- updated to 1.9.14

- removed outdated freebob patch; freebob driver is gone, finally obsoleted by ffado
- added doxygen-fix patch (from git; fixes docs build)

diff --git a/jack-audio-connection-kit.spec b/jack-audio-connection-kit.spec
index 0da210225a7eecd2caddc516bef56f7e01b435d7..8d46f2b0ba63aea16c6c8133c6741609c5cdef36 100644 (file)
--- a/jack-audio-connection-kit.spec
+++ b/jack-audio-connection-kit.spec
@@ -1,21 +1,21 @@
 #
 # Conditional build:
-%bcond_without apidocs         # don't generate documentation with doxygen
-%bcond_without ffado           # don't build firewire (FFADO) driver
-%bcond_without freebob         # don't build freebob driver
+%bcond_without apidocs         # Doxygen docs
+%bcond_without ffado           # firewire (FFADO) driver
 %bcond_with    classic         # build also classic jackd server (see http://trac.jackaudio.org/wiki/JackDbusPackaging)
 
 Summary:       The JACK Audio Connection Kit
 Summary(pl.UTF-8):     JACK - zestaw do połączeń audio
 Name:          jack-audio-connection-kit
-Version:       1.9.12
-Release:       2
+Version:       1.9.14
+Release:       1
 License:       LGPL v2.1+ (libjack), GPL v2+ (the rest)
 Group:         Daemons
 #Source0Download: http://jackaudio.org/downloads/
-Source0:       https://github.com/jackaudio/jack2/releases/download/v%{version}/jack2-%{version}.tar.gz
-# Source0-md5: 6cb5dfea0586bcf009c733c4e4b04a03
-Patch0:                jack-freebob.patch
+#Source0:      https://github.com/jackaudio/jack2/releases/download/v%{version}/jack2-%{version}.tar.gz
+Source0:       https://github.com/jackaudio/jack2/archive/v%{version}/jack2-%{version}.tar.gz
+# Source0-md5: b63b5cf65fc43ccf9585d274fe91069f
+Patch0:                jack-doxygen-fix.patch
 URL:           http://jackaudio.org/
 BuildRequires: alsa-lib-devel >= 1.0.18
 BuildRequires: autoconf >= 2.50
@@ -25,7 +25,6 @@ BuildRequires:        dbus-devel >= 1.0.0
 %{?with_apidocs:BuildRequires: doxygen}
 BuildRequires: expat-devel
 %{?with_ffado:BuildRequires:   libffado-devel >= 1.999.17}
-%{?with_freebob:BuildRequires: libfreebob-devel >= 1.0.0}
 BuildRequires: libsamplerate-devel
 BuildRequires: libsndfile-devel >= 1.0.0
 BuildRequires: libstdc++-devel
@@ -120,6 +119,7 @@ License:    GPL v2+
 Group:         Libraries
 Requires:      %{name} = %{version}-%{release}
 Requires:      libffado >= 1.999.17
+Obsoletes:     jack-driver-freebob < 1.9.13
 
 %description driver-firewire
 FireWire (FFADO) sound driver for JACK.
@@ -127,20 +127,6 @@ FireWire (FFADO) sound driver for JACK.
 %description driver-firewire -l pl.UTF-8
 Sterownik dźwięku FireWire (FFADO) dla JACK-a.
 
-%package driver-freebob
-Summary:       FreeBoB sound driver for JACK
-Summary(pl.UTF-8):     Sterownik dźwięku FreeBoB dla JACK-a
-License:       GPL v2+
-Group:         Libraries
-Requires:      %{name} = %{version}-%{release}
-Requires:      libfreebob >= 1.0.0
-
-%description driver-freebob
-FreeBoB (BeBoB platform) sound driver for JACK.
-
-%description driver-freebob -l pl.UTF-8
-Sterownik dźwięku FreeBoB (do platformy BeBoB) dla JACK-a.
-
 %package example-clients
 Summary:       Example clients that use JACK
 Summary(pl.UTF-8):     Przykładowe programy klienckie używające JACK-a
@@ -190,8 +176,7 @@ export LINKFLAGS="%{rpmldflags}"
        %{?with_classic:--classic} \
        --dbus \
        %{?with_apidocs:--doxygen} \
-       %{?with_ffado:--firewire} \
-       %{?with_freebob:--freebob}
+       %{?with_ffado:--firewire}
 
 ./waf build %{?_smp_mflags} -v
 
@@ -227,7 +212,7 @@ fi
 
 %files
 %defattr(644,root,root,755)
-%doc ChangeLog README* TODO
+%doc AUTHORS.rst ChangeLog.rst README*
 %attr(755,root,root) %{_bindir}/jack_alias
 %attr(755,root,root) %{_bindir}/jack_control
 %attr(755,root,root) %{_bindir}/jack_cpu
@@ -291,12 +276,6 @@ fi
 %attr(755,root,root) %{_libdir}/jack/jack_firewire.so
 %endif
 
-%if %{with freebob}
-%files driver-freebob
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/jack/jack_freebob.so
-%endif
-
 %files example-clients
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/alsa_in
@@ -315,6 +294,7 @@ fi
 %attr(755,root,root) %{_bindir}/jack_monitor_client
 %attr(755,root,root) %{_bindir}/jack_multiple_metro
 %attr(755,root,root) %{_bindir}/jack_netsource
+%attr(755,root,root) %{_bindir}/jack_property
 %attr(755,root,root) %{_bindir}/jack_samplerate
 %attr(755,root,root) %{_bindir}/jack_showtime
 %attr(755,root,root) %{_bindir}/jack_simple_client
@@ -334,6 +314,7 @@ fi
 %{_mandir}/man1/jack_metro.1*
 %{_mandir}/man1/jack_monitor_client.1*
 %{_mandir}/man1/jack_netsource.1*
+%{_mandir}/man1/jack_property.1*
 %{_mandir}/man1/jack_samplerate.1*
 %{_mandir}/man1/jack_showtime.1*
 %{_mandir}/man1/jack_simple_client.1*

diff --git a/jack-doxygen-fix.patch b/jack-doxygen-fix.patch
new file mode 100644 (file)
index 0000000..a1a730f
--- /dev/null
+++ b/jack-doxygen-fix.patch
@@ -0,0 +1,23 @@
+From af6c00ab09428e7999c882265c3086b847750c8c Mon Sep 17 00:00:00 2001
+From: Guido Aulisi <guido.aulisi@gmail.com>
+Date: Thu, 5 Dec 2019 15:19:23 +0100
+Subject: [PATCH] Fix compilation of documentation
+
+Custom footer without date is not needed anymore
+---
+ doxyfile.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/doxyfile.in b/doxyfile.in
+index f92e264a..2335adab 100644
+--- a/doxyfile.in
++++ b/doxyfile.in
+@@ -792,7 +792,7 @@ HTML_HEADER            =
+ # each generated HTML page. If it is left blank doxygen will generate a
+ # standard footer.
+ 
+-HTML_FOOTER            = @SRCDIR@/no_date_footer.html
++HTML_FOOTER            =
+ 
+ # The HTML_STYLESHEET tag can be used to specify a user-defined cascading
+ # style sheet that is used by each HTML page. It can be used to

diff --git a/jack-freebob.patch b/jack-freebob.patch
deleted file mode 100644 (file)
index e237f26..0000000
--- a/jack-freebob.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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')