X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_openvuplus_3.0;a=blobdiff_plain;f=meta-openvuplus%2Frecipes-vuplus%2Fenigma2%2Fenigma2.bb;fp=meta-openvuplus%2Frecipes-vuplus%2Fenigma2%2Fenigma2.bb;h=7464f06b770aaf9592dca9040d4921899eee22e4;hp=635c22421d1fd31f140824ec55b1302698a6a293;hb=d5ed73c8eb69b1df41a91be4c5a92fd8881eade9;hpb=432c24518aea6538c76abac02362c00456b3251e

diff --git a/meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb b/meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb
index 635c224..7464f06 100644
--- a/meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb
+++ b/meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb
@@ -1,37 +1,140 @@
 DESCRIPTION = "Enigma2 is an experimental, but useful framebuffer-based frontend for DVB functions"
-MAINTAINER = "Felix Domke <tmbinc@elitedvb.net>"
+MAINTAINER = "vuplus team"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=c9e255efa454e0155c1fd758df7dcaf3"
-DEPENDS = "jpeg libungif libmad libpng libsigc++-1.2 gettext-native \
-	dreambox-dvbincludes freetype libdvbsi++ python swig-native \
-	libfribidi libxmlccwrap libdreamdvd gstreamer gst-plugin-dvbmediasink \
-	gst-plugins-bad gst-plugins-good gst-plugins-ugly python-wifi \
-	hostap-daemon bridge-utils ntfs-3g dosfstools util-linux \
-"
 
-RDEPENDS_GST= "gst-plugins-base-decodebin gst-plugins-base-decodebin2 gst-plugins-base-app gst-plugins-bad-fragmented \
-		gst-plugins-good-id3demux gst-plugins-ugly-mad gst-plugins-base-ogg gst-plugins-base-playbin \
-        	gst-plugins-base-typefindfunctions gst-plugins-base-audioconvert gst-plugins-base-audioresample \
-		gst-plugins-good-wavparse gst-plugins-ugly-mpegstream \
-		gst-plugins-good-flac gst-plugin-dvbmediasink gst-plugins-bad-mpegdemux gst-plugins-ugly-dvdsub \
-		gst-plugins-good-souphttpsrc gst-plugins-ugly-mpegaudioparse gst-plugins-base-subparse \
-        	gst-plugins-good-apetag gst-plugins-good-icydemux gst-plugins-good-autodetect gst-plugins-good-flv \
-		gst-plugins-bad-mms gst-plugins-ugly-asf gst-plugins-bad-faad \
-"
+DEPENDS = " \
+        jpeg \
+        giflib \
+        libmad \
+        libpng \
+        libsigc++-1.2 \
+        gettext-native \
+        dreambox-dvbincludes \
+        freetype \
+        libdvbsi++ \
+        python \
+        swig-native \
+        libfribidi \
+        libxml2 \
+        libxmlccwrap \
+        libdreamdvd \
+        ${@base_contains("GST_VERSION", "1.0", "gstreamer1.0-plugins-base gstreamer1.0", "gst-plugins-base gstreamer", d)} \
+        python-wifi \
+        hostapd \
+        bridge-utils \
+        ntfs-3g \
+        dosfstools \
+        util-linux \
+	"
 
-RDEPENDS_${PN} = "python-codecs python-core python-lang python-re python-threading \
-		python-xml python-fcntl python-stringold python-pickle python-netclient \
-		glibc-gconv-iso8859-15 ethtool parted \
-		${RDEPENDS_GST} \
-"
+RDEPENDS_${PN} = " \
+	alsa-conf \
+        ethtool \
+	glibc-gconv-iso8859-15 \
+        parted \
+	${PYTHON_RDEPS} \
+	${GST_RDEPENDS} \
+	"
 
