pkgsrc-Changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc/mail/thunderbird



Module Name:    pkgsrc
Committed By:   nia
Date:           Mon Jun 15 15:44:22 UTC 2020

Modified Files:
        pkgsrc/mail/thunderbird: Makefile distinfo options.mk
        pkgsrc/mail/thunderbird/patches: patch-browser_app_profile_firefox.js
            patch-dom_media_CubebUtils.cpp patch-media_libcubeb_src_cubeb.c
            patch-media_libcubeb_src_moz.build patch-old-configure.in
            patch-toolkit_library_moz.build
Added Files:
        pkgsrc/mail/thunderbird/patches: patch-gfx_thebes_gfxPlatform.cpp
Removed Files:
        pkgsrc/mail/thunderbird/patches: patch-ipc_glue_CrossProcessSemaphore.h
            patch-ipc_glue_CrossProcessSemaphore__posix.cpp
            patch-media_libcubeb_src_cubeb__oss.c

Log Message:
thunderbird: Sync with firefox68

- Re-enable multiprocess mode
- Drop hacks for crossprocess semaphores on NetBSD
- Drop OSS support
- Drop unused gnome option

Bump PKGREVISION


To generate a diff of this commit:
cvs rdiff -u -r1.249 -r1.250 pkgsrc/mail/thunderbird/Makefile
cvs rdiff -u -r1.228 -r1.229 pkgsrc/mail/thunderbird/distinfo
cvs rdiff -u -r1.21 -r1.22 pkgsrc/mail/thunderbird/options.mk
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/mail/thunderbird/patches/patch-browser_app_profile_firefox.js \
    pkgsrc/mail/thunderbird/patches/patch-media_libcubeb_src_cubeb.c \
    pkgsrc/mail/thunderbird/patches/patch-media_libcubeb_src_moz.build \
    pkgsrc/mail/thunderbird/patches/patch-old-configure.in
cvs rdiff -u -r1.3 -r1.4 \
    pkgsrc/mail/thunderbird/patches/patch-dom_media_CubebUtils.cpp
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/mail/thunderbird/patches/patch-gfx_thebes_gfxPlatform.cpp
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/mail/thunderbird/patches/patch-ipc_glue_CrossProcessSemaphore.h
cvs rdiff -u -r1.3 -r0 \
    pkgsrc/mail/thunderbird/patches/patch-ipc_glue_CrossProcessSemaphore__posix.cpp
cvs rdiff -u -r1.2 -r0 \
    pkgsrc/mail/thunderbird/patches/patch-media_libcubeb_src_cubeb__oss.c
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/mail/thunderbird/patches/patch-toolkit_library_moz.build

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mail/thunderbird/Makefile
diff -u pkgsrc/mail/thunderbird/Makefile:1.249 pkgsrc/mail/thunderbird/Makefile:1.250
--- pkgsrc/mail/thunderbird/Makefile:1.249      Mon Jun 15 08:31:19 2020
+++ pkgsrc/mail/thunderbird/Makefile    Mon Jun 15 15:44:22 2020
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.249 2020/06/15 08:31:19 nia Exp $
+# $NetBSD: Makefile,v 1.250 2020/06/15 15:44:22 nia Exp $
 
 DISTNAME=      thunderbird-${TB_VER}.source
 PKGNAME=       thunderbird-${TB_VER}
+PKGREVISION=   1
 TB_VER=                68.9.0
 CATEGORIES=    mail
 MASTER_SITES=  ${MASTER_SITE_MOZILLA:=thunderbird/releases/${TB_VER}/source/}

Index: pkgsrc/mail/thunderbird/distinfo
diff -u pkgsrc/mail/thunderbird/distinfo:1.228 pkgsrc/mail/thunderbird/distinfo:1.229
--- pkgsrc/mail/thunderbird/distinfo:1.228      Fri Jun  5 03:57:58 2020
+++ pkgsrc/mail/thunderbird/distinfo    Mon Jun 15 15:44:22 2020
@@ -1,41 +1,39 @@
-$NetBSD: distinfo,v 1.228 2020/06/05 03:57:58 ryoon Exp $
+$NetBSD: distinfo,v 1.229 2020/06/15 15:44:22 nia Exp $
 
 SHA1 (thunderbird-68.9.0.source.tar.xz) = aeee38c1a36b07f8e85af1c7371ebb539083ab4a
 RMD160 (thunderbird-68.9.0.source.tar.xz) = f3467224d1225ec98085d38a4d38b798e3cebd0b
 SHA512 (thunderbird-68.9.0.source.tar.xz) = 891472c95ba6ff46061131504e89010da512a84b0e1dea0482e603fd4c87f11e099280a245c7dd9fc9320c48229c26602565c089d86f1a1f4271b29b6fc606f0
 Size (thunderbird-68.9.0.source.tar.xz) = 332239044 bytes
