[SCM] vamp-plugin-sdk/master: Patches refreshed.
mira-guest at users.alioth.debian.org
mira-guest at users.alioth.debian.org
Sun Jun 25 22:36:50 UTC 2017
The following commit has been merged in the master branch:
commit 1669723e568bd1e41b0376ce77458f6f5818c86a
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date: Mon Jun 26 00:12:23 2017 +0200
Patches refreshed.
diff --git a/debian/patches/01-fix_multiarch.patch b/debian/patches/01-fix_multiarch.patch
index 1e680a3..df4f2fc 100644
--- a/debian/patches/01-fix_multiarch.patch
+++ b/debian/patches/01-fix_multiarch.patch
@@ -6,10 +6,12 @@ Index: vamp-plugin-sdk/Makefile.in
===================================================================
--- vamp-plugin-sdk.orig/Makefile.in
+++ vamp-plugin-sdk/Makefile.in
-@@ -42,6 +42,8 @@ CC = @CC@
+@@ -41,7 +41,9 @@ default: @TARGETS@
+ CC = @CC@
CXX = @CXX@
CFLAGS = @CFLAGS@
- CXXFLAGS = -I. @CXXFLAGS@ @SNDFILE_CFLAGS@
+-CXXFLAGS = -I. @CXXFLAGS@ @SNDFILE_CFLAGS@
++CXXFLAGS = -I. @CXXFLAGS@ @SNDFILE_CFLAGS@
+SUFFIX := $(shell uname -m | sed -e 's/^unknown/$//' -e 's/^i.86/$//' -e 's/^x86_64/$/64/')
+LIBDIR ?= lib$(SUFFIX)
@@ -25,7 +27,7 @@ Index: vamp-plugin-sdk/Makefile.in
+INSTALL_PLUGINS = $(INSTALL_PREFIX)/$(LIBDIR)/vamp
INSTALL_BINARIES = $(INSTALL_PREFIX)/bin
- INSTALL_SDK_LIBNAME = libvamp-sdk.so.2.5.0
+ INSTALL_SDK_LIBNAME = libvamp-sdk.so.2.7.0
@@ -90,7 +92,7 @@ INSTALL_HOSTSDK_LINK_DEV = libvamp-host
INSTALL_HOSTSDK_STATIC = libvamp-hostsdk.a
INSTALL_HOSTSDK_LA = libvamp-hostsdk.la
diff --git a/debian/patches/02-fix_pkg-config.patch b/debian/patches/02-fix_pkg-config.patch
index 7eec17d..21e238c 100644
--- a/debian/patches/02-fix_pkg-config.patch
+++ b/debian/patches/02-fix_pkg-config.patch
@@ -17,7 +17,7 @@ Index: vamp-plugin-sdk/pkgconfig/vamp-hostsdk.pc.in
+includedir=@includedir@
Name: vamp-hostsdk
- Version: 2.5
+ Version: 2.7.1
Index: vamp-plugin-sdk/pkgconfig/vamp-sdk.pc.in
===================================================================
--- vamp-plugin-sdk.orig/pkgconfig/vamp-sdk.pc.in
@@ -33,7 +33,7 @@ Index: vamp-plugin-sdk/pkgconfig/vamp-sdk.pc.in
+includedir=@includedir@
Name: vamp-sdk
- Version: 2.5
+ Version: 2.7.1
Index: vamp-plugin-sdk/pkgconfig/vamp.pc.in
===================================================================
--- vamp-plugin-sdk.orig/pkgconfig/vamp.pc.in
@@ -49,12 +49,12 @@ Index: vamp-plugin-sdk/pkgconfig/vamp.pc.in
+includedir=@includedir@
Name: vamp
- Version: 2.5
+ Version: 2.7.1
Index: vamp-plugin-sdk/Makefile.in
===================================================================
--- vamp-plugin-sdk.orig/Makefile.in
+++ vamp-plugin-sdk/Makefile.in
-@@ -265,6 +265,7 @@ clean:
+@@ -281,6 +281,7 @@ clean:
distclean: clean
rm -f $(SDK_STATIC) $(SDK_DYNAMIC) $(HOSTSDK_STATIC) $(HOSTSDK_DYNAMIC) $(PLUGIN_TARGET) $(HOST_TARGET) $(RDFGEN_TARGET) *~ */*~
rm -f config.log config.status Makefile
@@ -62,7 +62,7 @@ Index: vamp-plugin-sdk/Makefile.in
install: $(SDK_STATIC) $(SDK_DYNAMIC) $(HOSTSDK_STATIC) $(HOSTSDK_DYNAMIC) $(PLUGIN_TARGET) $(HOST_TARGET) $(RDFGEN_TARGET)
mkdir -p $(DESTDIR)$(INSTALL_API_HEADERS)
-@@ -294,12 +295,9 @@ install: $(SDK_STATIC) $(SDK_DYNAMIC) $(
+@@ -310,12 +311,9 @@ install: $(SDK_STATIC) $(SDK_DYNAMIC) $(
ln -s $(INSTALL_SDK_LIBNAME) $(DESTDIR)$(INSTALL_SDK_LIBS)/$(INSTALL_SDK_LINK_DEV)
rm -f $(DESTDIR)$(INSTALL_SDK_LIBS)/$(INSTALL_HOSTSDK_LINK_DEV)
ln -s $(INSTALL_HOSTSDK_LIBNAME) $(DESTDIR)$(INSTALL_SDK_LIBS)/$(INSTALL_HOSTSDK_LINK_DEV)
@@ -82,7 +82,7 @@ Index: vamp-plugin-sdk/configure.ac
===================================================================
--- vamp-plugin-sdk.orig/configure.ac
+++ vamp-plugin-sdk/configure.ac
-@@ -55,5 +55,10 @@ changequote([,])dnl
+@@ -56,5 +56,10 @@ changequote([,])dnl
AC_SUBST(CXXFLAGS)
AC_SUBST(CFLAGS)
--
vamp-plugin-sdk packaging
More information about the pkg-multimedia-commits
mailing list