Skip to content
This repository has been archived by the owner on Jun 15, 2023. It is now read-only.

Commit

Permalink
multimedia/dvb-apps: Remove references to CA_SET_PID syscall which was
Browse files Browse the repository at this point in the history
deleted in Linux Kernel 4.14. This fixes a build issue with the upcoming
v4l 1.18.0 update.

PR:		245501
Obtained from:	https://gitweb.gentoo.org/repo/gentoo.git/commit/media-tv/linuxtv-dvb-apps/?id=ed58fb83ffaf70423a83866a738978cc273f877b
  • Loading branch information
decke committed Apr 15, 2020
1 parent e243d41 commit 4bc3afb
Show file tree
Hide file tree
Showing 3 changed files with 56 additions and 1 deletion.
2 changes: 1 addition & 1 deletion multimedia/dvb-apps/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

PORTNAME= dvb-apps
PORTVERSION= 1.1.2.1505
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= multimedia
MASTER_SITES= LOCAL/decke
DISTNAME= ${PORTNAME}-3d43b280298c
Expand Down
17 changes: 17 additions & 0 deletions multimedia/dvb-apps/files/patch-include_ca.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
From ed58fb83ffaf70423a83866a738978cc273f877b Mon Sep 17 00:00:00 2001
From: Chris Reffett <creffett@gentoo.org>
Date: Thu, 4 Jan 2018 13:13:00 -0500
Subject: 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
--- include/ca.h
+++ 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
38 changes: 38 additions & 0 deletions multimedia/dvb-apps/files/patch-util_dst-utils_dst_test.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
From ed58fb83ffaf70423a83866a738978cc273f877b Mon Sep 17 00:00:00 2001
From: Chris Reffett <creffett@gentoo.org>
Date: Thu, 4 Jan 2018 13:13:00 -0500
Subject: 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
--- util/dst-utils/dst_test.c
+++ 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);

0 comments on commit 4bc3afb

Please sign in to comment.