[SCM] vamp-plugin-sdk/master: Added patch to fir pkg-config (Closes: #728826)

mira-guest at users.alioth.debian.org mira-guest at users.alioth.debian.org
Thu Feb 27 13:42:01 UTC 2014


The following commit has been merged in the master branch:
commit 24067c4fb12eee861e3c973678c6c827defe52a2
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Thu Feb 27 14:41:52 2014 +0100

    Added patch to fir pkg-config (Closes: #728826)

diff --git a/debian/patches/01-fix_multiarch.patch b/debian/patches/01-fix_multiarch.patch
index 8d0385d..23b4f5d 100644
--- a/debian/patches/01-fix_multiarch.patch
+++ b/debian/patches/01-fix_multiarch.patch
@@ -35,27 +35,3 @@ Index: vamp-plugin-sdk-2.5/Makefile.in
  
  # Flags required to tell the compiler to create a dynamically loadable object
  #
-Index: vamp-plugin-sdk-2.5/pkgconfig/vamp-hostsdk.pc.in
-===================================================================
---- vamp-plugin-sdk-2.5.orig/pkgconfig/vamp-hostsdk.pc.in	2013-05-26 00:43:52.787522806 +0200
-+++ vamp-plugin-sdk-2.5/pkgconfig/vamp-hostsdk.pc.in	2013-05-26 00:43:52.783522806 +0200
-@@ -1,6 +1,6 @@
- prefix=%PREFIX%
- exec_prefix=${prefix}
--libdir=${exec_prefix}/lib
-+libdir=${prefix}%LIBDIR%
- includedir=${prefix}/include
- 
- Name: vamp-hostsdk
-Index: vamp-plugin-sdk-2.5/pkgconfig/vamp-sdk.pc.in
-===================================================================
---- vamp-plugin-sdk-2.5.orig/pkgconfig/vamp-sdk.pc.in	2013-05-26 00:43:52.787522806 +0200
-+++ vamp-plugin-sdk-2.5/pkgconfig/vamp-sdk.pc.in	2013-05-26 00:43:52.783522806 +0200
-@@ -1,6 +1,6 @@
- prefix=%PREFIX%
- exec_prefix=${prefix}
--libdir=${exec_prefix}/lib
-+libdir=${prefix}%LIBDIR%
- includedir=${prefix}/include
- 
- Name: vamp-sdk
diff --git a/debian/patches/02-fix_pkg-config.patch b/debian/patches/02-fix_pkg-config.patch
new file mode 100644
index 0000000..49fee49
--- /dev/null
+++ b/debian/patches/02-fix_pkg-config.patch
@@ -0,0 +1,52 @@
+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
+@@ -1,7 +1,7 @@
+-prefix=%PREFIX%
+-exec_prefix=${prefix}
+-libdir=${exec_prefix}/lib
+-includedir=${prefix}/include
++prefix=@prefix@
++exec_prefix=@exec_prefix@
++libdir=@libdir@
++includedir=@includedir@
+ 
+ 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
+@@ -1,7 +1,7 @@
+-prefix=%PREFIX%
+-exec_prefix=${prefix}
+-libdir=${exec_prefix}/lib
+-includedir=${prefix}/include
++prefix=@prefix@
++exec_prefix=@exec_prefix@
++libdir=@libdir@
++includedir=@includedir@
+ 
+ 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
+@@ -1,7 +1,7 @@
+-prefix=%PREFIX%
+-exec_prefix=${prefix}
+-libdir=${exec_prefix}/lib
+-includedir=${prefix}/include
++prefix=@prefix@
++exec_prefix=@exec_prefix@
++libdir=@libdir@
++includedir=@includedir@
+ 
+ Name: vamp
+ Version: 2.5
diff --git a/debian/patches/series b/debian/patches/series
index 2f0dafa..a1e988d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 01-fix_multiarch.patch
+02-fix_pkg-config.patch

-- 
vamp-plugin-sdk packaging



More information about the pkg-multimedia-commits mailing list