head 1.20; access; symbols pkgsrc-2013Q2:1.20.0.2 pkgsrc-2013Q2-base:1.20 pkgsrc-2013Q1:1.17.0.2 pkgsrc-2013Q1-base:1.17 pkgsrc-2012Q4:1.14.0.2 pkgsrc-2012Q4-base:1.14 pkgsrc-2012Q3:1.12.0.2 pkgsrc-2012Q3-base:1.12 pkgsrc-2012Q2:1.10.0.2 pkgsrc-2012Q2-base:1.10 pkgsrc-2012Q1:1.9.0.2 pkgsrc-2012Q1-base:1.9 pkgsrc-2011Q4:1.8.0.2 pkgsrc-2011Q4-base:1.8 pkgsrc-2011Q3:1.6.0.2 pkgsrc-2011Q3-base:1.6 pkgsrc-2011Q2:1.5.0.2 pkgsrc-2011Q2-base:1.5 pkgsrc-2011Q1:1.4.0.12 pkgsrc-2011Q1-base:1.4 pkgsrc-2010Q4:1.4.0.10 pkgsrc-2010Q4-base:1.4 pkgsrc-2010Q3:1.4.0.8 pkgsrc-2010Q3-base:1.4 pkgsrc-2010Q2:1.4.0.6 pkgsrc-2010Q2-base:1.4 pkgsrc-2010Q1:1.4.0.4 pkgsrc-2010Q1-base:1.4 pkgsrc-2009Q4:1.4.0.2 pkgsrc-2009Q4-base:1.4 pkgsrc-2009Q3:1.1.1.1.0.2 pkgsrc-2009Q3-base:1.1.1.1 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.20 date 2013.05.23.12.55.26; author ryoon; state dead; branches; next 1.19; commitid hOYA93csj3ibSKQw; 1.19 date 2013.05.19.08.47.41; author ryoon; state Exp; branches; next 1.18; commitid i72N8U6dwY2uDdQw; 1.18 date 2013.04.05.13.30.17; author ryoon; state Exp; branches; next 1.17; 1.17 date 2013.03.25.02.55.59; author sbd; state Exp; branches; next 1.16; 1.16 date 2013.01.10.15.01.30; author ryoon; state Exp; branches; next 1.15; 1.15 date 2013.01.05.08.02.16; author sbd; state Exp; branches; next 1.14; 1.14 date 2012.11.21.15.26.49; author ryoon; state Exp; branches; next 1.13; 1.13 date 2012.11.17.10.57.49; author ryoon; state Exp; branches; next 1.12; 1.12 date 2012.08.28.23.27.10; author ryoon; state Exp; branches; next 1.11; 1.11 date 2012.08.28.12.42.01; author ryoon; state Exp; branches; next 1.10; 1.10 date 2012.04.26.13.30.29; author ryoon; state Exp; branches; next 1.9; 1.9 date 2012.03.06.12.34.08; author ryoon; state Exp; branches; next 1.8; 1.8 date 2011.11.12.12.45.04; author tnn; state Exp; branches; next 1.7; 1.7 date 2011.10.03.12.37.24; author tnn; state Exp; branches; next 1.6; 1.6 date 2011.08.18.18.31.10; author tnn; state Exp; branches; next 1.5; 1.5 date 2011.04.26.14.16.36; author tnn; state Exp; branches; next 1.4; 1.4 date 2009.11.04.09.44.09; author tnn; state Exp; branches; next 1.3; 1.3 date 2009.11.04.09.13.06; author tnn; state Exp; branches; next 1.2; 1.2 date 2009.10.11.10.49.56; author tnn; state Exp; branches; next 1.1; 1.1 date 2009.08.05.02.59.48; author tnn; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2009.08.05.02.59.48; author tnn; state Exp; branches 1.1.1.1.2.1; next ; 1.1.1.1.2.1 date 2009.10.28.18.13.23; author tron; state Exp; branches; next ; desc @@ 1.20 log @Remove xulrunner. This does not work, and there is no consumer. @ text @$NetBSD: patch-aa,v 1.19 2013/05/19 08:47:41 ryoon Exp $ --- configure.in.orig 2013-05-11 19:19:23.000000000 +0000 +++ configure.in @@@@ -1404,6 +1404,17 @@@@ if test "$GNU_CC"; then CFLAGS=$_SAVE_CFLAGS AC_SUBST(HAVE_TOOLCHAIN_SUPPORT_MSSSE3) + # Check for -msse4.1 on $CC + AC_MSG_CHECKING([if toolchain supports -msse4.1 option]) + HAVE_TOOLCHAIN_SUPPORT_MSSE4_1= + _SAVE_CFLAGS=$CFLAGS + CFLAGS="$CFLAGS -msse4.1" + AC_TRY_COMPILE([asm ("pmulld %xmm6,%xmm0");],,AC_MSG_RESULT([yes]) + [HAVE_TOOLCHAIN_SUPPORT_MSSE4_1=1], + AC_MSG_RESULT([no])) + CFLAGS=$_SAVE_CFLAGS + AC_SUBST(HAVE_TOOLCHAIN_SUPPORT_MSSE4_1) + # Turn on GNU-specific warnings: # -Wall - turn on a lot of warnings # -Wpointer-arith - good to have @@@@ -2066,6 +2077,9 @@@@ ia64*-hpux*) if test -z "$MC"; then MC=mc.exe fi + if test "$LIBRUNPATH"; then + DSO_LDOPTS="-Wl,-R$LIBRUNPATH $DSO_LDOPTS" + fi ;; *-mingw*) DSO_CFLAGS= @@@@ -2848,6 +2862,7 @@@@ EOF #pragma GCC visibility push(hidden) #pragma GCC visibility push(default) #include +#include #pragma GCC visibility pop __attribute__ ((visibility ("default"))) void Func() { @@@@ -2856,7 +2871,7 @@@@ __attribute__ ((visibility ("default"))) } EOF ac_cv_have_visibility_builtin_bug=no - if ! ${CC-cc} ${CFLAGS} ${DSO_PIC_CFLAGS} ${DSO_LDOPTS} -O2 -S -o conftest.S conftest.c > /dev/null 2>&1 ; then + if ! ${CXX-c++} ${CXXFLAGS} ${DSO_PIC_CFLAGS} ${DSO_LDOPTS} -O2 -S -o conftest.S conftest.c > /dev/null 2>&1 ; then ac_cv_have_visibility_builtin_bug=yes else if test `grep -c "@@PLT" conftest.S` = 0; then @@@@ -3018,6 +3033,9 @@@@ dnl ==================================== case $target in *-hpux11.*) ;; +*-dragonfly*) + AC_CHECK_LIB(c, gethostbyname_r) + ;; *) AC_CHECK_LIB(c_r, gethostbyname_r) ;; @@@@ -3319,6 +3337,9 @@@@ AC_CACHE_CHECK( #ifdef linux #define _BSD_SOURCE 1 #endif + #ifdef __NetBSD__ + #error use of global _res variable in threaded programs is not portable + #endif #include ], [int foo = res_ninit(&_res);], @@@@ -3989,6 +4010,14 @@@@ if test -n "$YASM"; then _YASM_BUILD=` echo ${YASM_VERSION} | $AWK -F\. '{ print $4 }'` fi +if test -n "${LIBXUL_SDK_DIR}"; then + AC_MSG_WARN([pkgsrc: LIBXUL_SDK_DIR is set; assuming we want nss and nspr from xulrunner.]) + NSPR_CFLAGS="-I${prefix}/include/xulrunner/unstable `pkg-config --cflags mozilla-nspr`" + NSPR_LIBS="`pkg-config --libs mozilla-nspr`" + NSS_CFLAGS="`pkg-config --cflags mozilla-nss`" + NSS_LIBS="`pkg-config --libs mozilla-nss`" +fi + if test -z "$SKIP_LIBRARY_CHECKS"; then dnl system JPEG support dnl ======================================================== @@@@ -4016,11 +4045,7 @@@@ if test "$MOZ_NATIVE_JPEG" = 1; then #include ], [ #if JPEG_LIB_VERSION < $MOZJPEG #error "Insufficient JPEG library version ($MOZJPEG required)." - #endif - #ifndef JCS_EXTENSIONS - #error "libjpeg-turbo JCS_EXTENSIONS required" - #endif - ], + #endif ], MOZ_NATIVE_JPEG=1, AC_MSG_ERROR([Insufficient JPEG library version for --with-system-jpeg])) fi @@@@ -5212,7 +5237,11 @@@@ if test -n "$MOZ_WEBRTC"; then dnl Make sure doesn't get matched by *-linux* MOZ_WEBRTC= ;; - *-linux*|*-mingw*|*-darwin*) + *-netbsd*) + dnl Custom socketvar.h is not compatible with NetBSD. + MOZ_WEBRTC= + ;; + *-linux*|*-mingw*|*-darwin*|*-dragonfly*|*-freebsd*|*-openbsd*) dnl Leave enabled ;; *) @@@@ -5263,6 +5292,9 @@@@ if test -n "$MOZ_WEBRTC"; then MOZ_VP8_ENCODER=1 MOZ_VP8_ERROR_CONCEALMENT=1 + dnl with libv4l2 we can support more cameras + PKG_CHECK_MODULES(MOZ_LIBV4L2, libv4l2) + dnl OpenSLES is only available in Android 2.3 and later; we'll change this dnl hard dependency to a dynamic load with graceful runtime failure before dnl we make --enable-webrtc on by default in Android (bug 815905) @@@@ -5299,8 +5331,8 @@@@ AC_SUBST(MOZ_WEBRTC_IN_LIBXUL) AC_SUBST(MOZ_SCTP) AC_SUBST(MOZ_SRTP) -case "$target_cpu" in -arm*) +case "$target" in +arm-*-linux*|*-dragonfly*|*-freebsd*|*-netbsd*|*-openbsd*) MOZ_SAMPLE_TYPE_S16=1 AC_DEFINE(MOZ_SAMPLE_TYPE_S16) AC_SUBST(MOZ_SAMPLE_TYPE_S16) @@@@ -5704,7 +5736,7 @@@@ MOZ_ALSA=) if test -n "$MOZ_ALSA"; then AC_DEFINE(MOZ_CUBEB) - PKG_CHECK_MODULES(MOZ_ALSA, alsa, , + PKG_CHECK_MODULES(MOZ_ALSA, alsa, MOZ_ALSA=1, [echo "$MOZ_ALSA_PKG_ERRORS" AC_MSG_ERROR([Need alsa for Ogg, Wave or WebM decoding on Linux. Disable with --disable-ogg --disable-wave --disable-webm. (On Ubuntu, you might try installing the package libasound2-dev.)])]) fi @@@@ -8311,16 +8343,26 @@@@ MOZ_ARG_DISABLE_BOOL(necko-wifi, NECKO_WIFI=, NECKO_WIFI=1) -if test "$OS_ARCH" = "OS2"; then - dnl OS/2 implementation of Necko-WiFi support will be added in bug 506566 - NECKO_WIFI= -fi -if test "$NECKO_WIFI" -a \ - "$OS_ARCH" != "Linux" -a \ - "$OS_ARCH" != "Darwin" -a \ - "$OS_ARCH" != "SunOS" -a \ - "$OS_ARCH" != "WINNT"; then - AC_MSG_ERROR([Necko WiFi scanning not supported on your platform, use --disable-necko-wifi]) +if test "$NECKO_WIFI"; then + case "$OS_TARGET" in + Android) + ;; + Darwin) + ;; + SunOS) + ;; + WINNT) + ;; + OS2) + dnl OS/2 implementation of Necko-WiFi support will be added in bug 506566 + NECKO_WIFI= + ;; + *) + if test -z "$MOZ_ENABLE_DBUS"; then + AC_MSG_ERROR([Necko WiFi scanning needs DBus on your platform, remove --disable-dbus or use --disable-necko-wifi]) + fi + ;; + esac fi if test "$NECKO_WIFI"; then @@@@ -8981,6 +9023,27 @@@@ elif test "${OS_TARGET}" = "Android"; th fi fi +# Keep libcubeb and audio_device backends in sync +if test -n "$MOZ_ALSA"; then + EXTRA_GYP_DEFINES="$EXTRA_GYP_DEFINES -D include_alsa_audio=1" +else + EXTRA_GYP_DEFINES="$EXTRA_GYP_DEFINES -D include_alsa_audio=0" +fi +if test -n "$MOZ_PULSEAUDIO"; then + EXTRA_GYP_DEFINES="$EXTRA_GYP_DEFINES -D include_pulse_audio=1" +else + EXTRA_GYP_DEFINES="$EXTRA_GYP_DEFINES -D include_pulse_audio=0" +fi + +# Don't try to compile sse4.1 code if toolchain doesn't support +if test -z "$HAVE_TOOLCHAIN_SUPPORT_MSSE4_1"; then + EXTRA_GYP_DEFINES="$EXTRA_GYP_DEFINES -D yuv_disable_asm=1" +fi + +if test -n "$MOZ_LIBV4L2_LIBS"; then + EXTRA_GYP_DEFINES="$EXTRA_GYP_DEFINES -D use_libv4l2=1" +fi + if test -n "$MOZ_WEBRTC"; then AC_MSG_RESULT("generating WebRTC Makefiles...") @ 1.19 log @Update to 21.0 and mark as BROKEN. * Introduce WEBRTC patches for FreeBSD, this patches are not work for NetBSD. * When firefox/xulrunner-22.0 is released, I will check the functionality of xulrunner package again. * Patches and dist.mk are used by www/firefox. * Take MAINATINERship. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.18 2013/04/05 13:30:17 ryoon Exp $ @ 1.18 log @Update to 20.0 Changelog: NEW Per-window Private Browsing. Learn more. NEW New download experience. Learn more. NEW Ability to close hanging plugins, without the browser hanging CHANGED Continued performance improvements around common browser tasks (page loads, downloads, shutdown, etc.) DEVELOPER Continued implementation of draft ECMAScript 6 - clear() and Math.imul DEVELOPER New JavaScript Profiler tool HTML5 getUserMedia implemented for web access to the user's camera and microphone (with user permission) HTML5 now supports blend modes HTML5 Various