xbmc: bump version to 13.1
v12 cover xbmc: bump version to 13.1
the patch series combines my latest patches to bump xbmc. It also adds uClibc support to xbmc, a mesa3d version bump and several new packages to support the new xbmc release along with libva to get the best out of Intel systems.
The series is compiled-tested using
BR2_TOOLCHAIN_EXTERNAL=y
BR2_PACKAGE_XBMC=y
BR2_PACKAGE_XBMC_AVAHI=y
BR2_PACKAGE_XBMC_DBUS=y
BR2_PACKAGE_XBMC_LIBBLURAY=y
BR2_PACKAGE_XBMC_LIBMICROHTTPD=y
BR2_PACKAGE_XBMC_LIBNFS=y
BR2_PACKAGE_XBMC_RTMPDUMP=y
BR2_PACKAGE_XBMC_LIBSHAIRPLAY=y
BR2_PACKAGE_XBMC_LIBSMBCLIENT=y
BR2_PACKAGE_XBMC_LIBTHEORA=y
BR2_PACKAGE_XBMC_LIBUSB=y
BR2_PACKAGE_XBMC_WAVPACK=y
BR2_PACKAGE_XBMC_GOOM=y
BR2_PACKAGE_XBMC_ADDON_XVDR=y
BR2_PACKAGE_XBMC_PVR_ADDONS=y
BR2_PACKAGE_MESA3D=y
BR2_PACKAGE_MESA3D_DRI_DRIVER_I965=y
BR2_PACKAGE_XORG7=y
BR2_PACKAGE_XSERVER_XORG_SERVER=y
BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR=y
BR2_PACKAGE_XDRIVER_XF86_VIDEO_INTEL=y
Regards, Bernd
v12: - rebased (no more RC versions ;))
- bump xbmc to 13.1
- github helper produces a wrong URL
(wrong: xbmc-13.1-Gotham.tar.gz, correct: 13.1-Gotham.tar.gz), so I had to switch to _SOURCE until a fix is found
- bump mesa3d version to 10.2.1
v11: - patch series updated by Yann
- series re-ordering
- add new required gconv-related patch
- some commit logs massaging
v10: - reworked patch series based on comments by Yann
- added comment to xproto_dri3proto
- removed emtpy line from libva
- added comment to libglu
- fix libpng support in xbmc??s rsxs screensaver
- bump mesa3d version to 10.2-rc4
v9: - reworked patch series based on comments by Yann & Arnout:
- moved some patches before xbmc version bump for bisectability
- removed iconv patch to SDL, to be checked later
- removed rtmpdump/KSV patch from series, to be checked later
- added description to mesa3d/xorg meta package dependency
- reworked OpenGL/egl+gles logic in package/xbmc/
- bump xbmc to 13.1 Beta2
- cec needs udev to be useful
v8: - squashed "[v7 29/31] ffmpeg cross-compile" into
"[v8 16/28] Gotham bump" (Thomas)
- squashed "[v7 21/31] uclibc at arm" & "[v7 31/31] ipv6" patches into "[v8 20/28] uclibc" patch (Thomas/Yann)
- xbmc-pvr-addons: updated comment (Yann)
v7: - rebased
- bump mesa3d version to 10.2-rc3
- included v2 of "xproto_dri3proto: New package"
v6: - bump mesa3d version to 10.2-rc2
- bump libva and libva-intel-driver to 1.3.1
Bernd Kuhls (28):
xbmc: add host-gettext dependency
xbmc: add host-nasm dependency
xbmc: add host-yasm dependency for MMX/64bit archs
xbmc: add missing egl-related cflags
xbmc: hdmi cec supports needs udev for device scanning
xbmc: bump version to 13.1
xbmc-pvr-addons: bump to a version compatible with XBMC Gotham
xbmc-addon-xvdr: bump to a version compatible with XBMC Gotham
mesa3d: Bump version to 10.2.1, fix xa build
mesa3d: Depend on xorg meta package instead of xserver_xorg-server
mesa3d: add dependency xproto_presentproto
mesa3d: Remove dependency for the libxml2 module of host-python
mesa3d: Add dri3 support
mesa3d: dri2 does not need udev support
libva: new package
libva-intel-driver: new package
ffmpeg: Add libva support
libglu: new package
libglew: new package
sdl: Add new dependency libglu for opengl support
xdriver_xf86-video-intel: Bump version to 2.99.911
xbmc: Allow compilation with uClibc
xbmc: Add alsa support
xbmc: Add lame support
xbmc: Fix TexturePacker compile
xbmc: Add X.org/OpenGL support
xbmc: Add option for Goom screensaver
xbmc: Add VA-API support
Samuel Martin (2):
xbmc: fix missing libraries from rpi-userland
rpi-userland: cleanup *_CONF_OPT
Yann E. MORIN (2):
toolchain: add option to copy the gconv libraries package/libcec: fix missing libraries from rpi-userland
Makefile | 6 + package/Config.in | 4 + package/ffmpeg/ffmpeg.mk | 8 +- package/libcec/libcec.mk | 1 + package/libglew/Config.in | 19 ++ package/libglew/libglew.mk | 36 ++++ package/libglu/Config.in | 10 + package/libglu/libglu.mk | 17 ++ package/libva-intel-driver/Config.in | 19 ++ package/libva-intel-driver/libva-intel-driver.mk | 29 +++ package/libva/Config.in | 18 ++ package/libva/libva-0001-no_test_decode.patch | 17 ++ package/libva/libva.mk | 56 +++++ package/libxml2/Config.in | 3 - package/libxml2/libxml2-python2.patch | 27 --- package/libxml2/libxml2.mk | 16 +- package/mesa3d/Config.in | 24 +-- .../mesa3d-0002-dri2-does-not-need-udev.patch | 25 +++ package/mesa3d/mesa3d.mk | 25 ++- package/rpi-userland/rpi-userland.mk | 2 +- package/sdl/sdl.mk | 3 +- package/x11r7/xdriver_xf86-video-intel/Config.in | 5 +- .../xdriver_xf86-video-intel.mk | 27 ++- .../xbmc-addon-xvdr-0001-foreign-automake.patch | 28 --- package/xbmc-addon-xvdr/xbmc-addon-xvdr.mk | 7 +- package/xbmc-pvr-addons/xbmc-pvr-addons.mk | 7 +- package/xbmc/Config.in | 59 +++++- package/xbmc/xbmc-0002-mathutil.patch | 213 ++++++++++++++++++++ package/xbmc/xbmc.mk | 95 +++++++-- toolchain/toolchain-common.in | 10 + 30 files changed, 682 insertions(+), 134 deletions(-) create mode 100644 package/libglew/Config.in create mode 100644 package/libglew/libglew.mk create mode 100644 package/libglu/Config.in create mode 100644 package/libglu/libglu.mk create mode 100644 package/libva-intel-driver/Config.in create mode 100644 package/libva-intel-driver/libva-intel-driver.mk create mode 100644 package/libva/Config.in create mode 100644 package/libva/libva-0001-no_test_decode.patch create mode 100644 package/libva/libva.mk delete mode 100644 package/libxml2/libxml2-python2.patch create mode 100644 package/mesa3d/mesa3d-0002-dri2-does-not-need-udev.patch delete mode 100644 package/xbmc-addon-xvdr/xbmc-addon-xvdr-0001-foreign-automake.patch create mode 100644 package/xbmc/xbmc-0002-mathutil.patch
Signature · 1 line
1.7.10.4
PATCH v12 1/32 toolchain: add option to copy the gconv libraries
From: "Yann E. MORIN" <[email protected]>
The gconv libraries are used to translate between different character sets (charsets).
In (e)glibc they are implemented by the internal implemenation of iconv, called gconv, and are provided as dlopen-able libraries.
Some packages need them to present text to the user (eg. XBMC Gotham).
--- Makefile | 6 ++++++ toolchain/toolchain-common.in | 10 ++++++++++ 2 files changed, 16 insertions(+)
Makefile +6 -0
@@ -395,6 +395,9 @@ ifeq ($(BR2_TOOLCHAIN_USES_GLIBC),y) ifneq ($(GENERATE_LOCALE),) TARGETS += target-generatelocales endif +ifeq ($(BR2_COPY_GCONV_LIBS),y) +TARGETS += target-copygconvlibs +endif endif ifeq ($(BR2_ECLIPSE_REGISTER),y)
@@ -620,6 +623,9 @@ target-generatelocales: host-localedef toolchain done endif +target-copygconvlibs: + $(Q)cp -a $(STAGING_DIR)/usr/lib/gconv $(TARGET_DIR)/usr/lib/gconv + target-post-image: $(TARGETS_ROOTFS) target-finalize @$(foreach s, $(call qstrip,$(BR2_ROOTFS_POST_IMAGE_SCRIPT)), \ $(call MESSAGE,"Executing post-image script $(s)"); \
toolchain/toolchain-common.in +10 -0
@@ -77,6 +77,16 @@ config BR2_GENERATE_LOCALE specified, UTF-8 is assumed. Examples of locales: en_US, fr_FR.UTF-8. +config BR2_COPY_GCONV_LIBS + bool "copy gconv libs" + depends on BR2_TOOLCHAIN_USES_GLIBC + help + The gconv libraries are used to convert between different + character sets (charsets). + + Say 'y' if you need to store and/or display different charsets. + Note that the full set of gconv libraries is worth around 7MiB. + # glibc and eglibc directly include gettext, so a separatly compiled # gettext isn't needed and shouldn't be built to avoid conflicts. Some # packages always need gettext, other packages only need gettext when
Signature · 1 line
1.7.10.4
PATCH v12 1/32 toolchain: add option to copy the gconv libraries
Bernd, Yann,
toolchain/toolchain-common.in config BR2_GENERATE_LOCALE · line 82
Quoted 3 lines · Bernd Kuhls
toolchain/toolchain-common.in +3
-0+config BR2_COPY_GCONV_LIBS + bool "copy gconv libs" + depends on BR2_TOOLCHAIN_USES_GLIBC
A few comments about this patch:
- I dislike the name of the option. Maybe it should be BR2_TOOLCHAIN_GLIBC_GCONV_LIBS_COPY or something like that.
- There should be a sub-option or something to copy only a subset of the gconv library, with a sane, default set of gconv libraries. Maybe with a choice "copy all" / "copy a selection".
- Packages that needs gconv libraries should select this option.
Thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com
PATCH v12 1/32 toolchain: add option to copy the gconv libraries
Thomas, All,
On 2014-06-08 15:15 +0200, Thomas Petazzoni spake thusly:
Quoted 8 lines · Bernd Kuhls
toolchain/toolchain-common.in config BR2_GENERATE_LOCALE · line 82
Quoted 4 lines
toolchain/toolchain-common.in +3
-0+config BR2_COPY_GCONV_LIBS + bool "copy gconv libs" + depends on BR2_TOOLCHAIN_USES_GLIBCA few comments about this patch:
Quoted 8 lines
- I dislike the name of the option. Maybe it should be
BR2_TOOLCHAIN_GLIBC_GCONV_LIBS_COPYor something like that.- There should be a sub-option or something to copy only a subset of the gconv library, with a sane, default set of gconv libraries. Maybe with a choice "copy all" / "copy a selection".
- Packages that needs gconv libraries should select this option.
OK, OK, and OK. Will do.
Regards,
Yann E. MORIN.
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'
PATCH v12 2/32 xbmc: add host-gettext dependency
In reply to Bernd KuhlsAUTOPOINT=/bin/true does not work anymore since
https://github.com/xbmc/xbmc/commit/42017cba7a62a0cf16896b061a25a25d392e1e46
config.status: error: cannot find input file: `Makefile.in'
configure: error: Submodule lib/cpluff failed to configure
This will be needed for 13.0 Gotham.
--- package/xbmc/xbmc.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
package/xbmc/xbmc.mk +2 -2
@@ -12,7 +12,7 @@ XBMC_LICENSE_FILES = LICENSE.GPL # called TexturePacker. It is responsible to take all the images used in the # GUI and pack them in a blob. # http://wiki.xbmc.org/index.php?title=TexturePacker -XBMC_DEPENDENCIES = host-gawk host-gperf host-infozip host-lzo host-sdl_image host-swig +XBMC_DEPENDENCIES = host-gawk host-gettext host-gperf host-infozip host-lzo host-sdl_image host-swig XBMC_DEPENDENCIES += boost bzip2 expat flac fontconfig freetype jasper jpeg \ libass libcdio libcurl libegl libfribidi libgcrypt libgles libmad libmodplug libmpeg2 \ libogg libplist libpng libsamplerate libungif libvorbis libxml2 lzo ncurses \
@@ -133,7 +133,7 @@ endif # Add HOST_DIR to PATH for codegenerator.mk to find swig define XBMC_BOOTSTRAP - cd $(@D) && PATH=$(BR_PATH) AUTOPOINT=/bin/true ./bootstrap + cd $(@D) && PATH=$(BR_PATH) ./bootstrap endef XBMC_PRE_CONFIGURE_HOOKS += XBMC_BOOTSTRAP
Signature · 1 line
1.7.10.4
PATCH v12 2/32 xbmc: add host-gettext dependency
Bernd, All,
On 2014-06-07 14:31 +0200, Bernd Kuhls spake thusly:
Quoted 10 lines
AUTOPOINT=/bin/true does not work anymore since
https://github.com/xbmc/xbmc/commit/42017cba7a62a0cf16896b061a25a25d392e1e46config.status: error: cannot find input file: `Makefile.in'
configure: error: Submodule lib/cpluff failed to configureThis will be needed for 13.0 Gotham.
Signed-off-by Bernd Kuhls <[email protected]>Signed-off-by "Yann E. MORIN" <[email protected]>
Regards,
Yann E. MORIN.
Quoted 33 lines
--- package/xbmc/xbmc.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)package/xbmc/xbmc.mk +2
-2@@ -12,7 +12,7 @@ XBMC_LICENSE_FILES = LICENSE.GPL # called TexturePacker. It is responsible to take all the images used in the # GUI and pack them in a blob. # http://wiki.xbmc.org/index.php?title=TexturePacker -XBMC_DEPENDENCIES = host-gawk host-gperf host-infozip host-lzo host-sdl_image host-swig +XBMC_DEPENDENCIES = host-gawk host-gettext host-gperf host-infozip host-lzo host-sdl_image host-swig XBMC_DEPENDENCIES += boost bzip2 expat flac fontconfig freetype jasper jpeg \ libass libcdio libcurl libegl libfribidi libgcrypt libgles libmad libmodplug libmpeg2 \ libogg libplist libpng libsamplerate libungif libvorbis libxml2 lzo ncurses \@@ -133,7 +133,7 @@ endif # Add HOST_DIR to PATH for codegenerator.mk to find swig define XBMC_BOOTSTRAP - cd $(@D) && PATH=$(BR_PATH) AUTOPOINT=/bin/true ./bootstrap + cd $(@D) && PATH=$(BR_PATH) ./bootstrap endef XBMC_PRE_CONFIGURE_HOOKS += XBMC_BOOTSTRAPSignature · 6 lines
1.7.10.4 _______________________________________________ buildroot mailing list buildroot at busybox.net http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'
PATCH v12 2/32 xbmc: add host-gettext dependency
Hi all,
Quoted 65 lines · Yann E. MORIN
Bernd, All,
On 2014-06-07 14:31 +0200, Bernd Kuhls spake thusly:
Quoted 10 lines
AUTOPOINT=/bin/true does not work anymore since
https://github.com/xbmc/xbmc/commit/42017cba7a62a0cf16896b061a25a25d392e1e46config.status: error: cannot find input file: `Makefile.in'
configure: error: Submodule lib/cpluff failed to configureThis will be needed for 13.0 Gotham.
Signed-off-by Bernd Kuhls <[email protected]>Signed-off-by "Yann E. MORIN" <[email protected]>Reviewed-by "Yann E. MORIN" <[email protected]>Tested-by "Yann E. MORIN" <[email protected]>Regards,
Yann E. MORIN.Quoted 29 lines
--- package/xbmc/xbmc.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)package/xbmc/xbmc.mk +2
-3@@ -12,7 +12,7 @@ XBMC_LICENSE_FILES = LICENSE.GPL # called TexturePacker. It is responsible to take all the images used in the # GUI and pack them in a blob. # http://wiki.xbmc.org/index.php?title=TexturePacker -XBMC_DEPENDENCIES = host-gawk host-gperf host-infozip host-lzo host-sdl_image host-swig +XBMC_DEPENDENCIES = host-gawk host-gettext host-gperf host-infozip host-lzo host-sdl_image host-swig XBMC_DEPENDENCIES += boost bzip2 expat flac fontconfig freetype jasper jpeg \ libass libcdio libcurl libegl libfribidi libgcrypt libgles libmad libmodplug libmpeg2 \ libogg libplist libpng libsamplerate libungif libvorbis libxml2 lzo ncurses \@@ -133,7 +133,7 @@ endif # Add HOST_DIR to PATH for codegenerator.mk to find swig define XBMC_BOOTSTRAP - cd $(@D) && PATH=$(BR_PATH) AUTOPOINT=/bin/true ./bootstrap + cd $(@D) && PATH=$(BR_PATH) ./bootstrap endef XBMC_PRE_CONFIGURE_HOOKS += XBMC_BOOTSTRAP --1.7.10.4
Quoted 4 lines
_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot--
.-----------------.--------------------.------------------.--------------------.| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
PATCH v12 3/32 xbmc: add host-nasm dependency
In reply to Bernd KuhlsFixes:
checking for nasm... no
configure: error: Could not find a required program. Please see the README for your platform.
This will be needed for 13.0 Gotham.
--- package/xbmc/xbmc.mk | 3 +++ 1 file changed, 3 insertions(+)
package/xbmc/xbmc.mk +3 -0
@@ -18,6 +18,9 @@ XBMC_DEPENDENCIES += boost bzip2 expat flac fontconfig freetype jasper jpeg \ libogg libplist libpng libsamplerate libungif libvorbis libxml2 lzo ncurses \ openssl pcre python readline sqlite taglib tiff tinyxml yajl zlib +# xbmc at i386 depends on nasm +XBMC_DEPENDENCIES += $(if $(BR2_i386),host-nasm) + XBMC_CONF_ENV = \ PYTHON_VERSION="$(PYTHON_VERSION_MAJOR)" \ PYTHON_LDFLAGS="-lpython$(PYTHON_VERSION_MAJOR) -lpthread -ldl -lutil -lm" \
Signature · 1 line
1.7.10.4
PATCH v12 3/32 xbmc: add host-nasm dependency
Bernd, All,
On 2014-06-07 14:31 +0200, Bernd Kuhls spake thusly:
Quoted 8 lines
Fixes:
checking for nasm... no
configure: error: Could not find a required program. Please see the README for your platform.This will be needed for 13.0 Gotham.
Signed-off-by Bernd Kuhls <[email protected]>Signed-off-by "Yann E. MORIN" <[email protected]>
Regards,
Yann E. MORIN.
Quoted 25 lines
--- package/xbmc/xbmc.mk | 3 +++ 1 file changed, 3 insertions(+)package/xbmc/xbmc.mk +3
-0@@ -18,6 +18,9 @@ XBMC_DEPENDENCIES += boost bzip2 expat flac fontconfig freetype jasper jpeg \ libogg libplist libpng libsamplerate libungif libvorbis libxml2 lzo ncurses \ openssl pcre python readline sqlite taglib tiff tinyxml yajl zlib +# xbmc at i386 depends on nasm +XBMC_DEPENDENCIES += $(if $(BR2_i386),host-nasm) + XBMC_CONF_ENV = \ PYTHON_VERSION="$(PYTHON_VERSION_MAJOR)" \ PYTHON_LDFLAGS="-lpython$(PYTHON_VERSION_MAJOR) -lpthread -ldl -lutil -lm" \Signature · 6 lines
1.7.10.4 _______________________________________________ buildroot mailing list buildroot at busybox.net http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'
PATCH v12 3/32 xbmc: add host-nasm dependency
Bernd, All,
On 2014-06-07 23:27 +0200, Yann E. MORIN spake thusly:
Quoted 11 lines
On 2014-06-07 14:31 +0200, Bernd Kuhls spake thusly:
Quoted 8 lines
Fixes:
checking for nasm... no
configure: error: Could not find a required program. Please see the README for your platform.This will be needed for 13.0 Gotham.
Signed-off-by Bernd Kuhls <[email protected]>Signed-off-by "Yann E. MORIN" <[email protected]>Tested-by "Yann E. MORIN" <[email protected]>
Eh, no, just reviewed, I did not do any i386 test...
Quoted 1 line
Reviewed-by "Yann E. MORIN" <[email protected]>
Regards,
Yann E. MORIN.
Quoted 38 lines
Quoted 26 lines
--- package/xbmc/xbmc.mk | 3 +++ 1 file changed, 3 insertions(+)package/xbmc/xbmc.mk +3
-0@@ -18,6 +18,9 @@ XBMC_DEPENDENCIES += boost bzip2 expat flac fontconfig freetype jasper jpeg \ libogg libplist libpng libsamplerate libungif libvorbis libxml2 lzo ncurses \ openssl pcre python readline sqlite taglib tiff tinyxml yajl zlib +# xbmc at i386 depends on nasm +XBMC_DEPENDENCIES += $(if $(BR2_i386),host-nasm) + XBMC_CONF_ENV = \ PYTHON_VERSION="$(PYTHON_VERSION_MAJOR)" \ PYTHON_LDFLAGS="-lpython$(PYTHON_VERSION_MAJOR) -lpthread -ldl -lutil -lm" \Signature · 6 lines
1.7.10.4 _______________________________________________ buildroot mailing list buildroot at busybox.net http://lists.busybox.net/mailman/listinfo/buildrootSignature · 10 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' _______________________________________________ buildroot mailing list buildroot at busybox.net http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'
PATCH v12 4/32 xbmc: add host-yasm dependency for MMX/64bit archs
In reply to Bernd KuhlsFixes error during xbmc configure:
yasm not found, use --disable-yasm for a crippled build
If you think configure made a mistake, make sure you are using the latest version from Git. If the latest version fails, report the problem to the ffmpeg-user at ffmpeg.org mailing list or IRC #ffmpeg on irc.freenode.net. Include the log file "config.log" produced by configure as this will help solving the problem.
configure: error: Submodule lib/ffmpeg failed to configure
This will be needed for 13.0 Gotham.
--- package/xbmc/xbmc.mk | 7 +++++++ 1 file changed, 7 insertions(+)
package/xbmc/xbmc.mk +7 -0
@@ -21,6 +21,13 @@ XBMC_DEPENDENCIES += boost bzip2 expat flac fontconfig freetype jasper jpeg \ # xbmc at i386 depends on nasm XBMC_DEPENDENCIES += $(if $(BR2_i386),host-nasm) +# ffmpeg depends on yasm on MMX archs +# xbmc configure passes $(BR2_ARCH) to ffmpeg configure which adds +# yasm as dependency for x86_64, even if BR2_x86_generic=y +ifneq ($(BR2_X86_CPU_HAS_MMX)$(BR2_x86_64),) +XBMC_DEPENDENCIES += host-yasm +endif + XBMC_CONF_ENV = \ PYTHON_VERSION="$(PYTHON_VERSION_MAJOR)" \ PYTHON_LDFLAGS="-lpython$(PYTHON_VERSION_MAJOR) -lpthread -ldl -lutil -lm" \
Signature · 1 line
1.7.10.4
PATCH v12 4/32 xbmc: add host-yasm dependency for MMX/64bit archs
Bernd, All,
On 2014-06-07 14:31 +0200, Bernd Kuhls spake thusly:
Quoted 11 lines
Fixes error during xbmc configure:
yasm not found, use --disable-yasm for a crippled build
If you think configure made a mistake, make sure you are using the latest version from Git. If the latest version fails, report the problem to the ffmpeg-user at ffmpeg.org mailing list or IRC #ffmpeg on irc.freenode.net. Include the log file "config.log" produced by configure as this will help solving the problem.
configure: error: Submodule lib/ffmpeg failed to configure
Quoted 4 lines
This will be needed for 13.0 Gotham.
Signed-off-by Bernd Kuhls <[email protected]>Signed-off-by "Yann E. MORIN" <[email protected]>
Quoted 9 lines
--- package/xbmc/xbmc.mk | 7 +++++++ 1 file changed, 7 insertions(+)package/xbmc/xbmc.mk +0
-0
package/xbmc/xbmc.mk XBMC_DEPENDENCIES += boost bzip2 expat flac fontconfig freetype jasper jpeg \ · line 26
Quoted 6 lines
package/xbmc/xbmc.mk +3
-0@@ -21,6 +21,13 @@ XBMC_DEPENDENCIES += boost bzip2 expat flac fontconfig freetype jasper jpeg \ # xbmc at i386 depends on nasm XBMC_DEPENDENCIES += $(if $(BR2_i386),host-nasm) +# ffmpeg depends on yasm on MMX archs +# xbmc configure passes $(BR2_ARCH) to ffmpeg configure which adds +# yasm as dependency for x86_64, even if BR2_x86_generic=y
Yes, all x86_64 have MMX.
Regards,
Yann E. MORIN.
Quoted 14 lines
package/xbmc/xbmc.mk +4
-0+ifneq ($(BR2_X86_CPU_HAS_MMX)$(BR2_x86_64),) +XBMC_DEPENDENCIES += host-yasm +endif + XBMC_CONF_ENV = \ PYTHON_VERSION="$(PYTHON_VERSION_MAJOR)" \ PYTHON_LDFLAGS="-lpython$(PYTHON_VERSION_MAJOR) -lpthread -ldl -lutil -lm" \Signature · 6 lines
1.7.10.4 _______________________________________________ buildroot mailing list buildroot at busybox.net http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'
PATCH v12 5/32 xbmc: add missing egl-related cflags
In reply to Bernd KuhlsA similar patch is used in package/qt/qt.mk.
Fixes compilation error:
In file included from /home/br/br/output/host/usr/x86_64-buildroot-linux-gnu/sysroot/usr/include/EGL/egl.h:36:0,
from /home/br/br/output/build/xbmc-13.0-Gotham/xbmc/windowing/egl/WinSystemEGL.h:28,
from /home/br/br/output/build/xbmc-13.0-Gotham/xbmc/windowing/WindowingFactory.h:39,
from DVDPlayerVideo.cpp:23:/home/br/br/output/host/usr/x86_64-buildroot-linux-gnu/sysroot/usr/include/EGL/eglplatform.h:118:22: fatal error: X11/Xlib.h: No such file or directory
using this defconfig
BR2_x86_64=y
BR2_x86_corei7=y
BR2_TOOLCHAIN_EXTERNAL=y
BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y
BR2_PACKAGE_XBMC=y
BR2_PACKAGE_MESA3D=y
BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST=y
BR2_PACKAGE_MESA3D_OPENGL_EGL=y
BR2_PACKAGE_MESA3D_OPENGL_ES=y
This will be needed for 13.0 Gotham.
--- package/xbmc/xbmc.mk | 4 ++++ 1 file changed, 4 insertions(+)
package/xbmc/xbmc.mk +4 -0
@@ -70,6 +70,10 @@ ifeq ($(BR2_PACKAGE_DBUS),y) XBMC_DEPENDENCIES += dbus endif +XBMC_CONF_ENV += \ + CFLAGS="$(TARGET_CFLAGS) $(shell $(PKG_CONFIG_HOST_BINARY) --cflags egl)" \ + CXXFLAGS="$(TARGET_CXXFLAGS) $(shell $(PKG_CONFIG_HOST_BINARY) --cflags egl)" + ifeq ($(BR2_PACKAGE_XBMC_LIBUSB),y) XBMC_DEPENDENCIES += libusb-compat XBMC_CONF_OPT += --enable-libusb
Signature · 1 line
1.7.10.4
PATCH v12 6/32 xbmc: hdmi cec supports needs udev for device scanning
In reply to Bernd Kuhlslibcec support in xbmc compiles without udev being linked to libcec, but it is useless because xbmc uses libcec?s udev support for scanning connected CEC devices since:
https://github.com/xbmc/xbmc/commit/59171c7a030f8a9c913abbce931967a6a8ff6897
--- package/xbmc/Config.in | 5 +++-- package/xbmc/xbmc.mk | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-)
package/xbmc/Config.in +3 -2
@@ -98,13 +98,14 @@ comment "libbluray support needs a toolchain w/ dynamic library" config BR2_PACKAGE_XBMC_LIBCEC bool "hdmi cec" depends on !BR2_PREFER_STATIC_LIB # libcec + depends on BR2_PACKAGE_HAS_UDEV select BR2_PACKAGE_LIBCEC help Enable CEC (Consumer Electronics Control) support. Select this if you want XBMC to support HDMI CEC. -comment "hdmi cec support needs a toolchain w/ dynamic library" - depends on BR2_PREFER_STATIC_LIB +comment "hdmi cec support needs udev /dev management and a toolchain w/ dynamic library" + depends on BR2_PREFER_STATIC_LIB || !BR2_PACKAGE_HAS_UDEV config BR2_PACKAGE_XBMC_LIBMICROHTTPD bool "web server"
package/xbmc/xbmc.mk +1 -1
@@ -131,7 +131,7 @@ XBMC_CONF_OPT += --disable-avahi endif ifeq ($(BR2_PACKAGE_XBMC_LIBCEC),y) -XBMC_DEPENDENCIES += libcec +XBMC_DEPENDENCIES += libcec udev XBMC_CONF_OPT += --enable-libcec else XBMC_CONF_OPT += --disable-libcec
Signature · 1 line
1.7.10.4
PATCH v12 6/32 xbmc: hdmi cec supports needs udev for device scanning
Bernd, All,
On 2014-06-07 14:31 +0200, Bernd Kuhls spake thusly:
Quoted 6 lines
libcec support in xbmc compiles without udev being linked to libcec, but it is useless because xbmc uses libcec?s udev support for scanning connected CEC devices since:
https://github.com/xbmc/xbmc/commit/59171c7a030f8a9c913abbce931967a6a8ff6897Signed-off-by Bernd Kuhls <[email protected]>
Regards,
Yann E. MORIN.
Quoted 46 lines
--- package/xbmc/Config.in | 5 +++-- package/xbmc/xbmc.mk | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-)package/xbmc/Config.in +3
-2@@ -98,13 +98,14 @@ comment "libbluray support needs a toolchain w/ dynamic library" config BR2_PACKAGE_XBMC_LIBCEC bool "hdmi cec" depends on !BR2_PREFER_STATIC_LIB # libcec + depends on BR2_PACKAGE_HAS_UDEV select BR2_PACKAGE_LIBCEC help Enable CEC (Consumer Electronics Control) support. Select this if you want XBMC to support HDMI CEC. -comment "hdmi cec support needs a toolchain w/ dynamic library" - depends on BR2_PREFER_STATIC_LIB +comment "hdmi cec support needs udev /dev management and a toolchain w/ dynamic library" + depends on BR2_PREFER_STATIC_LIB || !BR2_PACKAGE_HAS_UDEV config BR2_PACKAGE_XBMC_LIBMICROHTTPD bool "web server"package/xbmc/xbmc.mk +1
-1@@ -131,7 +131,7 @@ XBMC_CONF_OPT += --disable-avahi endif ifeq ($(BR2_PACKAGE_XBMC_LIBCEC),y) -XBMC_DEPENDENCIES += libcec +XBMC_DEPENDENCIES += libcec udev XBMC_CONF_OPT += --enable-libcec else XBMC_CONF_OPT += --disable-libcecSignature · 6 lines
1.7.10.4 _______________________________________________ buildroot mailing list buildroot at busybox.net http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'
PATCH v12 7/32 xbmc: bump version to 13.1
In reply to Bernd Kuhls--- package/xbmc/Config.in | 1 + package/xbmc/xbmc.mk | 8 +++++--- 2 files changed, 6 insertions(+), 3 deletions(-)
package/xbmc/Config.in +1 -0
@@ -35,6 +35,7 @@ menuconfig BR2_PACKAGE_XBMC select BR2_PACKAGE_LIBUNGIF select BR2_PACKAGE_LIBVORBIS select BR2_PACKAGE_LIBXML2 + select BR2_PACKAGE_LIBXSLT select BR2_PACKAGE_LZO select BR2_PACKAGE_NCURSES select BR2_PACKAGE_OPENSSL
package/xbmc/xbmc.mk +5 -3
@@ -4,8 +4,9 @@ # ################################################################################ -XBMC_VERSION = 12.3-Frodo -XBMC_SITE = $(call github,xbmc,xbmc,$(XBMC_VERSION)) +XBMC_VERSION = 13.1-Gotham +XBMC_SOURCE = $(XBMC_VERSION).tar.gz +XBMC_SITE = https://github.com/xbmc/xbmc/archive XBMC_LICENSE = GPLv2 XBMC_LICENSE_FILES = LICENSE.GPL # XBMC needs host-sdl_image (and therefore host-sdl) for a host tools it builds
@@ -15,7 +16,7 @@ XBMC_LICENSE_FILES = LICENSE.GPL XBMC_DEPENDENCIES = host-gawk host-gettext host-gperf host-infozip host-lzo host-sdl_image host-swig XBMC_DEPENDENCIES += boost bzip2 expat flac fontconfig freetype jasper jpeg \ libass libcdio libcurl libegl libfribidi libgcrypt libgles libmad libmodplug libmpeg2 \ - libogg libplist libpng libsamplerate libungif libvorbis libxml2 lzo ncurses \ + libogg libplist libpng libsamplerate libungif libvorbis libxml2 libxslt lzo ncurses \ openssl pcre python readline sqlite taglib tiff tinyxml yajl zlib # xbmc at i386 depends on nasm
@@ -37,6 +38,7 @@ XBMC_CONF_ENV = \ TEXTUREPACKER_NATIVE_ROOT="$(HOST_DIR)/usr" XBMC_CONF_OPT += \ + --with-arch=$(BR2_ARCH) \ --disable-alsa \ --disable-crystalhd \ --disable-debug \
Signature · 1 line
1.7.10.4
PATCH v12 7/32 xbmc: bump version to 13.1
Bernd, All,
On 2014-06-07 14:31 +0200, Bernd Kuhls spake thusly:
Quoted 2 lines
Signed-off-by Bernd Kuhls <[email protected]>Signed-off-by "Yann E. MORIN" <[email protected]>
Regards,
Yann E. MORIN.
Quoted 57 lines
--- package/xbmc/Config.in | 1 + package/xbmc/xbmc.mk | 8 +++++--- 2 files changed, 6 insertions(+), 3 deletions(-)package/xbmc/Config.in +1
-0@@ -35,6 +35,7 @@ menuconfig BR2_PACKAGE_XBMC select BR2_PACKAGE_LIBUNGIF select BR2_PACKAGE_LIBVORBIS select BR2_PACKAGE_LIBXML2 + select BR2_PACKAGE_LIBXSLT select BR2_PACKAGE_LZO select BR2_PACKAGE_NCURSES select BR2_PACKAGE_OPENSSLpackage/xbmc/xbmc.mk +5
-3@@ -4,8 +4,9 @@ # ################################################################################ -XBMC_VERSION = 12.3-Frodo -XBMC_SITE = $(call github,xbmc,xbmc,$(XBMC_VERSION)) +XBMC_VERSION = 13.1-Gotham +XBMC_SOURCE = $(XBMC_VERSION).tar.gz +XBMC_SITE = https://github.com/xbmc/xbmc/archive XBMC_LICENSE = GPLv2 XBMC_LICENSE_FILES = LICENSE.GPL # XBMC needs host-sdl_image (and therefore host-sdl) for a host tools it builds@@ -15,7 +16,7 @@ XBMC_LICENSE_FILES = LICENSE.GPL XBMC_DEPENDENCIES = host-gawk host-gettext host-gperf host-infozip host-lzo host-sdl_image host-swig XBMC_DEPENDENCIES += boost bzip2 expat flac fontconfig freetype jasper jpeg \ libass libcdio libcurl libegl libfribidi libgcrypt libgles libmad libmodplug libmpeg2 \ - libogg libplist libpng libsamplerate libungif libvorbis libxml2 lzo ncurses \ + libogg libplist libpng libsamplerate libungif libvorbis libxml2 libxslt lzo ncurses \ openssl pcre python readline sqlite taglib tiff tinyxml yajl zlib # xbmc at i386 depends on nasm@@ -37,6 +38,7 @@ XBMC_CONF_ENV = \ TEXTUREPACKER_NATIVE_ROOT="$(HOST_DIR)/usr" XBMC_CONF_OPT += \ + --with-arch=$(BR2_ARCH) \ --disable-alsa \ --disable-crystalhd \ --disable-debug \Signature · 6 lines
1.7.10.4 _______________________________________________ buildroot mailing list buildroot at busybox.net http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'
PATCH v12 8/32 xbmc-pvr-addons: bump to a version compatible with XBMC Gotham
In reply to Bernd Kuhls--- package/xbmc-pvr-addons/xbmc-pvr-addons.mk | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
package/xbmc-pvr-addons/xbmc-pvr-addons.mk +4 -3
@@ -4,9 +4,10 @@ # ################################################################################ -# This cset is on the branch 'frodo' -# When XBMC is updated, then this should be updated to the corresponding branch -XBMC_PVR_ADDONS_VERSION = 319351af7f3b546a5a56cdf6492f6ba1aec1cd2f +# This cset in on master. When a Gotham branch is made, we should +# follow it, as incompatible changes in the plugins API can happen +# on the master branch. +XBMC_PVR_ADDONS_VERSION = f38b2ebdc6f96244d5e4bc584315f4a2c24bc787 XBMC_PVR_ADDONS_SITE = $(call github,opdenkamp,xbmc-pvr-addons,$(XBMC_PVR_ADDONS_VERSION)) XBMC_PVR_ADDONS_LICENSE = GPLv3+ XBMC_PVR_ADDONS_LICENSE_FILES = COPYING
Signature · 1 line
1.7.10.4
PATCH v12 8/32 xbmc-pvr-addons: bump to a version compatible with XBMC Gotham
Bernd, All,
On 2014-06-07 14:31 +0200, Bernd Kuhls spake thusly:
Quoted 2 lines
Signed-off-by Bernd Kuhls <[email protected]>Signed-off-by "Yann E. MORIN" <[email protected]>
there's a minor typo in the comment, so fix and feel free to add:
-- Acked-by: "Yann E. MORIN" <[email protected]>
Quoted 9 lines
--- package/xbmc-pvr-addons/xbmc-pvr-addons.mk | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)package/xbmc-pvr-addons/xbmc-pvr-addons.mk +0
-0
package/xbmc-pvr-addons/xbmc-pvr-addons.mk line 7
Quoted 7 lines
package/xbmc-pvr-addons/xbmc-pvr-addons.mk +1
-3@@ -4,9 +4,10 @@ # ################################################################################ -# This cset is on the branch 'frodo' -# When XBMC is updated, then this should be updated to the corresponding branch -XBMC_PVR_ADDONS_VERSION = 319351af7f3b546a5a56cdf6492f6ba1aec1cd2f +# This cset in on master. When a Gotham branch is made, we should
*is on master
Regards,
Yann E. MORIN.
Quoted 13 lines
package/xbmc-pvr-addons/xbmc-pvr-addons.mk +3
-0+# follow it, as incompatible changes in the plugins API can happen +# on the master branch. +XBMC_PVR_ADDONS_VERSION = f38b2ebdc6f96244d5e4bc584315f4a2c24bc787 XBMC_PVR_ADDONS_SITE = $(call github,opdenkamp,xbmc-pvr-addons,$(XBMC_PVR_ADDONS_VERSION)) XBMC_PVR_ADDONS_LICENSE = GPLv3+ XBMC_PVR_ADDONS_LICENSE_FILES = COPYINGSignature · 6 lines
1.7.10.4 _______________________________________________ buildroot mailing list buildroot at busybox.net http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'
PATCH v12 8/32 xbmc-pvr-addons: bump to a version compatible with XBMC Gotham
In reply to Bernd KuhlsBernd, All,
On 2014-06-07 14:31 +0200, Bernd Kuhls spake thusly:
Quoted 11 lines
Signed-off-by Bernd Kuhls <[email protected]>Signed-off-by "Yann E. MORIN" <[email protected]>--- package/xbmc-pvr-addons/xbmc-pvr-addons.mk | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)package/xbmc-pvr-addons/xbmc-pvr-addons.mk +0
-0
package/xbmc-pvr-addons/xbmc-pvr-addons.mk line 10
Quoted 10 lines
package/xbmc-pvr-addons/xbmc-pvr-addons.mk +4
-3@@ -4,9 +4,10 @@ # ################################################################################ -# This cset is on the branch 'frodo' -# When XBMC is updated, then this should be updated to the corresponding branch -XBMC_PVR_ADDONS_VERSION = 319351af7f3b546a5a56cdf6492f6ba1aec1cd2f +# This cset in on master. When a Gotham branch is made, we should +# follow it, as incompatible changes in the plugins API can happen +# on the master branch. +XBMC_PVR_ADDONS_VERSION = f38b2ebdc6f96244d5e4bc584315f4a2c24bc787
Oh, I just updated my local clone, and a new branch for Gotham was made, with a few fixes already.
Regards,
Yann E. MORIN.
Quoted 10 lines
package/xbmc-pvr-addons/xbmc-pvr-addons.mk +0
-0XBMC_PVR_ADDONS_SITE = $(call github,opdenkamp,xbmc-pvr-addons,$(XBMC_PVR_ADDONS_VERSION)) XBMC_PVR_ADDONS_LICENSE = GPLv3+ XBMC_PVR_ADDONS_LICENSE_FILES = COPYINGSignature · 6 lines
1.7.10.4 _______________________________________________ buildroot mailing list buildroot at busybox.net http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'
PATCH v12 9/32 xbmc-addon-xvdr: bump to a version compatible with XBMC Gotham
In reply to Bernd KuhlsRemoved patch applied upstream.
--- .../xbmc-addon-xvdr-0001-foreign-automake.patch | 28 -------------------- package/xbmc-addon-xvdr/xbmc-addon-xvdr.mk | 7 ++--- 2 files changed, 4 insertions(+), 31 deletions(-) delete mode 100644 package/xbmc-addon-xvdr/xbmc-addon-xvdr-0001-foreign-automake.patch
package/xbmc-addon-xvdr/xbmc-addon-xvdr-0001-foreign-automake.patch deleted +0 -28
@@ -1,28 +0,0 @@ -commit 846b0b5a8b559f94dffadf5b2f95ca845b6ba9f1 -Author: Yann E. MORIN <[email protected]> -Date: Wed Mar 26 07:45:58 2014 +0100 - - configure: set the foreign flag - - This is required since we do not bundle the necessary files (NEWS, - INSTALL et al.) Setting it in configure.in is needed to be able - to run autoreconf (in lieu of the weird autogen.sh) - - Signed-off-by: "Yann E. MORIN" <[email protected]> - -Patch accepted upstream in master: - https://github.com/pipelka/xbmc-addon-xvdr/commit/84e5860f488e67a3a3386c779f9a56adeb3dc220 - -diff --git a/configure.in b/configure.in -index 6e692e1..7be0d18 100755 ---- a/configure.in -+++ b/configure.in -@@ -12,7 +12,7 @@ AC_CANONICAL_HOST - AC_CANONICAL_TARGET - - dnl Setup for automake --AM_INIT_AUTOMAKE -+AM_INIT_AUTOMAKE([foreign]) - - dnl Check for tools -
package/xbmc-addon-xvdr/xbmc-addon-xvdr.mk +4 -3
@@ -4,9 +4,10 @@ # ################################################################################ -# This cset is on the branch 'xbmc-frodo' -# When XBMC is updated, then this should be updated to the corresponding branch -XBMC_ADDON_XVDR_VERSION = acd4e145fc3220cf708aaf40d895904732dce2c7 +# This cset in on master. When a Gotham branch is made, we should +# follow it, as incompatible changes in the plugins API can happen +# on the master branch. +XBMC_ADDON_XVDR_VERSION = 82b5093ad33847f97a978cb620c9a87d2dbcf7eb XBMC_ADDON_XVDR_SITE = $(call github,pipelka,xbmc-addon-xvdr,$(XBMC_ADDON_XVDR_VERSION)) XBMC_ADDON_XVDR_LICENSE = GPLv2+ XBMC_ADDON_XVDR_LICENSE_FILES = COPYING
Signature · 1 line
1.7.10.4
PATCH v12 9/32 xbmc-addon-xvdr: bump to a version compatible with XBMC Gotham
Bernd, All,
On 2014-06-07 14:31 +0200, Bernd Kuhls spake thusly:
Quoted 4 lines
Removed patch applied upstream.
Signed-off-by Bernd Kuhls <[email protected]>Signed-off-by "Yann E. MORIN" <[email protected]>
There's a typo in the comment; when fixed, feel free to add my:
-- Reviewed-by: "Yann E. MORIN" <[email protected]>
Quoted 45 lines
--- .../xbmc-addon-xvdr-0001-foreign-automake.patch | 28 -------------------- package/xbmc-addon-xvdr/xbmc-addon-xvdr.mk | 7 ++--- 2 files changed, 4 insertions(+), 31 deletions(-) delete mode 100644 package/xbmc-addon-xvdr/xbmc-addon-xvdr-0001-foreign-automake.patchpackage/xbmc-addon-xvdr/xbmc-addon-xvdr-0001-foreign-automake.patch deleted +0
-28@@ -1,28 +0,0 @@ -commit 846b0b5a8b559f94dffadf5b2f95ca845b6ba9f1 -Author: Yann E. MORIN <[email protected]> -Date: Wed Mar 26 07:45:58 2014 +0100 - - configure: set the foreign flag - - This is required since we do not bundle the necessary files (NEWS, - INSTALL et al.) Setting it in configure.in is needed to be able - to run autoreconf (in lieu of the weird autogen.sh) - - Signed-off-by: "Yann E. MORIN" <[email protected]> - -Patch accepted upstream in master: - https://github.com/pipelka/xbmc-addon-xvdr/commit/84e5860f488e67a3a3386c779f9a56adeb3dc220 - -diff --git a/configure.in b/configure.in -index 6e692e1..7be0d18 100755 ---- a/configure.in -+++ b/configure.in -@@ -12,7 +12,7 @@ AC_CANONICAL_HOST - AC_CANONICAL_TARGET - - dnl Setup for automake --AM_INIT_AUTOMAKE -+AM_INIT_AUTOMAKE([foreign]) - - dnl Check for tools -package/xbmc-addon-xvdr/xbmc-addon-xvdr.mk +0
-0
package/xbmc-addon-xvdr/xbmc-addon-xvdr.mk line 7
Quoted 7 lines
package/xbmc-addon-xvdr/xbmc-addon-xvdr.mk +1
-3@@ -4,9 +4,10 @@ # ################################################################################ -# This cset is on the branch 'xbmc-frodo' -# When XBMC is updated, then this should be updated to the corresponding branch -XBMC_ADDON_XVDR_VERSION = acd4e145fc3220cf708aaf40d895904732dce2c7 +# This cset in on master. When a Gotham branch is made, we should
*is on master
Regards,
Yann E. MORIN.
Quoted 13 lines
package/xbmc-addon-xvdr/xbmc-addon-xvdr.mk +3
-0+# follow it, as incompatible changes in the plugins API can happen +# on the master branch. +XBMC_ADDON_XVDR_VERSION = 82b5093ad33847f97a978cb620c9a87d2dbcf7eb XBMC_ADDON_XVDR_SITE = $(call github,pipelka,xbmc-addon-xvdr,$(XBMC_ADDON_XVDR_VERSION)) XBMC_ADDON_XVDR_LICENSE = GPLv2+ XBMC_ADDON_XVDR_LICENSE_FILES = COPYINGSignature · 6 lines
1.7.10.4 _______________________________________________ buildroot mailing list buildroot at busybox.net http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'
PATCH v12 10/32 mesa3d: Bump version to 10.2.1, fix xa build
In reply to Bernd KuhlsBuilding xa requires at least one non swrast gallium driver, needed since:
http://cgit.freedesktop.org/mesa/mesa/commit/configure.ac?h=10.2&id=e283e966660fdf037be6353dc96b7f63b8aa315a
--- package/mesa3d/mesa3d.mk | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
package/mesa3d/mesa3d.mk +8 -4
@@ -4,7 +4,7 @@ # ################################################################################ -MESA3D_VERSION = 10.0.4 +MESA3D_VERSION = 10.2.1 MESA3D_SOURCE = MesaLib-$(MESA3D_VERSION).tar.bz2 MESA3D_SITE = ftp://ftp.freedesktop.org/pub/mesa/$(MESA3D_VERSION) MESA3D_LICENSE = MIT, SGI, Khronos
@@ -35,9 +35,13 @@ MESA3D_DEPENDENCIES += \ xlib_libXdamage \ xlib_libXfixes \ libxcb -MESA3D_CONF_OPT += \ - --enable-glx \ - --enable-xa +MESA3D_CONF_OPT += --enable-glx +# quote from mesa3d configure "Building xa requires at least one non swrast gallium driver." +ifneq ($(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_NOUVEAU)$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SVGA),) +MESA3D_CONF_OPT += --enable-xa +else +MESA3D_CONF_OPT += --disable-xa +endif else MESA3D_CONF_OPT += \ --disable-glx \
Signature · 1 line
1.7.10.4
PATCH v12 11/32 mesa3d: Depend on xorg meta package instead of xserver_xorg-server
In reply to Bernd Kuhlsmesa3d does not depend on the xorg server as such, only on X libraries.
--- package/mesa3d/Config.in | 22 +++++++++++----------- package/mesa3d/mesa3d.mk | 4 ++-- 2 files changed, 13 insertions(+), 13 deletions(-)
package/mesa3d/Config.in +11 -11
@@ -3,13 +3,13 @@ menuconfig BR2_PACKAGE_MESA3D select BR2_PACKAGE_LIBDRM select BR2_PACKAGE_EXPAT select BR2_PACKAGE_HOST_LIBXML2_PYTHON - select BR2_PACKAGE_XPROTO_DRI2PROTO if BR2_PACKAGE_XSERVER_XORG_SERVER - select BR2_PACKAGE_XPROTO_XF86DRIPROTO if BR2_PACKAGE_XSERVER_XORG_SERVER - select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XSERVER_XORG_SERVER - select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_XSERVER_XORG_SERVER - select BR2_PACKAGE_XLIB_LIBXDAMAGE if BR2_PACKAGE_XSERVER_XORG_SERVER - select BR2_PACKAGE_XLIB_LIBXFIXES if BR2_PACKAGE_XSERVER_XORG_SERVER - select BR2_PACKAGE_LIBXCB if BR2_PACKAGE_XSERVER_XORG_SERVER + select BR2_PACKAGE_XPROTO_DRI2PROTO if BR2_PACKAGE_XORG7 + select BR2_PACKAGE_XPROTO_XF86DRIPROTO if BR2_PACKAGE_XORG7 + select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XORG7 + select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_XORG7 + select BR2_PACKAGE_XLIB_LIBXDAMAGE if BR2_PACKAGE_XORG7 + select BR2_PACKAGE_XLIB_LIBXFIXES if BR2_PACKAGE_XORG7 + select BR2_PACKAGE_LIBXCB if BR2_PACKAGE_XORG7 depends on BR2_INSTALL_LIBSTDCPP depends on BR2_LARGEFILE depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL
@@ -61,10 +61,10 @@ config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST This is a software opengl implementation using the Gallium3D infrastructure. -comment "DRI drivers needs an X.Org server and a toolchain w/ dynamic library" - depends on BR2_PREFER_STATIC_LIB || !BR2_PACKAGE_XSERVER_XORG_SERVER +comment "DRI drivers needs X.Org and a toolchain w/ dynamic library" + depends on BR2_PREFER_STATIC_LIB || !BR2_PACKAGE_XORG7 -if !BR2_PREFER_STATIC_LIB && BR2_PACKAGE_XSERVER_XORG_SERVER +if !BR2_PREFER_STATIC_LIB && BR2_PACKAGE_XORG7 comment "DRI drivers"
@@ -91,7 +91,7 @@ config BR2_PACKAGE_MESA3D_DRI_DRIVER_RADEON help Legacy Radeon driver for R100 series GPUs. -endif # !BR2_PREFER_STATIC_LIB && BR2_PACKAGE_XSERVER_XORG_SERVER +endif # !BR2_PREFER_STATIC_LIB && BR2_PACKAGE_XORG7 if BR2_PACKAGE_MESA3D_DRIVER
package/mesa3d/mesa3d.mk +2 -2
@@ -25,7 +25,7 @@ MESA3D_DEPENDENCIES = \ host-xutil_makedepend \ libdrm -ifeq ($(BR2_PACKAGE_XSERVER_XORG_SERVER),y) +ifeq ($(BR2_PACKAGE_XORG7),y) MESA3D_DEPENDENCIES += \ xproto_xf86driproto \ xproto_dri2proto \
@@ -100,7 +100,7 @@ ifeq ($(BR2_PACKAGE_WAYLAND),y) MESA3D_DEPENDENCIES += wayland MESA3D_EGL_PLATFORMS += wayland endif -ifeq ($(BR2_PACKAGE_XSERVER_XORG_SERVER),y) +ifeq ($(BR2_PACKAGE_XORG7),y) MESA3D_EGL_PLATFORMS += x11 endif MESA3D_CONF_OPT += \
Signature · 1 line
1.7.10.4
PATCH v12 12/32 mesa3d: add dependency xproto_presentproto
In reply to Bernd Kuhls--- package/mesa3d/Config.in | 1 + package/mesa3d/mesa3d.mk | 1 + 2 files changed, 2 insertions(+)
package/mesa3d/Config.in +1 -0
@@ -4,6 +4,7 @@ menuconfig BR2_PACKAGE_MESA3D select BR2_PACKAGE_EXPAT select BR2_PACKAGE_HOST_LIBXML2_PYTHON select BR2_PACKAGE_XPROTO_DRI2PROTO if BR2_PACKAGE_XORG7 + select BR2_PACKAGE_XPROTO_PRESENTPROTO if BR2_PACKAGE_XORG7 select BR2_PACKAGE_XPROTO_XF86DRIPROTO if BR2_PACKAGE_XORG7 select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XORG7 select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_XORG7
package/mesa3d/mesa3d.mk +1 -0
@@ -30,6 +30,7 @@ MESA3D_DEPENDENCIES += \ xproto_xf86driproto \ xproto_dri2proto \ xproto_glproto \ + xproto_presentproto \ xlib_libX11 \ xlib_libXext \ xlib_libXdamage \
Signature · 1 line
1.7.10.4
PATCH v12 13/32 mesa3d: Remove dependency for the libxml2 module of host-python
In reply to Bernd KuhlsRemove the ugly BR2_PACKAGE_HOST_LIBXML2_PYTHON hack as well as mesa3d was the only package needing it, this is not the case anymore since:
--- package/libxml2/Config.in | 3 --- package/libxml2/libxml2-python2.patch | 27 --------------------------- package/libxml2/libxml2.mk | 16 +--------------- package/mesa3d/Config.in | 1 - package/mesa3d/mesa3d.mk | 1 - 5 files changed, 1 insertion(+), 47 deletions(-) delete mode 100644 package/libxml2/libxml2-python2.patch
package/libxml2/Config.in +0 -3
@@ -4,6 +4,3 @@ config BR2_PACKAGE_LIBXML2 XML C Parser http://xmlsoft.org/ - -config BR2_PACKAGE_HOST_LIBXML2_PYTHON - bool
package/libxml2/libxml2-python2.patch deleted +0 -27
@@ -1,27 +0,0 @@ -Prefer python2 binary in case python points to python3 - -Signed-off-by: Bernd Kuhls <[email protected]> - -diff -uNr libxml2-2.9.1.org/configure.in libxml2-2.9.1/configure.in ---- libxml2-2.9.1.org/configure.in 2013-04-19 09:25:20.000000000 +0200 -+++ libxml2-2.9.1/configure.in 2014-04-12 14:16:26.579361068 +0200 -@@ -748,6 +748,11 @@ - PYTHON_TESTS= - pythondir= - if test "$with_python" != "no" ; then -+ if test -x "$with_python/bin/python2" -+ then -+ echo Found python2 in $with_python/bin/python2 -+ PYTHON="$with_python/bin/python2" -+ else - if test -x "$with_python/bin/python" - then - echo Found python in $with_python/bin/python -@@ -773,6 +778,7 @@ - fi - fi - fi -+ fi - if test "$PYTHON" != "" - then - PYTHON_VERSION=`$PYTHON -c "from distutils import sysconfig; print(sysconfig.get_python_version())"`
package/libxml2/libxml2.mk +1 -15
@@ -20,21 +20,7 @@ LIBXML2_CONF_OPT = --with-gnu-ld --without-python --without-debug --without-lzma HOST_LIBXML2_DEPENDENCIES = host-pkgconf -HOST_LIBXML2_CONF_OPT = --without-zlib --without-lzma - -# mesa3d uses functions that are only available with debug -ifeq ($(BR2_PACKAGE_MESA3D),y) -HOST_LIBXML2_CONF_OPT += --with-debug -else -HOST_LIBXML2_CONF_OPT += --without-debug -endif - -ifeq ($(BR2_PACKAGE_HOST_LIBXML2_PYTHON),y) -HOST_LIBXML2_DEPENDENCIES += host-python -HOST_LIBXML2_CONF_OPT += --with-python=$(HOST_DIR)/usr -else -HOST_LIBXML2_CONF_OPT += --without-python -endif +HOST_LIBXML2_CONF_OPT = --without-zlib --without-lzma --without-python ifeq ($(BR2_PACKAGE_ZLIB),y) LIBXML2_DEPENDENCIES += zlib
package/mesa3d/Config.in +0 -1
@@ -2,7 +2,6 @@ menuconfig BR2_PACKAGE_MESA3D bool "Mesa 3D Graphics Library" select BR2_PACKAGE_LIBDRM select BR2_PACKAGE_EXPAT - select BR2_PACKAGE_HOST_LIBXML2_PYTHON select BR2_PACKAGE_XPROTO_DRI2PROTO if BR2_PACKAGE_XORG7 select BR2_PACKAGE_XPROTO_PRESENTPROTO if BR2_PACKAGE_XORG7 select BR2_PACKAGE_XPROTO_XF86DRIPROTO if BR2_PACKAGE_XORG7
package/mesa3d/mesa3d.mk +0 -1
@@ -20,7 +20,6 @@ MESA3D_DEPENDENCIES = \ host-bison \ host-flex \ host-gettext \ - host-libxml2 \ host-python \ host-xutil_makedepend \ libdrm
Signature · 1 line
1.7.10.4
PATCH v12 14/32 mesa3d: Add dri3 support
In reply to Bernd Kuhls--- package/mesa3d/mesa3d.mk | 7 +++++++ 1 file changed, 7 insertions(+)
package/mesa3d/mesa3d.mk +7 -0
@@ -24,6 +24,13 @@ MESA3D_DEPENDENCIES = \ host-xutil_makedepend \ libdrm +ifeq ($(BR2_PACKAGE_XPROTO_DRI3PROTO),y) +MESA3D_DEPENDENCIES += xproto_dri3proto +MESA3D_CONF_OPT += --enable-dri3 +else +MESA3D_CONF_OPT += --disable-dri3 +endif + ifeq ($(BR2_PACKAGE_XORG7),y) MESA3D_DEPENDENCIES += \ xproto_xf86driproto \
Signature · 1 line
1.7.10.4
PATCH v12 15/32 mesa3d: dri2 does not need udev support
In reply to Bernd Kuhlshttp://cgit.freedesktop.org/mesa/mesa/commit/configure.ac?id=b959fd9674938e127a34d42d34b903e3a9ae7ad9
"The loader infrastructure for everything but DRI2 requires that udev be present"
Check for udev only for dri3.
--- .../mesa3d-0002-dri2-does-not-need-udev.patch | 25 ++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 package/mesa3d/mesa3d-0002-dri2-does-not-need-udev.patch
package/mesa3d/mesa3d-0002-dri2-does-not-need-udev.patch new file +25 -0
@@ -0,0 +1,25 @@ +http://cgit.freedesktop.org/mesa/mesa/commit/configure.ac?id=b959fd9674938e127a34d42d34b903e3a9ae7ad9 +"The loader infrastructure for everything but DRI2 requires that udev be present" + +Check for udev only for dri3. + +Patch sent upstream: https://bugs.freedesktop.org/show_bug.cgi?id=75212#c5 + +Signed-off-by: Bernd Kuhls <[email protected]> + +diff -uNr Mesa-10.2.0-rc1.org/configure.ac Mesa-10.2.0-rc1/configure.ac +--- Mesa-10.2.0-rc1.org/configure.ac 2014-05-03 02:17:23.000000000 +0200 ++++ Mesa-10.2.0-rc1/configure.ac 2014-05-07 19:51:54.187921825 +0200 +@@ -998,11 +998,11 @@ + DEFINES="$DEFINES -DHAVE_ALIAS" + if test "x$enable_dri3" = xyes; then + DEFINES="$DEFINES -DHAVE_DRI3" +- fi + + if test "x$have_libudev" != xyes; then + AC_MSG_ERROR([libudev-dev required for building DRI]) + fi ++ fi + + case "$host_cpu" in + powerpc* | sparc*)
Signature · 1 line
1.7.10.4
PATCH v12 15/32 mesa3d: dri2 does not need udev support
Bernd, All,
On 2014-06-07 14:31 +0200, Bernd Kuhls spake thusly:
Quoted 4 lines
http://cgit.freedesktop.org/mesa/mesa/commit/configure.ac?id=b959fd9674938e127a34d42d34b903e3a9ae7ad9
"The loader infrastructure for everything but DRI2 requires that udev be present"Check for udev only for dri3.
The git-tree of mesa3d requires that either libudev or sysfs be present:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=85b6f36ca5238dd3fec7c5fcacb8b7074ce53c8e
So it is now possible to use --enable-sysfs instead of requiring libudev.so.
That's a pity this is not in mesa-10.2.1, and the patch is a bit too large to back-port, IMHO.
Quoted 12 lines
Signed-off-by Bernd Kuhls <[email protected]>--- .../mesa3d-0002-dri2-does-not-need-udev.patch | 25 ++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 package/mesa3d/mesa3d-0002-dri2-does-not-need-udev.patchpackage/mesa3d/mesa3d-0002-dri2-does-not-need-udev.patch new file +0
-0
package/mesa3d/mesa3d-0002-dri2-does-not-need-udev.patch line 6
Quoted 6 lines
package/mesa3d/mesa3d-0002-dri2-does-not-need-udev.patch new file +6
-0@@ -0,0 +1,25 @@ +http://cgit.freedesktop.org/mesa/mesa/commit/configure.ac?id=b959fd9674938e127a34d42d34b903e3a9ae7ad9 +"The loader infrastructure for everything but DRI2 requires that udev be present" + +Check for udev only for dri3. + +Patch sent upstream: https://bugs.freedesktop.org/show_bug.cgi?id=75212#c5
Unfortunately, upstream is not too keen on applying this patch.
So, I think we should revisit your libudev package. I'll go comment there.
Regards,
Yann E. MORIN.
Quoted 25 lines
package/mesa3d/mesa3d-0002-dri2-does-not-need-udev.patch new file +18
-0+Signed-off-by: Bernd Kuhls <[email protected]> + +diff -uNr Mesa-10.2.0-rc1.org/configure.ac Mesa-10.2.0-rc1/configure.ac +--- Mesa-10.2.0-rc1.org/configure.ac 2014-05-03 02:17:23.000000000 +0200 ++++ Mesa-10.2.0-rc1/configure.ac 2014-05-07 19:51:54.187921825 +0200 +@@ -998,11 +998,11 @@ + DEFINES="$DEFINES -DHAVE_ALIAS" + if test "x$enable_dri3" = xyes; then + DEFINES="$DEFINES -DHAVE_DRI3" +- fi + + if test "x$have_libudev" != xyes; then + AC_MSG_ERROR([libudev-dev required for building DRI]) + fi ++ fi + + case "$host_cpu" in + powerpc* | sparc*)Signature · 6 lines
1.7.10.4 _______________________________________________ buildroot mailing list buildroot at busybox.net http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'
PATCH v12 16/32 libva: new package
In reply to Bernd Kuhls--- package/Config.in | 1 + package/libva/Config.in | 18 ++++++++ package/libva/libva-0001-no_test_decode.patch | 17 ++++++++ package/libva/libva.mk | 56 +++++++++++++++++++++++++ 4 files changed, 92 insertions(+) create mode 100644 package/libva/Config.in create mode 100644 package/libva/libva-0001-no_test_decode.patch create mode 100644 package/libva/libva.mk
package/Config.in +1 -0
@@ -601,6 +601,7 @@ source "package/libsvg/Config.in" source "package/libsvg-cairo/Config.in" source "package/libsvgtiny/Config.in" source "package/libungif/Config.in" +source "package/libva/Config.in" source "package/opencv/Config.in" source "package/opengl/Config.in" source "package/pango/Config.in"
package/libva/Config.in new file +18 -0
@@ -0,0 +1,18 @@ +config BR2_PACKAGE_LIBVA + bool "libva" + select BR2_PACKAGE_LIBDRM + select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XORG7 + select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_XORG7 + select BR2_PACKAGE_XLIB_LIBXFIXES if BR2_PACKAGE_XORG7 + depends on BR2_TOOLCHAIN_HAS_THREADS # libdrm/libpthread-stubs + depends on BR2_LARGEFILE # libdrm + help + The main motivation for VA-API (Video Acceleration API) is to enable + hardware accelerated video decode/encode at various entry-points (VLD, + IDCT, Motion Compensation etc.) for the prevailing coding standards + today (MPEG-2, MPEG-4 ASP/H.263, MPEG-4 AVC/H.264, and VC-1/VMW3). + + http://www.freedesktop.org/wiki/Software/vaapi/ + +comment "libva needs a toolchain w/ largefile, threads" + depends on !BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_THREADS
package/libva/libva-0001-no_test_decode.patch new file +17 -0
@@ -0,0 +1,17 @@ +mpeg2vldemo is the only file requiring cxx support. It is not needed for +buildroot, so disable its compilation to avoid depending on cxx. + +Signed-off-by: Bernd Kuhls <[email protected]> + +diff -uNr libva-1.3.0.org/test/Makefile.am libva-1.3.0/test/Makefile.am +--- libva-1.3.0.org/test/Makefile.am 2014-03-24 05:49:46.000000000 +0100 ++++ libva-1.3.0/test/Makefile.am 2014-04-26 18:12:25.644390292 +0200 +@@ -20,7 +20,7 @@ + # TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE + # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +-SUBDIRS = common decode encode vainfo ++SUBDIRS = common encode vainfo + + if USE_X11 + SUBDIRS += basic putsurface
package/libva/libva.mk new file +56 -0
56 lines not on this page · raw message
Signature · 1 line
1.7.10.4
PATCH v12 17/32 libva-intel-driver: new package
In reply to Bernd Kuhls--- package/Config.in | 1 + package/libva-intel-driver/Config.in | 19 ++++++++++++++ package/libva-intel-driver/libva-intel-driver.mk | 29 ++++++++++++++++++++++ 3 files changed, 49 insertions(+) create mode 100644 package/libva-intel-driver/Config.in create mode 100644 package/libva-intel-driver/libva-intel-driver.mk
package/Config.in +1 -0
@@ -602,6 +602,7 @@ source "package/libsvg-cairo/Config.in" source "package/libsvgtiny/Config.in" source "package/libungif/Config.in" source "package/libva/Config.in" +source "package/libva-intel-driver/Config.in" source "package/opencv/Config.in" source "package/opengl/Config.in" source "package/pango/Config.in"
package/libva-intel-driver/Config.in new file +19 -0
@@ -0,0 +1,19 @@ +config BR2_PACKAGE_LIBVA_INTEL_DRIVER + bool "libva-intel-driver" + select BR2_PACKAGE_LIBVA + select BR2_PACKAGE_LIBDRM + select BR2_PACKAGE_LIBDRM_INTEL + select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XORG7 + select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_XORG7 + select BR2_PACKAGE_XLIB_LIBXFIXES if BR2_PACKAGE_XORG7 + depends on BR2_i386 || BR2_x86_64 + depends on BR2_TOOLCHAIN_HAS_THREADS # libdrm/libpthread-stubs + depends on BR2_LARGEFILE # libdrm + help + VA-API back-end driver for Intel graphics chips + + https://01.org/linuxgraphics/community/vaapi + +comment "libva intel driver needs a toolchain w/ largefile, threads" + depends on !BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_i386 || BR2_x86_64
package/libva-intel-driver/libva-intel-driver.mk new file +29 -0
@@ -0,0 +1,29 @@ +################################################################################ +# +# libva-intel-driver +# +################################################################################ + +LIBVA_INTEL_DRIVER_VERSION = 1.3.1 +LIBVA_INTEL_DRIVER_SOURCE = libva-intel-driver-$(LIBVA_INTEL_DRIVER_VERSION).tar.bz2 +LIBVA_INTEL_DRIVER_SITE = http://www.freedesktop.org/software/vaapi/releases/libva-intel-driver +LIBVA_INTEL_DRIVER_LICENSE = MIT +LIBVA_INTEL_DRIVER_LICENSE_FILES = COPYING +LIBVA_INTEL_DRIVER_AUTORECONF = YES +LIBVA_INTEL_DRIVER_DEPENDENCIES = host-pkgconf libdrm libva + +ifeq ($(BR2_PACKAGE_XORG7),y) +LIBVA_INTEL_DRIVER_DEPENDENCIES += xlib_libX11 xlib_libXext xlib_libXfixes +LIBVA_INTEL_DRIVER_CONF_OPT += --enable-x11 +else +LIBVA_INTEL_DRIVER_CONF_OPT += --disable-x11 +endif + +ifeq ($(BR2_PACKAGE_WAYLAND),y) +LIBVA_DEPENDENCIES += wayland +LIBVA_INTEL_DRIVER_CONF_OPT += --enable-wayland +else +LIBVA_INTEL_DRIVER_CONF_OPT += --disable-wayland +endif + +$(eval $(autotools-package))
Signature · 1 line
1.7.10.4
PATCH v12 18/32 ffmpeg: Add libva support
In reply to Bernd Kuhls--- package/ffmpeg/ffmpeg.mk | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
package/ffmpeg/ffmpeg.mk +7 -1
@@ -41,7 +41,6 @@ FFMPEG_CONF_OPT = \ --enable-mdct \ --enable-rdft \ --disable-crystalhd \ - --disable-vaapi \ --disable-vdpau \ --disable-dxva2 \ --enable-runtime-cpudetect \
@@ -209,6 +208,13 @@ FFMPEG_CONF_OPT += \ --enable-encoder=libvorbis endif +ifeq ($(BR2_PACKAGE_LIBVA),y) +FFMPEG_CONF_OPT += --enable-vaapi +FFMPEG_DEPENDENCIES += libva +else +FFMPEG_CONF_OPT += --disable-vaapi +endif + ifeq ($(BR2_X86_CPU_HAS_MMX),y) FFMPEG_CONF_OPT += --enable-yasm FFMPEG_DEPENDENCIES += host-yasm
Signature · 1 line
1.7.10.4
PATCH v12 19/32 libglu: new package
In reply to Bernd Kuhls--- package/Config.in | 1 + package/libglu/Config.in | 10 ++++++++++ package/libglu/libglu.mk | 17 +++++++++++++++++ 3 files changed, 28 insertions(+) create mode 100644 package/libglu/Config.in create mode 100644 package/libglu/libglu.mk
package/Config.in +1 -0
@@ -592,6 +592,7 @@ source "package/libexif/Config.in" source "package/libgail/Config.in" source "package/libgeotiff/Config.in" source "package/libglade/Config.in" +source "package/libglu/Config.in" source "package/libgtk2/Config.in" source "package/libpng/Config.in" source "package/libqrencode/Config.in"
package/libglu/Config.in new file +10 -0
@@ -0,0 +1,10 @@ +config BR2_PACKAGE_LIBGLU + bool "libglu" + depends on BR2_PACKAGE_HAS_LIBGL + help + Mesa OpenGL Utility library + + http://cgit.freedesktop.org/mesa/glu/ + +comment "libglu needs an OpenGL backend" + depends on !BR2_PACKAGE_HAS_LIBGL
package/libglu/libglu.mk new file +17 -0
@@ -0,0 +1,17 @@ +################################################################################ +# +# libglu +# +################################################################################ + +LIBGLU_VERSION = 9.0.0 +LIBGLU_SITE = http://cgit.freedesktop.org/mesa/glu/snapshot +LIBGLU_SOURCE = glu-$(LIBGLU_VERSION).tar.gz +LIBGLU_LICENSE = SGI-B-2.0 +LIBGLU_LICENSE_FILES = include/GL/glu.h +LIBGLU_INSTALL_STAGING = YES +# upstream does not distribute a autoconf?ed configure script +LIBGLU_AUTORECONF = YES +LIBGLU_DEPENDENCIES = libgl + +$(eval $(autotools-package))
Signature · 1 line
1.7.10.4
PATCH v12 20/32 libglew: new package
In reply to Bernd Kuhls--- package/Config.in | 1 + package/libglew/Config.in | 19 +++++++++++++++++++ package/libglew/libglew.mk | 36 ++++++++++++++++++++++++++++++++++++ 3 files changed, 56 insertions(+) create mode 100644 package/libglew/Config.in create mode 100644 package/libglew/libglew.mk
package/Config.in +1 -0
@@ -592,6 +592,7 @@ source "package/libexif/Config.in" source "package/libgail/Config.in" source "package/libgeotiff/Config.in" source "package/libglade/Config.in" +source "package/libglew/Config.in" source "package/libglu/Config.in" source "package/libgtk2/Config.in" source "package/libpng/Config.in"
package/libglew/Config.in new file +19 -0
@@ -0,0 +1,19 @@ +config BR2_PACKAGE_LIBGLEW + bool "libglew" + depends on BR2_PACKAGE_XORG7 + depends on BR2_PACKAGE_HAS_LIBGL + select BR2_PACKAGE_XLIB_LIBX11 + select BR2_PACKAGE_XLIB_LIBXEXT + select BR2_PACKAGE_XLIB_LIBXI + select BR2_PACKAGE_XLIB_LIBXMU + help + The OpenGL Extension Wrangler Library (GLEW) is a cross-platform C/C++ + extension loading library. GLEW provides efficient run-time mechanisms + for determining which OpenGL extensions are supported on the target + platform. OpenGL core and extension functionality is exposed in a + single header file. + + http://glew.sourceforge.net + +comment "libglew depends on X.org and needs an OpenGL backend" + depends on !BR2_PACKAGE_XORG7 || !BR2_PACKAGE_HAS_LIBGL
package/libglew/libglew.mk new file +36 -0
@@ -0,0 +1,36 @@ +################################################################################ +# +# libglew +# +################################################################################ + +LIBGLEW_VERSION = 1.10.0 +LIBGLEW_SOURCE = glew-$(LIBGLEW_VERSION).tgz +LIBGLEW_SITE = http://sourceforge.net/projects/glew/files/glew/$(LIBGLEW_VERSION) +LIBGLEW_LICENSE = MIT +LIBGLEW_LICENSE_FILES = LICENSE.txt +LIBGLEW_INSTALL_STAGING = YES +LIBGLEW_DEPENDENCIES = libgl xlib_libX11 xlib_libXext xlib_libXi xlib_libXmu + +# using $TARGET_CONFIGURE_OPTS breaks compilation +define LIBGLEW_BUILD_CMDS + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \ + GLEW_DEST="/usr" LIBDIR="/usr/lib" \ + AR="$(TARGET_AR)" CC="$(TARGET_CC)" \ + LD="$(TARGET_CC)" STRIP="$(TARGET_STRIP)" \ + POPT="$(TARGET_CFLAGS)" LDFLAGS.EXTRA="$(TARGET_LDFLAGS)" +endef + +define LIBGLEW_INSTALL_STAGING_CMDS + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \ + GLEW_DEST="$(STAGING_DIR)/usr" LIBDIR="$(STAGING_DIR)/usr/lib" \ + $(TARGET_CONFIGURE_OPTS) install +endef + +define LIBGLEW_INSTALL_TARGET_CMDS + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \ + GLEW_DEST="$(TARGET_DIR)/usr" LIBDIR="$(TARGET_DIR)/usr/lib" \ + $(TARGET_CONFIGURE_OPTS) install +endef + +$(eval $(generic-package))
Signature · 1 line
1.7.10.4
PATCH v12 21/32 sdl: Add new dependency libglu for opengl support
In reply to Bernd Kuhls--- package/sdl/sdl.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
package/sdl/sdl.mk +2 -1
@@ -62,7 +62,8 @@ SDL_DEPENDENCIES += alsa-lib endif ifeq ($(BR2_PACKAGE_MESA3D),y) -SDL_DEPENDENCIES += mesa3d +SDL_DEPENDENCIES += libglu mesa3d +SDL_CONF_OPT += --enable-video-opengl endif SDL_CONF_OPT += --enable-pulseaudio=no \
Signature · 1 line
1.7.10.4
PATCH v12 22/32 xdriver_xf86-video-intel: Bump version to 2.99.911
In reply to Bernd Kuhls- add necessary dependencies
- add -D_GNU_SOURCE to avoid getline compilation error
--- package/x11r7/xdriver_xf86-video-intel/Config.in | 5 ++-- .../xdriver_xf86-video-intel.mk | 27 +++++++++++++++----- 2 files changed, 24 insertions(+), 8 deletions(-)
package/x11r7/xdriver_xf86-video-intel/Config.in +3 -2
@@ -3,12 +3,13 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_INTEL depends on (BR2_i386 || BR2_x86_64) depends on BR2_PACKAGE_MESA3D select BR2_PACKAGE_XPROTO_FONTSPROTO - select BR2_PACKAGE_XPROTO_RANDRPROTO - select BR2_PACKAGE_XPROTO_RENDERPROTO select BR2_PACKAGE_XPROTO_XPROTO select BR2_PACKAGE_XLIB_LIBPCIACCESS select BR2_PACKAGE_LIBDRM select BR2_PACKAGE_LIBDRM_INTEL + select BR2_PACKAGE_XLIB_LIBXCOMPOSITE + select BR2_PACKAGE_XLIB_LIBXRANDR + select BR2_PACKAGE_XLIB_LIBXTST help Intel video driver
package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk +21 -6
@@ -4,18 +4,18 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_INTEL_VERSION = 2.99.907 +XDRIVER_XF86_VIDEO_INTEL_VERSION = 2.99.911 XDRIVER_XF86_VIDEO_INTEL_SOURCE = xf86-video-intel-$(XDRIVER_XF86_VIDEO_INTEL_VERSION).tar.bz2 XDRIVER_XF86_VIDEO_INTEL_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_VIDEO_INTEL_LICENSE = MIT XDRIVER_XF86_VIDEO_INTEL_LICENSE_FILES = COPYING -XDRIVER_XF86_VIDEO_INTEL_AUTORECONF = YES + +# this fixes a getline-related compilation in src/sna/kgem.c +XDRIVER_XF86_VIDEO_INTEL_CONF_ENV = \ + CFLAGS="$(TARGET_CFLAGS) -D_GNU_SOURCE" XDRIVER_XF86_VIDEO_INTEL_CONF_OPT = \ - --enable-dri \ - --enable-kms-only \ --disable-xvmc \ - --disable-ums-only \ --enable-sna \ --disable-uxa \ --disable-glamor \
@@ -23,6 +23,21 @@ XDRIVER_XF86_VIDEO_INTEL_CONF_OPT = \ --disable-dga \ --disable-async-swap -XDRIVER_XF86_VIDEO_INTEL_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xproto libdrm xlib_libpciaccess +XDRIVER_XF86_VIDEO_INTEL_DEPENDENCIES = \ + libdrm \ + xlib_libXcomposite \ + xlib_libXrandr \ + xlib_libXtst \ + xlib_libpciaccess \ + xproto_fontsproto \ + xproto_xproto \ + xserver_xorg-server + +ifeq ($(BR2_PACKAGE_MESA3D_DRI_DRIVER_I965),y) +XDRIVER_XF86_VIDEO_INTEL_CONF_OPT += --enable-dri +XDRIVER_XF86_VIDEO_INTEL_DEPENDENCIES += mesa3d xproto_xf86driproto +else +XDRIVER_XF86_VIDEO_INTEL_CONF_OPT += --disable-dri +endif $(eval $(autotools-package))
Signature · 1 line
1.7.10.4
PATCH v12 23/32 xbmc: Allow compilation with uClibc
In reply to Bernd Kuhls- Add dependencies needed by xbmc on BR2_LARGEFILE, BR2_INET_IPV6 & BR2_USE_WCHAR after the removal of BR2_TOOLCHAIN_USES_GLIBC
- Add xbmc-0002-mathutil.patch to fix ARM compilation
--- package/xbmc/Config.in | 15 ++- package/xbmc/xbmc-0002-mathutil.patch | 213 +++++++++++++++++++++++++++++++++ 2 files changed, 222 insertions(+), 6 deletions(-) create mode 100644 package/xbmc/xbmc-0002-mathutil.patch
package/xbmc/Config.in +9 -6
@@ -1,11 +1,10 @@ -comment "xbmc needs an (e)glibc toolchain w/ C++, threads" - depends on !BR2_TOOLCHAIN_USES_GLIBC || !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS +comment "xbmc needs a toolchain w/ C++, IPv6, largefile, threads, wchar" + depends on BR2_arm || BR2_i386 || BR2_x86_64 + depends on !BR2_INET_IPV6 || !BR2_INSTALL_LIBSTDCPP || !BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR comment "xbmc requires an OpenGL ES and EGL backend" + depends on BR2_arm || BR2_i386 || BR2_x86_64 depends on !BR2_PACKAGE_HAS_LIBEGL || !BR2_PACKAGE_HAS_LIBGLES - depends on BR2_TOOLCHAIN_USES_GLIBC - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_HAS_THREADS menuconfig BR2_PACKAGE_XBMC bool "xbmc"
@@ -58,10 +57,14 @@ menuconfig BR2_PACKAGE_XBMC select BR2_PACKAGE_TINYXML select BR2_PACKAGE_YAJL select BR2_PACKAGE_ZLIB - depends on BR2_TOOLCHAIN_USES_GLIBC + depends on BR2_INET_IPV6 depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_LARGEFILE depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_PACKAGE_HAS_LIBEGL && BR2_PACKAGE_HAS_LIBGLES + depends on BR2_USE_MMU # python + depends on BR2_USE_WCHAR + depends on BR2_arm || BR2_i386 || BR2_x86_64 help XBMC is an award-winning free and open source (GPL) software media player and entertainment hub for digital media.
package/xbmc/xbmc-0002-mathutil.patch new file +213 -0
213 lines not on this page · raw message
Signature · 1 line
1.7.10.4
PATCH v12 24/32 xbmc: Add alsa support
In reply to Bernd Kuhls--- package/xbmc/xbmc.mk | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
package/xbmc/xbmc.mk +7 -1
@@ -39,7 +39,6 @@ XBMC_CONF_ENV = \ XBMC_CONF_OPT += \ --with-arch=$(BR2_ARCH) \ - --disable-alsa \ --disable-crystalhd \ --disable-debug \ --disable-dvdcss \
@@ -72,6 +71,13 @@ ifeq ($(BR2_PACKAGE_DBUS),y) XBMC_DEPENDENCIES += dbus endif +ifeq ($(BR2_PACKAGE_ALSA_LIB),y) +XBMC_DEPENDENCIES += alsa-lib +XBMC_CONF_OPT += --enable-alsa +else +XBMC_CONF_OPT += --disable-alsa +endif + XBMC_CONF_ENV += \ CFLAGS="$(TARGET_CFLAGS) $(shell $(PKG_CONFIG_HOST_BINARY) --cflags egl)" \ CXXFLAGS="$(TARGET_CXXFLAGS) $(shell $(PKG_CONFIG_HOST_BINARY) --cflags egl)"
Signature · 1 line
1.7.10.4
PATCH v12 25/32 xbmc: Add lame support
In reply to Bernd Kuhls--- package/xbmc/xbmc.mk | 7 +++++++ 1 file changed, 7 insertions(+)
package/xbmc/xbmc.mk +7 -0
@@ -78,6 +78,13 @@ else XBMC_CONF_OPT += --disable-alsa endif +ifeq ($(BR2_PACKAGE_LAME),y) +XBMC_DEPENDENCIES += lame +XBMC_CONF_OPT += --enable-libmp3lame +else +XBMC_CONF_OPT += --disable-libmp3lame +endif + XBMC_CONF_ENV += \ CFLAGS="$(TARGET_CFLAGS) $(shell $(PKG_CONFIG_HOST_BINARY) --cflags egl)" \ CXXFLAGS="$(TARGET_CXXFLAGS) $(shell $(PKG_CONFIG_HOST_BINARY) --cflags egl)"
Signature · 1 line
1.7.10.4
PATCH v12 26/32 xbmc: Fix TexturePacker compile
In reply to Bernd KuhlsPatch description:
use_texturepacker_native=yes
is needed because we obviously need a native-compiled binary, but the xbmc build system does enable this variable only for darwin, android and raspberry-pi targets.
USE_TEXTUREPACKER_NATIVE_ROOT="$(HOST_DIR)/usr"
is also needed because USE_TEXTUREPACKER_NATIVE_ROOT="$TEXTUREPACKER_NATIVE_ROOT"
is only executed for raspberry-pi by xbmc/configure and only USE_TEXTUREPACKER_NATIVE_ROOT is used by tools/TexturePacker/Makefile.in.
To sum up, building for raspberry-pi and other archs works out-of-the-box, compiling for an Intel target, for example, fails:
In file included from SDL_anigif.cpp:23:0:
SDL_anigif.h:24:21: fatal error: SDL/SDL.h: No such file or directory compilation terminated.
XBMCTex.cpp:34:21: fatal error: SDL/SDL.h: No such file or directory
--- package/xbmc/xbmc.mk | 2 ++ 1 file changed, 2 insertions(+)
package/xbmc/xbmc.mk +2 -0
@@ -35,6 +35,8 @@ XBMC_CONF_ENV = \ PYTHON_CPPFLAGS="-I$(STAGING_DIR)/usr/include/python$(PYTHON_VERSION_MAJOR)" \ PYTHON_SITE_PKG="$(STAGING_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages" \ PYTHON_NOVERSIONCHECK="no-check" \ + use_texturepacker_native=yes \ + USE_TEXTUREPACKER_NATIVE_ROOT="$(HOST_DIR)/usr" \ TEXTUREPACKER_NATIVE_ROOT="$(HOST_DIR)/usr" XBMC_CONF_OPT += \
Signature · 1 line
1.7.10.4
PATCH v12 27/32 xbmc: Add X.org/OpenGL support
In reply to Bernd Kuhls- on ARM xbmc only supports EGL/GLES
https://github.com/xbmc/xbmc/blob/Gotham/configure.in#L695
- rsxs depends on OpenGL
https://github.com/xbmc/xbmc/blob/Gotham/configure.in#L1469
so include a compile fix, courtesy of
https://github.com/OpenELEC/OpenELEC.tv/blob/master/packages/mediacenter/xbmc/package.mk#L109
--- package/xbmc/Config.in | 31 ++++++++++++++++++++++++++++--- package/xbmc/xbmc.mk | 32 ++++++++++++++++++++++++++------ 2 files changed, 54 insertions(+), 9 deletions(-)
package/xbmc/Config.in +28 -3
@@ -2,9 +2,26 @@ comment "xbmc needs a toolchain w/ C++, IPv6, largefile, threads, wchar" depends on BR2_arm || BR2_i386 || BR2_x86_64 depends on !BR2_INET_IPV6 || !BR2_INSTALL_LIBSTDCPP || !BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR +config BR2_PACKAGE_XBMC_EGL_GLES + bool + default y + depends on BR2_PACKAGE_HAS_LIBEGL + depends on BR2_PACKAGE_HAS_LIBGLES + depends on !BR2_PACKAGE_XBMC_GL # prefer GL if available + +config BR2_PACKAGE_XBMC_GL + bool + default y + depends on BR2_PACKAGE_HAS_LIBGL + depends on !BR2_arm # xbmc needs egl/gles on arm + +comment "xbmc needs an OpenGL or an openGL ES and EGL backend" + depends on BR2_i386 || BR2_x86_64 + depends on !BR2_PACKAGE_XBMC_GL && !BR2_PACKAGE_XBMC_EGL_GLES + comment "xbmc requires an OpenGL ES and EGL backend" - depends on BR2_arm || BR2_i386 || BR2_x86_64 - depends on !BR2_PACKAGE_HAS_LIBEGL || !BR2_PACKAGE_HAS_LIBGLES + depends on BR2_arm + depends on !BR2_PACKAGE_XBMC_EGL_GLES menuconfig BR2_PACKAGE_XBMC bool "xbmc"
@@ -22,6 +39,8 @@ menuconfig BR2_PACKAGE_XBMC select BR2_PACKAGE_LIBCDIO select BR2_PACKAGE_LIBCURL select BR2_PACKAGE_LIBFRIBIDI + select BR2_PACKAGE_LIBGLEW if BR2_PACKAGE_XBMC_GL + select BR2_PACKAGE_LIBGLU if BR2_PACKAGE_XBMC_GL select BR2_PACKAGE_LIBGCRYPT select BR2_PACKAGE_LIBID3TAG select BR2_PACKAGE_LIBMAD
@@ -51,17 +70,23 @@ menuconfig BR2_PACKAGE_XBMC select BR2_PACKAGE_PYTHON_UNICODEDATA select BR2_PACKAGE_PYTHON_ZLIB select BR2_PACKAGE_READLINE + select BR2_PACKAGE_SDL if BR2_PACKAGE_XBMC_GL + select BR2_PACKAGE_SDL_X11 if BR2_PACKAGE_XBMC_GL + select BR2_PACKAGE_SDL_IMAGE if BR2_PACKAGE_XBMC_GL select BR2_PACKAGE_SQLITE select BR2_PACKAGE_TAGLIB select BR2_PACKAGE_TIFF select BR2_PACKAGE_TINYXML + select BR2_PACKAGE_XLIB_XMU if BR2_PACKAGE_XBMC_GL # needed by rsxs screensaver + select BR2_PACKAGE_XLIB_XRANDR if BR2_PACKAGE_XBMC_GL + select BR2_PACKAGE_XLIB_XT if BR2_PACKAGE_XBMC_GL # needed by rsxs screensaver select BR2_PACKAGE_YAJL select BR2_PACKAGE_ZLIB depends on BR2_INET_IPV6 depends on BR2_INSTALL_LIBSTDCPP depends on BR2_LARGEFILE depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_PACKAGE_HAS_LIBEGL && BR2_PACKAGE_HAS_LIBGLES + depends on BR2_PACKAGE_XBMC_EGL_GLES || BR2_PACKAGE_XBMC_GL depends on BR2_USE_MMU # python depends on BR2_USE_WCHAR depends on BR2_arm || BR2_i386 || BR2_x86_64
package/xbmc/xbmc.mk +26 -6
@@ -15,7 +15,7 @@ XBMC_LICENSE_FILES = LICENSE.GPL # http://wiki.xbmc.org/index.php?title=TexturePacker XBMC_DEPENDENCIES = host-gawk host-gettext host-gperf host-infozip host-lzo host-sdl_image host-swig XBMC_DEPENDENCIES += boost bzip2 expat flac fontconfig freetype jasper jpeg \ - libass libcdio libcurl libegl libfribidi libgcrypt libgles libmad libmodplug libmpeg2 \ + libass libcdio libcurl libfribidi libgcrypt libmad libmodplug libmpeg2 \ libogg libplist libpng libsamplerate libungif libvorbis libxml2 libxslt lzo ncurses \ openssl pcre python readline sqlite taglib tiff tinyxml yajl zlib
@@ -44,7 +44,6 @@ XBMC_CONF_OPT += \ --disable-crystalhd \ --disable-debug \ --disable-dvdcss \ - --disable-gl \ --disable-hal \ --disable-joystick \ --disable-mysql \
@@ -52,14 +51,10 @@ XBMC_CONF_OPT += \ --disable-optical-drive \ --disable-projectm \ --disable-pulse \ - --disable-sdl \ --disable-ssh \ --disable-vaapi \ --disable-vdpau \ --disable-vtbdecoder \ - --disable-x11 \ - --disable-xrandr \ - --enable-gles \ --enable-optimizations ifeq ($(BR2_PACKAGE_RPI_USERLAND),y)
@@ -87,9 +82,34 @@ else XBMC_CONF_OPT += --disable-libmp3lame endif +# quote from xbmc/configure.in: "GLES overwrites GL if both set to yes." +# we choose the opposite because opengl offers more features, like libva support +ifeq ($(BR2_PACKAGE_XBMC_GL),y) +XBMC_DEPENDENCIES += libglew libglu libgl sdl_image xlib_libX11 xlib_libXext \ + xlib_libXmu xlib_libXrandr xlib_libXt +XBMC_CONF_OPT += --enable-gl --enable-sdl --enable-x11 --enable-xrandr--disable-gles +# fix rsxs compile +# make sure target libpng-config is used, options taken from rsxs-0.9/acinclude.m4 +XBMC_CONF_ENV += \ + jm_cv_func_gettimeofday_clobber=no \ + mac_cv_pkg_png=$(STAGING_DIR)/usr/bin/libpng-config \ + mac_cv_pkg_cppflags="`$(STAGING_DIR)/usr/bin/libpng-config --I_opts --cppflags`" \ + mac_cv_pkg_cxxflags="`$(STAGING_DIR)/usr/bin/libpng-config --ccopts`" \ + mac_cv_pkg_ldflags="`$(STAGING_DIR)/usr/bin/libpng-config --L_opts --R_opts`" \ + mac_cv_pkg_libs="`$(STAGING_DIR)/usr/bin/libpng-config --libs`" +XBMC_CONF_OPT += --enable-rsxs +else +XBMC_CONF_OPT += --disable-gl --disable-rsxs --disable-sdl --disable-x11 --disable-xrandr +ifeq ($(BR2_PACKAGE_XBMC_EGL_GLES),y) +XBMC_DEPENDENCIES += libegl libgles +XBMC_CONF_OPT += --enable-gles XBMC_CONF_ENV += \ CFLAGS="$(TARGET_CFLAGS) $(shell $(PKG_CONFIG_HOST_BINARY) --cflags egl)" \ CXXFLAGS="$(TARGET_CXXFLAGS) $(shell $(PKG_CONFIG_HOST_BINARY) --cflags egl)" +else +XBMC_CONF_OPT += --disable-gles +endif +endif ifeq ($(BR2_PACKAGE_XBMC_LIBUSB),y) XBMC_DEPENDENCIES += libusb-compat
Signature · 1 line
1.7.10.4
PATCH v12 28/32 xbmc: Add option for Goom screensaver
In reply to Bernd Kuhls--- package/xbmc/Config.in | 9 +++++++++ package/xbmc/xbmc.mk | 6 ++++++ 2 files changed, 15 insertions(+)
package/xbmc/Config.in +9 -0
@@ -194,6 +194,15 @@ config BR2_PACKAGE_XBMC_WAVPACK Enable WAV input support. Select this if you want to play back WV files. +config BR2_PACKAGE_XBMC_GOOM + bool "goom screensaver" + depends on BR2_PACKAGE_XBMC_GL + help + Enable goom screensaver + +comment "goom needs an OpenGL backend" + depends on !BR2_PACKAGE_XBMC_GL + comment "XBMC addons" source "package/xbmc-addon-xvdr/Config.in"
package/xbmc/xbmc.mk +6 -0
@@ -182,6 +182,12 @@ ifeq ($(BR2_PACKAGE_XBMC_LIBTHEORA),y) XBMC_DEPENDENCIES += libtheora endif +ifeq ($(BR2_PACKAGE_XBMC_GOOM),y) +XBMC_CONF_OPT += --enable-goom +else +XBMC_CONF_OPT += --disable-goom +endif + # Add HOST_DIR to PATH for codegenerator.mk to find swig define XBMC_BOOTSTRAP cd $(@D) && PATH=$(BR_PATH) ./bootstrap
Signature · 1 line
1.7.10.4
PATCH v12 29/32 xbmc: Add VA-API support
In reply to Bernd Kuhls--- package/xbmc/xbmc.mk | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
package/xbmc/xbmc.mk +8 -1
@@ -52,7 +52,6 @@ XBMC_CONF_OPT += \ --disable-projectm \ --disable-pulse \ --disable-ssh \ - --disable-vaapi \ --disable-vdpau \ --disable-vtbdecoder \ --enable-optimizations
@@ -111,6 +110,14 @@ XBMC_CONF_OPT += --disable-gles endif endif +# xbmc needs libva & libva-glx +ifeq ($(BR2_PACKAGE_LIBVA)$(BR2_PACKAGE_MESA3D_DRI_DRIVER),yy) +XBMC_DEPENDENCIES += mesa3d libva +XBMC_CONF_OPT += --enable-vaapi +else +XBMC_CONF_OPT += --disable-vaapi +endif + ifeq ($(BR2_PACKAGE_XBMC_LIBUSB),y) XBMC_DEPENDENCIES += libusb-compat XBMC_CONF_OPT += --enable-libusb
Signature · 1 line
1.7.10.4
PATCH v12 30/32 xbmc: fix missing libraries from rpi-userland
In reply to Bernd KuhlsFrom: Samuel Martin <[email protected]>
When rpi-userland libraries are built as shared-objects, not all needed libraries are passed in the LD_FLAGS, leading to failure at linkage.
To avoid this issue, set the LIBS variable content in accordance with the INCLUDES variable value.
The commit 5e3b1f31b3f82e3b163567f10d7131c9d649a2cf currently works around this issue by forcing rpi-userland to be statically linked, whereas it is actually a LIBS flags problem in xbmc package.
A follow-up patch fixes rpi-userland package.
--- package/xbmc/xbmc.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
package/xbmc/xbmc.mk +2 -1
@@ -60,7 +60,8 @@ ifeq ($(BR2_PACKAGE_RPI_USERLAND),y) XBMC_DEPENDENCIES += rpi-userland XBMC_CONF_OPT += --with-platform=raspberry-pi --enable-player=omxplayer XBMC_CONF_ENV += INCLUDES="-I$(STAGING_DIR)/usr/include/interface/vcos/pthreads \ - -I$(STAGING_DIR)/usr/include/interface/vmcs_host/linux" + -I$(STAGING_DIR)/usr/include/interface/vmcs_host/linux" \ + LIBS="-lvcos -lvchostif" endif ifeq ($(BR2_PACKAGE_DBUS),y)
Signature · 1 line
1.7.10.4
PATCH v12 31/32 rpi-userland: cleanup *_CONF_OPT
In reply to Bernd KuhlsFrom: Samuel Martin <[email protected]>
This change reverts the commit 5e3b1f31b3f82e3b163567f10d7131c9d649a2cf because rpi-userland is correctly built whatever the value of the BUILD_SHARED_LIBS CMake flags.
The cset 5e3b1f31b3f82e3b163567f10d7131c9d649a2cf originally intends to fix linkage/runtime failure in xbmc package because of missing flags in xbmc LIBS env. var. This has been fixed in the previous patch.
So, for rpi-userland package, BUILD_SHARED_LIBS does no longer need to be forced to OFF, and can safely be driven by the CMake infrastructure.
--- package/rpi-userland/rpi-userland.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
package/rpi-userland/rpi-userland.mk +1 -1
@@ -9,7 +9,7 @@ RPI_USERLAND_SITE = $(call github,raspberrypi,userland,$(RPI_USERLAND_VERSION)) RPI_USERLAND_LICENSE = BSD-3c RPI_USERLAND_LICENSE_FILES = LICENCE RPI_USERLAND_INSTALL_STAGING = YES -RPI_USERLAND_CONF_OPT = -DVMCS_INSTALL_PREFIX=/usr -DBUILD_SHARED_LIBS=OFF +RPI_USERLAND_CONF_OPT = -DVMCS_INSTALL_PREFIX=/usr RPI_USERLAND_PROVIDES = libegl libgles libopenmax libopenvg
Signature · 1 line
1.7.10.4
PATCH v12 32/32 package/libcec: fix missing libraries from rpi-userland
In reply to Bernd KuhlsFrom: "Yann E. MORIN" <[email protected]>
When rpi-userland libraries are built as shared-objects, not all needed libraries are passed in the LD_FLAGS, leading to failure at linkage.
To avoid this issue, set the LIBS variable content in accordance with INCLUDES variable value.
This is needed because libcec does not use pkg-config to look for the ldflags needed for -lbcm_host, even though bcm_host provides a .pc file (even a correct one!)
--- package/libcec/libcec.mk | 1 + 1 file changed, 1 insertion(+)
package/libcec/libcec.mk +1 -0
@@ -26,6 +26,7 @@ ifeq ($(BR2_PACKAGE_RPI_USERLAND),y) LIBCEC_CONF_OPT = --enable-rpi \ --with-rpi-include-path=$(STAGING_DIR)/usr/include LIBCEC_DEPENDENCIES += rpi-userland +LIBCEC_CONF_ENV += LIBS="-lvcos -lvchostif" else LIBCEC_CONF_OPT = --disable-rpi endif
Signature · 1 line
1.7.10.4
v12 cover xbmc: bump version to 13.1
In reply to Bernd KuhlsBernd, All,
On 2014-06-07 14:31 +0200, Bernd Kuhls spake thusly:
Quoted 1 line
the patch series combines my latest patches to bump xbmc.
[--SNIP--]
Quoted 30 lines
Bernd Kuhls (28):
xbmc: add host-gettext dependency
xbmc: add host-nasm dependency
xbmc: add host-yasm dependency for MMX/64bit archs
xbmc: add missing egl-related cflags
xbmc: hdmi cec supports needs udev for device scanning
xbmc: bump version to 13.1
xbmc-pvr-addons: bump to a version compatible with XBMC Gotham
xbmc-addon-xvdr: bump to a version compatible with XBMC Gotham
mesa3d: Bump version to 10.2.1, fix xa build
mesa3d: Depend on xorg meta package instead of xserver_xorg-server
mesa3d: add dependencyxproto_presentproto
mesa3d: Remove dependency for the libxml2 module of host-python
mesa3d: Add dri3 support
mesa3d: dri2 does not need udev support
libva: new package
libva-intel-driver: new package
ffmpeg: Add libva support
libglu: new package
libglew: new package
sdl: Add new dependency libglu for opengl support
xdriver_xf86-video-intel: Bump version to 2.99.911
xbmc: Allow compilation with uClibc
xbmc: Add alsa support
xbmc: Add lame support
xbmc: Fix TexturePacker compile
xbmc: Add X.org/OpenGL support
xbmc: Add option for Goom screensaver
xbmc: Add VA-API support
Quoted 7 lines
Samuel Martin (2):
xbmc: fix missing libraries from rpi-userland
rpi-userland: cleanup*_CONF_OPTYann E. MORIN (2):
toolchain: add option to copy the gconv libraries package/libcec: fix missing libraries from rpi-userland
The last three patches in the series should not be part of the series, and should be applied first; besides there's a mising one. They are part of another series by Samuel:
http://lists.busybox.net/pipermail/buildroot/2014-June/098496.html http://patchwork.ozlabs.org/patch/356127/ http://patchwork.ozlabs.org/patch/356128/ http://patchwork.ozlabs.org/patch/356129/ http://patchwork.ozlabs.org/patch/356130/
Regards,
Yann E. MORIN.
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'
v12 cover xbmc: bump version to 13.1
In reply to Bernd KuhlsDear Bernd Kuhls,
I've applied:
a0d0abc16024153f0e1e18166e71a58b4eae08cb xbmc-addon-xvdr: bump to a version compatible with XBMC Gotham f40f440563a6887e018303ff2142e31cac331b91 xbmc-pvr-addons: bump to a version compatible with XBMC Gotham 5c71e4fe1dd3925fa8dbc343fcd67fb97a0f214f xbmc: bump version to 13.1 bd10d26439a2304e4e94bf28df70c01f362e5d0b mesa3d: Bump version to 10.2.1, fix xa build acf15e042f02d2da71a7a7da4801df51eb50cf35 xbmc: hdmi cec supports needs udev for device scanning 5bfdf2aa50e800f45d19f88044c701b74dc1a2ad xbmc: add host-yasm dependency for MMX/64bit archs a1116a3250fdfbd55295ad0f820f6d0c59baccde xbmc: add host-nasm dependency e0bb1a68d49ce816da4816e3160ffe75cb520412 xbmc: add host-gettext dependency
from this series. I'll continue to go through the series today and tomorrow.
Thanks,
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com
v12 cover xbmc: bump version to 13.1
In reply to Bernd KuhlsDear Bernd Kuhls,
Quoted 3 lines · Bernd Kuhls
xbmc: fix missing libraries from rpi-userland
rpi-userland: cleanup*_CONF_OPTpackage/libcec: fix missing libraries from rpi-userland
These patches can be dropped from your series, I've applied them from Samuel's series.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com