Thank you very much Helmut for your review.
I've attached a new patch per your suggestions.
Best,
Nilesh
From 5ebc536d6120c8f7b95be09aa406baa092782862 Mon Sep 17 00:00:00 2001
From: Nilesh Patra <[email protected]>
Date: Thu, 7 Aug 2025 16:58:07 +0530
Subject: [PATCH] Get vdr-plugin-xineliboutput cross building
---
debian/patches/cross.patch | 63 ++++++++++++++++++++++++++++++++++++++
debian/patches/series | 1 +
debian/rules | 9 ++++--
3 files changed, 71 insertions(+), 2 deletions(-)
create mode 100644 debian/patches/cross.patch
diff --git a/debian/patches/cross.patch b/debian/patches/cross.patch
new file mode 100644
index 0000000..f843873
--- /dev/null
+++ b/debian/patches/cross.patch
@@ -0,0 +1,63 @@
+--- a/Makefile
++++ b/Makefile
+@@ -46,6 +46,8 @@
+ CXX ?= g++
+ CC ?= gcc
+ OPTFLAGS ?=
++PKG_CONFIG ?= pkg-config
++CC_FOR_BUILD ?= $(CC)
+
+ ifeq ($(ARCH_APPLE_DARWIN), yes)
+ CXXFLAGS ?= -O3 -pipe -Wall -Woverloaded-virtual -fPIC -g -fno-common -bundle -flat_namespace -undefined suppress
+@@ -63,7 +65,7 @@
+ ###
+
+ # Use package data if installed...otherwise assume we're under the VDR source directory:
+-PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell PKG_CONFIG_PATH="$$PKG_CONFIG_PATH:../../.." pkg-config --variable=$(1) vdr))
++PKGCFG = $(if $(VDRDIR),$(shell $(PKG_CONFIG) --variable=$(1) $(VDRDIR)/vdr.pc),$(shell PKG_CONFIG_PATH="$$PKG_CONFIG_PATH:../../.." $(PKG_CONFIG) --variable=$(1) vdr))
+ BINDIR = $(call PKGCFG,bindir)
+ LIBDIR = $(call PKGCFG,libdir)
+ LOCDIR = $(call PKGCFG,locdir)
+@@ -296,7 +298,7 @@
+
+ mpg2c: mpg2c.c
+ @echo CCLD $@
+- $(Q)$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) mpg2c.c -o $@
++ $(Q)$(CC_FOR_BUILD) $(CPPFLAGS) $(CFLAGS_FOR_BUILD) $(LDFLAGS) mpg2c.c -o $@
+
+ # data
+ black_720x576.c: mpg2c black_720x576.mpg
+--- a/configure
++++ b/configure
+@@ -189,9 +189,9 @@
+ if $PKG_CONFIG --exists $libname; then
+ if $PKG_CONFIG --libs $libname >/dev/null; then
+ add_flags LIBS_$subsys \
+- `pkg-config --libs-only-L $libname` \
+- `pkg-config --libs-only-l $libname`
+- add_flags CFLAGS_$subsys `pkg-config --cflags-only-I $libname`
++ `$PKG_CONFIG --libs-only-L $libname` \
++ `$PKG_CONFIG --libs-only-l $libname`
++ add_flags CFLAGS_$subsys `$PKG_CONFIG --cflags-only-I $libname`
+ log "yes"
+ return 0
+ fi
+@@ -312,6 +312,7 @@
+ echo " --disable-pkgconfig do not use pkg-config"
+ echo " --cc=CC select C compiler"
+ echo " --cxx=CXX select C++ compiler"
++ echo " --pkgconfig=PKG_CONFIG select pkg-config Path"
+ echo " --add-cflags=FLAGS add compiler flags"
+ }
+
+@@ -334,6 +335,10 @@
+ CXX=$optval
+ logdbg "C++ compiler: $CXX"
+ ;;
++ --pkgconfig=?*)
++ PKG_CONFIG=$optval
++ logdbg "PKG_CONFIG: $PKG_CONFIG"
++ ;;
+ --add-cflags=?*)
+ CFLAGS="$CFLAGS $optval"
+ logdbg "CFLAGS: $CFLAGS"
diff --git a/debian/patches/series b/debian/patches/series
index cebe540..24cd223 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
disable-po-update.patch
cppflags.patch
+cross.patch
diff --git a/debian/rules b/debian/rules
index fd85908..97cd086 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,18 +3,23 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
+include /usr/share/dpkg/architecture.mk
+DPKG_EXPORT_BUILDTOOLS=1
+include /usr/share/dpkg/buildtools.mk
ifeq (,$(filter terse,$(DEB_BUILD_OPTIONS)))
MAKE_OPTIONS += VERBOSE=1
endif
+export DEB_CXXFLAGS_MAINT_APPEND = -fPIC
+
%:
dh $@ --with vdrplugin
override_dh_auto_configure:
- ./configure --disable-dbus-glib-1
+ ./configure --disable-dbus-glib-1 --cc="$(CC)" --cxx="$(CXX)" --pkgconfig="$(PKG_CONFIG)"
override_dh_auto_build:
- dh_auto_build -- all $(MAKE_OPTIONS)
+ dh_auto_build --buildsystem=makefile -- all $(MAKE_OPTIONS)
txt2man -s 1 -t vdr-sxfe -v "Remote X-Server frontend for vdr-plugin-xineliboutput" debian/vdr-sxfe.1.txt >vdr-sxfe.1
txt2man -s 1 -t vdr-fbfe -v "Remote Framebuffer frontend for vdr-plugin-xineliboutput" debian/vdr-fbfe.1.txt >vdr-fbfe.1
txt2man -s 1 -t vdr-fbfe -v "Remote Framebuffer frontend for vdr-plugin-xineliboutput" debian/vdr-wlfe.1.txt >vdr-wlfe.1
--
2.47.2
_______________________________________________
pkg-vdr-dvb-devel mailing list
[email protected]
https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-vdr-dvb-devel
