CVS commit: pkgsrc/x11/xvidcap

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

Module Name:    pkgsrc
Committed By:   nia
Date:           Sun Jun 14 10:12:57 UTC 2026

Modified Files:
        pkgsrc/x11/xvidcap: Makefile distinfo
Added Files:
        pkgsrc/x11/xvidcap/patches: patch-ffmpeg_libavcodec_bitstream.h

Log Message:
xvidcap: Avoid regressions with recent GNU toolchains.

With GCC 14 and newer, building xvidcap's internal codecs silently
fails. This results in a working package, but without any usable
codecs, which vastly impacts xvidcap's functionality.

This change fixes the silent errors.


To generate a diff of this commit:
cvs rdiff -u -r1.68 -r1.69 pkgsrc/x11/xvidcap/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/x11/xvidcap/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/x11/xvidcap/patches/patch-ffmpeg_libavcodec_bitstream.h

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

Modified files:

Index: pkgsrc/x11/xvidcap/Makefile
diff -u pkgsrc/x11/xvidcap/Makefile:1.68 pkgsrc/x11/xvidcap/Makefile:1.69
--- pkgsrc/x11/xvidcap/Makefile:1.68    Tue Jan 27 08:41:09 2026
+++ pkgsrc/x11/xvidcap/Makefile Sun Jun 14 10:12:56 2026
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.68 2026/01/27 08:41:09 wiz Exp $
+# $NetBSD: Makefile,v 1.69 2026/06/14 10:12:56 nia Exp $
 
 DISTNAME=      xvidcap-1.1.7
-PKGREVISION=   33
+PKGREVISION=   34
 CATEGORIES=    x11
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=xvidcap/}
 
@@ -45,6 +45,12 @@ SUBST_SED.sr+=               -e "s|sndrate = 44100|sn
 
 CONFIGURE_ARGS+=       --with-forced-embedded-ffmpeg
 
+.include "../../mk/compiler.mk"
+
+.if !${CC_VERSION:Mgcc-4.*}
+CFLAGS+=               -Wno-incompatible-pointer-types
+.endif
+
 .include "options.mk"
 .include "../../devel/libglade/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"

Index: pkgsrc/x11/xvidcap/distinfo
diff -u pkgsrc/x11/xvidcap/distinfo:1.15 pkgsrc/x11/xvidcap/distinfo:1.16
--- pkgsrc/x11/xvidcap/distinfo:1.15    Tue Oct 26 11:34:59 2021
+++ pkgsrc/x11/xvidcap/distinfo Sun Jun 14 10:12:56 2026
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.15 2021/10/26 11:34:59 nia Exp $
+$NetBSD: distinfo,v 1.16 2026/06/14 10:12:56 nia Exp $
 
 BLAKE2s (xvidcap-1.1.7.tar.gz) = cc98acc42810e743775ff8049871f0b24ed141e432fd59bf6f6b76badfd156b6
 SHA512 (xvidcap-1.1.7.tar.gz) = 9dc2e6751a0f9126dc81f24fca18430a57550b57eaad2e2cd782cc1a5274a7998b509b491d85db3a1302866583b48c36e65043608c453c0466fbbe3d1142bc42
 Size (xvidcap-1.1.7.tar.gz) = 4789924 bytes
 SHA1 (patch-configure) = 9a82ebbfd4fd6e7b1ad4567e346ce2c2860d1c9e
+SHA1 (patch-ffmpeg_libavcodec_bitstream.h) = 76199105fc31ec92703420bbcd06c61d958b3515
 SHA1 (patch-src_capture.c) = 1fc2f28c3a30a08eac799cb646d291472e99a10a

Added files:

Index: pkgsrc/x11/xvidcap/patches/patch-ffmpeg_libavcodec_bitstream.h
diff -u /dev/null pkgsrc/x11/xvidcap/patches/patch-ffmpeg_libavcodec_bitstream.h:1.1
--- /dev/null   Sun Jun 14 10:12:57 2026
+++ pkgsrc/x11/xvidcap/patches/patch-ffmpeg_libavcodec_bitstream.h      Sun Jun 14 10:12:56 2026
@@ -0,0 +1,35 @@
+$NetBSD: patch-ffmpeg_libavcodec_bitstream.h,v 1.1 2026/06/14 10:12:56 nia Exp $
+
+Fix build with recent GNU toolchains.
+
+--- ffmpeg/libavcodec/bitstream.h.orig 2026-06-14 10:05:08.928376357 +0000
++++ ffmpeg/libavcodec/bitstream.h
+@@ -53,26 +53,8 @@ extern const uint8_t ff_reverse[256];
+ 
+ extern const uint8_t ff_reverse[256];
+ 
+-#if defined(ARCH_X86)
+-// avoid +32 for shift optimization (gcc should do that ...)
+-static inline  int32_t NEG_SSR32( int32_t a, int8_t s){
+-    asm ("sarl %1, %0\n\t"
+-         : "+r" (a)
+-         : "ic" ((uint8_t)(-s))
+-    );
+-    return a;
+-}
+-static inline uint32_t NEG_USR32(uint32_t a, int8_t s){
+-    asm ("shrl %1, %0\n\t"
+-         : "+r" (a)
+-         : "ic" ((uint8_t)(-s))
+-    );
+-    return a;
+-}
+-#else
+-#    define NEG_SSR32(a,s) ((( int32_t)(a))>>(32-(s)))
+-#    define NEG_USR32(a,s) (((uint32_t)(a))>>(32-(s)))
+-#endif
++#define NEG_SSR32(a,s) ((( int32_t)(a))>>(32-(s)))
++#define NEG_USR32(a,s) (((uint32_t)(a))>>(32-(s)))
+ 
+ /* bit output */
+