Date: Sat, 16 Jun 2012 05:21:42 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r761 - in branches/experimental: Mk mail/thunderbird mail/thunderbird-beta mail/thunderbird-beta/files mail/thunderbird-esr mail/thunderbird-esr/files mail/thunderbird/files www/firefox www/firefox-beta www/firefox-beta/files www/firefox-esr www/firefox-esr/files www/firefox-nightly www/firefox/files www/libxul www/libxul/files www/seamonkey www/seamonkey-beta www/seamonkey-beta/files www/seamonkey/files Message-ID: <201206160521.q5G5LgVQ034705@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Sat Jun 16 05:21:42 2012
New Revision: 761
Log:
- use system libvpx (better support for tier2 archs)
- leave patches for bundled libvpx intact
Added:
branches/experimental/mail/thunderbird-beta/files/patch-bug741737
branches/experimental/mail/thunderbird-esr/files/patch-bug741737
branches/experimental/mail/thunderbird/files/patch-bug741737
branches/experimental/www/firefox-beta/files/patch-bug741737
branches/experimental/www/firefox-esr/files/patch-bug741737
branches/experimental/www/firefox/files/patch-bug741737
branches/experimental/www/libxul/files/patch-bug741737
branches/experimental/www/seamonkey-beta/files/patch-bug741737
branches/experimental/www/seamonkey/files/patch-bug741737
Modified:
branches/experimental/Mk/bsd.gecko.mk
branches/experimental/mail/thunderbird-beta/Makefile
branches/experimental/mail/thunderbird-esr/Makefile
branches/experimental/mail/thunderbird/Makefile
branches/experimental/www/firefox-beta/Makefile
branches/experimental/www/firefox-esr/Makefile
branches/experimental/www/firefox-nightly/Makefile
branches/experimental/www/firefox/Makefile
branches/experimental/www/libxul/Makefile
branches/experimental/www/seamonkey-beta/Makefile
branches/experimental/www/seamonkey/Makefile
Modified: branches/experimental/Mk/bsd.gecko.mk
==============================================================================
--- branches/experimental/Mk/bsd.gecko.mk Fri Jun 15 19:42:52 2012 (r760)
+++ branches/experimental/Mk/bsd.gecko.mk Sat Jun 16 05:21:42 2012 (r761)
@@ -611,8 +611,8 @@
sqlite_MOZ_OPTIONS= --enable-system-sqlite
vpx_LIB_DEPENDS= vpx:${PORTSDIR}/multimedia/libvpx
-vpx_MOZ_OPTIONS= --with-system-libvpx=${LOCALBASE}
-vpx_EXTRACT_AFTER_ARGS= --exclude mozilla*/media/libvpx
+vpx_MOZ_OPTIONS= --with-system-libvpx
+#vpx_EXTRACT_AFTER_ARGS= --exclude mozilla*/media/libvpx
zip_DEPENDS= zip:${PORTSDIR}/archivers/zip
Modified: branches/experimental/mail/thunderbird-beta/Makefile
==============================================================================
--- branches/experimental/mail/thunderbird-beta/Makefile Fri Jun 15 19:42:52 2012 (r760)
+++ branches/experimental/mail/thunderbird-beta/Makefile Sat Jun 16 05:21:42 2012 (r761)
@@ -25,7 +25,7 @@
USE_AUTOTOOLS= autoconf213:env
USE_GECKO= gecko
CONFLICTS= thunderbird-10.*
-USE_MOZILLA= -nss -dbm -vpx
+USE_MOZILLA= -nss -dbm
MOZ_TOOLKIT= cairo-gtk2
MAKE_JOBS_SAFE= yes
Added: branches/experimental/mail/thunderbird-beta/files/patch-bug741737
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/mail/thunderbird-beta/files/patch-bug741737 Sat Jun 16 05:21:42 2012 (r761)
@@ -0,0 +1,93 @@
+changeset: 91900:eee73897136b
+user: Martin Stransky <stransky@redhat.com>
+date: Tue Apr 17 19:57:40 2012 -0400
+summary: Bug 741737 - Configure libvpx with pkgconfig. r=khuey, a=npotb
+
+diff --git a/configure.in b/configure.in
+--- mozilla/configure.in
++++ mozilla/configure.in
+@@ -5591,12 +5591,10 @@ MOZ_ARG_DISABLE_BOOL(webm,
+
+ dnl system libvpx Support
+ dnl ========================================================
+-MOZ_ARG_WITH_STRING(system-libvpx,
+-[ --with-system-libvpx=[PFX]
+- Use system libvpx [installed at prefix PFX]],
+- LIBVPX_DIR=$withval)
+-
+-MOZ_NATIVE_LIBVPX=
++MOZ_ARG_WITH_BOOL(system-libvpx,
++[ --with-system-libvpx Use system libvpx (located with pkgconfig)],
++ MOZ_NATIVE_LIBVPX=1)
++
+ MOZ_LIBVPX_INCLUDES=
+ MOZ_LIBVPX_LIBS=
+
+@@ -5609,54 +5607,18 @@ if test -n "$MOZ_WEBM"; then
+ AC_DEFINE(MOZ_VP8_ENCODER)
+ fi
+
+- if test -n "$LIBVPX_DIR" -a "$LIBVPX_DIR" != no; then
+- _SAVE_CFLAGS=$CFLAGS
+- _SAVE_LDFLAGS=$LDFLAGS
+- _SAVE_LIBS=$LIBS
+- if test "${LIBVPX_DIR}" = "yes"; then
+- LIBVPX_DIR=/usr
+- fi
+- CFLAGS="-I${LIBVPX_DIR}/include $CFLAGS"
+- LDFLAGS="-L${LIBVPX_DIR}/lib $LDFLAGS"
+- MOZ_NATIVE_LIBVPX_DEC_TEST=
+- MOZ_CHECK_HEADER(vpx/vpx_decoder.h,
+- [if test ! -f "${LIBVPX_DIR}/include/vpx/vpx_decoder.h"; then
+- AC_MSG_ERROR([vpx/vpx_decoder.h found, but is not in ${LIBVPX_DIR}/include])
+- fi],
+- AC_MSG_ERROR([--with-system-libvpx requested but vpx/vpx_decoder.h not found]))
+- AC_CHECK_LIB(vpx, vpx_codec_dec_init_ver,
+- [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 >= 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 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_FRAGMENTS)
+- #error "test failed."
+- #endif
+- ],
+- [return 0;],
+- [AC_MSG_RESULT([yes])
+- MOZ_NATIVE_LIBVPX=1
+- AC_DEFINE(MOZ_NATIVE_LIBVPX)
+- 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 v1.0.0 or later])])
+- fi
+- CFLAGS=$_SAVE_CFLAGS
+- LDFLAGS=$_SAVE_LDFLAGS
+- LIBS=$_SAVE_LIBS
++ if test -n "$MOZ_NATIVE_LIBVPX"; then
++ dnl ============================
++ dnl === libvpx Version check ===
++ dnl ============================
++ dnl Check to see if we have a system libvpx package.
++ PKG_CHECK_MODULES(LIBVPX, vpx >= 1.0.0)
++
++ MOZ_CHECK_HEADER([vpx/vpx_decoder.h], [],
++ [AC_MSG_ERROR([Couldn't find vpx/vpx_decoder.h which is required for build with system libvpx. Use --without-system-libvpx to build with in-tree libvpx.])])
++
++ AC_CHECK_LIB(vpx, vpx_codec_dec_init_ver, [],
++ [AC_MSG_ERROR([--with-system-libvpx requested but symbol vpx_codec_dec_init_ver not found])])
+ fi
+ fi
+
+
Modified: branches/experimental/mail/thunderbird-esr/Makefile
==============================================================================
--- branches/experimental/mail/thunderbird-esr/Makefile Fri Jun 15 19:42:52 2012 (r760)
+++ branches/experimental/mail/thunderbird-esr/Makefile Sat Jun 16 05:21:42 2012 (r761)
@@ -26,7 +26,7 @@
LATEST_LINK= thunderbird-esr
USE_GECKO= gecko
CONFLICTS= thunderbird-1[1-9].*
-USE_MOZILLA= -nss -dbm -vpx
+USE_MOZILLA= -nss -dbm
MOZ_TOOLKIT= cairo-gtk2
MAKE_JOBS_SAFE= yes
Added: branches/experimental/mail/thunderbird-esr/files/patch-bug741737
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/mail/thunderbird-esr/files/patch-bug741737 Sat Jun 16 05:21:42 2012 (r761)
@@ -0,0 +1,90 @@
+changeset: 91900:eee73897136b
+user: Martin Stransky <stransky@redhat.com>
+date: Tue Apr 17 19:57:40 2012 -0400
+summary: Bug 741737 - Configure libvpx with pkgconfig. r=khuey, a=npotb
+
+diff --git a/configure.in b/configure.in
+--- mozilla/configure.in
++++ mozilla/configure.in
+@@ -5588,12 +5588,10 @@ MOZ_ARG_DISABLE_BOOL(webm,
+
+ dnl system libvpx Support
+ dnl ========================================================
+-MOZ_ARG_WITH_STRING(system-libvpx,
+-[ --with-system-libvpx=[PFX]
+- Use system libvpx [installed at prefix PFX]],
+- LIBVPX_DIR=$withval)
++MOZ_ARG_WITH_BOOL(system-libvpx,
++[ --with-system-libvpx Use system libvpx (located with pkgconfig)],
++ MOZ_NATIVE_LIBVPX=1)
+
+-MOZ_NATIVE_LIBVPX=
+ MOZ_LIBVPX_INCLUDES=
+ MOZ_LIBVPX_LIBS=
+
+@@ -5606,53 +5604,18 @@ if test -n "$MOZ_WEBM"; then
+ AC_DEFINE(MOZ_VP8_ENCODER)
+ fi
+
+- if test -n "$LIBVPX_DIR" -a "$LIBVPX_DIR" != no; then
+- _SAVE_CFLAGS=$CFLAGS
+- _SAVE_LDFLAGS=$LDFLAGS
+- _SAVE_LIBS=$LIBS
+- if test "${LIBVPX_DIR}" = "yes"; then
+- LIBVPX_DIR=/usr
+- fi
+- CFLAGS="-I${LIBVPX_DIR}/include $CFLAGS"
+- LDFLAGS="-L${LIBVPX_DIR}/lib $LDFLAGS"
+- MOZ_NATIVE_LIBVPX_DEC_TEST=
+- MOZ_CHECK_HEADER(vpx/vpx_decoder.h,
+- [if test ! -f "${LIBVPX_DIR}/include/vpx/vpx_decoder.h"; then
+- AC_MSG_ERROR([vpx/vpx_decoder.h found, but is not in ${LIBVPX_DIR}/include])
+- fi],
+- AC_MSG_ERROR([--with-system-libvpx requested but vpx/vpx_decoder.h not found]))
+- AC_CHECK_LIB(vpx, vpx_codec_dec_init_ver,
+- [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).
+- 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.
+- AC_TRY_COMPILE([
+- #include <vpx/vpx_decoder.h>
+- #if !defined(VPX_CODEC_USE_INPUT_PARTITION)
+- #error "test failed."
+- #endif
+- ],
+- [return 0;],
+- [AC_MSG_RESULT([yes])
+- MOZ_NATIVE_LIBVPX=1
+- 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])])
+- fi
+- CFLAGS=$_SAVE_CFLAGS
+- LDFLAGS=$_SAVE_LDFLAGS
+- LIBS=$_SAVE_LIBS
++ if test -n "$MOZ_NATIVE_LIBVPX"; then
++ dnl ============================
++ dnl === libvpx Version check ===
++ dnl ============================
++ dnl Check to see if we have a system libvpx package.
++ PKG_CHECK_MODULES(LIBVPX, vpx >= 0.9.7)
++
++ MOZ_CHECK_HEADER([vpx/vpx_decoder.h], [],
++ [AC_MSG_ERROR([Couldn't find vpx/vpx_decoder.h which is required for build with system libvpx. Use --without-system-libvpx to build with in-tree libvpx.])])
++
++ AC_CHECK_LIB(vpx, vpx_codec_dec_init_ver, [],
++ [AC_MSG_ERROR([--with-system-libvpx requested but symbol vpx_codec_dec_init_ver not found])])
+ fi
+ fi
+
Modified: branches/experimental/mail/thunderbird/Makefile
==============================================================================
--- branches/experimental/mail/thunderbird/Makefile Fri Jun 15 19:42:52 2012 (r760)
+++ branches/experimental/mail/thunderbird/Makefile Sat Jun 16 05:21:42 2012 (r761)
@@ -25,7 +25,7 @@
USE_AUTOTOOLS= autoconf213:env
USE_GECKO= gecko
CONFLICTS= thunderbird-10.*
-USE_MOZILLA= -nss -dbm -vpx
+USE_MOZILLA= -nss -dbm
MOZ_TOOLKIT= cairo-gtk2
MAKE_JOBS_SAFE= yes
Added: branches/experimental/mail/thunderbird/files/patch-bug741737
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/mail/thunderbird/files/patch-bug741737 Sat Jun 16 05:21:42 2012 (r761)
@@ -0,0 +1,93 @@
+changeset: 91900:eee73897136b
+user: Martin Stransky <stransky@redhat.com>
+date: Tue Apr 17 19:57:40 2012 -0400
+summary: Bug 741737 - Configure libvpx with pkgconfig. r=khuey, a=npotb
+
+diff --git a/configure.in b/configure.in
+--- mozilla/configure.in
++++ mozilla/configure.in
+@@ -5591,12 +5591,10 @@ MOZ_ARG_DISABLE_BOOL(webm,
+
+ dnl system libvpx Support
+ dnl ========================================================
+-MOZ_ARG_WITH_STRING(system-libvpx,
+-[ --with-system-libvpx=[PFX]
+- Use system libvpx [installed at prefix PFX]],
+- LIBVPX_DIR=$withval)
+-
+-MOZ_NATIVE_LIBVPX=
++MOZ_ARG_WITH_BOOL(system-libvpx,
++[ --with-system-libvpx Use system libvpx (located with pkgconfig)],
++ MOZ_NATIVE_LIBVPX=1)
++
+ MOZ_LIBVPX_INCLUDES=
+ MOZ_LIBVPX_LIBS=
+
+@@ -5609,54 +5607,18 @@ if test -n "$MOZ_WEBM"; then
+ AC_DEFINE(MOZ_VP8_ENCODER)
+ fi
+
+- if test -n "$LIBVPX_DIR" -a "$LIBVPX_DIR" != no; then
+- _SAVE_CFLAGS=$CFLAGS
+- _SAVE_LDFLAGS=$LDFLAGS
+- _SAVE_LIBS=$LIBS
+- if test "${LIBVPX_DIR}" = "yes"; then
+- LIBVPX_DIR=/usr
+- fi
+- CFLAGS="-I${LIBVPX_DIR}/include $CFLAGS"
+- LDFLAGS="-L${LIBVPX_DIR}/lib $LDFLAGS"
+- MOZ_NATIVE_LIBVPX_DEC_TEST=
+- MOZ_CHECK_HEADER(vpx/vpx_decoder.h,
+- [if test ! -f "${LIBVPX_DIR}/include/vpx/vpx_decoder.h"; then
+- AC_MSG_ERROR([vpx/vpx_decoder.h found, but is not in ${LIBVPX_DIR}/include])
+- fi],
+- AC_MSG_ERROR([--with-system-libvpx requested but vpx/vpx_decoder.h not found]))
+- AC_CHECK_LIB(vpx, vpx_codec_dec_init_ver,
+- [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 >= 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 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_FRAGMENTS)
+- #error "test failed."
+- #endif
+- ],
+- [return 0;],
+- [AC_MSG_RESULT([yes])
+- MOZ_NATIVE_LIBVPX=1
+- AC_DEFINE(MOZ_NATIVE_LIBVPX)
+- 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 v1.0.0 or later])])
+- fi
+- CFLAGS=$_SAVE_CFLAGS
+- LDFLAGS=$_SAVE_LDFLAGS
+- LIBS=$_SAVE_LIBS
++ if test -n "$MOZ_NATIVE_LIBVPX"; then
++ dnl ============================
++ dnl === libvpx Version check ===
++ dnl ============================
++ dnl Check to see if we have a system libvpx package.
++ PKG_CHECK_MODULES(LIBVPX, vpx >= 1.0.0)
++
++ MOZ_CHECK_HEADER([vpx/vpx_decoder.h], [],
++ [AC_MSG_ERROR([Couldn't find vpx/vpx_decoder.h which is required for build with system libvpx. Use --without-system-libvpx to build with in-tree libvpx.])])
++
++ AC_CHECK_LIB(vpx, vpx_codec_dec_init_ver, [],
++ [AC_MSG_ERROR([--with-system-libvpx requested but symbol vpx_codec_dec_init_ver not found])])
+ fi
+ fi
+
+
Modified: branches/experimental/www/firefox-beta/Makefile
==============================================================================
--- branches/experimental/www/firefox-beta/Makefile Fri Jun 15 19:42:52 2012 (r760)
+++ branches/experimental/www/firefox-beta/Makefile Sat Jun 16 05:21:42 2012 (r761)
@@ -28,7 +28,7 @@
USE_GECKO= gecko
CONFLICTS= firefox-10.*
MOZ_PKGCONFIG_FILES= # empty
-USE_MOZILLA= -nss -dbm -vpx
+USE_MOZILLA= -nss -dbm
MOZILLA_NAME= Firefox
MOZ_TOOLKIT= cairo-gtk2
Added: branches/experimental/www/firefox-beta/files/patch-bug741737
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/firefox-beta/files/patch-bug741737 Sat Jun 16 05:21:42 2012 (r761)
@@ -0,0 +1,93 @@
+changeset: 91900:eee73897136b
+user: Martin Stransky <stransky@redhat.com>
+date: Tue Apr 17 19:57:40 2012 -0400
+summary: Bug 741737 - Configure libvpx with pkgconfig. r=khuey, a=npotb
+
+diff --git a/configure.in b/configure.in
+--- configure.in
++++ configure.in
+@@ -5591,12 +5591,10 @@ MOZ_ARG_DISABLE_BOOL(webm,
+
+ dnl system libvpx Support
+ dnl ========================================================
+-MOZ_ARG_WITH_STRING(system-libvpx,
+-[ --with-system-libvpx=[PFX]
+- Use system libvpx [installed at prefix PFX]],
+- LIBVPX_DIR=$withval)
+-
+-MOZ_NATIVE_LIBVPX=
++MOZ_ARG_WITH_BOOL(system-libvpx,
++[ --with-system-libvpx Use system libvpx (located with pkgconfig)],
++ MOZ_NATIVE_LIBVPX=1)
++
+ MOZ_LIBVPX_INCLUDES=
+ MOZ_LIBVPX_LIBS=
+
+@@ -5609,54 +5607,18 @@ if test -n "$MOZ_WEBM"; then
+ AC_DEFINE(MOZ_VP8_ENCODER)
+ fi
+
+- if test -n "$LIBVPX_DIR" -a "$LIBVPX_DIR" != no; then
+- _SAVE_CFLAGS=$CFLAGS
+- _SAVE_LDFLAGS=$LDFLAGS
+- _SAVE_LIBS=$LIBS
+- if test "${LIBVPX_DIR}" = "yes"; then
+- LIBVPX_DIR=/usr
+- fi
+- CFLAGS="-I${LIBVPX_DIR}/include $CFLAGS"
+- LDFLAGS="-L${LIBVPX_DIR}/lib $LDFLAGS"
+- MOZ_NATIVE_LIBVPX_DEC_TEST=
+- MOZ_CHECK_HEADER(vpx/vpx_decoder.h,
+- [if test ! -f "${LIBVPX_DIR}/include/vpx/vpx_decoder.h"; then
+- AC_MSG_ERROR([vpx/vpx_decoder.h found, but is not in ${LIBVPX_DIR}/include])
+- fi],
+- AC_MSG_ERROR([--with-system-libvpx requested but vpx/vpx_decoder.h not found]))
+- AC_CHECK_LIB(vpx, vpx_codec_dec_init_ver,
+- [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 >= 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 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_FRAGMENTS)
+- #error "test failed."
+- #endif
+- ],
+- [return 0;],
+- [AC_MSG_RESULT([yes])
+- MOZ_NATIVE_LIBVPX=1
+- AC_DEFINE(MOZ_NATIVE_LIBVPX)
+- 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 v1.0.0 or later])])
+- fi
+- CFLAGS=$_SAVE_CFLAGS
+- LDFLAGS=$_SAVE_LDFLAGS
+- LIBS=$_SAVE_LIBS
++ if test -n "$MOZ_NATIVE_LIBVPX"; then
++ dnl ============================
++ dnl === libvpx Version check ===
++ dnl ============================
++ dnl Check to see if we have a system libvpx package.
++ PKG_CHECK_MODULES(LIBVPX, vpx >= 1.0.0)
++
++ MOZ_CHECK_HEADER([vpx/vpx_decoder.h], [],
++ [AC_MSG_ERROR([Couldn't find vpx/vpx_decoder.h which is required for build with system libvpx. Use --without-system-libvpx to build with in-tree libvpx.])])
++
++ AC_CHECK_LIB(vpx, vpx_codec_dec_init_ver, [],
++ [AC_MSG_ERROR([--with-system-libvpx requested but symbol vpx_codec_dec_init_ver not found])])
+ fi
+ fi
+
+
Modified: branches/experimental/www/firefox-esr/Makefile
==============================================================================
--- branches/experimental/www/firefox-esr/Makefile Fri Jun 15 19:42:52 2012 (r760)
+++ branches/experimental/www/firefox-esr/Makefile Sat Jun 16 05:21:42 2012 (r761)
@@ -29,7 +29,7 @@
USE_GECKO= gecko
CONFLICTS= firefox-1[1-9].*
MOZ_PKGCONFIG_FILES= # empty
-USE_MOZILLA= -nss -dbm -vpx
+USE_MOZILLA= -nss -dbm
MOZILLA_NAME= Firefox
MOZ_TOOLKIT= cairo-gtk2
Added: branches/experimental/www/firefox-esr/files/patch-bug741737
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/firefox-esr/files/patch-bug741737 Sat Jun 16 05:21:42 2012 (r761)
@@ -0,0 +1,90 @@
+changeset: 91900:eee73897136b
+user: Martin Stransky <stransky@redhat.com>
+date: Tue Apr 17 19:57:40 2012 -0400
+summary: Bug 741737 - Configure libvpx with pkgconfig. r=khuey, a=npotb
+
+diff --git a/configure.in b/configure.in
+--- configure.in
++++ configure.in
+@@ -5588,12 +5588,10 @@ MOZ_ARG_DISABLE_BOOL(webm,
+
+ dnl system libvpx Support
+ dnl ========================================================
+-MOZ_ARG_WITH_STRING(system-libvpx,
+-[ --with-system-libvpx=[PFX]
+- Use system libvpx [installed at prefix PFX]],
+- LIBVPX_DIR=$withval)
++MOZ_ARG_WITH_BOOL(system-libvpx,
++[ --with-system-libvpx Use system libvpx (located with pkgconfig)],
++ MOZ_NATIVE_LIBVPX=1)
+
+-MOZ_NATIVE_LIBVPX=
+ MOZ_LIBVPX_INCLUDES=
+ MOZ_LIBVPX_LIBS=
+
+@@ -5606,53 +5604,18 @@ if test -n "$MOZ_WEBM"; then
+ AC_DEFINE(MOZ_VP8_ENCODER)
+ fi
+
+- if test -n "$LIBVPX_DIR" -a "$LIBVPX_DIR" != no; then
+- _SAVE_CFLAGS=$CFLAGS
+- _SAVE_LDFLAGS=$LDFLAGS
+- _SAVE_LIBS=$LIBS
+- if test "${LIBVPX_DIR}" = "yes"; then
+- LIBVPX_DIR=/usr
+- fi
+- CFLAGS="-I${LIBVPX_DIR}/include $CFLAGS"
+- LDFLAGS="-L${LIBVPX_DIR}/lib $LDFLAGS"
+- MOZ_NATIVE_LIBVPX_DEC_TEST=
+- MOZ_CHECK_HEADER(vpx/vpx_decoder.h,
+- [if test ! -f "${LIBVPX_DIR}/include/vpx/vpx_decoder.h"; then
+- AC_MSG_ERROR([vpx/vpx_decoder.h found, but is not in ${LIBVPX_DIR}/include])
+- fi],
+- AC_MSG_ERROR([--with-system-libvpx requested but vpx/vpx_decoder.h not found]))
+- AC_CHECK_LIB(vpx, vpx_codec_dec_init_ver,
+- [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).
+- 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.
+- AC_TRY_COMPILE([
+- #include <vpx/vpx_decoder.h>
+- #if !defined(VPX_CODEC_USE_INPUT_PARTITION)
+- #error "test failed."
+- #endif
+- ],
+- [return 0;],
+- [AC_MSG_RESULT([yes])
+- MOZ_NATIVE_LIBVPX=1
+- 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])])
+- fi
+- CFLAGS=$_SAVE_CFLAGS
+- LDFLAGS=$_SAVE_LDFLAGS
+- LIBS=$_SAVE_LIBS
++ if test -n "$MOZ_NATIVE_LIBVPX"; then
++ dnl ============================
++ dnl === libvpx Version check ===
++ dnl ============================
++ dnl Check to see if we have a system libvpx package.
++ PKG_CHECK_MODULES(LIBVPX, vpx >= 0.9.7)
++
++ MOZ_CHECK_HEADER([vpx/vpx_decoder.h], [],
++ [AC_MSG_ERROR([Couldn't find vpx/vpx_decoder.h which is required for build with system libvpx. Use --without-system-libvpx to build with in-tree libvpx.])])
++
++ AC_CHECK_LIB(vpx, vpx_codec_dec_init_ver, [],
++ [AC_MSG_ERROR([--with-system-libvpx requested but symbol vpx_codec_dec_init_ver not found])])
+ fi
+ fi
+
Modified: branches/experimental/www/firefox-nightly/Makefile
==============================================================================
--- branches/experimental/www/firefox-nightly/Makefile Fri Jun 15 19:42:52 2012 (r760)
+++ branches/experimental/www/firefox-nightly/Makefile Sat Jun 16 05:21:42 2012 (r761)
@@ -31,7 +31,7 @@
USE_PYTHON_BUILD=yes
USE_GECKO= gecko
MOZ_PKGCONFIG_FILES= # empty
-USE_MOZILLA= -vpx
+USE_MOZILLA= # empty
MOZILLA_NAME= Nightly
MOZILLA_SUFX= -nightly
MOZILLA= ${PORTNAME}${MOZILLA_SUFX}
Modified: branches/experimental/www/firefox/Makefile
==============================================================================
--- branches/experimental/www/firefox/Makefile Fri Jun 15 19:42:52 2012 (r760)
+++ branches/experimental/www/firefox/Makefile Sat Jun 16 05:21:42 2012 (r761)
@@ -28,7 +28,7 @@
USE_GECKO= gecko
CONFLICTS= firefox-10.*
MOZ_PKGCONFIG_FILES= # empty
-USE_MOZILLA= -nss -dbm -vpx
+USE_MOZILLA= -nss -dbm
MOZILLA_NAME= Firefox
MOZ_TOOLKIT= cairo-gtk2
Added: branches/experimental/www/firefox/files/patch-bug741737
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/firefox/files/patch-bug741737 Sat Jun 16 05:21:42 2012 (r761)
@@ -0,0 +1,93 @@
+changeset: 91900:eee73897136b
+user: Martin Stransky <stransky@redhat.com>
+date: Tue Apr 17 19:57:40 2012 -0400
+summary: Bug 741737 - Configure libvpx with pkgconfig. r=khuey, a=npotb
+
+diff --git a/configure.in b/configure.in
+--- configure.in
++++ configure.in
+@@ -5591,12 +5591,10 @@ MOZ_ARG_DISABLE_BOOL(webm,
+
+ dnl system libvpx Support
+ dnl ========================================================
+-MOZ_ARG_WITH_STRING(system-libvpx,
+-[ --with-system-libvpx=[PFX]
+- Use system libvpx [installed at prefix PFX]],
+- LIBVPX_DIR=$withval)
+-
+-MOZ_NATIVE_LIBVPX=
++MOZ_ARG_WITH_BOOL(system-libvpx,
++[ --with-system-libvpx Use system libvpx (located with pkgconfig)],
++ MOZ_NATIVE_LIBVPX=1)
++
+ MOZ_LIBVPX_INCLUDES=
+ MOZ_LIBVPX_LIBS=
+
+@@ -5609,54 +5607,18 @@ if test -n "$MOZ_WEBM"; then
+ AC_DEFINE(MOZ_VP8_ENCODER)
+ fi
+
+- if test -n "$LIBVPX_DIR" -a "$LIBVPX_DIR" != no; then
+- _SAVE_CFLAGS=$CFLAGS
+- _SAVE_LDFLAGS=$LDFLAGS
+- _SAVE_LIBS=$LIBS
+- if test "${LIBVPX_DIR}" = "yes"; then
+- LIBVPX_DIR=/usr
+- fi
+- CFLAGS="-I${LIBVPX_DIR}/include $CFLAGS"
+- LDFLAGS="-L${LIBVPX_DIR}/lib $LDFLAGS"
+- MOZ_NATIVE_LIBVPX_DEC_TEST=
+- MOZ_CHECK_HEADER(vpx/vpx_decoder.h,
+- [if test ! -f "${LIBVPX_DIR}/include/vpx/vpx_decoder.h"; then
+- AC_MSG_ERROR([vpx/vpx_decoder.h found, but is not in ${LIBVPX_DIR}/include])
+- fi],
+- AC_MSG_ERROR([--with-system-libvpx requested but vpx/vpx_decoder.h not found]))
+- AC_CHECK_LIB(vpx, vpx_codec_dec_init_ver,
+- [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 >= 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 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_FRAGMENTS)
+- #error "test failed."
+- #endif
+- ],
+- [return 0;],
+- [AC_MSG_RESULT([yes])
+- MOZ_NATIVE_LIBVPX=1
+- AC_DEFINE(MOZ_NATIVE_LIBVPX)
+- 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 v1.0.0 or later])])
+- fi
+- CFLAGS=$_SAVE_CFLAGS
+- LDFLAGS=$_SAVE_LDFLAGS
+- LIBS=$_SAVE_LIBS
++ if test -n "$MOZ_NATIVE_LIBVPX"; then
++ dnl ============================
++ dnl === libvpx Version check ===
++ dnl ============================
++ dnl Check to see if we have a system libvpx package.
++ PKG_CHECK_MODULES(LIBVPX, vpx >= 1.0.0)
++
++ MOZ_CHECK_HEADER([vpx/vpx_decoder.h], [],
++ [AC_MSG_ERROR([Couldn't find vpx/vpx_decoder.h which is required for build with system libvpx. Use --without-system-libvpx to build with in-tree libvpx.])])
++
++ AC_CHECK_LIB(vpx, vpx_codec_dec_init_ver, [],
++ [AC_MSG_ERROR([--with-system-libvpx requested but symbol vpx_codec_dec_init_ver not found])])
+ fi
+ fi
+
+
Modified: branches/experimental/www/libxul/Makefile
==============================================================================
--- branches/experimental/www/libxul/Makefile Fri Jun 15 19:42:52 2012 (r760)
+++ branches/experimental/www/libxul/Makefile Sat Jun 16 05:21:42 2012 (r761)
@@ -47,7 +47,7 @@
USE_GECKO= gecko
MOZILLA_EXEC_NAME=xulrunner
MOZ_TOOLKIT= cairo-gtk2
-USE_MOZILLA= -nss -dbm -vpx
+USE_MOZILLA= -nss -dbm
MOZ_PKGCONFIG_FILES= libxul-embedding libxul mozilla-js mozilla-nss \
mozilla-plugin
Added: branches/experimental/www/libxul/files/patch-bug741737
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/libxul/files/patch-bug741737 Sat Jun 16 05:21:42 2012 (r761)
@@ -0,0 +1,90 @@
+changeset: 91900:eee73897136b
+user: Martin Stransky <stransky@redhat.com>
+date: Tue Apr 17 19:57:40 2012 -0400
+summary: Bug 741737 - Configure libvpx with pkgconfig. r=khuey, a=npotb
+
+diff --git a/configure.in b/configure.in
+--- configure.in
++++ configure.in
+@@ -5588,12 +5588,10 @@ MOZ_ARG_DISABLE_BOOL(webm,
+
+ dnl system libvpx Support
+ dnl ========================================================
+-MOZ_ARG_WITH_STRING(system-libvpx,
+-[ --with-system-libvpx=[PFX]
+- Use system libvpx [installed at prefix PFX]],
+- LIBVPX_DIR=$withval)
++MOZ_ARG_WITH_BOOL(system-libvpx,
++[ --with-system-libvpx Use system libvpx (located with pkgconfig)],
++ MOZ_NATIVE_LIBVPX=1)
+
+-MOZ_NATIVE_LIBVPX=
+ MOZ_LIBVPX_INCLUDES=
+ MOZ_LIBVPX_LIBS=
+
+@@ -5606,53 +5604,18 @@ if test -n "$MOZ_WEBM"; then
+ AC_DEFINE(MOZ_VP8_ENCODER)
+ fi
+
+- if test -n "$LIBVPX_DIR" -a "$LIBVPX_DIR" != no; then
+- _SAVE_CFLAGS=$CFLAGS
+- _SAVE_LDFLAGS=$LDFLAGS
+- _SAVE_LIBS=$LIBS
+- if test "${LIBVPX_DIR}" = "yes"; then
+- LIBVPX_DIR=/usr
+- fi
+- CFLAGS="-I${LIBVPX_DIR}/include $CFLAGS"
+- LDFLAGS="-L${LIBVPX_DIR}/lib $LDFLAGS"
+- MOZ_NATIVE_LIBVPX_DEC_TEST=
+- MOZ_CHECK_HEADER(vpx/vpx_decoder.h,
+- [if test ! -f "${LIBVPX_DIR}/include/vpx/vpx_decoder.h"; then
+- AC_MSG_ERROR([vpx/vpx_decoder.h found, but is not in ${LIBVPX_DIR}/include])
+- fi],
+- AC_MSG_ERROR([--with-system-libvpx requested but vpx/vpx_decoder.h not found]))
+- AC_CHECK_LIB(vpx, vpx_codec_dec_init_ver,
+- [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).
+- 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.
+- AC_TRY_COMPILE([
+- #include <vpx/vpx_decoder.h>
+- #if !defined(VPX_CODEC_USE_INPUT_PARTITION)
+- #error "test failed."
+- #endif
+- ],
+- [return 0;],
+- [AC_MSG_RESULT([yes])
+- MOZ_NATIVE_LIBVPX=1
+- 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])])
+- fi
+- CFLAGS=$_SAVE_CFLAGS
+- LDFLAGS=$_SAVE_LDFLAGS
+- LIBS=$_SAVE_LIBS
++ if test -n "$MOZ_NATIVE_LIBVPX"; then
++ dnl ============================
++ dnl === libvpx Version check ===
++ dnl ============================
++ dnl Check to see if we have a system libvpx package.
++ PKG_CHECK_MODULES(LIBVPX, vpx >= 0.9.7)
++
++ MOZ_CHECK_HEADER([vpx/vpx_decoder.h], [],
++ [AC_MSG_ERROR([Couldn't find vpx/vpx_decoder.h which is required for build with system libvpx. Use --without-system-libvpx to build with in-tree libvpx.])])
++
++ AC_CHECK_LIB(vpx, vpx_codec_dec_init_ver, [],
++ [AC_MSG_ERROR([--with-system-libvpx requested but symbol vpx_codec_dec_init_ver not found])])
+ fi
+ fi
+
Modified: branches/experimental/www/seamonkey-beta/Makefile
==============================================================================
--- branches/experimental/www/seamonkey-beta/Makefile Fri Jun 15 19:42:52 2012 (r760)
+++ branches/experimental/www/seamonkey-beta/Makefile Sat Jun 16 05:21:42 2012 (r761)
@@ -48,7 +48,7 @@
--disable-necko-wifi \
--disable-updater
-USE_MOZILLA= -nss -dbm -vpx
+USE_MOZILLA= -nss -dbm
USE_GECKO_OPTIONS=+smb
MOZ_TOOLKIT= cairo-gtk2
MOZILLA_PLIST_DIRS= bin lib
Added: branches/experimental/www/seamonkey-beta/files/patch-bug741737
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/seamonkey-beta/files/patch-bug741737 Sat Jun 16 05:21:42 2012 (r761)
@@ -0,0 +1,93 @@
+changeset: 91900:eee73897136b
+user: Martin Stransky <stransky@redhat.com>
+date: Tue Apr 17 19:57:40 2012 -0400
+summary: Bug 741737 - Configure libvpx with pkgconfig. r=khuey, a=npotb
+
+diff --git a/configure.in b/configure.in
+--- mozilla/configure.in
++++ mozilla/configure.in
+@@ -5591,12 +5591,10 @@ MOZ_ARG_DISABLE_BOOL(webm,
+
+ dnl system libvpx Support
+ dnl ========================================================
+-MOZ_ARG_WITH_STRING(system-libvpx,
+-[ --with-system-libvpx=[PFX]
+- Use system libvpx [installed at prefix PFX]],
+- LIBVPX_DIR=$withval)
+-
+-MOZ_NATIVE_LIBVPX=
++MOZ_ARG_WITH_BOOL(system-libvpx,
++[ --with-system-libvpx Use system libvpx (located with pkgconfig)],
++ MOZ_NATIVE_LIBVPX=1)
++
+ MOZ_LIBVPX_INCLUDES=
+ MOZ_LIBVPX_LIBS=
+
+@@ -5609,54 +5607,18 @@ if test -n "$MOZ_WEBM"; then
+ AC_DEFINE(MOZ_VP8_ENCODER)
+ fi
+
+- if test -n "$LIBVPX_DIR" -a "$LIBVPX_DIR" != no; then
+- _SAVE_CFLAGS=$CFLAGS
+- _SAVE_LDFLAGS=$LDFLAGS
+- _SAVE_LIBS=$LIBS
+- if test "${LIBVPX_DIR}" = "yes"; then
+- LIBVPX_DIR=/usr
+- fi
+- CFLAGS="-I${LIBVPX_DIR}/include $CFLAGS"
+- LDFLAGS="-L${LIBVPX_DIR}/lib $LDFLAGS"
+- MOZ_NATIVE_LIBVPX_DEC_TEST=
+- MOZ_CHECK_HEADER(vpx/vpx_decoder.h,
+- [if test ! -f "${LIBVPX_DIR}/include/vpx/vpx_decoder.h"; then
+- AC_MSG_ERROR([vpx/vpx_decoder.h found, but is not in ${LIBVPX_DIR}/include])
+- fi],
+- AC_MSG_ERROR([--with-system-libvpx requested but vpx/vpx_decoder.h not found]))
+- AC_CHECK_LIB(vpx, vpx_codec_dec_init_ver,
+- [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 >= 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 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_FRAGMENTS)
+- #error "test failed."
+- #endif
+- ],
+- [return 0;],
+- [AC_MSG_RESULT([yes])
+- MOZ_NATIVE_LIBVPX=1
+- AC_DEFINE(MOZ_NATIVE_LIBVPX)
+- 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 v1.0.0 or later])])
+- fi
+- CFLAGS=$_SAVE_CFLAGS
+- LDFLAGS=$_SAVE_LDFLAGS
+- LIBS=$_SAVE_LIBS
++ if test -n "$MOZ_NATIVE_LIBVPX"; then
++ dnl ============================
++ dnl === libvpx Version check ===
++ dnl ============================
++ dnl Check to see if we have a system libvpx package.
++ PKG_CHECK_MODULES(LIBVPX, vpx >= 1.0.0)
++
++ MOZ_CHECK_HEADER([vpx/vpx_decoder.h], [],
++ [AC_MSG_ERROR([Couldn't find vpx/vpx_decoder.h which is required for build with system libvpx. Use --without-system-libvpx to build with in-tree libvpx.])])
++
++ AC_CHECK_LIB(vpx, vpx_codec_dec_init_ver, [],
++ [AC_MSG_ERROR([--with-system-libvpx requested but symbol vpx_codec_dec_init_ver not found])])
+ fi
+ fi
+
+
Modified: branches/experimental/www/seamonkey/Makefile
==============================================================================
--- branches/experimental/www/seamonkey/Makefile Fri Jun 15 19:42:52 2012 (r760)
+++ branches/experimental/www/seamonkey/Makefile Sat Jun 16 05:21:42 2012 (r761)
@@ -48,7 +48,7 @@
--disable-necko-wifi \
--disable-updater
-USE_MOZILLA= -nss -dbm -vpx
+USE_MOZILLA= -nss -dbm
USE_GECKO_OPTIONS=+smb
MOZ_TOOLKIT= cairo-gtk2
MOZILLA_PLIST_DIRS= bin lib
Added: branches/experimental/www/seamonkey/files/patch-bug741737
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/seamonkey/files/patch-bug741737 Sat Jun 16 05:21:42 2012 (r761)
@@ -0,0 +1,93 @@
+changeset: 91900:eee73897136b
+user: Martin Stransky <stransky@redhat.com>
+date: Tue Apr 17 19:57:40 2012 -0400
+summary: Bug 741737 - Configure libvpx with pkgconfig. r=khuey, a=npotb
+
+diff --git a/configure.in b/configure.in
+--- mozilla/configure.in
++++ mozilla/configure.in
+@@ -5591,12 +5591,10 @@ MOZ_ARG_DISABLE_BOOL(webm,
+
+ dnl system libvpx Support
+ dnl ========================================================
+-MOZ_ARG_WITH_STRING(system-libvpx,
+-[ --with-system-libvpx=[PFX]
+- Use system libvpx [installed at prefix PFX]],
+- LIBVPX_DIR=$withval)
+-
+-MOZ_NATIVE_LIBVPX=
++MOZ_ARG_WITH_BOOL(system-libvpx,
++[ --with-system-libvpx Use system libvpx (located with pkgconfig)],
++ MOZ_NATIVE_LIBVPX=1)
++
+ MOZ_LIBVPX_INCLUDES=
+ MOZ_LIBVPX_LIBS=
+
+@@ -5609,54 +5607,18 @@ if test -n "$MOZ_WEBM"; then
+ AC_DEFINE(MOZ_VP8_ENCODER)
+ fi
+
+- if test -n "$LIBVPX_DIR" -a "$LIBVPX_DIR" != no; then
+- _SAVE_CFLAGS=$CFLAGS
+- _SAVE_LDFLAGS=$LDFLAGS
+- _SAVE_LIBS=$LIBS
+- if test "${LIBVPX_DIR}" = "yes"; then
+- LIBVPX_DIR=/usr
+- fi
+- CFLAGS="-I${LIBVPX_DIR}/include $CFLAGS"
+- LDFLAGS="-L${LIBVPX_DIR}/lib $LDFLAGS"
+- MOZ_NATIVE_LIBVPX_DEC_TEST=
+- MOZ_CHECK_HEADER(vpx/vpx_decoder.h,
+- [if test ! -f "${LIBVPX_DIR}/include/vpx/vpx_decoder.h"; then
+- AC_MSG_ERROR([vpx/vpx_decoder.h found, but is not in ${LIBVPX_DIR}/include])
+- fi],
+- AC_MSG_ERROR([--with-system-libvpx requested but vpx/vpx_decoder.h not found]))
+- AC_CHECK_LIB(vpx, vpx_codec_dec_init_ver,
+- [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 >= 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 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_FRAGMENTS)
+- #error "test failed."
+- #endif
+- ],
+- [return 0;],
+- [AC_MSG_RESULT([yes])
+- MOZ_NATIVE_LIBVPX=1
+- AC_DEFINE(MOZ_NATIVE_LIBVPX)
+- 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 v1.0.0 or later])])
+- fi
+- CFLAGS=$_SAVE_CFLAGS
+- LDFLAGS=$_SAVE_LDFLAGS
+- LIBS=$_SAVE_LIBS
++ if test -n "$MOZ_NATIVE_LIBVPX"; then
++ dnl ============================
++ dnl === libvpx Version check ===
++ dnl ============================
++ dnl Check to see if we have a system libvpx package.
++ PKG_CHECK_MODULES(LIBVPX, vpx >= 1.0.0)
++
++ MOZ_CHECK_HEADER([vpx/vpx_decoder.h], [],
++ [AC_MSG_ERROR([Couldn't find vpx/vpx_decoder.h which is required for build with system libvpx. Use --without-system-libvpx to build with in-tree libvpx.])])
++
++ AC_CHECK_LIB(vpx, vpx_codec_dec_init_ver, [],
++ [AC_MSG_ERROR([--with-system-libvpx requested but symbol vpx_codec_dec_init_ver not found])])
+ fi
+ fi
+
+
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201206160521.q5G5LgVQ034705>