CVS commit: pkgsrc/www/seamonkey

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Fri Jun 26 11:40:28 UTC 2020

Modified Files:
        pkgsrc/www/seamonkey: Makefile distinfo
Added Files:
        pkgsrc/www/seamonkey/patches:
            patch-mozilla_gfx_skia_skia_src_core_SkCpu.cpp
            patch-mozilla_media_ffvpx_libavutil_arm_bswap.h

Log Message:
seamonkey: More aarch64 fixes from www/firefox


To generate a diff of this commit:
cvs rdiff -u -r1.217 -r1.218 pkgsrc/www/seamonkey/Makefile
cvs rdiff -u -r1.166 -r1.167 pkgsrc/www/seamonkey/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/www/seamonkey/patches/patch-mozilla_gfx_skia_skia_src_core_SkCpu.cpp \
    pkgsrc/www/seamonkey/patches/patch-mozilla_media_ffvpx_libavutil_arm_bswap.h

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

Modified files:

Index: pkgsrc/www/seamonkey/Makefile
diff -u pkgsrc/www/seamonkey/Makefile:1.217 pkgsrc/www/seamonkey/Makefile:1.218
--- pkgsrc/www/seamonkey/Makefile:1.217 Wed Jun 24 14:26:00 2020
+++ pkgsrc/www/seamonkey/Makefile       Fri Jun 26 11:40:28 2020
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.217 2020/06/24 14:26:00 nia Exp $
+# $NetBSD: Makefile,v 1.218 2020/06/26 11:40:28 nia Exp $
 
 DISTNAME=      seamonkey-${SM_VER}.source
 PKGNAME=       seamonkey-${SM_VER:S/b/beta/}
-PKGREVISION=   4
+PKGREVISION=   5
 SM_VER=                2.53.2
 CATEGORIES=    www
 MASTER_SITES=  ${MASTER_SITE_MOZILLA:=seamonkey/releases/${SM_VER}/source/}

Index: pkgsrc/www/seamonkey/distinfo
diff -u pkgsrc/www/seamonkey/distinfo:1.166 pkgsrc/www/seamonkey/distinfo:1.167
--- pkgsrc/www/seamonkey/distinfo:1.166 Wed Jun 24 14:26:00 2020
+++ pkgsrc/www/seamonkey/distinfo       Fri Jun 26 11:40:28 2020
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.166 2020/06/24 14:26:00 nia Exp $
+$NetBSD: distinfo,v 1.167 2020/06/26 11:40:28 nia Exp $
 
 SHA1 (seamonkey-2.53.2.source.tar.xz) = 7c6e3295a751aa36c8325e20ef1367d0fb643120
 RMD160 (seamonkey-2.53.2.source.tar.xz) = 567c8bd64166e5854c712f2c2d6ca0dea182c75b
