dvb-apps: Use debian source and port patches (#6026)

cross/dvb-apps/Makefile

@@ -1,11 +1,10 @@
 PKG_NAME = dvb-apps
-PKG_VERS = 3d43b280298c
+PKG_VERS = 1.1.1+rev1500
 PKG_EXT = tar.bz2
-PKG_DIST_NAME = $(PKG_VERS).$(PKG_EXT)
-PKG_DIST_SITE = https://linuxtv.org/hg/dvb-apps/archive
+PKG_DIST_NAME = linuxtv-$(PKG_NAME)_$(PKG_VERS).orig.$(PKG_EXT)
+PKG_DIST_SITE = http://deb.debian.org/debian/pool/main/l/linuxtv-dvb-apps
 PKG_DIST_FILE = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
-PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
-
+PKG_DIR = $(PKG_NAME)-3ee111da5b3a
 DEPENDS =
 
 HOMEPAGE = https://www.linuxtv.org/wiki/index.php/LinuxTV_dvb-apps
@@ -14,4 +13,7 @@ LICENSE  = GPL
 
 CONFIGURE_TARGET = nop
 
+# Applying Debian patches
+PATCHES_LEVEL = 1
+
 include ../../mk/spksrc.cross-cc.mk

cross/dvb-apps/digests

@@ -1,3 +1,3 @@
-dvb-apps-3d43b280298c.tar.bz2 SHA1 20d97fdcc5c0201780d6e82f276c4bd049ee4dae
-dvb-apps-3d43b280298c.tar.bz2 SHA256 f39e2f0ebed7e32bce83522062ad4d414f67fccd5df1b647618524497e15e057
-dvb-apps-3d43b280298c.tar.bz2 MD5 e6c8e3a1760cc4f64c2d59c3d3b39842
+dvb-apps-1.1.1+rev1500.tar.bz2 SHA1 2b7f5a533e20bcbf06539119670e429bf73e8a96
+dvb-apps-1.1.1+rev1500.tar.bz2 SHA256 ff437eccc10532012eca803ac5851f8a5d87a717707a461ca378363c9386c839
+dvb-apps-1.1.1+rev1500.tar.bz2 MD5 89eee9c710ce7420546d6c0064b2dc7c

cross/dvb-apps/patches/01_README.scan.dpatch

@@ -0,0 +1,28 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_README.scan.dpatch by Thomas Schmidt <[email protected]>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: change Readme to list Debian-specific Paths
+
+@DPATCH@
+diff -urNad linuxtv-dvb-apps-1.1.1+rev1207~/util/scan/README linuxtv-dvb-apps-1.1.1+rev1207/util/scan/README
+--- linuxtv-dvb-apps-1.1.1+rev1207~/util/scan/README	2008-06-17 01:44:38.000000000 +1000
++++ linuxtv-dvb-apps-1.1.1+rev1207/util/scan/README	2008-06-17 20:18:03.000000000 +1000
+@@ -6,13 +6,13 @@
+ feel free to submit it to the linux-dvb mailing list
+ http://www.linuxtv.org/lists.php.
+
+-Basic usage: ./dvbscan dvb-s/Astra-19.2E | tee mychannels.conf
+-or           ./atscscan atsc/us-NTSC-center-frequencies-8VSB
++Basic usage: dvbscan dvb-s/Astra-19.2E | tee mychannels.conf
++or           atscscan atsc/us-NTSC-center-frequencies-8VSB
+
+ If you want it to check a specific frequency, tune to that frequency
+-(e.g. using szap/tzap/czap/azap) and then use './dvbscan -c' or './atscscan -c'.
++(e.g. using szap/tzap/czap/azap) and then use 'dvbscan -c' or 'atscscan -c'.
+
+-For more scan options see ./dvbscan -h or ./atscscan -h
++For more scan options see dvbscan -h or atscscan -h
+
+ atscscan is _just_ a copy of dvbscan to not confuse ATSC-user.
+

cross/dvb-apps/patches/02_dtv-scan-tables.patch

@@ -0,0 +1,28 @@
+Description: Remove scan files from dvb-apps package
+ The scan files included in the linux-dvb-apps tarball are redundant
+ and out of date since Jan 2013, when the scan files were split into a
+ separate upstream dtv-scan-tables tarball. Debian has followed
+ upstream's lead, and split these packages in Debian too.
+ .
+ Remove the linux-dvb-apps scan files from dvb-apps package until
+ such time as upstream removes them from tarball.
+Author: Jonathan McCrohan <[email protected]>
+Date: Thu, 19 Sep 2013 00:33:37 +0100
+---
+--- a/util/scan/Makefile
++++ b/util/scan/Makefile
+@@ -30,12 +30,5 @@ atsc_psip_section.c atsc_psip_section.h:
+ include ../../Make.rules
+
+ install::
+-	@echo installing scan files
+-	@mkdir -p $(DESTDIR)$(sharedir)/dvb/atsc
+-	@mkdir -p $(DESTDIR)$(sharedir)/dvb/dvb-c
+-	@mkdir -p $(DESTDIR)$(sharedir)/dvb/dvb-s
+-	@mkdir -p $(DESTDIR)$(sharedir)/dvb/dvb-t
+-	@install -m 664 atsc/* $(DESTDIR)$(sharedir)/dvb/atsc/
+-	@install -m 664 dvb-c/* $(DESTDIR)$(sharedir)/dvb/dvb-c/
+-	@install -m 664 dvb-s/* $(DESTDIR)$(sharedir)/dvb/dvb-s/
+-	@install -m 664 dvb-t/* $(DESTDIR)$(sharedir)/dvb/dvb-t/
++	@echo not installing scan files
++	@echo please see dtv-scan-tables package instead

cross/dvb-apps/patches/09_x_zap_flush_stdout.dpatch

@@ -0,0 +1,36 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+
+## 09_x_zap_flush_stdout.dpatch by Sebastian Schmidt <[email protected]>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Make [stc]zap flush stdout after writing status line
+
+@DPATCH@
+Index: linuxtv-dvb-apps-1.1.1+rev1483/util/szap/czap.c
+===================================================================
+--- linuxtv-dvb-apps-1.1.1+rev1483.orig/util/szap/czap.c	2012-04-11 00:44:06.000000000 +1000
++++ linuxtv-dvb-apps-1.1.1+rev1483/util/szap/czap.c	2012-05-13 20:28:36.000000000 +1000
+@@ -229,9 +229,10 @@
+ 		if (status & FE_HAS_LOCK)
+ 			printf("FE_HAS_LOCK");
+
+-		usleep(1000000);
+
+ 		printf("\n");
++		fflush(stdout);
++		usleep(1000000);
+
+ 		if (exit_after_tuning && (status & FE_HAS_LOCK))
+ 			break;
+Index: linuxtv-dvb-apps-1.1.1+rev1483/util/szap/szap.c
+===================================================================
+--- linuxtv-dvb-apps-1.1.1+rev1483.orig/util/szap/szap.c	2012-04-11 00:44:06.000000000 +1000
++++ linuxtv-dvb-apps-1.1.1+rev1483/util/szap/szap.c	2012-05-13 20:28:51.000000000 +1000
+@@ -204,6 +204,7 @@
+ 		if (exit_after_tuning && ((status & FE_HAS_LOCK) || (++timeout >= 10)))
+ 			break;
+
++		fflush(stdout);
+ 		usleep(1000000);
+ 	} while (1);
+

cross/dvb-apps/patches/15_stdint_include.dpatch

@@ -0,0 +1,41 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_README.scan.dpatch by Stephane Glondu <[email protected]>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Explicitly include <stdint.h> and include system headers first
+## DP: to fix FTBFS (Closes: #525580)
+
+@DPATCH@
+diff -Nru linuxtv-dvb-apps-1.1.1+rev1207/lib/libdvbapi/dvbaudio.c linuxtv-dvb-apps-1.1.1+rev1207/lib/libdvbapi/dvbaudio.c
+--- linuxtv-dvb-apps-1.1.1+rev1207/lib/libdvbapi/dvbaudio.c	2008-06-16 15:44:38.000000000 +0000
++++ linuxtv-dvb-apps-1.1.1+rev1207/lib/libdvbapi/dvbaudio.c	2009-04-29 13:10:19.000000000 +0000
+@@ -21,6 +21,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <stdio.h>
++#include <stdint.h>
+ #include <sys/param.h>
+ #include <fcntl.h>
+ #include <unistd.h>
+diff -Nru linuxtv-dvb-apps-1.1.1+rev1207/test/test_av.c linuxtv-dvb-apps-1.1.1+rev1207/test/test_av.c
+--- linuxtv-dvb-apps-1.1.1+rev1207/test/test_av.c	2008-06-16 15:44:38.000000000 +0000
++++ linuxtv-dvb-apps-1.1.1+rev1207/test/test_av.c	2009-04-29 13:10:19.000000000 +0000
+@@ -23,6 +23,7 @@
+ #include <sys/ioctl.h>
+ #include <stdlib.h>
+ #include <stdio.h>
++#include <stdint.h>
+ #include <string.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+diff -Nru linuxtv-dvb-apps-1.1.1+rev1207/util/scan/diseqc.c linuxtv-dvb-apps-1.1.1+rev1207/util/scan/diseqc.c
+--- linuxtv-dvb-apps-1.1.1+rev1207/util/scan/diseqc.c	2008-06-16 15:44:38.000000000 +0000
++++ linuxtv-dvb-apps-1.1.1+rev1207/util/scan/diseqc.c	2009-04-29 13:10:19.000000000 +0000
+@@ -1,6 +1,6 @@
+-#include <linux/dvb/frontend.h>
+ #include <sys/ioctl.h>
+ #include <time.h>
++#include <linux/dvb/frontend.h>
+
+ #include "scan.h"
+ #include "diseqc.h"

cross/dvb-apps/patches/alevt.patch

@@ -0,0 +1,173 @@
+Index: linuxtv-dvb-apps-1.1.1+rev1457/util/alevt/ChangeLog
+===================================================================
+--- linuxtv-dvb-apps-1.1.1+rev1457.orig/util/alevt/ChangeLog	2011-12-08 01:26:50.000000000 +1100
++++ linuxtv-dvb-apps-1.1.1+rev1457/util/alevt/ChangeLog	2012-01-05 22:23:33.000000000 +1100
+@@ -1,11 +1,11 @@
+-Thu Feb 11 22:05:00 MET 2010	(1.7.0)
++Sat Feb 14 15:10:00 MET 2010	(1.7.0)
+
+     - redesigned version:
+     - outfile, new starting methods, libzvbi implementation
+     - lots of bug fixes, all patches available in the Internet applied
+-    - extensive code cleanup
++    - intensive code cleanup
+
+-Mon Dec  3 03:11:07 MET 2007	(1.6.2)
++Mon Dec 3 03:11:07 MET 2007	(1.6.2)
+
+     - compilation fixes for newer gcc
+     - makefile tweaks (man vs share/man, /usr/X11R6 vs /usr, etc)
+Index: linuxtv-dvb-apps-1.1.1+rev1457/util/alevt/README
+===================================================================
+--- linuxtv-dvb-apps-1.1.1+rev1457.orig/util/alevt/README	2011-12-08 01:26:50.000000000 +1100
++++ linuxtv-dvb-apps-1.1.1+rev1457/util/alevt/README	2012-01-05 22:23:33.000000000 +1100
+@@ -13,7 +13,7 @@
+ 3. lots of cruft which is completely outdated or obsolete for other reasons
+
+ To handle all that in one big effort I decided to redesign the program
+-completely, enlarging its capabilities for DVB-S at the same time.
++completely, enlarging its DVB capabilities at the same time.
+
+ So here are the changes:
+
+@@ -22,8 +22,7 @@
+
+ 2. Erasure of old outdated integers, functions, parameters:
+
+-- bell, big_buf, debug, display, editor, erc, fine_tune, newbttv,
+-- oldbttv
++- bell, big_buf, debug, display, editor, erc, fine_tune, newbttv, oldbttv.
+
+ 3. Coding style cleanups (no superfluous comments, not more than
+    80 characters per column, no uncommented code.
+@@ -52,20 +51,24 @@
+    make install" there is an uninstaller now to revert the installation:
+    "make uninstall".
+
+-ENJOY IT!
++External dependencies to run that program:
+
+-Uwe Bugla, February 11th, 2010.
++AleVT needs some some system libraries to be installed in your system.
++- libc6 (>= 2.3.6)
++- libpng12 (>= 1.2.13)
++- libx11 (>= 1.3.3)
++- libzvbi0 (>= 0.2.11)
++- zlib (>= 1.1.4)
+
+-External dependencies
++ENJOY IT!
+
+-AleVT needs some system libraries to be installed in your system.
+-They are zlib, libX11, libpng and libzvbi.
++Uwe Bugla, February 14th, 2010.
+
+ Credits go to:
+ - Andreas Rottmann from debian.org for compiler fixes and
+   other kinds of investigation.
+ - Francesco Lavra for supplying a kernel patch to avoid kernel demux
+-  incompatibilities with kernels >= 2.6.32
++  incompatibilities with kernels 2.6.32-rc1 - 2.6.33-rc7
+ - Andy Walls for helpful investigation in kernelspace
+ - Edgar Toernig for providing the source version 1.6.2 and doing all the
+   development for the basic versions
+Index: linuxtv-dvb-apps-1.1.1+rev1457/util/alevt/TODO
+===================================================================
+--- linuxtv-dvb-apps-1.1.1+rev1457.orig/util/alevt/TODO	2011-12-08 01:26:50.000000000 +1100
++++ linuxtv-dvb-apps-1.1.1+rev1457/util/alevt/TODO	2012-01-05 22:23:33.000000000 +1100
+@@ -1,12 +1,18 @@
+-Hi, these are issues that I unfortunately cannot resolve myself:
++These are issues that I unfortunately cannot resolve myself:
+
+-1. graphical menu written in GKT2, to be used in general connection with
++1. Most important: for usage without script and outfile option:
++    DVB monitoring demon helping the program to rewrite the PAT
++    (Program Allocation Table) when the external player software
++    has chosen a channel which is part of a new transponder.
++    At the moment alevt hangs when the transponder is changed by an
++    external player software.
++    It then can only be stopped via "killall -9 alevt".
++    Or you switch it off before every channel change.
++
++2. Graphical menu written in GKT2, to be used in general connection with
+     the outfile (-o) option.
+
+-2. for usage without script and outfile option:
+-    DVB monitoring demon helping the program to rewrite the PAT when the
+-    external player software has chosen a channel which is part of a
+-    new transponder.
+-    At the moment alevt hangs when the transponder is changed.
++3. New BDF fonts for slightly bigger windows.
++    Those BDF fonts need to be edited so that they can be transformed by bdf2xbm.
+
+-Uwe Bugla, February 11th, 2010.
++Uwe Bugla, February 14th, 2010.
+Index: linuxtv-dvb-apps-1.1.1+rev1457/util/alevt/vbi.c
+===================================================================
+--- linuxtv-dvb-apps-1.1.1+rev1457.orig/util/alevt/vbi.c	2011-12-08 01:26:50.000000000 +1100
++++ linuxtv-dvb-apps-1.1.1+rev1457/util/alevt/vbi.c	2012-01-05 22:23:33.000000000 +1100
+@@ -706,10 +706,6 @@
+ 			}
+ 		j = i + 5;
+ 		i = j + (((tbl[i+3] << 8) | tbl[i+4]) & 0x0fff);
+-		if (!progp) {
+-			error("SDT: service_id 0x%x not in PAT\n", k);
+-			continue;
+-		}
+          while (j < i) {
+             switch (tbl[j]) {
+                case 0x48: // service descriptor
+Index: linuxtv-dvb-apps-1.1.1+rev1457/util/Makefile
+===================================================================
+--- linuxtv-dvb-apps-1.1.1+rev1457.orig/util/Makefile	2011-12-08 01:26:50.000000000 +1100
++++ linuxtv-dvb-apps-1.1.1+rev1457/util/Makefile	2012-01-05 22:23:33.000000000 +1100
+@@ -19,3 +19,4 @@
+ 	$(MAKE) -C gotox $@
+ 	$(MAKE) -C zap $@
+ 	$(MAKE) -C lsdvb $@
++	$(MAKE) -C alevt $@
+Index: linuxtv-dvb-apps-1.1.1+rev1457/util/alevt/Makefile
+===================================================================
+--- linuxtv-dvb-apps-1.1.1+rev1457.orig/util/alevt/Makefile	2011-12-08 01:26:50.000000000 +1100
++++ linuxtv-dvb-apps-1.1.1+rev1457/util/alevt/Makefile	2012-01-05 22:27:12.000000000 +1100
+@@ -57,28 +57,36 @@
+ 	rm -f alevt alevt-date alevt-cap
+
+ rpm-install: all
++	install -d 0755 ${RPM_BUILD_ROOT}$(USR_X11R6)/bin
++	install -d 0755 ${RPM_BUILD_ROOT}$(USR_X11R6)/$(MAN)/man1
++	install -d 0755 $(RPM_BUILD_ROOT)$(USR_X11R6)/include/X11/pixmaps
++
+ 	install -m 0755 alevt        ${RPM_BUILD_ROOT}$(USR_X11R6)/bin
+ 	install -m 0755 alevt-date   ${RPM_BUILD_ROOT}$(USR_X11R6)/bin
+ 	install -m 0755 alevt-cap    ${RPM_BUILD_ROOT}$(USR_X11R6)/bin
+ 	install -m 0644 alevt.1      ${RPM_BUILD_ROOT}$(USR_X11R6)/$(MAN)/man1
+ 	install -m 0644 alevt-date.1 ${RPM_BUILD_ROOT}$(USR_X11R6)/$(MAN)/man1
+ 	install -m 0644 alevt-cap.1  ${RPM_BUILD_ROOT}$(USR_X11R6)/$(MAN)/man1
+-	install -d 0755 $(RPM_BUILD_ROOT)$(USR_X11R6)/include/X11/pixmaps
+-	install -m 0644 alevt.png $(RPM_BUILD_ROOT)$(USR_X11R6)/include/X11/pixmaps
++	install -m 0644 icon.xbm $(RPM_BUILD_ROOT)$(USR_X11R6)/include/X11/pixmaps/alevt.xbm
+
+ install: all
++	install -d 0755 $(DESTDIR)$(PREFIX)/bin
++	install -d 0755 $(DESTDIR)$(PREFIX)/share/man/man1
++	install -d 0755 $(DESTDIR)$(PREFIX)/share/pixmaps
++	install -d 0755 $(DESTDIR)$(PREFIX)/share/applications
++
+ 	install -m 0755 alevt		$(DESTDIR)$(PREFIX)/bin
+ 	install -m 0755 alevt-date	$(DESTDIR)$(PREFIX)/bin
+ 	install -m 0755 alevt-cap	$(DESTDIR)$(PREFIX)/bin
+ 	install -m 0644 alevt.1		$(DESTDIR)$(PREFIX)/share/man/man1
+ 	install -m 0644 alevt-date.1	$(DESTDIR)$(PREFIX)/share/man/man1
+ 	install -m 0644 alevt-cap.1	$(DESTDIR)$(PREFIX)/share/man/man1
+-	install -m 0644 alevt.png $(DESTDIR)$(PREFIX)/share/pixmaps
++	install -m 0644 icon.xbm $(DESTDIR)$(PREFIX)/share/pixmaps/alevt.xbm
+ 	install -m 0644 alevt.desktop $(DESTDIR)$(PREFIX)/share/applications
+
+ uninstall: clean
+ 	rm -f /usr/bin/alevt /usr/bin/alevt-cap /usr/bin/alevt-date \
+-	/usr/share/pixmaps/alevt.png /usr/share/applications/alevt.desktop \
++	/usr/share/pixmaps/alevt.xbm /usr/share/applications/alevt.desktop \
+ 	/usr/share/man/man1/alevt.1 /usr/share/man/man1/alevt-cap.1 \
+ 	/usr/share/man/man1/alevt-date.1
+