git: b2bad281f662 - 2023Q3 - audio/alsa-plugins: revert ffmpeg workaround
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 07 Jul 2023 21:34:01 UTC
The branch 2023Q3 has been updated by jbeich:
URL: https://cgit.FreeBSD.org/ports/commit/?id=b2bad281f662159af0709d978dd5dcb5c375d863
commit b2bad281f662159af0709d978dd5dcb5c375d863
Author: Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2023-07-07 21:02:50 +0000
Commit: Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2023-07-07 21:33:57 +0000
audio/alsa-plugins: revert ffmpeg workaround
Not a leaf consumer. Depending on ffmpeg4 can cause bustage or crashes
in ffmpeg consumers.
PR: 271641 272337
This reverts commit ca82785515c8ecfa4bab73b7539a688c343f327e.
(cherry picked from commit 38462c18edacfc7e912783cb164065eab8d38be2)
---
audio/alsa-plugins/Makefile | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/audio/alsa-plugins/Makefile b/audio/alsa-plugins/Makefile
index 92788a29cc1b..80531dcf2cae 100644
--- a/audio/alsa-plugins/Makefile
+++ b/audio/alsa-plugins/Makefile
@@ -39,10 +39,9 @@ BLKCNT_P2_CFLAGS= -DFREEBSD_OSS_BLKCNT_P2
BUFSZ_P2_CFLAGS= -DFREEBSD_OSS_BUFSZ_P2
VERBOSE_CFLAGS= -DALSA_OSS_DEBUG_VERBOSE
-FFMPEG_LIB_DEPENDS= libavcodec.so.58:multimedia/ffmpeg4
+FFMPEG_LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg
FFMPEG_CONFIGURE_ENABLE= libav
-FFMPEG_CONFIGURE_ENV+= PKG_CONFIG_PATH="${LOCALBASE}/ffmpeg4/libdata/pkgconfig"
-FFMPEG_MAKE_ENV+= PKG_CONFIG_PATH="${LOCALBASE}/ffmpeg4/libdata/pkgconfig"
+FFMPEG_BROKEN= fails to build with ffmpeg >= 5
JACK_LIB_DEPENDS= libjack.so:audio/jack
JACK_CONFIGURE_ENABLE= jack