Add TeVii S650 firmware. Thanks to Arne Stäcker in bug #291954.

Package-Manager: portage-2.1.6.13/cvs/Linux i686

3 files changed, 29 insertions, 4 deletions

diff --git a/media-tv/linuxtv-dvb-firmware/ChangeLog b/media-tv/linuxtv-dvb-firmware/ChangeLog
index 957b095a974d..c30622f98be5 100644
--- a/media-tv/linuxtv-dvb-firmware/ChangeLog
+++ b/media-tv/linuxtv-dvb-firmware/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-tv/linuxtv-dvb-firmware
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/linuxtv-dvb-firmware/ChangeLog,v 1.27 2009/10/08 16:05:47 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/linuxtv-dvb-firmware/ChangeLog,v 1.28 2009/11/12 18:18:55 billie Exp $
+
+  12 Nov 2009; Daniel Pielmeier <billie@gentoo.org>
+  linuxtv-dvb-firmware-2009.09.19.ebuild:
+  Add TeVii S650 firmware. Thanks to Arne Stäcker in bug #291954.
 
 *linuxtv-dvb-firmware-2009.09.19 (08 Oct 2009)
 
diff --git a/media-tv/linuxtv-dvb-firmware/Manifest b/media-tv/linuxtv-dvb-firmware/Manifest
index 0282739ab9ff..40e288a06ade 100644
--- a/media-tv/linuxtv-dvb-firmware/Manifest
+++ b/media-tv/linuxtv-dvb-firmware/Manifest
@@ -5,6 +5,7 @@ DIST 2830SLoad2.sys 15872 RMD160 36d7cc34b84b377770f229b9212052c28f588437 SHA1 1
 DIST 7%5Cdrv_2.11.02.zip 235227 RMD160 b47dd9508fd5dd57355e138eea93658ab413ac13 SHA1 1796ed41f2c8c1ccd10f61e634c7733ed8be14fa SHA256 a8e994a4af94cc5c4808603d648a19d5056f85338cfa6bfffffb072f2fde36bf
 DIST AVerTVHD_MCE_A180_Drv_v1.2.2.16.zip 156028 RMD160 59f0b35f04d0030b39cde9c1a2e04cf060670769 SHA1 42a8f736fc0c1d62c91d9f8f4337d37d07216840 SHA256 7f65564416b12bc34d0d2e49b61a11c557e0f48a49064a8c880423606d43aa3f
 DIST TT_PCI_2.19h_28_11_2006.zip 22366414 RMD160 4620a276149fd10a4423c49485bfcf347c886261 SHA1 0e731714adc12f5507ee1912fa2512228274fdef SHA256 887492ba12193ed39ac28ed98f02e6ebb7290807461f4c7ffb10750685098061
+DIST Tevii_linuxdriver_0815.rar 3743579 RMD160 187c4f855558df6c66bc0b2b7f5bf6cdafaf6a86 SHA1 d77413c796510a6a042a42b7cb7de0ff1e364886 SHA256 e1c5f04d3c565e43f90cf00dea6a1c30981d8bd14162163d8b97755d8ea909c1
 DIST TwinhanDTV2.608a.zip 22316104 RMD160 d8d80b4451bc8bcef5c90bd4c87ef8c03cf13ead SHA1 1aa9c294f007796961803f056ed9cc01ff02821b SHA256 5e6007e28d2d043c63bb917189f6ddfe8e8a25edd007af0328926a093e2390a6
 DIST Yuan%20MPC718%20TV%20Tuner%20Card%202.13.10.1016.zip 2485056 RMD160 3115b2d68f103daa22d88a87cd91b665d6dec99b SHA1 2f651be072a601e7dcc6b3220e553bb04c0ac009 SHA256 0a3e5272ccbc7fbd3ac006d8677a22a556b39594febb52d2cbab637d153e7381
 DIST af9005.fw 28250 RMD160 ad88928d271b0bf3d172dd44e09db0c83d87c3b1 SHA1 25d75856bbae1afd1cac24c083584db831e00a0b SHA256 5d1eedb40067a622c3ac6ec782f8c2de3af8d11e76603deed738deac7144cd82
@@ -29,6 +30,6 @@ DIST v4l-cx23885-avcore-01.fw 16382 RMD160 899016dd0024e2c7b0ed4b9b11a3c046a7e9f
 DIST v4l-cx23885-enc.fw 16382 RMD160 899016dd0024e2c7b0ed4b9b11a3c046a7e9faf1 SHA1 86d5d19ee61e37b3ea33fb644c112b8e3fbb120d SHA256 c2a75fc710f51c778abe7c7e8b54ed5686b17811dd203d1de3070d3df70d70f6
 DIST v4l-cx25840.fw 16382 RMD160 904d1921a2e12551b35776ee06bffe636e795c6b SHA1 fb298a12c7a267ab3b96d025e4703cc9d642b2dd SHA256 67a06c2dbcdf893c309357c4de181655be55708b6985c99b2e7ba8bebc417212
 EBUILD linuxtv-dvb-firmware-2009.07.06-r1.ebuild 9013 RMD160 6c2b567880bf5eed949dd7aad9a0ada99a189207 SHA1 d19e8b1491577af5f953b2f2e1aa44c48f659ba0 SHA256 228c404412314d05618e1abf4ab2dd7b0d5b437833e536d0e24064ad5b31b332
