[packages/jack-audio-connection-kit] - updated to 1.9.9.5 - updated doxygen-output-dirs patch
qboosh
qboosh at pld-linux.org
Mon Nov 4 17:16:02 CET 2013
commit e7ac5016bed789d056e49083f7f6080827c7f6f1
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Mon Nov 4 17:16:14 2013 +0100
- updated to 1.9.9.5
- updated doxygen-output-dirs patch
jack-audio-connection-kit.spec | 28 ++++++++++++++--------------
jack-doxygen-output-dirs.patch | 36 ++++++++++++++++++++++++++++++++++--
2 files changed, 48 insertions(+), 16 deletions(-)
---
diff --git a/jack-audio-connection-kit.spec b/jack-audio-connection-kit.spec
index 7f18fe8..1a2b645 100644
--- a/jack-audio-connection-kit.spec
+++ b/jack-audio-connection-kit.spec
@@ -8,19 +8,19 @@
Summary: The JACK Audio Connection Kit
Summary(pl.UTF-8): JACK - zestaw do połączeń audio
Name: jack-audio-connection-kit
-Version: 1.9.8
-Release: 3
+Version: 1.9.9.5
+Release: 1
License: LGPL v2.1+ (libjack), GPL v2+ (the rest)
Group: Daemons
#Source0Download: http://jackaudio.org/download
-Source0: https://dl.dropbox.com/u/28869550/jack-%{version}.tgz
-# Source0-md5: 1dd2ff054cab79dfc11d134756f27165
+Source0: http://jackaudio.org/downloads/jack-%{version}.tar.bz2
+# Source0-md5: 6c9de6b89db9d7076fa2ce222816cf4c
Patch0: jack-doxygen-output-dirs.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: celt-devel >= 0.11.0
BuildRequires: dbus-devel >= 1.0.0
%{?with_apidocs:BuildRequires: doxygen}
BuildRequires: expat-devel
@@ -33,6 +33,8 @@ BuildRequires: libtool
BuildRequires: pkgconfig
BuildRequires: readline-devel
BuildRequires: rpmbuild(macros) >= 1.98
+# with opus_custom interface
+BuildRequires: opus-devel >= 1.0.3-2
%{?with_apidocs:BuildRequires: texlive-pdftex}
Requires: %{name}-libs = %{version}-%{release}
Requires: alsa-lib >= 1.0.18
@@ -72,7 +74,9 @@ Summary: JACK library
Summary(pl.UTF-8): Biblioteka JACK-a
License: LGPL v2.1+
Group: Libraries
+Requires: celt >= 0.11.0
Requires: dbus-libs >= 1.0.0
+Requires: opus >= 1.0.3-2
Conflicts: jack-audio-connection-kit < 0.100.7
%description libs
@@ -165,11 +169,9 @@ wymaga biblioteki libsndfile.
%prep
%setup -q -n jack-%{version}
-cd jack-%{version}
%patch0 -p1
%build
-cd jack-%{version}
export CFLAGS="%{rpmcflags} -I/usr/include/ncurses"
export CXXFLAGS="%{rpmcxxflags} -I/usr/include/ncurses"
export CPPFLAGS="%{rpmcxxflags} -I/usr/include/ncurses"
@@ -179,20 +181,18 @@ export LINKFLAGS="%{rpmldflags}"
-v \
%{?debug:--debug} \
--prefix=%{_prefix} \
- --libdir=/%{_lib} \
- --libdir32=/lib \
- --dbus \
+ --libdir=%{_libdir} \
+ --alsa \
%{?with_classic:--classic} \
+ --dbus \
%{?with_apidocs:--doxygen} \
%{?with_ffado:--firewire} \
- %{?with_freebob:--freebob} \
- --alsa
+ %{?with_freebob:--freebob}
./waf build %{?_smp_mflags} -v
%install
rm -rf $RPM_BUILD_ROOT
-cd jack-%{version}
HTML_DIR=%{_gtkdocdir}/%{name}/reference \
./waf install \
@@ -224,7 +224,7 @@ fi
%files
%defattr(644,root,root,755)
-%doc jack-%{version}/{ChangeLog,README*,TODO}
+%doc ChangeLog README* TODO
%attr(755,root,root) %{_bindir}/jack_alias
%attr(755,root,root) %{_bindir}/jack_control
%attr(755,root,root) %{_bindir}/jack_cpu
diff --git a/jack-doxygen-output-dirs.patch b/jack-doxygen-output-dirs.patch
index 19bf027..2c9eb05 100644
--- a/jack-doxygen-output-dirs.patch
+++ b/jack-doxygen-output-dirs.patch
@@ -20,10 +20,42 @@ diff -rupN jack-1.9.7.old/doxyfile jack-1.9.7/doxyfile
html_docs_source_dir = "build/default/html"
- html_docs_install_dir = share_dir + '/reference/html/'
+ if os.environ.get('HTML_DIR', ''):
-+ html_docs_install_dir = bld.env.get_destdir() + os.environ.get('HTML_DIR', '')
++ html_docs_install_dir = bld.options.destdir + os.environ.get('HTML_DIR', '')
+ else:
-+ share_dir = bld.env.get_destdir() + bld.env['PREFIX'] + '/share/jack-audio-connection-kit'
++ share_dir = bld.options.destdir + bld.env['PREFIX'] + '/share/jack-audio-connection-kit'
+ html_docs_install_dir = share_dir + '/reference/html/'
if Options.commands['install']:
if os.path.isdir(html_docs_install_dir):
Utils.pprint('CYAN', "Removing old doxygen documentation installation...")
+--- jack-1.9.9.5/wscript.orig 2013-11-03 20:36:21.608140224 +0100
++++ jack-1.9.9.5/wscript 2013-11-03 20:47:00.498113413 +0100
+@@ -362,7 +362,7 @@
+ else:
+ share_dir = bld.options.destdir + bld.env['PREFIX'] + '/share/jack-audio-connection-kit'
+ html_docs_install_dir = share_dir + '/reference/html/'
+- if Options.commands['install']:
++ if bld.cmd == 'install':
+ if os.path.isdir(html_docs_install_dir):
+ Logs.pprint('CYAN', "Removing old doxygen documentation installation...")
+ shutil.rmtree(html_docs_install_dir)
+@@ -370,17 +370,17 @@
+ Logs.pprint('CYAN', "Installing doxygen documentation...")
+ shutil.copytree(html_docs_source_dir, html_docs_install_dir)
+ Logs.pprint('CYAN', "Installing doxygen documentation done.")
+- elif Options.commands['uninstall']:
++ elif bld.cmd == 'uninstall':
+ Logs.pprint('CYAN', "Uninstalling doxygen documentation...")
+ if os.path.isdir(share_dir):
+ shutil.rmtree(share_dir)
+ Logs.pprint('CYAN', "Uninstalling doxygen documentation done.")
+- elif Options.commands['clean']:
++ elif bld.cmd == 'clean':
+ if os.access(html_docs_source_dir, os.R_OK):
+ Logs.pprint('CYAN', "Removing doxygen generated documentation...")
+ shutil.rmtree(html_docs_source_dir)
+ Logs.pprint('CYAN', "Removing doxygen generated documentation done.")
+- elif Options.commands['build']:
++ elif bld.cmd == 'build':
+ if not os.access(html_docs_source_dir, os.R_OK):
+ os.popen("doxygen").read()
+ else:
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/jack-audio-connection-kit.git/commitdiff/e7ac5016bed789d056e49083f7f6080827c7f6f1
More information about the pld-cvs-commit
mailing list