compile fix with KV 3.19, thx to ??? on wrt bug 541642

Package-Manager: portage-2.2.17/cvs/Linux x86_64
Manifest-Sign-Key: 0x34C2808A

4 files changed, 87 insertions, 5 deletions

diff --git a/media-tv/v4l-dvb-saa716x/ChangeLog b/media-tv/v4l-dvb-saa716x/ChangeLog
index 7c12178a8129..8747afa37203 100644
--- a/media-tv/v4l-dvb-saa716x/ChangeLog
+++ b/media-tv/v4l-dvb-saa716x/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-tv/v4l-dvb-saa716x
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/v4l-dvb-saa716x/ChangeLog,v 1.6 2015/02/15 16:26:36 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/v4l-dvb-saa716x/ChangeLog,v 1.7 2015/03/03 13:56:26 hd_brummy Exp $
+
+*v4l-dvb-saa716x-0.0.1_p20141109-r1 (03 Mar 2015)
+
+  03 Mar 2015; Joerg Bornkessel <hd_brummy@gentoo.org>
+  +v4l-dvb-saa716x-0.0.1_p20141109-r1.ebuild,
+  +files/v4l-dvb-saa716x-3.19-set_gpio.patch:
+  compile fix with KV 3.19, thx to ??? on wrt bug 541642
 
 *v4l-dvb-saa716x-0.0.1_p20141109 (15 Feb 2015)
 
diff --git a/media-tv/v4l-dvb-saa716x/Manifest b/media-tv/v4l-dvb-saa716x/Manifest
index 00e530d365eb..1d5888b6d8eb 100644
--- a/media-tv/v4l-dvb-saa716x/Manifest
+++ b/media-tv/v4l-dvb-saa716x/Manifest
@@ -2,18 +2,20 @@
 Hash: SHA256
 
 AUX OSD_RAW_CMD_patch_2.diff 843 SHA256 41ad8460fd67ec56466266fd4e89de712dc8ca99327cf95670a5a0a27b6a9a14 SHA512 57688acc06ac9fcde332e3fba9d4048ac962d7c65c3844ff60e1d48956f7fe0f02315859f427cd5e21695ffa0c3d5cbd46ff953d7d1eca4b3e2ab165f6985e71 WHIRLPOOL 18ef1d95fa4bd2e0e3d353356782d39f84179a9f0f48bb36f5b4705500d7c4030b3ad684a2e186c3c6e64d72d55059f65fb9cd63c170701865b39f406fe9541d
+AUX v4l-dvb-saa716x-3.19-set_gpio.patch 733 SHA256 6ea366636aa838d2d1499d314085e3d8eafba91de37ebc57b0be0d069140ba8c SHA512 e713779f02ebdc090a364e2339217c7f4fa2d54ba53d26f61a1a0241d19078e0278da14c8ba6520354d8a037c6834ae90271e39cdda279cfd8f4047277f24116 WHIRLPOOL bba297c62a576612ff54dcd741ec8f5f2a1640e79da503b068637bd0341c2dc39fcebf107994a27dbc3302ef92182562fe223368e8de578da214ca0917dbfd2f
 AUX v4l-dvb-saa716x-Makefilepatch-2.diff 562 SHA256 2b4cd1fd3d185f3d20654d759db177beffa52984178e55e149789697f10edf69 SHA512 e0ff1c5a79f7b02323eff281bf6dc6ebb7a8fe7a43eb83ebd4a7379468924d3992790899bfabbbf2ee411cda6366ad6a677d8ad004a306e14b55d891f6f69dc0 WHIRLPOOL 289bbb5858afed31c77e9427e7e4d2872ed14ae048c9e84ba0faad8435de431271798f5b6ba53bc1217d4554ff36cab94b980cc5a6ead92610be25f85c192432
 DIST v4l-dvb-saa716x-0.0.1_p20140322.tar.gz 5026505 SHA256 79ff65c1354506ffb951e23bc1667c372cf22e9eca8309f9b7486fcfec22ef29 SHA512 2b452f6951064f01e88ccf1a2a6f0c9db8ac96779f7b8d56d33cf387d6ed196922edf6b6234d5887ce9dfdb7013772dc874be5ad5893b8e92b23ffe1f2b5d6ea WHIRLPOOL c6f63e835a670455aa871d179283d283d1e3da23f83c868040a48a402178d73d0c7f44ee807076e3cbd72a7b3e1f050d3e6103d2a49c778eddfe19efdba815a7
 DIST v4l-dvb-saa716x-0.0.1_p20141109.tar.gz 5028238 SHA256 2c6608f94df9da7681e2b22fdbdd842cdd1e97dd1dac6017c713c1fc037cd2bd SHA512 a67f095d4878b4ceb3b340e725925385fee33b289e875e9e0903370d0ec909d66893d9ac846d5c7fedf469129a3327e3458668db5a83ff2718c04174e6e07c66 WHIRLPOOL 156cac6e08c57c1a4c2b5511d211de784d941c22d6bc7c2aa8188e9c01b8cf043e4f7a3af595180c68af4de6be7d1bfba4f27323c14a18afdd3110e8629802a3
 EBUILD v4l-dvb-saa716x-0.0.1_p20140322.ebuild 1654 SHA256 241f64a86ff5600057c669bca588e63cd0d8336f4b89d8e7ec46137a4e4fd435 SHA512 35d25fc7afdd105a8afddada74f0886ebc04fad5376037655b23c9236c9019b69c9a3047128f7c13cc95b5ab80a31e1cd50664aaab1b9503bd4ec5e2fe76ccb6 WHIRLPOOL 3c296fa1b7ac8bccb2025b89eabefc1c06f255ad5fb1405d242500e354b4f0fbf5423c9769f012710ac906b2a9df6a7bbcf88b15fa9d7c536a33a6f2a0023637
