[PATCH 0/1] gst-ffmpeg yasm check fix

[PATCH 0/1] gst-ffmpeg yasm check fix

[tom.zanussi]

From: Tom Zanussi <tom.zanussi@linux.intel.com>

Builds started failing here, tracked it down to commit:

4d309730 ['gst-ffmpeg: configure-fix patch used wrong test']

which essentially just has the effect of never disabling yasm instead
of always disabling it as before.  With this patch it can be conditionally
enabled or disabled as perhaps intended.

The following changes since commit 6d4d42d63db4c3fcffd831ce359599f3ee1d710e:

  qemuimage-tests/sanity/boot: Increase timeout (2013-04-06 17:22:21 +0100)

are available in the git repository at:

  git://git.yoctoproject.org/poky-contrib.git tzanussi/gst-ffmpeg-yasm-check-fix
  http://git.yoctoproject.org/cgit/cgit.cgi/poky-contrib/log/?h=tzanussi/gst-ffmpeg-yasm-check-fix

Tom Zanussi (1):
  gst-ffmpeg: fix --disable-yasm

 .../gstreamer/gst-ffmpeg-0.10.13/configure-fix.patch                | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

-- 
1.7.11.4

[PATCH 1/1] gst-ffmpeg: fix --disable-yasm

[tom.zanussi]

From: Tom Zanussi <tom.zanussi@linux.intel.com>

The gst-ffmpeg build shows the following warning:

configure: WARNING: unrecognized options: --disable-yasm

which means that the following test in configure always fails and
--disable-yasm never gets passed to the embedded ffmpeg build:

'if test "x$disable_yasm" = "xyes"; then'
  embffmpeg_configure_args="$embffmpeg_configure_args --disable-yasm"

commit 4d309730 ['gst-ffmpeg: configure-fix patch used wrong test']
actually fixed the obviously backwards syntax by reversing the test -
prior to that, --disable-yasm would always unconditionally be passed
into the embedded ffmpeg config.

This fixes things so that the variable actually exists and makes the
test meaningful.

Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
---
 .../gstreamer/gst-ffmpeg-0.10.13/configure-fix.patch                | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-multimedia/gstreamer/gst-ffmpeg-0.10.13/configure-fix.patch b/meta/recipes-multimedia/gstreamer/gst-ffmpeg-0.10.13/configure-fix.patch
index 2bb124b..9ef6f7c 100644
--- a/meta/recipes-multimedia/gstreamer/gst-ffmpeg-0.10.13/configure-fix.patch
+++ b/meta/recipes-multimedia/gstreamer/gst-ffmpeg-0.10.13/configure-fix.patch
@@ -7,11 +7,13 @@ Signed-off-by: Shane Wang <shane.wang@intel.com>
 diff -r f2f8f74c6e30 configure.ac
 --- a/configure.ac	Thu Dec 22 23:56:09 2011 +0800
 +++ b/configure.ac	Thu Dec 22 23:57:37 2011 +0800
-@@ -325,6 +325,10 @@
+@@ -325,6 +325,12 @@
          --enable-gpl"
    fi
  
-+  if test "x$disable_yasm" = "xyes"; then
++ AC_ARG_ENABLE(yasm,
++              [AC_HELP_STRING([--disable-yasm], [disable use of yasm assembler])])
++  if test "x$enable_yasm" = "xno"; then
 +    embffmpeg_configure_args="$embffmpeg_configure_args --disable-yasm"
 +  fi
 +
-- 
1.7.11.4