Received: by mail.netbsd.org (Postfix, from userid 605) id 6728484DA0; Fri, 13 Mar 2020 20:02:47 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id E3C0584D6A for ; Fri, 13 Mar 2020 20:02:46 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id PHspprkAFztc for ; Fri, 13 Mar 2020 20:02:45 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 6179484D5E for ; Fri, 13 Mar 2020 20:02:45 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 54BFEFB27; Fri, 13 Mar 2020 20:02:45 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1584129765167730" MIME-Version: 1.0 Date: Fri, 13 Mar 2020 20:02:45 +0000 From: "Benny Siegert" Subject: CVS commit: [pkgsrc-2019Q4] pkgsrc/www/firefox68 To: pkgsrc-changes@NetBSD.org Reply-To: bsiegert@netbsd.org X-Mailer: log_accum Message-Id: <20200313200245.54BFEFB27@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1584129765167730 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: bsiegert Date: Fri Mar 13 20:02:45 UTC 2020 Modified Files: pkgsrc/www/firefox68 [pkgsrc-2019Q4]: Makefile PLIST distinfo mozilla-common.mk options.mk pkgsrc/www/firefox68/patches [pkgsrc-2019Q4]: patch-aa patch-dom_media_CubebUtils.cpp patch-media_libcubeb_src_cubeb.c patch-media_libcubeb_src_moz.build patch-media_libcubeb_update.sh patch-toolkit_library_moz.build Removed Files: pkgsrc/www/firefox68/patches [pkgsrc-2019Q4]: patch-build_moz.configure_old.configure patch-media_libcubeb_src_cubeb__oss.c Log Message: Pullup ticket #6145 - requested by nia www/firefox68: security fix Revisions pulled up: - www/firefox68/Makefile 1.15 - www/firefox68/PLIST 1.5 - www/firefox68/distinfo 1.11 - www/firefox68/mozilla-common.mk 1.7 - www/firefox68/options.mk 1.8 - www/firefox68/patches/patch-aa 1.2 - www/firefox68/patches/patch-build_moz.configure_old.configure deleted - www/firefox68/patches/patch-dom_media_CubebUtils.cpp 1.2 - www/firefox68/patches/patch-media_libcubeb_src_cubeb.c 1.2 - www/firefox68/patches/patch-media_libcubeb_src_cubeb__oss.c deleted - www/firefox68/patches/patch-media_libcubeb_src_moz.build 1.2 - www/firefox68/patches/patch-media_libcubeb_update.sh 1.2 - www/firefox68/patches/patch-toolkit_library_moz.build 1.2 --- Module Name: pkgsrc Committed By: nia Date: Thu Mar 12 19:39:35 UTC 2020 Modified Files: pkgsrc/www/firefox68: Makefile PLIST distinfo mozilla-common.mk options.mk pkgsrc/www/firefox68/patches: patch-aa patch-dom_media_CubebUtils.cpp patch-media_libcubeb_src_cubeb.c patch-media_libcubeb_src_moz.build patch-media_libcubeb_update.sh patch-toolkit_library_moz.build Removed Files: pkgsrc/www/firefox68/patches: patch-build_moz.configure_old.configure patch-media_libcubeb_src_cubeb__oss.c Log Message: firefox68: Update to 68.6.0 While here, - Remove OSS support now that cubeb_sun has been stable for a long while - Appease pkglint Security fixes in this release: #CVE-2020-6805: Use-after-free when removing data about origins #CVE-2020-6806: BodyStream::OnInputStreamReady was missing protections #CVE-2020-6807: Use-after-free in cubeb during stream destruction #CVE-2020-6811: Devtools' 'Copy as cURL' feature did not fully escape #CVE-2019-20503: Out of bounds reads in sctp_load_addresses_from_init #CVE-2020-6812: The names of AirPods with personally identifiable #CVE-2020-6814: Memory safety bugs fixed in Firefox 74 and Firefox ESR 68.6 To generate a diff of this commit: cvs rdiff -u -r1.5.4.2 -r1.5.4.3 pkgsrc/www/firefox68/Makefile \ pkgsrc/www/firefox68/distinfo cvs rdiff -u -r1.3.4.1 -r1.3.4.2 pkgsrc/www/firefox68/PLIST cvs rdiff -u -r1.6 -r1.6.4.1 pkgsrc/www/firefox68/mozilla-common.mk cvs rdiff -u -r1.4 -r1.4.4.1 pkgsrc/www/firefox68/options.mk cvs rdiff -u -r1.1 -r1.1.6.1 pkgsrc/www/firefox68/patches/patch-aa \ pkgsrc/www/firefox68/patches/patch-dom_media_CubebUtils.cpp \ pkgsrc/www/firefox68/patches/patch-media_libcubeb_src_cubeb.c \ pkgsrc/www/firefox68/patches/patch-media_libcubeb_src_moz.build \ pkgsrc/www/firefox68/patches/patch-media_libcubeb_update.sh \ pkgsrc/www/firefox68/patches/patch-toolkit_library_moz.build cvs rdiff -u -r1.1 -r0 \ pkgsrc/www/firefox68/patches/patch-build_moz.configure_old.configure \ pkgsrc/www/firefox68/patches/patch-media_libcubeb_src_cubeb__oss.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1584129765167730 Content-Disposition: inline Content-Length: 20115 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/www/firefox68/Makefile diff -u pkgsrc/www/firefox68/Makefile:1.5.4.2 pkgsrc/www/firefox68/Makefile:1.5.4.3 --- pkgsrc/www/firefox68/Makefile:1.5.4.2 Sun Feb 23 11:50:10 2020 +++ pkgsrc/www/firefox68/Makefile Fri Mar 13 20:02:44 2020 @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.5.4.2 2020/02/23 11:50:10 bsiegert Exp $ +# $NetBSD: Makefile,v 1.5.4.3 2020/03/13 20:02:44 bsiegert Exp $ FIREFOX_VER= ${MOZ_BRANCH}${MOZ_BRANCH_MINOR} -MOZ_BRANCH= 68.5 +MOZ_BRANCH= 68.6 MOZ_BRANCH_MINOR= .0esr DISTNAME= firefox-${FIREFOX_VER}.source Index: pkgsrc/www/firefox68/distinfo diff -u pkgsrc/www/firefox68/distinfo:1.5.4.2 pkgsrc/www/firefox68/distinfo:1.5.4.3 --- pkgsrc/www/firefox68/distinfo:1.5.4.2 Sun Feb 23 11:50:10 2020 +++ pkgsrc/www/firefox68/distinfo Fri Mar 13 20:02:44 2020 @@ -1,14 +1,13 @@ -$NetBSD: distinfo,v 1.5.4.2 2020/02/23 11:50:10 bsiegert Exp $ +$NetBSD: distinfo,v 1.5.4.3 2020/03/13 20:02:44 bsiegert Exp $ -SHA1 (firefox-68.5.0esr.source.tar.xz) = 5e74dc0335b09819b24285d23e7746ca70af1dae -RMD160 (firefox-68.5.0esr.source.tar.xz) = 34b2446b42e98de3e9f5798466bd4f49375dd44a -SHA512 (firefox-68.5.0esr.source.tar.xz) = 0acf4ecd47bccf062ab330231e36355f5d84e66ab411f653ae3160583613840925bb473c0f7dfa4b15311a543940293c4633516851c9466c4b0133c9271710d3 -Size (firefox-68.5.0esr.source.tar.xz) = 314176068 bytes -SHA1 (patch-aa) = 1f292aae7d37bd480ba834324b737bfebee52503 +SHA1 (firefox-68.6.0esr.source.tar.xz) = 85d35d0a0190d56585f93c9f117d5c0f52bcbc44 +RMD160 (firefox-68.6.0esr.source.tar.xz) = d11d44f5400ca1f5c3b721dd974a77fbf7cf7e7a +SHA512 (firefox-68.6.0esr.source.tar.xz) = 84565d654ed8bd2d036d08de4d16e41ae8881f0b20b34424ab347d50a37384acf50c04f74269720e79db28028569dff79f2b910848939ff87c078f36684a75a3 +Size (firefox-68.6.0esr.source.tar.xz) = 313814396 bytes +SHA1 (patch-aa) = 9f7200c411cd2217a80ec10a276c8877bc6b845c SHA1 (patch-browser_app_profile_firefox.js) = 076cc2892547bac07fe907533f4e821f13f5738e -SHA1 (patch-build_moz.configure_old.configure) = 05963b12fd908d90e3378b30cff7e48291b8a447 SHA1 (patch-dom_base_nsAttrName.h) = ac7ba441a3b27df2855cf2673eea36b1cb44ad49 -SHA1 (patch-dom_media_CubebUtils.cpp) = b1b4f981c4bede877e3bd092d2648d4b8cbc73a5 +SHA1 (patch-dom_media_CubebUtils.cpp) = 3cd2c65ab281d802c56216565970450767a3fb24 SHA1 (patch-gfx_angle_checkout_src_common_third__party_smhasher_src_PMurHash.cpp) = e458c9c8dc66edc69c1874734af28a77fc5e3993 SHA1 (patch-gfx_angle_checkout_src_compiler_translator_InfoSink.h) = 2f73c76c48852613e0c55c1680fcc2a9eb3cf4ef SHA1 (patch-gfx_gl_GLContextProviderGLX.cpp) = 2c909a10a341e600392417240ad0c556f495d6ba @@ -24,14 +23,13 @@ SHA1 (patch-js_src_threading_posix_Threa SHA1 (patch-js_src_util_NativeStack.cpp) = 2c6f844d38343f40ebbc8fd665279256e4ae6d35 SHA1 (patch-media_ffvpx_libavutil_arm_bswap.h) = de58daa0fd23d4fec50426602b65c9ea5862558a SHA1 (patch-media_libcubeb_gtest_moz.build) = ea6dcc7ceeb76ce1fb9d508cf43080a2eef3a9e4 -SHA1 (patch-media_libcubeb_src_cubeb.c) = e3446562ed16ec9643df42ee0b9c46ee91f22913 +SHA1 (patch-media_libcubeb_src_cubeb.c) = dcc173f0bef8b7b12c45739bf04577f3292a517e SHA1 (patch-media_libcubeb_src_cubeb__alsa.c) = f359a66a22f11142d05746e15894d998d3e3bf5a -SHA1 (patch-media_libcubeb_src_cubeb__oss.c) = 103f751d5a7bc14a81a6ed43e1afc722bc092f7e -SHA1 (patch-media_libcubeb_src_moz.build) = dcca90cb5132442877712cd7b1f4e832c93d2655 -SHA1 (patch-media_libcubeb_update.sh) = 4508319d8534a0cc983e4767c2142169af9e5033 +SHA1 (patch-media_libcubeb_src_moz.build) = 7d66d9e0d7129b2106885201f88355262ee1a22a +SHA1 (patch-media_libcubeb_update.sh) = 8dcc4ca8e2812b4063f28e5d6308abbee0b1c9d9 SHA1 (patch-media_libpng_pngpriv.h) = c8084332560017cd7c9b519b61d125fa28af0dbc SHA1 (patch-toolkit_components_terminator_nsTerminator.cpp) = e5700d95302ef9672b404ab19e13ef7ba3ede5cf -SHA1 (patch-toolkit_library_moz.build) = 102e3713552c26f76e8b4e473846bb8fbc44b278 +SHA1 (patch-toolkit_library_moz.build) = 57516a1cc888fdbaf39ba90f73e5de488ad1f01e SHA1 (patch-toolkit_modules_subprocess_subprocess__shared__unix.js) = 22a39e54e042ab2270a3cb54e4e307c8900cad12 SHA1 (patch-toolkit_moz.configure) = 40ee147cc1d2c62dd6c83b3f67ce9e61f758ea57 SHA1 (patch-toolkit_mozapps_installer_packager.mk) = b2343fbad2556504dfd13601c02e6e2357c7d2bc Index: pkgsrc/www/firefox68/PLIST diff -u pkgsrc/www/firefox68/PLIST:1.3.4.1 pkgsrc/www/firefox68/PLIST:1.3.4.2 --- pkgsrc/www/firefox68/PLIST:1.3.4.1 Sun Feb 23 11:50:10 2020 +++ pkgsrc/www/firefox68/PLIST Fri Mar 13 20:02:44 2020 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.3.4.1 2020/02/23 11:50:10 bsiegert Exp $ +@comment $NetBSD: PLIST,v 1.3.4.2 2020/03/13 20:02:44 bsiegert Exp $ bin/firefox68 lib/firefox68/actors/AudioPlaybackChild.jsm lib/firefox68/actors/AutoplayChild.jsm @@ -2887,13 +2887,13 @@ lib/firefox68/browser/chrome/devtools/mo ${PLIST.debug}lib/firefox68/browser/chrome/devtools/modules/devtools/client/shared/vendor/react-dev.js ${PLIST.debug}lib/firefox68/browser/chrome/devtools/modules/devtools/client/shared/vendor/react-dom-dev.js lib/firefox68/browser/chrome/devtools/modules/devtools/client/shared/vendor/react-dom-factories.js -lib/firefox68/browser/chrome/devtools/modules/devtools/client/shared/vendor/react-dom-server.js ${PLIST.debug}lib/firefox68/browser/chrome/devtools/modules/devtools/client/shared/vendor/react-dom-server-dev.js -lib/firefox68/browser/chrome/devtools/modules/devtools/client/shared/vendor/react-dom-test-utils.js +lib/firefox68/browser/chrome/devtools/modules/devtools/client/shared/vendor/react-dom-server.js ${PLIST.debug}lib/firefox68/browser/chrome/devtools/modules/devtools/client/shared/vendor/react-dom-test-utils-dev.js +lib/firefox68/browser/chrome/devtools/modules/devtools/client/shared/vendor/react-dom-test-utils.js lib/firefox68/browser/chrome/devtools/modules/devtools/client/shared/vendor/react-dom.js -lib/firefox68/browser/chrome/devtools/modules/devtools/client/shared/vendor/react-prop-types.js ${PLIST.debug}lib/firefox68/browser/chrome/devtools/modules/devtools/client/shared/vendor/react-prop-types-dev.js +lib/firefox68/browser/chrome/devtools/modules/devtools/client/shared/vendor/react-prop-types.js lib/firefox68/browser/chrome/devtools/modules/devtools/client/shared/vendor/react-redux.js lib/firefox68/browser/chrome/devtools/modules/devtools/client/shared/vendor/react-router-dom.js lib/firefox68/browser/chrome/devtools/modules/devtools/client/shared/vendor/react-test-renderer-shallow.js @@ -4271,6 +4271,7 @@ lib/firefox68/browser/features/webcompat lib/firefox68/browser/features/webcompat@mozilla.org/injections/css/bug1605611-maps.google.com-directions-time.css lib/firefox68/browser/features/webcompat@mozilla.org/injections/css/bug1609991-cracked.com-flex-basis-fix.css lib/firefox68/browser/features/webcompat@mozilla.org/injections/css/bug1610016-gaana.com-input-position-fix.css +lib/firefox68/browser/features/webcompat@mozilla.org/injections/css/bug1610344-directv.com.co-hide-unsupported-message.css lib/firefox68/browser/features/webcompat@mozilla.org/injections/js/bug0000000-testbed-js-injection.js lib/firefox68/browser/features/webcompat@mozilla.org/injections/js/bug1452707-window.controllers-shim-ib.absa.co.za.js lib/firefox68/browser/features/webcompat@mozilla.org/injections/js/bug1457335-histography.io-ua-change.js Index: pkgsrc/www/firefox68/mozilla-common.mk diff -u pkgsrc/www/firefox68/mozilla-common.mk:1.6 pkgsrc/www/firefox68/mozilla-common.mk:1.6.4.1 --- pkgsrc/www/firefox68/mozilla-common.mk:1.6 Sun Dec 22 14:33:58 2019 +++ pkgsrc/www/firefox68/mozilla-common.mk Fri Mar 13 20:02:44 2020 @@ -1,4 +1,4 @@ -# $NetBSD: mozilla-common.mk,v 1.6 2019/12/22 14:33:58 gdt Exp $ +# $NetBSD: mozilla-common.mk,v 1.6.4.1 2020/03/13 20:02:44 bsiegert Exp $ # # common Makefile fragment for mozilla packages based on gecko 2.0. # @@ -38,8 +38,8 @@ BUILD_DEPENDS+= yasm>=1.1:../../devel/y .endif # For rustc/cargo detection -CONFIGURE_ARGS+= --target=${MACHINE_GNU_PLATFORM:Q} -CONFIGURE_ARGS+= --host=${MACHINE_GNU_PLATFORM:Q} +CONFIGURE_ARGS+= --target=${MACHINE_GNU_PLATFORM} +CONFIGURE_ARGS+= --host=${MACHINE_GNU_PLATFORM} CONFIGURE_ENV+= BINDGEN_CFLAGS="-isystem${PREFIX}/include/nspr \ -isystem${X11BASE}/include/pixman-1" @@ -126,7 +126,7 @@ CONFIG_SUB_OVERRIDE+= ${MOZILLA_DIR}js/ CONFIG_SUB_OVERRIDE+= ${MOZILLA_DIR}nsprpub/build/autoconf/config.sub CONFIG_SUB_OVERRIDE+= ${MOZILLA_DIR}/js/ctypes/libffi/config.sub -CONFIGURE_ENV+= CPP=${CPP} +CONFIGURE_ENV+= CPP=${CPP:Q} # Build outside ${WRKSRC} # Try to avoid conflict with config/makefiles/xpidl/Makefile.in Index: pkgsrc/www/firefox68/options.mk diff -u pkgsrc/www/firefox68/options.mk:1.4 pkgsrc/www/firefox68/options.mk:1.4.4.1 --- pkgsrc/www/firefox68/options.mk:1.4 Sun Dec 22 16:07:48 2019 +++ pkgsrc/www/firefox68/options.mk Fri Mar 13 20:02:44 2020 @@ -1,17 +1,21 @@ -# $NetBSD: options.mk,v 1.4 2019/12/22 16:07:48 nia Exp $ +# $NetBSD: options.mk,v 1.4.4.1 2020/03/13 20:02:44 bsiegert Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.firefox PKG_SUPPORTED_OPTIONS= official-mozilla-branding PKG_SUPPORTED_OPTIONS+= debug debug-info mozilla-jemalloc webrtc -PKG_SUPPORTED_OPTIONS+= alsa oss pulseaudio dbus -PKG_SUPPORTED_OPTIONS+= wayland -PLIST_VARS+= gnome jemalloc debug +PKG_SUPPORTED_OPTIONS+= alsa pulseaudio dbus wayland +PLIST_VARS+= jemalloc debug + +.include "../../devel/wayland/platform.mk" +.if ${PLATFORM_SUPPORTS_WAYLAND} == "yes" +PKG_SUGGESTED_OPTIONS+= wayland +.endif .if ${OPSYS} == "Linux" PKG_SUGGESTED_OPTIONS+= pulseaudio mozilla-jemalloc dbus .else -PKG_SUGGESTED_OPTIONS+= oss dbus +PKG_SUGGESTED_OPTIONS+= dbus .endif PKG_SUGGESTED_OPTIONS.Linux+= webrtc @@ -25,11 +29,6 @@ CONFIGURE_ARGS+= --enable-alsa CONFIGURE_ARGS+= --disable-alsa .endif -.if !empty(PKG_OPTIONS:Moss) -CONFIGURE_ARGS+= --with-oss -.include "../../mk/oss.buildlink3.mk" -.endif - .if !empty(PKG_OPTIONS:Mmozilla-jemalloc) PLIST.jemalloc= yes CONFIGURE_ARGS+= --enable-jemalloc Index: pkgsrc/www/firefox68/patches/patch-aa diff -u pkgsrc/www/firefox68/patches/patch-aa:1.1 pkgsrc/www/firefox68/patches/patch-aa:1.1.6.1 --- pkgsrc/www/firefox68/patches/patch-aa:1.1 Sat Sep 21 07:31:44 2019 +++ pkgsrc/www/firefox68/patches/patch-aa Fri Mar 13 20:02:45 2020 @@ -1,79 +1,25 @@ -$NetBSD: patch-aa,v 1.1 2019/09/21 07:31:44 ryoon Exp $ +$NetBSD: patch-aa,v 1.1.6.1 2020/03/13 20:02:45 bsiegert Exp $ -* Add OSS audio support * Add Sun audio support -* Disable libav-fft on SunOS (relocation errors) ---- old-configure.in.orig 2019-05-29 15:39:16.000000000 +0000 +--- old-configure.in.orig 2020-03-05 20:57:20.000000000 +0000 +++ old-configure.in -@@ -2043,6 +2043,71 @@ MOZ_WEBM_ENCODER=1 +@@ -1987,6 +1987,19 @@ MOZ_WEBM_ENCODER=1 AC_DEFINE(MOZ_WEBM_ENCODER) AC_SUBST(MOZ_WEBM_ENCODER) +dnl ================================== -+dnl = Check OSS/sunaudio availability ++dnl = Check sunaudio availability +dnl ================================== + -+dnl If using Linux, Solaris or BSDs, ensure that OSS/sunaudio is available ++dnl If using Solaris or NetBSD, ensure that sunaudio is available +case "$OS_TARGET" in -+Linux|DragonFly|FreeBSD|GNU/kFreeBSD) -+ MOZ_OSS=1 -+ ;; +SunOS|NetBSD) + MOZ_SUNAUDIO=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_SUNAUDIO) -+AC_SUBST(MOZ_OSS) -+AC_SUBST_LIST(MOZ_OSS_CFLAGS) -+AC_SUBST_LIST(MOZ_OSS_LIBS) + dnl ======================================================== dnl NegotiateAuth Index: pkgsrc/www/firefox68/patches/patch-dom_media_CubebUtils.cpp diff -u pkgsrc/www/firefox68/patches/patch-dom_media_CubebUtils.cpp:1.1 pkgsrc/www/firefox68/patches/patch-dom_media_CubebUtils.cpp:1.1.6.1 --- pkgsrc/www/firefox68/patches/patch-dom_media_CubebUtils.cpp:1.1 Sat Sep 21 07:31:44 2019 +++ pkgsrc/www/firefox68/patches/patch-dom_media_CubebUtils.cpp Fri Mar 13 20:02:45 2020 @@ -1,4 +1,6 @@ -$NetBSD: patch-dom_media_CubebUtils.cpp,v 1.1 2019/09/21 07:31:44 ryoon Exp $ +$NetBSD: patch-dom_media_CubebUtils.cpp,v 1.1.6.1 2020/03/13 20:02:45 bsiegert Exp $ + +Add Sun audio support. --- dom/media/CubebUtils.cpp.orig 2019-07-06 01:48:31.000000000 +0000 +++ dom/media/CubebUtils.cpp @@ -7,7 +9,7 @@ $NetBSD: patch-dom_media_CubebUtils.cpp, const char* AUDIOSTREAM_BACKEND_ID_STR[] = { "jack", "pulse", "alsa", "audiounit", "audioqueue", "wasapi", - "winmm", "directsound", "sndio", "opensl", "audiotrack", "kai"}; -+ "winmm", "directsound", "sndio", "opensl", "audiotrack", "kai", "oss", "sun"}; ++ "winmm", "directsound", "sndio", "opensl", "audiotrack", "kai", "sun"}; /* Index for failures to create an audio stream the first time. */ const int CUBEB_BACKEND_INIT_FAILURE_FIRST = ArrayLength(AUDIOSTREAM_BACKEND_ID_STR); Index: pkgsrc/www/firefox68/patches/patch-media_libcubeb_src_cubeb.c diff -u pkgsrc/www/firefox68/patches/patch-media_libcubeb_src_cubeb.c:1.1 pkgsrc/www/firefox68/patches/patch-media_libcubeb_src_cubeb.c:1.1.6.1 --- pkgsrc/www/firefox68/patches/patch-media_libcubeb_src_cubeb.c:1.1 Sat Sep 21 07:31:44 2019 +++ pkgsrc/www/firefox68/patches/patch-media_libcubeb_src_cubeb.c Fri Mar 13 20:02:45 2020 @@ -1,9 +1,8 @@ -$NetBSD: patch-media_libcubeb_src_cubeb.c,v 1.1 2019/09/21 07:31:44 ryoon Exp $ +$NetBSD: patch-media_libcubeb_src_cubeb.c,v 1.1.6.1 2020/03/13 20:02:45 bsiegert Exp $ -* Support OSS audio * Support Sun audio ---- media/libcubeb/src/cubeb.c.orig 2019-06-09 08:15:58.000000000 +0000 +--- media/libcubeb/src/cubeb.c.orig 2020-03-05 20:57:11.000000000 +0000 +++ media/libcubeb/src/cubeb.c @@ -51,6 +51,9 @@ int wasapi_init(cubeb ** context, char c #if defined(USE_SNDIO) @@ -15,28 +14,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb. #if defined(USE_OPENSL) int opensl_init(cubeb ** context, char const * context_name); #endif -@@ -60,6 +63,9 @@ int audiotrack_init(cubeb ** context, ch - #if defined(USE_KAI) - int kai_init(cubeb ** context, char const * context_name); - #endif -+#if defined(USE_OSS) -+int oss_init(cubeb ** context, char const * context_name); -+#endif - - static int - validate_stream_params(cubeb_stream_params * input_stream_params, -@@ -160,6 +166,10 @@ cubeb_init(cubeb ** context, char const - #if defined(USE_KAI) - init_oneshot = kai_init; - #endif -+ } else if (!strcmp(backend_name, "oss")) { -+#if defined(USE_OSS) -+ init_oneshot = oss_init; -+#endif - } else { - /* Already set */ - } -@@ -195,6 +205,9 @@ cubeb_init(cubeb ** context, char const +@@ -195,6 +198,9 @@ cubeb_init(cubeb ** context, char const #if defined(USE_SNDIO) sndio_init, #endif @@ -46,13 +24,3 @@ $NetBSD: patch-media_libcubeb_src_cubeb. #if defined(USE_OPENSL) opensl_init, #endif -@@ -204,6 +217,9 @@ cubeb_init(cubeb ** context, char const - #if defined(USE_KAI) - kai_init, - #endif -+#if defined(USE_OSS) -+ oss_init, -+#endif - }; - int i; - Index: pkgsrc/www/firefox68/patches/patch-media_libcubeb_src_moz.build diff -u pkgsrc/www/firefox68/patches/patch-media_libcubeb_src_moz.build:1.1 pkgsrc/www/firefox68/patches/patch-media_libcubeb_src_moz.build:1.1.6.1 --- pkgsrc/www/firefox68/patches/patch-media_libcubeb_src_moz.build:1.1 Sat Sep 21 07:31:44 2019 +++ pkgsrc/www/firefox68/patches/patch-media_libcubeb_src_moz.build Fri Mar 13 20:02:45 2020 @@ -1,20 +1,13 @@ -$NetBSD: patch-media_libcubeb_src_moz.build,v 1.1 2019/09/21 07:31:44 ryoon Exp $ +$NetBSD: patch-media_libcubeb_src_moz.build,v 1.1.6.1 2020/03/13 20:02:45 bsiegert Exp $ -* Add OSS audio support * Add Sun audio support ---- media/libcubeb/src/moz.build.orig 2019-05-29 15:39:06.000000000 +0000 +--- media/libcubeb/src/moz.build.orig 2020-03-05 20:57:11.000000000 +0000 +++ media/libcubeb/src/moz.build -@@ -23,6 +23,18 @@ if CONFIG['MOZ_ALSA']: +@@ -23,6 +23,12 @@ if CONFIG['MOZ_ALSA']: ] DEFINES['USE_ALSA'] = True -+if CONFIG['MOZ_OSS']: -+ SOURCES += [ -+ 'cubeb_oss.c', -+ ] -+ DEFINES['USE_OSS'] = True -+ +if CONFIG['MOZ_SUNAUDIO']: + SOURCES += [ + 'cubeb_sun.c', @@ -24,11 +17,3 @@ $NetBSD: patch-media_libcubeb_src_moz.bu if CONFIG['MOZ_PULSEAUDIO'] or CONFIG['MOZ_JACK']: SOURCES += [ 'cubeb_resampler.cpp', -@@ -89,6 +101,7 @@ FINAL_LIBRARY = 'gkmedias' - - CFLAGS += CONFIG['MOZ_ALSA_CFLAGS'] - CFLAGS += CONFIG['MOZ_JACK_CFLAGS'] -+CFLAGS += CONFIG['MOZ_OSS_CFLAGS'] - CFLAGS += CONFIG['MOZ_PULSEAUDIO_CFLAGS'] - - # We allow warnings for third-party code that can be updated from upstream. Index: pkgsrc/www/firefox68/patches/patch-media_libcubeb_update.sh diff -u pkgsrc/www/firefox68/patches/patch-media_libcubeb_update.sh:1.1 pkgsrc/www/firefox68/patches/patch-media_libcubeb_update.sh:1.1.6.1 --- pkgsrc/www/firefox68/patches/patch-media_libcubeb_update.sh:1.1 Sat Sep 21 07:31:44 2019 +++ pkgsrc/www/firefox68/patches/patch-media_libcubeb_update.sh Fri Mar 13 20:02:45 2020 @@ -1,12 +1,13 @@ -$NetBSD: patch-media_libcubeb_update.sh,v 1.1 2019/09/21 07:31:44 ryoon Exp $ +$NetBSD: patch-media_libcubeb_update.sh,v 1.1.6.1 2020/03/13 20:02:45 bsiegert Exp $ + +Add Sun audio support. --- media/libcubeb/update.sh.orig 2019-05-29 15:39:11.000000000 +0000 +++ media/libcubeb/update.sh -@@ -25,6 +25,8 @@ cp $1/src/cubeb_log.h src +@@ -25,6 +25,7 @@ cp $1/src/cubeb_log.h src cp $1/src/cubeb_mixer.cpp src cp $1/src/cubeb_mixer.h src cp $1/src/cubeb_opensl.c src -+cp $1/src/cubeb_oss.c src +cp $1/src/cubeb_sun.c src cp $1/src/cubeb-jni.cpp src cp $1/src/cubeb-jni.h src Index: pkgsrc/www/firefox68/patches/patch-toolkit_library_moz.build diff -u pkgsrc/www/firefox68/patches/patch-toolkit_library_moz.build:1.1 pkgsrc/www/firefox68/patches/patch-toolkit_library_moz.build:1.1.6.1 --- pkgsrc/www/firefox68/patches/patch-toolkit_library_moz.build:1.1 Sat Sep 21 07:31:44 2019 +++ pkgsrc/www/firefox68/patches/patch-toolkit_library_moz.build Fri Mar 13 20:02:45 2020 @@ -1,17 +1,14 @@ -$NetBSD: patch-toolkit_library_moz.build,v 1.1 2019/09/21 07:31:44 ryoon Exp $ +$NetBSD: patch-toolkit_library_moz.build,v 1.1.6.1 2020/03/13 20:02:45 bsiegert Exp $ -* Restore OSS support - ---- toolkit/library/moz.build.orig 2018-10-18 20:06:16.000000000 +0000 +--- toolkit/library/moz.build.orig 2020-03-05 20:57:55.000000000 +0000 +++ toolkit/library/moz.build -@@ -232,8 +232,8 @@ if CONFIG['MOZ_SYSTEM_LIBVPX']: +@@ -231,9 +231,6 @@ if CONFIG['MOZ_SYSTEM_LIBVPX']: if not CONFIG['MOZ_TREE_PIXMAN']: OS_LIBS += CONFIG['MOZ_PIXMAN_LIBS'] -if CONFIG['MOZ_ALSA']: - OS_LIBS += CONFIG['MOZ_ALSA_LIBS'] -+if CONFIG['MOZ_OSS']: -+ OS_LIBS += CONFIG['MOZ_OSS_LIBS'] - +- if CONFIG['HAVE_CLOCK_MONOTONIC']: OS_LIBS += CONFIG['REALTIME_LIBS'] + --_----------=_1584129765167730--