Add xorg support and upgrade for mp3 issue.
PATCH 1/1 Add xorg support and upgrade for mp3 issue.
--- .../multimedia/gst-plugins-bad/gst-plugins-bad.mk | 2 +- .../gst-plugins-base/gst-plugins-base.mk | 19 ++++++++-- .../gst-plugins-good/gst-plugins-good.mk | 18 ++++++++-- .../gst-plugins-ugly/gst-plugins-ugly.mk | 2 +- ....10.25-fix-unaligned-detectiob-for-x86-64.patch | 36 -------------------- package/multimedia/gstreamer/gstreamer.mk | 2 +- 6 files changed, 32 insertions(+), 47 deletions(-) delete mode 100644 package/multimedia/gstreamer/gstreamer-0.10.25-fix-unaligned-detectiob-for-x86-64.patch
package/multimedia/gst-plugins-bad/gst-plugins-bad.mk +1 -1
@@ -3,7 +3,7 @@ # gst-plugins-bad # ############################################################# -GST_PLUGINS_BAD_VERSION = 0.10.14 +GST_PLUGINS_BAD_VERSION = 0.10.19 GST_PLUGINS_BAD_SOURCE = gst-plugins-bad-$(GST_PLUGINS_BAD_VERSION).tar.bz2 GST_PLUGINS_BAD_SITE = http://gstreamer.freedesktop.org/src/gst-plugins-bad GST_PLUGINS_BAD_LIBTOOL_PATCH = NO
package/multimedia/gst-plugins-base/gst-plugins-base.mk +15 -4
@@ -3,7 +3,7 @@ # gst-plugins-base # ############################################################# -GST_PLUGINS_BASE_VERSION = 0.10.25 +GST_PLUGINS_BASE_VERSION = 0.10.30 GST_PLUGINS_BASE_SOURCE = gst-plugins-base-$(GST_PLUGINS_BASE_VERSION).tar.bz2 GST_PLUGINS_BASE_SITE = http://gstreamer.freedesktop.org/src/gst-plugins-base GST_PLUGINS_BASE_INSTALL_STAGING = YES
@@ -18,16 +18,27 @@ GST_PLUGINS_BASE_CONF_ENV = GST_PLUGINS_BASE_CONF_OPT = \ --disable-examples \ - --disable-x \ - --disable-xvideo \ - --disable-xshm \ --disable-oggtest \ --disable-vorbistest \ --disable-freetypetest + + + GST_PLUGINS_BASE_DEPENDENCIES = gstreamer liboil \ $(if $(BR2_PACKAGE_ALSA_LIB),alsa-lib) +ifeq ($(BR2_PACKAGE_XORG7),y) +GST_PLUGINS_BASE_DEPENDENCIES += xserver_xorg-server +GST_PLUGINS_BASE_CONF_OPT += --enable-x \ + --enable-xvideo \ + --enable-xshm +else +GST_PLUGINS_BASE_CONF_OPT += --disable-x \ + --disable-xvideo \ + --disable-xshm +endif + ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_ADDER),y) GST_PLUGINS_BASE_CONF_OPT += --enable-adder else
package/multimedia/gst-plugins-good/gst-plugins-good.mk +14 -4
@@ -3,7 +3,7 @@ # gst-plugins-good # ############################################################# -GST_PLUGINS_GOOD_VERSION = 0.10.16 +GST_PLUGINS_GOOD_VERSION = 0.10.24 GST_PLUGINS_GOOD_SOURCE = gst-plugins-good-$(GST_PLUGINS_GOOD_VERSION).tar.bz2 GST_PLUGINS_GOOD_SITE = http://gstreamer.freedesktop.org/src/gst-plugins-good GST_PLUGINS_GOOD_LIBTOOL_PATCH = NO
@@ -16,9 +16,6 @@ GST_PLUGINS_GOOD_CONF_OPT = \ --disable-osx_audio \ --disable-osx_video \ --disable-gst_v4l2 \ - --disable-x \ - --disable-xshm \ - --disable-xvideo \ --disable-aalib \ --disable-aalibtest \ --disable-esd \
@@ -28,6 +25,19 @@ GST_PLUGINS_GOOD_CONF_OPT = \ GST_PLUGINS_GOOD_DEPENDENCIES = gstreamer gst-plugins-base +ifeq ($(BR2_PACKAGE_XORG7),y) +GST_PLUGINS_BASE_DEPENDENCIES += xserver_xorg-server +GST_PLUGINS_BASE_CONF_OPT += --enable-x \ + --enable-x \ + --enable-xvideo \ + --enable-xshm +else +GST_PLUGINS_BASE_CONF_OPT += --disable-x \ + --disable-x \ + --disable-xvideo \ + --disable-xshm +endif + ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_JPEG),y) GST_PLUGINS_GOOD_CONF_OPT += --enable-jpeg GST_PLUGINS_GOOD_DEPENDENCIES += jpeg
package/multimedia/gst-plugins-ugly/gst-plugins-ugly.mk +1 -1
@@ -3,7 +3,7 @@ # gst-plugins-ugly # ############################################################# -GST_PLUGINS_UGLY_VERSION = 0.10.10 +GST_PLUGINS_UGLY_VERSION = 0.10.15 GST_PLUGINS_UGLY_SOURCE = gst-plugins-ugly-$(GST_PLUGINS_UGLY_VERSION).tar.bz2 GST_PLUGINS_UGLY_SITE = http://gstreamer.freedesktop.org/src/gst-plugins-ugly GST_PLUGINS_UGLY_LIBTOOL_PATCH = NO
package/multimedia/gstreamer/gstreamer-0.10.25-fix-unaligned-detectiob-for-x86-64.patch deleted +0 -36
@@ -1,36 +0,0 @@ -[PATCH] gst-arch.m4: fix unaligned detection for x86-64 when cross compiling - -Submitted upstream at https://bugzilla.gnome.org/show_bug.cgi?id=607317 - -Commit 4221e9dc (amd64/x86_64 allows unaligned memory access too) added -x86-64 to the unaligned access whitelist, but missed the trailing -wildcards, so the test never succeeds (host is something like -x86_64-unknown-linux-gnu). - -When building natively, this isn't a big deal as the AC_TRY_RUN test -correctly detects it, but that doesn't work when cross compiling so -the build dies with: - -configure: error: cannot run test program while cross compiling -See `config.log' for more details. - -Fix it by adding the trailing wildcards. - -Signed-off-by: Peter Korsgaard <[email protected]> ---- - configure | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: gstreamer-0.10.25/configure -=================================================================== ---- gstreamer-0.10.25.orig/configure -+++ gstreamer-0.10.25/configure -@@ -15655,7 +15655,7 @@ $as_echo_n "checking if unaligned memory - $as_echo_n "(blacklisted) " >&6 - as_cv_unaligned_access=no - ;; -- i?86*|x86_64|amd64|powerpc*|m68k*|cris*) -+ i?86*|x86_64*|amd64*|powerpc*|m68k*|cris*) - $as_echo_n "(whitelisted) " >&6 - as_cv_unaligned_access=yes - ;;
package/multimedia/gstreamer/gstreamer.mk +1 -1
@@ -3,7 +3,7 @@ # gstreamer # ############################################################# -GSTREAMER_VERSION = 0.10.25 +GSTREAMER_VERSION = 0.10.30 GSTREAMER_SOURCE = gstreamer-$(GSTREAMER_VERSION).tar.bz2 GSTREAMER_SITE = http://gstreamer.freedesktop.org/src/gstreamer GSTREAMER_INSTALL_STAGING = YES
Signature · 1 line
1.7.1
PATCH 1/1 Add xorg support and upgrade for mp3 issue.
Hello Massimiliano,
Thanks for reworking the patch with Git. I have a couple of comments, though. First, does the X.org support needs to be part of the same patch as the version bump ? In other words, shouldn't this be split in several smaller patches (one to bump the versions, one to add X.org support) ?
It would be good to add a little bit more details in the commit log:
what does the X.org support brings, and what mp3 issue is being fixed by the version bump ?
Other comments below.
package/multimedia/gst-plugins-base/gst-plugins-base.mk GST_PLUGINS_BASE_CONF_ENV = · line 27
Quoted 12 lines · On Sat, 21 Aug 2010 17:21:37 +0200 Massimiliano Marretta <[email protected]>…
GST_PLUGINS_BASE_CONF_OPT= \package/multimedia/gst-plugins-base/gst-plugins-base.mk +3
-3--disable-examples \ - --disable-x \ - --disable-xvideo \ - --disable-xshm \ --disable-oggtest \ --disable-vorbistest \ --disable-freetypetest + + +
Useless newlines. Keep only one.
package/multimedia/gst-plugins-base/gst-plugins-base.mk GST_PLUGINS_BASE_CONF_ENV = · line 40
Quoted 10 lines
package/multimedia/gst-plugins-base/gst-plugins-base.mk +10
-0+ifeq ($(BR2_PACKAGE_XORG7),y) +GST_PLUGINS_BASE_DEPENDENCIES += xserver_xorg-server +GST_PLUGINS_BASE_CONF_OPT += --enable-x \ + --enable-xvideo \ + --enable-xshm +else +GST_PLUGINS_BASE_CONF_OPT += --disable-x \ + --disable-xvideo \ + --disable-xshm +endif
This is really a detail, but I'd prefer to have the first --option on a newline, so :
GST_PLUGINS_BASE_CONF_OPT += \ --disable-foobar \ --disable-barfoo
package/multimedia/gst-plugins-good/gst-plugins-good.mk GST_PLUGINS_GOOD_CONF_OPT = \ · line 31
Quoted 4 lines
package/multimedia/gst-plugins-good/gst-plugins-good.mk +4
-0+ifeq ($(BR2_PACKAGE_XORG7),y) +GST_PLUGINS_BASE_DEPENDENCIES += xserver_xorg-server +GST_PLUGINS_BASE_CONF_OPT += --enable-x \ + --enable-x \
Duplicate.
package/multimedia/gst-plugins-good/gst-plugins-good.mk GST_PLUGINS_GOOD_CONF_OPT = \ · line 36
Quoted 5 lines
package/multimedia/gst-plugins-good/gst-plugins-good.mk +5
-0+ --enable-xvideo \ + --enable-xshm +else +GST_PLUGINS_BASE_CONF_OPT += --disable-x \ + --disable-x \
Duplicate again.
package/multimedia/gstreamer/gstreamer-0.10.25-fix-unaligned-detectiob-for-x86-64.patch
Quoted 6 lines
package/multimedia/gst-plugins-base/gst-plugins-base.mk +3
-0+ --disable-xvideo \ + --disable-xshm +endifpackage/multimedia/gstreamer/gstreamer-0.10.25-fix-unaligned-detectiob-for-x86-64.patch deleted +0
-0
Are you sure this patch is no longer needed ?
Thanks!
Thomas
Signature · 4 lines
Thomas Petazzoni, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com
PATCH 1/1 Add xorg support and upgrade for mp3 issue.
Quoted 7 lines · Thomas Petazzoni
Hello Massimiliano,
Thanks for reworking the patch with Git. I have a couple of comments, though. First, does the X.org support needs to be part of the same patch as the version bump ? In other words, shouldn't this be split in several smaller patches (one to bump the versions, one to add X.org support) ?
Also there should be some caution when upgrading gstreamer to the latest version. Starting with gstreamer 0.10.30, gstreamer is making the transition from liboil to liborc. Here's a snippet from the GStreamer Base Plug-ins 0.10.30 release notes:
Use Orc (Optimized Inner Loops Runtime Compiler) for SIMD and other optimisations, and remove liboil dependency. The main goal for this release was to make the transition from liboil to liborc. Performance improvements should not be expected and will be the focus of future versions. liborc is an optional dependency for the time being, to make it possible to test and develop the very latest GStreamer versions on systems that don't have orc yet. However, without orc slow unoptimised backup code will be used for many performance critical code paths. Distributors are urged to package and ship the latest version of liborc and compile GStreamer modules with --enable-orc. Please do not distribute GStreamer packages that are not orc enabled.
So I suggest that gstreamer and the gst plug-ins are only updated to 0.10.29 for the time being. Then liborc should be added to buildroot and as soon as that package has landed, an update to 0.10.30 can be attempted.
Sven
Signature · 5 lines
Sven Neumann Head of Software Development RAUMFELD GmbH | Reichenberger Str. 124 | 10999 Berlin | Germany Tel: +49.30.340.60.98.0 | Fax: +49.30.340.60.98.99 | s.neumann at raumfeld.com