Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-tv/v4l-dvb-saa716x/, media-tv/v4l-dvb-saa716x/files/
Date: Sun, 03 Feb 2019 22:57:35
Message-Id: 1549234620.e67dfee2ac77d29107a204c4485367c8f7d6e919.asturm@gentoo
1 commit: e67dfee2ac77d29107a204c4485367c8f7d6e919
2 Author: Martin Dummer <martin.dummer <AT> gmx <DOT> net>
3 AuthorDate: Thu Nov 8 16:25:33 2018 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Sun Feb 3 22:57:00 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e67dfee2
7
8 media-tv/v4l-dvb-saa716x: fix AUDIO_GET_PTS undeclared
9
10 fix compile error "... AUDIO_GET_PTS undeclared" with kernel >=4.17
11
12 Signed-off-by: Martin Dummer <martin.dummer <AT> gmx.net>
13 Closes: https://bugs.gentoo.org/670156
14 Package-Manager: Portage-2.3.51, Repoman-2.3.11
15 Closes: https://github.com/gentoo/gentoo/pull/10363
16 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
17
18 ...v4l-dvb-saa716x-4.17-define-AUDIO_GET_PTS.patch | 12 +++++
19 .../v4l-dvb-saa716x-0.0.1_p20170225-r2.ebuild | 60 ++++++++++++++++++++++
20 2 files changed, 72 insertions(+)
21
22 diff --git a/media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-4.17-define-AUDIO_GET_PTS.patch b/media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-4.17-define-AUDIO_GET_PTS.patch
23 new file mode 100644
24 index 00000000000..8e418c82868
25 --- /dev/null
26 +++ b/media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-4.17-define-AUDIO_GET_PTS.patch
27 @@ -0,0 +1,12 @@
28 +--- a/linux/drivers/media/common/saa716x/saa716x_ff.h 2018-11-08 15:44:10.479886225 +0100
29 ++++ b/linux/drivers/media/common/saa716x/saa716x_ff.h 2018-11-08 15:45:19.981237523 +0100
30 +@@ -108,6 +108,9 @@
31 + #define VIDEO_CAPTURE_OFF 0
32 + #define VIDEO_CAPTURE_ONE_SHOT 1
33 +
34 ++#ifndef AUDIO_GET_PTS
35 ++#define AUDIO_GET_PTS _IOR('o', 19, __u64)
36 ++#endif
37 +
38 + /* place to store all the necessary device information */
39 + struct sti7109_dev {
40
41 diff --git a/media-tv/v4l-dvb-saa716x/v4l-dvb-saa716x-0.0.1_p20170225-r2.ebuild b/media-tv/v4l-dvb-saa716x/v4l-dvb-saa716x-0.0.1_p20170225-r2.ebuild
42 new file mode 100644
43 index 00000000000..66babc6091c
44 --- /dev/null
45 +++ b/media-tv/v4l-dvb-saa716x/v4l-dvb-saa716x-0.0.1_p20170225-r2.ebuild
46 @@ -0,0 +1,60 @@
47 +# Copyright 2018 Gentoo Authors
48 +# Distributed under the terms of the GNU General Public License v2
49 +
50 +EAPI=7
51 +
52 +inherit linux-info linux-mod
53 +
54 +DESCRIPTION="driver for saa716x based dvb cards like TT S2-6400 or Skystar 2 eXpress HD"
55 +HOMEPAGE="https://bitbucket.org/powARman/v4l-dvb-saa716x/overview"
56 +
57 +HG_REVISION="3b9fce66666a"
58 +HG_REVISION_DATE="20160322"
59 +
60 +SRC_URI="https://bitbucket.org/powARman/v4l-dvb-saa716x/get/${HG_REVISION}.tar.gz
61 +-> v4l-dvb-saa716x-0.0.1_p${HG_REVISION_DATE}.tar.gz"
62 +
63 +LICENSE="GPL-2"
64 +SLOT="0"
65 +KEYWORDS="~amd64 ~x86"
66 +IUSE="+firmware"
67 +
68 +DEPEND=""
69 +RDEPEND="${DEPEND}
70 + firmware? ( sys-firmware/tt-s2-6400-firmware )"
71 +
72 +S="${WORKDIR}/powARman-v4l-dvb-saa716x-${HG_REVISION}"
73 +
74 +BUILD_TARGETS="modules"
75 +MODULE_NAMES="saa716x_ff(misc:${EROOT%/}/usr/src/linux:${S}/linux/drivers/media/common/saa716x)
76 + saa716x_core(misc:${EROOT%/}/usr/src/linux:${S}/linux/drivers/media/common/saa716x)
77 + saa716x_budget(misc:${EROOT%/}/usr/src/linux:${S}/linux/drivers/media/common/saa716x)
78 + saa716x_hybrid(misc:${EROOT%/}/usr/src/linux:${S}/linux/drivers/media/common/saa716x)"
79 +
80 +CONFIG_CHECK="~DVB_CORE ~DVB_STV6110x ~DVB_STV090x"
81 +
82 +src_prepare() {
83 + default
84 +
85 + eapply -p0 "${FILESDIR}/OSD_RAW_CMD_patch_2.diff"
86 + eapply "${FILESDIR}/v4l-dvb-saa716x-Makefilepatch-2.diff"
87 + kernel_is ge 3 19 0 && eapply "${FILESDIR}/v4l-dvb-saa716x-3.19-set_gpio.patch"
88 + kernel_is ge 4 2 0 && eapply "${FILESDIR}/v4l-dvb-saa716x-4.2-fix-compile.patch"
89 + kernel_is ge 4 5 2 && eapply "${FILESDIR}/v4l-dvb-saa716x-4.5.2-fix-compile.patch"
90 + kernel_is ge 4 6 0 && eapply "${FILESDIR}/v4l-dvb-saa716x-4.6.0-fix-compile.patch"
91 + kernel_is ge 4 9 0 && eapply "${FILESDIR}/v4l-dvb-saa716x-4.9-fix-warnings.patch"
92 + kernel_is ge 4 10 0 && eapply "${FILESDIR}/v4l-dvb-saa716x-4.10-fix-compile.patch"
93 + kernel_is ge 4 14 0 && eapply "${FILESDIR}/v4l-dvb-saa716x-4.14.0-fix-compile.patch"
94 + kernel_is ge 4 15 0 && eapply "${FILESDIR}/v4l-dvb-saa716x-4.15-fix-autorepeat.patch"
95 + kernel_is ge 4 15 0 && eapply "${FILESDIR}/v4l-dvb-saa716x-4.15-fix-timers.patch"
96 + kernel_is ge 4 16 0 && eapply "${FILESDIR}/v4l-dvb-saa716x-4.16-fix-compile.patch"
97 + kernel_is ge 4 17 0 && eapply "${FILESDIR}/v4l-dvb-saa716x-4.17-define-AUDIO_GET_PTS.patch"
98 +}
99 +
100 +src_compile() {
101 + BUILD_PARAMS="SUBDIRS=${S}/linux/drivers/media/common/saa716x \
102 + CONFIG_SAA716X_CORE=m CONFIG_DVB_SAA716X_FF=m CONFIG_DVB_SAA716X_BUDGET=m \
103 + CONFIG_DVB_SAA716X_HYBRID=m"
104 + addpredict "${EROOT%/}"/usr/src/linux/
105 + linux-mod_src_compile
106 +}