1 |
commit: f8107f9cfc4ffab4a7d05e8097cad910714b54f8 |
2 |
Author: Joerg Bornkessel <hd_brummy <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Oct 10 19:21:07 2015 +0000 |
4 |
Commit: Joerg Bornkessel <hd_brummy <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Oct 10 19:21:07 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8107f9c |
7 |
|
8 |
compile fix for >=linux-4.2, reported, fixed by Daniel Peters on wrt bug #559476 |
9 |
|
10 |
Package-Manager: portage-2.2.20.1 |
11 |
|
12 |
.../files/v4l-dvb-saa716x-4.2-fix-compile.patch | 34 +++++++++++++++ |
13 |
.../v4l-dvb-saa716x-0.0.1_p20141109-r2.ebuild | 50 ++++++++++++++++++++++ |
14 |
2 files changed, 84 insertions(+) |
15 |
|
16 |
diff --git a/media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-4.2-fix-compile.patch b/media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-4.2-fix-compile.patch |
17 |
new file mode 100644 |
18 |
index 0000000..392ef25 |
19 |
--- /dev/null |
20 |
+++ b/media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-4.2-fix-compile.patch |
21 |
@@ -0,0 +1,34 @@ |
22 |
+diff -urN powARman-v4l-dvb-saa716x-d7e98fc59230/linux/drivers/media/common/saa716x/saa716x_budget.c v4l-dvb-saa716x-0.0.1_p20141109-r1/work/powARman-v4l-dvb-saa716x-d7e98fc59230/linux/drivers/media/common/saa716x/saa716x_budget.c |
23 |
+--- powARman-v4l-dvb-saa716x-d7e98fc59230/linux/drivers/media/common/saa716x/saa716x_budget.c 2015-09-03 00:30:08.662553247 +0200 |
24 |
++++ v4l-dvb-saa716x-0.0.1_p20141109-r1/work/powARman-v4l-dvb-saa716x-d7e98fc59230/linux/drivers/media/common/saa716x/saa716x_budget.c 2015-09-03 00:31:03.899206845 +0200 |
25 |
+@@ -306,7 +306,7 @@ |
26 |
+ #define SAA716x_MODEL_TWINHAN_VP1028 "Twinhan/Azurewave VP-1028" |
27 |
+ #define SAA716x_DEV_TWINHAN_VP1028 "DVB-S" |
28 |
+ |
29 |
+-static int vp1028_dvbs_set_voltage(struct dvb_frontend *fe, fe_sec_voltage_t voltage) |
30 |
++static int vp1028_dvbs_set_voltage(struct dvb_frontend *fe, enum fe_sec_voltage voltage) |
31 |
+ { |
32 |
+ struct saa716x_dev *saa716x = fe->dvb->priv; |
33 |
+ |
34 |
+diff -urN powARman-v4l-dvb-saa716x-d7e98fc59230/linux/drivers/media/common/saa716x/saa716x_hybrid.c v4l-dvb-saa716x-0.0.1_p20141109-r1/work/powARman-v4l-dvb-saa716x-d7e98fc59230/linux/drivers/media/common/saa716x/saa716x_hybrid.c |
35 |
+--- powARman-v4l-dvb-saa716x-d7e98fc59230/linux/drivers/media/common/saa716x/saa716x_hybrid.c 2014-11-09 15:44:55.000000000 +0100 |
36 |
++++ v4l-dvb-saa716x-0.0.1_p20141109-r1/work/powARman-v4l-dvb-saa716x-d7e98fc59230/linux/drivers/media/common/saa716x/saa716x_hybrid.c 2015-09-03 00:31:03.899206845 +0200 |
37 |
+@@ -321,7 +321,7 @@ |
38 |
+ .request_firmware = tda1004x_vp6090_request_firmware, |
39 |
+ }; |
40 |
+ |
41 |
+-static int vp6090_dvbs_set_voltage(struct dvb_frontend *fe, fe_sec_voltage_t voltage) |
42 |
++static int vp6090_dvbs_set_voltage(struct dvb_frontend *fe, enum fe_sec_voltage voltage) |
43 |
+ { |
44 |
+ struct saa716x_dev *saa716x = fe->dvb->priv; |
45 |
+ |
46 |
+diff -urN powARman-v4l-dvb-saa716x-d7e98fc59230/linux/drivers/media/common/saa716x/saa716x_pci.c v4l-dvb-saa716x-0.0.1_p20141109-r1/work/powARman-v4l-dvb-saa716x-d7e98fc59230/linux/drivers/media/common/saa716x/saa716x_pci.c |
47 |
+--- powARman-v4l-dvb-saa716x-d7e98fc59230/linux/drivers/media/common/saa716x/saa716x_pci.c 2014-11-09 15:44:55.000000000 +0100 |
48 |
++++ v4l-dvb-saa716x-0.0.1_p20141109-r1/work/powARman-v4l-dvb-saa716x-d7e98fc59230/linux/drivers/media/common/saa716x/saa716x_pci.c 2015-09-03 00:31:03.900206839 +0200 |
49 |
+@@ -1,3 +1,5 @@ |
50 |
++#include <asm/atomic.h> |
51 |
++#include <linux/spinlock_types.h> |
52 |
+ #include <asm/io.h> |
53 |
+ #include <asm/pgtable.h> |
54 |
+ #include <asm/page.h> |
55 |
+ |
56 |
|
57 |
diff --git a/media-tv/v4l-dvb-saa716x/v4l-dvb-saa716x-0.0.1_p20141109-r2.ebuild b/media-tv/v4l-dvb-saa716x/v4l-dvb-saa716x-0.0.1_p20141109-r2.ebuild |
58 |
new file mode 100644 |
59 |
index 0000000..7904dec |
60 |
--- /dev/null |
61 |
+++ b/media-tv/v4l-dvb-saa716x/v4l-dvb-saa716x-0.0.1_p20141109-r2.ebuild |
62 |
@@ -0,0 +1,50 @@ |
63 |
+# Copyright 1999-2015 Gentoo Foundation |
64 |
+# Distributed under the terms of the GNU General Public License v2 |
65 |
+# $Id$ |
66 |
+ |
67 |
+EAPI=5 |
68 |
+ |
69 |
+inherit linux-info linux-mod |
70 |
+ |
71 |
+DESCRIPTION="driver for saa716x based dvb cards like Technotrend S2-6400 or Technisat Skystar 2 eXpress HD" |
72 |
+HOMEPAGE="https://bitbucket.org/powARman/v4l-dvb-saa716x/overview" |
73 |
+ |
74 |
+HG_REVISION="d7e98fc59230" |
75 |
+HG_REVISION_DATE="20141109" |
76 |
+ |
77 |
+SRC_URI="https://bitbucket.org/powARman/v4l-dvb-saa716x/get/${HG_REVISION}.tar.gz |
78 |
+-> v4l-dvb-saa716x-0.0.1_p${HG_REVISION_DATE}.tar.gz" |
79 |
+ |
80 |
+LICENSE="GPL-2" |
81 |
+SLOT="0" |
82 |
+KEYWORDS="~amd64 ~x86" |
83 |
+IUSE="+firmware" |
84 |
+ |
85 |
+DEPEND="" |
86 |
+RDEPEND="${DEPEND} |
87 |
+ firmware? ( sys-firmware/tt-s2-6400-firmware )" |
88 |
+ |
89 |
+S="${WORKDIR}/powARman-v4l-dvb-saa716x-${HG_REVISION}" |
90 |
+ |
91 |
+BUILD_TARGETS="modules" |
92 |
+MODULE_NAMES="saa716x_ff(misc:${ROOT}/usr/src/linux:${S}/linux/drivers/media/common/saa716x) |
93 |
+ saa716x_core(misc:${ROOT}/usr/src/linux:${S}/linux/drivers/media/common/saa716x) |
94 |
+ saa716x_budget(misc:${ROOT}/usr/src/linux:${S}/linux/drivers/media/common/saa716x) |
95 |
+ saa716x_hybrid(misc:${ROOT}/usr/src/linux:${S}/linux/drivers/media/common/saa716x)" |
96 |
+ |
97 |
+CONFIG_CHECK="DVB_CORE DVB_STV6110x DVB_STV090x" |
98 |
+ |
99 |
+src_prepare() { |
100 |
+ epatch "${FILESDIR}/OSD_RAW_CMD_patch_2.diff" |
101 |
+ epatch "${FILESDIR}/v4l-dvb-saa716x-Makefilepatch-2.diff" |
102 |
+ kernel_is ge 3 19 0 && epatch "${FILESDIR}/v4l-dvb-saa716x-3.19-set_gpio.patch" |
103 |
+ kernel_is ge 4 2 0 && epatch "${FILESDIR}/v4l-dvb-saa716x-4.2-fix-compile.patch" |
104 |
+} |
105 |
+ |
106 |
+src_compile() { |
107 |
+ BUILD_PARAMS="SUBDIRS=${S}/linux/drivers/media/common/saa716x \ |
108 |
+ CONFIG_SAA716X_CORE=m CONFIG_DVB_SAA716X_FF=m CONFIG_DVB_SAA716X_BUDGET=m \ |
109 |
+ CONFIG_DVB_SAA716X_HYBRID=m" |
110 |
+ addpredict "${ROOT}"/usr/src/linux/ |
111 |
+ linux-mod_src_compile |
112 |
+} |