* added livedotcom and goom to contrib system

  goom sources currently located on my server.

configure.ac

 dnl Autoconf settings for vlc
-dnl $Id: configure.ac,v 1.128 2003/12/06 22:45:02 jpsaman Exp $
+dnl $Id: configure.ac,v 1.129 2003/12/07 20:47:19 hartman Exp $
 
 AC_INIT(vlc,0.7.0-test1)
 
@@ -83,6 +83,8 @@ if test -d ${topdir}/extras/contrib/lib; then
   fi
   LDFLAGS="${LDFLAGS} -L${topdir}/extras/contrib/lib"
   LDFLAGS_save="${LDFLAGS_save} -L${topdir}/extras/contrib/lib"
+  with_livedotcom_tree=${topdir}/extras/contrib/src/live
+  with_goom_tree=${topdir}/extras/contrib/src/goom
 fi
 
 dnl

extras/contrib/src/.cvsignore

+ffmpeg*
+libmpeg2*
 *.tar.gz
 *.tar.bz2
 .*

extras/contrib/src/Makefile

@@ -2,7 +2,7 @@
 # src/Makefile : Dearchive and compile all files necessary
 # ***************************************************************************
 # Copyright (C) 2003 VideoLAN
-# $Id: Makefile,v 1.6 2003/11/23 13:06:43 massiot Exp $
+# $Id: Makefile,v 1.7 2003/12/07 20:47:19 hartman Exp $
 #
 # Authors: Christophe Massiot <massiot@via.ecp.fr>
 #
@@ -42,7 +42,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 .lame .ebml .matroska .ffmpeg .openslp \
-	.dvdcss .dvdread .dvdplay .dvbpsi
+	.dvdcss .dvdread .dvdplay .dvbpsi .live .goom
 FORCE:
 
 # ***************************************************************************
@@ -515,18 +515,18 @@ DISTCLEAN_PKG += libmatroska-$(LIBMATROSKA_VERSION).tar.gz
 # ffmpeg
 # ***************************************************************************
 
-#ffmpeg:
-#	cvs -d $(FFMPEG_CVSROOT) login
-#	cvs -d $(FFMPEG_CVSROOT) co ffmpeg
-#	patch -p 0 < Patches/ffmpeg.patch.cvs
-#	(cd $@; ./bootstrap)
-
-ffmpeg-$(FFMPEG_VERSION).tar.gz:
-	$(WGET) $(FFMPEG_URL)
+ffmpeg:
+	cvs -d $(FFMPEG_CVSROOT) login
+	cvs -d $(FFMPEG_CVSROOT) co ffmpeg
+	patch -p 0 < Patches/ffmpeg.patch.cvs
+	(cd $@; ./bootstrap)
 
-ffmpeg: ffmpeg-$(FFMPEG_VERSION).tar.gz
-	$(EXTRACT_GZ)
-	patch -p 0 < Patches/ffmpeg.patch
+#ffmpeg-$(FFMPEG_VERSION).tar.gz:
+#	$(WGET) $(FFMPEG_URL)
+#
+#ffmpeg: ffmpeg-$(FFMPEG_VERSION).tar.gz
+#	$(EXTRACT_GZ)
+#	patch -p 0 < Patches/ffmpeg.patch
 
 .ffmpeg: ffmpeg
 	(cd $<; ./configure --prefix=$(PREFIX) --extra-cflags="$(CFLAGS)" --extra-ldflags="$(LDFLAGS)" --enable-mp3lame --enable-pp --disable-vhook --disable-vorbis --disable-faad --disable-a52 --enable-mp3lame && make && make -C libavcodec/libpostproc install && make -C libavcodec installlib && make -C libavformat installlib)
@@ -631,6 +631,43 @@ CLEAN_FILE += .dvbpsi
 CLEAN_PKG += libdvbpsi
 DISTCLEAN_PKG += libdvbpsi-$(LIBDVBPSI_VERSION).tar.gz
 
