rpms/ladspa/devel ladspa-1.13-plugindir.patch, NONE, 1.1 ladspa.spec, 1.19, 1.20

[Robert Scheck]

Author: robert

Update of /cvs/pkgs/rpms/ladspa/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6411

Modified Files:
	ladspa.spec 
Added Files:
	ladspa-1.13-plugindir.patch 
Log Message:
- Really added the plugindir patch now (thanks to Karsten Hopp)
- Avoid the make errors because of mkdirhier better than until now


ladspa-1.13-plugindir.patch:

--- NEW FILE ladspa-1.13-plugindir.patch ---
--- src/search.c		2001-07-21 09:04:23.000000000 -0700
+++ src/search.c.plugindir	2007-10-09 04:43:30.000000000 -0700
@@ -99,10 +99,7 @@
 
   pcLADSPAPath = getenv("LADSPA_PATH");
   if (!pcLADSPAPath) {
-    fprintf(stderr,
-	    "Warning: You do not have a LADSPA_PATH "
-	    "environment variable set.\n");
-    return;
+    pcLADSPAPath = PLUGINDIR;
   }
   
   pcStart = pcLADSPAPath;
--- src/load.c			2001-07-21 09:04:23.000000000 -0700
+++ src/load.c.plugindir	2007-10-09 04:42:47.000000000 -0700
@@ -54,6 +54,8 @@
        to search. */
 
     pcLADSPAPath = getenv("LADSPA_PATH");
+    if (! pcLADSPAPath)
+      pcLADSPAPath = PLUGINDIR;
     
     if (pcLADSPAPath) {
 


Index: ladspa.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ladspa/devel/ladspa.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- ladspa.spec	25 Feb 2009 17:10:54 -0000	1.19
+++ ladspa.spec	22 Mar 2009 16:12:13 -0000	1.20
@@ -1,6 +1,6 @@
 Name:           ladspa
 Version:        1.13
-Release:        4%{?dist}
+Release:        5%{?dist}
 
 Summary:        Linux Audio Developer's Simple Plug-in API, examples and tools
 
@@ -41,6 +41,8 @@
 %patch1 -p0 -b .plugindir
 # respect RPM_OPT_FLAGS
 perl -pi -e 's/^(CFLAGS.*)-O3(.*)/$1\$\(RPM_OPT_FLAGS\)$2 -DPLUGINDIR=\$\(PLUGINDIR\)/' src/makefile
+# avoid X.org dependency
+perl -pi -e 's/-mkdirhier/-mkdir -p/' src/makefile
 
 # fix links to the header file in the docs
 cd doc
@@ -58,13 +60,6 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 
-## ladspa_sdk uses mkdirhier for install which is provided by XFree86
-## we don't want to depend on XFree86 for building
-## so let's make these dirs ourselves
-mkdir -p $RPM_BUILD_ROOT%{_libdir}/ladspa
-mkdir -p $RPM_BUILD_ROOT%{_includedir}/ladspa
-mkdir -p $RPM_BUILD_ROOT%{_bindir}/ladspa
-
 cd src
 make install \
   INSTALL_PLUGINS_DIR=$RPM_BUILD_ROOT%{_libdir}/ladspa \
@@ -96,6 +91,10 @@
 
 
 %changelog
+* Sun Mar 22 2009 Robert Scheck <robert at fedoraproject.org> - 1.13-5
+- Really added the plugindir patch now (thanks to Karsten Hopp)
+- Avoid the make errors because of mkdirhier better than until now
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.13-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild