summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Reffett <creffett@gentoo.org>2018-01-04 13:13:00 -0500
committerChris Reffett <creffett@gentoo.org>2018-01-04 13:13:49 -0500
commited58fb83ffaf70423a83866a738978cc273f877b (patch)
tree901047a18f0e6aa9488489ec4c2d77cf36c63930 /media-tv
parentprofiles: Tidy up old net-misc/mediatomb masks (diff)
downloadgentoo-ed58fb83ffaf70423a83866a738978cc273f877b.tar.gz
gentoo-ed58fb83ffaf70423a83866a738978cc273f877b.tar.bz2
gentoo-ed58fb83ffaf70423a83866a738978cc273f877b.zip
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
Diffstat (limited to 'media-tv')
-rw-r--r--media-tv/linuxtv-dvb-apps/files/linuxtv-dvb-apps-no-ca_set_pid.patch41
-rw-r--r--media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20140321.ebuild3
2 files changed, 43 insertions, 1 deletions
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 00000000000..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() {