rpms/vkeybd/devel vkeybd-CFLAGS.patch, NONE, 1.1 vkeybd-lash-2.patch, NONE, 1.1 vkeybd-lash.patch, NONE, 1.1 vkeybd.desktop, NONE, 1.1 vkeybd.png, NONE, 1.1 vkeybd.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Anthony Green (green)
fedora-extras-commits at redhat.com
Sat Oct 21 17:05:34 UTC 2006
Author: green
Update of /cvs/extras/rpms/vkeybd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28353/devel
Modified Files:
.cvsignore sources
Added Files:
vkeybd-CFLAGS.patch vkeybd-lash-2.patch vkeybd-lash.patch
vkeybd.desktop vkeybd.png vkeybd.spec
Log Message:
auto-import vkeybd-0.1.17a-1 on branch devel from vkeybd-0.1.17a-1.src.rpm
vkeybd-CFLAGS.patch:
--- NEW FILE vkeybd-CFLAGS.patch ---
--- Makefile.orig 2006-04-25 11:28:38.000000000 -0400
+++ Makefile 2006-04-25 11:31:19.000000000 -0400
@@ -84,7 +84,7 @@
VKB_TCLFILE = $(VKBLIB_DIR)/vkeybd.tcl
-CFLAGS = -Wall -O -DVKB_TCLFILE=\"$(VKB_TCLFILE)\" \
+CFLAGS = -Wall $(RPM_OPT_FLAGS) -DVKB_TCLFILE=\"$(VKB_TCLFILE)\" \
-DVKBLIB_DIR=\"$(VKBLIB_DIR)\"\
-DVERSION_STR=\"$(VERSION)\"\
$(DEVICES) $(XINC) $(TCLINC) $(TKINC) $(LASHCFLAGS)
vkeybd-lash-2.patch:
--- NEW FILE vkeybd-lash-2.patch ---
--- README~ 2006-09-25 09:00:12.000000000 -0700
+++ README 2006-09-25 09:08:53.000000000 -0700
@@ -46,8 +46,8 @@
To disable a device, set the value 0. Do not undefine it.
At least one of them must have non-zero value.
- - USE_LADCCA
- Supports LADCCA (http://pkl.net/~node/software/)
+ - USE_LASH
+ Supports LASH (http://www.nongnu.org/lash/)
Set 1 to add the this support.
- TCLLIB
@@ -106,7 +106,7 @@
device port. This options makes vkeybd possible to "fake"
as a real MIDI device.
--lash bool
- Specify the support of LADCCA. Give yes or no as the
+ Specify the support of LASH. Give yes or no as the
argument. The default value is no.
OSS Sequencer Device Option:
vkeybd-lash.patch:
--- NEW FILE vkeybd-lash.patch ---
--- Makefile~ 2006-04-25 07:00:14.000000000 -0400
+++ Makefile 2006-04-25 07:00:36.000000000 -0400
@@ -30,7 +30,7 @@
USE_AWE = 1
USE_MIDI = 1
USE_ALSA = 1
-USE_LADCCA = 0
+USE_LASH = 0
#
# Tcl/Tk library -- depends on your distribution
@@ -68,14 +68,14 @@
endif
#
-# LADCCA stuff
+# LASH stuff
#
-ifeq (1,$(USE_LADCCA))
-LADCCACFLAGS = $(shell pkg-config --cflags ladcca-1.0) \
- $(shell pkg-config --exists ladcca-1.0 && echo "-DHAVE_LADCCA" )
-LADCCALIBS = $(shell pkg-config --libs ladcca-1.0)
-DEVICES += $(LADCCACFLAGS)
-EXTRALIB += $(LADCCALIBS)
+ifeq (1,$(USE_LASH))
+LASHCFLAGS = $(shell pkg-config --cflags lash-1.0) \
+ $(shell pkg-config --exists lash-1.0 && echo "-DHAVE_LASH" )
+LASHLIBS = $(shell pkg-config --libs lash-1.0)
+DEVICES += $(LASHCFLAGS)
+EXTRALIB += $(LASHLIBS)
endif
#----------------------------------------------------------------
@@ -87,7 +87,7 @@
CFLAGS = -Wall -O -DVKB_TCLFILE=\"$(VKB_TCLFILE)\" \
-DVKBLIB_DIR=\"$(VKBLIB_DIR)\"\
-DVERSION_STR=\"$(VERSION)\"\
- $(DEVICES) $(XINC) $(TCLINC) $(TKINC) $(LADCCACFLAGS)
+ $(DEVICES) $(XINC) $(TCLINC) $(TKINC) $(LASHCFLAGS)
TARGETS = vkeybd sftovkb
--- oper_alsa.c~ 2006-04-25 06:59:53.000000000 -0400
+++ oper_alsa.c 2006-04-25 07:00:36.000000000 -0400
@@ -79,7 +79,7 @@
{"addr", "subscriber", "--addr client:port or 'subscriber' : ALSA sequencer destination"},
{"name", DEFAULT_NAME, "--name string : use the specified string as client/port names"},
#ifdef HAVE_LADCCA
- {"ladcca", "no", "--ladcca <yes|no> : support LADCCA (default = no)"},
+ {"lash", "no", "--lash <yes|no> : support LASH (default = no)"},
#endif
{NULL},
};
@@ -100,7 +100,7 @@
static int seq_client, seq_port;
static int chan_no;
-#ifdef HAVE_LADCCA
+#ifdef HAVE_LASH
static cca_client_t * cca_client = NULL;
#endif
@@ -156,9 +156,9 @@
/* get my client id */
my_client = snd_seq_client_id(seq_handle);
- /* tell the ladcca server our client id */
-#ifdef HAVE_LADCCA
- if ((var = Tcl_GetVar2(ip, "optvar", "ladcca", TCL_GLOBAL_ONLY)) != NULL) {
+ /* tell the lash server our client id */
+#ifdef HAVE_LASH
+ if ((var = Tcl_GetVar2(ip, "optvar", "lash", TCL_GLOBAL_ONLY)) != NULL) {
if (*var == 'y' || *var == 'Y' || *var == '1') {
cca_client = cca_init (cca_args,
"vkeybd",
@@ -174,7 +174,7 @@
}
}
}
-#endif /* HAVE_LADCCA */
+#endif /* HAVE_LASH */
/* set client info */
if ((var = Tcl_GetVar2(ip, "optvar", "name", TCL_GLOBAL_ONLY)) != NULL)
@@ -203,7 +203,7 @@
if (seq_client != SND_SEQ_ADDRESS_SUBSCRIBERS) {
/* subscribe to MIDI port */
if (
-#ifdef HAVE_LADCCA
+#ifdef HAVE_LASH
!cca_enabled (cca_client) &&
#endif
snd_seq_connect_to(seq_handle, my_port, seq_client, seq_port) < 0) {
--- README~ 2006-04-25 06:59:57.000000000 -0400
+++ README 2006-04-25 07:00:36.000000000 -0400
@@ -105,7 +105,7 @@
tk707 check the client/port name whether it is a valid MIDI
device port. This options makes vkeybd possible to "fake"
as a real MIDI device.
- --ladcca bool
+ --lash bool
Specify the support of LADCCA. Give yes or no as the
argument. The default value is no.
--- vkb.c~ 2006-04-25 07:00:21.000000000 -0400
+++ vkb.c 2006-04-25 07:00:37.000000000 -0400
@@ -65,7 +65,7 @@
static vkb_oper_t *oper;
#ifdef HAVE_LADCCA
-cca_args_t * cca_args = NULL;
+lash_args_t * lash_args = NULL;
#endif
/*
@@ -78,7 +78,7 @@
int c, nargc;
#ifdef HAVE_LADCCA
- cca_args = cca_extract_args(&argc, &argv);
+ lash_args = lash_extract_args(&argc, &argv);
#endif /* HAVE_LADCCA */
nargc = argc + 1;
--- vkb.h~ 2006-04-25 07:00:29.000000000 -0400
+++ vkb.h 2006-04-25 07:00:37.000000000 -0400
@@ -24,7 +24,7 @@
#include <tcl.h>
#ifdef HAVE_LADCCA
-#include <ladcca/ladcca.h>
+#include <lash/lash.h>
#endif
#ifndef VKB_TCLFILE
--- NEW FILE vkeybd.desktop ---
[Desktop Entry]
Name=Vkeybd
Comment=Virtual MIDI keyboard
Icon=vkeybd.png
Exec=vkeybd
Terminal=false
StartupWMClass=vkeybd.tcl
Type=Application
Categories=Application;AudioVideo;
Encoding=UTF-8
--- NEW FILE vkeybd.spec ---
Summary: Virtual MIDI keyboard
Name: vkeybd
Version: 0.1.17a
Release: 1%{?dist}
License: GPL
Group: Applications/Multimedia
URL: http://www.alsa-project.org/~iwai/alsa.html
Source0: http://www.alsa-project.org/~iwai/vkeybd-0.1.17a.tar.bz2
Source1: vkeybd.png
Source2: vkeybd.desktop
Patch0: vkeybd-lash.patch
Patch1: vkeybd-CFLAGS.patch
Patch2: vkeybd-lash-2.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: tk-devel >= 8.4, tk-devel < 8.5
BuildRequires: lash-devel
BuildRequires: desktop-file-utils
Requires: tk >= 8.4, tk < 8.5, lash
Requires: hicolor-icon-theme
%description
This is a virtual keyboard for AWE, MIDI and ALSA drivers.
It's a simple fake of a MIDI keyboard on X-windows system.
Enjoy a music with your mouse and "computer" keyboard :-)
%prep
%setup -q -n vkeybd
%patch0 -p0
%patch1 -p0
%patch2 -p0
%build
make %{?_smp_mflags} USE_LADCCA=1 TCL_VERSION=8.4 PREFIX=%{_prefix}
%install
rm -rf $RPM_BUILD_ROOT
make USE_LADCCA=1 PREFIX=%{_prefix} DESTDIR=$RPM_BUILD_ROOT install
make USE_LADCCA=1 PREFIX=%{_prefix} DESTDIR=$RPM_BUILD_ROOT install-man
chmod 644 $RPM_BUILD_ROOT/%{_mandir}/man1/*
chmod 755 $RPM_BUILD_ROOT/%{_datadir}/vkeybd/vkeybd.tcl
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/64x64/apps
install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/64x64/apps/vkeybd.png
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
desktop-file-install --vendor fedora \
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
--add-category X-Fedora \
%{SOURCE2}
%clean
rm -rf $RPM_BUILD_ROOT
%post
# update icon themes
touch --no-create %{_datadir}/icons/hicolor || :
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
%postun
# update icon themes
touch --no-create %{_datadir}/icons/hicolor || :
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
%files
%defattr(-,root,root,-)
%doc README ChangeLog
%{_bindir}/vkeybd
%{_bindir}/sftovkb
%{_datadir}/vkeybd/
%{_mandir}/man1/*
%{_datadir}/applications/*%{name}.desktop
%{_datadir}/icons/hicolor/64x64/apps/vkeybd.png
%changelog
* Thu Oct 19 2006 Anthony Green <green at redhat.com> 0.1.17a-1
- Update sources.
- Remove jack-audio-connection-kit dependency, which is implied by
lash dependency.
* Mon Sep 25 2006 Anthony Green <green at redhat.com> 0.1.17-8
- Tweak vkeybd.desktop file.
- Package ChangeLog.
- Clean up %%files.
- Move Categories to .desktop file.
- More LADCCA to LASH patching.
- Fix man page permissions.
* Tue Sep 19 2006 Anthony Green <green at redhat.com> 0.1.17-7
- Remove Require(post,postun) for gtk2, as per the packaging
guidelines.
* Tue Sep 19 2006 Anthony Green <green at redhat.com> 0.1.17-6
- Remove my COPYING file.
- Don't use update-desktop-database.
- Clean up BuildRequires.
- Install the icon in the hicolor tree.
- Require hicolor-icon-theme.
- Don't Require tcl, since tk does that.
- Collar tk version requirements.
- Make vkeybd.tcl executable.
- Require(post,postun) gtk2 for gtk-update-icon-cache.
* Thu Jun 1 2006 Anthony Green <green at redhat.com> 0.1.17-5
- Add dist tag to Release.
- Build with _smp_mflags.
- Add GPL license file (COPYING).
* Tue Apr 25 2006 Anthony Green <green at redhat.com> 0.1.17-4
- Add Fernando Lopez-Lezcano's icon and related changes.
- Clean up macro usage.
* Tue Apr 25 2006 Anthony Green <green at redhat.com> 0.1.17-3
- Build with RPM_OPT_FLAGS with vkeybd-CFLAGS.patch.
* Sat Apr 22 2006 Anthony Green <green at redhat.com> 0.1.17-2
- Build for Fedora Extras.
- Port from ladcca to lash.
- Update description.
* Mon Dec 27 2004 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.1.17-1
- updated to 0.1.17
- spec file cleanup
* Mon May 10 2004 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu>
- added buildrequires, detect tcl version
* Tue Feb 24 2004 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.1.15-1
- updated to 0.1.15
* Sat Jul 26 2003 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.1.13a-1
- updated to 0.1.13a
- added menu entries
* Mon Dec 30 2002 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.1.12-1
- Initial build.
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/vkeybd/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 21 Oct 2006 17:02:37 -0000 1.1
+++ .cvsignore 21 Oct 2006 17:05:04 -0000 1.2
@@ -0,0 +1 @@
+vkeybd-0.1.17a.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/vkeybd/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 21 Oct 2006 17:02:37 -0000 1.1
+++ sources 21 Oct 2006 17:05:04 -0000 1.2
@@ -0,0 +1 @@
+3def91f76f68203a275781d471c5b7e2 vkeybd-0.1.17a.tar.bz2
More information about the fedora-extras-commits
mailing list