CVS commit: pkgsrc/multimedia/ffmpeg6

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Mon Jan  1 09:06:25 UTC 2024

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

Log Message:
ffmpeg6: fix patch-configure


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/multimedia/ffmpeg6/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/multimedia/ffmpeg6/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/ffmpeg6/distinfo
diff -u pkgsrc/multimedia/ffmpeg6/distinfo:1.5 pkgsrc/multimedia/ffmpeg6/distinfo:1.6
--- pkgsrc/multimedia/ffmpeg6/distinfo:1.5      Sun Dec 31 20:49:27 2023
+++ pkgsrc/multimedia/ffmpeg6/distinfo  Mon Jan  1 09:06:25 2024
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.5 2023/12/31 20:49:27 adam Exp $
+$NetBSD: distinfo,v 1.6 2024/01/01 09:06:25 adam Exp $
 
 BLAKE2s (ffmpeg-6.1.1.tar.xz) = e07806b5adbb459584f35c6b5fa7d3e8e5184fe6cca9e818c7b494f6e8287d8c
 SHA512 (ffmpeg-6.1.1.tar.xz) = fca3f8635f29182e3ae0fe843a8a53614e4b47e22c11508df3ff7cdbafbb4b5ee0d82d9b3332871f7c1032033b1cad2f67557d7c5f7f7d85e2adadca122965d5
 Size (ffmpeg-6.1.1.tar.xz) = 10458600 bytes
 SHA1 (patch-Makefile) = 2d27f218ee49179fdea14bb5c86c506dfb64dbd6
-SHA1 (patch-configure) = f6e8208a113c6a20999cb671a5aff4f1aa6734a9
+SHA1 (patch-configure) = 40afb0e226a0a1b5785ac8cf7a48c5859d326a4e
 SHA1 (patch-doc_Makefile) = c513af183e374bff4fa5945d374ddae472d51bad
 SHA1 (patch-doc_general__contents.texi) = 13704795d2688dc0377a512dc6e65025ad674724
 SHA1 (patch-doc_indevs.texi) = 8cd421a67f34ebbe6099102bf1de7c6cdb13dcb7

Index: pkgsrc/multimedia/ffmpeg6/patches/patch-configure
diff -u pkgsrc/multimedia/ffmpeg6/patches/patch-configure:1.2 pkgsrc/multimedia/ffmpeg6/patches/patch-configure:1.3
--- pkgsrc/multimedia/ffmpeg6/patches/patch-configure:1.2       Sun Dec 31 20:49:27 2023
+++ pkgsrc/multimedia/ffmpeg6/patches/patch-configure   Mon Jan  1 09:06:25 2024
@@ -1,4 +1,4 @@
-$NetBSD: patch-configure,v 1.2 2023/12/31 20:49:27 adam Exp $
+$NetBSD: patch-configure,v 1.3 2024/01/01 09:06:25 adam Exp $
 
 Sun audio support.
 
@@ -35,14 +35,14 @@ Do not use 'rsync'.
  pulse_indev_deps="libpulse"
  pulse_outdev_deps="libpulse"
  sdl2_outdev_deps="sdl2"
-@@ -5554,6 +5556,7 @@ case $target_os in
-     android)
+@@ -5586,6 +5588,7 @@ case $target_os in
+     netbsd)
          disable symver
          enable section_data_rel_ro
 +        enable pic
-         add_cflags -fPIE
-         add_ldexeflags -fPIE -pie
-         SLIB_INSTALL_NAME='$(SLIBNAME)'
+         oss_indev_extralibs="-lossaudio"
+         oss_outdev_extralibs="-lossaudio"
+         enabled gcc || check_ldflags -Wl,-zmuldefs
 @@ -5612,7 +5615,7 @@ case $target_os in
          ;;
      darwin)