Thoughts?
Index: Makefile
===================================================================
RCS file: /cvs/ports/www/mozilla-firefox/Makefile,v
retrieving revision 1.198
diff -u -p -r1.198 Makefile
--- Makefile 16 Mar 2012 21:31:24 -0000 1.198
+++ Makefile 6 Apr 2012 10:44:41 -0000
@@ -10,6 +10,7 @@ MOZILLA_VERSION = 11.0
MOZILLA_BRANCH = release
MOZILLA_PROJECT = firefox
MOZILLA_CODENAME = browser
+REVISION = 0
SO_VERSION = 30.0
# NOTE: Must bump minor version if any shlib's are removed from the
@@ -38,7 +39,8 @@ CONFIGURE_STYLE = autoconf no-autoheader
CONFIGURE_ARGS += --enable-official-branding
CONFIGURE_ARGS += --with-system-libevent=/usr/ --disable-gconf
CONFIGURE_ARGS += --with-system-zlib=/usr/ --with-system-bz2=${LOCALBASE}
-WANTLIB += event
+CONFIGURE_ARGS += --with-system-libvpx=${LOCALBASE}
+WANTLIB += event vpx
.if ${MACHINE_ARCH:Msparc64}
CONFIGURE_ARGS += --disable-tracejit --disable-methodjit
@@ -47,8 +49,10 @@ CONFIGURE_ARGS += --disable-tracejit --d
# needed during make install
BUILD_DEPENDS += archivers/unzip
+LIB_DEPENDS += multimedia/libvpx>=1.0.0
+
# ensure we depend on cairo with tee backend enabled
-LIB_DEPENDS = graphics/cairo>=1.10.2p0
+LIB_DEPENDS += graphics/cairo>=1.10.2p0
# --with-system-png=${LOCALBASE}
# no system png : apng support not bundled in
Index: patches/patch-configure_in
===================================================================
RCS file: patches/patch-configure_in
diff -N patches/patch-configure_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-configure_in 6 Apr 2012 10:44:41 -0000
@@ -0,0 +1,43 @@
+$OpenBSD$
+
+Build --with-system-libvpx is broken for libvpx-1.0.0
+(https://hg.mozilla.org/mozilla-central/rev/e73a68477cfd)
+
+--- configure.in.orig Thu Apr 5 12:43:43 2012
++++ configure.in Thu Apr 5 12:44:54 2012
+@@ -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
+- 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
+ ],
+@@ -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])
+- 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
