From 91b7fb7247240b23dfe022e015182841d9dcd19c Mon Sep 17 00:00:00 2001 From: Marcus von Appen Date: Tue, 29 Jul 2014 16:35:30 +0000 Subject: [PATCH] - Fix the implicit requirement lines of the pkg-config files to use libav's files and libraries and not ffmpeg's PR: ports/192219 Submitted by: Adriaan de Groot --- multimedia/libav/Makefile | 2 +- multimedia/libav/files/patch-configure | 25 +++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/multimedia/libav/Makefile b/multimedia/libav/Makefile index 12ba60d3250c..50615ae7dbad 100644 --- a/multimedia/libav/Makefile +++ b/multimedia/libav/Makefile @@ -2,7 +2,7 @@ PORTNAME= libav PORTVERSION= 10.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia audio ipv6 net MASTER_SITES= http://libav.org/releases/ diff --git a/multimedia/libav/files/patch-configure b/multimedia/libav/files/patch-configure index d19796be006d..229c39fba6cd 100644 --- a/multimedia/libav/files/patch-configure +++ b/multimedia/libav/files/patch-configure @@ -29,3 +29,28 @@ prefix=$prefix exec_prefix=\${prefix} libdir=$libdir +@@ -4556,15 +4556,15 @@ + EOF + } + +-lavfi_libs="libavutil = $LIBAVUTIL_VERSION" +-enabled movie_filter && prepend lavfi_libs "libavformat >= $LIBAVFORMAT_VERSION, libavcodec >= $LIBAVCODEC_VERSION," +-enabled resample_filter && prepend lavfi_libs "libavresample >= $LIBAVRESAMPLE_VERSION," +-enabled scale_filter && prepend lavfi_libs "libswscale >= $LIBSWSCALE_VERSION," ++lavfi_libs="libavutil-libav = $LIBAVUTIL_VERSION" ++enabled movie_filter && prepend lavfi_libs "libavformat-libav >= $LIBAVFORMAT_VERSION, libavcodec-libav >= $LIBAVCODEC_VERSION," ++enabled resample_filter && prepend lavfi_libs "libavresample-libav >= $LIBAVRESAMPLE_VERSION," ++enabled scale_filter && prepend lavfi_libs "libswscale-libav >= $LIBSWSCALE_VERSION," + + pkgconfig_generate libavutil "Libav utility library" "$LIBAVUTIL_VERSION" "$LIBM" +-pkgconfig_generate libavcodec "Libav codec library" "$LIBAVCODEC_VERSION" "$extralibs" "libavutil = $LIBAVUTIL_VERSION" +-pkgconfig_generate libavformat "Libav container format library" "$LIBAVFORMAT_VERSION" "$extralibs" "libavcodec = $LIBAVCODEC_VERSION" +-pkgconfig_generate libavdevice "Libav device handling library" "$LIBAVDEVICE_VERSION" "$extralibs" "libavformat = $LIBAVFORMAT_VERSION" ++pkgconfig_generate libavcodec "Libav codec library" "$LIBAVCODEC_VERSION" "$extralibs" "libavutil-libav = $LIBAVUTIL_VERSION" ++pkgconfig_generate libavformat "Libav container format library" "$LIBAVFORMAT_VERSION" "$extralibs" "libavcodec-libav = $LIBAVCODEC_VERSION" ++pkgconfig_generate libavdevice "Libav device handling library" "$LIBAVDEVICE_VERSION" "$extralibs" "libavformat-libav = $LIBAVFORMAT_VERSION" + pkgconfig_generate libavfilter "Libav video filtering library" "$LIBAVFILTER_VERSION" "$extralibs" "$lavfi_libs" +-pkgconfig_generate libavresample "Libav audio resampling library" "$LIBAVRESAMPLE_VERSION" "$extralibs" "libavutil = $LIBAVUTIL_VERSION" +-pkgconfig_generate libswscale "Libav image rescaling library" "$LIBSWSCALE_VERSION" "$LIBM" "libavutil = $LIBAVUTIL_VERSION" ++pkgconfig_generate libavresample "Libav audio resampling library" "$LIBAVRESAMPLE_VERSION" "$extralibs" "libavutil-libav = $LIBAVUTIL_VERSION" ++pkgconfig_generate libswscale "Libav image rescaling library" "$LIBSWSCALE_VERSION" "$LIBM" "libavutil-libav = $LIBAVUTIL_VERSION"