On Thu, Apr 21, 2011 at 09:48:44 (CEST), Reinhard Tartler wrote: > This unbreaks static compilation against libav when using pkg-config, > like mplayer2 does > > Taken from on a patch from "Uoti Urpal <[email protected]>" > http://repo.or.cz/w/FFMpeg-mirror/mplayer-patches.git/commitdiff/65e612b5943fe79a6aaf83c0f48a1e4a0f739ffc?hp=0d0f1bc11ec7c8f81a61c1fa4a6bc0048ad10f30 > --- > configure | 10 +++++----- > 1 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/configure b/configure > index 32c3544..456457a 100755 > --- a/configure > +++ b/configure > @@ -2839,7 +2839,7 @@ for thread in $THREADS_LIST; do > fi > done > > -check_lib math.h sin -lm > +check_lib math.h sin -lm && LIBM="-lm" > enabled vaapi && require vaapi va/va.h vaInitialize -lva > > check_mathfunc exp2 > @@ -3425,10 +3425,10 @@ Cflags: -I\${includedir} > EOF > } > > -pkgconfig_generate libavutil "Libav utility library" "$LIBAVUTIL_VERSION" > -pkgconfig_generate libavcodec "Libav codec library" "$LIBAVCODEC_VERSION" > "$extralibs" > +pkgconfig_generate libavutil "Libav utility library" "$LIBAVUTIL_VERSION" > "$LIBM" > +pkgconfig_generate libavcodec "Libav codec library" "$LIBAVCODEC_VERSION" > "$extralibs" "libavutil = $LIBAVUTIL_VERSION"
This hunk was forgotten in the previous variant, mainly because in the original patch, the dependency went via libavcore. With it's merge into libavutil, the dependency needs to be moved to avcodec, not dropped. > 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 libavfilter "Libav video filtering library" > "$LIBAVFILTER_VERSION" "$extralibs" > -pkgconfig_generate libpostproc "Libav post processing library" > "$LIBPOSTPROC_VERSION" > -pkgconfig_generate libswscale "Libav image rescaling library" > "$LIBSWSCALE_VERSION" "" "libavutil = $LIBAVUTIL_VERSION" > +pkgconfig_generate libpostproc "Libav post processing library" > "$LIBPOSTPROC_VERSION" "" "libavutil = $LIBAVUTIL_VERSION" > +pkgconfig_generate libswscale "Libav image rescaling library" > "$LIBSWSCALE_VERSION" "$LIBM" "libavutil = $LIBAVUTIL_VERSION" -- Gruesse/greetings, Reinhard Tartler, KeyID 945348A4 _______________________________________________ libav-devel mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-devel
