Fri Jun 26 11:40:28 2020 UTC ()
seamonkey: More aarch64 fixes from www/firefox


(nia)
diff -r1.217 -r1.218 pkgsrc/www/seamonkey/Makefile
diff -r1.166 -r1.167 pkgsrc/www/seamonkey/distinfo
diff -r0 -r1.1 pkgsrc/www/seamonkey/patches/patch-mozilla_gfx_skia_skia_src_core_SkCpu.cpp
diff -r0 -r1.1 pkgsrc/www/seamonkey/patches/patch-mozilla_media_ffvpx_libavutil_arm_bswap.h
cvs diff -r1.217 -r1.218 pkgsrc/www/seamonkey/Makefile (expand / switch to unified diff)

--- pkgsrc/www/seamonkey/Makefile 2020/06/24 14:26:00 1.217
+++ pkgsrc/www/seamonkey/Makefile 2020/06/26 11:40:28 1.218
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: Makefile,v 1.217 2020/06/24 14:26:00 nia Exp $ 1# $NetBSD: Makefile,v 1.218 2020/06/26 11:40:28 nia Exp $
2 2
3DISTNAME= seamonkey-${SM_VER}.source 3DISTNAME= seamonkey-${SM_VER}.source
4PKGNAME= seamonkey-${SM_VER:S/b/beta/} 4PKGNAME= seamonkey-${SM_VER:S/b/beta/}
5PKGREVISION= 4 5PKGREVISION= 5
6SM_VER= 2.53.2 6SM_VER= 2.53.2
7CATEGORIES= www 7CATEGORIES= www
8MASTER_SITES= ${MASTER_SITE_MOZILLA:=seamonkey/releases/${SM_VER}/source/} 8MASTER_SITES= ${MASTER_SITE_MOZILLA:=seamonkey/releases/${SM_VER}/source/}
9EXTRACT_SUFX= .tar.xz 9EXTRACT_SUFX= .tar.xz
10 10
11MAINTAINER= pkgsrc-users@NetBSD.org 11MAINTAINER= pkgsrc-users@NetBSD.org
12HOMEPAGE= https://www.seamonkey-project.org/ 12HOMEPAGE= https://www.seamonkey-project.org/
13COMMENT= Full-featured gecko-based browser 13COMMENT= Full-featured gecko-based browser
14LICENSE= mpl-2.0 14LICENSE= mpl-2.0
15 15
16WRKSRC= ${WRKDIR}/${DISTNAME:S/.source//} 16WRKSRC= ${WRKDIR}/${DISTNAME:S/.source//}
17MOZILLA_DIR= mozilla/ 17MOZILLA_DIR= mozilla/
18PLIST_SRC+= ${PLIST_SRC_DFLT} 18PLIST_SRC+= ${PLIST_SRC_DFLT}
cvs diff -r1.166 -r1.167 pkgsrc/www/seamonkey/distinfo (expand / switch to unified diff)

--- pkgsrc/www/seamonkey/distinfo 2020/06/24 14:26:00 1.166
+++ pkgsrc/www/seamonkey/distinfo 2020/06/26 11:40:28 1.167
@@ -1,31 +1,33 @@ @@ -1,31 +1,33 @@
1$NetBSD: distinfo,v 1.166 2020/06/24 14:26:00 nia Exp $ 1$NetBSD: distinfo,v 1.167 2020/06/26 11:40:28 nia Exp $
2 2
3SHA1 (seamonkey-2.53.2.source.tar.xz) = 7c6e3295a751aa36c8325e20ef1367d0fb643120 3SHA1 (seamonkey-2.53.2.source.tar.xz) = 7c6e3295a751aa36c8325e20ef1367d0fb643120
4RMD160 (seamonkey-2.53.2.source.tar.xz) = 567c8bd64166e5854c712f2c2d6ca0dea182c75b 4RMD160 (seamonkey-2.53.2.source.tar.xz) = 567c8bd64166e5854c712f2c2d6ca0dea182c75b
5SHA512 (seamonkey-2.53.2.source.tar.xz) = 58dd605a916ef7fb9cad112bb54fffc837690e458e1254b685f21df1bc8808a9b53d27147cad1064294c789d1f77f17c9f6adecf2be906afa44128496f72a805 5SHA512 (seamonkey-2.53.2.source.tar.xz) = 58dd605a916ef7fb9cad112bb54fffc837690e458e1254b685f21df1bc8808a9b53d27147cad1064294c789d1f77f17c9f6adecf2be906afa44128496f72a805
6Size (seamonkey-2.53.2.source.tar.xz) = 291744036 bytes 6Size (seamonkey-2.53.2.source.tar.xz) = 291744036 bytes
7SHA1 (patch-ldap_c-sdk_include_portable.h) = b262539b92c6822a5ae8c98743d2d71b27bb076a 7SHA1 (patch-ldap_c-sdk_include_portable.h) = b262539b92c6822a5ae8c98743d2d71b27bb076a
8SHA1 (patch-mailnews_base_search_src_nsMsgSearchTerm.cpp) = d70faf66d802de613caa6a12cc36d9021caab41d 8SHA1 (patch-mailnews_base_search_src_nsMsgSearchTerm.cpp) = d70faf66d802de613caa6a12cc36d9021caab41d
9SHA1 (patch-mozilla_browser_branding_unofficial_locales_en-US_brand.dtd) = 174e1766565f576c79019a05c81f010a3ceaee2f 9SHA1 (patch-mozilla_browser_branding_unofficial_locales_en-US_brand.dtd) = 174e1766565f576c79019a05c81f010a3ceaee2f
10SHA1 (patch-mozilla_dom_base_nsAttrName.h) = 3ddbe33950d93e06e41a43de3395a1794a66e61a 10SHA1 (patch-mozilla_dom_base_nsAttrName.h) = 3ddbe33950d93e06e41a43de3395a1794a66e61a
11SHA1 (patch-mozilla_dom_media_CubebUtils.cpp) = 8949ad37cbde3ab2471d1771282809a254d3ec86 11SHA1 (patch-mozilla_dom_media_CubebUtils.cpp) = 8949ad37cbde3ab2471d1771282809a254d3ec86
12SHA1 (patch-mozilla_gfx_layers_client_ClientPaintedLayer.cpp) = 5ed6afee07c97782e30d4dd7a37465230fb553fb 12SHA1 (patch-mozilla_gfx_layers_client_ClientPaintedLayer.cpp) = 5ed6afee07c97782e30d4dd7a37465230fb553fb
 13SHA1 (patch-mozilla_gfx_skia_skia_src_core_SkCpu.cpp) = 5151277f18865ea817ecef5d3dfba5b82d07d649
13SHA1 (patch-mozilla_ipc_chromium_src_base_lock__impl__posix.cc) = 985f4548d15a54f39e7d805c507131b3c6b67532 14SHA1 (patch-mozilla_ipc_chromium_src_base_lock__impl__posix.cc) = 985f4548d15a54f39e7d805c507131b3c6b67532
14SHA1 (patch-mozilla_ipc_chromium_src_base_message__pump__libevent.cc) = 00240cfb510cf71259640fd4aa428621f0eb75ba 15SHA1 (patch-mozilla_ipc_chromium_src_base_message__pump__libevent.cc) = 00240cfb510cf71259640fd4aa428621f0eb75ba
15SHA1 (patch-mozilla_ipc_chromium_src_base_platform__thread__posix.cc) = 5abcee4d027dad6f29ac6ea7e002f0af47bbce3a 16SHA1 (patch-mozilla_ipc_chromium_src_base_platform__thread__posix.cc) = 5abcee4d027dad6f29ac6ea7e002f0af47bbce3a
16SHA1 (patch-mozilla_ipc_glue_GeckoChildProcessHost.cpp) = 7ab1c1701344adab8d7ee0332476a864fa2446bb 17SHA1 (patch-mozilla_ipc_glue_GeckoChildProcessHost.cpp) = 7ab1c1701344adab8d7ee0332476a864fa2446bb
17SHA1 (patch-mozilla_js_src_gc_Memory.cpp) = 0850c9d57794c037ee5ab6b3d52319f4ec34c72c 18SHA1 (patch-mozilla_js_src_gc_Memory.cpp) = 0850c9d57794c037ee5ab6b3d52319f4ec34c72c
18SHA1 (patch-mozilla_js_src_threading_posix_Thread.cpp) = a22611b1329d38c1a56988be2f84aba71c431506 19SHA1 (patch-mozilla_js_src_threading_posix_Thread.cpp) = a22611b1329d38c1a56988be2f84aba71c431506
 20SHA1 (patch-mozilla_media_ffvpx_libavutil_arm_bswap.h) = 092081aad618309cf016fefcd00cf725fc0e92af
19SHA1 (patch-mozilla_media_libcubeb_src_cubeb.c) = 85e03895737f47dfb373a46bb2992e36fc78728f 21SHA1 (patch-mozilla_media_libcubeb_src_cubeb.c) = 85e03895737f47dfb373a46bb2992e36fc78728f
20SHA1 (patch-mozilla_media_libcubeb_src_cubeb__alsa.c) = 5931c3293ec6130776f146a6a962ebe86aba39a4 22SHA1 (patch-mozilla_media_libcubeb_src_cubeb__alsa.c) = 5931c3293ec6130776f146a6a962ebe86aba39a4
21SHA1 (patch-mozilla_media_libcubeb_src_moz.build) = ca2c76fc54a62323db0e66386a99a996cd7aaef0 23SHA1 (patch-mozilla_media_libcubeb_src_moz.build) = ca2c76fc54a62323db0e66386a99a996cd7aaef0
22SHA1 (patch-mozilla_media_libcubeb_update.sh) = a1632da23a4752e6cc805f2af9243d152896cc3f 24SHA1 (patch-mozilla_media_libcubeb_update.sh) = a1632da23a4752e6cc805f2af9243d152896cc3f
23SHA1 (patch-mozilla_media_libpng_pngpriv.h) = 731061bf32caa61e586a7a7fe86f1393a6520731 25SHA1 (patch-mozilla_media_libpng_pngpriv.h) = 731061bf32caa61e586a7a7fe86f1393a6520731
24SHA1 (patch-mozilla_netwerk_srtp_src_crypto_hash_hmac.c) = eb07566cd98d4bbab3fd020815e72b17fbed324a 26SHA1 (patch-mozilla_netwerk_srtp_src_crypto_hash_hmac.c) = eb07566cd98d4bbab3fd020815e72b17fbed324a
25SHA1 (patch-mozilla_netwerk_srtp_src_crypto_kernel_crypto__kernel.c) = e3974859577a7437e32e37995149c938be8d9ff3 27SHA1 (patch-mozilla_netwerk_srtp_src_crypto_kernel_crypto__kernel.c) = e3974859577a7437e32e37995149c938be8d9ff3
26SHA1 (patch-mozilla_old-configure.in) = 5c711b031a2acee9ab4cf803769179de4fff0ea7 28SHA1 (patch-mozilla_old-configure.in) = 5c711b031a2acee9ab4cf803769179de4fff0ea7
27SHA1 (patch-mozilla_servo_components_style_build__gecko.rs) = 473e823fa0cd819dfee1040d360eda543d5557f0 29SHA1 (patch-mozilla_servo_components_style_build__gecko.rs) = 473e823fa0cd819dfee1040d360eda543d5557f0
28SHA1 (patch-mozilla_third__party_rust_libc_src_unix_bsd_netbsdlike_netbsd_other_mod.rs) = 784a2bd19eeae5f616e430caf6f90e1220645be3 30SHA1 (patch-mozilla_third__party_rust_libc_src_unix_bsd_netbsdlike_netbsd_other_mod.rs) = 784a2bd19eeae5f616e430caf6f90e1220645be3
29SHA1 (patch-mozilla_toolkit_components_terminator_nsTerminator.cpp) = 0d975e4b7e3d2a8550c16a9a87c2f7011917cddd 31SHA1 (patch-mozilla_toolkit_components_terminator_nsTerminator.cpp) = 0d975e4b7e3d2a8550c16a9a87c2f7011917cddd
30SHA1 (patch-mozilla_toolkit_library_moz.build) = b1e5ccc55527f1839afc4b1c757767445ed33e50 32SHA1 (patch-mozilla_toolkit_library_moz.build) = b1e5ccc55527f1839afc4b1c757767445ed33e50
31SHA1 (patch-mozilla_toolkit_moz.configure) = 1798a74b329ad0f58d98872e1cbc51cb829ac746 33SHA1 (patch-mozilla_toolkit_moz.configure) = 1798a74b329ad0f58d98872e1cbc51cb829ac746
File Added: pkgsrc/www/seamonkey/patches/patch-mozilla_gfx_skia_skia_src_core_SkCpu.cpp
$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() {
File Added: pkgsrc/www/seamonkey/patches/patch-mozilla_media_ffvpx_libavutil_arm_bswap.h
$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 */