[SVN-Commit] r600 - branches/experimental/www/seamonkey/files
svn-freebsd-gecko at chruetertee.ch
svn-freebsd-gecko at chruetertee.ch
Fri Jul 29 22:32:43 UTC 2011
Author: flo
Date: Fri Jul 29 22:32:35 2011
New Revision: 600
Log:
merge some patches from firefox/thunderbird.
This should be what will be committed to the ports tree
Added:
branches/experimental/www/seamonkey/files/patch-configure.in
branches/experimental/www/seamonkey/files/patch-mozilla-configure.in
branches/experimental/www/seamonkey/files/patch-mozilla-gfx-qcms-Makefile.in
branches/experimental/www/seamonkey/files/patch-mozilla-media-libvpx-vpx_config.c
branches/experimental/www/seamonkey/files/patch-mozilla-media-libvpx-vpx_config.h
Deleted:
branches/experimental/www/seamonkey/files/patch-configure
branches/experimental/www/seamonkey/files/patch-mozilla-configure
Deleted: branches/experimental/www/seamonkey/files/patch-configure
==============================================================================
--- branches/experimental/www/seamonkey/files/patch-configure Fri Jul 29 22:32:35 2011 (r599)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,47 +0,0 @@
---- configure.orig 2010-05-11 17:47:16.000000000 +0000
-+++ configure 2010-05-11 17:51:00.000000000 +0000
-@@ -5956,7 +5956,7 @@
- CPU_ARCH=sparc
- ;;
-
--x86_64 | ia64)
-+amd64 | x86_64 | ia64)
- CPU_ARCH="$OS_TEST"
- ;;
-
-@@ -10972,7 +10972,7 @@
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- ac_save_LIBS="$LIBS"
--LIBS="-liconv $LIBS"
-+LIBS="-L$LOCALBASE/lib -liconv $LIBS"
- cat > conftest.$ac_ext <<EOF
- #line 10978 "configure"
- #include "confdefs.h"
-@@ -11003,7 +11003,7 @@
- fi
- if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
- echo "$ac_t""yes" 1>&6
-- _ICONV_LIBS="$_ICONV_LIBS -liconv"
-+ _ICONV_LIBS="$_ICONV_LIBS -L$LOCALBASE/lib -liconv"
- else
- echo "$ac_t""no" 1>&6
- echo $ac_n "checking for libiconv in -liconv""... $ac_c" 1>&6
-@@ -11013,7 +11013,7 @@
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- ac_save_LIBS="$LIBS"
--LIBS="-liconv $LIBS"
-+LIBS="-L$LOCALBASE/lib -liconv $LIBS"
- cat > conftest.$ac_ext <<EOF
- #line 11019 "configure"
- #include "confdefs.h"
-@@ -11044,7 +11044,7 @@
- fi
- if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
- echo "$ac_t""yes" 1>&6
-- _ICONV_LIBS="$_ICONV_LIBS -liconv"
-+ _ICONV_LIBS="$_ICONV_LIBS -L$LOCALBASE/lib -liconv"
- else
- echo "$ac_t""no" 1>&6
- fi
Added: branches/experimental/www/seamonkey/files/patch-configure.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/seamonkey/files/patch-configure.in Fri Jul 29 22:32:35 2011 (r600)
@@ -0,0 +1,20 @@
+--- configure.in.orig 2011-07-28 00:58:59.534861026 +0200
++++ configure.in 2011-07-28 01:00:05.591863508 +0200
+@@ -1438,7 +1438,7 @@
+ CPU_ARCH=sparc
+ ;;
+
+-x86_64 | ia64)
++amd64 | x86_64 | ia64)
+ CPU_ARCH="$OS_TEST"
+ ;;
+
+@@ -1458,7 +1458,7 @@
+ dnl ===============================================================
+ INTEL_ARCHITECTURE=
+ case "$OS_TEST" in
+- x86_64|i?86)
++ amd64|x86_64|i?86)
+ INTEL_ARCHITECTURE=1
+ esac
+
Deleted: branches/experimental/www/seamonkey/files/patch-mozilla-configure
==============================================================================
--- branches/experimental/www/seamonkey/files/patch-mozilla-configure Fri Jul 29 22:32:35 2011 (r599)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,11 +0,0 @@
---- mozilla/configure.orig 2010-01-08 09:53:05.000000000 +0100
-+++ mozilla/configure 2010-01-08 09:53:34.000000000 +0100
-@@ -5502,7 +5502,7 @@
- CPU_ARCH=sparc
- ;;
-
--x86_64 | ia64)
-+amd64 | x86_64 | ia64)
- CPU_ARCH="$OS_TEST"
- ;;
- esac
Added: branches/experimental/www/seamonkey/files/patch-mozilla-configure.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/seamonkey/files/patch-mozilla-configure.in Fri Jul 29 22:32:35 2011 (r600)
@@ -0,0 +1,86 @@
+--- mozilla/configure.in.orig 2010-11-04 21:05:18.000000000 +0100
++++ mozilla/configure.in 2010-11-09 12:59:28.000000000 +0100
+@@ -1549,7 +1549,7 @@
+ CPU_ARCH=sparc
+ ;;
+
+-x86_64 | ia64)
++amd64 | x86_64 | ia64)
+ CPU_ARCH="$OS_TEST"
+ ;;
+
+@@ -1567,7 +1567,7 @@ dnl Set INTEL_ARCHITECTURE if we're comp
+ dnl ===============================================================
+ INTEL_ARCHITECTURE=
+ case "$OS_TEST" in
+- x86_64|i?86)
++ amd64|x86_64|i?86)
+ INTEL_ARCHITECTURE=1
+ esac
+
+@@ -3803,19 +3803,21 @@
+ AC_CHECK_FUNCS(localtime_r strtok_r)
+
+ dnl check for clock_gettime(), the CLOCK_MONOTONIC clock, and -lrt
+-_SAVE_LDFLAGS=$LDFLAGS
+-LDFLAGS="$LDFLAGS -lrt"
+-AC_CACHE_CHECK(for clock_gettime(CLOCK_MONOTONIC) and -lrt,
++_SAVE_LIBS=$LIBS
++AC_SEARCH_LIBS(clock_gettime, rt)
++AC_CACHE_CHECK(for clock_gettime(CLOCK_MONOTONIC),
+ ac_cv_have_clock_monotonic,
+ [AC_TRY_LINK([#include <time.h>],
+ [ struct timespec ts;
+ clock_gettime(CLOCK_MONOTONIC, &ts); ],
+ ac_cv_have_clock_monotonic=yes,
+ ac_cv_have_clock_monotonic=no)])
+-LDFLAGS=$_SAVE_LDFLAGS
++LIBS=$_SAVE_LIBS
+ if test "$ac_cv_have_clock_monotonic" = "yes"; then
+ HAVE_CLOCK_MONOTONIC=1
+- REALTIME_LIBS=-lrt
++ if test "$ac_cv_search_clock_gettime" != "none required"; then
++ REALTIME_LIBS=$ac_cv_search_clock_gettime
++ fi
+ AC_DEFINE(HAVE_CLOCK_MONOTONIC)
+ AC_SUBST(HAVE_CLOCK_MONOTONIC)
+ AC_SUBST(REALTIME_LIBS)
+@@ -4808,7 +4810,7 @@ CFLAGS=$_SAVE_CFLAGS
+ LDFLAGS=$_SAVE_LDFLAGS
+ LIBS=$_SAVE_LIBS
+
+-if test "${ZLIB_DIR}" -a -d "${ZLIB_DIR}" -a "$SYSTEM_ZLIB" = 1; then
++if test "${ZLIB_DIR}" -a "${ZLIB_DIR}" != "/usr" -a -d "${ZLIB_DIR}" -a "$SYSTEM_ZLIB" = 1; then
+ ZLIB_CFLAGS="-I${ZLIB_DIR}/include"
+ ZLIB_LIBS="-L${ZLIB_DIR}/lib ${ZLIB_LIBS}"
+ fi
+@@ -6022,6 +6024,14 @@
+ VPX_ASFLAGS="-f elf64 -rnasm -pnasm -DPIC"
+ VPX_X86_ASM=1
+ ;;
++ FreeBSD:i386)
++ VPX_ASFLAGS="-f elf32 -rnasm -pnasm"
++ VPX_X86_ASM=1
++ ;;
++ FreeBSD:amd64)
++ VPX_ASFLAGS="-f elf64 -rnasm -pnasm -DPIC"
++ VPX_X86_ASM=1
++ ;;
+ SunOS:x86)
+ VPX_ASFLAGS="-f elf32 -rnasm -pnasm"
+ VPX_X86_ASM=1
+@@ -6392,6 +6402,14 @@ if test -n "$MOZ_LIBJPEG_TURBO"; then
+ LIBJPEG_TURBO_ASFLAGS="-f elf64 -rnasm -pnasm -D__x86_64__ -DPIC -DELF"
+ LIBJPEG_TURBO_X64_ASM=1
+ ;;
++ FreeBSD:i386)
++ LIBJPEG_TURBO_ASFLAGS="-f elf32 -rnasm -pnasm -DPIC -DELF"
++ LIBJPEG_TURBO_X86_ASM=1
++ ;;
++ FreeBSD:amd64)
++ LIBJPEG_TURBO_ASFLAGS="-f elf64 -rnasm -pnasm -D__x86_64__ -DPIC -DELF"
++ LIBJPEG_TURBO_X64_ASM=1
++ ;;
+ SunOS:i?86)
+ LIBJPEG_TURBO_ASFLAGS="-f elf32 -rnasm -pnasm -DPIC -DELF"
+ LIBJPEG_TURBO_X86_ASM=1
Added: branches/experimental/www/seamonkey/files/patch-mozilla-gfx-qcms-Makefile.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/seamonkey/files/patch-mozilla-gfx-qcms-Makefile.in Fri Jul 29 22:32:35 2011 (r600)
@@ -0,0 +1,11 @@
+--- mozilla/gfx/qcms/Makefile.in.orig 2011-01-22 01:25:38.000000000 +0100
++++ mozilla/gfx/qcms/Makefile.in 2011-01-27 18:16:39.000000000 +0100
+@@ -15,7 +15,7 @@
+
+ CSRCS = iccread.c transform.c
+
+-ifeq (86,$(findstring 86,$(OS_TEST)))
++ifneq (,$(INTEL_ARCHITECTURE))
+ CSRCS += transform-sse2.c
+ ifdef _MSC_VER
+ ifneq ($(OS_ARCH)_$(OS_TEST),WINNT_x86_64)
Added: branches/experimental/www/seamonkey/files/patch-mozilla-media-libvpx-vpx_config.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/seamonkey/files/patch-mozilla-media-libvpx-vpx_config.c Fri Jul 29 22:32:35 2011 (r600)
@@ -0,0 +1,16 @@
+--- mozilla/media/libvpx/vpx_config_c.c~
++++ mozilla/media/libvpx/vpx_config_c.c
+@@ -12,11 +12,11 @@
+ /* 32 bit MacOS. */
+ #include "vpx_config_x86-darwin9-gcc.c"
+
+-#elif defined(__linux__) && defined(__i386__)
++#elif (defined(__linux__) || defined(__FreeBSD__)) && defined(__i386__)
+ /* 32 bit Linux. */
+ #include "vpx_config_x86-linux-gcc.c"
+
+-#elif defined(__linux__) && defined(__x86_64__)
++#elif (defined(__linux__) || defined(__FreeBSD__)) && defined(__x86_64__)
+ /* 64 bit Linux. */
+ #include "vpx_config_x86_64-linux-gcc.c"
+
Added: branches/experimental/www/seamonkey/files/patch-mozilla-media-libvpx-vpx_config.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/seamonkey/files/patch-mozilla-media-libvpx-vpx_config.h Fri Jul 29 22:32:35 2011 (r600)
@@ -0,0 +1,16 @@
+--- mozilla/media/libvpx/vpx_config.h~
++++ mozilla/media/libvpx/vpx_config.h
+@@ -12,11 +12,11 @@
+ /* 32 bit MacOS. */
+ #include "vpx_config_x86-darwin9-gcc.h"
+
+-#elif defined(__linux__) && defined(__i386__)
++#elif (defined(__linux__) || defined(__FreeBSD__)) && defined(__i386__)
+ /* 32 bit Linux. */
+ #include "vpx_config_x86-linux-gcc.h"
+
+-#elif defined(__linux__) && defined(__x86_64__)
++#elif (defined(__linux__) || defined(__FreeBSD__)) && defined(__x86_64__)
+ /* 64 bit Linux. */
+ #include "vpx_config_x86_64-linux-gcc.h"
+
More information about the freebsd-gecko
mailing list