[SCM] stk/master: Refresh patches

alessio at users.alioth.debian.org alessio at users.alioth.debian.org
Mon Sep 3 21:58:13 UTC 2012 

The following commit has been merged in the master branch:
commit ca227513b11abebb185898b61dcf1780887c81eb
Author: Alessio Treglia <alessio at debian.org>
Date:   Mon Sep 3 23:50:03 2012 +0200

    Refresh patches
    
    Take #2

diff --git a/debian/patches/03-system_rtaudio_rtmidi.patch b/debian/patches/03-system_rtaudio_rtmidi.patch
index 5d50bf0..c225842 100644
--- a/debian/patches/03-system_rtaudio_rtmidi.patch
+++ b/debian/patches/03-system_rtaudio_rtmidi.patch
@@ -2,16 +2,19 @@ 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/examples/Makefile.in  |   52 ++++++++++++++++++++---------------------
- projects/ragamatic/Makefile.in |    3 +-
- src/Makefile.in                |    3 +-
- 5 files changed, 34 insertions(+), 30 deletions(-)
+ projects/demo/Makefile.in        |    3 +-
+ projects/effects/Makefile.in     |    3 +-
+ projects/eguitar/Makefile.in     |    5 ++-
+ projects/examples/Makefile.in    |   52 +++++++++++++++++++--------------------
+ projects/examples/libMakefile    |    1 
+ projects/examples/libMakefile.in |    1 
+ projects/ragamatic/Makefile.in   |    3 +-
+ src/Makefile.in                  |    3 +-
+ 8 files changed, 39 insertions(+), 32 deletions(-)
 
---- stk.orig/src/Makefile.in	2012-01-22 16:21:02.548386269 +0100
-+++ stk/src/Makefile.in	2012-01-22 16:21:02.644386758 +0100
-@@ -49,7 +49,8 @@
+--- stk.orig/src/Makefile.in
++++ stk/src/Makefile.in
+@@ -51,7 +51,8 @@ LIBS     = @LIBS@
  
  REALTIME = @realtime@
  ifeq ($(REALTIME),yes)
@@ -21,9 +24,9 @@ Forwarded: no
  endif
  
  RAWWAVES = @rawwaves@
---- stk.orig/projects/demo/Makefile.in	2012-01-22 16:21:02.548386269 +0100
-+++ stk/projects/demo/Makefile.in	2012-01-22 16:21:02.648386772 +0100
-@@ -40,7 +40,8 @@
+--- stk.orig/projects/demo/Makefile.in
++++ stk/projects/demo/Makefile.in
+@@ -40,7 +40,8 @@ LIBRARY = @LIBS@
  REALTIME = @realtime@
  ifeq ($(REALTIME),yes)
    PROGRAMS += demo
@@ -33,9 +36,9 @@ Forwarded: no
  endif
  
  RAWWAVES = @rawwaves@
---- stk.orig/projects/examples/Makefile.in	2012-01-22 16:20:58.512366257 +0100
-+++ stk/projects/examples/Makefile.in	2012-01-22 16:21:02.648386772 +0100
-@@ -52,26 +52,26 @@
+--- stk.orig/projects/examples/Makefile.in
++++ stk/projects/examples/Makefile.in
+@@ -52,26 +52,26 @@ distclean: clean
  strip : 
  	strip $(PROGRAMS)
  
@@ -74,7 +77,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 @@
+@@ -79,26 +79,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)
  
@@ -115,9 +118,9 @@ 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
---- stk.orig/projects/effects/Makefile.in	2012-01-22 16:20:58.548366446 +0100
-+++ stk/projects/effects/Makefile.in	2012-01-22 16:21:02.652386786 +0100
-@@ -29,7 +29,8 @@
+--- stk.orig/projects/effects/Makefile.in
++++ stk/projects/effects/Makefile.in
+@@ -29,7 +29,8 @@ LIBRARY = @LIBS@
  REALTIME = @realtime@
  ifeq ($(REALTIME),yes)
    PROGRAMS += effects
@@ -127,9 +130,9 @@ Forwarded: no
  endif
  
  RAWWAVES = @rawwaves@
---- stk.orig/projects/ragamatic/Makefile.in	2012-01-22 16:20:58.476366076 +0100
-+++ stk/projects/ragamatic/Makefile.in	2012-01-22 16:21:02.652386786 +0100
-@@ -30,7 +30,8 @@
+--- stk.orig/projects/ragamatic/Makefile.in
++++ stk/projects/ragamatic/Makefile.in
+@@ -30,7 +30,8 @@ LIBRARY = @LIBS@
  REALTIME = @realtime@
  ifeq ($(REALTIME),yes)
    PROGRAMS = ragamat
@@ -139,9 +142,9 @@ Forwarded: no
  endif
  
  RAWWAVES = @rawwaves@
---- stk.orig/projects/examples/libMakefile.in	2012-01-22 16:24:23.261381555 +0100
-+++ stk/projects/examples/libMakefile.in	2012-01-22 16:25:16.525645676 +0100
-@@ -19,6 +19,7 @@
+--- stk.orig/projects/examples/libMakefile.in
++++ stk/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
@@ -149,9 +152,9 @@ Forwarded: no
  endif
  
  RAWWAVES = @rawwaves@
---- stk.orig/projects/examples/libMakefile	2012-01-22 16:25:45.221787974 +0100
-+++ stk/projects/examples/libMakefile	2012-01-22 16:26:16.157941376 +0100
-@@ -19,6 +19,7 @@
+--- stk.orig/projects/examples/libMakefile
++++ stk/projects/examples/libMakefile
+@@ -19,6 +19,7 @@ LIBRARY = -lpthread -framework CoreAudio
  REALTIME = yes
  ifeq ($(REALTIME),yes)
    PROGRAMS += audioprobe midiprobe duplex play record inetIn inetOut rtsine crtsine bethree controlbee threebees playsmf grains
@@ -159,3 +162,22 @@ Forwarded: no
  endif
  
  RAWWAVES = 
+--- stk.orig/projects/eguitar/Makefile.in
++++ stk/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
+ endif
+ 
+ RAWWAVES = @rawwaves@
+@@ -68,4 +69,4 @@ strip :
+ # 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)/$@

-- 
stk packaging

More information about the pkg-multimedia-commits mailing list