-GST_RTSP_RDEPENDS = "gst-plugins-good-udp gst-plugins-good-rtsp gst-plugins-good-rtp gst-plugins-good-rtpmanager"
-GST_ALSA_RDEPENDS = "gst-plugins-base-alsa alsa-conf"
-GST_MISC_RDEPENDS = "gst-plugins-good-matroska gst-plugins-good-isomp4 gst-plugins-base-vorbis gst-plugins-good-audioparsers"
-GST_DVD_RDEPENDS = "gst-plugins-bad-cdxaparse gst-plugins-ugly-cdio gst-plugins-bad-vcdsrc"
-GST_BASE_RDEPENDS = "${GST_ALSA_RDEPENDS} ${GST_MISC_RDEPENDS} ${GST_RTSP_RDEPENDS}"
+PYTHON_RDEPS = " \
+        python-codecs \
+        python-core \
+        python-lang \
+        python-re \
+        python-threading \
+        python-xml \
+        python-fcntl \
+        python-stringold \
+        python-pickle \
+        python-netclient \
+	"
 
-RDEPENDS_append_vuplus = " ${GST_BASE_RDEPENDS} ${GST_DVD_RDEPENDS} gst-plugins-good-avi"
+GST_RDEPENDS = "${@base_contains('GST_VERSION', '1.0', ' \
+	gstreamer1.0-plugin-dvbmediasink \
+	gstreamer1.0-plugin-subsink \
+	gstreamer1.0-plugins-base-alsa \
+	gstreamer1.0-plugins-base-app \
+	gstreamer1.0-plugins-base-audioconvert \
+	gstreamer1.0-plugins-base-audioresample \
+	gstreamer1.0-plugins-base-ogg \
+	gstreamer1.0-plugins-base-playback \
+	gstreamer1.0-plugins-base-subparse \
+	gstreamer1.0-plugins-base-typefindfunctions \
+	gstreamer1.0-plugins-base-vorbis \
+	gstreamer1.0-plugins-good-apetag \
+	gstreamer1.0-plugins-good-audioparsers \
+	gstreamer1.0-plugins-good-autodetect \
+	gstreamer1.0-plugins-good-avi \
+	gstreamer1.0-plugins-good-flac \
+	gstreamer1.0-plugins-good-flv \
+	gstreamer1.0-plugins-good-icydemux \
+	gstreamer1.0-plugins-good-id3demux \
+	gstreamer1.0-plugins-good-isomp4 \
+	gstreamer1.0-plugins-good-matroska \
+	gstreamer1.0-plugins-good-rtp \
+	gstreamer1.0-plugins-good-rtpmanager \
+	gstreamer1.0-plugins-good-rtsp \
+	gstreamer1.0-plugins-good-souphttpsrc \
+	gstreamer1.0-plugins-good-udp \
+	gstreamer1.0-plugins-good-wavparse \
+	gstreamer1.0-plugins-bad-faad \
+	gstreamer1.0-plugins-bad-fragmented \
+	gstreamer1.0-plugins-bad-videoparsersbad \
+	gstreamer1.0-plugins-bad-mms \
+	gstreamer1.0-plugins-bad-mpegpsdemux \
+	gstreamer1.0-plugins-bad-mpegtsdemux \
+	gstreamer1.0-plugins-ugly-asf \
+	gstreamer1.0-plugins-ugly-cdio \
+	gstreamer1.0-plugins-ugly-dvdsub \
+	gstreamer1.0-plugins-ugly-mad \
+	gstreamer1.0-plugins-ugly-amrnb \
+	gstreamer1.0-plugins-ugly-amrwbdec \
+	', ' \
+	gst-plugin-dvbmediasink \
+	gst-plugin-subsink \
+	gst-plugins-base-alsa \
+	gst-plugins-base-app \
+	gst-plugins-base-audioconvert \
+	gst-plugins-base-audioresample \
+	gst-plugins-base-decodebin \
+	gst-plugins-base-decodebin2 \
+	gst-plugins-base-ogg \
+	gst-plugins-base-playbin \
+	gst-plugins-base-subparse \
+	gst-plugins-base-typefindfunctions \
+	gst-plugins-base-vorbis \
+	gst-plugins-good-apetag \
+	gst-plugins-good-audioparsers \
+	gst-plugins-good-autodetect \
+	gst-plugins-good-avi \
+	gst-plugins-good-flac \
+	gst-plugins-good-flv \
+	gst-plugins-good-icydemux \
+	gst-plugins-good-id3demux \
+	gst-plugins-good-isomp4 \
+	gst-plugins-good-matroska \
+	gst-plugins-good-rtp \
+	gst-plugins-good-rtpmanager \
+	gst-plugins-good-rtsp \
+	gst-plugins-good-souphttpsrc \
+	gst-plugins-good-udp \
+	gst-plugins-good-wavparse \
+	gst-plugins-bad-cdxaparse \
+	gst-plugins-bad-faad \
+	gst-plugins-bad-mms \
+	gst-plugins-bad-mpegdemux \
+	gst-plugins-bad-vcdsrc \
+	gst-plugins-bad-fragmented \
+	gst-plugins-ugly-asf \
+	gst-plugins-ugly-cdio \
+	gst-plugins-ugly-dvdsub \
+	gst-plugins-ugly-mad \
+	gst-plugins-ugly-mpegstream \
+	gst-plugins-ugly-mpegaudioparse \
+	gst-plugins-ugly-amrnb \
+	gst-plugins-ugly-amrwbdec \
+	', d)}"
 
 # 'forward depends' - no two providers can have the same PACKAGES_DYNAMIC, however both
 # enigma2 and enigma2-plugins produce enigma2-plugin-*.
