contrib: add pkg-config checks where applicable

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))

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))

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))

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!)

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))

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))

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))

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))

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))

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))

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))

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))

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))

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))

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)" \

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))
 

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))