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=79525d3965e0d038c6f901dba3fa1a968f98a4fb;hp=73bcedd2c5e6f461699b4920ff018e5401e1868c;hb=332d7f317f88b311a56e8f430a4724e2220e85ee;hpb=08d9fd54ce56df8cf9280c2ff4b6c26ae6239921

diff --git a/recipes/pandora-system/pandora-libpnd.bb b/recipes/pandora-system/pandora-libpnd.bb
index 73bcedd..79525d3 100755
--- a/recipes/pandora-system/pandora-libpnd.bb
+++ b/recipes/pandora-system/pandora-libpnd.bb
@@ -1,29 +1,31 @@
 DESCRIPTION = "Support for the PND format in Pandora images (lib, daemon, init script etc.)"
 LICENSE = "lGPL"
 
-PR = "r1"
+PR = "r73"
 
 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 = "f03bf767b821f2f8e0a22e5d3422f4e5dfae8a2d"
+SRCREV = "8d7600dbd66bb286ad26f3e9ef624da5dd02bad4"
 
 S = "${WORKDIR}/git"
 
 inherit update-rc.d
 
 TARGET_CC_ARCH += "${LDFLAGS}"
-TARGET_CFLAGS += "-Wall -I./include"
+TARGET_CFLAGS += "-Wall -I./include -I${STAGING_INCDIR}/usr/include -I${STAGING_INCDIR}/SDL "
 
-PACKAGES =+ "${PN}-pndnotifyd ${PN}-pndevmapperd"
+PACKAGES =+ "${PN}-pndnotifyd ${PN}-pndevmapperd ${PN}-minimenu"
 
-RDEPENDS_${PN} += "${PN}-pndnotifyd ${PN}-pndevmapperd"
+RDEPENDS_${PN} += "${PN}-pndnotifyd ${PN}-pndevmapperd ${PN}-minimenu"
 
 INITSCRIPT_PACKAGES = "${PN}-pndnotifyd ${PN}-pndevmapperd"
 
@@ -51,6 +53,8 @@ do_install() {
           install -m 0644 ${S}/deployment/etc/pandora/conf/desktop ${D}${sysconfdir}/pandora/conf/desktop
           install -m 0644 ${S}/deployment/etc/pandora/conf/categories ${D}${sysconfdir}/pandora/conf/categories
           install -m 0644 ${S}/deployment/etc/pandora/conf/eventmap ${D}${sysconfdir}/pandora/conf/eventmap
+          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
@@ -60,30 +64,45 @@ do_install() {
           install -m 0755 ${S}/deployment/usr/bin/pndevmapperd ${D}${bindir}/pndevmapperd 
           install -m 0755 ${S}/deployment/usr/bin/pnd_run ${D}${bindir}/pnd_run 
           install -m 0755 ${S}/deployment/usr/bin/pnd_info ${D}${bindir}/pnd_info
-                   
+          install -m 0755 ${S}/deployment/usr/bin/mmenu ${D}${bindir}/mmenu
+          install -m 0755 ${S}/deployment/usr/bin/mmwrapper ${D}${bindir}/mmwrapper
+
           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
           install -m 0755 ${WORKDIR}/rc.pndevmapperd ${D}${sysconfdir}/init.d/pndevmapperd-init
-          
+
           install -d ${D}${prefix}/local/share/applications/
-          
+
           install -d ${D}${includedir}/
           install -m 0644 ${S}/include/pnd* ${D}${includedir}/
-          
+
           install -d ${D}${sysconfdir}/sudoers.d/
           install -m 440 ${S}/testdata/sh/sudoers ${D}${sysconfdir}/sudoers.d/99_libpnd
-          
+
           install -d ${D}${datadir}/applications/
           install -m 0644 ${WORKDIR}/op_pnd_run.desktop ${D}${datadir}/applications/
 }
 
-FILES_${PN} += "${bindir} ${sbindir} ${prefix}/pandora/*"
+FILES_${PN}-minimenu = "${bindir}/mmenu ${bindir}/mmwrapper ${sysconfdir}/pandora/conf/mmenu.conf ${sysconfdir}/pandora/mmenu* "
 FILES_${PN}-pndnotifyd = "${sysconfdir}/init.d/pndnotifyd-init ${bindir}/pndnotifyd"
 FILES_${PN}-pndevmapperd = "${sysconfdir}/init.d/pndevmapperd-init ${bindir}/pndevmapperd "
-FILES_${PN}-dev += "${libdir}/libpnd.a ${includedir}/pnd*"
+FILES_${PN}-dev += "${libdir}/libpnd.a ${includedir}/pnd* "
+FILES_${PN}-doc += "${libdir}/libpnd.txt "
+
+# Mop up remaining files.
+FILES_${PN} += "${bindir} ${sbindir} ${prefix}/pandora/*"
+
+CONFFILES_${PN} += ${sysconfdir}/pandora/conf/eventmap