[SCM] drumkv1/master: Revert "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 4ce1be840a3b9c09f835f2d62af7c7494c331770
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date: Thu Jun 16 17:34:07 2016 +0200
Revert "Refresh patch."
This reverts commit 67153181da4d529c0c4237ef44d73301d2335516.
diff --git a/debian/patches/0004-fix_install_path.patch b/debian/patches/0004-fix_install_path.patch
index e766b55..5fd88f3 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
-@@ -57,7 +57,7 @@ unix {
+@@ -54,7 +54,7 @@ unix {
isEmpty(LIBDIR) {
LV2DIR = $${PREFIX}/lib/lv2
} else {
diff --git a/src/src_jack.pri.in b/src/src_jack.pri.in
index 372aa42..e7abaf7 100644
--- a/src/src_jack.pri.in
+++ b/src/src_jack.pri.in
@@ -9,6 +9,5 @@ INCLUDEPATH = @ac_jack_incpath@
LIBS += @ac_jack_libs@
# Extra optimization flags
-QMAKE_CXXFLAGS += $(CPPFLAGS) @ac_cflags@
-QMAKE_CFLAGS += $(CPPFLAGS)
-QMAKE_LFLAGS += $(LDFLAGS)
+QMAKE_CXXFLAGS += @ac_cflags@
+QMAKE_LFLAGS += @ac_ldflags@
diff --git a/src/src_lv2.pri.in b/src/src_lv2.pri.in
index 89696b8..c66f46e 100644
--- a/src/src_lv2.pri.in
+++ b/src/src_lv2.pri.in
@@ -9,6 +9,5 @@ INCLUDEPATH = @ac_lv2_incpath@
LIBS += @ac_lv2_libs@
# Extra optimization flags
-QMAKE_CXXFLAGS += $(CPPFLAGS) @ac_cflags@
-QMAKE_CFLAGS += $(CPPFLAGS)
-QMAKE_LFLAGS += $(LDFLAGS)
+QMAKE_CXXFLAGS += @ac_cflags@
+QMAKE_LFLAGS += @ac_ldflags@
diff --git a/src/src_lv2.pro b/src/src_lv2.pro
index 0079731..8a3e871 100644
--- a/src/src_lv2.pro
+++ b/src/src_lv2.pro
@@ -57,7 +57,7 @@ unix {
isEmpty(LIBDIR) {
LV2DIR = $${PREFIX}/lib/lv2
} else {
- LV2DIR = $${PREFIX}/lib/lv2
+ LV2DIR = $${LIBDIR}/lv2
}
}
diff --git a/src/src_lv2ui.pro b/src/src_lv2ui.pro
index d10c9b4..d646bc0 100644
--- a/src/src_lv2ui.pro
+++ b/src/src_lv2ui.pro
@@ -73,7 +73,7 @@ unix {
isEmpty(LIBDIR) {
LV2DIR = $${PREFIX}/lib/lv2
} else {
- LV2DIR = $${PREFIX}/lib/lv2
+ LV2DIR = $${LIBDIR}/lv2
}
}
--
drumkv1 packaging
More information about the pkg-multimedia-commits
mailing list