diff mbox

[FFmpeg-devel,v3] configure: require pkg-config for libvorbis

Message ID 20170704180122.11012-1-wiiaboo@gmail.com
State Accepted
Commit 3b3501f75cb20b9f7abf43a3a9b1c3de595bc588
Headers show

Commit Message

Ricardo Constantino July 4, 2017, 6:01 p.m. UTC 
libvorbis comes with pkg-config files since at least v1.0.1, way back in 2003.

We need the two checks for vorbis and vorbisenc because we use functions from
both and Xiph considers them separate libraries.

The check is inverted (vorbis first then vorbisenc) because add_extralibs()
prepends to EXTRALIBS instead of appending. For both shared and static linking
the order didn't seem to matter anyway, testing with MinGW.

This alternative check was suggested by Derek Buitenhuis.
---
 configure | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

Paul B Mahol July 4, 2017, 7:38 p.m. UTC | #1 
On 7/4/17, Ricardo Constantino <wiiaboo@gmail.com> wrote:
> libvorbis comes with pkg-config files since at least v1.0.1, way back in
> 2003.
>
> We need the two checks for vorbis and vorbisenc because we use functions
> from
> both and Xiph considers them separate libraries.
>
> The check is inverted (vorbis first then vorbisenc) because add_extralibs()
> prepends to EXTRALIBS instead of appending. For both shared and static
> linking
> the order didn't seem to matter anyway, testing with MinGW.
>
> This alternative check was suggested by Derek Buitenhuis.
> ---
>  configure | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/configure b/configure
> index 282114d268..1c65b536d5 100755
> --- a/configure
> +++ b/configure
> @@ -5902,7 +5902,8 @@ enabled libtwolame        && require libtwolame
> twolame.h twolame_init -ltwolame
>  enabled libv4l2           && require_pkg_config libv4l2 libv4l2.h
> v4l2_ioctl
>  enabled libvidstab        && require_pkg_config "vidstab >= 0.98"
> vid.stab/libvidstab.h vsMotionDetectInit
>  enabled libvo_amrwbenc    && require libvo_amrwbenc vo-amrwbenc/enc_if.h
> E_IF_init -lvo-amrwbenc
> -enabled libvorbis         && require libvorbis vorbis/vorbisenc.h
> vorbis_info_init -lvorbisenc -lvorbis -logg
> +enabled libvorbis         && require_pkg_config vorbis vorbis/codec.h
> vorbis_info_init &&
> +                             require_pkg_config vorbisenc
> vorbis/vorbisenc.h vorbis_encode_init
>
>  enabled libvpx            && {
>      enabled libvpx_vp8_decoder && {
> --
> 2.13.0
>
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>

This one works, so OK from me.
Derek Buitenhuis July 6, 2017, 7:39 p.m. UTC | #2 
On 7/4/2017 8:38 PM, Paul B Mahol wrote:
> This one works, so OK from me.

Pushed.

- Derek
diff mbox

Patch

diff --git a/configure b/configure
index 282114d268..1c65b536d5 100755
--- a/configure
+++ b/configure
@@ -5902,7 +5902,8 @@  enabled libtwolame        && require libtwolame twolame.h twolame_init -ltwolame
 enabled libv4l2           && require_pkg_config libv4l2 libv4l2.h v4l2_ioctl
 enabled libvidstab        && require_pkg_config "vidstab >= 0.98" vid.stab/libvidstab.h vsMotionDetectInit
 enabled libvo_amrwbenc    && require libvo_amrwbenc vo-amrwbenc/enc_if.h E_IF_init -lvo-amrwbenc
-enabled libvorbis         && require libvorbis vorbis/vorbisenc.h vorbis_info_init -lvorbisenc -lvorbis -logg
+enabled libvorbis         && require_pkg_config vorbis vorbis/codec.h vorbis_info_init &&
+                             require_pkg_config vorbisenc vorbis/vorbisenc.h vorbis_encode_init
 
 enabled libvpx            && {
     enabled libvpx_vp8_decoder && {