[xulrunner] rebuild for libvpx 1.0.0
Tom Callaway
spot at fedoraproject.org
Mon Jan 30 18:43:21 UTC 2012
commit 69d464142cd464f30a2d938dfbb847e2554edec4
Author: Tom Callaway <spot at fedoraproject.org>
Date: Mon Jan 30 13:43:17 2012 -0500
rebuild for libvpx 1.0.0
mozilla-722127.patch | 74 ++++++++++++++++++++++++++++++++++++++++++++++++++
xulrunner.spec | 13 +++++++-
2 files changed, 85 insertions(+), 2 deletions(-)
---
diff --git a/mozilla-722127.patch b/mozilla-722127.patch
new file mode 100644
index 0000000..63a9e0a
--- /dev/null
+++ b/mozilla-722127.patch
@@ -0,0 +1,74 @@
+# HG changeset patch
+# Parent 0a6f3638cdaba9d3b5ef2eef73a42b2a167dc52a
+# User ojab <ojab at ojab.ru>
+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
+ [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
+- AC_MSG_CHECKING([for libvpx version >= v0.9.7])
+- dnl We need at least v0.9.7 to fix several crash bugs (for which we
+- dnl had local patches prior to v0.9.7).
++ AC_MSG_CHECKING([for libvpx version >= v1.0.0])
++ dnl We need at least v1.0.0 to fix several crash bugs (for which we
++ dnl had local patches prior to v1.0.0).
+ dnl
+ dnl This is a terrible test for the library version, but we don't
+ dnl have a good one. There is no version number in a public header,
+ dnl and testing the headers still doesn't guarantee we link against
+ dnl the right version. While we could call vpx_codec_version() at
+ dnl run-time, that would break cross-compiling. There are no
+- dnl additional exported symbols between the v0.9.7 release and the
+- dnl v0.9.6 one to check for.
++ dnl additional exported decoder symbols between the v1.0.0 release
++ dnl and the v0.9.7 one to check for.
+ AC_TRY_COMPILE([
+ #include <vpx/vpx_decoder.h>
+- #if !defined(VPX_CODEC_USE_INPUT_PARTITION)
++ #if !defined(VPX_CODEC_USE_INPUT_FRAGMENTS)
+ #error "test failed."
+ #endif
+ ],
+@@ -5639,7 +5639,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])
+- AC_MSG_ERROR([--with-system-libvpx requested but it is not v0.9.7 or later])])
++ AC_MSG_ERROR([--with-system-libvpx requested but it is not v1.0.0 or later])])
+ 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
+ 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 $ac_n "checking for libvpx version >= v1.0.0""... $ac_c" 1>&6
++echo "configure:17732: checking for libvpx version >= v1.0.0" >&5
+ cat > conftest.$ac_ext <<EOF
+ #line 17734 "configure"
+ #include "confdefs.h"
+
+ #include <vpx/vpx_decoder.h>
+- #if !defined(VPX_CODEC_USE_INPUT_PARTITION)
++ #if !defined(VPX_CODEC_USE_INPUT_FRAGMENTS)
+ #error "test failed."
+ #endif
+
+@@ -17753,7 +17753,7 @@ else
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ echo "$ac_t""no" 1>&6
+- { echo "configure: error: --with-system-libvpx requested but it is not v0.9.7 or later" 1>&2; exit 1; }
++ { echo "configure: error: --with-system-libvpx requested but it is not v1.0.0 or later" 1>&2; exit 1; }
+ fi
+ rm -f conftest*
+ fi
diff --git a/xulrunner.spec b/xulrunner.spec
index 99005b0..3ae8373 100644
--- a/xulrunner.spec
+++ b/xulrunner.spec
@@ -11,6 +11,7 @@
%global cairo_version 1.10.2
%global freetype_version 2.1.9
%global libnotify_version 0.7.0
+%global libvpx_version 1.0.0
%if %{?system_sqlite}
%global sqlite_version 3.7.7.1
@@ -60,7 +61,7 @@
Summary: XUL Runtime for Gecko Applications
Name: xulrunner
Version: 10.0
-Release: 1%{?pre_tag}%{?dist}
+Release: 2%{?pre_tag}%{?dist}
URL: http://developer.mozilla.org/En/XULRunner
License: MPLv1.1 or GPLv2+ or LGPLv2+
Group: Applications/Internet
@@ -93,6 +94,10 @@ Patch40: mozilla-682832-proxy.patch
Patch41: xulrunner-9.0-secondary-build-fix.patch
Patch42: mozilla-706724.patch
Patch43: mozilla-file.patch
+# Needed to detect/use libvpx-1.0.0
+# https://bugzilla.mozilla.org/show_bug.cgi?id=722127
+Patch44: mozilla-722127.patch
+
# ---------------------------------------------------
@@ -118,7 +123,7 @@ BuildRequires: libnotify-devel >= %{libnotify_version}
BuildRequires: mesa-libGL-devel
BuildRequires: yasm
BuildRequires: libcurl-devel
-BuildRequires: libvpx-devel
+BuildRequires: libvpx-devel >= %{libvpx_version}
Requires: mozilla-filesystem
Requires: nspr >= %{nspr_version}
@@ -223,6 +228,7 @@ sed -e 's/__RPM_VERSION_INTERNAL__/%{gecko_dir_ver}/' %{P:%%PATCH0} \
%patch41 -p2 -b .secondary-build
%patch42 -p1 -b .706724
%patch43 -p1 -b .file
+%patch44 -p2 -b .vpx1.0.0
%{__rm} -f .mozconfig
%{__cp} %{SOURCE10} .mozconfig
@@ -449,6 +455,9 @@ fi
#---------------------------------------------------------------------
%changelog
+* Mon Jan 30 2012 Tom Callaway <spot at fedoraproject.org> 10.0-2
+- rebuild against libvpx 1.0.0 (and BR 1.0.0 or greater)
+
* Mon Jan 23 2012 Martin Stransky <stransky at redhat.com> 10.0-1
- Update to 10.0 Beta 6
More information about the scm-commits
mailing list