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 c7711f4bf12c68468c3a9b5690cc7d9c9e5da4d9..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
@@ -19,6 +19,9 @@ zvbi: zvbi-$(ZVBI_VERSION).tar.bz2 .sum-zvbi
        $(APPLY) $(SRC)/zvbi/zvbi-ioctl.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)
 
@@ -26,7 +29,7 @@ DEPS_zvbi = pthreads iconv $(DEPS_iconv)
 
 ZVBI_CFLAGS := $(CFLAGS)
 ZVBICONF := \
-       --disable-v4l --disable-dvb --disable-bktr \
+       --disable-dvb --disable-bktr \
        --disable-nls --disable-proxy \
        --without-doxygen \
        $(HOSTCONF)
@@ -38,10 +41,11 @@ 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
-       cat "$(PREFIX)/lib/pkgconfig/zvbi-0.2.pc" | sed -e s/'[^ ]*iconv.a'/-liconv/ > $</zvbi-iconv-fixed.pc
-       mv $</zvbi-iconv-fixed.pc "$(PREFIX)/lib/pkgconfig/zvbi-0.2.pc"
+       sed -i.orig -e "s/\/[^ ]*libiconv.a/-liconv/" $(PREFIX)/lib/pkgconfig/zvbi-0.2.pc
        touch $@