kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

- Fix the implicit requirement lines of the pkg-config files to use libav's

Browse source 
files and libraries and not ffmpeg's

PR:		ports/192219
Submitted by:	Adriaan de Groot <groot@kde.org>
This commit is contained in:
Marcus von Appen 2014-07-29 16:35:30 +00:00
parent 18dd938458
commit 91b7fb7247
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=363357
2 changed files with 26 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
multimedia/libav/Makefile
View file

@ -2,7 +2,7 @@
PORTNAME= libav
PORTVERSION= 10.2
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= multimedia audio ipv6 net
MASTER_SITES= http://libav.org/releases/

25
multimedia/libav/files/patch-configure
View file

@ -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"