Split the debian patch into logical changes

Drop unneeded sections, and refresh m68k fix.

5 files changed, 55 insertions, 90 deletions

diff --git a/debian/patches/01_debian-patch.diff b/debian/patches/01_debian-patch.diff
deleted file mode 100644
index 60e49cf..0000000
--- a/debian/patches/01_debian-patch.diff
+++ /dev/null
@@ -1,84 +0,0 @@
-01_debian-patch by Junichi Uekawa <dancer@debian.org>
-Debian modifications to ladspa-sdk
-Index: ladspa-sdk/src/makefile
-===================================================================
---- ladspa-sdk.orig/src/makefile	2009-06-05 13:50:20.000000000 +1000
-+++ ladspa-sdk/src/makefile	2009-06-05 13:54:46.000000000 +1000
-@@ -4,9 +4,9 @@
- #
- # Change these if you want to install somewhere else.
- 
--INSTALL_PLUGINS_DIR	=	/usr/lib/ladspa/
--INSTALL_INCLUDE_DIR	=	/usr/include/
--INSTALL_BINARY_DIR	=	/usr/bin/
-+INSTALL_PLUGINS_DIR	?=	/usr/lib/ladspa/
-+INSTALL_INCLUDE_DIR	?=	/usr/include/
-+INSTALL_BINARY_DIR	?=	/usr/bin/
- 
- ###############################################################################
- #
-@@ -15,7 +15,7 @@
- 
- INCLUDES	=	-I.
- LIBRARIES	=	-ldl -lm
--CFLAGS		=	$(INCLUDES) -Wall -Werror -O3 -fPIC
-+CFLAGS		=	$(INCLUDES) -O3 -fPIC
- CXXFLAGS	=	$(CFLAGS)
- PLUGINS		=	../plugins/amp.so				\
- 			../plugins/delay.so				\
-@@ -35,11 +35,11 @@
- 
- ../plugins/%.so:	plugins/%.c ladspa.h
- 	$(CC) $(CFLAGS) -o plugins/$*.o -c plugins/$*.c
--	$(LD) -o ../plugins/$*.so plugins/$*.o -shared
-+	$(LD) -lc $(LIBRARIES) -o ../plugins/$*.so plugins/$*.o -shared
- 
- ../plugins/%.so:	plugins/%.cpp ladspa.h
- 	$(CPP) $(CXXFLAGS) -o plugins/$*.o -c plugins/$*.cpp
--	$(CPP) -o ../plugins/$*.so plugins/$*.o -shared
-+	$(CPP) $(LIBRARIES) -o ../plugins/$*.so plugins/$*.o -shared
- 
- ###############################################################################
- #
-@@ -59,9 +59,9 @@
- 	@echo Test complete.
- 
- install:	targets
--	-mkdirhier $(INSTALL_PLUGINS_DIR)
--	-mkdirhier $(INSTALL_INCLUDE_DIR)
--	-mkdirhier $(INSTALL_BINARY_DIR)
-+	-mkdir -p $(INSTALL_PLUGINS_DIR)
-+	-mkdir -p $(INSTALL_INCLUDE_DIR)
-+	-mkdir -p $(INSTALL_BINARY_DIR)
- 	cp ../plugins/* $(INSTALL_PLUGINS_DIR)
- 	cp ladspa.h $(INSTALL_INCLUDE_DIR)
- 	cp ../bin/* $(INSTALL_BINARY_DIR)
-Index: ladspa-sdk/src/search.c
-===================================================================
---- ladspa-sdk.orig/src/search.c	2009-06-05 13:51:31.000000000 +1000
-+++ ladspa-sdk/src/search.c	2009-06-05 13:53:47.000000000 +1000
-@@ -99,10 +99,10 @@
- 
-   pcLADSPAPath = getenv("LADSPA_PATH");
-   if (!pcLADSPAPath) {
-+    pcLADSPAPath="/usr/lib/ladspa/";
-     fprintf(stderr,
- 	    "Warning: You do not have a LADSPA_PATH "
- 	    "environment variable set.\n");
--    return;
-   }
-   
-   pcStart = pcLADSPAPath;
-Index: ladspa-sdk/src/load.c
-===================================================================
---- ladspa-sdk.orig/src/load.c	2009-06-05 13:51:31.000000000 +1000
-+++ ladspa-sdk/src/load.c	2009-06-05 13:53:47.000000000 +1000
-@@ -54,6 +54,8 @@
-        to search. */
- 
-     pcLADSPAPath = getenv("LADSPA_PATH");
-+    if (!pcLADSPAPath)
-+      pcLADSPAPath="/usr/lib/ladspa";
-     
-     if (pcLADSPAPath) {
- 
diff --git a/debian/patches/01_no-mkdirhier.diff b/debian/patches/01_no-mkdirhier.diff
new file mode 100644
index 0000000..d424594
--- /dev/null
+++ b/debian/patches/01_no-mkdirhier.diff
@@ -0,0 +1,18 @@
+Use mkdir -p instead of mkdirhier to avoid build-dep on xutils-dev
+Index: ladspa-sdk/src/makefile
+===================================================================
+--- ladspa-sdk.orig/src/makefile	2009-06-05 14:49:37.000000000 +1000
++++ ladspa-sdk/src/makefile	2009-06-05 14:50:07.000000000 +1000
+@@ -59,9 +59,9 @@
+ 	@echo Test complete.
+ 
+ install:	targets
+-	-mkdirhier $(INSTALL_PLUGINS_DIR)
+-	-mkdirhier $(INSTALL_INCLUDE_DIR)
+-	-mkdirhier $(INSTALL_BINARY_DIR)
++	-mkdir -p $(INSTALL_PLUGINS_DIR)
++	-mkdir -p $(INSTALL_INCLUDE_DIR)
++	-mkdir -p $(INSTALL_BINARY_DIR)
+ 	cp ../plugins/* $(INSTALL_PLUGINS_DIR)
+ 	cp ladspa.h $(INSTALL_INCLUDE_DIR)
+ 	cp ../bin/* $(INSTALL_BINARY_DIR)
diff --git a/debian/patches/02_default-ladspa-path.diff b/debian/patches/02_default-ladspa-path.diff
new file mode 100644
index 0000000..05f5122
--- /dev/null
+++ b/debian/patches/02_default-ladspa-path.diff
@@ -0,0 +1,30 @@
+Use a default ladspa path instead of failing when LADSPA_PATH is undefined
+Index: ladspa-sdk/src/load.c
+===================================================================
+--- ladspa-sdk.orig/src/load.c	2009-06-05 14:52:05.000000000 +1000
++++ ladspa-sdk/src/load.c	2009-06-05 14:54:04.000000000 +1000
+@@ -54,6 +54,8 @@
+        to search. */
+ 
+     pcLADSPAPath = getenv("LADSPA_PATH");
++    if (!pcLADSPAPath)
++      pcLADSPAPath = "/usr/lib/ladspa";
+     
+     if (pcLADSPAPath) {
+ 
+Index: ladspa-sdk/src/search.c
+===================================================================
+--- ladspa-sdk.orig/src/search.c	2009-06-05 14:52:05.000000000 +1000
++++ ladspa-sdk/src/search.c	2009-06-05 14:52:57.000000000 +1000
+@@ -99,10 +99,10 @@
+ 
+   pcLADSPAPath = getenv("LADSPA_PATH");
+   if (!pcLADSPAPath) {
++    pcLADSPAPath = "/usr/lib/ladspa/";
+     fprintf(stderr,
+ 	    "Warning: You do not have a LADSPA_PATH "
+ 	    "environment variable set.\n");
+-    return;
+   }
+   
+   pcStart = pcLADSPAPath;
diff --git a/debian/patches/02_m68k_workaround.diff b/debian/patches/03_m68k_workaround.diff
index 4e8cde1..37669b3 100644
--- a/debian/patches/02_m68k_workaround.diff
+++ b/debian/patches/03_m68k_workaround.diff
@@ -3,14 +3,14 @@ m68k gcc ICE's with -O3, reduce to -O2.
 closes: #328285
 Index: ladspa-sdk/src/makefile
 ===================================================================
---- ladspa-sdk.orig/src/makefile	2009-06-05 13:54:46.000000000 +1000
-+++ ladspa-sdk/src/makefile	2009-06-05 13:56:53.000000000 +1000
+--- ladspa-sdk.orig/src/makefile	2009-06-14 13:48:36.000000000 +1000
++++ ladspa-sdk/src/makefile	2009-06-14 13:49:13.000000000 +1000
 @@ -15,7 +15,7 @@
  
  INCLUDES	=	-I.
  LIBRARIES	=	-ldl -lm
--CFLAGS		=	$(INCLUDES) -O3 -fPIC
-+CFLAGS		=	$(INCLUDES) -O2 -fPIC
+-CFLAGS		=	$(INCLUDES) -Wall -Werror -O3 -fPIC
++CFLAGS		=	$(INCLUDES) -Wall -Werror -O2 -fPIC
  CXXFLAGS	=	$(CFLAGS)
  PLUGINS		=	../plugins/amp.so				\
  			../plugins/delay.so				\
diff --git a/debian/patches/series b/debian/patches/series
index 4beea10..6619d71 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
-01_debian-patch.diff
-02_m68k_workaround.diff
+01_no-mkdirhier.diff
+02_default-ladspa-path.diff
+03_m68k_workaround.diff