CVS commit: pkgsrc/graphics/xv

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

Module Name:    pkgsrc
Committed By:   nia
Date:           Wed Mar 18 16:19:54 UTC 2026

Modified Files:
        pkgsrc/graphics/xv: distinfo
        pkgsrc/graphics/xv/patches: patch-xv.h

Log Message:
xv: Fix build on SunOS with recent gcc


To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 pkgsrc/graphics/xv/distinfo
cvs rdiff -u -r1.4 -r1.5 pkgsrc/graphics/xv/patches/patch-xv.h

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

Modified files:

Index: pkgsrc/graphics/xv/distinfo
diff -u pkgsrc/graphics/xv/distinfo:1.33 pkgsrc/graphics/xv/distinfo:1.34
--- pkgsrc/graphics/xv/distinfo:1.33    Mon Apr 21 20:23:27 2025
+++ pkgsrc/graphics/xv/distinfo Wed Mar 18 16:19:54 2026
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.33 2025/04/21 20:23:27 wiz Exp $
+$NetBSD: distinfo,v 1.34 2026/03/18 16:19:54 nia Exp $
 
 BLAKE2s (xv-3.10a-enhancements.20070520-20081216.diff) = 1333e3066444f6adf64e83c33a129a46143678d4b2c805f3740baae1320d3449
 SHA512 (xv-3.10a-enhancements.20070520-20081216.diff) = d7152799f6ec65404496b8d83a93681122fe1280741ffe4d20d7dc1b3791873081c778b3d9806f1217b9d45f5b5bfce6fdbfb655c26ed5e87388a6f517c4f2f7
@@ -14,7 +14,7 @@ SHA1 (patch-bits_br__webp) = 47f2495f0e8
 SHA1 (patch-config.h) = 44e0c07e6bdef840b2e2c5b793d7854252254117
 SHA1 (patch-vdcomp.c) = 4c603cdc2c01925fed283b2aa6030d1933cdaddc
 SHA1 (patch-xv.c) = 6f4024903cb8b35a6ab2aba656b540f0df2566fb
-SHA1 (patch-xv.h) = 9af141caf2a17eac2eed1c24a2468df268f5ce20
+SHA1 (patch-xv.h) = 6def469a332abe3f4ee909caa6b93353d41114ca
 SHA1 (patch-xvbmp.c) = 5d5b01dabf235051394055ee6897c9d2500efe46
 SHA1 (patch-xvbrowse.c) = f15e6e8e4db2776f072f34355ecad7844a764c2a
 SHA1 (patch-xvdir.c) = 070714b588bc28f5d6e8974a88c960c6ab9df94f

Index: pkgsrc/graphics/xv/patches/patch-xv.h
diff -u pkgsrc/graphics/xv/patches/patch-xv.h:1.4 pkgsrc/graphics/xv/patches/patch-xv.h:1.5
--- pkgsrc/graphics/xv/patches/patch-xv.h:1.4   Mon Apr 21 20:23:27 2025
+++ pkgsrc/graphics/xv/patches/patch-xv.h       Wed Mar 18 16:19:54 2026
@@ -1,4 +1,4 @@
-$NetBSD: patch-xv.h,v 1.4 2025/04/21 20:23:27 wiz Exp $
+$NetBSD: patch-xv.h,v 1.5 2026/03/18 16:19:54 nia Exp $
 
 - don't declare errno and sys_errlist
 - use strerror
@@ -8,7 +8,7 @@ $NetBSD: patch-xv.h,v 1.4 2025/04/21 20:
 - pull XRandR support from forked upstream
   https://gitlab.com/DavidGriffith/xv/-/commit/a84406cb
 
---- xv.h.orig  2025-04-19 21:39:44.640689781 +0000
+--- xv.h.orig  2026-03-18 16:17:56.151309998 +0000
 +++ xv.h
 @@ -139,9 +139,7 @@
  #endif
@@ -39,7 +39,17 @@ $NetBSD: patch-xv.h,v 1.4 2025/04/21 20:
  #    define ERRSTR(x) strerror(x)
  #  else
  #    define ERRSTR(x) sys_errlist[x]