-EBUILD linuxtv-dvb-firmware-2009.09.19.ebuild 8967 RMD160 eadcd76c304af91d287dbc92c6d730a0fdc83cbd SHA1 e21bb0d64963d2034ebcf8df5349e70bf5fd45f2 SHA256 314b76a9e4ff67f6f5cb21cbfe2e4f40ec293e8f823e7713863bf80a4f6aac18
-MISC ChangeLog 5637 RMD160 254820437d44d49c5e4b208ed12403fd82c7dd25 SHA1 c7cbc28b204ca169157d82ed53ee66730a78f6b2 SHA256 7570486342b889cb4f54f70ca93fd70e4f6052fb9640c6246a2e18beddf43e02
+EBUILD linuxtv-dvb-firmware-2009.09.19.ebuild 9439 RMD160 a187a50ed8ccf17d0a7b52e09a4a28b8c2b3291e SHA1 f9e31c89a6f05b5e5f8f744f0a51d9064cf57c37 SHA256 80196279d7f5c656f5b309d23654995e7d3cd81dde6b889a512b9f93dd7ca9ea
+MISC ChangeLog 5799 RMD160 a233a4520f9baea4739cacae82cc8eb6cdfd23f1 SHA1 609ad60f8befce95f909a98a98e7151da13f4dc1 SHA256 d31c7ff87baae31ae410f1662ca006bc66ca758fc9090481b5ecec41b2db2238
 MISC metadata.xml 162 RMD160 8bd24f9f2805b005cef731c0cda868c72e6980af SHA1 7464d1657179a3f30c5ea2ad401590e4489ac945 SHA256 aaad144c69dd58781e1dc97b5fbad08a5b4db504bd3cbbb4ab27018a307d5d81
diff --git a/media-tv/linuxtv-dvb-firmware/linuxtv-dvb-firmware-2009.09.19.ebuild b/media-tv/linuxtv-dvb-firmware/linuxtv-dvb-firmware-2009.09.19.ebuild
index 89f13b3cce84..d5acaa78fd70 100644
--- a/media-tv/linuxtv-dvb-firmware/linuxtv-dvb-firmware-2009.09.19.ebuild
+++ b/media-tv/linuxtv-dvb-firmware/linuxtv-dvb-firmware-2009.09.19.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/linuxtv-dvb-firmware/linuxtv-dvb-firmware-2009.09.19.ebuild,v 1.1 2009/10/08 16:05:47 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/linuxtv-dvb-firmware/linuxtv-dvb-firmware-2009.09.19.ebuild,v 1.2 2009/11/12 18:18:55 billie Exp $
 
 DESCRIPTION="Firmware files needed for operation of some dvb-devices"
 HOMEPAGE="http://www.linuxtv.org"
@@ -20,6 +20,8 @@ S="${WORKDIR}"
 # Files which can be fetched from linuxtv.org
 PACKET_NAME=dvb-firmwares-1.tar.bz2
 PACKET_SRC_URI="http://www.linuxtv.org/downloads/firmware/${PACKET_NAME}"
+TEVII_NAME=Tevii_linuxdriver_0815.rar
+TEVII_SRC_URI="http://tevii.com/${TEVII_NAME}"
 get_dvb_firmware="${FILESDIR}/get_dvb_firmware-${PV}"
 # from http://git.kernel.org/?p=linux/kernel/git/stable/linux-2.6-stable.git;a=history;f=Documentation/dvb/get_dvb_firmware
 
@@ -36,6 +38,8 @@ FW_USE_FLAGS=(
 	"or51211"
 	"or51132"
 	"or51132"
+	"usb-dw2104"
+	"usb-dw2104"
 # own URL
 	"ttpci"
 	"bcm3510"
@@ -81,6 +85,8 @@ FW_FILES=(
 	"dvb-fe-or51211.fw"
 	"dvb-fe-or51132-qam.fw"
 	"dvb-fe-or51132-vsb.fw"
+	"dvb-usb-dw2104.fw"
+	"dvb-fe-cx24116.fw"
 # own URL
 	"dvb-ttpci-01.fw"
 	"dvb-fe-bcm3510-01.fw"
@@ -126,6 +132,8 @@ FW_GET_PARAMETER=(
 	"-"
 	"-"
 	"-"
+	"-"
+	"-"
 # own URL
 	"-"
 	"-"
@@ -171,6 +179,8 @@ FW_URLS=(
 	"${PACKET_SRC_URI}"
 	"${PACKET_SRC_URI}"
 	"${PACKET_SRC_URI}"
+	"${TEVII_SRC_URI}"
+	"${TEVII_SRC_URI}"
 # own URL
 	"http://www.escape-edv.de/endriss/firmware/dvb-ttpci-01.fw-fc2624"
 	"http://www.linuxtv.org/downloads/firmware/dvb-fe-bcm3510-01.fw"
@@ -304,6 +314,11 @@ src_unpack() {
 		unpack ${PACKET_NAME}
 	fi
 
+	# unpack tevii packet
+	if has ${TEVII_NAME} ${A}; then
+		unpack ${TEVII_NAME}
+	fi
+
 	if [[ -z ${DVB_CARDS} ]] || use dvb_cards_mpc718 ; then
 		mv Yuan%20MPC718%20TV%20Tuner%20Card%202.13.10.1016.zip "Yuan MPC718 TV Tuner Card 2.13.10.1016.zip"
 	fi
@@ -311,6 +326,11 @@ src_unpack() {
 		mv dvb-ttpci-01.fw-fc2624 dvb-ttpci-01.fw
 	fi
 
+	if [[ -z ${DVB_CARDS} ]] || use dvb_cards_usb-dw2104 ; then
+		mv tevii_linuxdriver_0815/fw/dvb-usb-s650.fw dvb-usb-dw2104.fw
+		mv tevii_linuxdriver_0815/fw/dvb-fe-cx24116.fw ./
+	fi
+
 	local script_v=${PV}
 
 	# Adjust temp-dir of get_dvb_firmware