[gentoo-commits] gentoo-x86 commit in media-sound/hydrogen/files: hydrogen-0.9.5-use_lrdf_pkgconfig.patch

[Samuli Suominen (ssuominen)]

ssuominen    11/07/29 09:15:29

  Added:                hydrogen-0.9.5-use_lrdf_pkgconfig.patch
  Log:
  Fix building with liblrdf-0.4.0-r20
  
  (Portage version: 2.2.0_alpha47/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  media-sound/hydrogen/files/hydrogen-0.9.5-use_lrdf_pkgconfig.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/hydrogen/files/hydrogen-0.9.5-use_lrdf_pkgconfig.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/hydrogen/files/hydrogen-0.9.5-use_lrdf_pkgconfig.patch?rev=1.1&content-type=text/plain

Index: hydrogen-0.9.5-use_lrdf_pkgconfig.patch
===================================================================
conf.CheckCHeader lrdf.h check fails because of missing -I/usr/include/raptor2, use pkg-config instead

--- Sconstruct
+++ Sconstruct
@@ -268,7 +268,8 @@
 		env.Append( LIBPATH = 'C:\Program Files\GnuWin32\lib' )
 		env.Append( LIBS = [ "pthread" ] )
 	
-        if str(env['lrdf']) == "1": env.Append( LIBS = ["lrdf"] )
+        if str(env['lrdf']) == "1":
+		env.ParseConfig('pkg-config --cflags --libs lrdf')
 	if str(env['jack']) == "1": env.Append( LIBS = ["jack"])
 	if str(env['alsa']) == "1": env.Append( LIBS = ["asound"])
 	if str(env['libarchive']) == "1": env.Append( LIBS = ["archive"])
@@ -449,7 +450,7 @@
    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 >= 0.4.0'):
     print 'lrdf must be installed!'
     Exit(1)