enigma2.bb: update srctree recipe to latest oe version

enigma2.bb

@@ -1,19 +1,21 @@
 DESCRIPTION = "Enigma2 is an experimental, but useful framebuffer-based frontend for DVB functions"
 MAINTAINER = "Felix Domke <[email protected]>"
+DEMUXTOOL = "${@["replex","projectx"][bb.data.getVar("TARGET_FPU",d,1) == 'hard']}"
 DEPENDS = "jpeg libungif libmad libpng libsigc++-1.2 gettext-native \
 	dreambox-dvbincludes freetype libdvbsi++ python python-twisted swig-native  \
-	dvd+rw-tools dvdauthor mjpegtools cdrkit python-imaging replex \
+	dvd+rw-tools dvdauthor mjpegtools cdrkit python-imaging ${DEMUXTOOL} \
 	libfribidi libxmlccwrap libdreamdvd libdvdcss tuxtxt-enigma2 ethtool \
-	gstreamer gst-plugins-bad gst-plugins-good gst-plugins-ugly"
+	gstreamer gst-plugins-bad gst-plugins-good gst-plugins-ugly \
+	python-wifi"
 RDEPENDS_${PN} = "python-codecs python-core python-lang python-re python-threading \
 	python-xml python-fcntl gst-plugin-decodebin gst-plugin-decodebin2 python-stringold \
 	python-pickle gst-plugin-app \
 	gst-plugin-id3demux gst-plugin-mad gst-plugin-ogg gst-plugin-playbin \
 	gst-plugin-typefindfunctions gst-plugin-audioconvert gst-plugin-audioresample \
 	gst-plugin-wavparse python-netclient gst-plugin-mpegstream gst-plugin-selector \
-	gst-plugin-flac gst-plugin-mpegdemux \
-	gst-plugin-neonhttpsrc gst-plugin-mpegaudioparse gst-plugin-subparse \
-	gst-plugin-apetag gst-plugin-icydemux gst-plugin-autodetect \
+	gst-plugin-flac gst-plugin-mpegdemux gst-plugin-dvdsub \
+	gst-plugin-souphttpsrc gst-plugin-mpegaudioparse gst-plugin-subparse \
+	gst-plugin-apetag gst-plugin-icydemux gst-plugin-autodetect gst-plugin-audioparsersbad \
 	python-twisted-core python-elementtree \
 	enigma2-fonts \
 	glibc-gconv-iso8859-15 ethtool"
@@ -30,13 +32,17 @@ RDEPENDS_${PN} += "font-valis-enigma"
 
 RDEPENDS_${PN} += "${@base_contains("MACHINE_FEATURES", "alsa", "gst-plugin-alsa alsa-conf", "", d)}"
 
-# proper hdtv hardware should be able to playback these codecs
-RDEPENDS_${PN} += "${@base_contains("MACHINE_FEATURES", "hdtv", "gst-plugin-avi gst-plugin-matroska \
-										gst-plugin-qtdemux gst-plugin-cdxaparse gst-plugin-cdio gst-plugin-vcdsrc gst-plugin-vorbis", "", d)}"
+# proper hdtv hardware should be able to playback these codecs (hmm, what about DVD/CD?)
+# and rtsp support is not expected to be useful without h264 decoder
+RDEPENDS_${PN} += "${@base_contains("MACHINE_FEATURES", "hdtv", "\
+	gst-plugin-avi gst-plugin-matroska gst-plugin-qtdemux \
+	gst-plugin-udp gst-plugin-rtsp gst-plugin-rtp gst-plugin-rtpmanager \
+	gst-plugin-cdxaparse gst-plugin-cdio gst-plugin-vcdsrc", "", d)}"
 
-RDEPENDS_enigma2_append_dm7020 = " gst-plugin-ossaudio gst-plugin-ivorbisdec"
-RDEPENDS_enigma2_append_dm7025 = " gst-plugin-ivorbisdec"
-RDEPENDS_enigma2_append_dm800 = " gst-plugin-ivorbisdec"
+# pick the vorbis decoder based on FPU capability
+RDEPENDS_${PN} += "${@["gst-plugin-ivorbisdec","gst-plugin-vorbis"][bb.data.getVar("TARGET_FPU",d,1) == 'hard']}"
+
+RDEPENDS_enigma2_append_dm7020 = " gst-plugin-ossaudio"
 
 # FPU hardware should be able to downmix DTS
 RRECOMMENDS_${PN} = "${@["","gst-plugin-dtsdec"][bb.data.getVar("TARGET_FPU",d,1) == 'hard']}"
