From 0e5f03a40db70a948f1a6741fcbded5085a50d347de4820adb0e4b38c4bb7185 Mon Sep 17 00:00:00 2001
From: OBS User autobuild <null@suse.de>
Date: Fri, 27 Nov 2009 13:43:18 +0000
Subject: [PATCH] checked in

OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/ladspa?expand=0&rev=9
---
 blop-ladspa_dir.diff  | 11 -----------
 blop-wdautil-fix.diff | 17 ++++++++++++++---
 ladspa.changes        |  6 ------
 ladspa.spec           |  6 ++----
 4 files changed, 16 insertions(+), 24 deletions(-)
 delete mode 100644 blop-ladspa_dir.diff

diff --git a/blop-ladspa_dir.diff b/blop-ladspa_dir.diff
deleted file mode 100644
index 7b15002..0000000
--- a/blop-ladspa_dir.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/wavedata.c	2009-11-25 13:53:57.000000000 +0000
-+++ src/wavedata.c	2009-11-25 13:54:07.000000000 +0000
-@@ -38,7 +38,7 @@
- /* Get LADPSA_PATH, if available */
- 	ladspa_path = getenv("LADSPA_PATH");
- 	if (!ladspa_path)
--		ladspa_path = "/usr/lib/ladspa:/usr/local/lib/ladspa";
-+		ladspa_path = "/usr/lib/ladspa:/usr/local/lib/ladspa/usr/lib64/ladspa:/usr/local/lib64/ladspa";
- 
- 	start = ladspa_path;
- 	while (*start != '\0')
diff --git a/blop-wdautil-fix.diff b/blop-wdautil-fix.diff
index b654c82..9a1c037 100644
--- a/blop-wdautil-fix.diff
+++ b/blop-wdautil-fix.diff
@@ -1,5 +1,9 @@
---- src/wdatutil.c
-+++ src/wdatutil.c
+---
+ src/wdatutil.c |   18 +++++++++---------
+ 1 file changed, 9 insertions(+), 9 deletions(-)
+
+--- a/src/wdatutil.c
++++ b/src/wdatutil.c
 @@ -269,13 +269,13 @@
  /*
   * Fixed data and tables
@@ -21,7 +25,7 @@
  	fprintf (wdat_fp, "\n");
  /*
   * Sample data
-@@ -326,7 +326,7 @@
+@@ -326,13 +326,13 @@
  		fprintf (wdat_fp, "\n");
  	}
  
@@ -30,3 +34,10 @@
  	fprintf (wdat_fp, "\n");
  /*
   * Function to get Wavedata - the sample rate is needed to calculate
+  * frequencies and related things
+  */
+-	fprintf (wdat_fp, "int\n");
++	fprintf (wdat_fp, "static int\n");
+ 	fprintf (wdat_fp, "blop_get_%s (Wavedata * w, unsigned long sample_rate)\n", data_name);
+ 	fprintf (wdat_fp, "{\n");
+ 	fprintf (wdat_fp, "\tWavetable * t;\n");
diff --git a/ladspa.changes b/ladspa.changes
index c233e23..839bd24 100644
--- a/ladspa.changes
+++ b/ladspa.changes
@@ -1,9 +1,3 @@
--------------------------------------------------------------------
-Wed Nov 25 13:58:09 UTC 2009 - mseben@novell.com
-
-- added blop-ladspa_dir.diff to correct ladspa dir for 64 bit arch
-- corrected blop-wdautil-fix.diff (bnc#553647)
-
 -------------------------------------------------------------------
 Tue Nov 17 08:58:59 CET 2009 - tiwai@suse.de
 
diff --git a/ladspa.spec b/ladspa.spec
index 22caf89..afbf17b 100644
--- a/ladspa.spec
+++ b/ladspa.spec
@@ -92,8 +92,7 @@ Patch22:        alienwah-compile-fix.diff
 Patch23:        alienwah-float_complex.diff
 Patch25:        pvoc-0.1.10-depend-copts-fix.diff
 Patch26:        swh-nostatic-lib.diff
-Patch27:        blop-ladspa_dir.diff
-Patch28:        blop-wdautil-fix.diff
+Patch27:        blop-wdautil-fix.diff
 Url:            http://www.ladspa.org/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
@@ -151,8 +150,7 @@ Authors:
 (cd blop-%{blop_version}
 %patch5
 %patch6
-%patch27
-%patch28
+%patch27 -p1
 )
 (cd vcf-%{vcf_version}
 %patch7