Revision bump. Add back tda10045 firmware thanks to Michael Lothian in bug #275667

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

3 files changed, 346 insertions, 2 deletions

diff --git a/media-tv/linuxtv-dvb-firmware/ChangeLog b/media-tv/linuxtv-dvb-firmware/ChangeLog
index 4d5fbc1aaaef..0215020b4a34 100644
--- a/media-tv/linuxtv-dvb-firmware/ChangeLog
+++ b/media-tv/linuxtv-dvb-firmware/ChangeLog
@@ -1,6 +1,13 @@
 # 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.22 2009/09/02 20:49:58 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/linuxtv-dvb-firmware/ChangeLog,v 1.23 2009/09/09 20:14:42 billie Exp $
+
+*linuxtv-dvb-firmware-2009.07.06-r1 (09 Sep 2009)
+
+  09 Sep 2009; Pielmeier Daniel <billie@gentoo.org>
+  +linuxtv-dvb-firmware-2009.07.06-r1.ebuild:
+  Revision bump. Add back tda10045 firmware thanks to Michael Lothian in bug
+  #275667
 
 *linuxtv-dvb-firmware-2009.07.06 (02 Sep 2009)
 
diff --git a/media-tv/linuxtv-dvb-firmware/Manifest b/media-tv/linuxtv-dvb-firmware/Manifest
index 1dae4dc564e7..8b8804ca81dc 100644
--- a/media-tv/linuxtv-dvb-firmware/Manifest
+++ b/media-tv/linuxtv-dvb-firmware/Manifest
@@ -15,6 +15,7 @@ DIST af9005.fw 28250 RMD160 ad88928d271b0bf3d172dd44e09db0c83d87c3b1 SHA1 25d758
 DIST dec217g.exe 16371951 RMD160 34ffa441adba1c34a2fafe067758f12782e54662 SHA1 02ec3582d5e8b9145de4a6e9804132b2cac7cb89 SHA256 fd20902bcc3178a26b5a27fe88adcdfce888daa8d2206b67b13e5f3a3973dc1c
 DIST dvb-fe-bcm3510-01.fw 2285 RMD160 894ecf8ddcf0bd7b34caed81053a18233a82f9f0 SHA1 09a2478fdff67ed6a4e77f4dcd05da43841874a9 SHA256 978ece002a3e1f5eb760f6ca48496e05da00b7aa76e0f6f2cb108bde2ea14f51
 DIST dvb-fe-sp887x.fw 23620 RMD160 e83382b4cb2dfa90c216e0a2b0e10cdddf5ce593 SHA1 bd64a6042f4f1884c87f0cfda24ed656f2333bcd SHA256 e0a3b66c7b059c3be93764bea82866121c1f4fa2336f4b6abed1047360e92368
+DIST dvb-fe-tda10045.fw 30555 RMD160 1848ab8f79be8f77b12d58f05127b532290f5968 SHA1 65c7b3711b4bdf1bd7f0a3780334fb2502535db4 SHA256 211d6917a2c1b56838d91bdd5963d0646fac111cdd8c765c2398af49e33b0e46
 DIST dvb-firmwares-1.tar.bz2 182356 RMD160 2e70e8111e0d8889f5cd017dfa1c8d2b635f61a2 SHA1 5431a0f6c95ca14f36531e841f95a2472d2c96b9 SHA256 11772d539e5605e92f51a1edc82382c19808dea2bb9f0b425efad354e0d9bd52
 DIST dvb-ttpci-01.fw-fc2624 242696 RMD160 ac6874b80744120406e003c9a5209d4245251af9 SHA1 f14aef72fb3b86058980bec2d8f1e59a02b0283b SHA256 dc4e47c3939956f2f3466fd0996a9ca62adc7068ac061afdd14bbc3b3d09e9d2
 DIST dvb-usb-af9015.fw 15913 RMD160 3dd2635d0d8e9fd5001e6c7e636fbc1e6ac533e5 SHA1 6a0edcc65f490d69534d4f071915fc73f5461560 SHA256 a0ae064c3acef212172f13317d627492d0ed3c0a43f3634821b33a00fbf99621
@@ -35,6 +36,7 @@ DIST v4l-cx25840.fw 16382 RMD160 904d1921a2e12551b35776ee06bffe636e795c6b SHA1 f
 EBUILD linuxtv-dvb-firmware-1.ebuild 4650 RMD160 c2e1f60fab881f33237797d207edf571e3aafff6 SHA1 327948b85e53794f8c57f5f24b44e4cc3ea096bd SHA256 4622276cd5254414811ae3a03ba345c28c241dd12d523aea79a4aad424ef06a0
 EBUILD linuxtv-dvb-firmware-2006.11.13.ebuild 5767 RMD160 7f7e2441bf4417814ab37fdd371858529709e358 SHA1 3c3171252dae4b96ca8727d543f8101bb231a702 SHA256 d235d858f6089bd0172e34e3ca51911a56efbd1beb017b8e47996da54a5fa846
 EBUILD linuxtv-dvb-firmware-2007.04.13.ebuild 6973 RMD160 5d09ef4c6f8024a5067403be48d3d99e9d19347b SHA1 a52e6f0e91fe4c9814dd469bdbd3bf0baffca1de SHA256 82ae77fcd315303aeedc384b3d5a2d8a94ad226f4d7b4623f36460758d251360
