[packages/jack-audio-connection-kit] - updated to 1.9.12 - removed obsolete jack-doxygen-output-dirs,release_device_on_error patches - ad
qboosh
qboosh at pld-linux.org
Fri Dec 22 17:38:06 CET 2017
commit a312c01c4b034c6e662a4ee39e2f3e5a6f3ee3ba
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Fri Dec 22 17:39:30 2017 +0100
- updated to 1.9.12
- removed obsolete jack-doxygen-output-dirs,release_device_on_error patches
- added freebob patch (fix freebob option)
jack-audio-connection-kit.spec | 21 ++++++++++-----------
jack-doxygen-output-dirs.patch | 26 --------------------------
jack-freebob.patch | 11 +++++++++++
release_device_on_error.patch | 23 -----------------------
4 files changed, 21 insertions(+), 60 deletions(-)
---
diff --git a/jack-audio-connection-kit.spec b/jack-audio-connection-kit.spec
index e2157e6..6a997d3 100644
--- a/jack-audio-connection-kit.spec
+++ b/jack-audio-connection-kit.spec
@@ -8,16 +8,14 @@
Summary: The JACK Audio Connection Kit
Summary(pl.UTF-8): JACK - zestaw do połączeń audio
Name: jack-audio-connection-kit
-Version: 1.9.10
-Release: 6
+Version: 1.9.12
+Release: 1
License: LGPL v2.1+ (libjack), GPL v2+ (the rest)
Group: Daemons
#Source0Download: http://jackaudio.org/downloads/
-Source0: https://dl.dropboxusercontent.com/u/28869550/jack-%{version}.tar.bz2
-#Source0: http://jackaudio.org/downloads/jack-%{version}.tar.bz2
-# Source0-md5: 4aeb91d7ae0cabce98355436ed4f217a
-Patch0: jack-doxygen-output-dirs.patch
-Patch1: release_device_on_error.patch
+Source0: https://github.com/jackaudio/jack2/releases/download/v%{version}/jack2-%{version}.tar.gz
+# Source0-md5: 6cb5dfea0586bcf009c733c4e4b04a03
+Patch0: jack-freebob.patch
URL: http://jackaudio.org/
BuildRequires: alsa-lib-devel >= 1.0.18
BuildRequires: autoconf >= 2.50
@@ -173,9 +171,8 @@ Przykładowy klient zestawu JACK: jackrec. Jest wydzielony, ponieważ
wymaga biblioteki libsndfile.
%prep
-%setup -q -n jack-%{version}
+%setup -q -n jack2-%{version}
%patch0 -p1
-%patch1 -p1
%build
export CFLAGS="%{rpmcflags} -I/usr/include/ncurses"
@@ -188,6 +185,7 @@ export LINKFLAGS="%{rpmldflags}"
%{?debug:--debug} \
--prefix=%{_prefix} \
--libdir=%{_libdir} \
+ --htmldir=%{_gtkdocdir}/%{name}/reference \
--alsa \
%{?with_classic:--classic} \
--dbus \
@@ -200,14 +198,13 @@ export LINKFLAGS="%{rpmldflags}"
%install
rm -rf $RPM_BUILD_ROOT
-HTML_DIR=%{_gtkdocdir}/%{name}/reference \
./waf install \
--destdir=$RPM_BUILD_ROOT
%{!?with_apidocs:rm -rf $RPM_BUILD_ROOT%{_gtkdocdir}}
# For compatibility with jack1
-mv $RPM_BUILD_ROOT%{_bindir}/jack_rec $RPM_BUILD_ROOT%{_bindir}/jackrec
+%{__mv} $RPM_BUILD_ROOT%{_bindir}/jack_rec $RPM_BUILD_ROOT%{_bindir}/jackrec
# not built or packaged
%{__rm} $RPM_BUILD_ROOT%{_mandir}/man1/jack_impulse_grabber.1 \
@@ -242,6 +239,7 @@ fi
%attr(755,root,root) %{_bindir}/jack_net_slave
%attr(755,root,root) %{_bindir}/jack_server_control
%attr(755,root,root) %{_bindir}/jack_session_notify
+%attr(755,root,root) %{_bindir}/jack_simdtests
%attr(755,root,root) %{_bindir}/jack_test
%attr(755,root,root) %{_bindir}/jack_unload
%{?with_classic:%attr(755,root,root) %{_bindir}/jackd}
@@ -254,6 +252,7 @@ fi
%attr(755,root,root) %{_libdir}/jack/jack_loopback.so
%attr(755,root,root) %{_libdir}/jack/jack_netone.so
%attr(755,root,root) %{_libdir}/jack/jack_net.so
+%attr(755,root,root) %{_libdir}/jack/jack_proxy.so
%attr(755,root,root) %{_libdir}/jack/netadapter.so
%attr(755,root,root) %{_libdir}/jack/netmanager.so
%attr(755,root,root) %{_libdir}/jack/profiler.so
diff --git a/jack-doxygen-output-dirs.patch b/jack-doxygen-output-dirs.patch
deleted file mode 100644
index 68bdb4d..0000000
--- a/jack-doxygen-output-dirs.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -rupN jack-1.9.7.old/doxyfile jack-1.9.7/doxyfile
---- jack-1.9.7.old/doxyfile 2011-03-30 11:03:54.000000000 -0400
-+++ jack-1.9.7/doxyfile 2011-04-03 08:54:03.000000000 -0400
-@@ -38,7 +38,7 @@ PROJECT_NUMBER = 1.9.7
- # If a relative path is entered, it will be relative to the location
- # where doxygen was started. If left blank the current directory will be used.
-
--OUTPUT_DIRECTORY =
-+OUTPUT_DIRECTORY = build/default/
-
- # If the CREATE_SUBDIRS tag is set to YES, then doxygen will create
- # 4096 sub-directories (in 2 levels) under the output directory of each output
---- jack-1.9.10/wscript.orig 2014-07-20 20:36:20.147537528 +0200
-+++ jack-1.9.10/wscript 2014-07-20 20:47:11.270843536 +0200
-@@ -436,7 +436,10 @@
- html_docs_source_dir = "build/default/html"
- if bld.cmd == 'install':
- share_dir = bld.options.destdir + bld.env['PREFIX'] + '/share/jack-audio-connection-kit'
-- html_docs_install_dir = share_dir + '/reference/html/'
-+ if os.environ.get('HTML_DIR', ''):
-+ html_docs_install_dir = bld.options.destdir + os.environ.get('HTML_DIR', '')
-+ else:
-+ html_docs_install_dir = share_dir + '/reference/html/'
- if os.path.isdir(html_docs_install_dir):
- Logs.pprint('CYAN', "Removing old doxygen documentation installation...")
- shutil.rmtree(html_docs_install_dir)
diff --git a/jack-freebob.patch b/jack-freebob.patch
new file mode 100644
index 0000000..e237f26
--- /dev/null
+++ b/jack-freebob.patch
@@ -0,0 +1,11 @@
+--- jack2-1.9.12/wscript.orig 2017-12-13 22:19:04.000000000 +0100
++++ jack2-1.9.12/wscript 2017-12-22 17:20:35.424934055 +0100
+@@ -416,7 +416,7 @@
+ alsa.add_package('alsa', atleast_version='1.0.18')
+ firewire = add_auto_option(opt, 'firewire', help='Enable FireWire driver (FFADO)', conf_dest='BUILD_DRIVER_FFADO')
+ firewire.add_package('libffado', atleast_version='1.999.17')
+- freebob = add_auto_option(opt, 'freebob', help='Enable FreeBob driver')
++ freebob = add_auto_option(opt, 'freebob', help='Enable FreeBob driver', conf_dest='BUILD_DRIVER_FREEBOB')
+ freebob.add_package('libfreebob', atleast_version='1.0.0')
+ iio = add_auto_option(opt, 'iio', help='Enable IIO driver', conf_dest='BUILD_DRIVER_IIO')
+ iio.add_package('gtkIOStream', atleast_version='1.4.0')
diff --git a/release_device_on_error.patch b/release_device_on_error.patch
deleted file mode 100644
index 25791e2..0000000
--- a/release_device_on_error.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -dur jack-1.9.10.orig/linux/alsa/JackAlsaDriver.cpp jack-1.9.10/linux/alsa/JackAlsaDriver.cpp
---- jack-1.9.10.orig/linux/alsa/JackAlsaDriver.cpp 2014-07-18 14:28:12.000000000 +0200
-+++ jack-1.9.10/linux/alsa/JackAlsaDriver.cpp 2015-12-06 18:30:36.000000000 +0100
-@@ -346,7 +346,7 @@
- fPlaybackChannels = ((alsa_driver_t *)fDriver)->playback_nchannels;
- return 0;
- } else {
-- JackAudioDriver::Close();
-+ Close();
- return -1;
- }
- }
-@@ -356,7 +356,9 @@
- // Generic audio driver close
- int res = JackAudioDriver::Close();
-
-- alsa_driver_delete((alsa_driver_t*)fDriver);
-+ if (fDriver) {
-+ alsa_driver_delete((alsa_driver_t*)fDriver);
-+ }
-
- if (JackServerGlobals::on_device_release != NULL)
- {
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/jack-audio-connection-kit.git/commitdiff/a312c01c4b034c6e662a4ee39e2f3e5a6f3ee3ba
More information about the pld-cvs-commit
mailing list