aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan McGregor <dan.mcgregor@usask.ca>2014-08-18 12:28:24 -0600
committerDan McGregor <dan.mcgregor@usask.ca>2016-07-06 12:57:46 -0600
commit9e3e88a388afb792b40b421586bae491268ef8cb (patch)
tree50ddf696a4f6d13fce561833ce87154c4aee9d20
parent493abdcab2defbe1f35e748170462329f867d844 (diff)
downloadmeta-openembedded-contrib-9e3e88a388afb792b40b421586bae491268ef8cb.tar.gz
meta-openembedded-contrib-9e3e88a388afb792b40b421586bae491268ef8cb.tar.bz2
meta-openembedded-contrib-9e3e88a388afb792b40b421586bae491268ef8cb.zip
xbmc: fix build
Remove inline asm. It's causing issues on certain platforms (Raspberry Pi) and has been removed upstream. Signed-off-by: Dan McGregor <dan.mcgregor@usask.ca>
-rw-r--r--meta-multimedia/recipes-mediacentre/xbmc/xbmc_git.bb29
1 files changed, 14 insertions, 15 deletions
diff --git a/meta-multimedia/recipes-mediacentre/xbmc/xbmc_git.bb b/meta-multimedia/recipes-mediacentre/xbmc/xbmc_git.bb
index 0d8dd5cb35..fc1a96940a 100644
--- a/meta-multimedia/recipes-mediacentre/xbmc/xbmc_git.bb
+++ b/meta-multimedia/recipes-mediacentre/xbmc/xbmc_git.bb
@@ -4,25 +4,19 @@ 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 libtinyxml libmad"
+DEPENDS += "libxslt taglib libssh"
#require recipes/egl/egl.inc
-SRCREV = "82388d55dae79cbb2e486e307e23202e76a43efa"
+SRCREV = "0f3db0516711e05765d297d060563730131c2f92"
-# multiple issues
-PNBLACKLIST[xbmc] ?= "/usr/include/c++/ctime:70:11: error: '::gmtime' has not been declared"
-
-PV = "11.0+gitr${SRCPV}"
-PR = "r14"
-SRC_URI = "git://github.com/xbmc/xbmc.git;branch=Eden \
+PV = "13.2+gitr${SRCPV}"
+#PR = "r14"
+SRC_URI = "git://github.com/xbmc/xbmc.git;branch=Gotham \
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://0004-configure-cope-with-ld-is-gold-DISTRO_FEATURE.patch \
- file://configure.in-Avoid-running-code.patch \
"
-inherit autotools gettext python-dir
+inherit autotools-brokensep gettext python-dir
S = "${WORKDIR}/git"
@@ -31,11 +25,18 @@ CCACHE = ""
CACHED_CONFIGUREVARS += " \
ac_cv_path_PYTHON="${STAGING_BINDIR_NATIVE}/python-native/python" \
+ jm_cv_func_gettimeofday_clobber=no \
+"
+
+PACKAGECONFIG ??= " \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'opengl', 'openglesv2', d)} \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)} \
"
PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'opengl', 'openglesv2', d)}"
PACKAGECONFIG[opengl] = "--enable-gl,--enable-gles,glew"
PACKAGECONFIG[openglesv2] = "--enable-gles,--enable-gl,"
+PACKAGECONFIG[pulseaudio] = "--enable-pulse=yes,--enable-pulse=no,pulseaudio"
EXTRA_OECONF = " \
--disable-rpath \
@@ -49,7 +50,7 @@ EXTRA_OECONF = " \
FULL_OPTIMIZATION_armv7a = "-fexpensive-optimizations -fomit-frame-pointer -O4 -ffast-math"
BUILD_OPTIMIZATION = "${FULL_OPTIMIZATION}"
-EXTRA_OECONF_append_armv7a = "--cpu=cortex-a8"
+EXTRA_OECONF_append_armv7a = " --with-cpu=cortex-a8"
# for python modules
export STAGING_LIBDIR
@@ -61,8 +62,6 @@ do_configure() {
oe_runconf
}
-PARALLEL_MAKE = ""
-
do_compile_prepend() {
for i in $(find . -name "Makefile") ; do
sed -i -e 's:I/usr/include:I${STAGING_INCDIR}:g' $i