diff --git a/cross/dvb-apps/Makefile b/cross/dvb-apps/Makefile index fcccce7505f..eddf8944a34 100644 --- a/cross/dvb-apps/Makefile +++ b/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 diff --git a/cross/dvb-apps/digests b/cross/dvb-apps/digests index f22604f64bb..48e2ef9f5bb 100644 --- a/cross/dvb-apps/digests +++ b/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 diff --git a/cross/dvb-apps/patches/01_README.scan.dpatch b/cross/dvb-apps/patches/01_README.scan.dpatch new file mode 100755 index 00000000000..29dbd473aa9 --- /dev/null +++ b/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 +## +## 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. + diff --git a/cross/dvb-apps/patches/02_dtv-scan-tables.patch b/cross/dvb-apps/patches/02_dtv-scan-tables.patch new file mode 100644 index 00000000000..210668bb60a --- /dev/null +++ b/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 +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 diff --git a/cross/dvb-apps/patches/09_x_zap_flush_stdout.dpatch b/cross/dvb-apps/patches/09_x_zap_flush_stdout.dpatch new file mode 100755 index 00000000000..8aa740d714d --- /dev/null +++ b/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 +## +## 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); + diff --git a/cross/dvb-apps/patches/15_stdint_include.dpatch b/cross/dvb-apps/patches/15_stdint_include.dpatch new file mode 100755 index 00000000000..125be4d444c --- /dev/null +++ b/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 +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Explicitly include 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 + #include + #include ++#include + #include + #include + #include +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 + #include + #include ++#include + #include + #include + #include +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 + #include + #include ++#include + + #include "scan.h" + #include "diseqc.h" diff --git a/cross/dvb-apps/patches/alevt.patch b/cross/dvb-apps/patches/alevt.patch new file mode 100644 index 00000000000..e271350ded0 --- /dev/null +++ b/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 + diff --git a/cross/dvb-apps/patches/apps_manpages.patch b/cross/dvb-apps/patches/apps_manpages.patch new file mode 100644 index 00000000000..8590a57b4b0 --- /dev/null +++ b/cross/dvb-apps/patches/apps_manpages.patch @@ -0,0 +1,886 @@ +--- a/Make.rules ++++ b/Make.rules +@@ -33,6 +33,7 @@ + includedir ?= $(prefix)/include + libdir ?= $(prefix)/lib + sharedir ?= $(prefix)/share ++mandir ?= $(prefix)/share/man/man1 + + ifneq ($(DESTDIR),) + DESTDIR := $(DESTDIR)/ +@@ -64,6 +65,11 @@ + mkdir -p $(DESTDIR)$(bindir) + install -m 755 $(inst_bin) $(DESTDIR)$(bindir)/ + endif ++ifneq ($(inst_man),) ++ @echo installing manpages ++ @mkdir -p $(DESTDIR)$(mandir) ++ @install -m 755 $(inst_man) $(DESTDIR)$(mandir)/ ++endif + else + %.o: %.c + @echo CC $@ +@@ -99,6 +105,11 @@ + @mkdir -p $(DESTDIR)$(bindir) + @install -m 755 $(inst_bin) $(DESTDIR)$(bindir)/ + endif ++ifneq ($(inst_man),) ++ @echo installing manpages ++ @mkdir -p $(DESTDIR)$(mandir) ++ @install -m 755 $(inst_man) $(DESTDIR)$(mandir)/ ++endif + endif + + -include $(prerequisites) +--- a/Makefile ++++ b/Makefile +@@ -6,6 +6,7 @@ + $(MAKE) -C lib $@ + $(MAKE) -C test $@ + $(MAKE) -C util $@ ++ $(MAKE) -C man $@ + + update: + @echo "Pulling changes & updating from master repository" +--- a/man/Makefile ++++ b/man/Makefile +@@ -0,0 +1,14 @@ ++manpages = *.1 ++inst_man = $(manpages) ++ ++.PHONY: all ++all: $(manpages) ++$(manpages): atsc_epg.1 av7110_loadkeys.1 azap.1 czap.1 dib3000-watch.1 \ ++dst_test.1 dvbdate.1 dvbnet.1 dvbscan.1 dvbtraffic.1 femon.1 gnutv.1 gotox.1 \ ++scan.1 szap.1 tzap.1 zap.1 ++include ../Make.rules ++ ++install:: ++ @echo installing manpages ++ @mkdir -p $(DESTDIR)$(mandir) ++ @install -m 644 *.1 $(DESTDIR)$(mandir)/ +--- a/man/atsc_epg.1 ++++ b/man/atsc_epg.1 +@@ -0,0 +1,35 @@ ++.TH atsc_epg 1 "February 14, 2010" ++.SH NAME ++atsc_epg \- an electronic program guide using ATSC devices. ++.SH SYNOPSIS ++.B atsc_epg ++.RI [ options ] ++.br ++.SH DESCRIPTION ++This manual page documents briefly the ++.B atsc_epg ++commands. ++.PP ++\fBatsc_epg\fP is an electronic program guide for ATSC devices. ++.SH OPTIONS ++.TP ++.B \-a ++adapter index to use, (default 0) ++.TP ++.B \-f ++tuning frequency ++.TP ++.B \-h ++print this help text ++.TP ++.B \-p ++period in hours, (default 12) ++.TP ++.B \-m ++modulation ATSC vsb_8|vsb_16 (default vsb_8) ++.TP ++.B \-t ++enable ETT to receive program details, if available ++.br ++.PP ++This manual page was written by Uwe Bugla . +--- a/man/av7110_loadkeys.1 ++++ b/man/av7110_loadkeys.1 +@@ -0,0 +1,26 @@ ++.TH av7110_loadkeys 1 "February 14, 2010" ++.SH NAME ++av7110_loadkeys \- a program to load keymaps. ++.SH SYNOPSIS ++.B av7110_loadkeys ++.RI [ options ] keymap_filename.(rc5|rcmm ++.br ++.SH DESCRIPTION ++This manual page documents briefly the ++.B av7110_loadkeys ++commands. ++.PP ++\fBav7110_loadkeys\fP is a program to load keymaps. ++.SH OPTIONS ++.TP ++.B \-i ++invert ++.TP ++.B \-a ++address ++.TP ++.B \-h ++print this help text ++.br ++.PP ++This manual page was written by Uwe Bugla . +--- a/man/azap.1 ++++ b/man/azap.1 +@@ -0,0 +1,35 @@ ++.TH azap 1 "February 14, 2010" ++.SH NAME ++azap \- a program to process channels.conf files. ++.SH SYNOPSIS ++.B azap ++.RI [ options ] ++.br ++.SH DESCRIPTION ++This manual page documents briefly the ++.B azap ++commands. ++.PP ++\fBazap\fP is a program to process a channels.conf file. ++.SH OPTIONS ++.TP ++.B \-a adapter_num ++use given adapter (default 0) ++.TP ++.B \-f frontend_id ++use given frontend (default 0) ++.TP ++.B \-d demux_id ++use given demux (default 0) ++.TP ++.B \-c conf_file ++read channels list from 'file' ++.TP ++.B \-r ++set up /dev/dvb/adapterX/dvr0 for TS recording ++.TP ++.B \-h ++print this help text ++.br ++.PP ++This manual page was written by Uwe Bugla . +--- a/man/czap.1 ++++ b/man/czap.1 +@@ -0,0 +1,46 @@ ++.TH czap 1 "February 14, 2010" ++.SH NAME ++czap \- a program to process channels.conf files. ++.SH SYNOPSIS ++.B czap ++.RI [ options ] ++.br ++.SH DESCRIPTION ++This manual page documents briefly the ++.B czap ++commands. ++.PP ++\fBczap\fP is a program to process a channels.conf file. ++.SH OPTIONS ++.TP ++.B \-a adapter_num ++use given adapter (default 0) ++.TP ++.B \-f frontend_id ++use given frontend (default 0) ++.TP ++.B \-d demux_id ++use given demux (default 0) ++.TP ++.B \-c conf_file ++read channels list from 'file' ++.TP ++.B \-H ++produce human readable output ++.TP ++.B \-n channel_num ++use given channel number ++.TP ++.B \-x ++exit after tuning ++.TP ++.B \-c conf_file -l ++list channel names in channels.conf file ++.B \-r ++set up /dev/dvb/adapterX/dvr0 for TS recording ++.TP ++.B \-h ++print this help text ++.br ++.PP ++This manual page was written by Uwe Bugla . +--- a/man/dib3000-watch.1 ++++ b/man/dib3000-watch.1 +@@ -0,0 +1,34 @@ ++.TH dib3000-watch 1 "February 14, 2010" ++.SH NAME ++dib3000-watch \- a program to check DVB cards. ++.SH SYNOPSIS ++.B dib3000-watch ++.RI [ options ] ++.br ++.SH DESCRIPTION ++This manual page documents briefly the ++.B dib3000-watch ++commands. ++.PP ++\fBdib3000-watch\fP is a program to check DVB cards. ++.SH OPTIONS ++.TP ++.B \-d ++-d: normally one of /dev/i2c-[0-255] ++.TP ++.B \-a ++-a: is 8 for DiB3000M-B and 9, 10, 11 or 12 for DiB3000M-C or DiB3000-P ++.TP ++.B \-o ++-o: output type (print|csv) (default: print) ++.TP ++.B \-i ++-i: query interval in seconds (default: 0.1) ++.TP ++.B \-h ++print this help text ++.br ++.SH AUTHOR ++Copyright (C) 2005 by Patrick Boettcher ++.PP ++This manual page was written by Uwe Bugla . +--- a/man/dst_test.1 ++++ b/man/dst_test.1 +@@ -0,0 +1,38 @@ ++.TH dst_test 1 "February 14, 2010" ++.SH NAME ++dst_test \- a Twinhan DST and clones test utility. ++.SH SYNOPSIS ++.B dst_test ++.RI [ options ] ++.br ++.SH DESCRIPTION ++This manual page documents briefly the ++.B dst_test ++commands. ++.PP ++\fBdst_test\fP is a Twinhan DST and clones test utility. ++.SH OPTIONS ++.TP ++.B \-c ++capabilities ++.TP ++.B \-i ++info ++.TP ++.B \-r ++reset ++.TP ++.B \-g ++get descr ++.TP ++.B \-s ++set_descr ++.TP ++.B \-a ++app_info ++.TP ++.B \-t ++session test ++.br ++.PP ++This manual page was written by Uwe Bugla . +--- a/man/dvbdate.1 ++++ b/man/dvbdate.1 +@@ -0,0 +1,38 @@ ++.TH dvbdate 1 "February 14, 2010" ++.SH NAME ++dvbdate \- a program to show the actual time. ++.SH SYNOPSIS ++.B dvbdate ++.RI [ options ] ++.br ++.SH DESCRIPTION ++This manual page documents briefly the ++.B dvbdate ++commands. ++.PP ++\fBdvbdate\fP is a program to show the actual time. ++.SH OPTIONS ++.TP ++.B \-a --adapter ++adapter to use, default: 0 ++.TP ++.B \-p --print ++print current time, received time and delta ++.TP ++.B \-s --set ++set the system clock to received time ++.TP ++.B \-f --force ++force the setting of the clock ++.TP ++.B \-q --quiet ++be silent ++.TP ++.B \-h --help ++display this message ++.TP ++.B \-t --timeout n ++max seconds to wait, default: 25 ++.br ++.PP ++This manual page was written by Uwe Bugla . +--- a/man/dvbnet.1 ++++ b/man/dvbnet.1 +@@ -0,0 +1,38 @@ ++.TH dvbnet 1 "February 14, 2009" ++.SH NAME ++dvbnet \- a DVB Network Interface Manager. ++.SH SYNOPSIS ++.B dvbnet ++.RI [ options ] ++.br ++.SH DESCRIPTION ++This manual page documents briefly the ++.B dvbnet ++commands. ++.PP ++\fBdvbnet\fP is a DVB Network Interface Manager. ++.SH OPTIONS ++.TP ++.B \-a AD ++Adapter card (default 0) ++.TP ++.B \-n DD ++Demux (default 0) ++.TP ++.B \-p PID ++Add interface listening on PID ++.TP ++.B \-d NUM ++Remove interface NUM ++.TP ++.B \-l ++List currently available interfaces ++.TP ++.B \-U ++use ULE framing (default: MPE) ++.TP ++.B \-v ++Print current version ++.br ++.PP ++This manual page was written by Uwe Bugla . +--- a/man/dvbscan.1 ++++ b/man/dvbscan.1 +@@ -0,0 +1,72 @@ ++.TH dvbscan 1 "February 14, 2009" ++.SH NAME ++dvbscan \- a program to produce DVB-T channels.conf files. ++.SH SYNOPSIS ++.B dvbscan ++.RI [ options ] ++.br ++.SH DESCRIPTION ++This manual page documents briefly the ++.B dvbscan ++commands. ++.PP ++\fBdvbscan\fP is a program to produce DVB-T channels.conf files. ++.SH OPTIONS ++.TP ++.B \ -h ++print this help text ++.TP ++.B \-adapter ++adapter to use (default 0) ++.TP ++.B \-frontend ++frontend to use (default 0) ++.TP ++.B \-demux ++demux to use (default 0) ++.TP ++.B \-secfile ++Optional sec.conf file ++.TP ++.B \-secid ++ID of the SEC configuration to use, one of: ++ * UNIVERSAL (default) - Europe, 10800 to 11800 MHz and 11600 to 12700 Mhz,\ ++ Dual LO, loband 9750, hiband 10600 MHz ++ * DBS - Expressvu, North America, 12200 to 12700 MHz, Single LO, 11250 MHz ++ * STANDARD - 10945 to 11450 Mhz, Single LO, 10000 Mhz ++ * ENHANCED - Astra, 10700 to 11700 MHz, Single LO, 9750 MHz ++ * C-BAND - Big Dish, 3700 to 4200 MHz, Single LO, 5150 Mhz ++ * C-MULTI - Big Dish - Multipoint LNBf, 3700 to 4200 MHz, Dual LO, H:5150MHz, V:5750MHz ++ * One of the sec definitions from the secfile if supplied ++.TP ++.B \-satpos ++Specify DISEQC switch position for DVB-S ++.TP ++.B \-inversion ++Specify inversion (default: auto) ++.TP ++.B \-uk-ordering ++Use UK DVB-T channel ordering if present. ++.TP ++.B \-timeout ++Specify filter timeout to use (standard specced values will be used by default) ++.TP ++.B \-filter ++Specify service filter, a comma seperated list of the following tokens: ++If no filter is supplied, all services will be output ++ * tv - Output TV channels ++ * radio - Output radio channels ++ * other - Output other channels ++ * encrypted - Output encrypted channels ++.TP ++.B \-out raw |- ++Output in raw format to or stdout ++.B \-out channels |- ++Output in channels.conf format to or stdout ++.B \-out vdr12 |- ++Output in vdr 1.2.x format to or stdout ++.B \-out vdr13 |- ++Output in vdr 1.3.x format to or stdout ++.br ++.PP ++This manual page was written by Uwe Bugla . +--- a/man/dvbtraffic.1 ++++ b/man/dvbtraffic.1 +@@ -0,0 +1,26 @@ ++.TH dvbtraffic 1 "February 14, 2010" ++.SH NAME ++dvbtraffic \- a program to show satellite traffic. ++.SH SYNOPSIS ++.B dvbtraffic ++.RI [ options ] ++.br ++.SH DESCRIPTION ++This manual page documents briefly the ++.B dvbtraffic ++commands. ++.PP ++\fBdvbtraffic\fP is a program to show satellite traffic. ++.SH OPTIONS ++.TP ++.B \-a N ++use dvb adapter N ++.TP ++.B \-d N ++use demux N ++.TP ++.B \-h ++display this help ++.br ++.PP ++This manual page was written by Uwe Bugla . +--- a/man/femon.1 ++++ b/man/femon.1 +@@ -0,0 +1,32 @@ ++.TH femon 1 "February 14, 2010" ++.SH NAME ++femon \- a program to monitor DVB frontend signal input. ++.SH SYNOPSIS ++.B femon ++.RI [ options ] ++.br ++.SH DESCRIPTION ++This manual page documents briefly the ++.B femon ++commands. ++.PP ++\fBfemon\fP is a program to monitor DVB frontend signal input. ++.SH OPTIONS ++.TP ++.B \-h ++print this help text ++.TP ++.B \-H ++human readable output ++.TP ++.B \-a number ++use given adapter (default 0) ++.TP ++.B \-f number ++use given frontend (default 0) ++.TP ++.B \-c number ++samples to take (default 0 = infinite) ++.br ++.PP ++This manual page was written by Uwe Bugla . +--- a/man/gnutv.1 ++++ b/man/gnutv.1 +@@ -0,0 +1,79 @@ ++.TH gnutv 1 "February 14, 2010" ++.SH NAME ++gnutv \- a digital tv utility. ++.SH SYNOPSIS ++.B gnutv ++.RI [ options ] ++.br ++.SH DESCRIPTION ++This manual page documents briefly the ++.B gnutv ++commands. ++.PP ++\fBgnutv\fP is a digital tv utility. ++.SH OPTIONS ++.TP ++.B \-adapter ++adapter to use (default 0) ++.TP ++.B \-frontend ++frontend to use (default 0) ++.TP ++.B \-demux ++demux to use (default 0) ++.TP ++.B \-caslotnum ++ca slot number to use (default 0) ++.TP ++.B \-channels ++channels.conf file ++.TP ++.B \-secfile ++Optional sec.conf file ++.TP ++.B \-secid ++ID of the SEC configuration to use, one of: ++ * UNIVERSAL (default) - Europe, 10800 to 11800 MHz and 11600 to 12700 Mhz,\ ++ Dual LO, loband 9750, hiband 10600 MHz ++ * DBS - Expressvu, North America, 12200 to 12700 MHz, Single LO, 11250 MHz ++ * STANDARD - 10945 to 11450 Mhz, Single LO, 10000 Mhz ++ * ENHANCED - Astra, 10700 to 11700 MHz, Single LO, 9750 MHz ++ * C-BAND - Big Dish, 3700 to 4200 MHz, Single LO, 5150 Mhz ++ * C-MULTI - Big Dish - Multipoint LNBf, 3700 to 4200 MHz, Dual LO, H:5150MHz, V:5750MHz ++ * One of the sec definitions from the secfile if supplied ++.TP ++.B \-out decoder ++Output to hardware decoder (default) ++.TP ++.B -out decoderabypass ++Output to hardware decoder using audio bypass ++.B -out dvr ++Output stream to dvr device ++.B -out null ++Do not output anything ++.B -out stdout ++Output to stdout ++.B -out file ++Output stream to file ++.B -out udp
++Output stream to address:port using udp ++.B -out udpif
++Output stream to address:port using udp forcing the specified interface ++.B -out rtp
++Output stream to address:port using udp-rtp ++.B -out rtpif
++Output stream to address:port using udp-rtp forcing the specified interface ++.TP ++.B \-timeout ++Number of seconds to output channel for (0=>exit immediately after successful tuning, default is to output forever) ++.TP ++.B \-cammenu ++Show the CAM menu ++.TP ++.B \-nomoveca ++Do not attempt to move CA descriptors from stream to programme level ++.B \-h ++print this help text ++.br ++.PP ++This manual page was written by Uwe Bugla . +--- a/man/gotox.1 ++++ b/man/gotox.1 +@@ -0,0 +1,33 @@ ++.TH gotox 1 "February 14, 2010" ++.SH NAME ++gotox \- a program to operate a rotor of a satellite dish. ++.SH SYNOPSIS ++.B gotox ++.RI [ options ] ++.br ++.SH DESCRIPTION ++This manual page documents briefly the ++.B gotox ++commands. ++.PP ++\fBgotox \fP is a program to operate a rotor set to tune a satellite dish. ++.SH OPTIONS ++.TP ++.B \-h ++print this help text ++.TP ++.B \-d degrees ++Goto the specified angle. Positive value for East rotation, ++negative value for West rotation on Northern Hemisphere (default 0) ++.TP ++.B \-a number ++use given adapter (default 0) ++.TP ++.B \-f number ++use given frontend (default 0) ++.TP ++.B \-t seconds ++leave power on to rotor for at least specified seconds of time (default 30) ++.br ++.PP ++This manual page was written by Uwe Bugla . +--- a/man/scan.1 ++++ b/man/scan.1 +@@ -0,0 +1,85 @@ ++.TH scan 1 "February 14, 2010" ++.SH NAME ++scan \- a program to produce channel.conf files. ++.SH SYNOPSIS ++.B scan ++.RI [ options ] ++.br ++.SH DESCRIPTION ++This manual page documents briefly the ++.B scan ++commands. ++.PP ++\fBscan\fP is a program to produce channels.conf files. ++.SH OPTIONS ++.TP ++.B \-c [initial-tuning-data-file] ++scan on currently tuned transponder only ++.TP ++.B \-v ++verbose (repeat for more) ++.TP ++.B \-q ++quiet (repeat for less) ++.TP ++.B \-a N ++use DVB /dev/dvb/adapterN/ ++.TP ++.B \-f N ++use DVB /dev/dvb/adapter?/frontendN ++.TP ++.B \-d N ++use DVB /dev/dvb/adapter?/demuxN ++.TP ++.B \-s N ++use DiSEqC switch position N (DVB-S only) ++.TP ++.B \-i N ++spectral inversion setting (0: off, 1: on, 2: auto [default]) ++.TP ++.B \-n ++evaluate NIT-other for full network scan (slow!) ++.TP ++.B \-5 ++multiply all filter timeouts by factor 5 for non-DVB-compliant section repitition rates ++.TP ++.B \-o fmt ++output format: 'zap' (default), 'vdr' or 'pids' (default with -c) ++.TP ++.B \-x N ++Conditional Access, (default -1) ++ N=0 gets only FTA channels ++ N=-1 gets all channels ++ N=xxx sets ca field in vdr output to :xxx: ++.TP ++.B \-t N ++Service select, Combined bitfield parameter. ++1 = TV, 2 = Radio, 4 = Other, (default 7) ++.TP ++.B \-p ++for vdr output format: dump provider name ++.TP ++.B \-e N ++ VDR version, default 3 for VDR-1.3.x and newer value 2 sets NIT and TID to zero ++ Vdr version 1.3.x and up implies -p. ++.TP ++.B \-l ++lnb-type (DVB-S Only) (use -l help to print types) or ++.TP ++.B \-l ++low[,high[,switch]] in Mhz ++.TP ++.B \-u ++UK DVB-T Freeview channel numbering for VDR ++.TP ++.B \-P ++do not use ATSC PSIP tables for scanning (but only PAT and PMT) (applies for ATSC only) ++.TP ++.B \-A N ++check for ATSC 1=Terrestrial [default], 2=Cable or 3=both ++.TP ++.B \-U ++Uniquely name unknown services ++.br ++.PP ++This manual page was written by Uwe Bugla . +--- a/man/szap.1 ++++ b/man/szap.1 +@@ -0,0 +1,57 @@ ++.TH szap 1 "February 14, 2010" ++.SH NAME ++szap \- a program to process channels.conf files. ++.SH SYNOPSIS ++.B szap ++.RI [ options ] ++.br ++.SH DESCRIPTION ++This manual page documents briefly the ++.B szap ++commands. ++.PP ++\fBszap\fP is a program to process a channels.conf file. ++.SH OPTIONS ++.TP ++.B \-n channel-number | channel_name ++zap to channel via number or full name (case insensitive) ++.TP ++.B \-q ++list known channels ++.TP ++.B \-a number ++use given adapter (default 0) ++.TP ++.B \-f number ++use given frontend (default 0) ++.TP ++.B \-d number ++use given demux (default 0) ++.TP ++.B \-c file ++read channels list from 'file' ++.TP ++.B \-b ++enable Audio Bypass (default no) ++.TP ++.B \-x ++exit after tuning ++.TP ++.B \-H ++human readable output ++.TP ++.B \-r ++set up /dev/dvb/adapterX/dvr0 for TS recording ++.TP ++.B \-l lnb-type (DVB-S Only) (use -l help to print types) or ++.TP ++.B \-l low[,high[,switch]] in Mhz ++.TP ++.B \-i ++run interactively, allowing you to type in channel names ++.TP ++.B \-p ++add pat and pmt to TS recording (implies -r) or -n numbers for zapping ++.br ++.PP ++This manual page was written by Uwe Bugla . +--- a/man/tzap.1 ++++ b/man/tzap.1 +@@ -0,0 +1,56 @@ ++.TH tzap 1 "February 14, 2010" ++.SH NAME ++tzap \- a program to process channels.conf files. ++.SH SYNOPSIS ++.B tzap ++.RI [ options ] ++.br ++.SH DESCRIPTION ++This manual page documents briefly the ++.B tzap ++commands. ++.PP ++\fBtzap\fP is a program to process channels.conf files. ++.SH OPTIONS ++.TP ++.B \-a number ++use given adapter (default 0) ++.TP ++.B \-f number ++use given frontend (default 0) ++.TP ++.B \-d number ++use given demux (default 0) ++.TP ++.B \-c file ++read channels list from 'file' ++.TP ++.B \-x ++exit after tuning ++.TP ++.B \-H ++human readable output ++.TP ++.B \-r ++set up /dev/dvb/adapterX/dvr0 for TS recording ++.TP ++.B \-s ++only print summary ++.TP ++.B \-S ++run silently (no output) ++.TP ++.B \-F ++set up frontend only, don't touch demux ++.TP ++.B \-t number ++timeout (seconds) ++.TP ++.B \-o file ++output filename (use -o - for stdout) ++.TP ++.B \-h ++display this help and exit ++.br ++.PP ++This manual page was written by Uwe Bugla . +--- a/man/zap.1 ++++ b/man/zap.1 +@@ -0,0 +1,44 @@ ++.TH zap 1 "February 14, 2010" ++.SH NAME ++zap \- a program to process channels.conf files. ++.SH SYNOPSIS ++.B zap ++.RI [ options ] ++.br ++.SH DESCRIPTION ++This manual page documents briefly the ++.B zap ++commands. ++.PP ++\fBzap\fP is a program to process a channels.conf file. ++.SH OPTIONS ++.TP ++.B \-adapter ++adapter to use (default 0) ++.TP ++.B \-frontend ++frontend to use (default 0) ++.TP ++.B \-demux ++demux to use (default 0) ++.TP ++.B \-caslotnum ++ca slot number to use (default 0) ++.TP ++.B \-channels ++channels.conf file ++.TP ++.B \-secfile ++Optional sec.conf file ++.TP ++.B \-secid ++ID of the SEC configuration to use ++.TP ++.B \-nomoveca ++Do not attempt to move CA descriptors from stream to program level ++.TP ++.B \-h ++print this help text ++.br ++.PP ++This manual page was written by Uwe Bugla . diff --git a/cross/dvb-apps/patches/build-libs-only.patch b/cross/dvb-apps/patches/build-libs-only.patch index 86ad3448c2d..242033acdbd 100644 --- a/cross/dvb-apps/patches/build-libs-only.patch +++ b/cross/dvb-apps/patches/build-libs-only.patch @@ -1,13 +1,15 @@ ---- Makefile.orig 2017-03-27 21:10:20.023847566 +0200 -+++ Makefile 2017-03-27 21:10:46.282317463 +0200 -@@ -10,8 +10,8 @@ +--- dvb-apps-3ee111da5b3a-orig/Makefile 2024-03-03 13:36:32.677691624 +0000 ++++ dvb-apps-3ee111da5b3a/Makefile 2024-03-03 13:36:45.309815511 +0000 +@@ -10,9 +10,9 @@ DVB_API_MINOR := $(word 3, $(shell grep all clean install: $(MAKE) -C lib $@ - $(MAKE) -C test $@ - $(MAKE) -C util $@ +- $(MAKE) -C man $@ +# $(MAKE) -C test $@ +# $(MAKE) -C util $@ ++# $(MAKE) -C man $@ update: @echo "Pulling changes & updating from master repository" diff --git a/cross/dvb-apps/patches/dbug606728.diff b/cross/dvb-apps/patches/dbug606728.diff new file mode 100644 index 00000000000..6704acc10d9 --- /dev/null +++ b/cross/dvb-apps/patches/dbug606728.diff @@ -0,0 +1,12 @@ +Index: linuxtv-dvb-apps-1.1.1+rev1483/util/dvbscan/dvbscan.c +=================================================================== +--- linuxtv-dvb-apps-1.1.1+rev1483.orig/util/dvbscan/dvbscan.c 2012-04-11 00:44:06.000000000 +1000 ++++ linuxtv-dvb-apps-1.1.1+rev1483/util/dvbscan/dvbscan.c 2012-05-13 20:14:41.000000000 +1000 +@@ -225,6 +225,7 @@ + output_filename = argv[argpos+2]; + if (!strcmp(output_filename, "-")) + output_filename = NULL; ++ argpos+=3; + } else { + if ((argc - argpos) != 1) + usage(); diff --git a/cross/dvb-apps/patches/dst_test-no-set-id.patch b/cross/dvb-apps/patches/dst_test-no-set-id.patch new file mode 100644 index 00000000000..171ab8b1aca --- /dev/null +++ b/cross/dvb-apps/patches/dst_test-no-set-id.patch @@ -0,0 +1,44 @@ +Description: Remove "dst_test -p" + The functionality was never actually implemented in the kernel, + and CA_SET_PID was removed from the kernel headers. +Author: Adrian Bunk <@debian.org> +Bug-Debian: https://bugs.debian.org/884039 + +--- linuxtv-dvb-apps-1.1.1+rev1500.orig/util/dst-utils/dst_test.c ++++ linuxtv-dvb-apps-1.1.1+rev1500/util/dst-utils/dst_test.c +@@ -111,16 +111,6 @@ static int dst_reset(int cafd) + return 0; + } + +-static int dst_set_pid(int cafd) +-{ +- if ((ioctl(cafd, CA_SET_PID)) < 0) { +- printf("%s: ioctl failed ..\n", __FUNCTION__); +- return -1; +- } +- +- return 0; +-} +- + static int dst_get_descr(int cafd) + { + if ((ioctl(cafd, CA_GET_DESCR_INFO)) < 0) { +@@ -191,7 +181,6 @@ int main(int argc, char *argv[]) + "\t -c capabilities\n" + "\t -i info\n" + "\t -r reset\n" +- "\t -p pid\n" + "\t -g get descr\n" + "\t -s set_descr\n" + "\t -a app_info\n" +@@ -229,10 +218,6 @@ int main(int argc, char *argv[]) + printf("%s: Reset\n", __FUNCTION__); + dst_reset(cafd); + break; +- case 'p': +- printf("%s: PID\n", __FUNCTION__); +- dst_set_pid(cafd); +- break; + case 'g': + printf("%s: Get Desc\n", __FUNCTION__); + dst_get_descr(cafd); diff --git a/cross/dvb-apps/patches/fix-build-libpng16.patch b/cross/dvb-apps/patches/fix-build-libpng16.patch new file mode 100644 index 00000000000..7642684eae6 --- /dev/null +++ b/cross/dvb-apps/patches/fix-build-libpng16.patch @@ -0,0 +1,12 @@ +Author: Tobias Frost +Description: fix build with libpng16 + +--- linuxtv-dvb-apps-1.1.1+rev1500.orig/util/alevt/exp-gfx.c ++++ linuxtv-dvb-apps-1.1.1+rev1500/util/alevt/exp-gfx.c +@@ -1,5 +1,6 @@ + /* Copyright 1999 by Paul Ortyl */ + ++#include + #include + #include + #include diff --git a/cross/dvb-apps/patches/gcc-10-sid-redefinition.patch b/cross/dvb-apps/patches/gcc-10-sid-redefinition.patch new file mode 100644 index 00000000000..d5d594530b5 --- /dev/null +++ b/cross/dvb-apps/patches/gcc-10-sid-redefinition.patch @@ -0,0 +1,10 @@ +--- linuxtv-dvb-apps-1.1.1+rev1500.orig/util/alevt/vbi.c ++++ linuxtv-dvb-apps-1.1.1+rev1500/util/alevt/vbi.c +@@ -35,7 +35,6 @@ static void dvb_handler(struct vbi *vbi, + + static u8 *rawbuf; // one common buffer for raw vbi data + static int rawbuf_size; // its current size +-u_int16_t sid; + static char *vbi_names[] + = { "/dev/vbi", "/dev/vbi0", "/dev/video0", "/dev/dvb/adapter0/demux0", + NULL }; // default device names if none was given at the command line diff --git a/cross/dvb-apps/patches/glibc-stime.patch b/cross/dvb-apps/patches/glibc-stime.patch new file mode 100644 index 00000000000..4859d75218c --- /dev/null +++ b/cross/dvb-apps/patches/glibc-stime.patch @@ -0,0 +1,16 @@ +The obsolete stime function is no longer available to newly linked binaries +since glibc 2.31. Replace it by clock_settime. + +--- a/util/dvbdate/dvbdate.c ++++ b/util/dvbdate/dvbdate.c +@@ -309,7 +309,9 @@ int atsc_scan_date(time_t *rx_time, unsi + */ + int set_time(time_t * new_time) + { +- if (stime(new_time)) { ++ struct timespec ts = { .tv_sec = new_time }; ++ ++ if (clock_settime(CLOCK_REALTIME, &ts)) { + perror("Unable to set time"); + return -1; + } diff --git a/cross/dvb-apps/patches/series b/cross/dvb-apps/patches/series new file mode 100644 index 00000000000..055c14fa08f --- /dev/null +++ b/cross/dvb-apps/patches/series @@ -0,0 +1,13 @@ +uk-CrystalPalace.diff +01_README.scan.dpatch +02_dtv-scan-tables.patch +09_x_zap_flush_stdout.dpatch +15_stdint_include.dpatch +apps_manpages.patch +alevt.patch +dbug606728.diff +use-ldflags.patch +fix-build-libpng16.patch +dst_test-no-set-id.patch +glibc-stime.patch +gcc-10-sid-redefinition.patch diff --git a/cross/dvb-apps/patches/uk-CrystalPalace.diff b/cross/dvb-apps/patches/uk-CrystalPalace.diff new file mode 100644 index 00000000000..b67aafbd76f --- /dev/null +++ b/cross/dvb-apps/patches/uk-CrystalPalace.diff @@ -0,0 +1,28 @@ +Index: linuxtv-dvb-apps-1.1.1+rev1483/util/scan/dvb-t/uk-CrystalPalace +=================================================================== +--- linuxtv-dvb-apps-1.1.1+rev1483.orig/util/scan/dvb-t/uk-CrystalPalace 2012-04-11 00:44:06.000000000 +1000 ++++ linuxtv-dvb-apps-1.1.1+rev1483/util/scan/dvb-t/uk-CrystalPalace 2012-05-13 20:38:53.000000000 +1000 +@@ -4,14 +4,14 @@ + #! 20120112 1 0 TERRESTRIAL GB + #------------------------------------------------------------------------------ + # location and provider: Crystal Palace, UK +-# date (yyyy-mm-dd) : 2012-02-12 ++# date (yyyy-mm-dd) : 2012-04-18 + # +-# T[2] [plp_id] [system_id] [# comment] ++# T[2] [plp_id] [system_id] ++ [# comment] + #------------------------------------------------------------------------------ +-T 481833330 8MHz 2/3 NONE QAM64 2k 1/32 NONE # London. +-T 537833330 8MHz 3/4 NONE QAM16 2k 1/32 NONE # London. +-T 505833330 8MHz 3/4 NONE QAM16 2k 1/32 NONE # London. +-T 561833330 8MHz 2/3 NONE QAM64 2k 1/32 NONE # London. +-T 529833330 8MHz 3/4 NONE QAM16 2k 1/32 NONE # London. +-T 578166670 8MHz 3/4 NONE QAM16 2k 1/32 NONE # London. +-T2 0 16435 554000000 8MHz AUTO AUTO AUTO AUTO AUTO AUTO # London. ++T 490000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # London . ++T 514000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # London . ++T 545833330 8MHz 2/3 NONE QAM256 AUTO AUTO AUTO # London . ++T 482000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # London . ++T 506000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # London . ++T 529833330 8MHz 3/4 NONE QAM64 8k 1/32 NONE # London . diff --git a/cross/dvb-apps/patches/use-ldflags.patch b/cross/dvb-apps/patches/use-ldflags.patch new file mode 100644 index 00000000000..f92902739e2 --- /dev/null +++ b/cross/dvb-apps/patches/use-ldflags.patch @@ -0,0 +1,50 @@ +Description: Use LDFLAGS passed in from dpkg-buildflags + The alevt and lib binaries are not linked with the hardening options + provided by dpkg-buildflags because LDFLAGS isn't used there. + This patch simple adds the LDFLAGS to the Makefiles. +Author: Tobias Grimm +Date: Thu, 19 Sep 2013 23:04:58 +0200 + +Index: linuxtv-dvb-apps/util/alevt/Makefile +=================================================================== +--- linuxtv-dvb-apps.orig/util/alevt/Makefile 2013-09-19 23:00:31.000000000 +0200 ++++ linuxtv-dvb-apps/util/alevt/Makefile 2013-09-19 23:00:34.000000000 +0200 +@@ -25,13 +25,13 @@ + all: alevt alevt-date alevt-cap alevt.1 alevt-date.1 alevt-cap.1 + + alevt: $(OBJS) +- $(CC) $(OPT) $(OBJS) -o alevt -L$(PREFIX)/lib -L$(PREFIX)/lib64 -lX11 $(EXPLIBS) ++ $(CC) $(OPT) $(OBJS) $(LDFLAGS) -o alevt -L$(PREFIX)/lib -L$(PREFIX)/lib64 -lX11 $(EXPLIBS) + + alevt-date: $(TOBJS) +- $(CC) $(OPT) $(TOBJS) -o alevt-date $(ZVBILIB) ++ $(CC) $(OPT) $(TOBJS) $(LDFLAGS) -o alevt-date $(ZVBILIB) + + alevt-cap: $(COBJS) +- $(CC) $(OPT) $(COBJS) -o alevt-cap $(EXPLIBS) ++ $(CC) $(OPT) $(COBJS) $(LDFLAGS) -o alevt-cap $(EXPLIBS) + + font.o: font1.xbm font2.xbm font3.xbm font4.xbm + fontsize.h: font1.xbm font2.xbm font3.xbm font4.xbm +Index: linuxtv-dvb-apps/Make.rules +=================================================================== +--- linuxtv-dvb-apps.orig/Make.rules 2013-09-19 23:00:29.000000000 +0200 ++++ linuxtv-dvb-apps/Make.rules 2013-09-19 23:00:34.000000000 +0200 +@@ -47,7 +47,7 @@ + %: %.c + $(CC) $(CPPFLAGS) $(CFLAGS) -MMD $(LDFLAGS) -o $@ $< $(filter-out %.h %.c,$^) $(LOADLIBES) $(LDLIBS) + %.so: +- $(CC) -shared -o $@ $^ ++ $(CC) -shared $(LDFLAGS) -o $@ $^ + %.a: + $(AR) rcs $@ $^ + clean:: +@@ -82,7 +82,7 @@ + @$(CC) $(CPPFLAGS) $(CFLAGS) -MMD $(LDFLAGS) -o $@ $< $(filter-out %.h %.c,$^) $(LOADLIBES) $(LDLIBS) + %.so: + @echo CC $@ +- @$(CC) -shared -o $@ $^ ++ @$(CC) -shared $(LDFLAGS) -o $@ $^ + %.a: + @echo AR $@ + @$(AR) rcs $@ $^