contrib: Growl: fix build

[vlc] / contrib / src / speex / rules.mak

diff --git a/contrib/src/speex/rules.mak b/contrib/src/speex/rules.mak
index 34ba9538a947f51f004b8bc5ba25f2eb48a047d1..50290ab5403d4357c2e9fce4ac42f42e53f21962 100644 (file)
--- 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))
@@ -12,12 +15,29 @@ $(TARBALLS)/speex-$(SPEEX_VERSION).tar.gz:
 
 speex: speex-$(SPEEX_VERSION).tar.gz .sum-speex
        $(UNPACK)
-       mv $@-$(SPEEX_VERSION) $@
-       touch $@
+       $(APPLY) $(SRC)/speex/no-ogg.patch
+       $(MOVE)
 
 # TODO: fixed point and ASM opts
 
 .speex: speex
+       $(RECONF)
        cd $< && $(HOSTVARS) ./configure $(HOSTCONF) --without-ogg
        cd $< && $(MAKE) install
        touch $@
+
+# Speex DSP
+
+PKGS += speexdsp
+PKGS_ALL += speexdsp
+ifeq ($(call need_pkg,"speexdsp"),)
+PKGS_FOUND += speexdsp
+endif
+
+.sum-speexdsp: .sum-speex
+       touch -r $< $@
+
+DEPS_speexdsp = speex $(DEPS_speex)
+
+.speexdsp:
+       touch $@