[gentoo-commits] repo/gentoo:master commit in: media-tv/linuxtv-dvb-apps/, media-tv/linuxtv-dvb-apps/files/
commit: eb705f892eae45b93306c1de1407c1c22ac23956
Author: Sam James (sam_c) cmpct info>
AuthorDate: Wed Mar 11 03:11:21 2020 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Sat Mar 14 21:46:28 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb705f89
media-tv/linuxtv-dvb-apps: Fix build with glibc-2.31, revbump, EAPI
* Patch to allow build with glibc-2.31
* EAPI bumped (no actual changes needed)
* Revbump to -r1
Closes: https://bugs.gentoo.org/711988
Signed-off-by: Sam James (sam_c) cmpct.info>
Closes: https://github.com/gentoo/gentoo/pull/14926
Signed-off-by: Sergei Trofimovich gentoo.org>
.../files/linuxtv-dvb-apps-glibc-2.31.patch| 14
.../linuxtv-dvb-apps-1.1.1.20140321-r1.ebuild | 93 ++
2 files changed, 107 insertions(+)
diff --git a/media-tv/linuxtv-dvb-apps/files/linuxtv-dvb-apps-glibc-2.31.patch
b/media-tv/linuxtv-dvb-apps/files/linuxtv-dvb-apps-glibc-2.31.patch
new file mode 100644
index 000..d404212b5e3
--- /dev/null
+++ b/media-tv/linuxtv-dvb-apps/files/linuxtv-dvb-apps-glibc-2.31.patch
@@ -0,0 +1,14 @@
+--- a/util/dvbdate/dvbdate.c
b/util/dvbdate/dvbdate.c
+@@ -309,7 +309,10 @@
+ */
+ int set_time(time_t * new_time)
+ {
+- if (stime(new_time)) {
++ struct timespec s = {0};
++ s.tv_sec = new_time;
++
++ if (clock_settime(CLOCK_REALTIME, )) {
+ perror("Unable to set time");
+ return -1;
+ }
diff --git
a/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20140321-r1.ebuild
b/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20140321-r1.ebuild
new file mode 100644
index 000..1ec133ccb2e
--- /dev/null
+++ b/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20140321-r1.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs vcs-snapshot
+
+HOMEPAGE="https://www.linuxtv.org/;
+DESCRIPTION="Small utils for DVB to scan, zap, view signal strength"
+SRC_URI="https://www.linuxtv.org/hg/dvb-apps/archive/3d43b280298c.tar.bz2 ->
${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+IUSE="alevt usb"
+
+RDEPEND="
+ alevt? (
+ !media-video/alevt
+ media-libs/libpng:0=
+ media-libs/zvbi[v4l]
+ sys-libs/zlib
+ x11-libs/libX11
+ )
+ usb? ( virtual/libusb:0 )
+"
+DEPEND="${RDEPEND}
+ dev-lang/perl
+ virtual/linuxtv-dvb-headers
+"
+RDEPEND+="
+ media-tv/dtv-scan-tables
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.1.1.20100223-ldflags.patch
+ "${FILESDIR}"/${PN}-1.1.1.20100223-alevt.patch
+ "${FILESDIR}"/${PN}-1.1.1.20100223-perl526.patch
+ "${FILESDIR}"/${PN}-no-ca_set_pid.patch
+ "${FILESDIR}"/${PN}-glibc-2.31.patch
+)
+
+src_prepare() {
+ default
+
+ # do not compile test-progs, incompatible with videodev2.h
+ sed -i '/-C test/d' Makefile || die
+
+ # remove copy of header-files
+ rm -rv "${S}"/include/ || die
+}
+
+src_compile() {
+ emake V=1 CC=$(tc-getCC) $(usex usb "ttusb_dec_reset=1" "")
+ use alevt && emake -C util/alevt CC=$(tc-getCC) OPT="${CFLAGS}"
+}
+
+src_install() {
+ emake V=1 prefix="${EPREFIX}/usr" libdir="${EPREFIX}/usr/$(get_libdir)"
\
+ $(usex usb "ttusb_dec_reset=1" "") \
+ DESTDIR="${D}" INSTDIR="${T}" install
+
+ if use alevt ; then
+ dodir /usr/share/{applications,man/man1}
+ emake -C util/alevt DESTDIR="${D}" install
+ fi
+
+ # rename scan to scan-dvb
+ mv "${ED}"/usr/bin/scan{,-dvb} || die
+
+ # install zap-files
+ local dir=""
+ for dir in dvb-{s,c,t} atsc ; do
+ insinto /usr/share/dvb/zap/${dir}
+ doins "${S}"/util/szap/channels-conf/${dir}/*
+ done
+
+ # install remote-key files
+ insinto /usr/share/dvb/av7110_loadkeys
+ doins util/av7110_loadkeys/*.rc*
+
+ # install Documentation
+ dodoc README
+ newdoc util/scan/README README.scan-dvb
+ newdoc util/szap/README README.zap
+ newdoc util/av7110_loadkeys/README README.av7110_loadkeys
+
+ use usb && newdoc util/ttusb_dec_reset/README README.ttusb_dec_reset
+}
+
+pkg_postinst() {
+ elog "/usr/bin/scan has been installed as scan-dvb."
+}
[gentoo-commits] repo/gentoo:master commit in: media-tv/linuxtv-dvb-apps/, media-tv/linuxtv-dvb-apps/files/
commit: ed58fb83ffaf70423a83866a738978cc273f877b
Author: Chris Reffett gentoo org>
AuthorDate: Thu Jan 4 18:13:00 2018 +
Commit: Chris Reffett gentoo org>
CommitDate: Thu Jan 4 18:13:49 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed58fb83
media-tv/linuxtv-dvb-apps: Remove references to deleted CA_SET_PID
syscall
Closes: https://bugs.gentoo.org/643436
Package-Manager: Portage-2.3.19, Repoman-2.3.6
.../files/linuxtv-dvb-apps-no-ca_set_pid.patch | 41 ++
.../linuxtv-dvb-apps-1.1.1.20140321.ebuild | 3 +-
2 files changed, 43 insertions(+), 1 deletion(-)
diff --git
a/media-tv/linuxtv-dvb-apps/files/linuxtv-dvb-apps-no-ca_set_pid.patch
b/media-tv/linuxtv-dvb-apps/files/linuxtv-dvb-apps-no-ca_set_pid.patch
new file mode 100644
index 000..05d886cf0ad
--- /dev/null
+++ b/media-tv/linuxtv-dvb-apps/files/linuxtv-dvb-apps-no-ca_set_pid.patch
@@ -0,0 +1,41 @@
+diff -ruN a/include/ca.h b/include/ca.h
+--- a/include/ca.h
b/include/ca.h
+@@ -85,6 +85,5 @@
+ #define CA_GET_MSG_IOR('o', 132, ca_msg_t)
+ #define CA_SEND_MSG _IOW('o', 133, ca_msg_t)
+ #define CA_SET_DESCR _IOW('o', 134, ca_descr_t)
+-#define CA_SET_PID_IOW('o', 135, ca_pid_t)
+
+ #endif
+diff -ruN a/util/dst-utils/dst_test.c b/util/dst-utils/dst_test.c
+--- a/util/dst-utils/dst_test.c
b/util/dst-utils/dst_test.c
+@@ -111,16 +111,6 @@
+ 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) {
+@@ -229,10 +219,6 @@
+ 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/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20140321.ebuild
b/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20140321.ebuild
index 233e547a8a7..340a1a94607 100644
--- a/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20140321.ebuild
+++ b/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20140321.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -36,6 +36,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-1.1.1.20100223-ldflags.patch
"${FILESDIR}"/${PN}-1.1.1.20100223-alevt.patch
"${FILESDIR}"/${PN}-1.1.1.20100223-perl526.patch
+ "${FILESDIR}"/${PN}-no-ca_set_pid.patch
)
src_prepare() {
[gentoo-commits] repo/gentoo:master commit in: media-tv/linuxtv-dvb-apps/, media-tv/linuxtv-dvb-apps/files/
commit: 67a6c2ec99e5bea632d089c51e914100bd6bf6cf
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Sun Aug 6 08:37:41 2017 +
Commit: Andreas Hüttel gentoo org>
CommitDate: Sun Aug 6 08:38:07 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67a6c2ec
media-tv/linuxtv-dvb-apps: Add build fix for Perl 5.26, bug 623578
Package-Manager: Portage-2.3.6, Repoman-2.3.3
.../files/linuxtv-dvb-apps-1.1.1.20100223-perl526.patch | 12
.../linuxtv-dvb-apps-1.1.1.20100223-r1.ebuild| 3 ++-
2 files changed, 14 insertions(+), 1 deletion(-)
diff --git
a/media-tv/linuxtv-dvb-apps/files/linuxtv-dvb-apps-1.1.1.20100223-perl526.patch
b/media-tv/linuxtv-dvb-apps/files/linuxtv-dvb-apps-1.1.1.20100223-perl526.patch
new file mode 100644
index 000..4db9ac3b546
--- /dev/null
+++
b/media-tv/linuxtv-dvb-apps/files/linuxtv-dvb-apps-1.1.1.20100223-perl526.patch
@@ -0,0 +1,12 @@
+diff -ruN linuxtv-dvb-apps-1.1.1.20100223.orig/util/scan/section_generate.pl
linuxtv-dvb-apps-1.1.1.20100223/util/scan/section_generate.pl
+--- linuxtv-dvb-apps-1.1.1.20100223.orig/util/scan/section_generate.pl
2010-02-14 12:21:19.0 -
linuxtv-dvb-apps-1.1.1.20100223/util/scan/section_generate.pl
2017-08-06 08:35:19.625688435 -
+@@ -4,7 +4,7 @@
+
+ die "no section perl file given" unless @ARGV;
+
+-my $h = require($ARGV[0]);
++my $h = require("./".$ARGV[0]);
+
+ our $basename;
+ our $debug = $ARGV[1];
diff --git
a/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20100223-r1.ebuild
b/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20100223-r1.ebuild
index 88362e0f4de..1cb34872418 100644
--- a/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20100223-r1.ebuild
+++ b/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20100223-r1.ebuild
@@ -32,7 +32,8 @@ DEPEND="${RDEPEND}
src_prepare() {
epatch \
"${FILESDIR}"/${P}-ldflags.patch \
- "${FILESDIR}"/${P}-alevt.patch
+ "${FILESDIR}"/${P}-alevt.patch \
+ "${FILESDIR}"/${P}-perl526.patch
# do not compile test-progs, incompatible with videodev2.h
sed -e '/-C test/d' \