+EBUILD linuxtv-dvb-firmware-2009.07.06-r1.ebuild 8721 RMD160 addd347f72c5fccc331af79bb1514bcb05e381c9 SHA1 3c4a53843a9ab016ffda50920dcf3ca8fd7898e8 SHA256 9e7cd427398374ccb4570dbc9df33755f795ced8af32a577af20ce093d7b3eed
 EBUILD linuxtv-dvb-firmware-2009.07.06.ebuild 8631 RMD160 720e5c647fe7d7b2f9beb9e20e00436a5f28ebe8 SHA1 4d4af8e9c0b749cbd5d8d0b6aa59dcb3184af926 SHA256 942324f55542ca6a805aafdf2b75fc4ae084ffefd0b0afca433c9449d3bfd518
-MISC ChangeLog 4332 RMD160 c31caa8d13e8cf641a77a891e343742b6f890e05 SHA1 c406b79d1b6a9b4f710331814218a348856d3007 SHA256 fbc8bb03150e71113d257430f2a5afc71fb05cc15cf45fc99e66ed53e1f8d081
+MISC ChangeLog 4569 RMD160 460301afcfc4b5becff66386f64b642d18a2c559 SHA1 d1a26f6e481b3bab48c366349672e66b2a7d6547 SHA256 c8dc3680ad9a5cd61d3724eb957e167f6323c0dfb31f6e7a7676c589b1e1ed9f
 MISC metadata.xml 162 RMD160 8bd24f9f2805b005cef731c0cda868c72e6980af SHA1 7464d1657179a3f30c5ea2ad401590e4489ac945 SHA256 aaad144c69dd58781e1dc97b5fbad08a5b4db504bd3cbbb4ab27018a307d5d81
