From de9aa7cb1bc1caf45d345c6a8cd29fa5144e69ff90a75bba6844cd221dbfebc6 Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@suse.com>
Date: Tue, 26 Jan 2010 08:52:15 +0000
Subject: [PATCH] Accepting request 30469 from home:plater

Copy from home:plater/ladspa via accept of submit request 30469 revision 32.
Request was accepted with message:
ok

OBS-URL: https://build.opensuse.org/request/show/30469
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/ladspa?expand=0&rev=11
---
 ladspa-devel.spec   |  1 +
 ladspa.changes      |  5 +++++
 ladspa.spec         | 22 +++++++++++++---------
 swh-configure.patch | 30 ++++++++++++++++++++++++++++++
 swh-libblo.dif      | 12 ++++++++++++
 5 files changed, 61 insertions(+), 9 deletions(-)
 create mode 100644 swh-configure.patch
 create mode 100644 swh-libblo.dif

diff --git a/ladspa-devel.spec b/ladspa-devel.spec
index 5e49bf2..872d908 100644
--- a/ladspa-devel.spec
+++ b/ladspa-devel.spec
@@ -28,6 +28,7 @@ Source:         ladspa_sdk_1.13.tar.bz2
 Url:            http://www.ladspa.org/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildArch:      noarch
+Provides:	ladspa-devel > 1.12.code10.3.1
 
 %description
 This package contains include files to develop LADSPA plugins.
diff --git a/ladspa.changes b/ladspa.changes
index f99b378..15b3c23 100644
--- a/ladspa.changes
+++ b/ladspa.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Jan 26 07:21:56 UTC 2010 - davejplater@gmail.com
+
+- Fixed swt lib build with swh-liblo.dif & swh-configure.patch
+
 -------------------------------------------------------------------
 Fri Jan 22 08:52:05 UTC 2010 - davejplater@gmail.com
 
diff --git a/ladspa.spec b/ladspa.spec
index f93ae01..e7d4b9c 100644
--- a/ladspa.spec
+++ b/ladspa.spec
@@ -43,6 +43,7 @@ License:        LGPLv2.1+
 Group:          Development/Libraries/C and C++
 AutoReq:        on
 Autoprov:       off
+Provides:	ladspa > 1.12.code10.3.1
 Source1:        ladspa_sdk_1.13.tar.bz2
 Source2:        cmt_src_1.15.tar.bz2
 Source3:        swh-plugins-%{swh_version}.tar.bz2
@@ -86,8 +87,8 @@ Patch15:        swh-readonly.dif
 Patch16:        pvoc-compile-fix.dif
 Patch17:        swh-0.4.13-gcc4-fix.diff
 Patch18:        sooperlooper-0.93-gcc4-fix.diff
-#Patch20:        pvoc-0.1.10-gcc4-fix.diff
-#Patch21:        ladspa_sdk-compile-fix.diff
+Patch20:	swh-libblo.dif
+Patch21:        swh-configure.patch
 Patch22:        alienwah-compile-fix.diff
 Patch23:        alienwah-float_complex.diff
 Patch25:        pvoc-0.1.10-depend-copts-fix.diff
@@ -129,14 +130,16 @@ Authors:
 #
 %setup -q -c -n ladspa -T -a 1 -a 2 -a 3 -a 6 -a 7 -a 8 -a 9 -a 10 -a 11 -a 12 -a 13 -a 14 -a 15 -a 16 -a 17 -a 18 -a 19 -a 20 -a 21 -a 22 -a 23 -a 24
 %patch
-#(cd ladspa_sdk
-#%%patch21
-#)
 (cd swh-plugins-%{swh_version}
 %patch1
 %patch15
 %patch17
 %patch26 -p1
+%patch20 -p1
+touch config.rpath
+./autogen.sh --prefix=%{_prefix}
+%{?suse_update_config:%{suse_update_config -f}}
+%patch21 -p1
 )
 (cd cmt
 %patch2
@@ -180,11 +183,8 @@ Authors:
 )
 (cd pvoc-%{pvoc_version}
 %patch16
-#%%patch20
 %patch25
 )
-# (cd caps-%{caps_version}
-# )
 
 %build
 # This package failed when testing with -Wl,-as-needed being default.
@@ -200,7 +200,10 @@ make CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -fPIC -ggdb" targets
 cd ../..
 # SWH plugins
 cd swh-plugins-%{swh_version}
+%if %suse_version <= 1100
 autoreconf --install --force
+%endif
+#./autogen.sh --prefix=%{_prefix} --libdir=%{_libdir}
 CFLAGS="$RPM_OPT_FLAGS -fPIC -ggdb -DPIC -fno-strict-aliasing" \
 ./configure --prefix=%{_prefix}
 make CFLAGS="$RPM_OPT_FLAGS -fPIC -ggdb -DPIC -fno-strict-aliasing"
@@ -333,7 +336,8 @@ done
 mkdir -p "$RPM_BUILD_ROOT"%{_bindir}
 install -c -m 755 vlevel-%{vlevel_version}/vlevel-bin "$RPM_BUILD_ROOT"%{_bindir}
 # additional RDF files
-cp %{SOURCE30} $RPM_BUILD_ROOT%{_datadir}/ladspa/rdf
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/ladspa/rdf
+cp -p %{SOURCE30} $RPM_BUILD_ROOT%{_datadir}/ladspa/rdf
 cp tap-plugins-%{tap_version}/*.rdf $RPM_BUILD_ROOT%{_datadir}/ladspa/rdf
 # install documents
 mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}/{cmt,swh,vcf}
diff --git a/swh-configure.patch b/swh-configure.patch
new file mode 100644
index 0000000..22cc156
--- /dev/null
+++ b/swh-configure.patch
@@ -0,0 +1,30 @@
+Index: swh-plugins-0.4.15/configure
+===================================================================
+--- swh-plugins-0.4.15.orig/configure
++++ swh-plugins-0.4.15/configure
+@@ -811,6 +811,7 @@ GMSGFMT
+ MSGFMT
+ GETTEXT_MACRO_VERSION
+ USE_NLS
++MKINSTALLDIRS
+ CPP
+ OTOOL64
+ OTOOL
+@@ -12121,6 +12122,17 @@ fi
+ 
+ ALL_LINGUAS="en_GB"
+ 
++        MKINSTALLDIRS=
++  if test -n "$ac_aux_dir"; then
++    case "$ac_aux_dir" in
++      /*) MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" ;;
++      *) MKINSTALLDIRS="\$(top_builddir)/$ac_aux_dir/mkinstalldirs" ;;
++    esac
++  fi
++  if test -z "$MKINSTALLDIRS"; then
++    MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
++  fi
++
+   { $as_echo "$as_me:$LINENO: checking whether NLS is requested" >&5
+ $as_echo_n "checking whether NLS is requested... " >&6; }
+     # Check whether --enable-nls was given.
diff --git a/swh-libblo.dif b/swh-libblo.dif
new file mode 100644
index 0000000..76d77da
--- /dev/null
+++ b/swh-libblo.dif
@@ -0,0 +1,12 @@
+Index: swh-plugins-0.4.15/configure.in
+===================================================================
+--- swh-plugins-0.4.15.orig/configure.in
++++ swh-plugins-0.4.15/configure.in
+@@ -49,6 +50,7 @@ AC_PROG_LIBTOOL
+ 
+ AC_LANG_C
+ AC_PROG_CC
++AM_PROG_CC_C_O
+ AC_REQUIRE_CPP
+ ALL_LINGUAS="en_GB"
+ AM_GNU_GETTEXT([external])