[oe-commits] org.oe.dev sdl.bbclass: Revamp to adhere to freedesktop standards.

[pfalcon commit]

sdl.bbclass: Revamp to adhere to freedesktop standards.
* OPIE in OE now adheres to FHS, so ${palmtopdir} is no more.
* OPIE in OE doesn't haev SDL support, so: make this bbclass produce
correct pixmap/.desktop per freedesktop standards, then TODO: make OPIE
use the same.
* Also, run after main install and before packaging, more natural (and will
allow to check if standard install dropped icon/.desktop already).

Author: pfalcon at openembedded.org
Branch: org.openembedded.dev
Revision: 3711ec9284b695d485674ca75433a32eb63e67a2
ViewMTN: http://monotone.openembedded.org/revision/info/3711ec9284b695d485674ca75433a32eb63e67a2
Files:
1
classes/sdl.bbclass
Diffs:

#
# mt diff -r38557d671af3e91de49fbe17b9d8971d0d0d8a98 -r3711ec9284b695d485674ca75433a32eb63e67a2
#
# 
# 
# patch "classes/sdl.bbclass"
#  from [0fe2736d00d981aecfa5177709840b1c37f8a7b5]
#    to [677bf11b6e6df905a621b732d1ba01c1c64aa945]
# 
============================================================
--- classes/sdl.bbclass	0fe2736d00d981aecfa5177709840b1c37f8a7b5
+++ classes/sdl.bbclass	677bf11b6e6df905a621b732d1ba01c1c64aa945
@@ -1,40 +1,40 @@ DEPENDS += "virtual/libsdl libsdl-mixer 
 #
 # (C) Michael 'Mickey' Lauer <mickey at Vanille.de>
 #
 
 DEPENDS += "virtual/libsdl libsdl-mixer libsdl-image"
 
-APPDESKTOP ?= "${PN}.desktop"
+APPDESKTOP ?= "${WORKDIR}/${PN}.desktop"
 APPNAME ?= "${PN}"
 APPIMAGE ?= "${WORKDIR}/${PN}.png"
 
 sdl_do_sdl_install() {
-	install -d ${D}${palmtopdir}/bin
-	install -d ${D}${palmtopdir}/pics
-	install -d ${D}${palmtopdir}/apps/Games
-	ln -sf ${bindir}/${APPNAME} ${D}${palmtopdir}/bin/${APPNAME}
-	install -m 0644 ${APPIMAGE} ${D}${palmtopdir}/pics/${PN}.png
+	install -d ${D}${datadir}/applications
+	install -d ${D}${datadir}/pixmaps
 
+	install -m 0644 ${APPIMAGE} ${D}${datadir}/pixmaps/${PN}.png
+
 	if [ -e "${APPDESKTOP}" ]
 	then
-		echo ${APPDESKTOP} present, installing to palmtopdir...
-		install -m 0644 ${APPDESKTOP} ${D}${palmtopdir}/apps/Games/${PN}.desktop
+		echo ${APPDESKTOP} present, using it...
+		install -m 0644 ${APPDESKTOP} ${D}${datadir}/applications/
 	else
 		echo ${APPDESKTOP} not present, creating one on-the-fly...
-		cat >${D}${palmtopdir}/apps/Games/${PN}.desktop <<EOF
+		cat >${D}${datadir}/applications/${PN}.desktop <<EOF
 [Desktop Entry]
-Note=Auto Generated... this may be not what you want
+Name=${PN}
 Comment=${DESCRIPTION}
+Note=Auto Generated by OE SDL bbclass
 Exec=${APPNAME}
 Icon=${PN}.png
 Type=Application
-Name=${PN}
+Categories=Games
 EOF
 	fi
 }
 
 EXPORT_FUNCTIONS do_sdl_install
-addtask sdl_install after do_compile before do_populate_staging
+addtask sdl_install after do_install before do_package
 
 SECTION = "x11/games"
 SECTION_${PN}-opie = "opie/games"