media-tv/dtv-scan-tables: Patch around Makefile issue

This patch has been sent upstream.

Closes: https://bugs.gentoo.org/689522
Package-Manager: Portage-2.3.69, Repoman-2.3.13
Signed-off-by: James Le Cuirot <chewi@gentoo.org>

diff --git a/media-tv/dtv-scan-tables/dtv-scan-tables-9999.ebuild b/media-tv/dtv-scan-tables/dtv-scan-tables-9999.ebuild
index e63f60d8936cd86fa2b01502f23aaa1bd6d0d4fe..305e482a91508e49e067eb111f914265413f9379 100644 (file)
--- a/media-tv/dtv-scan-tables/dtv-scan-tables-9999.ebuild
+++ b/media-tv/dtv-scan-tables/dtv-scan-tables-9999.ebuild
@@ -20,8 +20,16 @@ SLOT="0"
 
 DEPEND=">=media-tv/v4l-utils-1.4"
 
+PATCHES=( "${FILESDIR}"/Makefile.patch )
 DOCS=( README )
 
+src_prepare() {
+       default
+
+       # Conversion failure!
+       rm -v dvb-t/ke-Nairobi || die
+}
+
 src_compile() {
        emake dvbv3 dvbv5
 }

diff --git a/media-tv/dtv-scan-tables/files/Makefile.patch b/media-tv/dtv-scan-tables/files/Makefile.patch
new file mode 100644 (file)
index 0000000..60c6cde
--- /dev/null
+++ b/media-tv/dtv-scan-tables/files/Makefile.patch
@@ -0,0 +1,55 @@
+From 17049393c60503d305787d06b7137227a99ed2af Mon Sep 17 00:00:00 2001
+From: James Le Cuirot <chewi@gentoo.org>
+Date: Sat, 13 Jul 2019 16:23:23 +0100
+Subject: [PATCH] Improve Makefile to avoid "Argument list too long" error
+
+I wouldn't expect a foreach loop to be prone to this issue but it's
+not the right way to write a Makefile anyway.
+
+Note that conversion failures are now fatal and the dvb-t/ke-Nairobi
+file is failing to convert at the moment.
+
+Signed-off-by: James Le Cuirot <chewi@gentoo.org>
+---
+ Makefile | 16 ++++++++++------
+ 1 file changed, 10 insertions(+), 6 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 901dc9d..7cdb5bc 100644
+--- a/Makefile
++++ b/Makefile
+@@ -17,6 +17,8 @@ DVBV3DIRS = atsc dvb-c dvb-s dvb-t
+ DVBV5DIRS = $(DVBV3DIRS) isdb-t
+ 
+ DVBV3CHANNELFILES = $(foreach dir,$(DVBV3DIRS),$(wildcard $(dir)/*))
++DVBV3OUTPUTFILES = $(patsubst %,$(DVBV3OUTPUTDIR)/%,$(DVBV3CHANNELFILES))
++DVBV5OUTPUTFILES = $(patsubst %,$(DVBV5OUTPUTDIR)/%,$(DVBV3CHANNELFILES))
+ 
+ DVBFORMATCONVERT_CHANNEL_DVBV5 = -ICHANNEL -ODVBV5
+ DVBFORMATCONVERT_CHANNEL_DVBV3 = -IDVBV5 -OCHANNEL
+@@ -42,14 +44,16 @@ ifeq ($(DVBV3DIR),)
+ DVBV3DIR = dvbv3
+ endif
+ 
+-dvbv3:
+-      @$(foreach var,$(DVBV3DIRS), $(MKDIR) $(DVBV3OUTPUTDIR)/$(var);)
+-      @$(foreach var,$(DVBV3CHANNELFILES), $(DVBFORMATCONVERT) $(DVBFORMATCONVERT_CHANNEL_DVBV3) $(var) $(DVBV3OUTPUTDIR)/$(var);)
++$(DVBV3OUTPUTFILES): $(DVBV3OUTPUTDIR)/%: %
++      @$(MKDIR) "$(dir $@)"
++      @$(DVBFORMATCONVERT) $(DVBFORMATCONVERT_CHANNEL_DVBV3) "$<" "$@"
+ 
++$(DVBV5OUTPUTFILES): $(DVBV5OUTPUTDIR)/%: $(DVBV3OUTPUTDIR)/%
++      @$(MKDIR) "$(dir $@)"
++      @$(DVBFORMATCONVERT) $(DVBFORMATCONVERT_CHANNEL_DVBV5) "$<" "$@"
+ 
+-dvbv5: $(DVBV3OUTPUTDIR)
+-      @$(foreach var,$(DVBV3DIRS), $(MKDIR) $(DVBV5OUTPUTDIR)/$(var);)
+-      @$(foreach var,$(DVBV3CHANNELFILES), $(DVBFORMATCONVERT) $(DVBFORMATCONVERT_CHANNEL_DVBV5) $(DVBV3OUTPUTDIR)/$(var) $(DVBV5OUTPUTDIR)/$(var);)
++dvbv3: $(DVBV3OUTPUTFILES)
++dvbv5: $(DVBV5OUTPUTFILES)
+ 
+ install:
+       @mkdir -p $(DATADIR)/$(DVBV5DIR)
+-- 
+2.21.0
+