[patch] diff for the ebuild

linuxtv-dvb-firmware-2009.07.06.diff (text/plain), 8.21 KB, created by Daniel Pielmeier on 2009-07-29 18:34:35 UTC

--- media-tv/linuxtv-dvb-firmware/linuxtv-dvb-firmware-2007.04.13.ebuild	2009-06-29 22:21:16.000000000 +0200
+++ media-tv/linuxtv-dvb-firmware/linuxtv-dvb-firmware-2009.07.06.ebuild	2009-07-25 16:52:33.000000000 +0200
@@ -1,4 +1,4 @@
-# Copyright 1999-2007 Gentoo Foundation
+# 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-2007.04.13.ebuild,v 1.5 2007/11/27 10:39:37 zzam Exp $
 
@@ -10,9 +10,7 @@
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-UNSHIELD_DEPEND=">=app-arch/unshield-0.4"
-DEPEND="dvb_cards_sp887x? ( ${UNSHIELD_DEPEND} )"
-
+DEPEND=""
 RDEPEND=""
 
 RESTRICT="mirror"
@@ -23,71 +21,94 @@
 PACKET_NAME=dvb-firmwares-1.tar.bz2
 PACKET_SRC_URI="http://www.linuxtv.org/downloads/firmware/${PACKET_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
 
 FW_USE_FLAGS=(
 # packet
-	"or51132"
-	"or51132"
-	"or51211"
 	"usb-a800"
-	"dibusb-usb1"
 	"dibusb-usb2"
 	"usb-dtt200u"
 	"usb-umt"
 	"usb-vp702x"
 	"usb-vp7045"
 	"usb-wt220u"
-	"ttpci"
+	"dibusb-usb1"
+	"or51211"
+	"or51132"
+	"or51132"
 # own URL
+	"ttpci"
 	"bcm3510"
 	"usb-wt220u"
 	"usb-wt220u"
 	"usb-dib0700"
+	"usb-af9015"
+	"sp887x"
+	"af9005"
+	"cx231xx"
+	"cx18"
+	"cx18"
+	"cx18"
+	"cx23885"
+	"cx23885"
+	"pvrusb2"
+	"usb-bluebird"
 # get_dvb_firmware
 	"sp8870"
-	"sp887x"
-	"tda10045"
 	"tda10046"
 	"tda10046lifeview"
 	"ttusb-dec"
 	"ttusb-dec"
 	"ttusb-dec"
-	"nxt2002"
+	"opera1"
+	"opera1"
+	"vp7041"
 	"nxt200x"
-	"usb-bluebird"
+	"mpc718"
 )
 
 FW_FILES=(
 # packet
-	"dvb-fe-or51132-qam.fw"
-	"dvb-fe-or51132-vsb.fw"
-	"dvb-fe-or51211.fw"
 	"dvb-usb-avertv-a800-02.fw"
-	"dvb-dibusb-5.0.0.11.fw"
 	"dvb-usb-dibusb-6.0.0.8.fw"
 	"dvb-usb-dtt200u-01.fw"
 	"dvb-usb-umt-010-02.fw"
 	"dvb-usb-vp702x-01.fw"
 	"dvb-usb-vp7045-01.fw"
 	"dvb-usb-wt220u-01.fw"
-	"dvb-ttpci-01.fw"
+	"dvb-dibusb-5.0.0.11.fw"
+	"dvb-fe-or51211.fw"
+	"dvb-fe-or51132-qam.fw"
+	"dvb-fe-or51132-vsb.fw"
 # own URL
+	"dvb-ttpci-01.fw"
 	"dvb-fe-bcm3510-01.fw"
 	"dvb-usb-wt220u-02.fw"
 	"dvb-usb-wt220u-fc03.fw"
-	"dvb-usb-dib0700-01.fw"
+	"dvb-usb-dib0700-1.20.fw"
+	"dvb-usb-af9015.fw"
+	"dvb-fe-sp887x.fw"
+	"af9005.fw"
+	"v4l-cx231xx-avcore-01.fw"
+	"v4l-cx23418-apu.fw"
+	"v4l-cx23418-cpu.fw"
+	"v4l-cx23418-dig.fw"
+	"v4l-cx23885-avcore-01.fw"
+	"v4l-cx23885-enc.fw"
+	"v4l-cx25840.fw"
+	"dvb-usb-bluebird-01.fw"
 # get_dvb_firmware
 	"dvb-fe-sp8870.fw"
-	"dvb-fe-sp887x.fw"
-	"dvb-fe-tda10045.fw"
 	"dvb-fe-tda10046.fw"
 	"dvb-fe-tda10046.fw"
 	"dvb-ttusb-dec-2000t.fw"
 	"dvb-ttusb-dec-2540t.fw"
 	"dvb-ttusb-dec-3000s.fw"
-	"dvb-fe-nxt2002.fw"
+	"dvb-usb-opera1-fpga-01.fw"
+	"dvb-usb-opera-01.fw"
+	"dvb-vp7041-2.422.fw"
 	"dvb-fe-nxt2004.fw"
-	"dvb-usb-bluebird-01.fw"
+	"dvb-cx18-mpc718-mt352.fw"
 )
 
 FW_GET_PARAMETER=(
@@ -103,24 +124,35 @@
 	"-"
 	"-"
 	"-"
-	"-"
 # own URL
 	"-"
 	"-"
 	"-"
 	"-"
+	"-"
+	"-"
+	"-"
+	"-"
+	"-"
+	"-"
+	"-"
+	"-"
+	"-"
+	"-"
+	"-"
+	"-"
 # get_dvb_firmware
 	"sp8870"
-	"sp887x"
-	"tda10045"
 	"tda10046"
 	"tda10046lifeview"
 	"dec2000t"
 	"dec2540t"
 	"dec3000s"
-	"nxt2002"
-	"nxt2004"
+	"opera1"
 	"-"
+	"vp7041"
+	"nxt2004"
+	"mpc718"
 )
 
 FW_URLS=(
@@ -136,24 +168,35 @@
 	"${PACKET_SRC_URI}"
 	"${PACKET_SRC_URI}"
 	"${PACKET_SRC_URI}"
-	"${PACKET_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"
 	"http://www.linuxtv.org/downloads/firmware/dvb-usb-wt220u-02.fw"
 	"http://home.arcor.de/efocht/dvb-usb-wt220u-fc03.fw"
-	"http://vaasa.wi-bw.tfh-wildau.de/~pboettch/home/files/dvb-usb-dib0700-01.fw"
+	"http://www.wi-bw.tfh-wildau.de/~pboettch/home/files/dvb-usb-dib0700-1.20.fw"
+	"http://www.otit.fi/~crope/v4l-dvb/af9015/af9015_firmware_cutter/firmware_files/4.95.0/dvb-usb-af9015.fw"
+	"http://peterdamen.com/dvb-fe-sp887x.fw"
+	"http://ventoso.org/luca/af9005/af9005.fw"
+	"http://linuxtv.org/downloads/firmware/v4l-cx231xx-avcore-01.fw"
+	"http://linuxtv.org/downloads/firmware/v4l-cx23418-apu.fw"
+	"http://linuxtv.org/downloads/firmware/v4l-cx23418-cpu.fw"
+	"http://linuxtv.org/downloads/firmware/v4l-cx23418-dig.fw"
+	"http://linuxtv.org/downloads/firmware/v4l-cx23885-avcore-01.fw"
+	"http://linuxtv.org/downloads/firmware/v4l-cx23885-enc.fw"
+	"http://linuxtv.org/downloads/firmware/v4l-cx25840.fw"
+	"http://linuxtv.org/downloads/firmware/dvb-usb-bluebird-01.fw"
 # get_dvb_firmware
 	"http://www.softwarepatch.pl/9999ccd06a4813cb827dbb0005071c71/tt_Premium_217g.zip"
-	"http://www.avermedia.com/software/Dvbt1.3.57.6.zip"
-	"http://www.technotrend.de/new/217g/tt_budget_217g.zip"
-	"http://www.technotrend.de/new/217g/tt_budget_217g.zip"
-	"http://www.lifeview.com.tw/drivers/pci_card/FlyDVB-T/Drv_2.11.02.zip"
+	"http://www.tt-download.com/download/updates/219/TT_PCI_2.19h_28_11_2006.zip"
+	"http://www.lifeview.hk/dbimages/document/7%5Cdrv_2.11.02.zip"
 	"http://hauppauge.lightpath.net/de/dec217g.exe"
 	"http://hauppauge.lightpath.net/de/dec217g.exe"
 	"http://hauppauge.lightpath.net/de/dec217g.exe"
-	"http://www.bbti.us/download/windows/Technisat_DVB-PC_4_4_COMPACT.zip"
-	"http://www.aver.com/support/Drivers/AVerTVHD_MCE_A180_Drv_v1.2.2.16.zip"
-	"http://www.linuxtv.org/download/dvb/firmware/dvb-usb-bluebird-01.fw"
+	"http://www.informatik.uni-leipzig.de/~hlawit/dvb/2830SCap2.sys"
+	"http://www.informatik.uni-leipzig.de/~hlawit/dvb/2830SLoad2.sys"
+	"http://www.twinhan.com/files/AW/Software/TwinhanDTV2.608a.zip"
+	"http://www.avermedia-usa.com/support/Drivers/AVerTVHD_MCE_A180_Drv_v1.2.2.16.zip"
+	"ftp://ftp.work.acer-euro.com/desktop/aspire_idea510/vista/Drivers/Yuan%20MPC718%20TV%20Tuner%20Card%202.13.10.1016.zip"
 )
 
 SRC_URI=""
