commit 9a1803f859b005f0010fb03d01b045c7cf5ede2c
Author: Jakub Bogusz <[email protected]>
Date: Sat Feb 1 17:10:42 2014 +0100
- (temporarily?) use github source; updated to 0.124.1 (needs code from 4
repos)
- updated link patch
- added update patch (update capabilities and freebob code)
jack-audio-connection-kit-update.patch | 36 +++++++++++++++++++++
jack-audio-connection-kit.spec | 59 +++++++++++++++++++++++++++-------
link.patch | 22 ++++++++++---
3 files changed, 101 insertions(+), 16 deletions(-)
---
diff --git a/jack-audio-connection-kit.spec b/jack-audio-connection-kit.spec
index 3285785..e56f45c 100644
--- a/jack-audio-connection-kit.spec
+++ b/jack-audio-connection-kit.spec
@@ -10,21 +10,30 @@
Summary: The JACK Audio Connection Kit
Summary(pl.UTF-8): JACK - zestaw do połączeń audio
Name: jack-audio-connection-kit
-Version: 0.121.3
+Version: 0.124.1
Release: 1
License: LGPL v2.1+ (libjack), GPL v2+ (the rest)
Group: Daemons
-#Source0Download: http://jackaudio.org/download
-Source0: http://jackaudio.org/downloads/%{name}-%{version}.tar.gz
-# Source0-md5: 35f470f7422c37b33eb965033f7a42e8
+# http://jackaudio.org/download - outdated?
+#Source0: http://jackaudio.org/downloads/%{name}-%{version}.tar.gz
+Source0:
https://github.com/jackaudio/jack1/archive/%{version}/%{name}-%{version}.tar.gz
+# Source0-md5: 5805ff4d4305f05a04a6cd9fa345733c
+Source1:
https://github.com/jackaudio/headers/archive/%{version}/jack-headers-%{version}.tar.gz
+# Source1-md5: c9c209fd9915c9d0b0ab4c60e31a867d
+Source2:
https://github.com/jackaudio/tools/archive/%{version}/jack-tools-%{version}.tar.gz
+# Source2-md5: 25772ce858298fbb66146345c4394df5
+Source3:
https://github.com/jackaudio/example-clients/archive/7fa089095c81e81dacd2554ae3184acc7f2d58ed/jack-example-clients-%{version}.tar.gz
+# Source3-md5: dd415d1923a7d118d4c2454a1b58ae47
Patch0: %{name}-gcc4.patch
Patch1: %{name}-readline.patch
Patch2: link.patch
+Patch3: %{name}-update.patch
URL: http://jackaudio.org/
BuildRequires: alsa-lib-devel >= 1.0.18
BuildRequires: autoconf >= 2.50
BuildRequires: automake
BuildRequires: celt-devel >= 0.5.0
+BuildRequires: db-devel
%{?with_apidocs:BuildRequires: doxygen}
%{?with_cap:BuildRequires: libcap-devel}
%{?with_ffado:BuildRequires: libffado-devel >= 1.999.17}
@@ -179,17 +188,21 @@ Przykładowy klient zestawu JACK: jackrec. Jest
wydzielony, ponieważ
wymaga biblioteki libsndfile.
%prep
-%setup -q
+%setup -q -n jack1-%{version} -a1 -a2 -a3
+%{__mv} headers-%{version}/* jack
+%{__mv} tools-%{version}/* tools
+%{__mv} example-clients-*/* example-clients
%patch0 -p1
%patch1 -p1
%patch2 -p1
+%patch3 -p1
%build
%{__libtoolize}
%{__aclocal} -I config
+%{__autoconf}
%{__autoheader}
%{__automake}
-%{__autoconf}
%configure \
--enable-dynsimd \
@@ -222,9 +235,13 @@ rm -rf $RPM_BUILD_ROOT
%{!?with_apidocs:rm -rf $RPM_BUILD_ROOT%{_gtkdocdir}}
# loadable modules
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/jack/*.{la,a}
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/jack/*.la
+%if %{with static_libs}
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/jack/*.a
+%endif
# test program
-%{__rm} $RPM_BUILD_ROOT%{_bindir}/jack_load_test
+%{__rm} $RPM_BUILD_ROOT%{_bindir}/jack_load_test \
+ $RPM_BUILD_ROOT%{_mandir}/man1/jack_load_test.1
%clean
rm -rf $RPM_BUILD_ROOT
@@ -243,23 +260,27 @@ fi
%defattr(644,root,root,755)
# note: COPYING only specifies which parts fall under GPL and LGPL
%doc AUTHORS TODO COPYING
-%{?with_cap:%attr(4755,root,root) %{_bindir}/jackstart}
-%attr(755,root,root) %{_bindir}/jackd
%attr(755,root,root) %{_bindir}/jack_alias
%attr(755,root,root) %{_bindir}/jack_evmon
%attr(755,root,root) %{_bindir}/jack_iodelay
%attr(755,root,root) %{_bindir}/jack_load
%attr(755,root,root) %{_bindir}/jack_midi_dump
+%attr(755,root,root) %{_bindir}/jack_property
%attr(755,root,root) %{_bindir}/jack_session_notify
%attr(755,root,root) %{_bindir}/jack_server_control
%attr(755,root,root) %{_bindir}/jack_unload
+%attr(755,root,root) %{_bindir}/jackd
+%{?with_cap:%attr(4755,root,root) %{_bindir}/jackstart}
%dir %{_libdir}/jack
-%attr(755,root,root) %{_libdir}/jack/a2j_in.so
%attr(755,root,root) %{_libdir}/jack/jack_alsa.so
%attr(755,root,root) %{_libdir}/jack/jack_alsa_midi.so
%attr(755,root,root) %{_libdir}/jack/jack_dummy.so
%attr(755,root,root) %{_libdir}/jack/jack_net.so
%attr(755,root,root) %{_libdir}/jack/jack_oss.so
+%{_mandir}/man1/jack_iodelay.1*
+%{_mandir}/man1/jack_load.1*
+%{_mandir}/man1/jack_property.1*
+%{_mandir}/man1/jack_unload.1*
%{_mandir}/man1/jackd.1*
%{_mandir}/man1/jackstart.1*
@@ -329,7 +350,23 @@ fi
%attr(755,root,root) %{_bindir}/jack_wait
%attr(755,root,root) %{_libdir}/jack/inprocess.so
%attr(755,root,root) %{_libdir}/jack/intime.so
+%{_mandir}/man1/alsa_in.1*
+%{_mandir}/man1/alsa_out.1*
+%{_mandir}/man1/jack_bufsize.1*
+%{_mandir}/man1/jack_connect.1*
+%{_mandir}/man1/jack_disconnect.1*
+%{_mandir}/man1/jack_freewheel.1*
+%{_mandir}/man1/jack_impulse_grabber.1*
+%{_mandir}/man1/jack_lsp.1*
+%{_mandir}/man1/jack_metro.1*
+%{_mandir}/man1/jack_monitor_client.1*
+%{_mandir}/man1/jack_netsource.1*
+%{_mandir}/man1/jack_samplerate.1*
+%{_mandir}/man1/jack_showtime.1*
+%{_mandir}/man1/jack_transport.1*
+%{_mandir}/man1/jack_wait.1*
%files example-jackrec
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/jack_rec
+%{_mandir}/man1/jackrec.1*
diff --git a/jack-audio-connection-kit-update.patch
b/jack-audio-connection-kit-update.patch
new file mode 100644
index 0000000..40ff738
--- /dev/null
+++ b/jack-audio-connection-kit-update.patch
@@ -0,0 +1,36 @@
+--- jack1-0.124.1/drivers/freebob/freebob_driver.c.orig 2014-01-22
21:25:41.000000000 +0100
++++ jack1-0.124.1/drivers/freebob/freebob_driver.c 2014-02-01
16:13:41.975609896 +0100
+@@ -38,8 +38,8 @@
+
+ #include <assert.h>
+
+-#include <jack/types.h"
+-#include <jack/engine.h>
++#include <jack/types.h>
++#include "engine.h"
+ #include <sysdeps/time.h>
+
+ #include "include/internal.h"
+--- jack1-0.124.1/jackd/jackstart.c.orig 2014-01-22 21:25:41.000000000
+0100
++++ jack1-0.124.1/jackd/jackstart.c 2014-02-01 15:29:39.569054121 +0100
+@@ -37,7 +37,7 @@
+ #undef _POSIX_SOURCE
+ #include <sys/capability.h>
+
+-#include "jack/start.h"
++#include "start.h"
+ #include "md5.h"
+ #include "jack_md5.h"
+
+--- jack1-0.124.1/libjack/client.c.orig 2014-01-22 21:25:41.000000000
+0100
++++ jack1-0.124.1/libjack/client.c 2014-02-01 15:25:05.769065611 +0100
+@@ -2343,7 +2343,8 @@ jack_activate (jack_client_t *client)
+ VALGRIND_MEMSET (&req, 0, sizeof (req));
+
+ req.type = SetClientCapabilities;
+- req.x.client_id = client->control->id;
++
++ jack_uuid_copy (&req.x.client_id, client->control->uuid);
+ req.x.cap_pid = client->control->pid;
+
+ jack_client_deliver_request (client, &req);
diff --git a/link.patch b/link.patch
index e31416a..541a2d6 100644
--- a/link.patch
+++ b/link.patch
@@ -1,12 +1,24 @@
- fix for "Unresolved symbols found"
---- jack-audio-connection-kit-0.121.3/jackd/Makefile.am.orig 2011-09-28
14:27:47.000000000 +0200
-+++ jack-audio-connection-kit-0.121.3/jackd/Makefile.am 2012-11-11
17:13:29.103111610 +0100
+- avoid unnecessary linking with -ldb
+--- jack1-0.124.1/jackd/Makefile.am.orig 2014-02-01 16:19:21.505595646
+0100
++++ jack1-0.124.1/jackd/Makefile.am 2014-02-01 16:22:41.085587271 +0100
@@ -51,7 +51,7 @@
../libjack/midiport.c ../libjack/ringbuffer.c ../libjack/shm.c \
../libjack/thread.c ../libjack/time.c ../libjack/transclient.c \
- ../libjack/unlock.c
--libjackserver_la_LIBADD = simd.lo @OS_LDFLAGS@
-+libjackserver_la_LIBADD = simd.lo @OS_LDFLAGS@ $(CAP_LIBS)
+ ../libjack/unlock.c ../libjack/uuid.c ../libjack/metadata.c
+-libjackserver_la_LIBADD = simd.lo -ldb @OS_LDFLAGS@
++libjackserver_la_LIBADD = simd.lo -ldb @OS_LDFLAGS@ $(CAP_LIBS)
libjackserver_la_LDFLAGS = -export-dynamic -version-info @JACK_SO_VERSION@
simd.lo: $(srcdir)/../libjack/simd.c
+--- jack1-0.124.1/configure.ac.orig 2014-02-01 16:33:36.412226435 +0100
++++ jack1-0.124.1/configure.ac 2014-02-01 16:42:57.178869571 +0100
+@@ -232,7 +232,7 @@
+ AC_CHECK_FUNCS(on_exit atexit)
+ AC_CHECK_FUNCS(posix_memalign)
+ AC_CHECK_LIB(m, sin)
+-AC_CHECK_LIB(db, db_create,[],
++AC_CHECK_LIB(db, db_create, [DB_LIBS=-ldb],
+ AC_MSG_ERROR([*** JACK requires Berkeley DB libraries (libdb...)]))
+
+ echo -n "Checking for ppoll()... "
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/jack-audio-connection-kit.git/commitdiff/9a1803f859b005f0010fb03d01b045c7cf5ede2c
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
