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=0d47bff6bccfcacf74e7f3f6dad9fe2d89f1312f;hp=d3f352cd81551e641770cc6cdc44f3f22fdfe268;hb=248ee3c4e8a298bd184d674996883aa88c325ca6;hpb=989e3c90a06671ab91008e7a2e07c830bb473f2a

diff --git a/recipes/pandora-system/pandora-libpnd.bb b/recipes/pandora-system/pandora-libpnd.bb
index d3f352c..0d47bff 100755
--- a/recipes/pandora-system/pandora-libpnd.bb
+++ b/recipes/pandora-system/pandora-libpnd.bb
@@ -1,26 +1,42 @@
 DESCRIPTION = "Support for the PND format in Pandora images (lib, daemon, init script etc.)"
 LICENSE = "lGPL"
 
-PR = "r4"
+PR = "r66"
 
 PARALLEL_MAKE = ""
 
+DEPENDS = "virtual/libsdl libsdl-image libsdl-gfx libsdl-ttf"
+
 SRC_URI = " \
-          git://openpandora.org/pandora-libraries.git;protocol=git;branch=master \
-          file://rc.libpnd \
+          git://git.openpandora.org/pandora-libraries.git;protocol=git;branch=master \
+          file://rc.pndnotifyd \
+          file://rc.pndevmapperd \   
+          file://op_pnd_run.desktop \
 "
 
-SRCREV = "fd9090900d653b51b1d7b335b1224c3b65353773"
+SRCREV = "fbe6b2fab92cc1897014b23c8a645e80c2531142"
 
 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 ${PN}-minimenu"
+
+RDEPENDS_${PN} += "${PN}-pndnotifyd ${PN}-pndevmapperd ${PN}-minimenu"
+
+INITSCRIPT_PACKAGES = "${PN}-pndnotifyd ${PN}-pndevmapperd"
 
-INITSCRIPT_NAME = "libpnd-init"
-INITSCRIPT_PARAMS = "start 30 5 2 . stop 40 0 1 6 ."
+INITSCRIPT_NAME_${PN}-pndnotifyd = "pndnotifyd-init"
+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}"
 
 do_compile_prepend() {
           cd ${S}/
@@ -33,29 +49,58 @@ do_compile() {
 
 do_install() {
           install -d ${D}${sysconfdir}/pandora/conf/
-          install ${S}/deployment/etc/pandora/conf/apps ${D}${sysconfdir}/pandora/conf/apps
-          install ${S}/deployment/etc/pandora/conf/desktop ${D}${sysconfdir}/pandora/conf/desktop
+          install -m 0644 ${S}/deployment/etc/pandora/conf/apps ${D}${sysconfdir}/pandora/conf/apps
+          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}/
-          cp -pP ${S}/deployment/usr/lib/libpnd* ${D}${libdir}/
-#          cp -pP ${S}/deployment/usr/lib/libpnd.so.1.0.1 ${D}${libdir}/libpnd.so.1
-#          cp -pP ${S}/deployment/usr/lib/libpnd.a ${D}${libdir}/libpnd.a
-          
+          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
+
           install -d ${D}${bindir}/
-          cp -pP ${S}/deployment/usr/bin/pndnotifyd ${D}${bindir}/pndnotifyd
-                   
+          install -m 0755 ${S}/deployment/usr/bin/pndnotifyd ${D}${bindir}/pndnotifyd
+          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/
-#          cp -pP ${S}/deployment/usr/pandora/apps/* ${D}${prefix}/pandora/apps
-          install -d ${D}${prefix}/pandora/scripts/
-          cp -pP ${S}/deployment/usr/pandora/scripts/* ${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/
-          cp -pP ${WORKDIR}/rc.libpnd ${D}${sysconfdir}/init.d/libpnd-init
-          
-          install -d ${D}/home/root/
+          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}-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}-doc += "${libdir}/libpnd.txt "
+
+# Mop up remaining files.
 FILES_${PN} += "${bindir} ${sbindir} ${prefix}/pandora/*"
-FILES_${PN}-dev += "${libdir}/libpnd.a"