7d42d3b257
on inter-library dependency magic - libavcodec needs libvorbis which needs libogg, so add ogg to libavcodec's dependency libs - as of the previous commit, libavformat depends on libX11 and libXext, add them as dependency libs - add RPATH info when linking libavcodec and libavformat, so applications that dlopen() libavcodec or libavformat have a better chance of finding dependency libs fixes multimedia/ffmpeg2theora build problem noticed by sturm@
41 lines
3.0 KiB
Plaintext
41 lines
3.0 KiB
Plaintext
$OpenBSD: patch-configure,v 1.17 2007/10/19 14:32:57 jakemsr Exp $
|
|
--- configure.orig Mon Sep 10 19:18:12 2007
|
|
+++ configure Fri Oct 19 03:02:40 2007
|
|
@@ -2076,26 +2076,26 @@ Cflags: -I\${includedir}
|
|
EOF
|
|
}
|
|
|
|
-pkgconfig_generate libavutil "FFmpeg utility library" "$lavu_version" -lavutil "" ffmpeg
|
|
+pkgconfig_generate libavutil "FFmpeg utility library" "$lavu_version" "-lavutil $LIBavutil_EXTRALIBS" "" ffmpeg
|
|
pkgconfig_generate_uninstalled libavutil "FFmpeg utility library" "$lavu_version"
|
|
|
|
-pkgconfig_generate libavcodec "FFmpeg codec library" "$lavc_version" "-lavcodec $extralibs" "$pkg_requires libavutil = $lavu_version" ffmpeg
|
|
-pkgconfig_generate_uninstalled libavcodec "FFmpeg codec library" "$lavc_version" "$extralibs" "$pkg_requires libavutil = $lavu_version"
|
|
+pkgconfig_generate libavcodec "FFmpeg codec library" "$lavc_version" "-lavcodec $LIBavcodec_EXTRALIBS" "libavutil = $lavu_version $LIBavcodec_REQUIRES" ffmpeg
|
|
+pkgconfig_generate_uninstalled libavcodec "FFmpeg codec library" "$lavc_version" "-pthread" ""
|
|
|
|
-pkgconfig_generate libavformat "FFmpeg container format library" "$lavf_version" "-lavformat $extralibs" "$pkg_requires libavcodec = $lavc_version" ffmpeg
|
|
-pkgconfig_generate_uninstalled libavformat "FFmpeg container format library" "$lavf_version" "$extralibs" "$pkg_requires libavcodec = $lavc_version"
|
|
+pkgconfig_generate libavformat "FFmpeg container format library" "$lavf_version" "-lavformat $LIBavformat_EXTRALIBS" "libavcodec = $lavc_version $LIBavformat_REQUIRES" ffmpeg
|
|
+pkgconfig_generate_uninstalled libavformat "FFmpeg container format library" "$lavf_version" "" ""
|
|
|
|
if enabled pp; then
|
|
- pkgconfig_generate libpostproc "FFmpeg post processing library" "$pp_version" -lpostproc "" postproc
|
|
+ pkgconfig_generate libpostproc "FFmpeg post processing library" "$pp_version" "-lpostproc $LIBpostproc_EXTRALIBS" "" postproc
|
|
pkgconfig_generate_uninstalled libpostproc "FFmpeg post processing library" "$pp_version"
|
|
fi
|
|
|
|
if enabled swscaler; then
|
|
- pkgconfig_generate libswscale "FFmpeg image rescaling library" "$sws_version" -lswscale "libavutil = $lavu_version" ffmpeg
|
|
- pkgconfig_generate_uninstalled libswscale "FFmpeg image rescaling library" "$sws_version" "" "libavutil = $lavu_version"
|
|
+ pkgconfig_generate libswscale "FFmpeg image rescaling library" "$sws_version" "-lswscale $LIBswscale_EXTRALIBS" "libavutil = $lavu_version" ffmpeg
|
|
+ pkgconfig_generate_uninstalled libswscale "FFmpeg image rescaling library" "$sws_version" "" ""
|
|
else
|
|
- pkgconfig_generate libswscale "FFmpeg image rescaling library" "$sws_version" "" "$pkg_requires libavcodec = $lavc_version" ffmpeg
|
|
- pkgconfig_generate_uninstalled libswscale "FFmpeg image rescaling library" "$sws_version" "" "$pkg_requires libavcodec = $lavc_version"
|
|
+ pkgconfig_generate libswscale "FFmpeg image rescaling library" "$sws_version" "" "" ffmpeg
|
|
+ pkgconfig_generate_uninstalled libswscale "FFmpeg image rescaling library" "$sws_version" "" ""
|
|
apply libswscale.pc sed s/^Libs:.*$/Libs:/
|
|
apply libswscale-uninstalled.pc sed s/^Libs:.*$/Libs:/
|
|
fi
|