CVS commit: pkgsrc/www/firefox52

["Ryo ONODERA" <ryoon%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Tue Jan  6 15:15:46 UTC 2026

Modified Files:
        pkgsrc/www/firefox52: distinfo options.mk
Added Files:
        pkgsrc/www/firefox52/patches:
            patch-media_ffvpx_libavcodec_x86_mathops.h

Log Message:
www/firefox52: Use its own option name and fix build

* Some options for newer Firefox packages are not valid for 52.
* Fix build under NetBSD/amd64 11.99.4.


To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 pkgsrc/www/firefox52/distinfo
cvs rdiff -u -r1.7 -r1.8 pkgsrc/www/firefox52/options.mk
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/www/firefox52/patches/patch-media_ffvpx_libavcodec_x86_mathops.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/firefox52/distinfo
diff -u pkgsrc/www/firefox52/distinfo:1.37 pkgsrc/www/firefox52/distinfo:1.38
--- pkgsrc/www/firefox52/distinfo:1.37  Fri May  2 09:03:49 2025
+++ pkgsrc/www/firefox52/distinfo       Tue Jan  6 15:15:46 2026
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.37 2025/05/02 09:03:49 nia Exp $
+$NetBSD: distinfo,v 1.38 2026/01/06 15:15:46 ryoon Exp $
 
 BLAKE2s (firefox-52.9.0esr.source.tar.xz) = 68da851ecfe1b03231157bf79732865d3cf81b7c10128a2e2a9e6e7be3963348
 SHA512 (firefox-52.9.0esr.source.tar.xz) = bfca42668ca78a12a9fb56368f4aae5334b1f7a71966fbba4c32b9c5e6597aac79a6e340ac3966779d2d5563eb47c054ab33cc40bfb7306172138ccbd3adb2b9
@@ -80,6 +80,7 @@ SHA1 (patch-js_src_vm_StructuredClone.cp
 SHA1 (patch-js_xpconnect_src_XPCConvert.cpp) = 915777e9bb5366be41866cdb6ea0ad2b1c006dde
 SHA1 (patch-js_xpconnect_src_XPCWrappedNative.cpp) = 6630b8cb20a2a2b8337e8c1250e741fd65be1e54
 SHA1 (patch-js_xpconnect_src_xpcprivate.h) = e09e37819961bae40a9f276ae1ee510d2956c23e
+SHA1 (patch-media_ffvpx_libavcodec_x86_mathops.h) = f9cccdc9d40adaba0cd24addf354922254d26242
 SHA1 (patch-media_libcubeb_src_cubeb.c) = 24075714155e5c95fddf95ae8865a71db6006c15
 SHA1 (patch-media_libcubeb_src_cubeb__alsa.c) = c59eaf40973193885f32819b465b401c1ba45fce
 SHA1 (patch-media_libcubeb_src_cubeb__oss.c) = e15cc2d0c220738ccfd57f79eec242095c8ea536

Index: pkgsrc/www/firefox52/options.mk
diff -u pkgsrc/www/firefox52/options.mk:1.7 pkgsrc/www/firefox52/options.mk:1.8
--- pkgsrc/www/firefox52/options.mk:1.7 Fri Dec  5 08:57:54 2025
+++ pkgsrc/www/firefox52/options.mk     Tue Jan  6 15:15:46 2026
@@ -1,6 +1,6 @@
-# $NetBSD: options.mk,v 1.7 2025/12/05 08:57:54 martin Exp $
+# $NetBSD: options.mk,v 1.8 2026/01/06 15:15:46 ryoon Exp $
 
-PKG_OPTIONS_VAR=       PKG_OPTIONS.firefox
+PKG_OPTIONS_VAR=       PKG_OPTIONS.firefox52
 
 PKG_OPTIONS_REQUIRED_GROUPS=   gtk
 PKG_OPTIONS_GROUP.gtk=         gtk2 gtk3

Added files:

Index: pkgsrc/www/firefox52/patches/patch-media_ffvpx_libavcodec_x86_mathops.h
diff -u /dev/null pkgsrc/www/firefox52/patches/patch-media_ffvpx_libavcodec_x86_mathops.h:1.1
--- /dev/null   Tue Jan  6 15:15:46 2026
+++ pkgsrc/www/firefox52/patches/patch-media_ffvpx_libavcodec_x86_mathops.h     Tue Jan  6 15:15:46 2026
@@ -0,0 +1,40 @@
+$NetBSD: patch-media_ffvpx_libavcodec_x86_mathops.h,v 1.1 2026/01/06 15:15:46 ryoon Exp $
+
+* From 128 to fix build under NetBSD/amd64 11.99.4.
+
+--- media/ffvpx/libavcodec/x86/mathops.h.orig  2026-01-06 09:12:28.479025029 +0000
++++ media/ffvpx/libavcodec/x86/mathops.h
+@@ -113,19 +113,31 @@ static inline  int32_t NEG_SSR32( int32_t a, int8_t s)
+ // avoid +32 for shift optimization (gcc should do that ...)
+ #define NEG_SSR32 NEG_SSR32
+ static inline  int32_t NEG_SSR32( int32_t a, int8_t s){
++    if (__builtin_constant_p(s))
+     __asm__ ("sarl %1, %0\n\t"
+          : "+r" (a)
+-         : "ic" ((uint8_t)(-s))
++         : "i" (-s & 0x1F)
+     );
++    else
++        __asm__ ("sarl %1, %0\n\t"
++               : "+r" (a)
++               : "c" ((uint8_t)(-s))
++        );
+     return a;
+ }
+ 
+ #define NEG_USR32 NEG_USR32
+ static inline uint32_t NEG_USR32(uint32_t a, int8_t s){
++    if (__builtin_constant_p(s))
+     __asm__ ("shrl %1, %0\n\t"
+          : "+r" (a)
+-         : "ic" ((uint8_t)(-s))
++         : "i" (-s & 0x1F)
+     );
++    else
++        __asm__ ("shrl %1, %0\n\t"
++               : "+r" (a)
++               : "c" ((uint8_t)(-s))
++        );
+     return a;
+ }
+