+EBUILD v4l-dvb-saa716x-0.0.1_p20141109-r1.ebuild 1735 SHA256 1b70bc121e5fd1b529545a24de77a129ec9ea3b67473c21ea435ff5b9997fb77 SHA512 e5c9e8f080e4e19b5f16cba7ef45d0001dbea576cf926e0adc46f9de504db568210cf2e8ef2734a42df08a572a47f142a8deb4865acb74a663de6e85fe7f8e6d WHIRLPOOL 8cfed0390a1c85ac712ab7700eae8b404b0065668fb634d431049e365d7289e23c555686473e533318043e52d909c539af4fc113e1938234d80ff30fe37b2e82
 EBUILD v4l-dvb-saa716x-0.0.1_p20141109.ebuild 1651 SHA256 2bb41f42291435f70d59091d3d932005664ed6105b3898c14467e1cc58b0a4e1 SHA512 ce2a32541b97ce12abdc8425f871b441ab25a924e0dd661554fb642918017d10823c12157a2ee33ac0137ec7ef5de97ccbe9dd67e674cd0093cfa9cb96baab79 WHIRLPOOL 82a48a53778d0684b150b8a2defe475670237d7ce8b6b4fe8d2cfb911d1b90beca6b37d91c9d6b29f73055870d103b81e409de30d9d36e2fd4b31ba2768a6016
-MISC ChangeLog 1489 SHA256 fecf1d4b62999cc3664d70f42ccab89441a7c398a2ac266b3525765aec892b90 SHA512 c6560f90abfd0b8e5d8b0914649ea325ba8c2eaff024e6eb836f948367d7bdf3d3c42d8947f3ee5384914c09b2fcc9b1ade280b57d01c33c0aefa75169539dcd WHIRLPOOL 2373b759424fca7ca6665605e804769f0c77e45198a4167471d2272b20ce2713ef93c6c3fd9524269db349173425226595b2a2b544cfcf62d80c2c617b6e3e26
+MISC ChangeLog 1745 SHA256 6986bd5ef889327b639fc97fbd322ff57d71eca63e1d201522305b4939e34311 SHA512 cc308432cba30422a4f3ded5397210aedf07779d5faaa2c15a4f41d489b8db98755b8d110a31ca059e0605710facbe276c26da880482a8565705aa8204cc019c WHIRLPOOL 9f2fb5360ef99d7dc1fd5f0b5d927f540cd331d9015d37ea5d8200b83f72cd8ac8adf423e7f757cfd05162c9933cd32e42c981f5e5c6814a3c8946f96f1896a1
 MISC metadata.xml 540 SHA256 15d8b2b052b419939fd1ac6e41136f1924b1d102000b794b2ee3a0aebfbcb8b8 SHA512 324ad178fca0c503f72704ad28bc3eb9185c05e55ebf4d1b043c2cdef764c40f53358c768a96ac629704eaab1ae77c1f69d17da05bcaf7a083e2c9f4fcf67f71 WHIRLPOOL 116509d1e7062d7feb4d02e66b99e836d48c65355816124862f6eaffacc5b1fe3d474e8e24c262e39c98180ed8f8f5c101ba4fd0122597d6d3d932aea070e4f3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 Comment: added by hd_brummy@gentoo.org
 
-iD8DBQFU4MjAdn07HTTCgIoRCAVXAJ40tTSnjq1HY4Q83tA7NzbAKbmCEwCdGCtX
-dT7NInDrKcWlnffJAvUg1ac=
-=oGXa
+iD8DBQFU9b2Pdn07HTTCgIoRCHAGAJ9+MjElH/+8cqsClzheKlEWulpNvACggDTZ
+UjOts8SB9kn0Qs9EXctNXFI=
+=zGNf
 -----END PGP SIGNATURE-----