@@ -177,7 +220,7 @@
 
 	GET_PARAM="${FW_GET_PARAMETER[CARD]}"
 	if [[ ${GET_PARAM} != "-" ]]; then
-		# all with get_dvb_firmware need unzip
+		# all firmwares extracted by get_dvb_firmware need unzip
 		DEPEND="${DEPEND} dvb_cards_${FW_USE_FLAGS[CARD]}? ( app-arch/unzip )"
 	fi
 done
@@ -186,8 +229,7 @@
 
 DEPEND="${DEPEND}
 	${NEGATIVE_USE_FLAGS}
-		${UNSHIELD_DEPEND}
-		app-arch/unzip
+	app-arch/unzip
 	${NEGATIVE_END_BRACKETS}"
 
 install_dvb_card() {
@@ -205,7 +247,7 @@
 pkg_setup() {
 	#echo SRC_URI=${SRC_URI}
 	#echo DEPEND=${DEPEND}
-	if hasq tda1004x ${DVB_CARDS}; then
+	if has tda1004x ${DVB_CARDS}; then
 		eerror
 		eerror "DVB_CARDS flag tda1004x has been split into"
 		eerror "tda10045, tda10046 and tda10046lifeview".
@@ -221,7 +263,7 @@
 	# according to http://devmanual.gentoo.org/general-concepts/use-flags/index.html
 	# we should not die here. However, there is no sensible fallback choice to make
 	# because the user may have either the one or the other. WYGIWYG
-	if useq dvb_cards_tda10046 && useq dvb_cards_tda10046lifeview; then
+	if use dvb_cards_tda10046 && use dvb_cards_tda10046lifeview; then
 		eerror
 		eerror "You cannot have both tda10046 and tda10046lifeview in DVB_CARDS"
 		eerror "because of colliding firmware filenames (dvb-fe-tda10046.fw)."
@@ -236,6 +278,9 @@
 	done
 	elog "If you need another firmware file and want it included create a bug"
 	elog "at bugs.gentoo.org."
+	elog "If some firmware sources are not fetchable anymore please also report"
+	elog "a bug. If there is no alternative source or an update to the firmware"
+	elog "available we have to remove it from this ebuild and you are on your own."
 }
 
 src_unpack() {
@@ -245,20 +290,19 @@
 	done
 
 	# unpack firmware-packet
-	if hasq ${PACKET_NAME} ${A}; then
+	if has ${PACKET_NAME} ${A}; then
 		unpack ${PACKET_NAME}
-		# this file has renamed
-		mv dvb-usb-dibusb-5.0.0.11.fw dvb-dibusb-5.0.0.11.fw
 	fi
 
-	#SCRIPT_V=${PV}
-	#unchanged since last ebuild
-	SCRIPT_V=2006.11.13
+	use dvb_cards_mpc718 && mv Yuan%20MPC718%20TV%20Tuner%20Card%202.13.10.1016.zip "Yuan MPC718 TV Tuner Card 2.13.10.1016.zip"
+	use dvb_cards_dibusb-usb1 && mv dvb-usb-dibusb-5.0.0.11.fw dvb-dibusb-5.0.0.11.fw
+	use dvb_cards_ttpci && mv dvb-ttpci-01.fw-fc2624 dvb-ttpci-01.fw
+
+	SCRIPT_V=${PV}
 
 	# Adjust temp-dir of get_dvb_firmware
 	sed "${FILESDIR}"/get_dvb_firmware-${SCRIPT_V} \
-		-e "s#/tmp#${T}#g" \
-		> get_dvb_firmware
+		-e "s#/tmp#${T}#g" > get_dvb_firmware
 	chmod a+x get_dvb_firmware
 
 	# extract the firmware-files