[SCM] vamp-plugin-sdk/master: Fix pkg-config patch to let autoconf set the prefix variable.
bdrung at users.alioth.debian.org
bdrung at users.alioth.debian.org
Sun Mar 23 16:22:08 UTC 2014
The following commit has been merged in the master branch:
commit a05c50d8e92df50845eb710c39f999a17c0d33c4
Author: Benjamin Drung <bdrung at debian.org>
Date: Sun Mar 23 17:09:52 2014 +0100
Fix pkg-config patch to let autoconf set the prefix variable.
diff --git a/debian/control b/debian/control
index 4fd1226..34997a6 100644
--- a/debian/control
+++ b/debian/control
@@ -6,6 +6,7 @@ Uploaders:
Jaromír Mikeš <mira.mikes at seznam.cz>
Build-Depends:
debhelper (>= 9),
+ dh-autoreconf,
docbook-to-man,
doxygen,
graphviz,
diff --git a/debian/patches/02-fix_pkg-config.patch b/debian/patches/02-fix_pkg-config.patch
index 49fee49..f896d72 100644
--- a/debian/patches/02-fix_pkg-config.patch
+++ b/debian/patches/02-fix_pkg-config.patch
@@ -2,10 +2,8 @@ Description: Patch fixing pkg-config.
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Forwarded: no
-Index: vamp-plugin-sdk/pkgconfig/vamp-hostsdk.pc.in
-===================================================================
---- vamp-plugin-sdk.orig/pkgconfig/vamp-hostsdk.pc.in 2014-02-27 14:14:14.000000000 +0100
-+++ vamp-plugin-sdk/pkgconfig/vamp-hostsdk.pc.in 2014-02-27 14:20:06.675893445 +0100
+--- a/pkgconfig/vamp-hostsdk.pc.in
++++ b/pkgconfig/vamp-hostsdk.pc.in
@@ -1,7 +1,7 @@
-prefix=%PREFIX%
-exec_prefix=${prefix}
@@ -18,10 +16,8 @@ Index: vamp-plugin-sdk/pkgconfig/vamp-hostsdk.pc.in
Name: vamp-hostsdk
Version: 2.5
-Index: vamp-plugin-sdk/pkgconfig/vamp-sdk.pc.in
-===================================================================
---- vamp-plugin-sdk.orig/pkgconfig/vamp-sdk.pc.in 2014-02-27 14:14:14.000000000 +0100
-+++ vamp-plugin-sdk/pkgconfig/vamp-sdk.pc.in 2014-02-27 14:20:12.263921868 +0100
+--- a/pkgconfig/vamp-sdk.pc.in
++++ b/pkgconfig/vamp-sdk.pc.in
@@ -1,7 +1,7 @@
-prefix=%PREFIX%
-exec_prefix=${prefix}
@@ -34,10 +30,8 @@ Index: vamp-plugin-sdk/pkgconfig/vamp-sdk.pc.in
Name: vamp-sdk
Version: 2.5
-Index: vamp-plugin-sdk/pkgconfig/vamp.pc.in
-===================================================================
---- vamp-plugin-sdk.orig/pkgconfig/vamp.pc.in 2014-02-27 10:37:47.819199999 +0100
-+++ vamp-plugin-sdk/pkgconfig/vamp.pc.in 2014-02-27 14:19:59.279855804 +0100
+--- a/pkgconfig/vamp.pc.in
++++ b/pkgconfig/vamp.pc.in
@@ -1,7 +1,7 @@
-prefix=%PREFIX%
-exec_prefix=${prefix}
@@ -50,3 +44,43 @@ Index: vamp-plugin-sdk/pkgconfig/vamp.pc.in
Name: vamp
Version: 2.5
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -261,6 +261,7 @@
+ 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
++ rm -f $(PCDIR)/vamp.pc $(PCDIR)/vamp-sdk.pc $(PCDIR)/vamp-hostsdk.pc
+
+ install: $(SDK_STATIC) $(SDK_DYNAMIC) $(HOSTSDK_STATIC) $(HOSTSDK_DYNAMIC) $(PLUGIN_TARGET) $(HOST_TARGET) $(RDFGEN_TARGET)
+ mkdir -p $(DESTDIR)$(INSTALL_API_HEADERS)
+@@ -290,12 +291,9 @@
+ 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)
+- sed "s,%PREFIX%,$(INSTALL_PREFIX)," $(PCDIR)/vamp.pc.in \
+- > $(DESTDIR)$(INSTALL_PKGCONFIG)/vamp.pc
+- sed "s,%PREFIX%,$(INSTALL_PREFIX)," $(PCDIR)/vamp-sdk.pc.in \
+- > $(DESTDIR)$(INSTALL_PKGCONFIG)/vamp-sdk.pc
+- sed "s,%PREFIX%,$(INSTALL_PREFIX)," $(PCDIR)/vamp-hostsdk.pc.in \
+- > $(DESTDIR)$(INSTALL_PKGCONFIG)/vamp-hostsdk.pc
++ cp $(PCDIR)/vamp.pc $(DESTDIR)$(INSTALL_PKGCONFIG)/vamp.pc
++ cp $(PCDIR)/vamp-sdk.pc $(DESTDIR)$(INSTALL_PKGCONFIG)/vamp-sdk.pc
++ cp $(PCDIR)/vamp-hostsdk.pc $(DESTDIR)$(INSTALL_PKGCONFIG)/vamp-hostsdk.pc
+ sed -e "s,%LIBNAME%,$(INSTALL_SDK_LIBNAME),g" \
+ -e "s,%LINK_ABI%,$(INSTALL_SDK_LINK_ABI),g" \
+ -e "s,%LINK_DEV%,$(INSTALL_SDK_LINK_DEV),g" \
+--- a/configure.ac
++++ b/configure.ac
+@@ -50,5 +50,10 @@
+ changequote([,])dnl
+
+ AC_SUBST(CXXFLAGS)
+-AC_OUTPUT([Makefile])
++AC_OUTPUT([
++ Makefile
++ pkgconfig/vamp.pc
++ pkgconfig/vamp-hostsdk.pc
++ pkgconfig/vamp-sdk.pc
++])
+
diff --git a/debian/rules b/debian/rules
index 63a7850..b7e1b2d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,7 +8,7 @@ export LIBDIR=lib/$(DEB_HOST_MULTIARCH)
export DESTDIR=$(CURDIR)/debian/tmp
%:
- dh $@
+ dh $@ --with autoreconf
override_dh_auto_build:
--
vamp-plugin-sdk packaging
More information about the pkg-multimedia-commits
mailing list