[packages/jack-audio-connection-kit] - updated to 1.9.10 - updated doxygen-output-dirs patch

qboosh qboosh at pld-linux.org
Sun Jul 20 21:16:43 CEST 2014


commit 3b657199005ff07384a2951571277c91d54a212e
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Jul 20 21:21:46 2014 +0200

    - updated to 1.9.10
    - updated doxygen-output-dirs patch

 jack-audio-connection-kit.spec |  9 +++----
 jack-doxygen-output-dirs.patch | 53 +++++++-----------------------------------
 2 files changed, 14 insertions(+), 48 deletions(-)
---
diff --git a/jack-audio-connection-kit.spec b/jack-audio-connection-kit.spec
index 1a2b645..988d8b0 100644
--- a/jack-audio-connection-kit.spec
+++ b/jack-audio-connection-kit.spec
@@ -8,13 +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.9.5
+Version:	1.9.10
 Release:	1
 License:	LGPL v2.1+ (libjack), GPL v2+ (the rest)
 Group:		Daemons
-#Source0Download: http://jackaudio.org/download
-Source0:	http://jackaudio.org/downloads/jack-%{version}.tar.bz2
-# Source0-md5:	6c9de6b89db9d7076fa2ce222816cf4c
+#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
 URL:		http://jackaudio.org/
 BuildRequires:	alsa-lib-devel >= 1.0.18
diff --git a/jack-doxygen-output-dirs.patch b/jack-doxygen-output-dirs.patch
index 2c9eb05..68bdb4d 100644
--- a/jack-doxygen-output-dirs.patch
+++ b/jack-doxygen-output-dirs.patch
@@ -10,52 +10,17 @@ diff -rupN jack-1.9.7.old/doxyfile jack-1.9.7/doxyfile
  
  # 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.7/wscript~	2011-03-30 17:03:54.000000000 +0200
-+++ jack-1.9.7/wscript	2011-04-17 20:08:11.884392560 +0200
-@@ -315,9 +315,12 @@
-             bld.add_subdirs('dbus')
- 
-     if bld.env['BUILD_DOXYGEN_DOCS'] == True:
--        share_dir = bld.env.get_destdir() + bld.env['PREFIX'] + '/share/jack-audio-connection-kit'
+--- 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"
--        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:
-+            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:
+         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 Options.commands['install']:
-+        if bld.cmd == 'install':
+-            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)
-@@ -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/3b657199005ff07384a2951571277c91d54a212e



More information about the pld-cvs-commit mailing list