[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#916096: smplayer FTCBFS: uses the build architecture qmake



Source: smplayer
Version: 18.5.0~ds1-2
Tags: patch
User: helmutg@debian.org
Usertags: rebootstrap

smplayer fails to cross build from source, because it uses the build
architecture qmake. The attached patch makes it use a cross qmake for
cross compilation. Furthermore, it needs to Build-Depends:
qt5-qmake:native in order to use lrelease. Please consider applying the
patch.

Helmut
diff --minimal -Nru smplayer-18.5.0~ds1/debian/changelog smplayer-18.5.0~ds1/debian/changelog
--- smplayer-18.5.0~ds1/debian/changelog	2018-06-19 19:58:18.000000000 +0200
+++ smplayer-18.5.0~ds1/debian/changelog	2018-12-10 05:58:23.000000000 +0100
@@ -1,3 +1,12 @@
+smplayer (18.5.0~ds1-2.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTCBFS: (Closes: #-1)
+    + Pass a cross qmake along.
+    + Missing Build-Depends: qt5-qmake:native for lrelease.
+
+ -- Helmut Grohne <helmut@subdivi.de>  Mon, 10 Dec 2018 05:58:23 +0100
+
 smplayer (18.5.0~ds1-2) unstable; urgency=medium
 
   * Disable downloading potentially insecure javascript from youtube.com
diff --minimal -Nru smplayer-18.5.0~ds1/debian/control smplayer-18.5.0~ds1/debian/control
--- smplayer-18.5.0~ds1/debian/control	2018-06-19 19:58:18.000000000 +0200
+++ smplayer-18.5.0~ds1/debian/control	2018-12-10 05:58:21.000000000 +0100
@@ -10,6 +10,7 @@
  qtbase5-dev (>= 5.1),
  qtbase5-private-dev,
  qt5-qmake,
+ qt5-qmake:native,
  qtscript5-dev,
  qttools5-dev-tools,
  zlib1g-dev
diff --minimal -Nru smplayer-18.5.0~ds1/debian/rules smplayer-18.5.0~ds1/debian/rules
--- smplayer-18.5.0~ds1/debian/rules	2018-06-19 19:58:18.000000000 +0200
+++ smplayer-18.5.0~ds1/debian/rules	2018-12-10 05:58:06.000000000 +0100
@@ -6,8 +6,15 @@
 
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
+include /usr/share/dpkg/architecture.mk
+
+ifeq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH))
+QMAKE=qmake
+else
+QMAKE=$(DEB_HOST_GNU_TYPE)-qmake
+endif
 QMAKE_OPTS = DEFINES+=NO_DEBUG_ON_CONSOLE DEFINES-=MPLAYER2_SUPPORT
-MAKE_OPTS  = PREFIX=/usr QMAKE=qmake LRELEASE=lrelease QMAKE_OPTS="$(QMAKE_OPTS)"
+MAKE_OPTS  = PREFIX=/usr QMAKE=$(QMAKE) LRELEASE=lrelease QMAKE_OPTS="$(QMAKE_OPTS)"
 
 
 %:

Reply to: