[SCM] stk/master: Refresh patches for new release

fsateler at users.alioth.debian.org fsateler at users.alioth.debian.org
Mon Jun 9 23:01:28 UTC 2014 

The following commit has been merged in the master branch:
commit 4ea259b1c5552b7731785b83d3a03648301d1ea7
Author: Felipe Sateler <fsateler at debian.org>
Date:   Mon Jun 9 11:00:52 2014 -0400

    Refresh patches for new release
    
    Drop 02-realtime and 04-build-shared, incorporated upstream
    
    Add 02-stk-demo.patch to rename demo program

diff --git a/debian/patches/01-makefile.patch b/debian/patches/01-makefile.patch
index 3452268..2acb37c 100644
--- a/debian/patches/01-makefile.patch
+++ b/debian/patches/01-makefile.patch
@@ -2,39 +2,9 @@ Origin: Debian
 Description: Provide an install target to the src target.
  Add SONAME to shared libraries.
 Forwarded: no
----
- Makefile.in               |    5 ++++-
- configure                 |    4 ++--
- configure.ac              |    4 ++--
- projects/demo/Makefile.in |    6 +++---
- src/Makefile.in           |   20 +++++++++++++++++---
- 5 files changed, 28 insertions(+), 11 deletions(-)
-
---- stk.orig/projects/demo/Makefile.in
-+++ stk/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@
-@@ -57,8 +57,8 @@ DEFS    += -DRAWWAVE_PATH=\"$(RAWWAVES)\
- 
- all : $(PROGRAMS)
- 
--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 utilities.cpp -L../../src -lstk $(LIBRARY)
- 
- libdemo: demo.cpp
- 	$(CC) $(LDFLAGS) $(CFLAGS) $(DEFS) -o demo utilities.cpp demo.cpp -L../../src -lstk $(LIBRARY)
---- stk.orig/src/Makefile.in
-+++ stk/src/Makefile.in
-@@ -3,13 +3,15 @@
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -3,7 +3,7 @@
  
  STATICLIB = libstk.a
  SHAREDLIB = @sharedlib@
@@ -43,15 +13,7 @@ Forwarded: no
  RELEASE = 4.4.4
  
  AR = ar -rsc
