* dvdnav <-> dvdplay contrib

extras/contrib/src/Makefile

@@ -43,7 +43,7 @@ export LDFLAGS = -L$(PREFIX)/lib
 all: .autoconf .libtool .automake .iconv .intl .freetype .fribidi \
 	.a52 .mpeg2 .id3tag .mad .ogg .vorbis .vorbisenc .theora \
 	.FLAC .speex .faad .faac .lame .ebml .matroska .ffmpeg .openslp \
-	.dvdcss .dvdread .dvdplay .dvbpsi .live .goom .caca .dts .mod
+	.dvdcss .dvdread .dvdnav .dvbpsi .live .goom .caca .dts .mod
 FORCE:
 
 # ***************************************************************************
@@ -616,25 +616,6 @@ CLEAN_FILE += .dvdread
 CLEAN_PKG += libdvdread
 DISTCLEAN_PKG += libdvdread-$(LIBDVDREAD_VERSION).tar.gz
 
-# ***************************************************************************
-# libdvdplay
-# ***************************************************************************
-
-libdvdplay-$(LIBDVDPLAY_VERSION).tar.gz:
-	$(WGET) $(LIBDVDPLAY_URL)
-
-libdvdplay: libdvdplay-$(LIBDVDPLAY_VERSION).tar.gz
-	$(EXTRACT_GZ)
-
-.dvdplay: libdvdplay .dvdread
-	(cd $<; ./configure --prefix=$(PREFIX) && make && make install)
-	$(INSTALL_NAME)
-	touch $@
-
-CLEAN_FILE += .dvdplay
-CLEAN_PKG += libdvdplay
-DISTCLEAN_PKG += libdvdplay-$(LIBDVDPLAY_VERSION).tar.gz
-
 # ***************************************************************************
 # libdvdnav
 # ***************************************************************************

extras/contrib/src/packages.mak

@@ -80,14 +80,14 @@ LIBDVDCSS_VERSION=1.2.8
 LIBDVDCSS_URL=$(VIDEOLAN)/libdvdcss/$(LIBDVDCSS_VERSION)/libdvdcss-$(LIBDVDCSS_VERSION).tar.gz
 LIBDVDREAD_VERSION=0.9.4
 LIBDVDREAD_URL=http://www.dtek.chalmers.se/groups/dvd/dist/libdvdread-$(LIBDVDREAD_VERSION).tar.gz
-LIBDVDPLAY_VERSION=1.0.1
-LIBDVDPLAY_URL=$(VIDEOLAN)/libdvdplay/$(LIBDVDPLAY_VERSION)/libdvdplay-$(LIBDVDPLAY_VERSION).tar.gz
-LIBDVDNAV_VERSION=0.1.9
-LIBDVDNAV_URL=http://ftp.snt.utwente.nl/pub/linux/gentoo/distfiles/libdvdnav-$(LIBDVDNAV_VERSION).tar.gz
+LIBDVDNAV_VERSION=0.1.10
+LIBDVDNAV_URL=$(VIDEOLAN)/testing/contrib/libdvdnav-$(LIBDVDNAV_VERSION).tar.gz
 LIBDVBPSI_VERSION=0.1.4
 LIBDVBPSI_URL=$(VIDEOLAN)/libdvbpsi/$(LIBDVBPSI_VERSION)/libdvbpsi3-$(LIBDVBPSI_VERSION).tar.gz
 LIVEDOTCOM_VERSION=2004.06.02
+#LIVEDOTCOM_VERSION=2004.06.18
 LIVEDOTCOM_URL=$(VIDEOLAN)/testing/contrib/live.$(LIVEDOTCOM_VERSION).tar.gz
+#LIVEDOTCOM_URL=http://live.com/liveMedia/public/live.2004.06.18.tar.gz
 GOOM_URL=$(VIDEOLAN)/testing/contrib/goom-macosx-altivec-bin.tar.gz
 LIBCACA_VERSION=0.9
 LIBCACA_URL=http://sam.zoy.org/projects/libcaca/libcaca-$(LIBCACA_VERSION).tar.gz