Patchwork [meta-multimedia,1/2] xbmc: first try at making it build for non-GLES platforms

login
register
mail settings
Submitter Koen Kooi
Date March 11, 2013, 10:39 a.m.
Message ID <1362998354-7195-1-git-send-email-koen@dominion.thruhere.net>
Download mbox | patch
Permalink /patch/45865/
State New, archived
Headers show

Comments

Koen Kooi - March 11, 2013, 10:39 a.m.
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---
 .../recipes-mediacentre/xbmc/xbmc_git.bb           |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)
Martin Jansa - March 13, 2013, 11:24 a.m.
On Mon, Mar 11, 2013 at 11:39:13AM +0100, Koen Kooi wrote:
> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>

Hi,

it still fails on qemuarm builds:

| CPP     xbmc/cores/dvdplayer/DVDClock.o
| In file included from DVDClock.cpp:25:0:
| /home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/xbmc/11.0-r14+gitrAUTOINC+82388d55dae79cbb2e486e307e23202e76a43efa/git/xbmc/utils/MathUtils.h: In member function 'int CDVDClock::UpdateFramerate(double, double*)':
| /home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/xbmc/11.0-r14+gitrAUTOINC+82388d55dae79cbb2e486e307e23202e76a43efa/git/xbmc/utils/MathUtils.h:101:28: error: impossible constraint in 'asm'
| /home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/xbmc/11.0-r14+gitrAUTOINC+82388d55dae79cbb2e486e307e23202e76a43efa/git/xbmc/utils/MathUtils.h:101:28: error: impossible constraint in 'asm'
| /home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/xbmc/11.0-r14+gitrAUTOINC+82388d55dae79cbb2e486e307e23202e76a43efa/git/xbmc/utils/MathUtils.h:101:28: error: impossible constraint in 'asm'
| /home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/xbmc/11.0-r14+gitrAUTOINC+82388d55dae79cbb2e486e307e23202e76a43efa/git/xbmc/utils/MathUtils.h:101:28: error: impossible constraint in 'asm'
| make[1]: *** [DVDClock.o] Error 1
| make: *** [xbmc/cores/dvdplayer/DVDPlayer.a] Error 2
| ERROR: oe_runmake failed
| ERROR: Function failed: do_compile (see /home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/xbmc/11.0-r14+gitrAUTOINC+82388d55dae79cbb2e486e307e23202e76a43efa/temp/log.do_compile.30414 for further information)
NOTE: recipe xbmc-11.0-r14+gitrAUTOINC+82388d55dae79cbb2e486e307e23202e76a43efa: task do_compile: Failed
ERROR: Task 7628 (/home/jenkins/oe/shr-core-branches/shr-core/meta-openembedded/meta-multimedia/recipes-mediacentre/xbmc/xbmc_git.bb, do_compile) failed with exit code '1'

Full log:
http://logs.nslu2-linux.org/buildlogs/oe/oe-shr-core-branches/log.world.20130312_110444.log/

