From fb772c0b41ee7f4fca32d67d00b205ca7827bd66 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Sat, 17 Mar 2012 09:08:29 +0100 Subject: Firefox 11.0 --- mozilla-722127.patch | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) (limited to 'mozilla-722127.patch') diff --git a/mozilla-722127.patch b/mozilla-722127.patch index 63a9e0a..f86fcae 100644 --- a/mozilla-722127.patch +++ b/mozilla-722127.patch @@ -1,12 +1,7 @@ -# HG changeset patch -# Parent 0a6f3638cdaba9d3b5ef2eef73a42b2a167dc52a -# User ojab -Bug 722127 - Build --with-system-libvpx is broken for libvpx-1.0.0 - -diff -up xulrunner-10.0/mozilla-beta/configure.in.vpx1.0.0 xulrunner-10.0/mozilla-beta/configure.in ---- xulrunner-10.0/mozilla-beta/configure.in.vpx1.0.0 2012-01-24 02:59:49.000000000 -0500 -+++ xulrunner-10.0/mozilla-beta/configure.in 2012-01-30 13:11:22.303053551 -0500 -@@ -5616,20 +5616,20 @@ if test -n "$MOZ_WEBM"; then +diff -up xulrunner-11.0/mozilla-beta/configure.in.vpx1.0.0 xulrunner-11.0/mozilla-beta/configure.in +--- xulrunner-11.0/mozilla-beta/configure.in.vpx1.0.0 2012-03-09 01:39:31.000000000 +0100 ++++ xulrunner-11.0/mozilla-beta/configure.in 2012-03-09 15:03:51.246031329 +0100 +@@ -5710,20 +5710,20 @@ if test -n "$MOZ_WEBM"; then [MOZ_NATIVE_LIBVPX_DEC_TEST=1], ([--with-system-libvpx requested but symbol vpx_codec_dec_init_ver not found])) if test -n "$MOZ_NATIVE_LIBVPX_DEC_TEST" ; then @@ -33,7 +28,7 @@ diff -up xulrunner-10.0/mozilla-beta/configure.in.vpx1.0.0 xulrunner-10.0/mozill #error "test failed." #endif ], -@@ -5639,7 +5639,7 @@ if test -n "$MOZ_WEBM"; then +@@ -5734,7 +5734,7 @@ if test -n "$MOZ_WEBM"; then MOZ_LIBVPX_INCLUDES="-I${LIBVPX_DIR}/include" MOZ_LIBVPX_LIBS="-L${LIBVPX_DIR}/lib -lvpx"], [AC_MSG_RESULT([no]) @@ -42,19 +37,19 @@ diff -up xulrunner-10.0/mozilla-beta/configure.in.vpx1.0.0 xulrunner-10.0/mozill fi CFLAGS=$_SAVE_CFLAGS LDFLAGS=$_SAVE_LDFLAGS -diff -up xulrunner-10.0/mozilla-beta/configure.vpx1.0.0 xulrunner-10.0/mozilla-beta/configure ---- xulrunner-10.0/mozilla-beta/configure.vpx1.0.0 2012-01-30 13:11:47.805847514 -0500 -+++ xulrunner-10.0/mozilla-beta/configure 2012-01-30 13:14:07.818716354 -0500 -@@ -17727,14 +17727,14 @@ else +diff -up xulrunner-11.0/mozilla-beta/configure.vpx1.0.0 xulrunner-11.0/mozilla-beta/configure +--- xulrunner-11.0/mozilla-beta/configure.vpx1.0.0 2012-03-09 01:58:50.000000000 +0100 ++++ xulrunner-11.0/mozilla-beta/configure 2012-03-09 15:15:42.537585632 +0100 +@@ -17761,14 +17761,14 @@ else fi if test -n "$MOZ_NATIVE_LIBVPX_DEC_TEST" ; then - echo $ac_n "checking for libvpx version >= v0.9.7""... $ac_c" 1>&6 --echo "configure:17732: checking for libvpx version >= v0.9.7" >&5 +-echo "configure:17766: checking for libvpx version >= v0.9.7" >&5 + echo $ac_n "checking for libvpx version >= v1.0.0""... $ac_c" 1>&6 -+echo "configure:17732: checking for libvpx version >= v1.0.0" >&5 ++echo "configure:17766: checking for libvpx version >= v1.0.0" >&5 cat > conftest.$ac_ext < @@ -63,7 +58,7 @@ diff -up xulrunner-10.0/mozilla-beta/configure.vpx1.0.0 xulrunner-10.0/mozilla-b #error "test failed." #endif -@@ -17753,7 +17753,7 @@ else +@@ -17791,7 +17791,7 @@ else cat conftest.$ac_ext >&5 rm -rf conftest* echo "$ac_t""no" 1>&6 @@ -72,3 +67,8 @@ diff -up xulrunner-10.0/mozilla-beta/configure.vpx1.0.0 xulrunner-10.0/mozilla-b fi rm -f conftest* fi +@@ -25794,4 +25794,3 @@ if cmp -s config/autoconf.mk config/auto + else + rm -f config/autoconf.mk.orig 2> /dev/null + fi +- -- cgit