From 0a6c39fcd2f352d0413298274efab13056fd429a Mon Sep 17 00:00:00 2001 From: eddyg Date: Tue, 3 Mar 2009 01:16:09 +0000 Subject: [PATCH] Prevent Theora and Vorbis from using a system (e.g. fink) pkg-config which they then allow to override HBs paths for other libs. Thanks to KonaBlend and saintdev for identying the issue. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@2204 b64f7644-9d1e-0410-96f1-a4d463321fa5 --- contrib/libtheora/module.defs | 3 ++- contrib/libvorbis/module.defs | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/contrib/libtheora/module.defs b/contrib/libtheora/module.defs index be40ab579..6505c8b64 100644 --- a/contrib/libtheora/module.defs +++ b/contrib/libtheora/module.defs @@ -10,4 +10,5 @@ LIBTHEORA.CONFIGURE.extra = \ --disable-sdltest \ --disable-vorbistest \ --with-ogg=$(call fn.ABSOLUTE,$(CONTRIB.build/)) \ - --with-vorbis=$(call fn.ABSOLUTE,$(CONTRIB.build/)) + --with-vorbis=$(call fn.ABSOLUTE,$(CONTRIB.build/)) \ + HAVE_PKG_CONFIG=no diff --git a/contrib/libvorbis/module.defs b/contrib/libvorbis/module.defs index 9946bb53c..df7339c7f 100644 --- a/contrib/libvorbis/module.defs +++ b/contrib/libvorbis/module.defs @@ -4,4 +4,4 @@ $(eval $(call import.CONTRIB.defs,LIBVORBIS)) LIBVORBIS.FETCH.url = http://download.m0k.org/handbrake/contrib/libvorbis-aotuv_b5.tar.gz LIBVORBIS.EXTRACT.tarbase = libvorbis -LIBVORBIS.CONFIGURE.extra = --with-ogg=$(call fn.ABSOLUTE,$(CONTRIB.build/)) +LIBVORBIS.CONFIGURE.extra = --with-ogg=$(call fn.ABSOLUTE,$(CONTRIB.build/)) HAVE_PKG_CONFIG="no" -- 2.40.0