From 2276165337be792124fa7c467fdeb1eb6d5304f4 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Sat, 17 Jul 2010 05:47:54 +0000 Subject: [PATCH 1/4] Initialize branch F-12 for a2jmidid --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..06de2d2 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-12 From 6c86077b4cd452219e5d8e69e2fc4276c15f0d9d Mon Sep 17 00:00:00 2001 From: Orcan Ogetbil Date: Sat, 17 Jul 2010 06:56:40 +0000 Subject: [PATCH 2/4] - Fix license tag Wed May 19 2010 Orcan Ogetbil - 6-2 - Fix DSO linking Sat Jan 30 2010 Orcan Ogetbil - 6-1 - Update to 6 Thu Nov 26 2009 Orcan Ogetbil - 5-1 - Initial Fedora package. Specfile borrowed from SuSE. --- .cvsignore | 1 + a2jmidid-linking.patch | 11 ++++++ a2jmidid.spec | 82 ++++++++++++++++++++++++++++++++++++++++++ import.log | 1 + sources | 1 + 5 files changed, 96 insertions(+) create mode 100644 a2jmidid-linking.patch create mode 100644 a2jmidid.spec create mode 100644 import.log diff --git a/.cvsignore b/.cvsignore index e69de29..d6577cf 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +a2jmidid-6.tar.bz2 diff --git a/a2jmidid-linking.patch b/a2jmidid-linking.patch new file mode 100644 index 0000000..c99c906 --- /dev/null +++ b/a2jmidid-linking.patch @@ -0,0 +1,11 @@ +diff -rupN a2jmidid-6.old/wscript a2jmidid-6/wscript +--- a2jmidid-6.old/wscript 2009-12-06 19:53:25.000000000 -0500 ++++ a2jmidid-6/wscript 2010-05-19 13:13:20.000000000 -0400 +@@ -130,6 +130,7 @@ def build(bld): + prog.includes = '.' # make waf dependency tracking work + prog.target = 'a2jmidid' + prog.uselib = 'ALSA JACK DBUS-1' ++ prog.env.append_value("LINKFLAGS", "-ldl") + + prog = bld.create_obj('cc', 'program') + prog.source = 'a2jmidi_bridge.c' diff --git a/a2jmidid.spec b/a2jmidid.spec new file mode 100644 index 0000000..95217c9 --- /dev/null +++ b/a2jmidid.spec @@ -0,0 +1,82 @@ +Summary: Daemon for exposing ALSA sequencer applications in JACK MIDI system +Name: a2jmidid +Version: 6 +Release: 3%{?dist} +URL: http://home.gna.org/a2jmidid/ +Source0: http://download.gna.org/%{name}/%{name}-%{version}.tar.bz2 +# Fix DSO linking error +# https://gna.org/support/index.php?2547 +Patch0: a2jmidid-linking.patch +# a2jmidi_bridge.c and j2amidi_bridge.c are GPLv2+ +# The rest is GPLv2 +License: GPLv2 and GPLv2+ +Group: Applications/Multimedia +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root + +BuildRequires: alsa-lib-devel +BuildRequires: dbus-devel +BuildRequires: jack-audio-connection-kit-devel +BuildRequires: python +Requires: dbus + + +%description +a2jmidid is a project that aims to ease usage of legacy ALSA sequencer +applications, in a JACK MIDI enabled system. There are two ways to use legacy +ALSA sequencer applications in JACK MIDI system. + +The first approach is to use automatic bridging. For every ALSA sequencer port +you get one JACK MIDI port. If ALSA sequencer port is both input and output +one, you get two JACK MIDI ports, one input and output. + +The second approach is to static bridges. You start application that creates +one ALSA sequencer port and one JACK MIDI port. Such bridge is unidirectional. + +%prep +%setup -q +%patch0 -p1 -b .linking + +%build +export CFLAGS="%{optflags}" +./waf configure --prefix=%{_prefix} \ + --enable-pkg-config-dbus-service-dir +./waf %{?_smp_mflags} -v + +%install +rm -fr %{buildroot} +./waf --destdir=%{buildroot} -v install + +%clean +rm -fr %{buildroot} + +%files +%defattr(-,root,root,-) +%doc AUTHORS README gpl2.txt NEWS +%{_bindir}/a2j +%{_bindir}/%{name} +%{_bindir}/a2j_control +%{_bindir}/a2jmidi_bridge +%{_bindir}/j2amidi_bridge +%{_datadir}/dbus-1/services/org.gna.home.a2jmidid.service + +%changelog +* Fri Jul 16 2010 Orcan Ogetbil - 6-3 +- Fix license tag + +* Wed May 19 2010 Orcan Ogetbil - 6-2 +- Fix DSO linking + +* Sat Jan 30 2010 Orcan Ogetbil - 6-1 +- Update to 6 + +* Thu Nov 26 2009 Orcan Ogetbil - 5-1 +- Initial Fedora package. Specfile borrowed from SuSE. + +* Mon Jun 15 2009 Toni Graffy - 5-0.pm.1 +- update to 5 +* Sun Aug 03 2008 Toni Graffy - 4-0.pm.1 +- update to 4 +* Sat Oct 27 2007 Toni Graffy - 2-0.pm.1 +- update to 2 +* Mon Aug 27 2007 Toni Graffy - 1-0.pm.1 +- Initial build 1 diff --git a/import.log b/import.log new file mode 100644 index 0000000..a186b4e --- /dev/null +++ b/import.log @@ -0,0 +1 @@ +a2jmidid-6-3_fc13:F-12:a2jmidid-6-3.fc13.src.rpm:1279349786 diff --git a/sources b/sources index e69de29..d65bf34 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +461969bc19a5331e9e81441c6431ef20 a2jmidid-6.tar.bz2 From f355cd3857e5d3e4a28ac7e0561431c5059183e4 Mon Sep 17 00:00:00 2001 From: Orcan Ogetbil Date: Sat, 17 Jul 2010 07:50:18 +0000 Subject: [PATCH 3/4] - Workaround build failure on ppc/ppc64 --- a2jmidid-ppc.patch | 21 +++++++++++++++++++++ a2jmidid.spec | 10 +++++++++- 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 a2jmidid-ppc.patch diff --git a/a2jmidid-ppc.patch b/a2jmidid-ppc.patch new file mode 100644 index 0000000..1b8fc50 --- /dev/null +++ b/a2jmidid-ppc.patch @@ -0,0 +1,21 @@ +--- a2jmidid-6.old/sigsegv.c 2008-09-21 07:01:34.000000000 -0400 ++++ a2jmidid-6/sigsegv.c 2010-07-17 03:42:16.000000000 -0400 +@@ -49,6 +49,9 @@ char * __cxa_demangle(const char * __man + # define REGFORMAT "%x" + #endif + ++# if defined(powerpc) || defined(__ppc__) || defined(powerpc64) || defined(__ppc64__) || defined(__powerpc64__) //doesn't compile on ppc* ++static void signal_segv(int signum, siginfo_t* info, void*ptr) {} ++#else + static void signal_segv(int signum, siginfo_t* info, void*ptr) { + static const char *si_codes[3] = {"", "SEGV_MAPERR", "SEGV_ACCERR"}; + +@@ -146,7 +149,7 @@ static void signal_segv(int signum, sigi + a2j_error("End of stack trace"); + exit (-1); + } +- ++#endif //ppc,ppc64 + int setup_sigsegv() { + struct sigaction action; + diff --git a/a2jmidid.spec b/a2jmidid.spec index 95217c9..28ed69b 100644 --- a/a2jmidid.spec +++ b/a2jmidid.spec @@ -1,12 +1,16 @@ Summary: Daemon for exposing ALSA sequencer applications in JACK MIDI system Name: a2jmidid Version: 6 -Release: 3%{?dist} +Release: 3%{?dist}.1 URL: http://home.gna.org/a2jmidid/ Source0: http://download.gna.org/%{name}/%{name}-%{version}.tar.bz2 # Fix DSO linking error # https://gna.org/support/index.php?2547 Patch0: a2jmidid-linking.patch +# Sigsegv stacktrace doesn't compile on ppc. Workaround. +# Actually the code is taken from jack2. This workaround is +# also taken from jack2. +Patch1: a2jmidid-ppc.patch # a2jmidi_bridge.c and j2amidi_bridge.c are GPLv2+ # The rest is GPLv2 License: GPLv2 and GPLv2+ @@ -35,6 +39,7 @@ one ALSA sequencer port and one JACK MIDI port. Such bridge is unidirectional. %prep %setup -q %patch0 -p1 -b .linking +%patch1 -p1 -b .ppc %build export CFLAGS="%{optflags}" @@ -60,6 +65,9 @@ rm -fr %{buildroot} %{_datadir}/dbus-1/services/org.gna.home.a2jmidid.service %changelog +* Sat Jul 17 2010 Orcan Ogetbil - 6-3.1 +- Workaround build failure on ppc/ppc64 + * Fri Jul 16 2010 Orcan Ogetbil - 6-3 - Fix license tag From 38e8602ceadaf81f878427e54a2b5f2ee25f2978 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 09:29:14 +0000 Subject: [PATCH 4/4] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - import.log | 1 - 4 files changed, 23 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch delete mode 100644 import.log diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 40cf9b9..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: a2jmidid -# $Id$ -NAME := a2jmidid -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index 06de2d2..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-12 diff --git a/import.log b/import.log deleted file mode 100644 index a186b4e..0000000 --- a/import.log +++ /dev/null @@ -1 +0,0 @@ -a2jmidid-6-3_fc13:F-12:a2jmidid-6-3.fc13.src.rpm:1279349786