diff --git a/media-tv/linuxtv-dvb-firmware/linuxtv-dvb-firmware-2009.07.06-r1.ebuild b/media-tv/linuxtv-dvb-firmware/linuxtv-dvb-firmware-2009.07.06-r1.ebuild
new file mode 100644
index 000000000000..b4324fffc24d
--- /dev/null
+++ b/media-tv/linuxtv-dvb-firmware/linuxtv-dvb-firmware-2009.07.06-r1.ebuild
@@ -0,0 +1,335 @@
+# 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.07.06-r1.ebuild,v 1.1 2009/09/09 20:14:42 billie Exp $
+
+DESCRIPTION="Firmware files needed for operation of some dvb-devices"
+HOMEPAGE="http://www.linuxtv.org"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+RESTRICT="mirror"
+
+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}"
+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
+	"usb-a800"
+	"dibusb-usb2"
+	"usb-dtt200u"
+	"usb-umt"
+	"usb-vp702x"
+	"usb-vp7045"
+	"usb-wt220u"
+	"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"
+	"tda10045"
+# get_dvb_firmware
+	"sp8870"
+	"tda10046"
+	"tda10046lifeview"
+	"ttusb-dec"
+	"ttusb-dec"
+	"ttusb-dec"
+	"opera1"
+	"opera1"
+	"vp7041"
+	"nxt200x"
+	"mpc718"
+)
+
+FW_FILES=(
+# packet
+	"dvb-usb-avertv-a800-02.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-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-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"
+	"dvb-fe-tda10045.fw"
+# get_dvb_firmware
+	"dvb-fe-sp8870.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-usb-opera1-fpga-01.fw"
+	"dvb-usb-opera-01.fw"
+	"dvb-vp7041-2.422.fw"
+	"dvb-fe-nxt2004.fw"
+	"dvb-cx18-mpc718-mt352.fw"
+)
+
+FW_GET_PARAMETER=(
+# packet
+	"-"
+	"-"
+	"-"
+	"-"
+	"-"
+	"-"
+	"-"
+	"-"
+	"-"
+	"-"
+	"-"
+# own URL
+	"-"
+	"-"
+	"-"
+	"-"
+	"-"
+	"-"
+	"-"
+	"-"
+	"-"
+	"-"
+	"-"
+	"-"
+	"-"
+	"-"
+	"-"
+	"-"
+	"-"
+# get_dvb_firmware
+	"sp8870"
+	"tda10046"
+	"tda10046lifeview"
+	"dec2000t"
+	"dec2540t"
+	"dec3000s"
+	"opera1"
+	"-"
+	"vp7041"
+	"nxt2004"
+	"mpc718"
+)
+
+FW_URLS=(
+# packet
+	"${PACKET_SRC_URI}"
+	"${PACKET_SRC_URI}"
+	"${PACKET_SRC_URI}"
+	"${PACKET_SRC_URI}"
+	"${PACKET_SRC_URI}"
+	"${PACKET_SRC_URI}"
+	"${PACKET_SRC_URI}"
+	"${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://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"
+	"http://www.fireburn.co.uk/dvb-fe-tda10045.fw"
+# get_dvb_firmware
+	"http://2.download.softwarepatch.pl/1619edb0dcb493dd5337b94a1f79c3f6/tt_Premium_217g.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.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=""
+NEGATIVE_USE_FLAGS=""
+NEGATIVE_END_BRACKETS=""
+ALL_URLS=""
+
+for ((CARD=0; CARD < ${#FW_USE_FLAGS[*]}; CARD++)) do
+	URL="${FW_URLS[CARD]}"
+
+	if [[ -z ${URL} ]]; then
+		echo "missing url for ${FW_USE_FLAGS[CARD]}"
+		continue
+	fi
+	SRC_URI="${SRC_URI} dvb_cards_${FW_USE_FLAGS[CARD]}? ( ${URL} )"
+
+	IUSE="${IUSE} dvb_cards_${FW_USE_FLAGS[CARD]}"
+	NEGATIVE_USE_FLAGS="${NEGATIVE_USE_FLAGS} !dvb_cards_${FW_USE_FLAGS[CARD]}? ( "
+	NEGATIVE_END_BRACKETS="${NEGATIVE_END_BRACKETS} )"
+	ALL_URLS="${ALL_URLS} ${URL}"
+
+	GET_PARAM="${FW_GET_PARAMETER[CARD]}"
+	if [[ ${GET_PARAM} != "-" ]]; then
+		# all firmwares extracted by get_dvb_firmware need unzip
+		DEPEND="${DEPEND} dvb_cards_${FW_USE_FLAGS[CARD]}? ( app-arch/unzip )"
+	fi
+done
+
+SRC_URI="${SRC_URI} ${NEGATIVE_USE_FLAGS} ${ALL_URLS} ${NEGATIVE_END_BRACKETS}"
+
+DEPEND="${DEPEND}
+	${NEGATIVE_USE_FLAGS}
+	app-arch/unzip
+	${NEGATIVE_END_BRACKETS}"
+
+install_dvb_card() {
+	if [[ -z ${DVB_CARDS} ]]; then
+		# install (almost) all firmware files
+
+		# do not install this one due to conflicting filenames
+		[[ "${1}" != "tda10046lifeview" ]]
+	else
+		# Check if this flag is set
+		use dvb_cards_${1}
+	fi
+}
+
+pkg_setup() {
+	#echo SRC_URI=${SRC_URI}
+	#echo DEPEND=${DEPEND}
+	if has tda1004x ${DVB_CARDS}; then
+		eerror
+		eerror "DVB_CARDS flag tda1004x has been split into"
+		eerror "tda10045, tda10046 and tda10046lifeview".
+		eerror
+		eerror "But beware that you cannot enable tda10046 and"
+		eerror "tda10046lifeview at the same time."
+		eerror
+	fi
+
+	if [[ -z ${DVB_CARDS} ]]; then
+		elog "DVB_CARDS is not set, installing all available firmware files."
+	fi
+	# 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 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)."
+		eerror "Sorry."
+		eerror
+		die "Conflicting values for DVB_CARDS set."
+	fi
+	elog "List of possible card-names to use for DVB_CARDS:"
+	echo ${FW_USE_FLAGS[*]}| tr ' ' '\n' | sort | uniq | fmt \
+	| while read line; do
+		elog "   ${line}"
+	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() {
+	# link all downloaded files to ${S}
+	for f in ${A}; do
+		[[ -L ${f} ]] || ln -s ${DISTDIR}/${f} ${f}
+	done
+
+	# unpack firmware-packet
+	if has ${PACKET_NAME} ${A}; then
+		unpack ${PACKET_NAME}
+	fi
+
+	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
+	chmod a+x get_dvb_firmware
+
+	# extract the firmware-files
+	for ((CARD=0; CARD < ${#FW_USE_FLAGS[*]}; CARD++)) do
+		install_dvb_card ${FW_USE_FLAGS[CARD]} || continue
+
+		GET_PARAM=${FW_GET_PARAMETER[CARD]}
+		if [[ ${GET_PARAM} != "-" ]]; then
+			[[ -f ${FW_FILES[CARD]} ]] && ewarn "Already existing: ${FW_FILES[CARD]}"
+			elog "Extracting ${FW_FILES[CARD]}"
+			./get_dvb_firmware ${GET_PARAM}
+		fi
+	done
+}
+
+src_install() {
+	insinto /lib/firmware
+
+	for ((CARD=0; CARD < ${#FW_USE_FLAGS[*]}; CARD++)) do
+		if install_dvb_card ${FW_USE_FLAGS[CARD]}; then
+			local FILE=${FW_FILES[CARD]}
+			[[ -f ${FILE} ]] || die "File ${FILE} does not exist!"
+			doins ${FILE}
+		fi
+	done
+}