Date: Wed, 15 Apr 2020 18:54:24 +0000 (UTC) From: Bernhard Froehlich <decke@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r531779 - in head/multimedia/dvb-apps: . files Message-ID: <202004151854.03FIsOr0038476@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: decke Date: Wed Apr 15 18:54:24 2020 New Revision: 531779 URL: https://svnweb.freebsd.org/changeset/ports/531779 Log: multimedia/dvb-apps: Remove references to CA_SET_PID syscall which was 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 Added: head/multimedia/dvb-apps/files/patch-include_ca.h (contents, props changed) head/multimedia/dvb-apps/files/patch-util_dst-utils_dst_test.c (contents, props changed) Modified: head/multimedia/dvb-apps/Makefile Modified: head/multimedia/dvb-apps/Makefile ============================================================================== --- head/multimedia/dvb-apps/Makefile Wed Apr 15 18:00:51 2020 (r531778) +++ head/multimedia/dvb-apps/Makefile Wed Apr 15 18:54:24 2020 (r531779) @@ -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 Added: head/multimedia/dvb-apps/files/patch-include_ca.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/dvb-apps/files/patch-include_ca.h Wed Apr 15 18:54:24 2020 (r531779) @@ -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 Added: head/multimedia/dvb-apps/files/patch-util_dst-utils_dst_test.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/dvb-apps/files/patch-util_dst-utils_dst_test.c Wed Apr 15 18:54:24 2020 (r531779) @@ -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);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202004151854.03FIsOr0038476>