[SCM] stk/master: Refresh patches.
alessio at users.alioth.debian.org
alessio at users.alioth.debian.org
Wed Aug 31 10:42:18 UTC 2011
The following commit has been merged in the master branch:
commit 4b622e0de881875e5b72d21979cfb3ebf9e6ed14
Author: Alessio Treglia <alessio at debian.org>
Date: Wed Aug 31 12:41:54 2011 +0200
Refresh patches.
diff --git a/debian/patches/01-makefile.patch b/debian/patches/01-makefile.patch
index f1017f7..770693d 100644
--- a/debian/patches/01-makefile.patch
+++ b/debian/patches/01-makefile.patch
@@ -4,12 +4,14 @@ Description: Provide an install target to the src target.
Forwarded: no
---
Makefile.in | 5 ++++-
+ configure | 7 ++++---
+ configure.ac | 4 ++--
projects/demo/Makefile.in | 6 +++---
- src/Makefile.in | 24 ++++++++++++++++++------
- 3 files changed, 25 insertions(+), 10 deletions(-)
+ src/Makefile.in | 18 +++++++++++++++---
+ 5 files changed, 28 insertions(+), 12 deletions(-)
---- stk-4.4.2.orig/projects/demo/Makefile.in
-+++ stk-4.4.2/projects/demo/Makefile.in
+--- 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
@@ -30,31 +32,27 @@ Forwarded: no
libdemo: demo.cpp
$(CC) $(LDFLAGS) $(CFLAGS) $(DEFS) -o demo utilities.cpp demo.cpp -L../../src -lstk $(LIBRARY)
---- stk-4.4.2.orig/src/Makefile.in
-+++ stk-4.4.2/src/Makefile.in
+--- stk.orig/src/Makefile.in
++++ stk/src/Makefile.in
@@ -3,7 +3,7 @@
- LIBRARY = libstk.a
- SHAREDLIB = libstk.so
+ STATICLIB = libstk.a
+ SHAREDLIB = @sharedlib@
-MAJOR = 4
+MAJOR = 0
- RELEASE = 4.4.2
+ RELEASE = 4.4.3
AR = ar -rsc
-@@ -70,13 +70,26 @@ $(LIBRARY) : $(OBJECTS)
- $(RM) -f $(LIBRARY)
- $(AR) $(LIBRARY) $(OBJECT_PATH)/*.o
-
--$(SHAREDLIB).$(RELEASE) : $(OBJECTS)
-+$(SHAREDLIB) : $(OBJECTS)
- $(RM) -f $(@) $(SHAREDLIB).$(MAJOR) $(SHAREDLIB)
-- $(CC) $(LDFLAGS) -fPIC -shared -o $(@) $(OBJECT_PATH)/*.o $(LIBS)
-- $(LN) -s $(SHAREDLIB).$(RELEASE) $(SHAREDLIB).$(MAJOR)
-- $(LN) -s $(SHAREDLIB).$(RELEASE) $(SHAREDLIB)
-+ $(CC) $(LDFLAGS) -fPIC -shared -Wl,-soname=$(SHAREDLIB).$(MAJOR) -o $(@).$(MAJOR).$(RELEASE) $(OBJECT_PATH)/*.o $(LIBS)
-+ $(LN) -s $(SHAREDLIB).$(MAJOR).$(RELEASE) $(SHAREDLIB).$(MAJOR)
-+ $(LN) -s $(SHAREDLIB).$(MAJOR).$(RELEASE) $(SHAREDLIB)
- # $(CC) $(LDFLAGS) -fPIC -shared -Wl,-soname,$(SHAREDLIB).$(MAJOR) -o $(@) $(OBJECT_PATH)/*.o $(LIBS)
+@@ -71,11 +71,23 @@ $(STATICLIB) : $(OBJECTS)
+ $(AR) $(STATICLIB) $(OBJECT_PATH)/*.o
+
+ $(SHAREDLIB) : $(OBJECTS)
+- $(RM) -f $(@) $(SHAREDLIB).$(MAJOR) $(SHAREDLIB)
++ $(RM) -f $(@) $(SHAREDLIB).$(MAJOR).$(RELEASE) $(SHAREDLIB).$(MAJOR) $(SHAREDLIB)
+ $(CC) $(LDFLAGS) -fPIC @libflags@ $(OBJECT_PATH)/*.o $(LIBS)
++ $(LN) -s $(SHAREDLIB).$(MAJOR).$(RELEASE) @sharedname@
+ $(LN) -s @sharedname@ $(SHAREDLIB)
+ # $(LN) -s @sharedname@ $(SHAREDLIB).$(MAJOR)
+install-headers:
+ install -d $(DESTDIR)/usr/include/stk
@@ -63,25 +61,23 @@ Forwarded: no
+install: $(SHAREDLIB) install-headers
+ install -d $(DESTDIR)/usr/share/stk
+ install -d $(DESTDIR)/usr/lib
-+ install -m 644 $(LIBRARY) $(DESTDIR)/usr/lib
+ install -m 644 $(SHAREDLIB).$(MAJOR).$(RELEASE) $(DESTDIR)/usr/lib
-+# install -m 644 $(SHAREDLIB) $(DESTDIR)/usr/lib
+ ln -s $(SHAREDLIB).$(MAJOR).$(RELEASE) $(DESTDIR)/usr/lib/$(SHAREDLIB).$(MAJOR)
+ ln -s $(SHAREDLIB).$(MAJOR).$(RELEASE) $(DESTDIR)/usr/lib/$(SHAREDLIB)
+
$(OBJECTS) : Stk.h
clean :
-@@ -87,4 +100,4 @@ clean :
+@@ -86,4 +98,4 @@ clean :
$(RM) -fR *.dSYM
distclean: clean
- $(RM) Makefile
\ No newline at end of file
+ $(RM) Makefile
---- stk-4.4.2.orig/Makefile.in
-+++ stk-4.4.2/Makefile.in
-@@ -2,7 +2,7 @@
+--- stk.orig/Makefile.in
++++ stk/Makefile.in
+@@ -4,7 +4,7 @@ RM = /bin/rm
all :
cd src && $(MAKE)
@@ -90,10 +86,47 @@ Forwarded: no
cd projects/effects && $(MAKE) libeffects
cd projects/ragamatic && $(MAKE) libragamat
cd projects/examples && $(MAKE) -f libMakefile
-@@ -23,3 +23,6 @@ distclean: clean
+@@ -25,3 +25,6 @@ distclean: clean
cd projects/ragamatic && $(MAKE) distclean
cd projects/examples && $(MAKE) distclean
+install:
+ make -C src install
+# make -C projects/demo install
+--- stk.orig/configure
++++ stk/configure
+@@ -5237,9 +5237,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*)
+@@ -6967,7 +6967,8 @@ $debug ||
+ if test -n "$CONFIG_FILES"; then
+
+
+-ac_cr='
'
++ac_cr='
++'
+ ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
+ if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
+ ac_cs_awk_cr='\\r'
+--- stk.orig/configure.ac
++++ stk/configure.ac
+@@ -93,8 +93,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-realtime.patch b/debian/patches/02-realtime.patch
index ba11451..c4de943 100644
--- a/debian/patches/02-realtime.patch
+++ b/debian/patches/02-realtime.patch
@@ -8,8 +8,9 @@ Forwarded: no
--- stk.orig/Makefile.in
+++ stk/Makefile.in
-@@ -1,26 +1,34 @@
- ### Do not edit -- Generated by 'configure --with-whatever' from Makefile.in
+@@ -2,27 +2,35 @@
+
+ RM = /bin/rm
+REALTIME = @realtime@
+
@@ -23,7 +24,7 @@ Forwarded: no
cd projects/examples && $(MAKE) -f libMakefile
clean :
- -rm -f *~
+ $(RM) -f *~
cd src && $(MAKE) clean
cd projects/demo && $(MAKE) clean
+ifeq ($(REALTIME),yes)
@@ -33,7 +34,7 @@ Forwarded: no
cd projects/examples && $(MAKE) clean
distclean: clean
- -rm -rf config.log config.status autom4te.cache Makefile
+ $(RM) -rf config.log config.status autom4te.cache Makefile
cd src && $(MAKE) distclean
cd projects/demo && $(MAKE) distclean
+ifeq ($(REALTIME),yes)
--
stk packaging
More information about the pkg-multimedia-commits
mailing list