- RM = /bin/rm
- LN = /bin/ln
- OBJECT_PATH = @object_path@
-+LIBDIR = @libdir@
-+PREFIX = @prefix@
- vpath %.o $(OBJECT_PATH)
- 
- OBJECTS	=	Stk.o Generator.o Noise.o Blit.o BlitSaw.o BlitSquare.o Granulate.o \
-@@ -71,11 +73,23 @@ $(STATICLIB) : $(OBJECTS)
+@@ -88,8 +88,9 @@ $(STATICLIB) : $(OBJECTS)
  	$(AR) $(STATICLIB) $(OBJECT_PATH)/*.o
  
  $(SHAREDLIB) : $(OBJECTS)
@@ -62,48 +24,40 @@ Forwarded: no
  	$(LN) -s @sharedname@ $(SHAREDLIB)
  #	$(LN) -s @sharedname@ $(SHAREDLIB).$(MAJOR)
  
-+install-headers:
-+	install -d $(DESTDIR)/usr/include/stk
-+	cp -r ../include/*.h $(DESTDIR)/usr/include/stk
-+
-+install: $(SHAREDLIB) install-headers
-+	install -d  $(DESTDIR)/usr/share/stk
-+	install -d $(DESTDIR)$(PREFIX)$(LIBDIR)
+@@ -99,9 +100,9 @@ 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 $(SHAREDLIB).$(MAJOR).$(RELEASE) $(DESTDIR)$(PREFIX)$(LIBDIR)
-+	ln -s $(SHAREDLIB).$(MAJOR).$(RELEASE) $(DESTDIR)$(PREFIX)$(LIBDIR)/$(SHAREDLIB).$(MAJOR)
-+	ln -s $(SHAREDLIB).$(MAJOR).$(RELEASE) $(DESTDIR)$(PREFIX)$(LIBDIR)/$(SHAREDLIB)
-+
- $(OBJECTS) : Stk.h
++	ln -sf $(SHAREDLIB).$(MAJOR).$(RELEASE) $(DESTDIR)$(PREFIX)$(LIBDIR)/$(SHAREDLIB)
++	ln -sf $(SHAREDLIB).$(MAJOR).$(RELEASE) $(DESTDIR)$(PREFIX)$(LIBDIR)/$(SHAREDLIB).$(MAJOR)
+ 
  
- clean : 
-@@ -86,4 +100,4 @@ clean :
+ $(OBJECTS) : Stk.h
+@@ -114,4 +115,4 @@ clean :
  	$(RM) -fR *.dSYM
  
  distclean: clean
 -	$(RM) Makefile
 \ No newline at end of file
 +	$(RM) Makefile
---- stk.orig/Makefile.in
-+++ stk/Makefile.in
-@@ -4,7 +4,7 @@ RM = /bin/rm
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -6,7 +6,7 @@ REALTIME = @realtime@
  
  all :
  	cd src && $(MAKE)
 -	cd projects/demo && $(MAKE) libdemo
-+	cd projects/demo && $(MAKE) stk-demo
++	cd projects/demo && $(MAKE) demo
+ ifeq ($(REALTIME),yes)
  	cd projects/effects && $(MAKE) libeffects
  	cd projects/ragamatic && $(MAKE) libragamat
- 	cd projects/eguitar && $(MAKE) libeguitar
-@@ -28,3 +28,6 @@ distclean: clean
- 	cd projects/eguitar && $(MAKE) distclean
- 	cd projects/examples && $(MAKE) distclean
- 
-+install:
-+	make -C src install
-+#	make -C projects/demo install
---- stk.orig/configure
-+++ stk/configure
-@@ -4898,9 +4898,9 @@ case $host_os in *\ *) host_os=`echo "$h
+--- a/configure
++++ b/configure
+@@ -4495,9 +4495,9 @@ case $host_os in *\ *) host_os=`echo "$h
  
  sharedlib="libstk.so"
  
@@ -115,9 +69,9 @@ Forwarded: no
  
  case $host in
    *-apple*)
---- stk.orig/configure.ac
-+++ stk/configure.ac
-@@ -93,8 +93,8 @@ CXXFLAGS="$CXXFLAGS $cxxflag"
+--- a/configure.ac
++++ b/configure.ac
+@@ -112,8 +112,8 @@ CXXFLAGS="$CXXFLAGS $cxxflag"
  AC_CANONICAL_HOST
  
  AC_SUBST( sharedlib, ["libstk.so"] )
diff --git a/debian/patches/02-realtime.patch b/debian/patches/02-realtime.patch
deleted file mode 100644
index 61dda1e..0000000
--- a/debian/patches/02-realtime.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-Author: Pino Toscano <toscano.pino at tiscali.it>
-Description: Enable realtime support only on those architectures that
- actually provide it.
-Forwarded: no
----
- Makefile.in |    8 ++++++++
- 1 file changed, 8 insertions(+)
-
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -2,30 +2,38 @@
- 
- RM = /bin/rm
- 
-+REALTIME = @realtime@
-+
- all :
- 	cd src && $(MAKE)
-+ifeq ($(REALTIME),yes)
- 	cd projects/demo && $(MAKE) stk-demo
- 	cd projects/effects && $(MAKE) libeffects
- 	cd projects/ragamatic && $(MAKE) libragamat
- 	cd projects/eguitar && $(MAKE) libeguitar
-+endif
- 	cd projects/examples && $(MAKE) -f libMakefile
- 
- clean : 
- 	$(RM) -f *~
- 	cd src && $(MAKE) clean
-+ifeq ($(REALTIME),yes)
- 	cd projects/demo && $(MAKE) clean
- 	cd projects/effects && $(MAKE) clean
- 	cd projects/ragamatic && $(MAKE) clean
- 	cd projects/eguitar && $(MAKE) clean
-+endif
- 	cd projects/examples && $(MAKE) clean
- 
- distclean: clean
- 	$(RM) -rf config.log config.status autom4te.cache Makefile
- 	cd src && $(MAKE) distclean
-+ifeq ($(REALTIME),yes)
- 	cd projects/demo && $(MAKE) distclean
- 	cd projects/effects && $(MAKE) distclean
- 	cd projects/ragamatic && $(MAKE) distclean
- 	cd projects/eguitar && $(MAKE) distclean
-+endif
- 	cd projects/examples && $(MAKE) distclean
- 
- install:
diff --git a/debian/patches/02-stk-demo.patch b/debian/patches/02-stk-demo.patch
new file mode 100644
index 0000000..d308331
--- /dev/null
+++ b/debian/patches/02-stk-demo.patch
@@ -0,0 +1,33 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -6,7 +6,7 @@ REALTIME = @realtime@
+ 
+ all :
+ 	cd src && $(MAKE)
+-	cd projects/demo && $(MAKE) demo
++	cd projects/demo && $(MAKE) stk-demo
+ ifeq ($(REALTIME),yes)
+ 	cd projects/effects && $(MAKE) libeffects
+ 	cd projects/ragamatic && $(MAKE) libragamat
+--- 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/03-system_rtaudio_rtmidi.patch b/debian/patches/03-system_rtaudio_rtmidi.patch
index f4857c9..6f04b3f 100644
--- a/debian/patches/03-system_rtaudio_rtmidi.patch
+++ b/debian/patches/03-system_rtaudio_rtmidi.patch
@@ -1,19 +1,9 @@
 Description: Link against system's shared copies of rtaudio and rtmidi.
 Author: Alessio Treglia <alessio at debian.org>
 Forwarded: no
----
- projects/demo/Makefile.in        |    3 +-
- projects/effects/Makefile.in     |    3 +-
- projects/eguitar/Makefile.in     |    5 ++-
- projects/examples/Makefile.in    |   52 +++++++++++++++++++--------------------
- projects/examples/libMakefile.in |    1 
- projects/ragamatic/Makefile.in   |    3 +-
- src/Makefile.in                  |    3 +-
- 8 files changed, 39 insertions(+), 32 deletions(-)
-
 --- a/src/Makefile.in
 +++ b/src/Makefile.in
-@@ -51,7 +51,8 @@
+@@ -52,7 +52,8 @@ LIBS     = @LIBS@
  
  REALTIME = @realtime@
  ifeq ($(REALTIME),yes)
@@ -22,10 +12,10 @@ Forwarded: no
 +	LIBS += -lrtaudio -lrtmidi
  endif
  
- RAWWAVES = @rawwaves@
+ BUILD_STATIC = @build_static@
 --- a/projects/demo/Makefile.in
 +++ b/projects/demo/Makefile.in
-@@ -40,7 +40,8 @@
+@@ -40,7 +40,8 @@ LIBRARY = @LIBS@
  REALTIME = @realtime@
  ifeq ($(REALTIME),yes)
    PROGRAMS += demo
@@ -37,7 +27,7 @@ Forwarded: no
  RAWWAVES = @rawwaves@
 --- a/projects/examples/Makefile.in
 +++ b/projects/examples/Makefile.in
-@@ -52,26 +52,26 @@
+@@ -56,26 +56,26 @@ distclean: clean
  strip : 
  	strip $(PROGRAMS)
  
@@ -76,7 +66,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)
-@@ -79,26 +79,26 @@
+@@ -83,26 +83,26 @@ inetOut: inetOut.cpp Stk.o FileRead.o Fi
  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)
  
@@ -119,7 +109,7 @@ 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 $(LIBRARY) -lrtaudio
 --- a/projects/effects/Makefile.in
 +++ b/projects/effects/Makefile.in
-@@ -29,7 +29,8 @@
+@@ -29,7 +29,8 @@ LIBRARY = @LIBS@
  REALTIME = @realtime@
  ifeq ($(REALTIME),yes)
    PROGRAMS += effects
@@ -131,7 +121,7 @@ Forwarded: no
  RAWWAVES = @rawwaves@
 --- a/projects/ragamatic/Makefile.in
 +++ b/projects/ragamatic/Makefile.in
-@@ -30,7 +30,8 @@
+@@ -30,7 +30,8 @@ LIBRARY = @LIBS@
  REALTIME = @realtime@
  ifeq ($(REALTIME),yes)
    PROGRAMS = ragamat
@@ -143,7 +133,7 @@ Forwarded: no
  RAWWAVES = @rawwaves@
 --- a/projects/examples/libMakefile.in
 +++ b/projects/examples/libMakefile.in
-@@ -19,6 +19,7 @@
+@@ -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
@@ -153,7 +143,7 @@ Forwarded: no
  RAWWAVES = @rawwaves@
 --- a/projects/eguitar/Makefile.in
 +++ b/projects/eguitar/Makefile.in
-@@ -29,7 +29,8 @@
+@@ -29,7 +29,8 @@ LIBRARY = @LIBS@
  REALTIME = @realtime@
  ifeq ($(REALTIME),yes)
    PROGRAMS += eguitar
@@ -163,10 +153,3 @@ Forwarded: no
  endif
  
  RAWWAVES = @rawwaves@
-@@ -68,4 +69,4 @@
- # Project specific objects:
- 
- utilities.o: utilities.cpp
--	$(CC) $(CFLAGS) $(DEFS) -c utilities.cpp -o $(OBJECT_PATH)/$@
-\ No newline at end of file
-+	$(CC) $(CFLAGS) $(DEFS) -c utilities.cpp -o $(OBJECT_PATH)/$@
diff --git a/debian/patches/04-build-shared.patch b/debian/patches/04-build-shared.patch
deleted file mode 100644
index 280ae8b..0000000
--- a/debian/patches/04-build-shared.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/Makefile.in
-+++ b/src/Makefile.in
-@@ -67,7 +67,7 @@
- %.o : ../src/include/%.cpp
- 	$(CC) $(CFLAGS) $(DEFS) -c $(<) -o $(OBJECT_PATH)/$@
- 
--all : $(STATICLIB)
-+all : $(STATICLIB) $(SHAREDLIB)
- 
- $(STATICLIB) : $(OBJECTS)
- 	$(RM) -f $(STATICLIB)
diff --git a/debian/patches/series b/debian/patches/series
index 43d33cf..32774a7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
 01-makefile.patch
-02-realtime.patch
+02-stk-demo.patch
 03-system_rtaudio_rtmidi.patch
-04-build-shared.patch
 05-endian.h.patch

-- 
stk packaging

More information about the pkg-multimedia-commits mailing list