> ---
>  .../recipes-mediacentre/xbmc/xbmc_git.bb           |    7 ++++---
>  1 files changed, 4 insertions(+), 3 deletions(-)
> 
> diff --git a/meta-multimedia/recipes-mediacentre/xbmc/xbmc_git.bb b/meta-multimedia/recipes-mediacentre/xbmc/xbmc_git.bb
> index 74bf710..6331306 100644
> --- a/meta-multimedia/recipes-mediacentre/xbmc/xbmc_git.bb
> +++ b/meta-multimedia/recipes-mediacentre/xbmc/xbmc_git.bb
> @@ -3,13 +3,13 @@ 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 libtinyxml"
> +DEPENDS = "libmad 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"
>  
>  PV = "11.0"
> -PR = "r14"
> +PR = "r15"
>  PR_append = "+gitr${SRCPV}"
>  SRC_URI = "git://github.com/xbmc/xbmc.git;branch=eden;protocol=git \
>             file://0001-configure-don-t-run-python-distutils-to-find-STAGING.patch \
> @@ -26,13 +26,14 @@ CACHED_CONFIGUREVARS += " \
>   ac_cv_path_PYTHON="${STAGING_BINDIR_NATIVE}/python-native/python" \
>  "
>  
> +
>  EXTRA_OECONF = " \
>   --disable-rpath \
> - --enable-gles \
>   --enable-libusb \
>   --enable-airplay \
>   --disable-optical-drive \
>   --enable-external-libraries \
> + ${@base_contains('DISTRO_FEATURES', 'opengl', '--enable-gl', '--enable-gles', d)} \
>  "
>  
>  FULL_OPTIMIZATION_armv7a = "-fexpensive-optimizations -fomit-frame-pointer -O4 -ffast-math"
> -- 
> 1.7.7.6
> 
> 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Martin Jansa - March 13, 2013, 11:32 a.m.
On Wed, Mar 13, 2013 at 12:24:57PM +0100, Martin Jansa wrote:
> On Mon, Mar 11, 2013 at 11:39:13AM +0100, Koen Kooi wrote:
> > Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
> 
> Hi,
> 
> it still fails on qemuarm builds:
> 
> | CPP     xbmc/cores/dvdplayer/DVDClock.o
> | In file included from DVDClock.cpp:25:0:
> | /home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/xbmc/11.0-r14+gitrAUTOINC+82388d55dae79cbb2e486e307e23202e76a43efa/git/xbmc/utils/MathUtils.h: In member function 'int CDVDClock::UpdateFramerate(double, double*)':
> | /home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/xbmc/11.0-r14+gitrAUTOINC+82388d55dae79cbb2e486e307e23202e76a43efa/git/xbmc/utils/MathUtils.h:101:28: error: impossible constraint in 'asm'
> | /home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/xbmc/11.0-r14+gitrAUTOINC+82388d55dae79cbb2e486e307e23202e76a43efa/git/xbmc/utils/MathUtils.h:101:28: error: impossible constraint in 'asm'
> | /home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/xbmc/11.0-r14+gitrAUTOINC+82388d55dae79cbb2e486e307e23202e76a43efa/git/xbmc/utils/MathUtils.h:101:28: error: impossible constraint in 'asm'
> | /home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/xbmc/11.0-r14+gitrAUTOINC+82388d55dae79cbb2e486e307e23202e76a43efa/git/xbmc/utils/MathUtils.h:101:28: error: impossible constraint in 'asm'
> | make[1]: *** [DVDClock.o] Error 1
> | make: *** [xbmc/cores/dvdplayer/DVDPlayer.a] Error 2
> | ERROR: oe_runmake failed
> | ERROR: Function failed: do_compile (see /home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/xbmc/11.0-r14+gitrAUTOINC+82388d55dae79cbb2e486e307e23202e76a43efa/temp/log.do_compile.30414 for further information)
> NOTE: recipe xbmc-11.0-r14+gitrAUTOINC+82388d55dae79cbb2e486e307e23202e76a43efa: task do_compile: Failed
> ERROR: Task 7628 (/home/jenkins/oe/shr-core-branches/shr-core/meta-openembedded/meta-multimedia/recipes-mediacentre/xbmc/xbmc_git.bb, do_compile) failed with exit code '1'
> 
> Full log:
> http://logs.nslu2-linux.org/buildlogs/oe/oe-shr-core-branches/log.world.20130312_110444.log/

Ignore this one, another build with this patch actually included is
running now.

