[SCM] stk/master: Refresh patches

fsateler at users.alioth.debian.org fsateler at users.alioth.debian.org
Thu Sep 7 23:20:09 UTC 2017


The following commit has been merged in the master branch:
commit cc64fb76636b10c0d9859fb886ce398196cd714f
Author: Felipe Sateler <fsateler at debian.org>
Date:   Thu Sep 7 20:02:52 2017 -0300

    Refresh patches
    
    Drop patches applied/picked from upstream

diff --git a/debian/patches/Bump-soname-with-each-release.patch b/debian/patches/Bump-soname-with-each-release.patch
deleted file mode 100644
index 89a5dca..0000000
--- a/debian/patches/Bump-soname-with-each-release.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From: Felipe Sateler <fsateler at debian.org>
-Date: Mon, 9 Jun 2014 21:01:56 -0400
-Subject: Bump soname with each release
-
-Imitate the libtool -release style of versioning, as long as the ABI is not stable
----
- configure.ac    | 10 ++++++----
- src/Makefile.in |  4 ++--
- 2 files changed, 8 insertions(+), 6 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 0616428..e33dc93 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -111,14 +111,16 @@ CXXFLAGS="$CXXFLAGS $cxxflag"
- 
- AC_CANONICAL_HOST
- 
-+basesharedname="libstk-\$(RELEASE)"
-+
- 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, [${basesharedname}.so] )
-+AC_SUBST( libflags, ["-shared -Wl,-soname,${basesharedname}.so -o $sharedname"] )
- case $host in
-   *-apple*)
-   AC_SUBST( sharedlib, ["libstk.dylib"] )
--  AC_SUBST( sharedname, ["libstk.\$(RELEASE).dylib"] )
--  AC_SUBST( libflags, ["-dynamiclib -o libstk.\$(RELEASE).dylib"] )
-+  AC_SUBST( sharedname, ["${basesharedname}.dylib"] )
-+  AC_SUBST( libflags, ["-dynamiclib -o ${basesharedname}.dylib"] )
- esac
- 
- if test $realtime = yes; then
-diff --git a/src/Makefile.in b/src/Makefile.in
-index 64da6bf..ffbd329 100644
---- a/src/Makefile.in
-+++ b/src/Makefile.in
-@@ -4,7 +4,7 @@
- STATICLIB = libstk.a
- SHAREDLIB = @sharedlib@
- MAJOR = 4
--RELEASE = 4.4.4
-+RELEASE = @PACKAGE_VERSION@
- 
- AR = ar -rsc
- RM = /bin/rm
-@@ -114,4 +114,4 @@ clean :
- 	$(RM) -fR *.dSYM
- 
- distclean: clean
--	$(RM) Makefile
-\ No newline at end of file
-+	$(RM) Makefile
diff --git a/debian/patches/Do-not-override-user-supplied-CXXFLAGS.patch b/debian/patches/Do-not-override-user-supplied-CXXFLAGS.patch
index 3baab8b..9bf5111 100644
--- a/debian/patches/Do-not-override-user-supplied-CXXFLAGS.patch
+++ b/debian/patches/Do-not-override-user-supplied-CXXFLAGS.patch
@@ -8,7 +8,7 @@ Prepend local flags to that
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index e33dc93..ab2b567 100644
+index 80a8a0f..95e558d 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -99,8 +99,8 @@ fi
diff --git a/debian/patches/Finish-renaming-SKINI.patch b/debian/patches/Finish-renaming-SKINI.patch
deleted file mode 100644
index 5341db1..0000000
--- a/debian/patches/Finish-renaming-SKINI.patch
+++ /dev/null
@@ -1,216 +0,0 @@
-From: Stephen Sinclair <radarsat1 at gmail.com>
-Date: Thu, 7 Aug 2014 11:53:21 +0200
-Subject: Finish renaming SKINI.msg and SKINI.tbl to SKINImsg.h and SKINItbl.h,
- respectively.
-
----
- doc/SKINI.txt                    | 22 +++++++++++-----------
- doc/hierarchy.txt                |  4 ++--
- include/Skini.h                  |  2 +-
- projects/demo/Md2Skini.cpp       |  2 +-
- projects/demo/demo.cpp           |  2 +-
- projects/effects/effects.cpp     |  2 +-
- projects/eguitar/eguitar.cpp     |  2 +-
- projects/examples/controlbee.cpp |  2 +-
- projects/examples/threebees.cpp  |  2 +-
- projects/ragamatic/ragamat.cpp   |  2 +-
- 10 files changed, 21 insertions(+), 21 deletions(-)
-
-diff --git a/doc/SKINI.txt b/doc/SKINI.txt
-index d42c731..89e7497 100644
---- a/doc/SKINI.txt
-+++ b/doc/SKINI.txt
-@@ -85,7 +85,7 @@ upon/from which to build and depart.
-     the channel number is scanned as a long int.  Channels could be socket
-     numbers, machine IDs, serial numbers, or even unique tags for each
-     event in a synthesis.  Other fields might be used, as specified in the
--    SKINI.tbl file.  This is described in more detail later.
-+    SKINItbl.h file.  This is described in more detail later.
- 
-     Fields in a SKINI line are delimited by spaces, commas, or
-     tabs.  The SKINI parser only operates on a line at a time,
-@@ -109,9 +109,9 @@ upon/from which to build and depart.
- 
-     All fields other than type, time, and channel are optional, and the
-     types and useage of the additional fields is defined in the file
--    SKINI.tbl.
-+    SKINItbl.h.
- 
--    The other important file used by SKINI is SKINI.msg, which is a
-+    The other important file used by SKINI is SKINImsg.h, which is a
-     set of #defines to make C code more readable, and to allow reasonably
-     quick re-mapping of control numbers, etc..  All of these defined
-     symbols are assigned integer values.  For JAVA, the #defines could
-@@ -127,13 +127,13 @@ upon/from which to build and depart.
-     receiving SKINI messages a line at a time, usually in real time,
-     but not restricted to real time.
- 
--    SKINI.msg should be included by anything wanting to use the
-+    SKINImsg.h should be included by anything wanting to use the
-     Skini.cpp object.  This is not mandatory, but use of the __SK_blah_
-     symbols which are defined in the .msg file will help to ensure
-     clarity and consistency when messages are added and changed.
- 
--    SKINI.tbl is used only by the SKINI parser object (Skini.cpp).
--    In the file SKINI.tbl, an array of structures is declared and
-+    SKINItbl.h is used only by the SKINI parser object (Skini.cpp).
-+    In the file SKINItbl.h, an array of structures is declared and
-     assigned values which instruct the parser as to what the message
-     types are, and what the fields mean for those message types.
-     This table is compiled and linked into applications using SKINI, but
-@@ -195,7 +195,7 @@ upon/from which to build and depart.
-         A -1 channel can be used as don't care, omni, or other functions
-         depending on your needs and taste.
- 
--    g)  All remaining fields are specified in the SKINI.tbl file.
-+    g)  All remaining fields are specified in the SKINItbl.h file.
-         In general, there are maximum two more fields, which are either
-         SK_INT (long), SK_DBL (double float), or SK_STR (string).  The
-         latter is the mechanism by which more arguments can be specified
-@@ -237,9 +237,9 @@ upon/from which to build and depart.
-         NoteOff         0.000000 2 71 82
-         NoteOff         0.000000 2 79 82
- 
--7)  The SKINI.tbl File, How Messages are Parsed:
-+7)  The SKINItbl.h File, How Messages are Parsed:
- 
--    The SKINI.tbl file contains an array of structures which
-+    The SKINItbl.h file contains an array of structures which
-     are accessed by the parser object Skini.cpp.  The struct is:
- 
-         struct SKINISpec { char messageString[32];
-@@ -276,7 +276,7 @@ upon/from which to build and depart.
-                            something else stored in the SK_STR field, or
-                            as a new type of multi-line message.
- 
--    Here's a couple of lines from the SKINI.tbl file
-+    Here's a couple of lines from the SKINItbl.h file
- 
-  {"NoteOff"          ,        __SK_NoteOff_,               SK_DBL,  SK_DBL},
-  {"NoteOn"           ,         __SK_NoteOn_,               SK_DBL,  SK_DBL},
-@@ -290,7 +290,7 @@ upon/from which to build and depart.
-     The first three are basic MIDI messages.  The first two would cause the
-     parser, after recognizing a match of the string "NoteOff" or "NoteOn",
-     to set the message type to 128 or 144 (__SK_NoteOff_ and __SK_NoteOn_
--    are #defined in the file SKINI.msg to be the MIDI byte value, without
-+    are #defined in the file SKINImsg.h to be the MIDI byte value, without
-     channel, of the actual MIDI messages for NoteOn and NoteOff).  The parser
-     would then set the time or delta time (this is always done and is
-     therefore not described in the SKINI Message Struct).  The next two
-diff --git a/doc/hierarchy.txt b/doc/hierarchy.txt
-index 6935041..1328704 100644
---- a/doc/hierarchy.txt
-+++ b/doc/hierarchy.txt
-@@ -173,7 +173,7 @@ effects.cpp     Effects demonstration program
- ragamatic.cpp   Nirvana just waiting to happen
- 
- Skini.cpp	      SKINI file/message parser object
--SKINI.msg	      #defines for often used and universal MIDI/SKINI symbols
--SKINI.tbl	      Table of SKINI messages
-+SKINImsg.h	      #defines for often used and universal MIDI/SKINI symbols
-+SKINItbl.h	      Table of SKINI messages
- 
- 
-diff --git a/include/Skini.h b/include/Skini.h
-index 9f83b1f..d5619bd 100644
---- a/include/Skini.h
-+++ b/include/Skini.h
-@@ -41,7 +41,7 @@ class Skini : public Stk
- 
-   //! A message structure to store and pass parsed SKINI messages.
-   struct Message { 
--    long type;                         /*!< The message type, as defined in SKINI.msg. */
-+    long type;                         /*!< The message type, as defined in SKINImsg.h. */
-     long channel;                      /*!< The message channel (not limited to 16!). */
-     StkFloat time;                     /*!< The message time stamp in seconds (delta or absolute). */
-     std::vector<StkFloat> floatValues; /*!< The message values read as floats (values are type-specific). */
-diff --git a/projects/demo/Md2Skini.cpp b/projects/demo/Md2Skini.cpp
-index be0e569..dc32e4b 100644
---- a/projects/demo/Md2Skini.cpp
-+++ b/projects/demo/Md2Skini.cpp
-@@ -11,7 +11,7 @@
- /***************************************************/
- 
- #include "RtMidi.h"
--#include "SKINI.msg"
-+#include "SKINImsg.h"
- #include <iostream>
- #include <stdlib.h>
- #include <stdio.h>
-diff --git a/projects/demo/demo.cpp b/projects/demo/demo.cpp
-index e2f6e2a..c877b4a 100644
---- a/projects/demo/demo.cpp
-+++ b/projects/demo/demo.cpp
-@@ -3,7 +3,7 @@
- // An example STK program that allows voice playback and control of
- // most of the STK instruments.
- 
--#include "SKINI.msg"
-+#include "SKINImsg.h"
- #include "WvOut.h"
- #include "Instrmnt.h"
- #include "JCRev.h"
-diff --git a/projects/effects/effects.cpp b/projects/effects/effects.cpp
-index f57e60c..6bbd9b9 100644
---- a/projects/effects/effects.cpp
-+++ b/projects/effects/effects.cpp
-@@ -1,7 +1,7 @@
- /**************  Effects Program  *********************/
- 
- #include "Skini.h"
--#include "SKINI.msg"
-+#include "SKINImsg.h"
- #include "Envelope.h"
- #include "PRCRev.h"
- #include "JCRev.h"
-diff --git a/projects/eguitar/eguitar.cpp b/projects/eguitar/eguitar.cpp
-index 4ae6e30..269f2d3 100644
---- a/projects/eguitar/eguitar.cpp
-+++ b/projects/eguitar/eguitar.cpp
-@@ -29,7 +29,7 @@
- // Gary P. Scavone, McGill University 2012.
- 
- #include "Guitar.h"
--#include "SKINI.msg"
-+#include "SKINImsg.h"
- #include "WvOut.h"
- #include "JCRev.h"
- #include "Skini.h"
-diff --git a/projects/examples/controlbee.cpp b/projects/examples/controlbee.cpp
-index ff5b8f7..42e4d41 100644
---- a/projects/examples/controlbee.cpp
-+++ b/projects/examples/controlbee.cpp
-@@ -3,7 +3,7 @@
- #include "BeeThree.h"
- #include "RtAudio.h"
- #include "Messager.h"
--#include "SKINI.msg"
-+#include "SKINImsg.h"
- #include <math.h>
- #include <algorithm>
- using std::min;
-diff --git a/projects/examples/threebees.cpp b/projects/examples/threebees.cpp
-index bd450f2..004cae2 100644
---- a/projects/examples/threebees.cpp
-+++ b/projects/examples/threebees.cpp
-@@ -4,7 +4,7 @@
- #include "RtAudio.h"
- #include "Messager.h"
- #include "Voicer.h"
--#include "SKINI.msg"
-+#include "SKINImsg.h"
- 
- #include <algorithm>
- using std::min;
-diff --git a/projects/ragamatic/ragamat.cpp b/projects/ragamatic/ragamat.cpp
-index 463092f..b706e2e 100644
---- a/projects/ragamatic/ragamat.cpp
-+++ b/projects/ragamatic/ragamat.cpp
-@@ -1,6 +1,6 @@
- /**************  Test Main Program Individual Voice *********************/
- 
--#include "SKINI.msg"
-+#include "SKINImsg.h"
- #include "Instrmnt.h"
- #include "JCRev.h"
- #include "Drone.h"
diff --git a/debian/patches/Fix-install-target-for-new-soname-scheme.patch b/debian/patches/Fix-install-target-for-new-soname-scheme.patch
deleted file mode 100644
index d225c09..0000000
--- a/debian/patches/Fix-install-target-for-new-soname-scheme.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From: Felipe Sateler <fsateler at debian.org>
-Date: Fri, 27 Nov 2015 20:32:46 -0300
-Subject: Fix install target for new soname scheme
-
----
- src/Makefile.in | 6 ++----
- 1 file changed, 2 insertions(+), 4 deletions(-)
-
-diff --git a/src/Makefile.in b/src/Makefile.in
-index 7904bbc..df82595 100644
---- a/src/Makefile.in
-+++ b/src/Makefile.in
-@@ -92,7 +92,6 @@ $(SHAREDLIB) : $(OBJECTS)
- 	$(RM) -f $(@) $(SHAREDLIB).$(MAJOR) $(SHAREDLIB)
- 	$(CC) $(LDFLAGS) -fPIC @libflags@ $(OBJECT_PATH)/*.o $(LIBS)
- 	$(LN) -s @sharedname@ $(SHAREDLIB)
--#	$(LN) -s @sharedname@ $(SHAREDLIB).$(MAJOR)
- 
- install-headers:
- 	install -d $(DESTDIR)$(PREFIX)$(INCLUDEDIR)/stk
-@@ -100,9 +99,8 @@ install-headers:
- 
- install: $(SHAREDLIB) install-headers
- 	install -d $(DESTDIR)$(PREFIX)$(LIBDIR)
--	install -m 644 $(SHAREDLIB).$(RELEASE) $(DESTDIR)$(PREFIX)$(LIBDIR)
--	ln -sf $(SHAREDLIB).$(RELEASE) $(DESTDIR)$(PREFIX)$(LIBDIR)/$(SHAREDLIB)
--	ln -sf $(SHAREDLIB).$(RELEASE) $(DESTDIR)$(PREFIX)$(LIBDIR)/$(SHAREDLIB).$(MAJOR)
-+	install -m 644 @sharedname@ $(DESTDIR)$(PREFIX)$(LIBDIR)
-+	ln -sf @sharedname@ $(DESTDIR)$(PREFIX)$(LIBDIR)/$(SHAREDLIB)
- 
- 
- $(OBJECTS) : Stk.h
diff --git a/debian/patches/Link-against-system-s-shared-copies-of-rtaudio-and-r.patch b/debian/patches/Link-against-system-s-shared-copies-of-rtaudio-and-r.patch
index 721045b..9e02a17 100644
--- a/debian/patches/Link-against-system-s-shared-copies-of-rtaudio-and-r.patch
+++ b/debian/patches/Link-against-system-s-shared-copies-of-rtaudio-and-r.patch
@@ -14,13 +14,13 @@ Forwarded: no
  7 files changed, 37 insertions(+), 31 deletions(-)
 
 diff --git a/projects/demo/Makefile.in b/projects/demo/Makefile.in
-index 7278730..1ec932d 100644
+index f27444b..3f774ff 100644
 --- a/projects/demo/Makefile.in
 +++ b/projects/demo/Makefile.in
 @@ -40,7 +40,8 @@ LIBRARY = @LIBS@
  REALTIME = @realtime@
  ifeq ($(REALTIME),yes)
-   PROGRAMS += demo
+   PROGRAMS += stk-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
@@ -166,7 +166,7 @@ index 3c078f4..6426909 100644
  
  RAWWAVES = @rawwaves@
 diff --git a/src/Makefile.in b/src/Makefile.in
-index ffbd329..7904bbc 100644
+index 739fa74..df82595 100644
 --- a/src/Makefile.in
 +++ b/src/Makefile.in
 @@ -52,7 +52,8 @@ LIBS     = @LIBS@
diff --git a/debian/patches/Rename-demo-to-stk-demo.patch b/debian/patches/Rename-demo-to-stk-demo.patch
index b08158d..b3e2bfb 100644
--- a/debian/patches/Rename-demo-to-stk-demo.patch
+++ b/debian/patches/Rename-demo-to-stk-demo.patch
@@ -3,9 +3,8 @@ 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(-)
+ Makefile.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/Makefile.in b/Makefile.in
 index f4f04ec..5afd13e 100644
@@ -20,27 +19,3 @@ index f4f04ec..5afd13e 100644
  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 @@
- ### Do not edit -- Generated by 'configure --with-whatever' from Makefile.in
- ### STK demo Makefile - for various flavors of unix
- 
--PROGRAMS = demo
-+PROGRAMS = stk-demo
- RM = /bin/rm
- SRC_PATH = ../../src
- OBJECT_PATH = @object_path@
-@@ -61,8 +61,8 @@ $(OBJECT_PATH)/.placeholder:
- 	mkdir -vp $(OBJECT_PATH)
- 	touch $(OBJECT_PATH)/.placeholder
- 
--demo: demo.cpp $(OBJECTS)
--	$(CC) $(LDFLAGS) $(CFLAGS) $(DEFS) -o demo demo.cpp $(OBJECT_PATH)/*.o $(LIBRARY)
-+stk-demo: demo.cpp $(OBJECTS)
-+	$(CC) $(LDFLAGS) $(CFLAGS) $(DEFS) -o stk-demo demo.cpp $(OBJECT_PATH)/*.o $(LIBRARY)
- 
- libdemo: demo.cpp
- 	$(CC) $(LDFLAGS) $(CFLAGS) $(DEFS) -o demo utilities.cpp demo.cpp -L../../src -lstk $(LIBRARY)
diff --git a/debian/patches/Sort-o-files b/debian/patches/Sort-o-files
index 1ca86aa..abda00d 100644
--- a/debian/patches/Sort-o-files
+++ b/debian/patches/Sort-o-files
@@ -15,7 +15,7 @@ Closes: #822566
  6 files changed, 6 insertions(+), 6 deletions(-)
 
 diff --git a/projects/demo/Makefile.in b/projects/demo/Makefile.in
-index 1ec932d..c8a1469 100644
+index 3f774ff..19b114f 100644
 --- a/projects/demo/Makefile.in
 +++ b/projects/demo/Makefile.in
 @@ -63,7 +63,7 @@ $(OBJECT_PATH)/.placeholder:
@@ -26,7 +26,7 @@ index 1ec932d..c8a1469 100644
 +	$(CC) $(LDFLAGS) $(CFLAGS) $(DEFS) -o stk-demo demo.cpp `LC_ALL=C ls $(OBJECT_PATH)/*.o` $(LIBRARY)
  
  libdemo: demo.cpp
- 	$(CC) $(LDFLAGS) $(CFLAGS) $(DEFS) -o demo utilities.cpp demo.cpp -L../../src -lstk $(LIBRARY)
+ 	$(CC) $(LDFLAGS) $(CFLAGS) $(DEFS) -o stk-demo utilities.cpp demo.cpp -L../../src -lstk $(LIBRARY)
 diff --git a/projects/effects/Makefile.in b/projects/effects/Makefile.in
 index 0fd65a2..98606ab 100644
 --- a/projects/effects/Makefile.in
diff --git a/debian/patches/series b/debian/patches/series
index c274f3a..dc7ce4e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,9 +1,6 @@
-Bump-soname-with-each-release.patch
 Rename-demo-to-stk-demo.patch
 Link-against-system-s-shared-copies-of-rtaudio-and-r.patch
 File-endian.h-is-not-on-machine-subdir.patch
-Fix-install-target-for-new-soname-scheme.patch
-Finish-renaming-SKINI.patch
 demo-needs-rt.patch
 Sort-o-files
 Do-not-override-user-supplied-CXXFLAGS.patch

-- 
stk packaging



More information about the pkg-multimedia-commits mailing list