* [meta-oe][PATCH] xbmc: Fix serveral build errors and install missing dependencies
@ 2012-10-07 3:20 Otavio Salvador
2012-10-07 16:38 ` Otavio Salvador
2012-10-09 9:03 ` Koen Kooi
0 siblings, 2 replies; 6+ messages in thread
From: Otavio Salvador @ 2012-10-07 3:20 UTC (permalink / raw)
To: openembedded-devel; +Cc: Otavio Salvador
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>
---
.../xbmc/configure.in-Avoid-running-code.patch | 32 ++++++++++++++++++++
.../recipes-mediacentre/xbmc/xbmc_git.bb | 28 +++++++++++------
2 files changed, 50 insertions(+), 10 deletions(-)
create mode 100644 meta-multimedia/recipes-mediacentre/xbmc/xbmc/configure.in-Avoid-running-code.patch
diff --git a/meta-multimedia/recipes-mediacentre/xbmc/xbmc/configure.in-Avoid-running-code.patch b/meta-multimedia/recipes-mediacentre/xbmc/xbmc/configure.in-Avoid-running-code.patch
new file mode 100644
index 0000000..5c14059
--- /dev/null
+++ b/meta-multimedia/recipes-mediacentre/xbmc/xbmc/configure.in-Avoid-running-code.patch
@@ -0,0 +1,32 @@
+From cfd851660a594801a591e80dc820c65cb7bd7836 Mon Sep 17 00:00:00 2001
+From: Otavio Salvador <otavio@ossystems.com.br>
+Date: Sat, 6 Oct 2012 06:40:03 -0300
+Subject: [PATCH] configure.in: Avoid running code or we break cross-compile
+
+Upstream-Status: Backport [similar change done for 12.0]
+
+Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
+---
+ configure.in | 6 +-----
+ 1 files changed, 1 insertions(+), 5 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index ef94683..d7efcb0 100755
+--- a/configure.in
++++ b/configure.in
+@@ -1246,11 +1246,7 @@ if test "$use_external_ffmpeg" = "yes"; then
+ AC_DEFINE([USE_EXTERNAL_FFMPEG], [1], [Whether to use external FFmpeg libraries.])
+
+ # Disable vdpau support if external libavcodec doesn't have it
+- AC_RUN_IFELSE(
+- AC_LANG_PROGRAM([[#include <libavcodec/avcodec.h>]],
+- [[avcodec_register_all();
+- AVCodec *codec = avcodec_find_decoder_by_name("vc1_vdpau");
+- return (codec) ? 0 : 1;]]),,
++ AC_CHECK_LIB([avcodec], [ff_vdpau_vc1_decode_picture],,
+ [if test "x$use_vdpau" = "xyes"; then
+ AC_MSG_ERROR($ffmpeg_vdpau_not_supported)
+ else
+--
+1.7.2.5
+
diff --git a/meta-multimedia/recipes-mediacentre/xbmc/xbmc_git.bb b/meta-multimedia/recipes-mediacentre/xbmc/xbmc_git.bb
index f0ce7cf..baa3dd2 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"
-
-
--
1.7.2.5
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [meta-oe][PATCH] xbmc: Fix serveral build errors and install missing dependencies
2012-10-07 3:20 [meta-oe][PATCH] xbmc: Fix serveral build errors and install missing dependencies Otavio Salvador
@ 2012-10-07 16:38 ` Otavio Salvador
2012-10-09 9:03 ` Koen Kooi
1 sibling, 0 replies; 6+ messages in thread
From: Otavio Salvador @ 2012-10-07 16:38 UTC (permalink / raw)
To: openembedded-devel
On Sun, Oct 7, 2012 at 12:20 AM, Otavio Salvador
<otavio@ossystems.com.br> wrote:
> 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>
I found an error, will send v2 soon.
--
Otavio Salvador O.S. Systems
E-mail: otavio@ossystems.com.br http://www.ossystems.com.br
Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [meta-oe][PATCH] xbmc: Fix serveral build errors and install missing dependencies
2012-10-07 3:20 [meta-oe][PATCH] xbmc: Fix serveral build errors and install missing dependencies Otavio Salvador
2012-10-07 16:38 ` Otavio Salvador
@ 2012-10-09 9:03 ` Koen Kooi
2012-10-11 22:01 ` Otavio Salvador
1 sibling, 1 reply; 6+ messages in thread
From: Koen Kooi @ 2012-10-09 9:03 UTC (permalink / raw)
To: openembedded-devel
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Op 07-10-12 05:20, Otavio Salvador schreef:
> 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.
> @@ -71,7 +79,7 @@ RRECOMMENDS_${PN}_append = " libcec \ python \
> python-lang \ python-re \ + python--netclient
> \ + libcurl \
I suspect things like curl-certs will be needed as well. Do you know why the
shlib code doesn't pick up the curl dep?
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
Comment: GPGTools - http://gpgtools.org
iD8DBQFQc+hwMkyGM64RGpERArvPAJ9A4tvXJVF++EwRrg/JszPOIIpJQgCeMeX0
Ph5yRyWlhNemxVbTLGTUv2U=
=QC/E
-----END PGP SIGNATURE-----
^ permalink raw reply [flat|nested] 6+ messages in thread
* [meta-oe][PATCH] xbmc: Fix serveral build errors and install missing dependencies
@ 2012-10-11 21:46 Otavio Salvador
2012-10-15 22:18 ` Otavio Salvador
0 siblings, 1 reply; 6+ messages in thread
From: Otavio Salvador @ 2012-10-11 21:46 UTC (permalink / raw)
To: openembedded-devel; +Cc: Otavio Salvador
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>
---
.../xbmc/configure.in-Avoid-running-code.patch | 32 ++++++++++++++++++++
.../recipes-mediacentre/xbmc/xbmc_git.bb | 28 +++++++++++------
2 files changed, 50 insertions(+), 10 deletions(-)
create mode 100644 meta-multimedia/recipes-mediacentre/xbmc/xbmc/configure.in-Avoid-running-code.patch
diff --git a/meta-multimedia/recipes-mediacentre/xbmc/xbmc/configure.in-Avoid-running-code.patch b/meta-multimedia/recipes-mediacentre/xbmc/xbmc/configure.in-Avoid-running-code.patch
new file mode 100644
index 0000000..5c14059
--- /dev/null
+++ b/meta-multimedia/recipes-mediacentre/xbmc/xbmc/configure.in-Avoid-running-code.patch
@@ -0,0 +1,32 @@
+From cfd851660a594801a591e80dc820c65cb7bd7836 Mon Sep 17 00:00:00 2001
+From: Otavio Salvador <otavio@ossystems.com.br>
+Date: Sat, 6 Oct 2012 06:40:03 -0300
+Subject: [PATCH] configure.in: Avoid running code or we break cross-compile
+
+Upstream-Status: Backport [similar change done for 12.0]
+
+Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
+---
+ configure.in | 6 +-----
+ 1 files changed, 1 insertions(+), 5 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index ef94683..d7efcb0 100755
+--- a/configure.in
++++ b/configure.in
+@@ -1246,11 +1246,7 @@ if test "$use_external_ffmpeg" = "yes"; then
+ AC_DEFINE([USE_EXTERNAL_FFMPEG], [1], [Whether to use external FFmpeg libraries.])
+
+ # Disable vdpau support if external libavcodec doesn't have it
+- AC_RUN_IFELSE(
+- AC_LANG_PROGRAM([[#include <libavcodec/avcodec.h>]],
+- [[avcodec_register_all();
+- AVCodec *codec = avcodec_find_decoder_by_name("vc1_vdpau");
+- return (codec) ? 0 : 1;]]),,
++ AC_CHECK_LIB([avcodec], [ff_vdpau_vc1_decode_picture],,
+ [if test "x$use_vdpau" = "xyes"; then
+ AC_MSG_ERROR($ffmpeg_vdpau_not_supported)
+ else
+--
+1.7.2.5
+
diff --git a/meta-multimedia/recipes-mediacentre/xbmc/xbmc_git.bb b/meta-multimedia/recipes-mediacentre/xbmc/xbmc_git.bb
index f0ce7cf..74bf710 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"
-
-
--
1.7.10.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [meta-oe][PATCH] xbmc: Fix serveral build errors and install missing dependencies
2012-10-09 9:03 ` Koen Kooi
@ 2012-10-11 22:01 ` Otavio Salvador
0 siblings, 0 replies; 6+ messages in thread
From: Otavio Salvador @ 2012-10-11 22:01 UTC (permalink / raw)
To: openembedded-devel
On Tue, Oct 9, 2012 at 6:03 AM, Koen Kooi <koen@dominion.thruhere.net> wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> Op 07-10-12 05:20, Otavio Salvador schreef:
>> 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.
>
>> @@ -71,7 +79,7 @@ RRECOMMENDS_${PN}_append = " libcec \ python \
>> python-lang \ python-re \ + python--netclient
>> \ + libcurl \
>
> I suspect things like curl-certs will be needed as well. Do you know why the
> shlib code doesn't pick up the curl dep?
curl-certs is recommended by libcurl so it will get in. shlib did not
handle libcurl because it seems dlopened.
I mailed the fixed patch but forgot the v2 suffix, sorry.
--
Otavio Salvador O.S. Systems
E-mail: otavio@ossystems.com.br http://www.ossystems.com.br
Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [meta-oe][PATCH] xbmc: Fix serveral build errors and install missing dependencies
2012-10-11 21:46 Otavio Salvador
@ 2012-10-15 22:18 ` Otavio Salvador
0 siblings, 0 replies; 6+ messages in thread
From: Otavio Salvador @ 2012-10-15 22:18 UTC (permalink / raw)
To: openembedded-devel
On Thu, Oct 11, 2012 at 6:46 PM, Otavio Salvador
<otavio@ossystems.com.br> wrote:
> 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>
ping?
--
Otavio Salvador O.S. Systems
E-mail: otavio@ossystems.com.br http://www.ossystems.com.br
Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2012-10-15 22:31 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-10-07 3:20 [meta-oe][PATCH] xbmc: Fix serveral build errors and install missing dependencies Otavio Salvador
2012-10-07 16:38 ` Otavio Salvador
2012-10-09 9:03 ` Koen Kooi
2012-10-11 22:01 ` Otavio Salvador
-- strict thread matches above, loose matches on Subject: below --
2012-10-11 21:46 Otavio Salvador
2012-10-15 22:18 ` Otavio Salvador
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.