-SHA1 (patch-browser_app_profile_firefox.js) = d3ade5620370965e397ba494ff0495aeef5af0d0
+SHA1 (patch-browser_app_profile_firefox.js) = 775599fae82bf2701b8d45b728537abf3bab86fd
 SHA1 (patch-build_moz.configure_old.configure) = edd810f8d607697898ae315453719fe6c8c09bcc
 SHA1 (patch-build_moz.configure_rust.configure) = b57a9b1451dc426d75774f73d7c05fc98fe6e317
 SHA1 (patch-comm_mail_installer_package-manifest.in) = 14e8977f690e579a8caf73326248323615e04803
 SHA1 (patch-comm_mail_installer_removed-files.in) = f360ccac70a7afaee65e4617c015535084eee035
 SHA1 (patch-config_gcc-stl-wrapper.template.h) = aa9664c1ba850e7c45b654dcf5d7d591d4994a86
 SHA1 (patch-dom_base_nsAttrName.h) = 57a1a15cde53a1c8e22b1b38efdd40b9c0f1f91b
-SHA1 (patch-dom_media_CubebUtils.cpp) = 2b6e750a2336434edd9642e1a78f4b6b7df1354a
+SHA1 (patch-dom_media_CubebUtils.cpp) = 5022ead470ba2b3b75bc423e320be0cc18279b6b
 SHA1 (patch-gfx_angle_checkout_src_common_third__party_smhasher_src_PMurHash.cpp) = 795b510b525019f49169d1a594cd3e455e706500
 SHA1 (patch-gfx_angle_checkout_src_compiler_translator_InfoSink.h) = 879bb8ae14bc28e9c8b5f2874bf76298daea68c1
 SHA1 (patch-gfx_gl_GLContextProviderGLX.cpp) = 936ae039b758c5eaf48dd4661c896d186b340207
 SHA1 (patch-gfx_skia_skia_src_core_SkCpu.cpp) = c30cb2ed98d4486fcc23b3a9b464df088a30134a
+SHA1 (patch-gfx_thebes_gfxPlatform.cpp) = fcbe2f980557ff4eff8fcb6b4039a5c0eb956fa6
 SHA1 (patch-ipc_chromium_src_base_lock__impl__posix.cc) = 80df98ebde2365cdea7b98e72e474f594934718e
 SHA1 (patch-ipc_chromium_src_base_message__pump__libevent.cc) = 0475843fa07f38a3f6255cfb998e64863fd8b9c1
 SHA1 (patch-ipc_chromium_src_base_platform__thread__posix.cc) = aa71eee667e920b1c2364b90956a7332906c5d74
 SHA1 (patch-ipc_chromium_src_chrome_common_ipc__channel__posix.cc) = 2c03850559c733c37a749fdb86a3e4517878d56c
-SHA1 (patch-ipc_glue_CrossProcessSemaphore.h) = bc05df1cee60b3ae45f111ac451dc098027d8add
-SHA1 (patch-ipc_glue_CrossProcessSemaphore__posix.cpp) = d554afd62ee91241747c42d74df31d8d25bb448f
 SHA1 (patch-ipc_glue_GeckoChildProcessHost.cpp) = 007ec171c69059d503977bcef036a89b0f38dc5d
 SHA1 (patch-js_src_threading_posix_Thread.cpp) = 5c0e0238208b0928ea2472f15bdbe55aa7bcbb44
 SHA1 (patch-js_src_util_NativeStack.cpp) = 9bbfcc09e0166d6611ca813a555f60ea205d418d
 SHA1 (patch-media_libcubeb_gtest_moz.build) = da3183625cd058fac97dbf675d6a44fb1ee288f9
-SHA1 (patch-media_libcubeb_src_cubeb.c) = e7f5cdf21e18776a252dd9d602761acc958070d7
+SHA1 (patch-media_libcubeb_src_cubeb.c) = 426aeb9cbcd668bb98edff57550cc5ce7f0c690a
 SHA1 (patch-media_libcubeb_src_cubeb__alsa.c) = fdf4e43d90c112f70b00c6a1ab0a0f64aebe7ea7
