[SCM] zynaddsubfx/master: deleted old patches

mira-guest at users.alioth.debian.org mira-guest at users.alioth.debian.org
Thu Aug 23 12:20:46 UTC 2012


The following commit has been merged in the master branch:
commit dd13398e585ebfcd53d2c05b5048e3c3c11759b3
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Thu Aug 23 14:19:59 2012 +0200

    deleted old patches

diff --git a/debian/patches/015_oss_and_jack.patch b/debian/patches/015_oss_and_jack.patch
deleted file mode 100644
index a9c7162..0000000
--- a/debian/patches/015_oss_and_jack.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -urN zynaddsubfx-2.4.0.orig/src/Makefile.inc zynaddsubfx-2.4.0/src/Makefile.inc
---- zynaddsubfx-2.4.0.orig/src/Makefile.inc	2005-04-27 20:21:35.000000000 -0400
-+++ zynaddsubfx-2.4.0/src/Makefile.inc	2007-12-16 20:10:02.000000000 -0500
-@@ -9,8 +9,8 @@
- FFTW_VERSION=3
- 
- #Assembler FLOAT to INT conversions
--ASM_F2I=YES
--#ASM_F2I=NO
-+#ASM_F2I=YES
-+ASM_F2I=NO
- 
- #Graphic user interface disable option (ZynAddSubFX will run only in text-mode)
- #DISABLE_GUI=YES
-@@ -28,8 +28,8 @@
- #it will try OSS if JACK fails. At runtime you can set the OSS by default by command-line
- #parameters (run 'zynaddsubfx --help' for help) 
- 
--#LINUX_AUDIOOUT=OSS_AND_JACK
--LINUX_AUDIOOUT=OSS
-+LINUX_AUDIOOUT=OSS_AND_JACK
-+#LINUX_AUDIOOUT=OSS
- #LINUX_AUDIOOUT=NONE
- #LINUX_AUDIOOUT=JACK
- #LINUX_AUDIOOUT=JACK_RT     JACK_RT support is broken
diff --git a/debian/patches/016_lash.patch b/debian/patches/016_lash.patch
deleted file mode 100644
index dc6274a..0000000
--- a/debian/patches/016_lash.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- zynaddsubfx-2.4.0/src/Makefile.inc	2009-08-28 00:16:49.000000000 -0300
-+++ tmp/zynaddsubfx-2.4.0/src/Makefile.inc	2009-08-28 00:13:16.000000000 -0300
-@@ -43,8 +43,8 @@
- #LINUX_DSSI=YES
- 
- #Next line sets if the LASH session handler will be used
--#LINUX_USE_LASH=YES
--LINUX_USE_LASH=NO
-+LINUX_USE_LASH=YES
-+#LINUX_USE_LASH=NO
- 
- # W I N D O W S   C O N F I G U R A T I O N
- 
diff --git a/debian/patches/01_kfreebsd_fix.patch b/debian/patches/01_kfreebsd_fix.patch
deleted file mode 100644
index 13154f8..0000000
--- a/debian/patches/01_kfreebsd_fix.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- zynaddsubfx-2.4.0/src/Makefile.inc	2007-03-21 09:02:08.530426000 +0100
-+++ zynaddsubfx-2.4.0/src/Makefile.inc	2007-03-21 09:04:07.000000000 +0100
-@@ -18,7 +18,12 @@
- 
- # L I N U X   C O N F I G U R A T I O N
- #Next line sets the midi input. It can be "ALSA", "OSS" or "NONE".
-+ifeq ($(shell uname -s),Linux)
- LINUX_MIDIIN=ALSA
-+else
-+# Fallback for GNU/k*BSD
-+LINUX_MIDIIN=OSS
-+endif
- #LINUX_MIDIIN=OSS
- #LINUX_MIDIIN=NONE
diff --git a/debian/patches/02_makefile.patch b/debian/patches/02_makefile.patch
deleted file mode 100644
index cc4872c..0000000
--- a/debian/patches/02_makefile.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -urN zynaddsubfx-2.4.0.orig/src/Makefile zynaddsubfx-2.4.0/src/Makefile
---- zynaddsubfx-2.4.0.orig/src/Makefile	2005-04-27 19:45:52.000000000 -0400
-+++ zynaddsubfx-2.4.0/src/Makefile	2007-12-16 20:04:06.000000000 -0500
-@@ -125,3 +125,6 @@
- 	rm -f */*.o *.o
- 	$(MAKE) -C UI $@
- 
-+install:
-+	install -D zynaddsubfx $(DESTDIR)/usr/bin/zynaddsubfx
-+#	install -d -m 755 ../banks $(DESTDIR)/usr/share/zynaddsubfx/
-
diff --git a/debian/patches/03_main.patch b/debian/patches/03_main.patch
deleted file mode 100644
index 05471fa..0000000
--- a/debian/patches/03_main.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- zynaddsubfx-2.4.0/src/main.cpp	2009-08-30 18:42:39.000000000 -0300
-+++ tmp/zynaddsubfx-2.4.0/src/main.cpp	2009-08-30 18:53:12.000000000 -0300
-@@ -107,7 +107,7 @@
-  */
- void set_realtime()
- {
--#ifdef OS_LINUX
-+#if 0
-     sched_param sc;
- 
-     sc.sched_priority=50;
-@@ -283,7 +283,7 @@
-  */
- 
- 
--void initprogram()
-+void initprogram(int noui)
- {
-     cerr.precision(1);
-     cerr << std::fixed;
-@@ -341,6 +341,8 @@
- #endif
- #ifndef DISABLE_GUI
-     ui=new MasterUI(master,&Pexitprogram);
-+    if (noui=0)
-+       ui=new MasterUI(master,&Pexitprogram);
- #endif
- };
- 
-@@ -575,7 +577,7 @@
- 
-     //---------
- 
--    initprogram();
-+    initprogram(noui);
- 
- #ifdef USE_LASH
- #ifdef ALSAMIDIIN
diff --git a/debian/patches/05_partui.patch b/debian/patches/05_partui.patch
deleted file mode 100644
index 472735c..0000000
--- a/debian/patches/05_partui.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Index: zynaddsubfx-2.4.0/src/UI/PartUI.fl
-===================================================================
---- zynaddsubfx-2.4.0.orig/src/UI/PartUI.fl	2011-07-10 11:57:12.000000000 -0400
-+++ zynaddsubfx-2.4.0/src/UI/PartUI.fl	2011-07-10 12:05:38.000000000 -0400
-@@ -85,7 +85,15 @@
- 
- class PartUI_ {} {
-   Function {showparameters(int kititem,int engine)} {return_type virtual
--  } {}
-+  } {
-+    comment {This body intentionally left blank.} {in_source not_in_header
-+    }
-+  }
-+  Function {~PartUI_()} {return_type virtual
-+  } {
-+    comment {This body intentionally left blank.} {in_source not_in_header
-+    }
-+  }
- } 
- 
- class PartKitItem {: {public Fl_Group}
diff --git a/debian/patches/06_bankui.patch b/debian/patches/06_bankui.patch
deleted file mode 100644
index 555d0fc..0000000
--- a/debian/patches/06_bankui.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Index: zynaddsubfx-2.4.0/src/UI/BankUI.fl
-===================================================================
---- zynaddsubfx-2.4.0.orig/src/UI/BankUI.fl	2011-07-10 11:57:12.000000000 -0400
-+++ zynaddsubfx-2.4.0/src/UI/BankUI.fl	2011-07-10 12:02:57.000000000 -0400
-@@ -32,9 +32,17 @@
- 
- class BankProcess_ {} {
-   Function {process()} {open return_type {virtual void}
--  } {}
-+  } {
-+    comment {This body intentionally left blank.} {in_source not_in_header
-+    }
-+  }
-   decl {Bank *bank;} {public
-   }
-+  Function {~BankProcess_()} {return_type virtual
-+  } {
-+    comment {This body intentionally left blank.} {in_source not_in_header
-+    }
-+  }
- } 
- 
- class BankSlot {open : {public Fl_Button,BankProcess_}
diff --git a/debian/patches/07_ossaudiooutput.patch b/debian/patches/07_ossaudiooutput.patch
deleted file mode 100644
index b09a691..0000000
--- a/debian/patches/07_ossaudiooutput.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- zynaddsubfx-2.4.0/src/Output/OSSaudiooutput.cpp	2009-08-27 22:48:04.000000000 -0300
-+++ tmp/zynaddsubfx-2.4.0/src/Output/OSSaudiooutput.cpp	2009-08-27 22:43:47.000000000 -0300
-@@ -34,6 +34,21 @@
- #include "../globals.h"
- using namespace std;
- 
-+#if __BYTE_ORDER ==  __BIG_ENDIAN
-+/* borrowed from glib2 */
-+#define SHORT_SWAP_LE_BE(val)  ((short) ( \
-+    (short) ((short) (val) >> 8) |     \
-+    (short) ((short) (val) << 8)))
-+
-+void swap_endian(short *data, int length)
-+{
-+       int i;
-+       for (i = 0; i < length; i += 1, data++)
-+               *data = SHORT_SWAP_LE_BE(*data);
-+}
-+#endif
-+
-+
- OSSaudiooutput::OSSaudiooutput()
- {
-     int i;
-@@ -84,6 +99,9 @@
-         smps[i*2]=(short int) (l*32767.0);
-         smps[i*2+1]=(short int) (r*32767.0);
-     };
-+#if __BYTE_ORDER == __BIG_ENDIAN
-+    swap_endian(smps, SOUND_BUFFER_SIZE*4);
-+#endif
-     write(snd_handle,smps,SOUND_BUFFER_SIZE*4);// *2 because is 16 bit, again * 2 because is stereo
- };
- 
diff --git a/debian/patches/08_jackaudiooutput.patch b/debian/patches/08_jackaudiooutput.patch
deleted file mode 100644
index e1f926f..0000000
--- a/debian/patches/08_jackaudiooutput.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- zynaddsubfx-2.4.0/src/Output/JACKaudiooutput.cpp	2009-08-27 23:45:00.000000000 -0300
-+++ tmp/zynaddsubfx-2.4.0/src/Output/JACKaudiooutput.cpp	2009-08-27 23:50:19.000000000 -0300
-@@ -36,6 +36,7 @@
- bool JACKaudiooutputinit(Master *master_)
- {
-     jackmaster=master_;
-+    const char **ports;
-     jackclient=0;
- 
-     for (int i=0;i<15;i++) {
-@@ -52,7 +53,8 @@
- 
-     fprintf(stderr,"Internal SampleRate   = %d\nJack Output SampleRate= %d\n",SAMPLE_RATE,jack_get_sample_rate(jackclient));
-     if ((unsigned int)jack_get_sample_rate(jackclient)!=(unsigned int) SAMPLE_RATE)
--        fprintf(stderr,"It is recomanded that the both samplerates to be equal.\n");
-+	fprintf(stderr,"It is recommended that both of the samplerates be equal.\n");
-+
- 
-     jack_set_process_callback(jackclient,jackprocess,0);
-     jack_set_sample_rate_callback(jackclient,jacksrate,0);
-@@ -74,6 +76,15 @@
-     jack_connect(jackclient,jack_port_name(outport_left),"alsa_pcm:out_1");
-     jack_connect(jackclient,jack_port_name(outport_right),"alsa_pcm:out_2");
-      */
-+
-+    if ((ports = jack_get_ports (jackclient, NULL, NULL, JackPortIsPhysical|JackPortIsInput)) == NULL)
-+       fprintf(stderr,"Cannot connect to jack output, you may hear no sound\n");       else {
-+      if (jack_connect(jackclient,jack_port_name(outport_left),ports[0]))
-+       fprintf(stderr,"Cannot connect to left output port\n");
-+      if (jack_connect(jackclient,jack_port_name(outport_right),ports[1]))
-+       fprintf(stderr,"Cannot connect to right output port\n");
-+    }
-+
-     return(true);
- };
- 
diff --git a/debian/patches/09_fluid_1.3.patch b/debian/patches/09_fluid_1.3.patch
deleted file mode 100644
index 7d88583..0000000
--- a/debian/patches/09_fluid_1.3.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Index: zynaddsubfx-2.4.0/src/UI/OscilGenUI.fl
-===================================================================
---- zynaddsubfx-2.4.0.orig/src/UI/OscilGenUI.fl	2011-07-10 12:07:11.000000000 -0400
-+++ zynaddsubfx-2.4.0/src/UI/OscilGenUI.fl	2011-07-10 12:08:06.000000000 -0400
-@@ -129,7 +129,11 @@
- 
- class PSlider {: {public Fl_Slider}
- } {
--  Function {PSlider(int x,int y, int w, int h, const char *label=0):Fl_Slider(x,y,w,h,label)} {} {}
-+  Function {PSlider(int x,int y, int w, int h, const char *label=0):Fl_Slider(x,y,w,h,label)} {
-+  } {
-+    comment {This body intentionally left blank.} {in_source not_in_header
-+    }
-+  }
-   Function {handle(int event)} {return_type int
-   } {
-     code {int X=x(),Y=y(),W=w(),H=h();
-Index: zynaddsubfx-2.4.0/src/UI/PresetsUI.fl
-===================================================================
---- zynaddsubfx-2.4.0.orig/src/UI/PresetsUI.fl	2011-07-10 12:07:21.000000000 -0400
-+++ zynaddsubfx-2.4.0/src/UI/PresetsUI.fl	2011-07-10 12:08:49.000000000 -0400
-@@ -16,9 +16,15 @@
- 
- class PresetsUI_ {} {
-   Function {refresh()} {open return_type {virtual void}
--  } {}
-+  } {
-+    comment {This body intentionally left blank.} {in_source not_in_header
-+    }
-+  }
-   Function {~PresetsUI_()} {open return_type virtual
--  } {}
-+  } {
-+    comment {This body intentionally left blank.} {in_source not_in_header
-+    }
-+  }
- } 
- 
- class PresetsUI {} {
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 0e69e62..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,9 +0,0 @@
-#01_kfreebsd_fix.patch
-#015_oss_and_jack.patch
-#02_makefile.patch
-#03_main.patch
-#05_partui.patch
-#06_bankui.patch
-#07_ossaudiooutput.patch
-#08_jackaudiooutput.patch
-#09_fluid_1.3.patch

-- 
zynaddsubfx packaging



More information about the pkg-multimedia-commits mailing list