[SCM] stk/master: Refresh patches.
fsateler at users.alioth.debian.org
fsateler at users.alioth.debian.org
Fri Nov 27 23:49:38 UTC 2015
The following commit has been merged in the master branch:
commit ffc1ad4078aadbe3d1862ca17255218aba7b3f56
Author: Felipe Sateler <fsateler at debian.org>
Date: Thu Nov 19 23:30:34 2015 -0300
Refresh patches.
Add new patch using libtool -release style soname versioning
diff --git a/debian/patches/0001-Bump-soname-with-each-release.patch b/debian/patches/0001-Bump-soname-with-each-release.patch
new file mode 100644
index 0000000..89a5dca
--- /dev/null
+++ b/debian/patches/0001-Bump-soname-with-each-release.patch
@@ -0,0 +1,55 @@
+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/0001-Provide-an-install-target-to-the-src-target.patch b/debian/patches/0001-Provide-an-install-target-to-the-src-target.patch
deleted file mode 100644
index 0f9d466..0000000
--- a/debian/patches/0001-Provide-an-install-target-to-the-src-target.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-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 @@
-
- STATICLIB = libstk.a
- SHAREDLIB = @sharedlib@
--MAJOR = 4
-+MAJOR = 0
- RELEASE = 4.4.4
-
- AR = ar -rsc
-@@ -88,8 +88,9 @@ $(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)
-
-@@ -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 -sf $(SHAREDLIB).$(MAJOR).$(RELEASE) $(DESTDIR)$(PREFIX)$(LIBDIR)/$(SHAREDLIB)
-+ ln -sf $(SHAREDLIB).$(MAJOR).$(RELEASE) $(DESTDIR)$(PREFIX)$(LIBDIR)/$(SHAREDLIB).$(MAJOR)
-
-
- $(OBJECTS) : Stk.h
-@@ -114,4 +115,4 @@ clean :
- $(RM) -fR *.dSYM
-
- distclean: clean
-- $(RM) Makefile
-\ No newline at end of file
-+ $(RM) Makefile
diff --git a/debian/patches/0003-Link-against-system-s-shared-copies-of-rtaudio-and-r.patch b/debian/patches/0003-Link-against-system-s-shared-copies-of-rtaudio-and-r.patch
index 2afa514..721045b 100644
--- a/debian/patches/0003-Link-against-system-s-shared-copies-of-rtaudio-and-r.patch
+++ b/debian/patches/0003-Link-against-system-s-shared-copies-of-rtaudio-and-r.patch
@@ -166,7 +166,7 @@ index 3c078f4..6426909 100644
RAWWAVES = @rawwaves@
diff --git a/src/Makefile.in b/src/Makefile.in
-index 021e982..c019835 100644
+index ffbd329..7904bbc 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -52,7 +52,8 @@ LIBS = @LIBS@
diff --git a/debian/patches/series b/debian/patches/series
index 3b069ee..51c80b6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,4 @@
-0001-Provide-an-install-target-to-the-src-target.patch
+0001-Bump-soname-with-each-release.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