+# ***************************************************************************
+# live
+# ***************************************************************************
+
+live.$(LIVEDOTCOM_VERSION).tar.gz:
+	$(WGET) $(LIVEDOTCOM_URL)
+
+live: live.$(LIVEDOTCOM_VERSION).tar.gz
+	$(EXTRACT_GZ)
+	patch -p 0 < Patches/live.patch
+
+.live: live
+	(cd $<; ./genmakefiles macosx && make )
+	touch $@
+
+CLEAN_FILE += .live
+CLEAN_PKG += live
+DISTCLEAN_PKG += live.$(LIVEDOTCOM_VERSION).tar.gz
+
+# ***************************************************************************
+# goom
+# ***************************************************************************
+
+goom-dj.tar.gz:
+	$(WGET) $(GOOMDJ_URL)
+
+goom: goom-dj.tar.gz
+	$(EXTRACT_GZ)
+
+.goom: goom
+	(cd $<;)
+	touch $@
+
+CLEAN_FILE += .goom
+CLEAN_PKG += goom
+DISTCLEAN_PKG += goom-dj.tar.gz
+
 # ***************************************************************************
 # Some cleansing
 # ***************************************************************************

extras/contrib/src/Patches/live.patch

+diff -ru live/groupsock/Groupsock.cpp live-patched/groupsock/Groupsock.cpp
+--- live/groupsock/Groupsock.cpp	Thu Nov  6 03:53:15 2003
++++ live-patched/groupsock/Groupsock.cpp	Sun Dec  7 21:30:15 2003
+@@ -26,7 +26,7 @@
+ #if defined(__WIN32__) || defined(_WIN32)
+ #include <strstrea.h>
+ #else
+-#include <strstream.h>
++#include <strstream>
+ #endif
+ #include <stdio.h>
+ 
+diff -ru live/groupsock/NetInterface.cpp live-patched/groupsock/NetInterface.cpp
+--- live/groupsock/NetInterface.cpp	Thu Nov  6 03:53:15 2003
++++ live-patched/groupsock/NetInterface.cpp	Sun Dec  7 21:30:30 2003
+@@ -24,7 +24,7 @@
+ #if defined(__WIN32__) || defined(_WIN32)
+ #include <strstrea.h>
+ #else
+-#include <strstream.h>
++#include <strstream>
+ #endif
+ 
+ ////////// NetInterface //////////

extras/contrib/src/packages.mak

@@ -2,7 +2,7 @@
 # src/packages.mak : Archives locations
 # ***************************************************************************
 # Copyright (C) 2003 VideoLAN   
-# $Id: packages.mak,v 1.3 2003/11/17 13:14:25 hartman Exp $
+# $Id: packages.mak,v 1.4 2003/12/07 20:47:19 hartman Exp $
 #
 # Authors: Christophe Massiot <massiot@via.ecp.fr>
 #
@@ -69,7 +69,7 @@ LIBMATROSKA_VERSION=0.6.1
 LIBMATROSKA_URL=http://matroska.free.fr/downloads/libmatroska/libmatroska-$(LIBMATROSKA_VERSION).tar.gz
 FFMPEG_VERSION=0.4.8
 FFMPEG_URL=$(SF)/ffmpeg/ffmpeg-$(FFMPEG_VERSION).tar.gz
-FFMPEG_CVSOOT=:pserver:anonymous@mplayerhq.hu:/cvsroot/ffmpeg
+FFMPEG_CVSROOT=:pserver:anonymous@mplayerhq.hu:/cvsroot/ffmpeg
 OPENSLP_VERSION=1.0.11
 OPENSLP_URL=$(SF)/openslp/openslp-$(OPENSLP_VERSION).tar.gz
 LIBDVDCSS_VERSION=1.2.8
@@ -80,4 +80,7 @@ LIBDVDPLAY_VERSION=1.0.1
 LIBDVDPLAY_URL=http://www.videolan.org/pub/libdvdplay/$(LIBDVDPLAY_VERSION)/libdvdplay-$(LIBDVDPLAY_VERSION).tar.gz
 LIBDVBPSI_VERSION=0.1.3
 LIBDVBPSI_URL=http://www.videolan.org/pub/libdvbpsi/$(LIBDVBPSI_VERSION)/libdvbpsi-$(LIBDVBPSI_VERSION).tar.gz
+LIVEDOTCOM_VERSION=2003.11.06
+LIVEDOTCOM_URL=http://www.videolan.org/pub/testing/contrib/live.$(LIVEDOTCOM_VERSION).tar.gz
+GOOMDJ_URL=http://sidekick.student.utwente.nl/videolan/goom-dj.tar.gz