[SCM] stk/master: Convert patches to gbp pq format

fsateler at users.alioth.debian.org fsateler at users.alioth.debian.org
Fri Nov 27 23:49:37 UTC 2015 

The following commit has been merged in the master branch:
commit db28ed085243bdce11bb6bb87cae8ae94472f40d
Author: Felipe Sateler <fsateler at debian.org>
Date:   Mon Sep 21 09:23:16 2015 -0300

    Convert patches to gbp pq format

diff --git a/debian/patches/01-makefile.patch b/debian/patches/0001-Provide-an-install-target-to-the-src-target.patch
similarity index 78%
rename from debian/patches/01-makefile.patch
rename to debian/patches/0001-Provide-an-install-target-to-the-src-target.patch
index 395de14..0f9d466 100644
--- a/debian/patches/01-makefile.patch
+++ b/debian/patches/0001-Provide-an-install-target-to-the-src-target.patch
@@ -1,7 +1,47 @@
-Origin: Debian
-Description: Provide an install target to the src target.
- Add SONAME to shared libraries.
-Forwarded: no
+From: Felipe Sateler <fsateler at debian.org>
+Date: Mon, 21 Sep 2015 09:16:26 -0300
+Subject: Provide an install target to the src target.
+
+Add SONAME to shared libraries.
+---
+ configure       |  4 ++--
+ configure.ac    |  4 ++--
+ src/Makefile.in | 13 +++++++------
+ 3 files changed, 11 insertions(+), 10 deletions(-)
+
+diff --git a/configure b/configure
+index 8a1b931..0119ccd 100755
+--- a/configure
++++ b/configure
+@@ -4495,9 +4495,9 @@ case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
+ 
+ sharedlib="libstk.so"
+ 
+-sharedname="libstk.so.\$(RELEASE)"
++sharedname="libstk.so.\$(MAJOR)"
+ 
+-libflags="-shared -Wl,-soname,\$(SHAREDLIB).\$(MAJOR) -o \$(SHAREDLIB).\$(RELEASE)"
++libflags="-shared -Wl,-soname,\$(SHAREDLIB).\$(MAJOR) -o \$(SHAREDLIB).\$(MAJOR).\$(RELEASE)"
+ 
+ case $host in
+   *-apple*)
+diff --git a/configure.ac b/configure.ac
+index 0616428..7cd204f 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -112,8 +112,8 @@ CXXFLAGS="$CXXFLAGS $cxxflag"
+ AC_CANONICAL_HOST
+ 
+ AC_SUBST( sharedlib, ["libstk.so"] )
+-AC_SUBST( sharedname, ["libstk.so.\$(RELEASE)"] )
+-AC_SUBST( libflags, ["-shared -Wl,-soname,\$(SHAREDLIB).\$(MAJOR) -o \$(SHAREDLIB).\$(RELEASE)"] )
++AC_SUBST( sharedname, ["libstk.so.\$(MAJOR)"] )
++AC_SUBST( libflags, ["-shared -Wl,-soname,\$(SHAREDLIB).\$(MAJOR) -o \$(SHAREDLIB).\$(MAJOR).\$(RELEASE)"] )
+ case $host in
+   *-apple*)
+   AC_SUBST( sharedlib, ["libstk.dylib"] )
+diff --git a/src/Makefile.in b/src/Makefile.in
+index 64da6bf..021e982 100644
 --- a/src/Makefile.in
 +++ b/src/Makefile.in
 @@ -3,7 +3,7 @@
@@ -44,30 +84,3 @@ Forwarded: no
 -	$(RM) Makefile
 \ No newline at end of file
 +	$(RM) Makefile
