X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=openpandora.oe.git;a=blobdiff_plain;f=recipes%2Fpandora-system%2Fpandora-libpnd.bb;h=d5791312b56047b7c23932ae51a087437b380fc3;hp=c111cd9316fcb29b7de6ad55f30594230108011d;hb=e5f46a65909fea0be929639eba2ea9e7ab176743;hpb=aa5d3960a6854d0b58225d3c9469c7fa82250e34

diff --git a/recipes/pandora-system/pandora-libpnd.bb b/recipes/pandora-system/pandora-libpnd.bb
index c111cd9..d579131 100755
--- a/recipes/pandora-system/pandora-libpnd.bb
+++ b/recipes/pandora-system/pandora-libpnd.bb
@@ -1,20 +1,20 @@
 DESCRIPTION = "Support for the PND format in Pandora images (lib, daemon, init script etc.)"
 LICENSE = "lGPL"
 
-PR = "r19"
+PR = "r76"
 
 PARALLEL_MAKE = ""
 
 DEPENDS = "virtual/libsdl libsdl-image libsdl-gfx libsdl-ttf"
 
 SRC_URI = " \
-          git://openpandora.org/pandora-libraries.git;protocol=git;branch=master \
+          git://git.openpandora.org/pandora-libraries.git;protocol=git;branch=master \
           file://rc.pndnotifyd \
           file://rc.pndevmapperd \   
           file://op_pnd_run.desktop \
 "
 
-SRCREV = "f81cd920063e032c3099c82982b72d95c90314bb"
+SRCREV = "a6968a769ad2d91403bafafed82a6b8873f3e2e9"
 
 S = "${WORKDIR}/git"
 
@@ -25,8 +25,6 @@ TARGET_CFLAGS += "-Wall -I./include -I${STAGING_INCDIR}/usr/include -I${STAGING_
 
 PACKAGES =+ "${PN}-pndnotifyd ${PN}-pndevmapperd ${PN}-minimenu"
 
-RDEPENDS_${PN} += "${PN}-pndnotifyd ${PN}-pndevmapperd ${PN}-minimenu"
-
 INITSCRIPT_PACKAGES = "${PN}-pndnotifyd ${PN}-pndevmapperd"
 
 INITSCRIPT_NAME_${PN}-pndnotifyd = "pndnotifyd-init"
@@ -35,8 +33,10 @@ INITSCRIPT_PARAMS_${PN}-pndnotifyd = "start 30 5 3 . stop 40 0 1 6 ."
 INITSCRIPT_NAME_${PN}-pndevmapperd = "pndevmapperd-init"
 INITSCRIPT_PARAMS_${PN}-pndevmapperd = "start 30 5 3 . stop 40 0 1 6 ."
 
-RDEPENDS_${PN}-pndnotifyd += "${PN}"
-RDEPENDS_${PN}-pndevmapperd += "${PN}"
+# not needed - done by OE
+#RDEPENDS_${PN}-pndnotifyd += "${PN}"
+#RDEPENDS_${PN}-pndevmapperd += "${PN}"
+#RDEPENDS_${PN}-minimenu += "${PN}"
 
 do_compile_prepend() {
           cd ${S}/
@@ -56,8 +56,7 @@ do_install() {
           install -m 0644 ${S}/deployment/etc/pandora/conf/mmenu.conf ${D}${sysconfdir}/pandora/conf/mmenu.conf
 
           install -d ${D}${libdir}/
-          install -m 0644 ${S}/deployment/usr/lib/libpnd* ${D}${libdir}/
-          install -m 0644 ${S}/deployment/usr/lib/libpnd.so.1.0.1 ${D}${libdir}/libpnd.so.1
+          oe_libinstall -C ${S}/deployment/usr/lib/ libpnd ${D}/${libdir}/
 
           install -d ${D}${bindir}/
           install -m 0755 ${S}/deployment/usr/bin/pndnotifyd ${D}${bindir}/pndnotifyd
@@ -69,14 +68,16 @@ do_install() {
 
           install -d ${D}${prefix}/pandora/
           install -d ${D}${prefix}/pandora/apps/
-          install -d ${D}${prefix}/pandora/scripts/
+	  install -d ${D}${prefix}/pandora/scripts/
           install -m 0755 ${S}/deployment/usr/pandora/scripts/* ${D}${prefix}/pandora/scripts
           install -m 0755 ${S}/testdata/scripts/* ${D}${prefix}/pandora/scripts
 
           install -d ${D}${sysconfdir}/pandora/mmenu/
           install -d ${D}${sysconfdir}/pandora/mmenu/skins/
           install -d ${D}${sysconfdir}/pandora/mmenu/skins/default/
+	  install -d ${D}${sysconfdir}/pandora/mmenu/skins/clean/
           install -m 0755 ${S}/deployment/etc/pandora/mmenu/skins/default/* ${D}${sysconfdir}/pandora/mmenu/skins/default
+	  install -m 0755 ${S}/deployment/etc/pandora/mmenu/skins/clean/* ${D}${sysconfdir}/pandora/mmenu/skins/clean
 
           install -d ${D}${sysconfdir}/init.d/
           install -m 0755 ${WORKDIR}/rc.pndnotifyd ${D}${sysconfdir}/init.d/pndnotifyd-init
@@ -102,3 +103,7 @@ FILES_${PN}-doc += "${libdir}/libpnd.txt "
 
 # Mop up remaining files.
 FILES_${PN} += "${bindir} ${sbindir} ${prefix}/pandora/*"
+
+CONFFILES_${PN} += ${sysconfdir}/pandora/conf/eventmap
+
+NATIVE_INSTALL_WORKS = "1"