-@@ -208,7 +206,9 @@
+@@ -196,6 +194,9 @@
+ #  include <perror.h>
+ #endif
+ 
++#if defined(__sun) || defined(__linux__)
++#  include <alloca.h>
++#endif
+ 
+ /* GRR 20070512:  Very few modern systems even have a malloc.h anymore;
+  *                stdlib.h is, well, the standard.  (Former explicitly listed
+@@ -208,7 +209,9 @@
  #  if defined(hp300) || defined(hp800) || defined(NeXT)
  #    include <sys/malloc.h>    /* it's in "sys" on HPs and NeXT */
  #  else
@@ -50,7 +60,7 @@ $NetBSD: patch-xv.h,v 1.4 2025/04/21 20:
  #  endif
  #endif
  
-@@ -222,6 +222,11 @@
+@@ -222,6 +225,11 @@
  #include <X11/Xatom.h>
  #include <X11/Xmd.h>
  
@@ -62,7 +72,7 @@ $NetBSD: patch-xv.h,v 1.4 2025/04/21 20:
  #ifdef TV_L10N
  #  include <X11/Xlocale.h>
  #endif
-@@ -392,7 +397,7 @@
+@@ -392,7 +400,7 @@
  #  endif
  #endif
  
@@ -71,7 +81,7 @@ $NetBSD: patch-xv.h,v 1.4 2025/04/21 20:
  #  define USE_GETCWD
  #endif
  
-@@ -411,6 +416,9 @@
+@@ -411,6 +419,9 @@
  /* END OF CONFIGURATION INFO */
  /*****************************/
  
@@ -81,7 +91,7 @@ $NetBSD: patch-xv.h,v 1.4 2025/04/21 20:
  
  #ifdef DOJPEG
  #  define HAVE_JPEG
-@@ -568,6 +576,12 @@
+@@ -568,6 +579,12 @@
  #  define F_TIFINC  0
  #endif
  
@@ -94,7 +104,7 @@ $NetBSD: patch-xv.h,v 1.4 2025/04/21 20:
  #ifdef HAVE_PNG
  #  define F_PNGINC  1
  #else
-@@ -621,7 +635,8 @@
+@@ -621,7 +638,8 @@
  #define F_JPC       ( 0 + F_PNGINC + F_JPGINC)
  #define F_JP2       ( 0 + F_PNGINC + F_JPGINC + F_JP2INC)
  #define F_GIF       ( 0 + F_PNGINC + F_JPGINC + F_JP2INC + F_JP2INC)  /* always avail; index varies */
@@ -104,7 +114,7 @@ $NetBSD: patch-xv.h,v 1.4 2025/04/21 20:
  #define F_PS        ( 1 + F_TIFF)
  #define F_PBMRAW    ( 2 + F_TIFF)
  #define F_PBMASCII  ( 3 + F_TIFF)
-@@ -691,6 +706,7 @@
+@@ -691,6 +709,7 @@
  #define RFT_PI       (JP_EXT_RFT + 4)
  #define RFT_PIC2     (JP_EXT_RFT + 5)
  #define RFT_MGCSFX   (JP_EXT_RFT + 6)
@@ -112,7 +122,7 @@ $NetBSD: patch-xv.h,v 1.4 2025/04/21 20:
  
  /* definitions for page up/down, arrow up/down list control */
  #define LS_PAGEUP   0
-@@ -1404,6 +1420,11 @@ WHERE Window        pngW;
+@@ -1404,6 +1423,11 @@ WHERE Window        pngW;
  WHERE int           pngUp;        /* is pngW mapped, or what? */
  #endif
  
@@ -124,7 +134,7 @@ $NetBSD: patch-xv.h,v 1.4 2025/04/21 20:
  
  #ifdef ENABLE_FIXPIX_SMOOTH
  WHERE int           do_fixpix_smooth;  /* GRR 19980607: runtime FS dithering */
-@@ -2094,6 +2115,14 @@ int LoadSunRas             PARM((char *,
+@@ -2094,6 +2118,14 @@ int LoadSunRas             PARM((char *,
  int WriteSunRas            PARM((FILE *, byte *, int, int, int, byte *,
                                 byte *, byte*, int, int, int));