---- a/configure
-+++ b/configure
-@@ -4495,9 +4495,9 @@ case $host_os in *\ *) host_os=`echo "$h
- 
- sharedlib="libstk.so"
- 
--sharedname="libstk.so.\$(RELEASE)"
-+sharedname="libstk.so.\$(MAJOR)"
- 
--libflags="-shared -Wl,-soname,\$(SHAREDLIB).\$(MAJOR) -o \$(SHAREDLIB).\$(RELEASE)"
-+libflags="-shared -Wl,-soname,\$(SHAREDLIB).\$(MAJOR) -o \$(SHAREDLIB).\$(MAJOR).\$(RELEASE)"
- 
- case $host in
-   *-apple*)
---- a/configure.ac
-+++ b/configure.ac
-@@ -112,8 +112,8 @@ CXXFLAGS="$CXXFLAGS $cxxflag"
- AC_CANONICAL_HOST
- 
- AC_SUBST( sharedlib, ["libstk.so"] )
--AC_SUBST( sharedname, ["libstk.so.\$(RELEASE)"] )
--AC_SUBST( libflags, ["-shared -Wl,-soname,\$(SHAREDLIB).\$(MAJOR) -o \$(SHAREDLIB).\$(RELEASE)"] )
-+AC_SUBST( sharedname, ["libstk.so.\$(MAJOR)"] )
-+AC_SUBST( libflags, ["-shared -Wl,-soname,\$(SHAREDLIB).\$(MAJOR) -o \$(SHAREDLIB).\$(MAJOR).\$(RELEASE)"] )
- case $host in
-   *-apple*)
-   AC_SUBST( sharedlib, ["libstk.dylib"] )
diff --git a/debian/patches/02-stk-demo.patch b/debian/patches/0002-Rename-demo-to-stk-demo.patch
similarity index 72%
rename from debian/patches/02-stk-demo.patch
rename to debian/patches/0002-Rename-demo-to-stk-demo.patch
index 6843927..b08158d 100644
--- a/debian/patches/02-stk-demo.patch
+++ b/debian/patches/0002-Rename-demo-to-stk-demo.patch
@@ -1,3 +1,14 @@
+From: Felipe Sateler <fsateler at debian.org>
+Date: Mon, 21 Sep 2015 09:20:07 -0300
+Subject: Rename demo to stk-demo
+
+---
+ Makefile.in               | 2 +-
+ projects/demo/Makefile.in | 6 +++---
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index f4f04ec..5afd13e 100644
 --- a/Makefile.in
 +++ b/Makefile.in
 @@ -6,7 +6,7 @@ REALTIME = @realtime@
@@ -9,6 +20,8 @@
  ifeq ($(REALTIME),yes)
  	cd projects/effects && $(MAKE) libeffects
  	cd projects/ragamatic && $(MAKE) libragamat
+diff --git a/projects/demo/Makefile.in b/projects/demo/Makefile.in
+index 3955bf5..7278730 100644
 --- a/projects/demo/Makefile.in
 +++ b/projects/demo/Makefile.in
 @@ -1,7 +1,7 @@
diff --git a/debian/patches/03-system_rtaudio_rtmidi.patch b/debian/patches/0003-Link-against-system-s-shared-copies-of-rtaudio-and-r.patch
similarity index 89%
rename from debian/patches/03-system_rtaudio_rtmidi.patch
rename to debian/patches/0003-Link-against-system-s-shared-copies-of-rtaudio-and-r.patch
index 6f04b3f..2afa514 100644
--- a/debian/patches/03-system_rtaudio_rtmidi.patch
+++ b/debian/patches/0003-Link-against-system-s-shared-copies-of-rtaudio-and-r.patch
@@ -1,30 +1,62 @@
-Description: Link against system's shared copies of rtaudio and rtmidi.
-Author: Alessio Treglia <alessio at debian.org>
+From: Alessio Treglia <alessio at debian.org>
+Date: Mon, 21 Sep 2015 09:20:43 -0300
+Subject: Link against system's shared copies of rtaudio and rtmidi.
+
 Forwarded: no
---- a/src/Makefile.in
-+++ b/src/Makefile.in
-@@ -52,7 +52,8 @@ LIBS     = @LIBS@
+---
+ projects/demo/Makefile.in        |  3 ++-
+ projects/effects/Makefile.in     |  3 ++-
+ projects/eguitar/Makefile.in     |  3 ++-
+ projects/examples/Makefile.in    | 52 ++++++++++++++++++++--------------------
+ projects/examples/libMakefile.in |  1 +
+ projects/ragamatic/Makefile.in   |  3 ++-
+ src/Makefile.in                  |  3 ++-
+ 7 files changed, 37 insertions(+), 31 deletions(-)
+
+diff --git a/projects/demo/Makefile.in b/projects/demo/Makefile.in
+index 7278730..1ec932d 100644
+--- a/projects/demo/Makefile.in
++++ b/projects/demo/Makefile.in
+@@ -40,7 +40,8 @@ LIBRARY = @LIBS@
+ REALTIME = @realtime@
+ ifeq ($(REALTIME),yes)
+   PROGRAMS += demo
+-	OBJECTS += RtMidi.o RtAudio.o Thread.o Mutex.o Socket.o TcpServer.o @objects@
++	OBJECTS += Thread.o Mutex.o Socket.o TcpServer.o @objects@
++	LIBRARY += -lrtaudio -lrtmidi
+ endif
  
+ RAWWAVES = @rawwaves@
+diff --git a/projects/effects/Makefile.in b/projects/effects/Makefile.in
+index 59ba62c..0fd65a2 100644
+--- a/projects/effects/Makefile.in
++++ b/projects/effects/Makefile.in
+@@ -29,7 +29,8 @@ LIBRARY = @LIBS@
  REALTIME = @realtime@
  ifeq ($(REALTIME),yes)
--	OBJECTS += RtMidi.o RtAudio.o RtWvOut.o RtWvIn.o InetWvOut.o InetWvIn.o Thread.o Mutex.o Socket.o TcpClient.o TcpServer.o UdpSocket.o @objects@
-+	OBJECTS += RtWvOut.o RtWvIn.o InetWvOut.o InetWvIn.o Thread.o Mutex.o Socket.o TcpClient.o TcpServer.o UdpSocket.o @objects@
-+	LIBS += -lrtaudio -lrtmidi
+   PROGRAMS += effects
+-	OBJECTS += RtMidi.o RtAudio.o Thread.o Mutex.o Socket.o TcpServer.o @objects@
++	OBJECTS += Thread.o Mutex.o Socket.o TcpServer.o @objects@
++	LIBRARY += -lrtaudio -lrtmidi
  endif
  
- BUILD_STATIC = @build_static@
---- a/projects/demo/Makefile.in
-+++ b/projects/demo/Makefile.in
-@@ -40,7 +40,8 @@ LIBRARY = @LIBS@
+ RAWWAVES = @rawwaves@
+diff --git a/projects/eguitar/Makefile.in b/projects/eguitar/Makefile.in
+index 9684724..806e4b2 100644
+--- a/projects/eguitar/Makefile.in
++++ b/projects/eguitar/Makefile.in
+@@ -29,7 +29,8 @@ LIBRARY = @LIBS@
  REALTIME = @realtime@
  ifeq ($(REALTIME),yes)
-   PROGRAMS += demo
+   PROGRAMS += eguitar
 -	OBJECTS += RtMidi.o RtAudio.o Thread.o Mutex.o Socket.o TcpServer.o @objects@
 +	OBJECTS += Thread.o Mutex.o Socket.o TcpServer.o @objects@
 +	LIBRARY += -lrtaudio -lrtmidi
  endif
  
  RAWWAVES = @rawwaves@
+diff --git a/projects/examples/Makefile.in b/projects/examples/Makefile.in
+index 0b99516..aa102c9 100644
 --- a/projects/examples/Makefile.in
 +++ b/projects/examples/Makefile.in
 @@ -56,26 +56,26 @@ distclean: clean
@@ -66,7 +98,7 @@ Forwarded: no
  
  inetOut: inetOut.cpp Stk.o FileRead.o FileWvIn.o InetWvOut.o Socket.o TcpClient.o UdpSocket.o Thread.o Mutex.o
  	$(CC) $(LDFLAGS) $(CFLAGS) $(DEFS) -o inetOut inetOut.cpp $(OBJECT_PATH)/Stk.o $(OBJECT_PATH)/FileRead.o $(OBJECT_PATH)/FileWvIn.o $(OBJECT_PATH)/Socket.o $(OBJECT_PATH)/TcpClient.o $(OBJECT_PATH)/UdpSocket.o $(OBJECT_PATH)/Thread.o $(OBJECT_PATH)/Mutex.o $(OBJECT_PATH)/InetWvOut.o $(LIBRARY)
-@@ -83,26 +83,26 @@ inetOut: inetOut.cpp Stk.o FileRead.o Fi
+@@ -83,26 +83,26 @@ inetOut: inetOut.cpp Stk.o FileRead.o FileWvIn.o InetWvOut.o Socket.o TcpClient.
  sineosc: sineosc.cpp Stk.o FileRead.o FileWvIn.o FileLoop.o FileWrite.o FileWvOut.o
  	$(CC) $(LDFLAGS) $(CFLAGS) $(DEFS) -o sineosc sineosc.cpp $(OBJECT_PATH)/Stk.o $(OBJECT_PATH)/FileWrite.o $(OBJECT_PATH)/FileRead.o $(OBJECT_PATH)/FileWvIn.o $(OBJECT_PATH)/FileWvOut.o $(OBJECT_PATH)/FileLoop.o $(LIBRARY)
  
@@ -107,18 +139,20 @@ Forwarded: no
 -	$(CC) $(LDFLAGS) $(CFLAGS) $(DEFS) -o grains grains.cpp $(OBJECT_PATH)/Stk.o $(OBJECT_PATH)/Granulate.o $(OBJECT_PATH)/Noise.o $(OBJECT_PATH)/FileRead.o $(OBJECT_PATH)/RtAudio.o $(LIBRARY)
 +grains: grains.cpp Stk.o Granulate.o Noise.o FileRead.o
 +	$(CC) $(LDFLAGS) $(CFLAGS) $(DEFS) -o grains grains.cpp $(OBJECT_PATH)/Stk.o $(OBJECT_PATH)/Granulate.o $(OBJECT_PATH)/Noise.o $(OBJECT_PATH)/FileRead.o $(LIBRARY) -lrtaudio
---- a/projects/effects/Makefile.in
-+++ b/projects/effects/Makefile.in
-@@ -29,7 +29,8 @@ LIBRARY = @LIBS@
+diff --git a/projects/examples/libMakefile.in b/projects/examples/libMakefile.in
+index cc5706f..8241bc6 100644
+--- a/projects/examples/libMakefile.in
++++ b/projects/examples/libMakefile.in
+@@ -19,6 +19,7 @@ LIBRARY = @LIBS@
  REALTIME = @realtime@
  ifeq ($(REALTIME),yes)
-   PROGRAMS += effects
--	OBJECTS += RtMidi.o RtAudio.o Thread.o Mutex.o Socket.o TcpServer.o @objects@
-+	OBJECTS += Thread.o Mutex.o Socket.o TcpServer.o @objects@
-+	LIBRARY += -lrtaudio -lrtmidi
+   PROGRAMS += audioprobe midiprobe duplex play record inetIn inetOut rtsine crtsine bethree controlbee threebees playsmf grains
++  LIBRARY += -lrtaudio -lrtmidi
  endif
  
  RAWWAVES = @rawwaves@
+diff --git a/projects/ragamatic/Makefile.in b/projects/ragamatic/Makefile.in
+index 3c078f4..6426909 100644
 --- a/projects/ragamatic/Makefile.in
 +++ b/projects/ragamatic/Makefile.in
 @@ -30,7 +30,8 @@ LIBRARY = @LIBS@
@@ -131,25 +165,17 @@ Forwarded: no
  endif
  
  RAWWAVES = @rawwaves@
---- a/projects/examples/libMakefile.in
-+++ b/projects/examples/libMakefile.in
-@@ -19,6 +19,7 @@ LIBRARY = @LIBS@
- REALTIME = @realtime@
- ifeq ($(REALTIME),yes)
-   PROGRAMS += audioprobe midiprobe duplex play record inetIn inetOut rtsine crtsine bethree controlbee threebees playsmf grains
-+  LIBRARY += -lrtaudio -lrtmidi
- endif
+diff --git a/src/Makefile.in b/src/Makefile.in
+index 021e982..c019835 100644
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -52,7 +52,8 @@ LIBS     = @LIBS@
  
- RAWWAVES = @rawwaves@
---- a/projects/eguitar/Makefile.in
-+++ b/projects/eguitar/Makefile.in
-@@ -29,7 +29,8 @@ LIBRARY = @LIBS@
  REALTIME = @realtime@
  ifeq ($(REALTIME),yes)
-   PROGRAMS += eguitar
--	OBJECTS += RtMidi.o RtAudio.o Thread.o Mutex.o Socket.o TcpServer.o @objects@
-+	OBJECTS += Thread.o Mutex.o Socket.o TcpServer.o @objects@
-+	LIBRARY += -lrtaudio -lrtmidi
+-	OBJECTS += RtMidi.o RtAudio.o RtWvOut.o RtWvIn.o InetWvOut.o InetWvIn.o Thread.o Mutex.o Socket.o TcpClient.o TcpServer.o UdpSocket.o @objects@
++	OBJECTS += RtWvOut.o RtWvIn.o InetWvOut.o InetWvIn.o Thread.o Mutex.o Socket.o TcpClient.o TcpServer.o UdpSocket.o @objects@
++	LIBS += -lrtaudio -lrtmidi
  endif
  
- RAWWAVES = @rawwaves@
+ BUILD_STATIC = @build_static@
diff --git a/debian/patches/0004-File-endian.h-is-not-on-machine-subdir.patch b/debian/patches/0004-File-endian.h-is-not-on-machine-subdir.patch
new file mode 100644
index 0000000..fa13fcf
--- /dev/null
+++ b/debian/patches/0004-File-endian.h-is-not-on-machine-subdir.patch
@@ -0,0 +1,21 @@
+From: Felipe Sateler <fsateler at debian.org>
+Date: Mon, 21 Sep 2015 09:21:23 -0300
+Subject: File endian.h is not on machine subdir
+
+---
+ src/include/soundcard.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/include/soundcard.h b/src/include/soundcard.h
+index 2cf3a2c..088be6a 100644
+--- a/src/include/soundcard.h
++++ b/src/include/soundcard.h
+@@ -103,7 +103,7 @@
+ #define SNDCARD_OPL            28
+ 
+ #include <sys/types.h>
+-#include <machine/endian.h>
++#include <endian.h>
+ #ifndef _IOWR
+ #include <sys/ioccom.h>
+ #endif  /* !_IOWR */
diff --git a/debian/patches/05-endian.h.patch b/debian/patches/05-endian.h.patch
deleted file mode 100644
index 593c81d..0000000
--- a/debian/patches/05-endian.h.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/include/soundcard.h
-+++ b/src/include/soundcard.h
-@@ -103,7 +103,7 @@
- #define SNDCARD_OPL            28
- 
- #include <sys/types.h>
--#include <machine/endian.h>
-+#include <endian.h>
- #ifndef _IOWR
- #include <sys/ioccom.h>
- #endif  /* !_IOWR */
diff --git a/debian/patches/series b/debian/patches/series
index 32774a7..3b069ee 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,4 @@
-01-makefile.patch
-02-stk-demo.patch
-03-system_rtaudio_rtmidi.patch
-05-endian.h.patch
+0001-Provide-an-install-target-to-the-src-target.patch
+0002-Rename-demo-to-stk-demo.patch
+0003-Link-against-system-s-shared-copies-of-rtaudio-and-r.patch
+0004-File-endian.h-is-not-on-machine-subdir.patch

-- 
stk packaging

More information about the pkg-multimedia-commits mailing list