enigma2/tuxtxt/keymaps: follow changed build and packaging rules

diff --git a/recipes/enigma2/enigma2-plugins.bb b/recipes/enigma2/enigma2-plugins.bb
index 4965d30..cdf25a6 100755 (executable)
--- a/recipes/enigma2/enigma2-plugins.bb
+++ b/recipes/enigma2/enigma2-plugins.bb
@@ -3,7 +3,7 @@ MAINTAINER = "Felix Domke <tmbinc@elitedvb.net>"
 
 PACKAGES_DYNAMIC = "enigma2-plugin-*"
 
-SRCDATE = "20100727"
+SRCDATE = "20101112"
 
 # if you want the 2.7.0 release, use
 #TAG = ";tag=enigma2-plugins_rel27"

diff --git a/recipes/enigma2/enigma2.bb b/recipes/enigma2/enigma2.bb
index 19dfb82..e023718 100755 (executable)
--- a/recipes/enigma2/enigma2.bb
+++ b/recipes/enigma2/enigma2.bb
@@ -61,19 +61,12 @@ DESCRIPTION_append_enigma2-plugin-systemplugins-networkwizard = "provides easy s
 PN = "enigma2"
 PR = "r0"
 
-SRCDATE = "20100728"
+SRCDATE = "20101117"
 #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
 
-# if you want upcoming release, use:
-####################################################
-#BRANCH = "master"
-#PV = "2.8git${SRCDATE}"
-#SRCREV = ""
-####################################################
-
 # if you want experimental use
 ####################################################
 BRANCH = "experimental"
@@ -81,17 +74,7 @@ PV = "experimental-git${SRCDATE}"
 SRCREV = ""
 ####################################################
 
-# if you want a 2.7-based release, use
-####################################################
-#BRANCH="2.7"
-#PV = "2.7git${SRCDATE}"
-# if you want 2.7.0 use
-#SRCREV = "d5a16c6e9d0ee1cc2dc0d65b4321842dea4b0891"
-####################################################
-
-SRC_URI = "git://git.opendreambox.org/git/enigma2.git;protocol=git;branch=${BRANCH};tag=${SRCREV} \
-       file://new-hotplug.patch;patch=1;pnum=1 \
-       file://enigma2.sh"
+SRC_URI = "git://git.opendreambox.org/git/enigma2.git;protocol=git;branch=${BRANCH};tag=${SRCREV}"
 
 S = "${WORKDIR}/git"
 
@@ -102,14 +85,12 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 inherit autotools pkgconfig
 
-bindir = "/usr/bin"
-sbindir = "/usr/sbin"
-
-EXTRA_OECONF = "--with-target=native --with-libsdl=no"
-
-do_install_append() {
-       install -m 0755 ${WORKDIR}/enigma2.sh ${D}/usr/bin/
-}
+EXTRA_OECONF = " \
+        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)
@@ -117,11 +98,5 @@ python populate_packages_prepend () {
        do_split_packages(d, enigma2_plugindir, '(.*?/.*?)/.*', 'enigma2-plugin-%s', '%s ', recursive=True, match_path=True, prepend=True)
 }
 
-do_stage() {
-       install -d ${STAGING_INCDIR}/enigma2
-       install -m 0644 ${S}/include/*.h ${STAGING_INCDIR}/enigma2
-       for dir in actions base components driver dvb dvb/lowlevel dvb_ci gdi gui mmi nav python service; do
-               install -d ${STAGING_INCDIR}/enigma2/lib/$dir;
-               install -m 0644 ${S}/lib/$dir/*.h ${STAGING_INCDIR}/enigma2/lib/$dir;
-       done
-}
+RCONFLICTS_${PN} = "dreambox-keymaps"
+RREPLACES_${PN} = "dreambox-keymaps tuxbox-tuxtxt-32bpp (<= 0.0+cvs20090130-r1)"

diff --git a/recipes/tasks/task-opendreambox-base.bb b/recipes/tasks/task-opendreambox-base.bb
index 23aff44..8044b1a 100644 (file)
--- a/recipes/tasks/task-opendreambox-base.bb
+++ b/recipes/tasks/task-opendreambox-base.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "OpenDreambox: Base Task for the OpenDreambox Distribution"
 SECTION = "opendreambox/base"
 LICENSE = "MIT"
-PR = "r5"
+PR = "r6"
 
 inherit task
 
@@ -18,7 +18,6 @@ OPENDREAMBOX_BASE_ESSENTIAL = "\
   dreambox-wdog \
   ${@base_contains('MACHINE', 'dm7025', '', 'dreambox-tpmd', d)} \
   dreambox-feed-configs \
-  dreambox-keymaps \
   e2fsprogs-e2fsck \
   e2fsprogs-mke2fs \
   fakelocale \

diff --git a/recipes/tasks/task-opendreambox-enigma.bb b/recipes/tasks/task-opendreambox-enigma.bb
index 49bad6e..f10c989 100644 (file)
--- a/recipes/tasks/task-opendreambox-enigma.bb
+++ b/recipes/tasks/task-opendreambox-enigma.bb
@@ -26,6 +26,7 @@ DEPENDS_task-opendreambox-enigma = "\
   links-dream \
 "
 RDEPENDS_task-opendreambox-enigma = "\
+  dreambox-keymaps \
   enigma \
   ipkgpl \
   links-dream-plugin \

diff --git a/recipes/tuxbox/tuxbox-tuxtxt-32bpp.bb b/recipes/tuxbox/tuxbox-tuxtxt-32bpp.bb
index 3d95a45..b8a63ce 100644 (file)
--- a/recipes/tuxbox/tuxbox-tuxtxt-32bpp.bb
+++ b/recipes/tuxbox/tuxbox-tuxtxt-32bpp.bb
@@ -4,7 +4,7 @@ MAINTAINER = "Sven Karschewski <seddi@i-have-a-dreambox.com>"
 
 SRCDATE = "20090130"
 PV = "0.0+cvs${SRCDATE}"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "cvs://anoncvs@cvs.tuxbox.org/cvs/tuxbox;module=apps/tuxbox/plugins/tuxtxt;method=ext \
        file://makefiles.diff;patch=1;pnum=1 \
@@ -15,7 +15,11 @@ SRC_URI = "cvs://anoncvs@cvs.tuxbox.org/cvs/tuxbox;module=apps/tuxbox/plugins/tu
        file://allow_different_demux.diff;patch=1 \
        file://plugin.py"
 
-FILES_${PN} = "/usr/bin/tuxtxt /usr/share/fonts /usr/lib/enigma2/python/Plugins/Extensions/Tuxtxt /etc/tuxtxt"
+FILES_${PN} = "/usr/bin/tuxtxt /usr/share/fonts/tuxtxt.otb /usr/lib/enigma2/python/Plugins/Extensions/Tuxtxt /etc/tuxtxt"
+
+# tuxtxt.ttf comes from enigma2 git now
+FILES_${PN}_append_powerpc = " /usr/share/fonts/tuxtxt.ttf"
+RDEPENDS_${PN}_append_mipsel = " enigma2"
 
 S = "${WORKDIR}/tuxtxt"