CVS commit: pkgsrc/multimedia/ffmpeg3

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Tue Aug 23 10:17:49 UTC 2022

Modified Files:
        pkgsrc/multimedia/ffmpeg3: distinfo
        pkgsrc/multimedia/ffmpeg3/patches: patch-configure

Log Message:
ffplay3: fix build with SDL2 2.24.


To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 pkgsrc/multimedia/ffmpeg3/distinfo
cvs rdiff -u -r1.7 -r1.8 pkgsrc/multimedia/ffmpeg3/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/ffmpeg3/distinfo
diff -u pkgsrc/multimedia/ffmpeg3/distinfo:1.38 pkgsrc/multimedia/ffmpeg3/distinfo:1.39
--- pkgsrc/multimedia/ffmpeg3/distinfo:1.38     Mon May 23 13:50:19 2022
+++ pkgsrc/multimedia/ffmpeg3/distinfo  Tue Aug 23 10:17:49 2022
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.38 2022/05/23 13:50:19 adam Exp $
+$NetBSD: distinfo,v 1.39 2022/08/23 10:17:49 wiz Exp $
 
 BLAKE2s (ffmpeg-3.4.11.tar.xz) = d23ee74f99cf5e2b8ee8358053b2978b967cf81f5d85b0c3d2a8de0a7ba128b1
 SHA512 (ffmpeg-3.4.11.tar.xz) = 61d62d5ad7bbde78d957ca40b5cf9fae5fe0125292b99d0caff9441fad3ecea165a4546a44b9049849f588024c881bba2c6bbd0255133db49188d4bf4693ff4e
 Size (ffmpeg-3.4.11.tar.xz) = 8517940 bytes
 SHA1 (patch-Makefile) = 0c35f53878b0420aeea49d8ccb249279e705eb40
-SHA1 (patch-configure) = 48245369d03cb41576ab18abb4e93cfc5c2c5267
+SHA1 (patch-configure) = 1232f497896f36d23f72d43cdbf7d0de627bd85e
 SHA1 (patch-doc_Makefile) = 50ee7aaf74f8a5c439b11f141b5408322659543a
 SHA1 (patch-libavutil_common.h) = d0f1093bc82567807b39dde990ee347f90a082c9
 SHA1 (patch-libavutil_x86_asm.h) = 8f48f9e8ec08b5176bb40fc0021f3bb913dbef22

Index: pkgsrc/multimedia/ffmpeg3/patches/patch-configure
diff -u pkgsrc/multimedia/ffmpeg3/patches/patch-configure:1.7 pkgsrc/multimedia/ffmpeg3/patches/patch-configure:1.8
--- pkgsrc/multimedia/ffmpeg3/patches/patch-configure:1.7       Fri Jun 26 21:19:16 2020
+++ pkgsrc/multimedia/ffmpeg3/patches/patch-configure   Tue Aug 23 10:17:49 2022
@@ -1,9 +1,11 @@
-$NetBSD: patch-configure,v 1.7 2020/06/26 21:19:16 nia Exp $
+$NetBSD: patch-configure,v 1.8 2022/08/23 10:17:49 wiz Exp $
 
 Enable PIC and section_data_rel_ro on NetBSD, even on i386,
 to avoid text relocations.
 
---- configure.orig     2019-12-01 22:46:41.000000000 +0000
+Allow newer SDL2 versions.
+
+--- configure.orig     2022-05-14 00:19:12.000000000 +0000
 +++ configure
 @@ -4941,6 +4941,8 @@ case $target_os in
          ;;
@@ -31,3 +33,12 @@ to avoid text relocations.
  
  check_cc <<EOF && enable const_nan
  #include <math.h>
+@@ -6100,7 +6105,7 @@ fi
+ 
+ if enabled sdl2; then
+     SDL2_CONFIG="${cross_prefix}sdl2-config"
+-    if check_pkg_config sdl2 "sdl2 >= 2.0.1 sdl2 < 2.1.0" SDL_events.h SDL_PollEvent; then
++    if check_pkg_config sdl2 "sdl2 >= 2.0.1 " SDL_events.h SDL_PollEvent; then
+         check_func SDL_Init $sdl2_extralibs $sdl2_cflags ||
+             disable sdl2
+     elif "${SDL2_CONFIG}" --version > /dev/null 2>&1; then