> 
> > ---
> >  .../recipes-mediacentre/xbmc/xbmc_git.bb           |    7 ++++---
> >  1 files changed, 4 insertions(+), 3 deletions(-)
> > 
> > diff --git a/meta-multimedia/recipes-mediacentre/xbmc/xbmc_git.bb b/meta-multimedia/recipes-mediacentre/xbmc/xbmc_git.bb
> > index 74bf710..6331306 100644
> > --- a/meta-multimedia/recipes-mediacentre/xbmc/xbmc_git.bb
> > +++ b/meta-multimedia/recipes-mediacentre/xbmc/xbmc_git.bb
> > @@ -3,13 +3,13 @@ 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 libtinyxml"
> > +DEPENDS = "libmad 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"
> >  
> >  PV = "11.0"
> > -PR = "r14"
> > +PR = "r15"
> >  PR_append = "+gitr${SRCPV}"
> >  SRC_URI = "git://github.com/xbmc/xbmc.git;branch=eden;protocol=git \
> >             file://0001-configure-don-t-run-python-distutils-to-find-STAGING.patch \
> > @@ -26,13 +26,14 @@ CACHED_CONFIGUREVARS += " \
> >   ac_cv_path_PYTHON="${STAGING_BINDIR_NATIVE}/python-native/python" \
> >  "
> >  
> > +
> >  EXTRA_OECONF = " \
> >   --disable-rpath \
> > - --enable-gles \
> >   --enable-libusb \
> >   --enable-airplay \
> >   --disable-optical-drive \
> >   --enable-external-libraries \
> > + ${@base_contains('DISTRO_FEATURES', 'opengl', '--enable-gl', '--enable-gles', d)} \
> >  "
> >  
> >  FULL_OPTIMIZATION_armv7a = "-fexpensive-optimizations -fomit-frame-pointer -O4 -ffast-math"
> > -- 
> > 1.7.7.6
> > 
> > 
> > _______________________________________________
> > Openembedded-devel mailing list
> > Openembedded-devel@lists.openembedded.org
> > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
> 
> -- 
> Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com
Martin Jansa - March 13, 2013, 4:34 p.m.
On Wed, Mar 13, 2013 at 12:32:27PM +0100, Martin Jansa wrote:
> On Wed, Mar 13, 2013 at 12:24:57PM +0100, Martin Jansa wrote:
> > On Mon, Mar 11, 2013 at 11:39:13AM +0100, Koen Kooi wrote:
> > > Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
> > 
> > Hi,
> > 
> > it still fails on qemuarm builds:
> > 
> > | CPP     xbmc/cores/dvdplayer/DVDClock.o
> > | In file included from DVDClock.cpp:25:0:
> > | /home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/xbmc/11.0-r14+gitrAUTOINC+82388d55dae79cbb2e486e307e23202e76a43efa/git/xbmc/utils/MathUtils.h: In member function 'int CDVDClock::UpdateFramerate(double, double*)':
> > | /home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/xbmc/11.0-r14+gitrAUTOINC+82388d55dae79cbb2e486e307e23202e76a43efa/git/xbmc/utils/MathUtils.h:101:28: error: impossible constraint in 'asm'
> > | /home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/xbmc/11.0-r14+gitrAUTOINC+82388d55dae79cbb2e486e307e23202e76a43efa/git/xbmc/utils/MathUtils.h:101:28: error: impossible constraint in 'asm'
> > | /home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/xbmc/11.0-r14+gitrAUTOINC+82388d55dae79cbb2e486e307e23202e76a43efa/git/xbmc/utils/MathUtils.h:101:28: error: impossible constraint in 'asm'
> > | /home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/xbmc/11.0-r14+gitrAUTOINC+82388d55dae79cbb2e486e307e23202e76a43efa/git/xbmc/utils/MathUtils.h:101:28: error: impossible constraint in 'asm'
> > | make[1]: *** [DVDClock.o] Error 1
> > | make: *** [xbmc/cores/dvdplayer/DVDPlayer.a] Error 2
> > | ERROR: oe_runmake failed
> > | ERROR: Function failed: do_compile (see /home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/xbmc/11.0-r14+gitrAUTOINC+82388d55dae79cbb2e486e307e23202e76a43efa/temp/log.do_compile.30414 for further information)
> > NOTE: recipe xbmc-11.0-r14+gitrAUTOINC+82388d55dae79cbb2e486e307e23202e76a43efa: task do_compile: Failed
> > ERROR: Task 7628 (/home/jenkins/oe/shr-core-branches/shr-core/meta-openembedded/meta-multimedia/recipes-mediacentre/xbmc/xbmc_git.bb, do_compile) failed with exit code '1'
> > 
> > Full log:
> > http://logs.nslu2-linux.org/buildlogs/oe/oe-shr-core-branches/log.world.20130312_110444.log/
> 
> Ignore this one, another build with this patch actually included is
> running now.

