Teletext decoder module based on libzvbi. This is the status of thedj's work at 30 April 2007.

configure.ac

@@ -3782,6 +3782,21 @@ if test "${enable_x264}" != "no"; then
   fi
 fi
 
+dnl
+dnl vbi decoder plugin (using libzbvi)
+dnl
+AC_ARG_ENABLE(zvbi,
+  [  --enable-zvbi          VBI decoding support with libzvbi (default enabled)])
+if test "${enable_zvbi}" != "no"; then
+  PKG_CHECK_MODULES(ZVBI,
+        zvbi-0.2 >= 0.2.25,
+        [
+          VLC_ADD_LDFLAGS([zvbi],[$ZVBI_LIBS])
+          VLC_ADD_CFLAGS([zvbi],[$ZVBI_CFLAGS])
+          VLC_ADD_PLUGINS([zvbi]) ],
+        [AC_MSG_WARN(ZVBI library not found)])
+fi
+
 dnl
 dnl  CMML plugin
 dnl

extras/contrib/src/Makefile

@@ -1115,10 +1115,10 @@ DISTCLEAN_PKG += libdvdnav-$(LIBDVDNAV_VERSION).tar.bz2
 # libdvbpsi
 # ***************************************************************************
 
-libdvbpsi3-$(LIBDVBPSI_VERSION).tar.gz:
+libdvbpsi4-$(LIBDVBPSI_VERSION).tar.gz:
 	$(WGET) $(LIBDVBPSI_URL)
 
-libdvbpsi: libdvbpsi3-$(LIBDVBPSI_VERSION).tar.gz
+libdvbpsi: libdvbpsi4-$(LIBDVBPSI_VERSION).tar.gz
 	$(EXTRACT_GZ)
 
 .dvbpsi: libdvbpsi
@@ -1603,7 +1603,7 @@ zvbi: zvbi-$(ZVBI_VERSION).tar.bz2
 	$(EXTRACT_BZ2)
 
 .zvbi: zvbi
-	(cd $<; ./configure --prefix=$(PREFIX) && make)
+	(cd $<; ./configure --prefix=$(PREFIX) CFLAGS="$(CFLAGS) -fnested-functions" && make && make install)
 	touch $@
 
 CLEAN_FILE += .zvbi

extras/contrib/src/packages.mak

@@ -92,7 +92,7 @@ LIBDVDCSS_URL=$(VIDEOLAN)/libdvdcss/$(LIBDVDCSS_VERSION)/libdvdcss-$(LIBDVDCSS_V
 LIBDVDNAV_VERSION=20050211
 LIBDVDNAV_URL=$(VIDEOLAN)/testing/contrib/libdvdnav-$(LIBDVDNAV_VERSION).tar.bz2
 LIBDVBPSI_VERSION=0.1.5
-LIBDVBPSI_URL=$(VIDEOLAN)/contrib/libdvbpsi3-$(LIBDVBPSI_VERSION).tar.gz
+LIBDVBPSI_URL=$(VIDEOLAN)/libdvbpsi/$(LIBDVBPSI_VERSION)/libdvbpsi4-$(LIBDVBPSI_VERSION).tar.gz
 LIVEDOTCOM_VERSION=latest
 LIVEDOTCOM_URL=http://live555.com/liveMedia/public/live555-$(LIVEDOTCOM_VERSION).tar.gz
 #GOOM_URL=$(VIDEOLAN)/testing/contrib/goom-macosx-altivec-bin.tar.gz
@@ -185,7 +185,7 @@ PTHREADS_VERSION=2-7-0
 PTHREADS_URL=ftp://sources.redhat.com/pub/pthreads-win32/pthreads-w32-$(PTHREADS_VERSION)-release.tar.gz
 UNICOWS_VERSION=1.1.1
 UNICOWS_URL=$(SF)/libunicows/libunicows-$(UNICOWS_VERSION)-src.tar.gz
-ZVBI_VERSION=0.2.22
+ZVBI_VERSION=0.2.25
 ZVBI_URL=$(SF)/zapping/zvbi-$(ZVBI_VERSION).tar.bz2
 TAGLIB_VERSION=1.4
 TAGLIB_URL=http://developer.kde.org/~wheeler/files/src/taglib-$(TAGLIB_VERSION).tar.gz

modules/codec/Modules.am

@@ -29,3 +29,4 @@ SOURCES_cvdsub = cvdsub.c
 SOURCES_fake = fake.c
 SOURCES_realaudio = realaudio.c
 SOURCES_sdl_image = sdl_image.c
+SOURCES_zvbi = zvbi.c