[vlc-commits] contrib: add pkg-config checks where applicable
Rémi Denis-Courmont
git at videolan.org
Mon Jul 4 17:23:40 CEST 2011
vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Mon Jul 4 18:23:27 2011 +0300| [15228fd33857e03952ab5f58515290101d24d00e] | committer: Rémi Denis-Courmont
contrib: add pkg-config checks where applicable
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=15228fd33857e03952ab5f58515290101d24d00e
---
contrib/src/ass/rules.mak | 3 +++
contrib/src/dca/rules.mak | 3 +++
contrib/src/dvbpsi/rules.mak | 3 +++
contrib/src/ffmpeg/rules.mak | 3 +++
contrib/src/kate/rules.mak | 3 +++
contrib/src/lua/rules.mak | 3 +++
contrib/src/mad/rules.mak | 3 +++
contrib/src/modplug/rules.mak | 3 +++
contrib/src/shout/rules.mak | 3 +++
contrib/src/speex/rules.mak | 3 +++
contrib/src/theora/rules.mak | 3 +++
contrib/src/tiger/rules.mak | 3 +++
contrib/src/twolame/rules.mak | 3 +++
contrib/src/vorbis/rules.mak | 6 ++++++
contrib/src/x264/rules.mak | 3 +++
contrib/src/xcb/rules.mak | 5 +++++
contrib/src/zlib/rules.mak | 3 +++
17 files changed, 56 insertions(+), 0 deletions(-)
diff --git a/contrib/src/ass/rules.mak b/contrib/src/ass/rules.mak
index 828cc62..8fb9a61 100644
--- a/contrib/src/ass/rules.mak
+++ b/contrib/src/ass/rules.mak
@@ -3,6 +3,9 @@ ASS_VERSION := 0.9.12
ASS_URL := http://libass.googlecode.com/files/libass-$(ASS_VERSION).tar.gz
PKGS += ass
+ifeq ($(call need_pkg,"libass"),)
+PKGS_FOUND += ass
+endif
$(TARBALLS)/libass-$(ASS_VERSION).tar.gz:
$(call download,$(ASS_URL))
diff --git a/contrib/src/dca/rules.mak b/contrib/src/dca/rules.mak
index b26377d..5a94e28 100644
--- a/contrib/src/dca/rules.mak
+++ b/contrib/src/dca/rules.mak
@@ -6,6 +6,9 @@ DCA_URL := $(VIDEOLAN)/libdca/$(DCA_VERSION)/libdca-$(DCA_VERSION).tar.bz2
ifdef HAVE_FPU
PKGS += dca
endif
+ifeq ($(call need_pkg,"libdca"),)
+PKGS_FOUND += dca
+endif
$(TARBALLS)/libdca-$(DCA_VERSION).tar.bz2:
$(call download,$(DCA_URL))
diff --git a/contrib/src/dvbpsi/rules.mak b/contrib/src/dvbpsi/rules.mak
index 5435084..c63d647 100644
--- a/contrib/src/dvbpsi/rules.mak
+++ b/contrib/src/dvbpsi/rules.mak
@@ -4,6 +4,9 @@ DVBPSI_VERSION := 0.2.0
DVBPSI_URL := $(VIDEOLAN)/libdvbpsi/$(DVBPSI_VERSION)/libdvbpsi-$(DVBPSI_VERSION).tar.bz2
PKGS += dvbpsi
+ifeq ($(call need_pkg,"libdvbpsi"),)
+PKGS_FOUND += dvbpsi
+endif
$(TARBALLS)/libdvbpsi-$(DVBPSI_VERSION).tar.bz2:
$(call download,$(DVBPSI_URL))
diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak
index b256227..d4b7fba 100644
--- a/contrib/src/ffmpeg/rules.mak
+++ b/contrib/src/ffmpeg/rules.mak
@@ -104,6 +104,9 @@ FFMPEG_CFLAGS += --std=gnu99
# Build
PKGS += ffmpeg
+ifeq ($(call need_pkg,"libavcodec libavformat libswscale"),)
+PKGS_FOUND += ffmpeg
+endif
ffmpeg-$(FFMPEG_VERSION).tar.gz:
$(error FFmpeg snapshot is too old, VCS must be used!)
diff --git a/contrib/src/kate/rules.mak b/contrib/src/kate/rules.mak
index a4eeaff..53ce5d9 100644
--- a/contrib/src/kate/rules.mak
+++ b/contrib/src/kate/rules.mak
@@ -4,6 +4,9 @@ KATE_VERSION := 0.3.8
KATE_URL := http://libkate.googlecode.com/files/libkate-$(KATE_VERSION).tar.gz
PKGS += kate
+ifeq ($(call need_pkg,"kate >= 0.1.5"),)
+PKGS_FOUND += kate
+endif
$(TARBALLS)/libkate-$(KATE_VERSION).tar.gz:
$(call download,$(KATE_URL))
diff --git a/contrib/src/lua/rules.mak b/contrib/src/lua/rules.mak
index 422201f..3bf9a38 100644
--- a/contrib/src/lua/rules.mak
+++ b/contrib/src/lua/rules.mak
@@ -20,6 +20,9 @@ endif
# Feel free to add autodetection if you need to...
PKGS += lua
+ifeq ($(call need_pkg,"lua5.1"),)
+PKGS_FOUND += lua
+endif
$(TARBALLS)/lua-$(LUA_VERSION).tar.gz:
$(call download,$(LUA_URL))
diff --git a/contrib/src/mad/rules.mak b/contrib/src/mad/rules.mak
index 0be6c77..76fc65a 100644
--- a/contrib/src/mad/rules.mak
+++ b/contrib/src/mad/rules.mak
@@ -4,6 +4,9 @@ MAD_VERSION := 0.15.1b
MAD_URL := $(CONTRIB_VIDEOLAN)/libmad-$(MAD_VERSION).tar.gz
PKGS += mad
+ifeq ($(call need_pkg,"mad"),)
+PKGS_FOUND += mad
+endif
$(TARBALLS)/libmad-$(MAD_VERSION).tar.gz:
$(call download,$(MAD_URL))
diff --git a/contrib/src/modplug/rules.mak b/contrib/src/modplug/rules.mak
index 20b954b..4e69ea7 100644
--- a/contrib/src/modplug/rules.mak
+++ b/contrib/src/modplug/rules.mak
@@ -4,6 +4,9 @@ MODPLUG_VERSION := 0.8.8.3
MODPLUG_URL := $(SF)/modplug-xmms/libmodplug-$(MODPLUG_VERSION).tar.gz
PKGS += modplug
+ifeq ($(call need_pkg,"libmodplug >= 0.8.4 libmodplug != 0.8.8"),)
+PKGS_FOUND += modplug
+endif
$(TARBALLS)/libmodplug-$(MODPLUG_VERSION).tar.gz:
$(call download,$(MODPLUG_URL))
diff --git a/contrib/src/shout/rules.mak b/contrib/src/shout/rules.mak
index d17c794..882b2a4 100644
--- a/contrib/src/shout/rules.mak
+++ b/contrib/src/shout/rules.mak
@@ -4,6 +4,9 @@ SHOUT_VERSION := 2.2.2
SHOUT_URL := http://downloads.us.xiph.org/releases/libshout/libshout-$(SHOUT_VERSION).tar.gz
PKGS += shout
+ifeq ($(call need_pkg,"shout >= 2.1"),)
+PKGS_FOUND += shout
+endif
$(TARBALLS)/libshout-$(SHOUT_VERSION).tar.gz:
$(call download,$(SHOUT_URL))
diff --git a/contrib/src/speex/rules.mak b/contrib/src/speex/rules.mak
index 4df73b3..d76ee93 100644
--- a/contrib/src/speex/rules.mak
+++ b/contrib/src/speex/rules.mak
@@ -4,6 +4,9 @@ SPEEX_VERSION := 1.2rc1
SPEEX_URL := http://downloads.us.xiph.org/releases/speex/speex-$(SPEEX_VERSION).tar.gz
PKGS += speex
+ifeq ($(call need_pkg,"speex >= 1.0.5"),)
+PKGS_FOUND += speex
+endif
$(TARBALLS)/speex-$(SPEEX_VERSION).tar.gz:
$(call download,$(SPEEX_URL))
diff --git a/contrib/src/theora/rules.mak b/contrib/src/theora/rules.mak
index 94b9ff8..2b7d36e 100644
--- a/contrib/src/theora/rules.mak
+++ b/contrib/src/theora/rules.mak
@@ -5,6 +5,9 @@ THEORA_URL := http://downloads.xiph.org/releases/theora/libtheora-$(THEORA_VERSI
#THEORA_URL := $(CONTRIB_VIDEOLAN)/libtheora-$(THEORA_VERSION).tar.xz
PKGS += theora
+ifeq ($(call need_pkg,"theora >= 1.0"),)
+PKGS_FOUND += theora
+endif
$(TARBALLS)/libtheora-$(THEORA_VERSION).tar.xz:
$(call download,$(THEORA_URL))
diff --git a/contrib/src/tiger/rules.mak b/contrib/src/tiger/rules.mak
index 2ef26c4..6d6a620 100644
--- a/contrib/src/tiger/rules.mak
+++ b/contrib/src/tiger/rules.mak
@@ -7,6 +7,9 @@ ifeq ($(call need_pkg,"pangocairo >= 0.16"),)
# only available if the system has pangocairo
PKGS += tiger
endif
+ifeq ($(call need_pkg,"tiger >= 0.3.1"),)
+PKGS_FOUND += tiger
+endif
$(TARBALLS)/libtiger-$(TIGER_VERSION).tar.gz:
$(call download,$(TIGER_URL))
diff --git a/contrib/src/twolame/rules.mak b/contrib/src/twolame/rules.mak
index a9334e5..20a7f06 100644
--- a/contrib/src/twolame/rules.mak
+++ b/contrib/src/twolame/rules.mak
@@ -6,6 +6,9 @@ TWOLAME_URL := $(SF)/twolame/twolame-$(TWOLAME_VERSION).tar.gz
ifdef BUILD_ENCODERS
PKGS += twolame
endif
+ifeq ($(call need_pkg,"twolame"),)
+PKGS_FOUND += twolame
+endif
$(TARBALLS)/twolame-$(TWOLAME_VERSION).tar.gz:
$(call download,$(TWOLAME_URL))
diff --git a/contrib/src/vorbis/rules.mak b/contrib/src/vorbis/rules.mak
index d4a1073..89df937 100644
--- a/contrib/src/vorbis/rules.mak
+++ b/contrib/src/vorbis/rules.mak
@@ -7,10 +7,16 @@ VORBIS_URL := http://downloads.xiph.org/releases/vorbis/libvorbis-$(VORBIS_VERSI
ifndef HAVE_FPU
PKGS += vorbis
endif
+ifeq ($(call need_pkg,"vorbis >= 1.1"),)
+PKGS_FOUND += vorbis
+endif
PKGS_ALL += vorbisenc
ifdef BUILD_ENCODERS
PKGS += vorbisenc
endif
+ifeq ($(call need_pkg,"vorbisenc >= 1.1"),)
+PKGS_FOUND += vorbisenc
+endif
$(TARBALLS)/libvorbis-$(VORBIS_VERSION).tar.xz:
$(call download,$(VORBIS_URL))
diff --git a/contrib/src/x264/rules.mak b/contrib/src/x264/rules.mak
index 11e0375..4f0caab 100644
--- a/contrib/src/x264/rules.mak
+++ b/contrib/src/x264/rules.mak
@@ -7,6 +7,9 @@ X264_GITURL := git://git.videolan.org/x264.git
ifdef BUILD_ENCODERS
PKGS += x264
endif
+ifeq ($(call need_pkg,"x264 >= 0.86"),)
+PKGS_FOUND += x264
+endif
DEPS_x264 =
X264CONF = --prefix="$(PREFIX)" --host="$(HOST)" \
diff --git a/contrib/src/xcb/rules.mak b/contrib/src/xcb/rules.mak
index 90f5b2d..4387538 100644
--- a/contrib/src/xcb/rules.mak
+++ b/contrib/src/xcb/rules.mak
@@ -3,6 +3,11 @@
XCB_VERSION := 1.7
XCB_URL := http://xcb.freedesktop.org/dist/libxcb-$(XCB_VERSION).tar.bz2
+ifeq ($(call need_pkg,"xcb >= 1.6 xcb-shm xcb-composite xcb-xv >= 1.1.90.1"),)
+# xcb-randr >= 1.3 is not that useful
+PKGS_FOUND += xcb
+endif
+
$(TARBALLS)/libxcb-$(XCB_VERSION).tar.bz2:
$(call download,$(XCB_URL))
diff --git a/contrib/src/zlib/rules.mak b/contrib/src/zlib/rules.mak
index 426847d..cd5b156 100644
--- a/contrib/src/zlib/rules.mak
+++ b/contrib/src/zlib/rules.mak
@@ -3,6 +3,9 @@ ZLIB_VERSION := 1.2.5
ZLIB_URL := $(SF)/libpng/zlib-$(ZLIB_VERSION).tar.gz
PKGS += zlib
+ifeq ($(call need_pkg,"zlib"),)
+PKGS_FOUND += zlib
+endif
$(TARBALLS)/zlib-$(ZLIB_VERSION).tar.gz:
$(call download,$(ZLIB_URL))
More information about the vlc-commits
mailing list