CVS commit: pkgsrc/multimedia/ffmpeg4

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Tue Aug 23 10:04:39 UTC 2022

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

Log Message:
ffplay4: allow building against SDL2-2.24


To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 pkgsrc/multimedia/ffmpeg4/distinfo
cvs rdiff -u -r1.7 -r1.8 pkgsrc/multimedia/ffmpeg4/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/ffmpeg4/distinfo
diff -u pkgsrc/multimedia/ffmpeg4/distinfo:1.27 pkgsrc/multimedia/ffmpeg4/distinfo:1.28
--- pkgsrc/multimedia/ffmpeg4/distinfo:1.27     Mon May 23 00:35:02 2022
+++ pkgsrc/multimedia/ffmpeg4/distinfo  Tue Aug 23 10:04:39 2022
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.27 2022/05/23 00:35:02 dholland Exp $
+$NetBSD: distinfo,v 1.28 2022/08/23 10:04:39 wiz Exp $
 
 BLAKE2s (ffmpeg-4.4.2.tar.xz) = b28c91e749bebf8a0b2911723c60281ff4deea5d6ba613939a27b0ae702c8c0d
 SHA512 (ffmpeg-4.4.2.tar.xz) = abce847c607ac6d63fe32ceff8bf8724888acf2b7db9a083cba50e3235590cdcb27feb7e0a314133d0030809fb54d474f64001fc9ab7d896a819159869c09d5a
 Size (ffmpeg-4.4.2.tar.xz) = 9562968 bytes
 SHA1 (patch-Makefile) = 2d27f218ee49179fdea14bb5c86c506dfb64dbd6
-SHA1 (patch-configure) = f1aa00516d5c16fc1da2d26f441549e1d3e58f2d
+SHA1 (patch-configure) = ffa962bb7adb4a64f6c78d84accaa83da6835c0a
 SHA1 (patch-doc_Makefile) = 3b86307323fa565f9ad19c5bcb6ea71d323062fc
 SHA1 (patch-doc_general__contents.texi) = 13704795d2688dc0377a512dc6e65025ad674724
 SHA1 (patch-doc_indevs.texi) = 066a6ead2132ec05796bdcc000071dfca76d220c

Index: pkgsrc/multimedia/ffmpeg4/patches/patch-configure
diff -u pkgsrc/multimedia/ffmpeg4/patches/patch-configure:1.7 pkgsrc/multimedia/ffmpeg4/patches/patch-configure:1.8
--- pkgsrc/multimedia/ffmpeg4/patches/patch-configure:1.7       Sat Apr 10 08:50:43 2021
+++ pkgsrc/multimedia/ffmpeg4/patches/patch-configure   Tue Aug 23 10:04:39 2022
@@ -1,4 +1,4 @@
-$NetBSD: patch-configure,v 1.7 2021/04/10 08:50:43 adam Exp $
+$NetBSD: patch-configure,v 1.8 2022/08/23 10:04:39 wiz Exp $
 
 Sun audio support.
 
@@ -7,7 +7,9 @@ to avoid text relocations.
 
 Do not use 'rsync'.
 
---- configure.orig     2021-04-08 21:28:39.000000000 +0000
+Allow current SDL2 versions.
+
+--- configure.orig     2022-04-14 20:13:38.000000000 +0000
 +++ configure
 @@ -2139,6 +2139,7 @@ HEADERS_LIST="
      sys_resource_h
@@ -25,7 +27,7 @@ Do not use 'rsync'.
      symver_asm_label
      symver_gnu_asm
      vfp_args
-@@ -3430,6 +3430,8 @@ opengl_outdev_deps="opengl"
+@@ -3431,6 +3431,8 @@ opengl_outdev_deps="opengl"
  opengl_outdev_suggest="sdl2"
  oss_indev_deps_any="sys_soundcard_h"
  oss_outdev_deps_any="sys_soundcard_h"
@@ -34,7 +36,7 @@ Do not use 'rsync'.
  pulse_indev_deps="libpulse"
  pulse_outdev_deps="libpulse"
  sdl2_outdev_deps="sdl2"
-@@ -5368,6 +5370,8 @@ case $target_os in
+@@ -5369,6 +5371,8 @@ case $target_os in
          ;;
      netbsd)
          disable symver
@@ -43,7 +45,7 @@ Do not use 'rsync'.
          oss_indev_extralibs="-lossaudio"
          oss_outdev_extralibs="-lossaudio"
          enabled gcc || check_ldflags -Wl,-zmuldefs
-@@ -5766,10 +5770,13 @@ done
+@@ -5767,10 +5771,13 @@ done
  check_cc pragma_deprecated "" '_Pragma("GCC diagnostic ignored \"-Wdeprecated-declarations\"")'
  
  # The global variable ensures the bits appear unchanged in the object file.
@@ -60,7 +62,7 @@ Do not use 'rsync'.
  
  check_cc const_nan math.h "struct { double d; } static const bar[] = { { NAN } }"
  
-@@ -6169,6 +6176,7 @@ check_headers malloc.h
+@@ -6170,6 +6177,7 @@ check_headers malloc.h
  check_headers mftransform.h
  check_headers net/udplite.h
  check_headers poll.h
@@ -68,7 +70,16 @@ Do not use 'rsync'.
  check_headers sys/param.h
  check_headers sys/resource.h
  check_headers sys/select.h
-@@ -6598,7 +6606,6 @@ enabled makeinfo \
+@@ -6555,7 +6563,7 @@ fi
+ 
+ if enabled sdl2; then
+     SDL2_CONFIG="${cross_prefix}sdl2-config"
+-    test_pkg_config sdl2 "sdl2 >= 2.0.1 sdl2 < 2.1.0" SDL_events.h SDL_PollEvent
++    test_pkg_config sdl2 "sdl2 >= 2.0.1" SDL_events.h SDL_PollEvent
+     if disabled sdl2 && "${SDL2_CONFIG}" --version > /dev/null 2>&1; then
+         sdl2_cflags=$("${SDL2_CONFIG}" --cflags)
+         sdl2_extralibs=$("${SDL2_CONFIG}" --libs)
+@@ -6599,7 +6607,6 @@ enabled makeinfo \
  disabled makeinfo_html && texi2html --help 2> /dev/null | grep -q 'init-file' && enable texi2html || disable texi2html
  perl -v            > /dev/null 2>&1 && enable perl      || disable perl
  pod2man --help     > /dev/null 2>&1 && enable pod2man   || disable pod2man