[SCM] drumkv1/master: Refresh patch.
mira-guest at users.alioth.debian.org
mira-guest at users.alioth.debian.org
Thu Jun 16 16:42:38 UTC 2016
The following commit has been merged in the master branch:
commit 67153181da4d529c0c4237ef44d73301d2335516
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date: Thu Jun 16 17:31:00 2016 +0200
Refresh patch.
diff --git a/debian/patches/0004-fix_install_path.patch b/debian/patches/0004-fix_install_path.patch
index 5fd88f3..e766b55 100644
--- a/debian/patches/0004-fix_install_path.patch
+++ b/debian/patches/0004-fix_install_path.patch
@@ -6,7 +6,7 @@ Index: drumkv1/src/src_lv2.pro
===================================================================
--- drumkv1.orig/src/src_lv2.pro
+++ drumkv1/src/src_lv2.pro
-@@ -54,7 +54,7 @@ unix {
+@@ -57,7 +57,7 @@ unix {
isEmpty(LIBDIR) {
LV2DIR = $${PREFIX}/lib/lv2
} else {
diff --git a/src/src_jack.pri.in b/src/src_jack.pri.in
index e7abaf7..372aa42 100644
--- a/src/src_jack.pri.in
+++ b/src/src_jack.pri.in
@@ -9,5 +9,6 @@ INCLUDEPATH = @ac_jack_incpath@
LIBS += @ac_jack_libs@
# Extra optimization flags
-QMAKE_CXXFLAGS += @ac_cflags@
-QMAKE_LFLAGS += @ac_ldflags@
+QMAKE_CXXFLAGS += $(CPPFLAGS) @ac_cflags@
+QMAKE_CFLAGS += $(CPPFLAGS)
+QMAKE_LFLAGS += $(LDFLAGS)
diff --git a/src/src_lv2.pri.in b/src/src_lv2.pri.in
index c66f46e..89696b8 100644
--- a/src/src_lv2.pri.in
+++ b/src/src_lv2.pri.in
@@ -9,5 +9,6 @@ INCLUDEPATH = @ac_lv2_incpath@
LIBS += @ac_lv2_libs@
# Extra optimization flags
-QMAKE_CXXFLAGS += @ac_cflags@
-QMAKE_LFLAGS += @ac_ldflags@
+QMAKE_CXXFLAGS += $(CPPFLAGS) @ac_cflags@
+QMAKE_CFLAGS += $(CPPFLAGS)
+QMAKE_LFLAGS += $(LDFLAGS)
diff --git a/src/src_lv2.pro b/src/src_lv2.pro
index 8a3e871..0079731 100644
--- a/src/src_lv2.pro
+++ b/src/src_lv2.pro
@@ -57,7 +57,7 @@ unix {
isEmpty(LIBDIR) {
LV2DIR = $${PREFIX}/lib/lv2
} else {
- LV2DIR = $${LIBDIR}/lv2
+ LV2DIR = $${PREFIX}/lib/lv2
}
}
diff --git a/src/src_lv2ui.pro b/src/src_lv2ui.pro
index d646bc0..d10c9b4 100644
--- a/src/src_lv2ui.pro
+++ b/src/src_lv2ui.pro
@@ -73,7 +73,7 @@ unix {
isEmpty(LIBDIR) {
LV2DIR = $${PREFIX}/lib/lv2
} else {
- LV2DIR = $${LIBDIR}/lv2
+ LV2DIR = $${PREFIX}/lib/lv2
}
}
--
drumkv1 packaging
More information about the pkg-multimedia-commits
mailing list