@@ -10,12 +10,14 @@ SHA1 (patch-mozilla_browser_branding_uno
 SHA1 (patch-mozilla_dom_base_nsAttrName.h) = 3ddbe33950d93e06e41a43de3395a1794a66e61a
 SHA1 (patch-mozilla_dom_media_CubebUtils.cpp) = 8949ad37cbde3ab2471d1771282809a254d3ec86
 SHA1 (patch-mozilla_gfx_layers_client_ClientPaintedLayer.cpp) = 5ed6afee07c97782e30d4dd7a37465230fb553fb
+SHA1 (patch-mozilla_gfx_skia_skia_src_core_SkCpu.cpp) = 5151277f18865ea817ecef5d3dfba5b82d07d649
 SHA1 (patch-mozilla_ipc_chromium_src_base_lock__impl__posix.cc) = 985f4548d15a54f39e7d805c507131b3c6b67532
 SHA1 (patch-mozilla_ipc_chromium_src_base_message__pump__libevent.cc) = 00240cfb510cf71259640fd4aa428621f0eb75ba
 SHA1 (patch-mozilla_ipc_chromium_src_base_platform__thread__posix.cc) = 5abcee4d027dad6f29ac6ea7e002f0af47bbce3a
 SHA1 (patch-mozilla_ipc_glue_GeckoChildProcessHost.cpp) = 7ab1c1701344adab8d7ee0332476a864fa2446bb
 SHA1 (patch-mozilla_js_src_gc_Memory.cpp) = 0850c9d57794c037ee5ab6b3d52319f4ec34c72c
 SHA1 (patch-mozilla_js_src_threading_posix_Thread.cpp) = a22611b1329d38c1a56988be2f84aba71c431506
+SHA1 (patch-mozilla_media_ffvpx_libavutil_arm_bswap.h) = 092081aad618309cf016fefcd00cf725fc0e92af
 SHA1 (patch-mozilla_media_libcubeb_src_cubeb.c) = 85e03895737f47dfb373a46bb2992e36fc78728f
 SHA1 (patch-mozilla_media_libcubeb_src_cubeb__alsa.c) = 5931c3293ec6130776f146a6a962ebe86aba39a4
 SHA1 (patch-mozilla_media_libcubeb_src_moz.build) = ca2c76fc54a62323db0e66386a99a996cd7aaef0

Added files:

Index: pkgsrc/www/seamonkey/patches/patch-mozilla_gfx_skia_skia_src_core_SkCpu.cpp
diff -u /dev/null pkgsrc/www/seamonkey/patches/patch-mozilla_gfx_skia_skia_src_core_SkCpu.cpp:1.1
--- /dev/null   Fri Jun 26 11:40:28 2020
+++ pkgsrc/www/seamonkey/patches/patch-mozilla_gfx_skia_skia_src_core_SkCpu.cpp Fri Jun 26 11:40:28 2020
@@ -0,0 +1,15 @@
+$NetBSD: patch-mozilla_gfx_skia_skia_src_core_SkCpu.cpp,v 1.1 2020/06/26 11:40:28 nia Exp $
+
+NetBSD/aarch64 doesn't have <sys/auxv.h>.
+
+--- mozilla/gfx/skia/skia/src/core/SkCpu.cpp.orig      2020-02-17 23:37:51.000000000 +0000
++++ mozilla/gfx/skia/skia/src/core/SkCpu.cpp
+@@ -74,7 +74,7 @@
+         return features;
+     }
+ 
+-#elif defined(SK_CPU_ARM64) && __has_include(<sys/auxv.h>)
++#elif defined(SK_CPU_ARM64) && __has_include(<sys/auxv.h>) && !defined(__NetBSD__)
+     #include <sys/auxv.h>
+ 
+     static uint32_t read_cpu_features() {
Index: pkgsrc/www/seamonkey/patches/patch-mozilla_media_ffvpx_libavutil_arm_bswap.h
diff -u /dev/null pkgsrc/www/seamonkey/patches/patch-mozilla_media_ffvpx_libavutil_arm_bswap.h:1.1
--- /dev/null   Fri Jun 26 11:40:28 2020
+++ pkgsrc/www/seamonkey/patches/patch-mozilla_media_ffvpx_libavutil_arm_bswap.h        Fri Jun 26 11:40:28 2020
@@ -0,0 +1,22 @@
+$NetBSD: patch-mozilla_media_ffvpx_libavutil_arm_bswap.h,v 1.1 2020/06/26 11:40:28 nia Exp $
+
+Fix NetBSD aarch64 build.
+
+--- mozilla/media/ffvpx/libavutil/arm/bswap.h.orig     2020-02-17 23:37:58.000000000 +0000
++++ mozilla/media/ffvpx/libavutil/arm/bswap.h
+@@ -23,6 +23,8 @@
+ #include "config.h"
+ #include "libavutil/attributes.h"
+ 
++#ifndef __aarch64__
++
+ #ifdef __ARMCC_VERSION
+ 
+ #if HAVE_ARMV6
+@@ -64,4 +66,6 @@ static av_always_inline av_const uint32_
+ 
+ #endif /* __ARMCC_VERSION */
+ 
++#endif /* __aarch64__ */
++
+ #endif /* AVUTIL_ARM_BSWAP_H */