[SCM] samplv1/master: Added patch to fix install path.
mira-guest at users.alioth.debian.org
mira-guest at users.alioth.debian.org
Sat Jan 25 11:04:22 UTC 2014
The following commit has been merged in the master branch:
commit 409c5c5423e8cbd5c6bed7d127222336b0c0ba0c
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date: Sat Jan 25 12:03:52 2014 +0100
Added patch to fix install path.
diff --git a/debian/patches/0004-fix_install_path.patch b/debian/patches/0004-fix_install_path.patch
new file mode 100644
index 0000000..5d77b1d
--- /dev/null
+++ b/debian/patches/0004-fix_install_path.patch
@@ -0,0 +1,70 @@
+Description: Fixed installing path. (From upstream)
+Author: Jaromír Mikeš <mira.mikes at seznam.cz>
+Forwarded: no
+
+Index: samplv1/configure.ac
+===================================================================
+--- samplv1.orig/configure.ac 2014-01-25 11:48:49.534167836 +0100
++++ samplv1/configure.ac 2014-01-25 11:48:49.530167817 +0100
+@@ -13,6 +13,13 @@
+ fi
+ AC_SUBST(ac_prefix)
+
++# Set default library/plugin prefix.
++if test "x$exec_prefix" = "xNONE"; then
++ exec_prefix=$ac_prefix
++fi
++eval ac_libdir=$libdir
++AC_SUBST(ac_libdir)
++
+ # Enable debugging argument option.
+ AC_ARG_ENABLE(debug,
+ AC_HELP_STRING([--enable-debug], [enable debugging (default=no)]),
+Index: samplv1/src/src_lv2.pri.in
+===================================================================
+--- samplv1.orig/src/src_lv2.pri.in 2014-01-25 11:48:49.534167836 +0100
++++ samplv1/src/src_lv2.pri.in 2014-01-25 11:48:49.530167817 +0100
+@@ -2,6 +2,7 @@
+ #
+
+ PREFIX = @ac_prefix@
++LIBDIR = @ac_libdir@
+ CONFIG += @ac_debug@
+
+ INCLUDEPATH = @ac_lv2_incpath@
+Index: samplv1/src/src_lv2.pro
+===================================================================
+--- samplv1.orig/src/src_lv2.pro 2014-01-25 11:48:49.534167836 +0100
++++ samplv1/src/src_lv2.pro 2014-01-25 11:48:49.530167817 +0100
+@@ -39,7 +39,11 @@
+ contains(PREFIX, $$system(echo $HOME)) {
+ LV2DIR = $${PREFIX}/.lv2
+ } else {
+- LV2DIR = $${PREFIX}/lib/lv2
++ isEmpty(LIBDIR) {
++ LV2DIR = $${PREFIX}/lib/lv2
++ } else {
++ LV2DIR = $${LIBDIR}/lv2
++ }
+ }
+
+ TARGET_LV2 = $${NAME}.lv2/$${TARGET}.so
+Index: samplv1/src/src_lv2ui.pro
+===================================================================
+--- samplv1.orig/src/src_lv2ui.pro 2014-01-25 11:48:49.534167836 +0100
++++ samplv1/src/src_lv2ui.pro 2014-01-25 11:48:49.530167817 +0100
+@@ -55,11 +55,10 @@
+ contains(PREFIX, $$system(echo $HOME)) {
+ LV2DIR = $${PREFIX}/.lv2
+ } else {
+- ARCH = $$system(uname -m)
+- contains(ARCH, x86_64) {
+- LV2DIR = $${PREFIX}/lib64/lv2
+- } else {
++ isEmpty(LIBDIR) {
+ LV2DIR = $${PREFIX}/lib/lv2
++ } else {
++ LV2DIR = $${LIBDIR}/lv2
+ }
+ }
+
diff --git a/debian/patches/series b/debian/patches/series
index dee56f0..96bf5d0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
0001-buildsystem.patch
0002-fix_hardening.patch
0003-desktop_keywords.patch
+0004-fix_install_path.patch
--
samplv1 packaging
More information about the pkg-multimedia-commits
mailing list