Received: by mail.netbsd.org (Postfix, from userid 605) id 7CB0E84D82; Sat, 18 Jan 2020 15:32:42 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id F320E84D52 for ; Sat, 18 Jan 2020 15:32:41 +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 xa1rrst-j1sW for ; Sat, 18 Jan 2020 15:32:41 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 0363484D22 for ; Sat, 18 Jan 2020 15:32:40 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id EBA61FBF4; Sat, 18 Jan 2020 15:32:40 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1579361560276780" MIME-Version: 1.0 Date: Sat, 18 Jan 2020 15:32:40 +0000 From: "Nia Alarie" Subject: CVS commit: pkgsrc/www/firefox To: pkgsrc-changes@NetBSD.org Reply-To: nia@netbsd.org X-Mailer: log_accum Message-Id: <20200118153240.EBA61FBF4@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. --_----------=_1579361560276780 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: nia Date: Sat Jan 18 15:32:40 UTC 2020 Modified Files: pkgsrc/www/firefox: distinfo pkgsrc/www/firefox/patches: patch-aa patch-build_moz.configure_old.configure patch-dom_media_CubebUtils.cpp patch-media_libcubeb_src_moz.build patch-media_libcubeb_update.sh Log Message: firefox: Remove remaining traces of OSS support. We no longer patch this in but it's still searching for the files if you're using something FreeBSDish or Linuxish. This should resolve build problems on these platforms. On NetBSD this problem never appeared because it's been using native audio instead of OSS for a while now. from Michael Forney in PR pkg/54868 To generate a diff of this commit: cvs rdiff -u -r1.376 -r1.377 pkgsrc/www/firefox/distinfo cvs rdiff -u -r1.64 -r1.65 pkgsrc/www/firefox/patches/patch-aa cvs rdiff -u -r1.10 -r1.11 \ pkgsrc/www/firefox/patches/patch-build_moz.configure_old.configure cvs rdiff -u -r1.4 -r1.5 \ pkgsrc/www/firefox/patches/patch-dom_media_CubebUtils.cpp cvs rdiff -u -r1.18 -r1.19 \ pkgsrc/www/firefox/patches/patch-media_libcubeb_src_moz.build cvs rdiff -u -r1.6 -r1.7 \ pkgsrc/www/firefox/patches/patch-media_libcubeb_update.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1579361560276780 Content-Disposition: inline Content-Length: 10799 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/www/firefox/distinfo diff -u pkgsrc/www/firefox/distinfo:1.376 pkgsrc/www/firefox/distinfo:1.377 --- pkgsrc/www/firefox/distinfo:1.376 Wed Jan 15 10:50:37 2020 +++ pkgsrc/www/firefox/distinfo Sat Jan 18 15:32:40 2020 @@ -1,16 +1,16 @@ -$NetBSD: distinfo,v 1.376 2020/01/15 10:50:37 ryoon Exp $ +$NetBSD: distinfo,v 1.377 2020/01/18 15:32:40 nia Exp $ SHA1 (firefox-72.0.1.source.tar.xz) = bfe2a6c57cc9c192681388c9e4af9c0c44f315a6 RMD160 (firefox-72.0.1.source.tar.xz) = 1332177b77c54b9a1ef2180730fc9c08a5a7b730 SHA512 (firefox-72.0.1.source.tar.xz) = 8df6a64cde4bdb879c3cb9df7f8b43c7d67c47502e2dce1d3ee82de433931435963b3e51c99035a78f0a997bc934a838d198f2a1cd6a624441769d37b1469fcf Size (firefox-72.0.1.source.tar.xz) = 314963588 bytes -SHA1 (patch-aa) = 317ee54588268d9cacd63fa2a8902f2012c7c9ab +SHA1 (patch-aa) = 11060461fdaca5661e89651b8ded4a59d2abc4d7 SHA1 (patch-browser_app_profile_firefox.js) = 076cc2892547bac07fe907533f4e821f13f5738e -SHA1 (patch-build_moz.configure_old.configure) = 05963b12fd908d90e3378b30cff7e48291b8a447 +SHA1 (patch-build_moz.configure_old.configure) = da39a3ee5e6b4b0d3255bfef95601890afd80709 SHA1 (patch-build_moz.configure_rust.configure) = ee9e207e67709f3c9455b4d22f5f254890e99ca8 SHA1 (patch-config__make_system_wrappers.py) = 4e0a23d5b1f3a4fcb358ce319f6a2421be535375 SHA1 (patch-dom_base_nsAttrName.h) = ac7ba441a3b27df2855cf2673eea36b1cb44ad49 -SHA1 (patch-dom_media_CubebUtils.cpp) = b1b4f981c4bede877e3bd092d2648d4b8cbc73a5 +SHA1 (patch-dom_media_CubebUtils.cpp) = 226821d961039ae5c9c50d8615757b73c6bcd80a 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_skia_skia_src_core_SkCpu.cpp) = 36218819254f3681b9c717d652ea78c9f20d49ad @@ -24,8 +24,8 @@ SHA1 (patch-ipc_glue_GeckoChildProcessHo SHA1 (patch-js_src_util_NativeStack.cpp) = 2c6f844d38343f40ebbc8fd665279256e4ae6d35 SHA1 (patch-media_ffvpx_libavutil_arm_bswap.h) = de58daa0fd23d4fec50426602b65c9ea5862558a SHA1 (patch-media_libcubeb_src_cubeb__alsa.c) = 31536f36cb33f16da309527b50eda9b721608115 -SHA1 (patch-media_libcubeb_src_moz.build) = dcca90cb5132442877712cd7b1f4e832c93d2655 -SHA1 (patch-media_libcubeb_update.sh) = 4508319d8534a0cc983e4767c2142169af9e5033 +SHA1 (patch-media_libcubeb_src_moz.build) = 303cf902d8feb8efc3930d0df19b4713bf0ed795 +SHA1 (patch-media_libcubeb_update.sh) = 07cc41e24d2a004978c4cbf4ab0901544009d530 SHA1 (patch-media_libpng_pngpriv.h) = c8084332560017cd7c9b519b61d125fa28af0dbc SHA1 (patch-third__party_rust_libc_src_unix_bsd_netbsdlike_netbsd_mod.rs) = 3755f32fea84900cc0f00af3d9f53ed5fcfb0b4b SHA1 (patch-toolkit_components_terminator_nsTerminator.cpp) = e5700d95302ef9672b404ab19e13ef7ba3ede5cf Index: pkgsrc/www/firefox/patches/patch-aa diff -u pkgsrc/www/firefox/patches/patch-aa:1.64 pkgsrc/www/firefox/patches/patch-aa:1.65 --- pkgsrc/www/firefox/patches/patch-aa:1.64 Thu Jan 9 15:06:29 2020 +++ pkgsrc/www/firefox/patches/patch-aa Sat Jan 18 15:32:40 2020 @@ -1,85 +1,31 @@ -$NetBSD: patch-aa,v 1.64 2020/01/09 15:06:29 ryoon Exp $ +$NetBSD: patch-aa,v 1.65 2020/01/18 15:32:40 nia Exp $ -* Add OSS audio support * Add Sun audio support -* Disable libav-fft on SunOS (relocation errors) * Include include/nss/nss for workaround for neqo-crypto 0.1.6 of firefox-72.0 ---- old-configure.in.orig 2020-01-03 18:58:03.000000000 +0000 -+++ old-configure.in -@@ -1960,6 +1960,71 @@ MOZ_WEBM_ENCODER=1 +--- old-configure.in.orig Tue Jan 7 17:23:36 2020 ++++ old-configure.in Fri Jan 17 16:03:40 2020 +@@ -1960,6 +1960,19 @@ 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 dnl ======================================================== -@@ -2744,7 +2809,7 @@ AC_SUBST_LIST(MOZ_CAIRO_LIBS) +@@ -2744,7 +2757,7 @@ AC_SUBST_LIST(MOZ_CAIRO_OSLIBS) AC_SUBST(MOZ_TREE_PIXMAN) Index: pkgsrc/www/firefox/patches/patch-build_moz.configure_old.configure diff -u pkgsrc/www/firefox/patches/patch-build_moz.configure_old.configure:1.10 pkgsrc/www/firefox/patches/patch-build_moz.configure_old.configure:1.11 --- pkgsrc/www/firefox/patches/patch-build_moz.configure_old.configure:1.10 Thu Jul 11 11:32:40 2019 +++ pkgsrc/www/firefox/patches/patch-build_moz.configure_old.configure Sat Jan 18 15:32:40 2020 @@ -1,12 +0,0 @@ -$NetBSD: patch-build_moz.configure_old.configure,v 1.10 2019/07/11 11:32:40 ryoon Exp $ - ---- build/moz.configure/old.configure.orig 2019-07-06 01:48:30.000000000 +0000 -+++ build/moz.configure/old.configure -@@ -248,6 +248,7 @@ def old_configure_options(*options): - '--with-nspr-prefix', - '--with-nss-exec-prefix', - '--with-nss-prefix', -+ '--with-oss', - '--with-qemu-exe', - '--with-sixgill', - '--with-system-bz2', Index: pkgsrc/www/firefox/patches/patch-dom_media_CubebUtils.cpp diff -u pkgsrc/www/firefox/patches/patch-dom_media_CubebUtils.cpp:1.4 pkgsrc/www/firefox/patches/patch-dom_media_CubebUtils.cpp:1.5 --- pkgsrc/www/firefox/patches/patch-dom_media_CubebUtils.cpp:1.4 Thu Jul 11 11:32:40 2019 +++ pkgsrc/www/firefox/patches/patch-dom_media_CubebUtils.cpp Sat Jan 18 15:32:40 2020 @@ -1,13 +1,13 @@ -$NetBSD: patch-dom_media_CubebUtils.cpp,v 1.4 2019/07/11 11:32:40 ryoon Exp $ +$NetBSD: patch-dom_media_CubebUtils.cpp,v 1.5 2020/01/18 15:32:40 nia Exp $ ---- dom/media/CubebUtils.cpp.orig 2019-07-06 01:48:31.000000000 +0000 +--- dom/media/CubebUtils.cpp.orig Wed Jan 8 01:23:31 2020 +++ dom/media/CubebUtils.cpp -@@ -163,7 +163,7 @@ const char kBrandBundleURL[] = "chrome:/ +@@ -140,7 +140,7 @@ const char kBrandBundleURL[] = "chrome://branding/loca 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/firefox/patches/patch-media_libcubeb_src_moz.build diff -u pkgsrc/www/firefox/patches/patch-media_libcubeb_src_moz.build:1.18 pkgsrc/www/firefox/patches/patch-media_libcubeb_src_moz.build:1.19 --- pkgsrc/www/firefox/patches/patch-media_libcubeb_src_moz.build:1.18 Thu Jun 13 22:05:24 2019 +++ pkgsrc/www/firefox/patches/patch-media_libcubeb_src_moz.build Sat Jan 18 15:32:40 2020 @@ -1,20 +1,13 @@ -$NetBSD: patch-media_libcubeb_src_moz.build,v 1.18 2019/06/13 22:05:24 nia Exp $ +$NetBSD: patch-media_libcubeb_src_moz.build,v 1.19 2020/01/18 15:32:40 nia 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 Wed Jan 8 01:23:35 2020 +++ 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,7 +17,7 @@ $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' +@@ -92,6 +98,7 @@ FINAL_LIBRARY = 'gkmedias' CFLAGS += CONFIG['MOZ_ALSA_CFLAGS'] CFLAGS += CONFIG['MOZ_JACK_CFLAGS'] Index: pkgsrc/www/firefox/patches/patch-media_libcubeb_update.sh diff -u pkgsrc/www/firefox/patches/patch-media_libcubeb_update.sh:1.6 pkgsrc/www/firefox/patches/patch-media_libcubeb_update.sh:1.7 --- pkgsrc/www/firefox/patches/patch-media_libcubeb_update.sh:1.6 Thu Jun 13 22:05:24 2019 +++ pkgsrc/www/firefox/patches/patch-media_libcubeb_update.sh Sat Jan 18 15:32:40 2020 @@ -1,12 +1,11 @@ -$NetBSD: patch-media_libcubeb_update.sh,v 1.6 2019/06/13 22:05:24 nia Exp $ +$NetBSD: patch-media_libcubeb_update.sh,v 1.7 2020/01/18 15:32:40 nia Exp $ ---- media/libcubeb/update.sh.orig 2019-05-29 15:39:11.000000000 +0000 +--- media/libcubeb/update.sh.orig Wed Jan 8 01:23:35 2020 +++ 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 --_----------=_1579361560276780--