@@ -66,9 +169,12 @@ SUMMARY_enigma2-plugin-systemplugins-networkwizard = "provides easy step by step
 RDEPENDS_enigma2-plugin-extensions-webbrowser = "python-gdata libqtwebkite4 vuplus-webbrowser-utils qt4-embedded-fonts qt4-embedded-plugin-imageformat-gif qt4-embedded-plugin-imageformat-ico qt4-embedded-plugin-imageformat-jpeg qt4-embedded-plugin-imageformat-mng qt4-embedded-plugin-imageformat-svg qt4-embedded-plugin-imageformat-tiff qt4-embedded-plugin-iconengine-svgicon "
 SUMMARY_enigma2-plugin-systemplugins-crashreport = "automatically send crashlogs to Vu+"
 RDEPENDS_enigma2-plugin-systemplugins-crashreport = "python-twisted-mail python-twisted-names python-compression python-mime python-email"
-RDEPENDS_enigma2-plugin-systemplugins-wirelessaccesspoint = "hostap-daemon bridge-utils"
+RDEPENDS_enigma2-plugin-systemplugins-wirelessaccesspoint = "hostapd bridge-utils"
 
-RDEPENDS_enigma2-plugin-extensions-streamtv = "librtmp0 gst-plugins-bad-rtmp "
+RDEPENDS_enigma2-plugin-extensions-streamtv = " \
+	librtmp1 \
+	${@base_contains("GST_VERSION", "1.0", "gstreamer1.0-plugins-bad-rtmp", "gst-plugins-bad-rtmp", d)} \
+"
 
 DEPENDS += "djmount minidlna"
 RDEPENDS_enigma2-plugin-extensions-dlnaserver = "minidlna "
@@ -89,70 +195,75 @@ RDEPENDS_enigma2-plugin-systemplugins-backupsuitehdd = "mtd-utils-mkfs.ubifs mtd
 RDEPENDS_enigma2-plugin-systemplugins-backupsuiteusb = "enigma2-plugin-extensions-backupsuitehdd"
 
 DEPENDS += "${@base_contains("VUPLUS_FEATURES", "uianimation", "libgles libvugles2" , "", d)}"
-RDEPENDS_append_vuplus += "${@base_contains("VUPLUS_FEATURES", "uianimation", "libgles libvugles2" , "", d)}"
+RDEPENDS_${PN}_append_vuplus += "${@base_contains("VUPLUS_FEATURES", "uianimation", "libgles libvugles2" , "", d)}"
 
 PN = "enigma2"
-PR = "r97"
+PR = "r101"
 
-SRCDATE = "20121128"
-#SRCDATE is NOT used by git to checkout a specific revision
-#but we need it to build a ipk package version
-#when you like to checkout a specific revision of e2 you need
-#have to specify a commit id or a tag name in SRCREV
+inherit gitpkgv pythonnative
 
 ####################################################
