faad: set decode_audio at the end

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

diff --git a/contrib/src/zvbi/rules.mak b/contrib/src/zvbi/rules.mak
index 07539b0fa4b34c3b43a10145fc9d5a7c9bfc43a4..a54e910ec166f9ac7ab6c6966cd662101363dff5 100644 (file)
--- a/contrib/src/zvbi/rules.mak
+++ b/contrib/src/zvbi/rules.mak
@@ -1,6 +1,6 @@
 # zvbi
 
-ZVBI_VERSION := 0.2.33
+ZVBI_VERSION := 0.2.35
 ZVBI_URL := $(SF)/zapping/zvbi-$(ZVBI_VERSION).tar.bz2
 
 PKGS += zvbi
@@ -17,9 +17,11 @@ zvbi: zvbi-$(ZVBI_VERSION).tar.bz2 .sum-zvbi
        $(UNPACK)
        $(APPLY) $(SRC)/zvbi/zvbi-ssize_max.patch
        $(APPLY) $(SRC)/zvbi/zvbi-ioctl.patch
-       $(APPLY) $(SRC)/zvbi/zvbi-png15.patch
 ifdef HAVE_WIN32
        $(APPLY) $(SRC)/zvbi/zvbi-win32.patch
+endif
+ifdef HAVE_DARWIN_OS
+       $(APPLY) $(SRC)/zvbi/zvbi-fix-clang-support.patch
 endif
        $(MOVE)
 
@@ -39,7 +41,9 @@ ZVBI_CFLAGS += -DPTW32_STATIC_LIB
 endif
 
 .zvbi: zvbi
+ifdef HAVE_WIN32
        $(RECONF)
+endif
        cd $< && $(HOSTVARS) CFLAGS="$(ZVBI_CFLAGS)" ./configure $(ZVBICONF)
        cd $</src && $(MAKE) install
        cd $< && $(MAKE) SUBDIRS=. install