[hydrogen] Use pkg-config to detect cflags for liblrdf since raptor header file location changed

Orcan Ogetbil oget at fedoraproject.org
Mon Jul 23 01:21:17 UTC 2012


commit 9261c266f211ba61dddafa1983caca24067f47e9
Author: Orcan Ogetbil <oget.fedora at gmail.com>
Date:   Sun Jul 22 21:21:07 2012 -0400

    Use pkg-config to detect cflags for liblrdf since raptor header file location changed

 hydrogen-lrdf-pkg.patch |   21 +++++++++++++++++++++
 hydrogen.spec           |    9 ++++++++-
 2 files changed, 29 insertions(+), 1 deletions(-)
---
diff --git a/hydrogen-lrdf-pkg.patch b/hydrogen-lrdf-pkg.patch
new file mode 100644
index 0000000..4a11faf
--- /dev/null
+++ b/hydrogen-lrdf-pkg.patch
@@ -0,0 +1,21 @@
+diff -rupN hydrogen-0.9.5.1.old/Sconstruct hydrogen-0.9.5.1/Sconstruct
+--- hydrogen-0.9.5.1.old/Sconstruct	2012-02-19 16:54:05.000000000 -0500
++++ hydrogen-0.9.5.1/Sconstruct	2012-07-22 21:10:17.044739638 -0400
+@@ -193,6 +193,8 @@ def get_hydrogen_lib( opts ):
+             env.ParseConfig('pkg-config --modversion jack', get_jack_api_flags)
+         if str(env['lash']) == "1":
+             env.ParseConfig('pkg-config --cflags --libs lash-1.0')
++        if str(env['lrdf']) == "1":
++            env.ParseConfig('pkg-config --cflags --libs lrdf')
+ 
+ 
+ 	#env.Decider is not known in older scons version
+@@ -450,7 +452,7 @@ elif not str(env['libarchive']) == "1" a
+    Exit(1)
+ 
+ #lrdf: categorizing of ladspa effects
+-if str(env['lrdf']) == "1" and not conf.CheckCHeader('lrdf.h'):
++if str(env['lrdf']) == "1" and not conf.CheckPKG('lrdf'):
+     print 'lrdf must be installed!'
+     Exit(1)
+ 
diff --git a/hydrogen.spec b/hydrogen.spec
index f5419b3..c13b0af 100644
--- a/hydrogen.spec
+++ b/hydrogen.spec
@@ -1,13 +1,16 @@
 Summary:      Advanced drum machine for GNU/Linux
 Name:         hydrogen
 Version:      0.9.5.1
-Release:      3%{?dist}
+Release:      4%{?dist}
 URL:          http://www.hydrogen-music.org/
 Source0:      http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 # Remove the "you are using the development version" warning
 # http://sourceforge.net/mailarchive/forum.php?forum_name=hydrogen-devel
 # See the "0.9.5 si out" thread
 Patch1:       hydrogen-devel-warning.patch
+# We need to use pkgconfig to detect lrdf to get the right cflags
+# Temporary patch since upstream already switched from scons to cmake in trunk
+Patch2:       hydrogen-lrdf-pkg.patch
 License:      GPLv2+
 
 
@@ -57,6 +60,7 @@ patch -p0 < patches/portaudio.patch
 sed -i '/porttime/d' Sconstruct
 %endif
 %patch1 -p1 -b .nodevver
+%patch2 -p1 -b .cflags
 
 # Workaround due to change in scons behavior. Just a temporary fix since upstream
 # switched to cmake in trunk
@@ -129,6 +133,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Sun Jul 22 2012 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.9.5.1-4
+- Use pkg-config to detect cflags for liblrdf since raptor header file location changed
+
 * Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.5.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 


More information about the scm-commits mailing list