-BRANCH = "vuplus_experimental"
+SRCDATE = "20121128"
 PV = "experimental-git${SRCDATE}"
+BRANCH = "vuplus_experimental_gst10"
 SRCREV = ""
 ####################################################
 
 # enigma2_vuplus_mediaplayer.patch is for trick-play in media player
 
-SRC_URI = "git://code.vuplus.com/git/dvbapp.git;protocol=http;branch=${BRANCH};tag=${SRCREV} \
-           file://enigma2_vuplus_skin.patch;patch=1;pnum=1 \
-           file://enigma2_vuplus_mediaplayer.patch;patch=1;pnum=1 \
-	   file://enigma2_vuplus_mediaplayer_subtitle.patch;patch=1;pnum=1 \
-           file://enigma2_vuplus_remove_dreambox_enigma.patch;patch=1;pnum=1 \
-           file://enigma2_vuplus_vfd_mode.patch;patch=1;pnum=1 \
-           file://enigma2_vuplus_addlibpythondeps.patch;patch=1;pnum=1 \
-	   file://enigma2_vuplus_pluginbrowser.patch;striplevel=1 \
-           file://enigma2_vuplus_proc_oom_score_adj.patch;striplevel=1 \
-           file://enigma2_vuplus_fix_standby_name.patch \
-           file://enigma2_vuplus_fix_standby_name_skin.patch \
-           file://MyriadPro-Regular.otf \
-           file://MyriadPro-Semibold.otf \
-           file://MyriadPro-SemiboldIt.otf \
-           file://750S \
-           file://Vu_HD \
-           file://number_key \
-           "
-
-SRC_URI_append = " ${@base_contains("VUPLUS_FEATURES", "vuwlan", "file://enigma2_vuplus_networksetup.patch;patch=1;pnum=1", "", d)}"
+SRC_URI = "git://code.vuplus.com/git/dvbapp.git;protocol=http;branch=${BRANCH};rev=${SRCREV} \
+	file://enigma2_vuplus_skin.patch \
+	file://enigma2_vuplus_mediaplayer.patch \
+	file://enigma2_vuplus_remove_dreambox_enigma.patch \
+	file://enigma2_vuplus_vfd_mode.patch \
+	file://enigma2_vuplus_pluginbrowser.patch \
+	file://enigma2_vuplus_proc_oom_score_adj.patch \
+        file://enigma2_vuplus_fix_standby_name.patch \
+        file://enigma2_vuplus_fix_standby_name_skin.patch \
+	file://enigma2_vuplus_epng.patch \
+	file://enigma2_vuplus_eptrlist_insert.patch \
+	file://enigma2_vuplus_conversion_error.patch \
+	file://enigma2_vuplus_default_arg_error.patch \
+	file://enigma2_vuplus_wrong_boolean_type.patch \
+	file://enigma2_vuplus_disable_subtitle_sync_mode_bug.patch \
+	file://MyriadPro-Regular.otf \
+	file://MyriadPro-Semibold.otf \
+	file://MyriadPro-SemiboldIt.otf \
+	file://750S \
+	file://Vu_HD \
+	file://number_key \
+"
+
+SRC_URI_append = " ${@base_contains('GST_VERSION', '1.0', '', 'file://enbalesubtitleshack.patch', d)}"
+
+SRC_URI_append = " ${@base_contains("VUPLUS_FEATURES", "vuwlan", "file://enigma2_vuplus_networksetup.patch", "", d)}"
+
+LDFLAGS_prepend = "${@base_contains('GST_VERSION', '1.0', ' -lxml2 ', '', d)}"
 
 def change_po():
-        import os
-        try:
-                os.system("find ./ -name \"*.po\" > ./po_list")
-                os.system("find ./ -name \"*.pot\" >> ./po_list")
-                po_list = []
-                po_list = open('po_list','r+').readlines()
-                for x in po_list:
-                        changeword(x)
-                os.system('rm po_list')
-        except:
-                print 'word patch error '
-                return
+    import os
+    try:
+        os.system("find ./ -name \"*.po\" > ./po_list")
+        os.system("find ./ -name \"*.pot\" >> ./po_list")
+        po_list = []
+        po_list = open('po_list','r+').readlines()
+        for x in po_list:
+            changeword(x)
+        os.system('rm po_list')
+    except:
+        print 'word patch error '
+        return
 
 def changeword(file):
