head 1.4; access; symbols pkgsrc-2026Q1:1.4.0.40 pkgsrc-2026Q1-base:1.4 pkgsrc-2025Q4:1.4.0.38 pkgsrc-2025Q4-base:1.4 pkgsrc-2025Q3:1.4.0.36 pkgsrc-2025Q3-base:1.4 pkgsrc-2025Q2:1.4.0.34 pkgsrc-2025Q2-base:1.4 pkgsrc-2025Q1:1.4.0.32 pkgsrc-2025Q1-base:1.4 pkgsrc-2024Q4:1.4.0.30 pkgsrc-2024Q4-base:1.4 pkgsrc-2024Q3:1.4.0.28 pkgsrc-2024Q3-base:1.4 pkgsrc-2024Q2:1.4.0.26 pkgsrc-2024Q2-base:1.4 pkgsrc-2024Q1:1.4.0.24 pkgsrc-2024Q1-base:1.4 pkgsrc-2023Q4:1.4.0.22 pkgsrc-2023Q4-base:1.4 pkgsrc-2023Q3:1.4.0.20 pkgsrc-2023Q3-base:1.4 pkgsrc-2023Q2:1.4.0.18 pkgsrc-2023Q2-base:1.4 pkgsrc-2023Q1:1.4.0.16 pkgsrc-2023Q1-base:1.4 pkgsrc-2022Q4:1.4.0.14 pkgsrc-2022Q4-base:1.4 pkgsrc-2022Q3:1.4.0.12 pkgsrc-2022Q3-base:1.4 pkgsrc-2022Q2:1.4.0.10 pkgsrc-2022Q2-base:1.4 pkgsrc-2022Q1:1.4.0.8 pkgsrc-2022Q1-base:1.4 pkgsrc-2021Q4:1.4.0.6 pkgsrc-2021Q4-base:1.4 pkgsrc-2021Q3:1.4.0.4 pkgsrc-2021Q3-base:1.4 pkgsrc-2021Q2:1.4.0.2 pkgsrc-2021Q2-base:1.4 pkgsrc-2021Q1:1.3.0.16 pkgsrc-2021Q1-base:1.3 pkgsrc-2020Q4:1.3.0.14 pkgsrc-2020Q4-base:1.3 pkgsrc-2020Q3:1.3.0.12 pkgsrc-2020Q3-base:1.3 pkgsrc-2020Q2:1.3.0.10 pkgsrc-2020Q2-base:1.3 pkgsrc-2020Q1:1.3.0.6 pkgsrc-2020Q1-base:1.3 pkgsrc-2019Q4:1.3.0.8 pkgsrc-2019Q4-base:1.3 pkgsrc-2019Q3:1.3.0.4 pkgsrc-2019Q3-base:1.3 pkgsrc-2019Q2:1.3.0.2 pkgsrc-2019Q2-base:1.3 pkgsrc-2019Q1:1.1.0.18 pkgsrc-2019Q1-base:1.1 pkgsrc-2018Q4:1.1.0.16 pkgsrc-2018Q4-base:1.1 pkgsrc-2018Q3:1.1.0.14 pkgsrc-2018Q3-base:1.1 pkgsrc-2018Q2:1.1.0.12 pkgsrc-2018Q2-base:1.1 pkgsrc-2018Q1:1.1.0.10 pkgsrc-2018Q1-base:1.1 pkgsrc-2017Q4:1.1.0.8 pkgsrc-2017Q4-base:1.1 pkgsrc-2017Q3:1.1.0.6 pkgsrc-2017Q3-base:1.1 pkgsrc-2017Q2:1.1.0.2 pkgsrc-2017Q2-base:1.1; locks; strict; comment @# @; 1.4 date 2021.04.01.15.28.10; author martin; state Exp; branches; next 1.3; commitid XUCnIp9pdrMYsBNC; 1.3 date 2019.06.14.08.11.35; author nia; state Exp; branches; next 1.2; commitid 1JnUVZ0BYVNFa8rB; 1.2 date 2019.06.01.19.11.28; author maya; state Exp; branches; next 1.1; commitid HEuzUYS3SbMIewpB; 1.1 date 2017.04.27.01.55.57; author ryoon; state Exp; branches; next ; commitid 6CghKLrfFNzt67Pz; desc @@ 1.4 log @Avoid a gnu specific regex in a sed invocation during autoconfigury, now the pkg builds again on NetBSD-current. @ text @$NetBSD: patch-aa,v 1.3 2019/06/14 08:11:35 nia Exp $ * MOZ_ENABLE_PROFILER_SPS is not for users, Disable it * Disable libjpeg-turbo check * Add system libraries option * Add OSS audio support * Add Sun audio support * Fix GNU specific sed call by using a portable regex instead --- old-configure.in.orig 2017-09-11 22:13:47.000000000 +0200 +++ old-configure.in 2021-03-31 20:45:25.040426765 +0200 @@@@ -2159,11 +2159,7 @@@@ if test "$MOZ_SYSTEM_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_SYSTEM_JPEG=1, AC_MSG_ERROR([Insufficient JPEG library version for --with-system-jpeg])) fi @@@@ -2894,6 +2890,9 @@@@ if test -n "$MOZ_WEBRTC"; then MOZ_RAW=1 MOZ_VPX_ERROR_CONCEALMENT=1 + dnl with libv4l2 we can support more cameras + PKG_CHECK_MODULES(MOZ_LIBV4L2, libv4l2) + dnl enable once Signaling lands MOZ_WEBRTC_SIGNALING=1 AC_DEFINE(MOZ_WEBRTC_SIGNALING) @@@@ -2936,7 +2935,7 @@@@ dnl Use integers over floats for audio o dnl (regarless of the CPU architecture, because audio dnl backends for those platforms don't support floats. We also dnl use integers on ARM with other OS, because it's more efficient. -if test "$OS_TARGET" = "Android" -o "$CPU_ARCH" = "arm"; then +if test -n "$MOZ_INTEGER_SAMPLES"; then MOZ_SAMPLE_TYPE_S16=1 AC_DEFINE(MOZ_SAMPLE_TYPE_S16) AC_SUBST(MOZ_SAMPLE_TYPE_S16) @@@@ -3044,6 +3043,111 @@@@ if test -n "$MOZ_OMX_PLUGIN"; then fi fi +dnl ======================================================== +dnl Check for libogg +dnl ======================================================== + +MOZ_ARG_WITH_BOOL(system-ogg, +[ --with-system-ogg Use system libogg (located with pkgconfig)], +MOZ_SYSTEM_OGG=1, +MOZ_SYSTEM_OGG=) + +if test -n "$MOZ_SYSTEM_OGG"; then + PKG_CHECK_MODULES(MOZ_OGG, ogg >= 1.3.0) + + _SAVE_LIBS=$LIBS + LIBS="$LIBS $MOZ_OGG_LIBS" + AC_CHECK_FUNC(ogg_set_mem_functions, [], + [AC_DEFINE(MOZ_OGG_NO_MEM_REPORTING)]) + LIBS=$_SAVE_LIBS +fi + +AC_SUBST(MOZ_SYSTEM_OGG) + +dnl ======================================================== +dnl Check for libvorbis +dnl ======================================================== + +MOZ_ARG_WITH_BOOL(system-vorbis, +[ --with-system-vorbis Use system libvorbis (located with pkgconfig)], +MOZ_SYSTEM_VORBIS=1, +MOZ_SYSTEM_VORBIS=) + +if test -n "$MOZ_SYSTEM_VORBIS"; then + PKG_CHECK_MODULES(MOZ_VORBIS, vorbis vorbisenc >= 1.3.5) +fi + +AC_SUBST(MOZ_SYSTEM_VORBIS) + +dnl ======================================================== +dnl Check for integer-only libvorbis aka tremor +dnl ======================================================== + +MOZ_ARG_WITH_BOOL(system-tremor, +[ --with-system-tremor Use system libtremor (located with pkgconfig)], +MOZ_SYSTEM_TREMOR=1, +MOZ_SYSTEM_TREMOR=) + +if test -n "$MOZ_SYSTEM_TREMOR"; then + PKG_CHECK_MODULES(MOZ_TREMOR, vorbisidec >= 1.2.1) +fi + +AC_SUBST(MOZ_SYSTEM_TREMOR) + +dnl ======================================================== +dnl Check for libtheora +dnl ======================================================== + +MOZ_ARG_WITH_BOOL(system-theora, +[ --with-system-theora Use system libtheora (located with pkgconfig)], +MOZ_SYSTEM_THEORA=1, +MOZ_SYSTEM_THEORA=) + +if test -n "$MOZ_SYSTEM_THEORA"; then + PKG_CHECK_MODULES(MOZ_THEORA, theora >= 1.2) +fi + +AC_SUBST(MOZ_SYSTEM_THEORA) + +dnl ======================================================== +dnl Check for libSoundTouch +dnl ======================================================== + +MOZ_ARG_WITH_BOOL(system-soundtouch, +[ --with-system-soundtouch Use system libSoundTouch (located with pkgconfig)], +MOZ_SYSTEM_SOUNDTOUCH=1, +MOZ_SYSTEM_SOUNDTOUCH=) + +if test -n "$MOZ_SYSTEM_SOUNDTOUCH"; then + PKG_CHECK_MODULES(MOZ_SOUNDTOUCH, soundtouch >= 1.9.0) + + AC_LANG_SAVE + AC_LANG_CPLUSPLUS + _SAVE_CXXFLAGS=$CXXFLAGS + CXXFLAGS="$CXXFLAGS $MOZ_SOUNDTOUCH_CFLAGS" + AC_CACHE_CHECK(for soundtouch sample type, + ac_cv_soundtouch_sample_type, + [AC_TRY_COMPILE([#include + #ifndef SOUNDTOUCH_INTEGER_SAMPLES + #error soundtouch expects float samples + #endif], + [], + [ac_cv_soundtouch_sample_type=short], + [ac_cv_soundtouch_sample_type=float])]) + CXXFLAGS=$_SAVE_CXXFLAGS + AC_LANG_RESTORE + + if test \( -n "$MOZ_SAMPLE_TYPE_S16" -a "$ac_cv_soundtouch_sample_type" != short \) \ + -o \( -n "$MOZ_SAMPLE_TYPE_FLOAT32" -a "$ac_cv_soundtouch_sample_type" != float \) ; then + AC_MSG_ERROR([SoundTouch library is built with incompatible sample type. Either rebuild the library with/without --enable-integer-samples, chase default Mozilla sample type or remove --with-system-soundtouch.]) + fi +fi + +if test -n "$MOZ_SYSTEM_SOUNDTOUCH"; then + AC_DEFINE(MOZ_SYSTEM_SOUNDTOUCH) +fi +AC_SUBST(MOZ_SYSTEM_SOUNDTOUCH) + dnl system libvpx Support dnl ======================================================== MOZ_ARG_WITH_BOOL(system-libvpx, @@@@ -3208,6 +3312,71 @@@@ AC_DEFINE(MOZ_WEBM_ENCODER) AC_SUBST(MOZ_WEBM_ENCODER) dnl ================================== +dnl = Check OSS/sunaudio availability +dnl ================================== + +dnl If using Linux, Solaris or BSDs, ensure that OSS is available +case "$OS_TARGET" in +Linux|DragonFly|FreeBSD|GNU/kFreeBSD) + MOZ_OSS=1 + ;; +SunOS|NetBSD) + MOZ_SUN=1 + ;; +esac + +MOZ_ARG_WITH_STRING(oss, +[ --with-oss[=PFX] Enable OpenSoundSystem support [installed at prefix PFX]], + OSSPREFIX=$withval) + +if test -n "$OSSPREFIX"; then + if test "$OSSPREFIX" != "no"; then + MOZ_OSS=1 + else + MOZ_OSS= + fi +fi + +_SAVE_CFLAGS=$CFLAGS +_SAVE_LIBS=$LIBS +if test -n "$MOZ_OSS"; then + dnl Prefer 4Front implementation + AC_MSG_CHECKING([MOZ_OSS_CFLAGS]) + if test "$OSSPREFIX" != "yes"; then + oss_conf=${OSSPREFIX%/usr}/etc/oss.conf + if test -f "$oss_conf"; then + . "$oss_conf" + else + OSSLIBDIR=$OSSPREFIX/lib/oss + fi + if test -d "$OSSLIBDIR"; then + MOZ_OSS_CFLAGS="$MOZ_OSS_CFLAGS -I$OSSLIBDIR/include" + fi + fi + AC_MSG_RESULT([$MOZ_OSS_CFLAGS]) + + CFLAGS="$CFLAGS $MOZ_OSS_CFLAGS" + MOZ_CHECK_HEADERS(sys/soundcard.h soundcard.h) + + if test "$ac_cv_header_sys_soundcard_h" != "yes" -a \ + "$ac_cv_header_soundcard_h" != "yes"; then + AC_MSG_ERROR([Need OSS for Ogg, Wave or WebM decoding on $OS_TARGET. Disable with --without-oss.]) + fi + + dnl Assume NetBSD implementation over SunAudio + AC_CHECK_LIB(ossaudio, _oss_ioctl, + [AC_DEFINE_UNQUOTED(CUBEB_OSS_DEFAULT_OUTPUT, "/dev/audio") + MOZ_OSS_LIBS="$MOZ_OSS_LIBS -lossaudio"]) +fi +CFLAGS=$_SAVE_CFLAGS +LIBS=$_SAVE_LIBS + +AC_SUBST(MOZ_OSS) +AC_SUBST(MOZ_SUN) +AC_SUBST_LIST(MOZ_OSS_CFLAGS) +AC_SUBST_LIST(MOZ_OSS_LIBS) + +dnl ================================== dnl = Check alsa availability on Linux dnl ================================== @@@@ -5023,6 +5192,27 @@@@ if test "$USE_FC_FREETYPE"; then fi dnl ======================================================== +dnl Check for graphite2 +dnl ======================================================== +if test -n "$MOZ_SYSTEM_GRAPHITE2"; then + dnl graphite2.pc has bogus version, check manually + _SAVE_CFLAGS=$CFLAGS + CFLAGS="$CFLAGS $MOZ_GRAPHITE2_CFLAGS" + AC_TRY_COMPILE([ #include + #define GR2_VERSION_REQUIRE(major,minor,bugfix) \ + ( GR2_VERSION_MAJOR * 10000 + GR2_VERSION_MINOR \ + * 100 + GR2_VERSION_BUGFIX >= \ + (major) * 10000 + (minor) * 100 + (bugfix) ) + ], [ + #if !GR2_VERSION_REQUIRE(1,3,8) + #error "Insufficient graphite2 version." + #endif + ], [], + [AC_MSG_ERROR([--with-system-graphite2 requested but no working libgraphite2 found])]) + CFLAGS=$_SAVE_CFLAGS +fi + +dnl ======================================================== dnl Check for pixman and cairo dnl ======================================================== @@@@ -5916,7 +6106,7 @@@@ ac_configure_args="$_SUBDIR_CONFIG_ARGS" # --with-system-nspr will have been converted into the relevant $NSPR_CFLAGS # and $NSPR_LIBS. -ac_configure_args="`echo $ac_configure_args | sed -e 's/--with-system-nspr\S* *//'`" +ac_configure_args="`echo $ac_configure_args | sed -e 's/--with-system-nspr[[^[:space:]]]* *//'`" if test "$_INTL_API" = no; then ac_configure_args="$ac_configure_args --without-intl-api" @ 1.3 log @firefox52: This gets a sun audio too. Like seamonkey, this uses an older API for it, so device detection for microphones (etc) is currently disabled. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.2 2019/06/01 19:11:28 maya Exp $ d8 1 d10 2 a11 2 --- old-configure.in.orig 2017-09-11 20:13:47.000000000 +0000 +++ old-configure.in d256 9 @ 1.2 log @firefox*: don't use /dev/sound on netbsd. it treats "pause" as a sticky operation and might randomly fail to play audio if another program has paused its audio. PR kern/54229 @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.1 2017/04/27 01:55:57 ryoon Exp $ d7 1 d9 1 a9 1 --- old-configure.in.orig 2017-03-04 10:47:32.150192599 +0000 d155 1 a155 1 @@@@ -3208,6 +3312,67 @@@@ AC_DEFINE(MOZ_WEBM_ENCODER) d159 1 a159 1 +dnl = Check OSS availability d164 1 a164 1 +Linux|SunOS|DragonFly|FreeBSD|NetBSD|GNU/kFreeBSD) d167 3 d219 1 d227 1 a227 1 @@@@ -5023,6 +5188,27 @@@@ if test "$USE_FC_FREETYPE"; then @ 1.1 log @Import firefox52-52.1.0 as www/firefox52. Mozilla Firefox is a free, open-source and cross-platform web browser for Windows, Linux, MacOS X and many other operating systems. It is fast and easy to use, and offers many advantages over other web browsers, such as tabbed browsing and the ability to block pop-up windows. Firefox also offers excellent bookmark and history management, and it can be extended by developers using industry standards such as XML, CSS, JavaScript, C++, etc. Many extensions are available. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.50 2017/03/07 20:45:43 ryoon Exp $ d208 1 a208 1 + [AC_DEFINE_UNQUOTED(CUBEB_OSS_DEFAULT_OUTPUT, "/dev/sound") @