diff --git a/media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-3.19-set_gpio.patch b/media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-3.19-set_gpio.patch
new file mode 100644
index 000000000000..895caa4449e0
--- /dev/null
+++ b/media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-3.19-set_gpio.patch
@@ -0,0 +1,24 @@
+--- v4l-dvb-saa716x-d7e98fc59230-orig/linux/drivers/media/common/saa716x/saa716x_budget.c	2014-11-09 15:44:55.000000000 +0100
++++ v4l-dvb-saa716x-d7e98fc59230/linux/drivers/media/common/saa716x/saa716x_budget.c	2015-02-28 13:58:01.258743639 +0100
+@@ -497,10 +497,10 @@
+ 		break;
+ 	}
+ 
+-	err = stv090x_set_gpio(fe, 2, 0, en, 0);
++	err = skystar2_stv090x_config.set_gpio(fe, 2, 0, en, 0);
+ 	if (err < 0)
+ 		goto exit;
+-	err = stv090x_set_gpio(fe, 3, 0, sel, 0);
++	err = skystar2_stv090x_config.set_gpio(fe, 3, 0, sel, 0);
+ 	if (err < 0)
+ 		goto exit;
+ 
+@@ -519,7 +519,7 @@
+ 	else
+ 		value = 0;
+ 
+-	err = stv090x_set_gpio(fe, 4, 0, value, 0);
++	err = skystar2_stv090x_config.set_gpio(fe, 4, 0, value, 0);
+ 	if (err < 0)
+ 		goto exit;
+ 
diff --git a/media-tv/v4l-dvb-saa716x/v4l-dvb-saa716x-0.0.1_p20141109-r1.ebuild b/media-tv/v4l-dvb-saa716x/v4l-dvb-saa716x-0.0.1_p20141109-r1.ebuild
new file mode 100644
index 000000000000..19c9cb94f31b
--- /dev/null
+++ b/media-tv/v4l-dvb-saa716x/v4l-dvb-saa716x-0.0.1_p20141109-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-tv/v4l-dvb-saa716x/v4l-dvb-saa716x-0.0.1_p20141109-r1.ebuild,v 1.1 2015/03/03 13:56:26 hd_brummy Exp $
+
+EAPI=5
+
+inherit linux-info linux-mod
+
+DESCRIPTION="driver for saa716x based dvb cards like Technotrend S2-6400 or Technisat Skystar 2 eXpress HD"
+HOMEPAGE="https://bitbucket.org/powARman/v4l-dvb-saa716x/overview"
+
+HG_REVISION="d7e98fc59230"
+HG_REVISION_DATE="20141109"
+
+SRC_URI="https://bitbucket.org/powARman/v4l-dvb-saa716x/get/${HG_REVISION}.tar.gz
+-> v4l-dvb-saa716x-0.0.1_p${HG_REVISION_DATE}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+firmware"
+
+DEPEND=""
+RDEPEND="${DEPEND}
+	firmware? ( sys-firmware/tt-s2-6400-firmware )"
+
+S="${WORKDIR}/powARman-v4l-dvb-saa716x-${HG_REVISION}"
+
+BUILD_TARGETS="modules"
+MODULE_NAMES="saa716x_ff(misc:${ROOT}/usr/src/linux:${S}/linux/drivers/media/common/saa716x)
+	saa716x_core(misc:${ROOT}/usr/src/linux:${S}/linux/drivers/media/common/saa716x)
+	saa716x_budget(misc:${ROOT}/usr/src/linux:${S}/linux/drivers/media/common/saa716x)
+	saa716x_hybrid(misc:${ROOT}/usr/src/linux:${S}/linux/drivers/media/common/saa716x)"
+
+CONFIG_CHECK="DVB_CORE DVB_STV6110x DVB_STV090x"
+
+src_prepare() {
+	epatch "${FILESDIR}/OSD_RAW_CMD_patch_2.diff"
+	epatch "${FILESDIR}/v4l-dvb-saa716x-Makefilepatch-2.diff"
+	kernel_is ge 3 19 0 && epatch "${FILESDIR}/v4l-dvb-saa716x-3.19-set_gpio.patch"
+}
+
+src_compile() {
+	BUILD_PARAMS="SUBDIRS=${S}/linux/drivers/media/common/saa716x \
+	CONFIG_SAA716X_CORE=m CONFIG_DVB_SAA716X_FF=m CONFIG_DVB_SAA716X_BUDGET=m \
+	CONFIG_DVB_SAA716X_HYBRID=m"
+	addpredict "${ROOT}"/usr/src/linux/
+	linux-mod_src_compile
+}