-        fn = file[:-1]
-        fnn = file[:-1]+'_n'
-        cmd = "sed s/Dreambox/STB/g "+fn+" > "+fnn
-        os.system(cmd)
-        cmd1 = "mv "+fnn+" "+fn
-        os.system(cmd1)
+    fn = file[:-1]
+    fnn = file[:-1]+'_n'
+    cmd = "sed s/Dreambox/STB/g "+fn+" > "+fnn
+    os.system(cmd)
+    cmd1 = "mv "+fnn+" "+fn
+    os.system(cmd1)
 
 do_unpack_append(){
-        change_po()
+    change_po()
 }
 
 S = "${WORKDIR}/git"
@@ -162,50 +273,49 @@ FILES_${PN}-meta = "${datadir}/meta"
 PACKAGES += "${PN}-meta"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
-inherit autotools pkgconfig
+inherit autotools-brokensep pkgconfig pythonnative
 
 do_configure_prepend() {
 	git checkout ${BRANCH}
 }
 
 do_compile_prepend_vuplus() {
-        install -m 0755 ${WORKDIR}/MyriadPro-Regular.otf ${S}/data/fonts/
-        install -m 0755 ${WORKDIR}/MyriadPro-Semibold.otf ${S}/data/fonts/
-        install -m 0755 ${WORKDIR}/MyriadPro-SemiboldIt.otf ${S}/data/fonts/
-        install -m 0755 ${WORKDIR}/750S/*.png ${S}/data/750S/
-        install -m 0755 ${WORKDIR}/750S/buttons/*.png ${S}/data/750S/buttons/
-        install -m 0755 ${WORKDIR}/750S/countries/*.png ${S}/data/750S/countries/
-        install -m 0755 ${WORKDIR}/750S/icons/*.png ${S}/data/750S/icons/
-        install -m 0755 ${WORKDIR}/750S/menu/*.png ${S}/data/750S/menu/
-        install -m 0755 ${WORKDIR}/750S/spinner/*.png ${S}/data/skin_default/spinner/
-        install -m 0755 ${WORKDIR}/Vu_HD/*.png ${S}/data/Vu_HD/
-        install -m 0755 ${WORKDIR}/Vu_HD/buttons/*.png ${S}/data/Vu_HD/buttons/
-        install -m 0755 ${WORKDIR}/Vu_HD/countries/*.png ${S}/data/Vu_HD/countries/
-        install -m 0755 ${WORKDIR}/Vu_HD/icons/*.png ${S}/data/Vu_HD/icons/
-        install -m 0755 ${WORKDIR}/Vu_HD/menu/*.png ${S}/data/Vu_HD/menu/
-        install -m 0755 ${WORKDIR}/number_key/*.png ${S}/data/skin_default/buttons/
+	install -m 0755 ${WORKDIR}/MyriadPro-Regular.otf ${S}/data/fonts/
+	install -m 0755 ${WORKDIR}/MyriadPro-Semibold.otf ${S}/data/fonts/
+	install -m 0755 ${WORKDIR}/MyriadPro-SemiboldIt.otf ${S}/data/fonts/
+	install -m 0755 ${WORKDIR}/750S/*.png ${S}/data/750S/
+	install -m 0755 ${WORKDIR}/750S/buttons/*.png ${S}/data/750S/buttons/
+	install -m 0755 ${WORKDIR}/750S/countries/*.png ${S}/data/750S/countries/
+	install -m 0755 ${WORKDIR}/750S/icons/*.png ${S}/data/750S/icons/
+	install -m 0755 ${WORKDIR}/750S/menu/*.png ${S}/data/750S/menu/
+	install -m 0755 ${WORKDIR}/750S/spinner/*.png ${S}/data/skin_default/spinner/
+	install -m 0755 ${WORKDIR}/Vu_HD/*.png ${S}/data/Vu_HD/
+	install -m 0755 ${WORKDIR}/Vu_HD/buttons/*.png ${S}/data/Vu_HD/buttons/
+	install -m 0755 ${WORKDIR}/Vu_HD/countries/*.png ${S}/data/Vu_HD/countries/
+	install -m 0755 ${WORKDIR}/Vu_HD/icons/*.png ${S}/data/Vu_HD/icons/
+	install -m 0755 ${WORKDIR}/Vu_HD/menu/*.png ${S}/data/Vu_HD/menu/
+	install -m 0755 ${WORKDIR}/number_key/*.png ${S}/data/skin_default/buttons/
 }
 
 EXTRA_OECONF = " \
+        --enable-dependency-tracking \
+	${@base_contains("GST_VERSION", "1.0", "--with-gstversion=1.0", "", d)} \
 	${@base_contains("VUPLUS_FEATURES", "display-text-vfd", "--with-display-text-vfd" , "", d)} \
 	${@base_contains("VUPLUS_FEATURES", "display-graphic-vfd", "--with-display-graphic-vfd" , "", d)} \
 	${@base_contains("VUPLUS_FEATURES", "right-half-vfd-skin", "--with-set-right-half-vfd-skin" , "", d)} \
 	${@base_contains("VUPLUS_FEATURES", "enable-rc-kbd", "--with-remote-keyboard" , "", d)} \
 	${@base_contains("VUPLUS_FEATURES", "uianimation", "--with-libvugles2" , "", d)} \
-        BUILD_SYS=${BUILD_SYS} \
-        HOST_SYS=${HOST_SYS} \
-        STAGING_INCDIR=${STAGING_INCDIR} \
-        STAGING_LIBDIR=${STAGING_LIBDIR} \
+	BUILD_SYS=${BUILD_SYS} \
+	HOST_SYS=${HOST_SYS} \
+	STAGING_INCDIR=${STAGING_INCDIR} \
+	STAGING_LIBDIR=${STAGING_LIBDIR} \
 "
 
 python populate_packages_prepend() {
-        enigma2_plugindir = bb.data.expand('${libdir}/enigma2/python/Plugins', d)
-        do_split_packages(d, enigma2_plugindir, '^(\w+/\w+)/[a-zA-Z0-9_]+.*$', 'enigma2-plugin-%s', '%s', recursive=True, match_path=True, prepend=True)
-        do_split_packages(d, enigma2_plugindir, '^(\w+/\w+)/.*\.la$', 'enigma2-plugin-%s-dev', '%s (development)', recursive=True, match_path=True, prepend=True)
-        do_split_packages(d, enigma2_plugindir, '^(\w+/\w+)/.*\.a$', 'enigma2-plugin-%s-staticdev', '%s (static development)', recursive=True, match_path=True, prepend=True)
-        do_split_packages(d, enigma2_plugindir, '^(\w+/\w+)/(.*/)?\.debug/.*$', 'enigma2-plugin-%s-dbg', '%s (debug)', recursive=True, match_path=True, prepend=True)
+    enigma2_plugindir = bb.data.expand('${libdir}/enigma2/python/Plugins', d)
+    do_split_packages(d, enigma2_plugindir, '^(\w+/\w+)/[a-zA-Z0-9_]+.*$', 'enigma2-plugin-%s', '%s', recursive=True, match_path=True, prepend=True)
+    do_split_packages(d, enigma2_plugindir, '^(\w+/\w+)/.*\.la$', 'enigma2-plugin-%s-dev', '%s (development)', recursive=True, match_path=True, prepend=True)
+    do_split_packages(d, enigma2_plugindir, '^(\w+/\w+)/.*\.a$', 'enigma2-plugin-%s-staticdev', '%s (static development)', recursive=True, match_path=True, prepend=True)
+    do_split_packages(d, enigma2_plugindir, '^(\w+/\w+)/(.*/)?\.debug/.*$', 'enigma2-plugin-%s-dbg', '%s (debug)', recursive=True, match_path=True, prepend=True)
 }
 
-RCONFLICTS_${PN} = "dreambox-keymaps"
-RREPLACES_${PN} = "dreambox-keymaps tuxbox-tuxtxt-32bpp (<= 0.0+cvs20090130-r1)"
-