summaryrefslogtreecommitdiff
path: root/recipes/gnome-mplayer
diff options
context:
space:
mode:
authorStefan Schmidt <stefan@datenfreihafen.org>2009-11-02 13:27:47 +0100
committerStefan Schmidt <stefan@datenfreihafen.org>2009-11-02 13:27:47 +0100
commit87e80852736c60f3c60b313610caf1a6f4c0b86b (patch)
treed6f35bdc2e0184f63d77c6153a479601958d9459 /recipes/gnome-mplayer
parent762dcd115a0b1e67eeabcfd5adac422ae6bec744 (diff)
parentee94e37cf85a5050af8c0962134004e2c2861be0 (diff)
Merge branch 'org.openembedded.dev' of git.openembedded.org:openembedded into org.openembedded.dev
Diffstat (limited to 'recipes/gnome-mplayer')
-rw-r--r--recipes/gnome-mplayer/gecko-mediaplayer_0.9.8.bb19
1 files changed, 8 insertions, 11 deletions
diff --git a/recipes/gnome-mplayer/gecko-mediaplayer_0.9.8.bb b/recipes/gnome-mplayer/gecko-mediaplayer_0.9.8.bb
index d56fb28fd7..33d0be4aa2 100644
--- a/recipes/gnome-mplayer/gecko-mediaplayer_0.9.8.bb
+++ b/recipes/gnome-mplayer/gecko-mediaplayer_0.9.8.bb
@@ -4,32 +4,29 @@ LICENSE = "GPL"
DEPENDS = "firefox gtk+ gconf dbus-glib"
RDEPENDS = "firefox gnome-mplayer"
-PR = "r1"
+PR = "r3"
inherit autotools
SRC_URI = "http://gecko-mediaplayer.googlecode.com/files/${P}.tar.gz \
+ file://gecko-mplayer-svn.diff;patch=1;pnum=0 \
file://extensions \
"
# Yes, this needs to match the firefox version you are building *exactly*
-MOZILLA_HOME = firefox-3.5.2
+MOZILLA_HOME = "firefox-3.5.4"
do_install_append() {
- install -d ${D}${libdir}/${MOZILLA_HOME}
- mv ${D}${libdir}/mozilla/plugins ${D}${libdir}/${MOZILLA_HOME}
- cp -dpR ${WORKDIR}/extens* ${D}${libdir}/${MOZILLA_HOME}/
+ ln -sf ${libdir}/mozilla ${D}${libdir}/${MOZILLA_HOME}
+ cp -dpR ${WORKDIR}/extens* ${D}${libdir}/mozilla/
}
-
-#EXTRA_OEMAKE = "-I${STAGING_INCDIR}/${MOZILLA_HOME} -I${STAGING_INCDIR}/linux"
-
PACKAGES =+ "${PN}-firefox-hack"
RDEPENDS_${PN}-firefox-hack = "${PN}"
-FILES_${PN}-firefox-hack = "${libdir}/${MOZILLA_HOME}/extensions"
+FILES_${PN}-firefox-hack = "${libdir}/mozilla/extensions"
FILES_${PN} += "${sysconfdir}/* \
- ${libdir}/${MOZILLA_HOME}/*"
-FILES_${PN}-dbg += "${libdir}/${MOZILLA_HOME}/plugins/.debug/*"
+ ${libdir}/mozilla/* ${libdir}/${MOZILLA_HOME}"
+FILES_${PN}-dbg += "${libdir}/mozilla*/plugins/.debug/*"