Source: vdr-plugin-skinenigmang
Version: 0.1.2+git20190720-1
Tags: patch
User: debian-cr...@lists.debian.org
Usertags: ftcbfs
vdr-plugin-skinenigmang fails to cross build from source, because it
uses the build architecture pkg-config and thus fails finding its
dependencies. The attached patch makes it use the host architecture
pkg-config and it thus becomes cross buildable. Please consider applying
the patch.
Helmut
diff --minimal -Nru vdr-plugin-skinenigmang-0.1.2+git20190720/debian/changelog
vdr-plugin-skinenigmang-0.1.2+git20190720/debian/changelog
--- vdr-plugin-skinenigmang-0.1.2+git20190720/debian/changelog 2019-07-20
06:00:11.000000000 +0200
+++ vdr-plugin-skinenigmang-0.1.2+git20190720/debian/changelog 2019-07-24
21:53:19.000000000 +0200
@@ -1,3 +1,10 @@
+vdr-plugin-skinenigmang (0.1.2+git20190720-1.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix FTCBFS: Use a triplet-prefixed pkg-config. (Closes: #-1)
+
+ -- Helmut Grohne <hel...@subdivi.de> Wed, 24 Jul 2019 21:53:19 +0200
+
vdr-plugin-skinenigmang (0.1.2+git20190720-1) unstable; urgency=medium
* New Upstream Snapshot (commit 995b108)
diff --minimal -Nru
vdr-plugin-skinenigmang-0.1.2+git20190720/debian/patches/cross.patch
vdr-plugin-skinenigmang-0.1.2+git20190720/debian/patches/cross.patch
--- vdr-plugin-skinenigmang-0.1.2+git20190720/debian/patches/cross.patch
1970-01-01 01:00:00.000000000 +0100
+++ vdr-plugin-skinenigmang-0.1.2+git20190720/debian/patches/cross.patch
2019-07-24 21:53:17.000000000 +0200
@@ -0,0 +1,30 @@
+--- vdr-plugin-skinenigmang-0.1.2+git20190720.orig/Makefile
++++ vdr-plugin-skinenigmang-0.1.2+git20190720/Makefile
+@@ -127,19 +127,21 @@
+
+ OBJS = $(PLUGIN).o enigma.o config.o logo.o tools.o status.o texteffects.o
setup.o font.o
+
++PKG_CONFIG ?= pkg-config
++
+ ifdef HAVE_IMAGEMAGICK
+ OBJS += bitmap.o
+ ifneq ($(HAVE_IMAGEMAGICK), GRAPHICS)
+-LIBS += $(shell pkg-config --libs Magick++)
+-INCLUDES += $(shell pkg-config --cflags Magick++)
++LIBS += $(shell $(PKG_CONFIG) --libs Magick++)
++INCLUDES += $(shell $(PKG_CONFIG) --cflags Magick++)
+ else
+-LIBS += $(shell pkg-config --libs GraphicsMagick++)
+-INCLUDES += $(shell pkg-config --cflags GraphicsMagick++)
++LIBS += $(shell $(PKG_CONFIG) --libs GraphicsMagick++)
++INCLUDES += $(shell $(PKG_CONFIG) --cflags GraphicsMagick++)
+ endif
+ endif
+
+-INCLUDES += $(shell pkg-config --cflags freetype2)
+-LIBS += $(shell pkg-config --libs freetype2)
++INCLUDES += $(shell $(PKG_CONFIG) --cflags freetype2)
++LIBS += $(shell $(PKG_CONFIG) --libs freetype2)
+
+ ### The main target:
+
diff --minimal -Nru
vdr-plugin-skinenigmang-0.1.2+git20190720/debian/patches/series
vdr-plugin-skinenigmang-0.1.2+git20190720/debian/patches/series
--- vdr-plugin-skinenigmang-0.1.2+git20190720/debian/patches/series
2019-07-20 06:00:11.000000000 +0200
+++ vdr-plugin-skinenigmang-0.1.2+git20190720/debian/patches/series
2019-07-24 21:52:29.000000000 +0200
@@ -1,2 +1,3 @@
fix-imagemagick-path.patch
use-pkg-config-for-freetype.diff
+cross.patch
diff --minimal -Nru vdr-plugin-skinenigmang-0.1.2+git20190720/debian/rules
vdr-plugin-skinenigmang-0.1.2+git20190720/debian/rules
--- vdr-plugin-skinenigmang-0.1.2+git20190720/debian/rules 2019-07-20
06:00:11.000000000 +0200
+++ vdr-plugin-skinenigmang-0.1.2+git20190720/debian/rules 2019-07-24
21:53:19.000000000 +0200
@@ -2,9 +2,10 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-
+-include /usr/share/dpkg/buildtools.mk
+PKG_CONFIG ?= pkg-config
MAKE_OPTIONS = VDRDIR=/usr/include/vdr LIBDIR=. LOCALEDIR=locale
HAVE_IMAGEMAGICK=1
-CXXFLAGS += $(shell pkg-config vdr --variable=cxxflags)
+CXXFLAGS += $(shell $(PKG_CONFIG) vdr --variable=cxxflags)
%:
dh $@ --with vdrplugin
