[SCM] mediaconch/master: Call qmake with USE_WEBKIT=1
hyperair at users.alioth.debian.org
hyperair at users.alioth.debian.org
Mon Mar 14 18:44:34 UTC 2016
The following commit has been merged in the master branch:
commit 6dd7bddf0188ab3fdf6ea2907af4d1353902c099
Author: Chow Loong Jin <hyperair at debian.org>
Date: Tue Mar 15 02:11:19 2016 +0800
Call qmake with USE_WEBKIT=1
This avoids switching to QtWebEngine when 5.6 hits sid, since
QtWebEngine is not going to be packaged.
diff --git a/debian/rules b/debian/rules
index 676565d..8ec0cde 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,6 +14,8 @@ auto_build_cmd = \
$(1) -D"$$path"; \
done
+configure_targets = $(addprefix configure-, $(paths))
+
%:
dh $@ --with=autoreconf
@@ -21,8 +23,13 @@ auto_build_cmd = \
# override_dh_autoreconf:
# dh_autoreconf --as-needed
-override_dh_auto_configure:
- $(call auto_build_cmd,dh_auto_configure)
+override_dh_auto_configure: $(configure_targets)
+
+configure-%:
+ dh_auto_configure -D"$*"
+
+configure-Project/Qt/:
+ dh_auto_configure -DProject/Qt -- USE_WEBKIT=1
override_dh_auto_build:
$(call auto_build_cmd,dh_auto_build)
--
mediaconch packaging
More information about the pkg-multimedia-commits
mailing list