| 1 |
commit: ed58fb83ffaf70423a83866a738978cc273f877b |
| 2 |
Author: Chris Reffett <creffett <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Jan 4 18:13:00 2018 +0000 |
| 4 |
Commit: Chris Reffett <creffett <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jan 4 18:13:49 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed58fb83 |
| 7 |
|
| 8 |
media-tv/linuxtv-dvb-apps: Remove references to deleted CA_SET_PID |
| 9 |
syscall |
| 10 |
|
| 11 |
Closes: https://bugs.gentoo.org/643436 |
| 12 |
Package-Manager: Portage-2.3.19, Repoman-2.3.6 |
| 13 |
|
| 14 |
.../files/linuxtv-dvb-apps-no-ca_set_pid.patch | 41 ++++++++++++++++++++++ |
| 15 |
.../linuxtv-dvb-apps-1.1.1.20140321.ebuild | 3 +- |
| 16 |
2 files changed, 43 insertions(+), 1 deletion(-) |
| 17 |
|
| 18 |
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 |
| 19 |
new file mode 100644 |
| 20 |
index 00000000000..05d886cf0ad |
| 21 |
--- /dev/null |
| 22 |
+++ b/media-tv/linuxtv-dvb-apps/files/linuxtv-dvb-apps-no-ca_set_pid.patch |
| 23 |
@@ -0,0 +1,41 @@ |
| 24 |
+diff -ruN a/include/ca.h b/include/ca.h |
| 25 |
+--- a/include/ca.h |
| 26 |
++++ b/include/ca.h |
| 27 |
+@@ -85,6 +85,5 @@ |
| 28 |
+ #define CA_GET_MSG _IOR('o', 132, ca_msg_t) |
| 29 |
+ #define CA_SEND_MSG _IOW('o', 133, ca_msg_t) |
| 30 |
+ #define CA_SET_DESCR _IOW('o', 134, ca_descr_t) |
| 31 |
+-#define CA_SET_PID _IOW('o', 135, ca_pid_t) |
| 32 |
+ |
| 33 |
+ #endif |
| 34 |
+diff -ruN a/util/dst-utils/dst_test.c b/util/dst-utils/dst_test.c |
| 35 |
+--- a/util/dst-utils/dst_test.c |
| 36 |
++++ b/util/dst-utils/dst_test.c |
| 37 |
+@@ -111,16 +111,6 @@ |
| 38 |
+ return 0; |
| 39 |
+ } |
| 40 |
+ |
| 41 |
+-static int dst_set_pid(int cafd) |
| 42 |
+-{ |
| 43 |
+- if ((ioctl(cafd, CA_SET_PID)) < 0) { |
| 44 |
+- printf("%s: ioctl failed ..\n", __FUNCTION__); |
| 45 |
+- return -1; |
| 46 |
+- } |
| 47 |
+- |
| 48 |
+- return 0; |
| 49 |
+-} |
| 50 |
+- |
| 51 |
+ static int dst_get_descr(int cafd) |
| 52 |
+ { |
| 53 |
+ if ((ioctl(cafd, CA_GET_DESCR_INFO)) < 0) { |
| 54 |
+@@ -229,10 +219,6 @@ |
| 55 |
+ printf("%s: Reset\n", __FUNCTION__); |
| 56 |
+ dst_reset(cafd); |
| 57 |
+ break; |
| 58 |
+- case 'p': |
| 59 |
+- printf("%s: PID\n", __FUNCTION__); |
| 60 |
+- dst_set_pid(cafd); |
| 61 |
+- break; |
| 62 |
+ case 'g': |
| 63 |
+ printf("%s: Get Desc\n", __FUNCTION__); |
| 64 |
+ dst_get_descr(cafd); |
| 65 |
|
| 66 |
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 |
| 67 |
index 233e547a8a7..340a1a94607 100644 |
| 68 |
--- a/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20140321.ebuild |
| 69 |
+++ b/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20140321.ebuild |
| 70 |
@@ -1,4 +1,4 @@ |
| 71 |
-# Copyright 1999-2017 Gentoo Foundation |
| 72 |
+# Copyright 1999-2018 Gentoo Foundation |
| 73 |
# Distributed under the terms of the GNU General Public License v2 |
| 74 |
|
| 75 |
EAPI=6 |
| 76 |
@@ -36,6 +36,7 @@ PATCHES=( |
| 77 |
"${FILESDIR}"/${PN}-1.1.1.20100223-ldflags.patch |
| 78 |
"${FILESDIR}"/${PN}-1.1.1.20100223-alevt.patch |
| 79 |
"${FILESDIR}"/${PN}-1.1.1.20100223-perl526.patch |
| 80 |
+ "${FILESDIR}"/${PN}-no-ca_set_pid.patch |
| 81 |
) |
| 82 |
|
| 83 |
src_prepare() { |
Archives