diff options
author | Henning Heinold <heinold@inf.fu-berlin.de> | 2009-07-15 01:55:17 +0200 |
---|---|---|
committer | Henning Heinold <heinold@inf.fu-berlin.de> | 2009-07-15 02:00:01 +0200 |
commit | 74967b6059f91e50d33f6f4a30c165a06a00fcbb (patch) | |
tree | 93cb0dd905d9a37cc7e0a0ef1da00a2881af8cac /recipes/disko/disko_git.bb | |
parent | 11eaaf389879e53d58fab04f8d6d61e3c19e9685 (diff) | |
download | openembedded-74967b6059f91e50d33f6f4a30c165a06a00fcbb.tar.gz |
disko: move to newer git version
* workarounds for .pc
* removed patch for headers which was fixed upstream
Diffstat (limited to 'recipes/disko/disko_git.bb')
-rw-r--r-- | recipes/disko/disko_git.bb | 22 |
1 files changed, 19 insertions, 3 deletions
diff --git a/recipes/disko/disko_git.bb b/recipes/disko/disko_git.bb index 657fb40cec..a48ec15d39 100644 --- a/recipes/disko/disko_git.bb +++ b/recipes/disko/disko_git.bb @@ -7,10 +7,11 @@ DEPENDS = "sqlite3 libpng jpeg curl alsa-lib taglib directfb libxml2 virtual/lib libxv libxxf86vm" SRC_URI = "git://www.diskohq.org/disko.git;protocol=git \ - file://header.patch;patch=1 \ - file://pkgconfig.patch;patch=1 \ + file://linkpath.patch;patch=1 \ + file://pkgconfig.patch;patch=1 \ " -SRCREV = "bf29da8c0060a2b4f0f9593524ca71aa1adfbc0c" + +SRCREV = "ed1d2905be5ae4fff37c498847c298fa501bbde1" S = "${WORKDIR}/git" @@ -20,3 +21,18 @@ do_compile() { ${STAGING_BINDIR_NATIVE}/scons ${PARALLEL_MAKE} graphics=all PREFIX=${prefix} prefix=${prefix} || \ oefatal "scons build execution failed." } + +#workaround for disko which creates .pc inside install +do_install_append () { + +for i in `find ${S}/ ${D}/${libdir}/pkgconfig -name "*.pc" -type f` ; do \ + sed -i -e 's:${D}::g' $i + done +} + +scons_do_stage_append () { + STAGE_PKG_SEARCHPATH="${S}/ ${@['','${WORKDIR}/staging-pkg/'][bb.data.inherits_class('packaged-staging',d)]}" + for i in `find ${STAGE_PKG_SEARCHPATH} -name "*.pc" -type f` ; do \ + sed -i -e 's:${STAGING_DIR_HOST}::g' $i + done +} |