@@ -48,7 +54,6 @@ RRECOMMENDS_${PN} = "${@["","gst-plugin-dtsdec"][bb.data.getVar("TARGET_FPU",d,1
 
 DESCRIPTION_append_enigma2-plugin-extensions-cutlisteditor = "enables you to cut your movies."
 RDEPENDS_enigma2-plugin-extensions-cutlisteditor = "aio-grab"
-DESCRIPTION_append_enigma2-plugin-extensions-cutlisteditor = "enables you to cut your movies."
 DESCRIPTION_append_enigma2-plugin-extensions-graphmultiepg = "shows a graphical timeline EPG."
 DESCRIPTION_append_enigma2-plugin-extensions-pictureplayer = "displays photos on the TV."
 DESCRIPTION_append_enigma2-plugin-systemplugins-frontprocessorupdate = "keeps your frontprocessor up to date."
@@ -69,36 +74,48 @@ RDEPENDS_enigma2-plugin-extensions-modem = "dreambox-modem-ppp-scripts"
 DESCRIPTION_append_enigma2-plugin-systemplugins-wirelesslan = "helps you configuring your wireless lan"
 RDEPENDS_enigma2-plugin-systemplugins-wirelesslan = "wpa-supplicant wireless-tools python-wifi"
 DESCRIPTION_append_enigma2-plugin-systemplugins-networkwizard = "provides easy step by step network configuration"
-RDEPENDS_enigma2-plugin-extensions-dvdburn = "dvd+rw-tools dvdauthor mjpegtools cdrkit python-imaging replex"
+RDEPENDS_enigma2-plugin-extensions-dvdburn = "dvd+rw-tools dvdauthor mjpegtools cdrkit python-imaging ${DEMUXTOOL}"
 
 inherit gitpkgv srctree
 
-PN = "enigma2-debug"
 PV = "2.7+git"
 PKGV = "2.7+git${GITPKGV}"
-PR = "r24"
+PR = "r26"
 
 FILES_${PN} += "${datadir}/keymaps"
 FILES_${PN}-meta = "${datadir}/meta"
+PACKAGES =+ "${PN}-src"
 PACKAGES += "${PN}-meta"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 inherit autotools pkgconfig
 
+# fonts: Rarely changed, but updated everytime. Put in separate package,
+# so the dm7025 can keep them in squashfs. Also saves bandwidth...
+PACKAGES =+ "enigma2-fonts"
+PV_enigma2-fonts = "2010.11.14"
+PR_enigma2-fonts = "r0"
+PKGV_enigma2-fonts = "${PV_enigma2-fonts}"
+FILES_enigma2-fonts = "${datadir}/fonts"
+
 bindir = "/usr/bin"
 sbindir = "/usr/sbin"
 
-EXTRA_OECONF = "--enable-maintainer-mode --with-target=native --with-libsdl=no --with-boxtype=${MACHINE}"
-
-EXTRA_OECONF += "${@base_contains("MACHINE_FEATURES", "textlcd", "--with-textlcd" , "", d)}"
-EXTRA_OECONF += "${@base_contains("MACHINE_FEATURES", "colorlcd", "--with-colorlcd" , "", d)}"
+EXTRA_OECONF = "\
+	--enable-maintainer-mode --with-target=native --with-libsdl=no --with-boxtype=${MACHINE} \
+	${@base_contains("MACHINE_FEATURES", "textlcd", "--with-textlcd" , "", d)} \
+	${@base_contains("MACHINE_FEATURES", "colorlcd", "--with-colorlcd" , "", d)} \
+	BUILD_SYS=${BUILD_SYS} \
+	HOST_SYS=${HOST_SYS} \
+	STAGING_INCDIR=${STAGING_INCDIR} \
+	STAGING_LIBDIR=${STAGING_LIBDIR} \
+	"
 
 do_install_append() {
 	install -d ${D}/usr/share/keymaps
 }
 
 python populate_packages_prepend () {
 	enigma2_plugindir = bb.data.expand('${libdir}/enigma2/python/Plugins', d)
-
 	do_split_packages(d, enigma2_plugindir, '(.*?/.*?)/.*', 'enigma2-plugin-%s', '%s ', recursive=True, match_path=True, prepend=True, extra_depends="enigma2")
 }