svn commit: r363357 - in head/multimedia/libav: . files

[Marcus von Appen]

Author: mva
Date: Tue Jul 29 16:35:30 2014
New Revision: 363357
URL: http://svnweb.freebsd.org/changeset/ports/363357
QAT: https://qat.redports.org/buildarchive/r363357/

Log:
  - 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 <groot at kde.org>

Modified:
  head/multimedia/libav/Makefile
  head/multimedia/libav/files/patch-configure

Modified: head/multimedia/libav/Makefile
==============================================================================
--- head/multimedia/libav/Makefile	Tue Jul 29 16:31:41 2014	(r363356)
+++ head/multimedia/libav/Makefile	Tue Jul 29 16:35:30 2014	(r363357)
@@ -2,7 +2,7 @@
 
 PORTNAME=	libav
 PORTVERSION=	10.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia audio ipv6 net
 MASTER_SITES=	http://libav.org/releases/
 

Modified: head/multimedia/libav/files/patch-configure
==============================================================================
--- head/multimedia/libav/files/patch-configure	Tue Jul 29 16:31:41 2014	(r363356)
+++ head/multimedia/libav/files/patch-configure	Tue Jul 29 16:35:30 2014	(r363357)
@@ -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"