diff options
author | Otavio Salvador <otavio@ossystems.com.br> | 2012-10-11 21:46:02 +0000 |
---|---|---|
committer | Koen Kooi <koen@dominion.thruhere.net> | 2012-10-16 09:59:08 +0200 |
commit | 7eb2c6f8459fdcad5eb0f0dc2d8ca17a327dc0f6 (patch) | |
tree | 0d9956cd5312c7007bc4571b20d7716676c03303 /meta-multimedia/recipes-mediacentre/xbmc/xbmc_git.bb | |
parent | a660f4a0289884f516ed85a75a25c722e31e88c9 (diff) | |
download | meta-openembedded-contrib-7eb2c6f8459fdcad5eb0f0dc2d8ca17a327dc0f6.tar.gz |
xbmc: Fix serveral build errors and install missing dependencies
This allow the package to build fine. On the test board it didn't show
anything in display but it seems to be hardware specific issue.
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Diffstat (limited to 'meta-multimedia/recipes-mediacentre/xbmc/xbmc_git.bb')
-rw-r--r-- | meta-multimedia/recipes-mediacentre/xbmc/xbmc_git.bb | 28 |
1 files changed, 18 insertions, 10 deletions
diff --git a/meta-multimedia/recipes-mediacentre/xbmc/xbmc_git.bb b/meta-multimedia/recipes-mediacentre/xbmc/xbmc_git.bb index f0ce7cf15e..74bf710667 100644 --- a/meta-multimedia/recipes-mediacentre/xbmc/xbmc_git.bb +++ b/meta-multimedia/recipes-mediacentre/xbmc/xbmc_git.bb @@ -3,7 +3,7 @@ DESCRIPTION = "XBMC Media Center" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://LICENSE.GPL;md5=6eb631b6da7fdb01508a80213ffc35ff" -DEPENDS = "libusb1 libcec libplist expat yajl gperf-native libxmu fribidi mpeg2dec ffmpeg samba fontconfig curl python libass libmodplug libmicrohttpd wavpack libmms cmake-native libsdl-image libsdl-mixer virtual/egl mysql5 sqlite3 libmms faad2 libcdio libpcre boost lzo enca avahi libsamplerate0 libxinerama libxrandr libxtst bzip2 virtual/libsdl jasper zip-native zlib" +DEPENDS = "libusb1 libcec libplist expat yajl gperf-native libxmu fribidi mpeg2dec ffmpeg samba fontconfig curl python libass libmodplug libmicrohttpd wavpack libmms cmake-native libsdl-image libsdl-mixer virtual/egl mysql5 sqlite3 libmms faad2 libcdio libpcre boost lzo enca avahi libsamplerate0 libxinerama libxrandr libxtst bzip2 virtual/libsdl jasper zip-native zlib libtinyxml" #require recipes/egl/egl.inc SRCREV = "82388d55dae79cbb2e486e307e23202e76a43efa" @@ -15,12 +15,17 @@ SRC_URI = "git://github.com/xbmc/xbmc.git;branch=eden;protocol=git \ file://0001-configure-don-t-run-python-distutils-to-find-STAGING.patch \ file://0002-Revert-fixed-ios-Add-memory-barriers-to-atomic-Add-S.patch \ file://0003-Revert-fixed-ios-Add-memory-barriers-to-cas-assembly.patch \ + file://configure.in-Avoid-running-code.patch \ " inherit autotools gettext python-dir S = "${WORKDIR}/git" +CACHED_CONFIGUREVARS += " \ + ac_cv_path_PYTHON="${STAGING_BINDIR_NATIVE}/python-native/python" \ +" + EXTRA_OECONF = " \ --disable-rpath \ --enable-gles \ @@ -30,6 +35,11 @@ EXTRA_OECONF = " \ --enable-external-libraries \ " +FULL_OPTIMIZATION_armv7a = "-fexpensive-optimizations -fomit-frame-pointer -O4 -ffast-math" +BUILD_OPTIMIZATION = "${FULL_OPTIMIZATION}" + +EXTRA_OECONF_append_armv7a = "--cpu=cortex-a8" + # for python modules export HOST_SYS export BUILD_SYS @@ -45,19 +55,17 @@ do_configure() { PARALLEL_MAKE = "" do_compile_prepend() { - - sed -i -e 's:-rpath \$(libdir)::g' lib/libid3tag/libid3tag/Makefile - for i in $(find . -name "Makefile") ; do - sed -i -e 's:I/usr/include:I${STAGING_INCDIR}:g' -e 's:-rpath \$(libdir):-rpath ${STAGING_LIBDIR}:g' $i + sed -i -e 's:I/usr/include:I${STAGING_INCDIR}:g' $i done - for i in $(find . -name "*.mak*") ; do - sed -i -e 's:I/usr/include:I${STAGING_INCDIR}:g' -e 's:-rpath \$(libdir)::g' $i + for i in $(find . -name "*.mak*" -o -name "Makefile") ; do + sed -i -e 's:I/usr/include:I${STAGING_INCDIR}:g' -e 's:-rpath \$(libdir):-rpath ${libdir}:g' $i done - sed -i -e 's:I/usr/include:I${STAGING_INCDIR}:g' -e 's:-rpath \$(libdir)::g' ${S}/Makefile } +INSANE_SKIP_${PN} = "rpaths" + # on ARM architectures xbmc will use GLES which will make the regular wrapper fail, so start it directly do_install_append_arm() { sed -i -e 's:Exec=xbmc:Exec=${libdir}/xbmc/xbmc.bin:g' ${D}${datadir}/applications/xbmc.desktop @@ -71,7 +79,7 @@ RRECOMMENDS_${PN}_append = " libcec \ python \ python-lang \ python-re \ + python-netclient \ + libcurl \ " RRECOMMENDS_${PN}_append_libc-glibc = " glibc-charmap-ibm850 glibc-gconv-ibm850" - - |