-SHA1 (patch-media_libcubeb_src_cubeb__oss.c) = 202a10b264f7582c9e9b16a4b97447fadea8ff12
-SHA1 (patch-media_libcubeb_src_moz.build) = fd3b036b3ba4105949c6b0f46bf72c89184e777d
+SHA1 (patch-media_libcubeb_src_moz.build) = 79aa16955f6358b1b7d75b4e30bed4554a0afe7f
 SHA1 (patch-media_libcubeb_update.sh) = f8d0f674987519a1a1738be158e8cd4296f6def0
 SHA1 (patch-media_libpng_pngpriv.h) = dfd4d345e10f6f74d3a3546732a868481c1d5818
 SHA1 (patch-nsprpub_pr_src_pthreads_ptsynch.c) = cd0639f97f2135980bc3036cc858ac061107bc75
-SHA1 (patch-old-configure.in) = 24c2f64250160c9e4c4cdc3b5ff2e6d33a5d6aad
+SHA1 (patch-old-configure.in) = 85efc1242429e1c4974882a965cc09790e098b73
 SHA1 (patch-toolkit_components_terminator_nsTerminator.cpp) = cd4d65d6e6358b5b77b6b63441a8550f2d1e97c7
-SHA1 (patch-toolkit_library_moz.build) = 429745ec028ce71d8ba2457679b715ac14b6e2d3
+SHA1 (patch-toolkit_library_moz.build) = eee7849a119569ec74822c5f7d4878c7fd6b4096
 SHA1 (patch-toolkit_modules_subprocess_subprocess__shared__unix.js) = bc5293f7bf4885443a131958e4099bbf0f2c4a2c
 SHA1 (patch-toolkit_moz.configure) = 994c8ff526984482b0e5fa26176ed6c20380a97d
 SHA1 (patch-toolkit_mozapps_installer_packager.mk) = 00241c3e79d833a70753063186093d48956546b2

Index: pkgsrc/mail/thunderbird/options.mk
diff -u pkgsrc/mail/thunderbird/options.mk:1.21 pkgsrc/mail/thunderbird/options.mk:1.22
--- pkgsrc/mail/thunderbird/options.mk:1.21     Tue Jan  7 15:41:22 2020
+++ pkgsrc/mail/thunderbird/options.mk  Mon Jun 15 15:44:22 2020
@@ -1,13 +1,13 @@
-# $NetBSD: options.mk,v 1.21 2020/01/07 15:41:22 wiz Exp $
+# $NetBSD: options.mk,v 1.22 2020/06/15 15:44:22 nia Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.thunderbird
 
-PKG_SUPPORTED_OPTIONS= alsa dbus debug mozilla-jemalloc gnome \
-                       official-mozilla-branding oss pulseaudio \
+PKG_SUPPORTED_OPTIONS= alsa dbus debug mozilla-jemalloc \
+                       official-mozilla-branding pulseaudio \
                        mozilla-lightning wayland
 PKG_SUGGESTED_OPTIONS+=        mozilla-lightning
 
-PLIST_VARS+=           branding nobranding debug gnome jemalloc
+PLIST_VARS+=           branding nobranding debug jemalloc
 
 .include "../../devel/wayland/platform.mk"
 .if ${PLATFORM_SUPPORTS_WAYLAND} == "yes"
@@ -15,9 +15,9 @@ PKG_SUGGESTED_OPTIONS+=       wayland
 .endif
 
 .if ${OPSYS} == "Linux"
-PKG_SUGGESTED_OPTIONS+=        pulseaudio mozilla-jemalloc dbus
+PKG_SUGGESTED_OPTIONS+=        alsa pulseaudio mozilla-jemalloc dbus
 .else
-PKG_SUGGESTED_OPTIONS+=        oss dbus
+PKG_SUGGESTED_OPTIONS+=        dbus
 .endif
 
 .include "../../mk/bsd.options.mk"
@@ -29,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/mail/thunderbird/patches/patch-browser_app_profile_firefox.js
diff -u pkgsrc/mail/thunderbird/patches/patch-browser_app_profile_firefox.js:1.2 pkgsrc/mail/thunderbird/patches/patch-browser_app_profile_firefox.js:1.3
--- pkgsrc/mail/thunderbird/patches/patch-browser_app_profile_firefox.js:1.2    Sat Sep 21 10:55:17 2019
+++ pkgsrc/mail/thunderbird/patches/patch-browser_app_profile_firefox.js        Mon Jun 15 15:44:22 2020
@@ -1,8 +1,8 @@
-$NetBSD: patch-browser_app_profile_firefox.js,v 1.2 2019/09/21 10:55:17 ryoon Exp $
+$NetBSD: patch-browser_app_profile_firefox.js,v 1.3 2020/06/15 15:44:22 nia Exp $
 