Ignore ignored, it still fails like this with r15.

> 
> > 
> > > ---
> > >  .../recipes-mediacentre/xbmc/xbmc_git.bb           |    7 ++++---
> > >  1 files changed, 4 insertions(+), 3 deletions(-)
> > > 
> > > diff --git a/meta-multimedia/recipes-mediacentre/xbmc/xbmc_git.bb b/meta-multimedia/recipes-mediacentre/xbmc/xbmc_git.bb
> > > index 74bf710..6331306 100644
> > > --- a/meta-multimedia/recipes-mediacentre/xbmc/xbmc_git.bb
> > > +++ b/meta-multimedia/recipes-mediacentre/xbmc/xbmc_git.bb
> > > @@ -3,13 +3,13 @@ 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 libtinyxml"
> > > +DEPENDS = "libmad 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"
> > >  
> > >  PV = "11.0"
> > > -PR = "r14"
> > > +PR = "r15"
> > >  PR_append = "+gitr${SRCPV}"
> > >  SRC_URI = "git://github.com/xbmc/xbmc.git;branch=eden;protocol=git \
> > >             file://0001-configure-don-t-run-python-distutils-to-find-STAGING.patch \
> > > @@ -26,13 +26,14 @@ CACHED_CONFIGUREVARS += " \
> > >   ac_cv_path_PYTHON="${STAGING_BINDIR_NATIVE}/python-native/python" \
> > >  "
> > >  
> > > +
> > >  EXTRA_OECONF = " \
> > >   --disable-rpath \
> > > - --enable-gles \
> > >   --enable-libusb \
> > >   --enable-airplay \
> > >   --disable-optical-drive \
> > >   --enable-external-libraries \
> > > + ${@base_contains('DISTRO_FEATURES', 'opengl', '--enable-gl', '--enable-gles', d)} \
> > >  "
> > >  
> > >  FULL_OPTIMIZATION_armv7a = "-fexpensive-optimizations -fomit-frame-pointer -O4 -ffast-math"
> > > -- 
> > > 1.7.7.6
> > > 
> > > 
> > > _______________________________________________
> > > Openembedded-devel mailing list
> > > Openembedded-devel@lists.openembedded.org
> > > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
> > 
> > -- 
> > Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com
> 
> 
> 
> -- 
> Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

Patch

diff --git a/meta-multimedia/recipes-mediacentre/xbmc/xbmc_git.bb b/meta-multimedia/recipes-mediacentre/xbmc/xbmc_git.bb
index 74bf710..6331306 100644
--- a/meta-multimedia/recipes-mediacentre/xbmc/xbmc_git.bb
+++ b/meta-multimedia/recipes-mediacentre/xbmc/xbmc_git.bb
@@ -3,13 +3,13 @@  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 libtinyxml"
+DEPENDS = "libmad 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"
 
 PV = "11.0"
-PR = "r14"
+PR = "r15"
 PR_append = "+gitr${SRCPV}"
 SRC_URI = "git://github.com/xbmc/xbmc.git;branch=eden;protocol=git \
            file://0001-configure-don-t-run-python-distutils-to-find-STAGING.patch \
@@ -26,13 +26,14 @@  CACHED_CONFIGUREVARS += " \
  ac_cv_path_PYTHON="${STAGING_BINDIR_NATIVE}/python-native/python" \
 "
 
+
 EXTRA_OECONF = " \
  --disable-rpath \
- --enable-gles \
  --enable-libusb \
  --enable-airplay \
  --disable-optical-drive \
  --enable-external-libraries \
+ ${@base_contains('DISTRO_FEATURES', 'opengl', '--enable-gl', '--enable-gles', d)} \
 "
 
 FULL_OPTIMIZATION_armv7a = "-fexpensive-optimizations -fomit-frame-pointer -O4 -ffast-math"