diff options
Diffstat (limited to 'www/seamonkey/patches/patch-aa')
-rw-r--r-- | www/seamonkey/patches/patch-aa | 52 |
1 files changed, 8 insertions, 44 deletions
diff --git a/www/seamonkey/patches/patch-aa b/www/seamonkey/patches/patch-aa index cb6e339cad7..4664d7747c1 100644 --- a/www/seamonkey/patches/patch-aa +++ b/www/seamonkey/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.8 2012/03/19 10:35:57 ryoon Exp $ +$NetBSD: patch-aa,v 1.9 2012/04/28 22:48:06 ryoon Exp $ ---- mozilla/configure.in.orig 2012-03-13 05:32:20.000000000 +0000 +--- mozilla/configure.in.orig 2012-04-23 06:27:25.000000000 +0000 +++ mozilla/configure.in -@@ -2442,7 +2442,7 @@ case "$target" in +@@ -2413,7 +2413,7 @@ case "$target" in MOZ_FIX_LINK_PATHS='-Wl,-executable_path,$(LIBXUL_DIST)/bin' ;; @@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.8 2012/03/19 10:35:57 ryoon Exp $ if test `test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` != "elf"; then DLL_SUFFIX=".so.1.0" DSO_LDOPTS="-shared" -@@ -2450,6 +2450,9 @@ case "$target" in +@@ -2421,6 +2421,9 @@ case "$target" in if test ! "$GNU_CC"; then DSO_LDOPTS="-Bshareable $DSO_LDOPTS" fi @@ -21,7 +21,7 @@ $NetBSD: patch-aa,v 1.8 2012/03/19 10:35:57 ryoon Exp $ ;; ia64*-hpux*) -@@ -3441,6 +3444,9 @@ dnl ==================================== +@@ -3412,6 +3415,9 @@ dnl ==================================== case $target in *-hpux11.*) ;; @@ -31,7 +31,7 @@ $NetBSD: patch-aa,v 1.8 2012/03/19 10:35:57 ryoon Exp $ *) AC_CHECK_LIB(c_r, gethostbyname_r) ;; -@@ -4387,6 +4393,14 @@ if test -n "$YASM"; then +@@ -4358,6 +4364,14 @@ if test -n "$YASM"; then _YASM_BUILD=` echo ${YASM_VERSION} | $AWK -F\. '{ print $4 }'` fi @@ -46,43 +46,7 @@ $NetBSD: patch-aa,v 1.8 2012/03/19 10:35:57 ryoon Exp $ if test -z "$SKIP_LIBRARY_CHECKS"; then dnl system JPEG support dnl ======================================================== -@@ -5710,20 +5724,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 +5748,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 -@@ -5768,11 +5782,11 @@ if test -n "$MOZ_WEBM" -a -z "$MOZ_NATIV +@@ -5732,11 +5746,11 @@ if test -n "$MOZ_WEBM" -a -z "$MOZ_NATIV dnl See if we have assembly on this platform. case "$OS_ARCH:$CPU_ARCH" in @@ -96,7 +60,7 @@ $NetBSD: patch-aa,v 1.8 2012/03/19 10:35:57 ryoon Exp $ VPX_ASFLAGS="-f elf64 -rnasm -pnasm -DPIC" VPX_X86_ASM=1 ;; -@@ -9084,6 +9098,8 @@ if test -z "$MOZ_NATIVE_NSPR"; then +@@ -9102,6 +9116,8 @@ if test -z "$MOZ_NATIVE_NSPR"; then AC_MSG_WARN([Recreating autoconf.mk with updated nspr-config output]) if test "$OS_ARCH" != "WINNT"; then NSPR_LIBS=`./nsprpub/config/nspr-config --prefix=$LIBXUL_DIST --exec-prefix=$MOZ_BUILD_ROOT/dist --libdir=$LIBXUL_DIST/lib --libs` |