CVS commit: pkgsrc/multimedia/mplayer-share

["Robert Swindells" <rjs%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   rjs
Date:           Mon May 27 19:33:55 UTC 2024

Modified Files:
        pkgsrc/multimedia/mplayer-share: distinfo options.mk
        pkgsrc/multimedia/mplayer-share/patches: patch-configure

Log Message:
Make v4l2 option work on NetBSD.


To generate a diff of this commit:
cvs rdiff -u -r1.107 -r1.108 pkgsrc/multimedia/mplayer-share/distinfo
cvs rdiff -u -r1.72 -r1.73 pkgsrc/multimedia/mplayer-share/options.mk
cvs rdiff -u -r1.5 -r1.6 \
    pkgsrc/multimedia/mplayer-share/patches/patch-configure

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

Modified files:

Index: pkgsrc/multimedia/mplayer-share/distinfo
diff -u pkgsrc/multimedia/mplayer-share/distinfo:1.107 pkgsrc/multimedia/mplayer-share/distinfo:1.108
--- pkgsrc/multimedia/mplayer-share/distinfo:1.107      Fri Apr 12 19:32:56 2024
+++ pkgsrc/multimedia/mplayer-share/distinfo    Mon May 27 19:33:55 2024
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.107 2024/04/12 19:32:56 riastradh Exp $
+$NetBSD: distinfo,v 1.108 2024/05/27 19:33:55 rjs Exp $
 
 BLAKE2s (mplayer/MPlayer-1.5.tar.xz) = 1a86b823bcc82e07cf43551151449dd1cbdd768d8281ebe32cea6ced91d029c5
 SHA512 (mplayer/MPlayer-1.5.tar.xz) = 05fe1edf23cec53be676333b6299df4b3f1ee746e5ccd96dc0bed550e7a1602ba7ba182c1cc23fcac67aacde849a46628b1dcab8ee3d3d4117415c11b6a6ad74
@@ -6,7 +6,7 @@ Size (mplayer/MPlayer-1.5.tar.xz) = 1537
 SHA1 (patch-ae) = 286f5ac075ea4123a1a6276f97e02a4dda9b3e67
 SHA1 (patch-an) = 330c427e30b686165fda15a85b730a3f53e0d217
 SHA1 (patch-av__helpers.c) = c7821a3c4fb4cddc581ed1ee364c735c9680eb05
-SHA1 (patch-configure) = 4954fe76122f9412433b1cccb64bcc052d1c026f
+SHA1 (patch-configure) = 8eae09f084c8ad95e62e3a308629128c83296fcd
 SHA1 (patch-ffmpeg_libavutil_ppc_cpu.c) = c2076abc3214b243ad56e3f85960beac6111e557
 SHA1 (patch-gui_interface.c) = 04c347b6cb0a54132e6b089142c8ed282f583a1c
 SHA1 (patch-libao2_ao__alsa.c) = da568da8b9290f1ed49ecedec7dc9141408698b1

Index: pkgsrc/multimedia/mplayer-share/options.mk
diff -u pkgsrc/multimedia/mplayer-share/options.mk:1.72 pkgsrc/multimedia/mplayer-share/options.mk:1.73
--- pkgsrc/multimedia/mplayer-share/options.mk:1.72     Fri Sep 30 12:40:45 2022
+++ pkgsrc/multimedia/mplayer-share/options.mk  Mon May 27 19:33:55 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.72 2022/09/30 12:40:45 triaxx Exp $
+# $NetBSD: options.mk,v 1.73 2024/05/27 19:33:55 rjs Exp $
 
 .if defined(PKGNAME) && empty(PKGNAME:Mmplayer-share*)
 
@@ -292,7 +292,10 @@ CONFIGURE_ARGS+=   --enable-theora
 CONFIGURE_ARGS+=       --disable-theora
 .  endif
 
-.  if empty(PKG_OPTIONS:Mv4l2)
+.if !empty(PKG_OPTIONS:Mv4l2)
+CONFIGURE_ARGS+=       --enable-tv-v4l2
+.  include "../../graphics/libv4l/buildlink3.mk"
+.else
 CONFIGURE_ARGS+=       --disable-tv-v4l2
 .  endif
 

Index: pkgsrc/multimedia/mplayer-share/patches/patch-configure
diff -u pkgsrc/multimedia/mplayer-share/patches/patch-configure:1.5 pkgsrc/multimedia/mplayer-share/patches/patch-configure:1.6
--- pkgsrc/multimedia/mplayer-share/patches/patch-configure:1.5 Wed Dec 14 13:54:19 2022
+++ pkgsrc/multimedia/mplayer-share/patches/patch-configure     Mon May 27 19:33:55 2024
@@ -1,4 +1,4 @@
-$NetBSD: patch-configure,v 1.5 2022/12/14 13:54:19 tsutsui Exp $
+$NetBSD: patch-configure,v 1.6 2024/05/27 19:33:55 rjs Exp $
 
 o Handle properly sh3, evbarm, arm64, and m68k ports on NetBSD.
 o Fix CPU family detection on NetBSD with /proc mounted with "-o linux"
@@ -210,3 +210,12 @@ o use /dev/audio instead of /dev/sound f
        extra_ldflags="$extra_ldflags -lossaudio"
    else
        def_ossaudio_devdsp='#define PATH_DEV_DSP "/dev/dsp"'
+@@ -7940,7 +7971,7 @@ echores "$_tv_v4l1"
+ 
+ 
+ echocheck "Video 4 Linux 2 TV interface"
+-if test "$_tv_v4l2" = auto && test "$_tv" = yes ; then
++if test "$_tv_v4l2" = yes ; then
+     _tv_v4l2=no
+     if linux ; then
+         header_check_broken sys/time.h linux/videodev2.h && _tv_v4l2=yes