---- browser/app/profile/firefox.js.orig        2019-09-09 23:43:23.000000000 +0000
+--- browser/app/profile/firefox.js.orig        2020-06-02 14:07:51.000000000 +0000
 +++ browser/app/profile/firefox.js
-@@ -1862,6 +1862,15 @@ pref("prio.publicKeyB", "26E6674E65425B8
+@@ -1862,6 +1862,12 @@ pref("prio.publicKeyB", "26E6674E65425B8
  pref("toolkit.coverage.enabled", false);
  pref("toolkit.coverage.endpoint.base", "https://coverage.mozilla.org";);
  
@@ -12,9 +12,6 @@ $NetBSD: patch-browser_app_profile_firef
 +// Enable system addons, for example langpacks from www/firefox-l10n
 +pref("extensions.autoDisableScopes", 11);
 +
-+// Disable multiprocess window support. Workaround for PR 53273.
-+pref("browser.tabs.remote.autostart", false);
-+
  // Discovery prefs
  pref("browser.discovery.enabled", true);
  pref("browser.discovery.containers.enabled", true);
Index: pkgsrc/mail/thunderbird/patches/patch-media_libcubeb_src_cubeb.c
diff -u pkgsrc/mail/thunderbird/patches/patch-media_libcubeb_src_cubeb.c:1.2 pkgsrc/mail/thunderbird/patches/patch-media_libcubeb_src_cubeb.c:1.3
--- pkgsrc/mail/thunderbird/patches/patch-media_libcubeb_src_cubeb.c:1.2        Sat Sep 21 10:55:17 2019
+++ pkgsrc/mail/thunderbird/patches/patch-media_libcubeb_src_cubeb.c    Mon Jun 15 15:44:22 2020
@@ -1,6 +1,6 @@
-$NetBSD: patch-media_libcubeb_src_cubeb.c,v 1.2 2019/09/21 10:55:17 ryoon Exp $
+$NetBSD: patch-media_libcubeb_src_cubeb.c,v 1.3 2020/06/15 15:44:22 nia Exp $
 
---- media/libcubeb/src/cubeb.c.orig    2019-09-09 23:43:34.000000000 +0000
+--- media/libcubeb/src/cubeb.c.orig    2020-06-02 14:07:57.000000000 +0000
 +++ media/libcubeb/src/cubeb.c
 @@ -51,6 +51,9 @@ int wasapi_init(cubeb ** context, char c
  #if defined(USE_SNDIO)
@@ -12,28 +12,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
@@ -43,13 +22,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/mail/thunderbird/patches/patch-media_libcubeb_src_moz.build
diff -u pkgsrc/mail/thunderbird/patches/patch-media_libcubeb_src_moz.build:1.2 pkgsrc/mail/thunderbird/patches/patch-media_libcubeb_src_moz.build:1.3
--- pkgsrc/mail/thunderbird/patches/patch-media_libcubeb_src_moz.build:1.2      Sat Sep 21 10:55:17 2019
+++ pkgsrc/mail/thunderbird/patches/patch-media_libcubeb_src_moz.build  Mon Jun 15 15:44:22 2020
@@ -1,17 +1,11 @@
-$NetBSD: patch-media_libcubeb_src_moz.build,v 1.2 2019/09/21 10:55:17 ryoon Exp $
+$NetBSD: patch-media_libcubeb_src_moz.build,v 1.3 2020/06/15 15:44:22 nia Exp $
 
---- media/libcubeb/src/moz.build.orig  2019-09-09 23:43:34.000000000 +0000
+--- media/libcubeb/src/moz.build.orig  2020-06-02 14:07:57.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',
@@ -21,11 +15,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/mail/thunderbird/patches/patch-old-configure.in
diff -u pkgsrc/mail/thunderbird/patches/patch-old-configure.in:1.2 pkgsrc/mail/thunderbird/patches/patch-old-configure.in:1.3
--- pkgsrc/mail/thunderbird/patches/patch-old-configure.in:1.2  Sat Sep 21 10:55:17 2019
+++ pkgsrc/mail/thunderbird/patches/patch-old-configure.in      Mon Jun 15 15:44:22 2020
@@ -1,75 +1,23 @@
-$NetBSD: patch-old-configure.in,v 1.2 2019/09/21 10:55:17 ryoon Exp $
+$NetBSD: patch-old-configure.in,v 1.3 2020/06/15 15:44:22 nia Exp $
 
---- old-configure.in.orig      2019-09-09 23:43:36.000000000 +0000
+--- old-configure.in.orig      2020-06-02 14:07:57.000000000 +0000
 +++ old-configure.in
-@@ -1987,6 +1987,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/mail/thunderbird/patches/patch-dom_media_CubebUtils.cpp
diff -u pkgsrc/mail/thunderbird/patches/patch-dom_media_CubebUtils.cpp:1.3 pkgsrc/mail/thunderbird/patches/patch-dom_media_CubebUtils.cpp:1.4
--- pkgsrc/mail/thunderbird/patches/patch-dom_media_CubebUtils.cpp:1.3  Sat Sep 21 10:55:17 2019
+++ pkgsrc/mail/thunderbird/patches/patch-dom_media_CubebUtils.cpp      Mon Jun 15 15:44:22 2020
@@ -1,13 +1,13 @@
-$NetBSD: patch-dom_media_CubebUtils.cpp,v 1.3 2019/09/21 10:55:17 ryoon Exp $
+$NetBSD: patch-dom_media_CubebUtils.cpp,v 1.4 2020/06/15 15:44:22 nia Exp $
 
---- dom/media/CubebUtils.cpp.orig      2019-09-09 23:43:26.000000000 +0000
+--- dom/media/CubebUtils.cpp.orig      2020-06-02 14:07:52.000000000 +0000
 +++ dom/media/CubebUtils.cpp
 @@ -163,7 +163,7 @@ const char kBrandBundleURL[] = "chrome:/
  
  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/mail/thunderbird/patches/patch-toolkit_library_moz.build
diff -u pkgsrc/mail/thunderbird/patches/patch-toolkit_library_moz.build:1.1 pkgsrc/mail/thunderbird/patches/patch-toolkit_library_moz.build:1.2
--- pkgsrc/mail/thunderbird/patches/patch-toolkit_library_moz.build:1.1 Sun Dec 16 08:12:16 2018
+++ pkgsrc/mail/thunderbird/patches/patch-toolkit_library_moz.build     Mon Jun 15 15:44:22 2020
@@ -1,15 +1,14 @@
-$NetBSD: patch-toolkit_library_moz.build,v 1.1 2018/12/16 08:12:16 ryoon Exp $
+$NetBSD: patch-toolkit_library_moz.build,v 1.2 2020/06/15 15:44:22 nia Exp $
 
---- toolkit/library/moz.build.orig     2018-12-04 23:12:02.000000000 +0000
+--- toolkit/library/moz.build.orig     2020-06-02 14:08:02.000000000 +0000
 +++ toolkit/library/moz.build
-@@ -247,8 +247,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']
+ 

Added files:

Index: pkgsrc/mail/thunderbird/patches/patch-gfx_thebes_gfxPlatform.cpp
diff -u /dev/null pkgsrc/mail/thunderbird/patches/patch-gfx_thebes_gfxPlatform.cpp:1.1
--- /dev/null   Mon Jun 15 15:44:22 2020
+++ pkgsrc/mail/thunderbird/patches/patch-gfx_thebes_gfxPlatform.cpp    Mon Jun 15 15:44:22 2020
@@ -0,0 +1,27 @@
+$NetBSD: patch-gfx_thebes_gfxPlatform.cpp,v 1.1 2020/06/15 15:44:22 nia Exp $
+
+Don't rely on CrossProcessSemaphore on NetBSD. It has some implementation
+issues that cause issues (kern/55386, not available on NetBSD<9)
+
+This idea is borrowed from macOS which has the same limitation.
+
+--- gfx/thebes/gfxPlatform.cpp.orig    2020-06-02 14:07:53.000000000 +0000
++++ gfx/thebes/gfxPlatform.cpp
+@@ -2991,6 +2991,9 @@ bool gfxPlatform::UsesOffMainThreadCompo
+ }
+ 
+ bool gfxPlatform::UsesTiling() const {
++#ifdef __NetBSD__
++  return true;
++#else
+   bool usesSkia = GetDefaultContentBackend() == BackendType::SKIA;
+ 
+   // We can't just test whether the PaintThread is initialized here because
+@@ -3002,6 +3005,7 @@ bool gfxPlatform::UsesTiling() const {
+ 
+   return gfxPrefs::LayersTilesEnabled() ||
+          (gfxPrefs::LayersTilesEnabledIfSkiaPOMTP() && usesSkia && usesPOMTP);
++#endif
+ }
+ 
+ bool gfxPlatform::ContentUsesTiling() const {



Home | Main Index | Thread Index | Old Index