[pkgsrc/trunk]: pkgsrc/multimedia/ffmpeg4 multimedia/ffmpeg4: solaris build f...

[dholland <dholland%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/47dce4967998
branches:  trunk
changeset: 379753:47dce4967998
user:      dholland <dholland%pkgsrc.org@localhost>
date:      Mon May 23 00:35:02 2022 +0000

description:
multimedia/ffmpeg4: solaris build fixes from Claes Nästén in PR 56633

diffstat:

 multimedia/ffmpeg4/Makefile.common                     |   5 ++++-
 multimedia/ffmpeg4/distinfo                            |   3 ++-
 multimedia/ffmpeg4/patches/patch-ffbuild_libversion.sh |  12 ++++++++++++
 3 files changed, 18 insertions(+), 2 deletions(-)

diffs (59 lines):

diff -r 07841f54ec18 -r 47dce4967998 multimedia/ffmpeg4/Makefile.common
--- a/multimedia/ffmpeg4/Makefile.common        Sun May 22 23:58:43 2022 +0000
+++ b/multimedia/ffmpeg4/Makefile.common        Mon May 23 00:35:02 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.27 2022/04/20 21:16:01 wiz Exp $
+# $NetBSD: Makefile.common,v 1.28 2022/05/23 00:35:02 dholland Exp $
 # used by multimedia/ffmpeg4/Makefile
 # used by multimedia/ffplay4/Makefile
 
@@ -32,6 +32,8 @@
 CONFIGURE_ARGS+=       --libdir=${PREFIX}/lib/ffmpeg4
 CONFIGURE_ARGS+=       --shlibdir=${PREFIX}/lib/ffmpeg4
 LDFLAGS+=              ${COMPILER_RPATH_FLAG}${PREFIX}/lib/ffmpeg4
+# Misuse LDFLAGS because the package doesn't (at least right now) honor LIBS.
+LDFLAGS.SunOS+=                -lrt
 
 .if !empty(MACHINE_PLATFORM:MDarwin-1[2-9].*-*) || !empty(MACHINE_PLATFORM:MDarwin-2*)
 CONFIGURE_ARGS+=       --enable-opencl
@@ -73,6 +75,7 @@
 REPLACE_SH+=   configure
 REPLACE_SH+=   ffbuild/pkgconfig_generate.sh
 REPLACE_SH+=   ffbuild/version.sh
+REPLACE_SH+=   ffbuild/libversion.sh
 
 PLIST_SRC+=    ${PKGDIR}/PLIST
 
diff -r 07841f54ec18 -r 47dce4967998 multimedia/ffmpeg4/distinfo
--- a/multimedia/ffmpeg4/distinfo       Sun May 22 23:58:43 2022 +0000
+++ b/multimedia/ffmpeg4/distinfo       Mon May 23 00:35:02 2022 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.26 2022/04/20 21:16:01 wiz Exp $
+$NetBSD: distinfo,v 1.27 2022/05/23 00:35:02 dholland Exp $
 
 BLAKE2s (ffmpeg-4.4.2.tar.xz) = b28c91e749bebf8a0b2911723c60281ff4deea5d6ba613939a27b0ae702c8c0d
 SHA512 (ffmpeg-4.4.2.tar.xz) = abce847c607ac6d63fe32ceff8bf8724888acf2b7db9a083cba50e3235590cdcb27feb7e0a314133d0030809fb54d474f64001fc9ab7d896a819159869c09d5a
@@ -9,6 +9,7 @@
 SHA1 (patch-doc_general__contents.texi) = 13704795d2688dc0377a512dc6e65025ad674724
 SHA1 (patch-doc_indevs.texi) = 066a6ead2132ec05796bdcc000071dfca76d220c
 SHA1 (patch-doc_outdevs.texi) = 0a6930b835fb24e0008adeeb6c34990db1e16fc1
+SHA1 (patch-ffbuild_libversion.sh) = 7671eced5a8135a900c2f1d30343fc072ebb84ec
 SHA1 (patch-libavdevice_Makefile) = 526efd20021068245d8904c0d55508a540ae4054
 SHA1 (patch-libavdevice_alldevices.c) = 8f835f8ec7b057ddcd6303bc2178cdb6f4541e2a
 SHA1 (patch-libavdevice_sunau.c) = 44dba866c58d508c0f873ffdd9ad8d25c059cc8a
diff -r 07841f54ec18 -r 47dce4967998 multimedia/ffmpeg4/patches/patch-ffbuild_libversion.sh
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/multimedia/ffmpeg4/patches/patch-ffbuild_libversion.sh    Mon May 23 00:35:02 2022 +0000
@@ -0,0 +1,12 @@
+$NetBSD: patch-ffbuild_libversion.sh,v 1.1 2022/05/23 00:35:02 dholland Exp $
+
+Add missing shebang.
+
+--- ffbuild/libversion.sh~     2021-10-21 17:06:35.000000000 +0000
++++ ffbuild/libversion.sh
+@@ -1,3 +1,5 @@
++#!/bin/sh
++
+ toupper(){
+     echo "$@" | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ
+ }