- �a compile sous FreeBSD (mais �a ne tourne pas)

 - les d�pendances sont cach�es dans .deps/ au lieu de deps/
 - suppression d'encore quelques #include inutiles.
 - la gestion des plugins est maintenant encapsul�e dans misc/plugin.c
  un peu comme les threads, pour faciliter le portage.
 - l�ger remaniement de l'output pour --help et --version
 - les p_ts_packet sont cast�s en (void *) pour �viter un warning sous
  certaines architectures.
 - ajout de la GPL dans un fichier COPYING
 - fichier README avec rien dedans pour le moment, � part la liste de
  toutes les personnes ayant particip� au projet. J'en ai *forc�ment*
  oubli� certains, alors si vous avez un nom, rajoutez-le. de m�me, s'il
  y a un gros con que j'ai mis par erreur dans la liste et qui n'a jamais
  rien fait pour le projet, n'h�sitez pas � le supprimer sournoisement.
 - fichier AUTHORS avec la liste des gens ayant boss� sur le client. j'ai
  mis toutes les personnes ayant fait au moins un commit, ainsi que Henri
  parce que je sais qu'il bosse sur l'audio, et HPReg, Steve et Oli parce
  qu'ils ont boss� dessus aussi. Par contre ici aussi j'ai fort probable-
  ment oubli� des gens. Corrigez !
 - r�pertoire debian/ qui servira � cr�er des packages
 - rajout d'une entr�e pour faire `make install' (pas encore parfait)
 - nom de code de la future release 0.2 : `Onatopp' :)

AUTHORS

@@ -0,0 +1,22 @@
+
+  R�gis Duchesne <[email protected]>
+  Michel Lespinasse <[email protected]>
+
+  Olivier Baxa <[email protected]>
+  Eric Estievenart <[email protected]>
+
+  Jean-Philippe Grimaldi <[email protected]>
+  Andres Krapf <[email protected]>
+  Christophe Massiot <[email protected]>
+  Vincent Seguin <[email protected]>
+  Benoit Steiner <[email protected]>
+
+  Jean-Marc Dressler <[email protected]>
+  Ga�l Hendryckx <[email protected]>
+  Samuel Hocevar <[email protected]>
+  Michel Kaempf <[email protected]>
+
+  St�phane Borel <[email protected]>
+  Renaud Dartus <[email protected]>
+  Henri Fallon <[email protected]>
+

Makefile

@@ -13,6 +13,8 @@
 CC=egcc
 #CC=gcc295
 SHELL=/bin/sh
+INSTALL=install
+PREFIX=/usr
 
 # Audio output settings
 AUDIO = dsp
@@ -45,12 +47,10 @@ SYS=LINUX
 #SYS=BEOS
 
 # For x86 architecture, choose MMX support
-MMX=YES
-#MMX=NO
+ARCH += MMX
 # For x86 architecture, optimize for Pentium Pro
 # (choose NO if you get `Invalid instruction' errors)
-PPRO=YES
-#PPRO=NO
+ARCH += PPRO
 
 # Decoder choice - ?? old decoder will be removed soon
 #DECODER=old
@@ -65,19 +65,16 @@ DEBUG=0
 # Configuration pre-processing
 ################################################################################
 
-# Program version - may only be changed by the project leader
+# Program version and codename - may only be changed by the project leader
 PROGRAM_VERSION = 0.1.99
+PROGRAM_CODENAME = Onatopp
 
-# audio options
-audio := $(shell echo $(AUDIO) | tr 'A-Z' 'a-z')
-AUDIO := $(shell echo $(AUDIO) | tr 'a-z' 'A-Z')
-
-# video options
-video := $(shell echo $(VIDEO) | tr 'A-Z' 'a-z')
-VIDEO := $(shell echo $(VIDEO) | tr 'a-z' 'A-Z')
+# audio and video options
+AUDIO := $(shell echo $(AUDIO) | tr 'A-Z' 'a-z')
+VIDEO := $(shell echo $(VIDEO) | tr 'A-Z' 'a-z')
 
 # PROGRAM_OPTIONS is an identification string of the compilation options
-PROGRAM_OPTIONS = $(ARCH) $(SYS)
+PROGRAM_OPTIONS = $(SYS) $(ARCH)
 ifeq ($(DEBUG),1)
 PROGRAM_OPTIONS += DEBUG
 endif
@@ -89,12 +86,12 @@ PROGRAM_BUILD = `date` $(USER)@`hostname`
 
 # DEFINE will contain some of the constants definitions decided in Makefile, 
 # including ARCH_xx and SYS_xx. It will be passed to C compiler.
-DEFINE += -DARCH_$(ARCH)
+DEFINE += -DARCH_$(shell echo $(ARCH) | cut -f1 -d' ')
 DEFINE += -DSYS_$(SYS)
-DEFINE += -DAUDIO_OPTIONS="\"$(audio)\""
-DEFINE += -DVIDEO_OPTIONS="\"$(video)\""
+DEFINE += -DPLUGIN_PATH="\"$(PREFIX)/lib/videolan/vlc\""
 DEFINE += -DPROGRAM_VERSION="\"$(PROGRAM_VERSION)\""
-DEFINE += -DPROGRAM_OPTIONS="\"$(PROGRAM_OPTIONS)\""
+DEFINE += -DPROGRAM_CODENAME="\"$(PROGRAM_CODENAME)\""
+DEFINE += -DPROGRAM_OPTIONS="\"$(shell echo $(PROGRAM_OPTIONS) | tr 'A-Z' 'a-z')\""
 DEFINE += -DPROGRAM_BUILD="\"$(PROGRAM_BUILD)\""
 ifeq ($(DEBUG),1)
 DEFINE += -DDEBUG
@@ -113,15 +110,21 @@ INCLUDE += -Iinclude -I/usr/local/include -I/usr/X11R6/include
 #
 # Libraries
 #
-LIB += -L/usr/local/lib
 
 ifeq ($(SYS),GNU)
-LIB += -lthreads
-else
-LIB += -lpthread
+LIB += -lthreads -ldl
+endif
+
+ifeq ($(SYS),BSD)
+LIB += -pthread -lgnugetopt
+LIB += -L/usr/local/lib
 endif
+
+ifeq ($(SYS),LINUX)
+LIB += -lpthread -ldl
+endif
+
 LIB += -lm
-LIB += -ldl
 
 #
 # C compiler flags: compilation
@@ -137,27 +140,28 @@ CCFLAGS += -ffast-math -funroll-loops -fargument-noalias-global
 CCFLAGS += -fomit-frame-pointer
 
 # Optimizations for x86 familiy
-ifeq ($(ARCH),X86)
+ifneq (,$(findstring X86,$(ARCH)))
 CCFLAGS += -malign-double
 #CCFLAGS += -march=pentium
-ifeq ($(PPRO), YES)
+# Eventual Pentium Pro optimizations
+ifneq (,$(findstring PPRO,$(ARCH)))
 ifneq ($(SYS), BSD)
 CCFLAGS += -march=pentiumpro
 endif
 endif
 # Eventual MMX optimizations for x86
-ifeq ($(MMX), YES)
+ifneq (,$(findstring MMX,$(ARCH)))
 CFLAGS += -DHAVE_MMX
 endif
 endif
 
 # Optimizations for PowerPC
-ifeq ($(ARCH),PPC)
+ifneq (,$(findstring PPC,$(ARCH)))
 CCFLAGS += -mcpu=604e -mmultiple -mhard-float -mstring
 endif
 
 # Optimizations for Sparc
-ifeq ($(ARCH),SPARC)
+ifneq (,$(findstring SPARC,$(ARCH)))
 CCFLAGS += -mhard-float
 endif
 
@@ -260,6 +264,7 @@ endif
 misc_obj =			misc/mtime.o \
 						misc/rsc_files.o \
 						misc/netutils.o \
+						misc/plugins.o \
 						misc/decoder_fifo.o
 
 C_OBJ = $(interface_obj) \
@@ -278,8 +283,8 @@ C_OBJ = $(interface_obj) \
 #
 # Assembler Objects
 # 
-ifeq ($(ARCH),X86)
-ifeq ($(MMX), YES)
+ifneq (,$(findstring X86,$(ARCH)))
+ifneq (,$(findstring MMX,$(ARCH)))
 ifeq ($(DECODER),new)
 ASM_OBJ = 			video_decoder/vdec_idctmmx.o \
 						video_output/video_yuv_mmx.o
@@ -293,17 +298,17 @@ endif
 #
 # Plugins
 #
-interface_plugin =	$(video:%=interface/intf_%.so)
-audio_plugin =		$(audio:%=audio_output/aout_%.so)
-video_plugin = 		$(video:%=video_output/vout_%.so)
+interface_plugin =	$(VIDEO:%=interface/intf_%.so)
+audio_plugin =		$(AUDIO:%=audio_output/aout_%.so)
+video_plugin = 		$(VIDEO:%=video_output/vout_%.so)
 
 PLUGIN_OBJ = $(interface_plugin) $(audio_plugin) $(video_plugin)
 
 #
 # Other lists of files
 #
 sources := $(C_OBJ:%.o=%.c) $(PLUGIN_OBJ:%.so=%.c)
-dependancies := $(sources:%.c=dep/%.d)
+dependancies := $(sources:%.c=.dep/%.d)
 
 # All symbols must be exported
 export
@@ -323,7 +328,12 @@ clean:
 distclean: clean
 	rm -f **/*.o **/*.so **/*~ *.log
 	rm -f vlc gmon.out core
-	rm -rf dep
+	rm -rf .dep
+
+install:
+	$(INSTALL) vlc $(PREFIX)/bin
+	mkdir -p $(PREFIX)/lib/videolan/vlc
+	$(INSTALL) $(PLUGIN_OBJ) $(PREFIX)/lib/videolan/vlc
 
 show:
 	@echo "Command line for C objects:"
@@ -347,7 +357,7 @@ $(dependancies): %.d: FORCE
 	@$(MAKE) -s --no-print-directory -f Makefile.dep $@
 
 $(C_OBJ): %.o: Makefile.dep
-$(C_OBJ): %.o: dep/%.d
+$(C_OBJ): %.o: .dep/%.d
 $(C_OBJ): %.o: %.c
 	@echo "compiling $*.o from $*.c"
 	@$(CC) $(CCFLAGS) $(CFLAGS) -c -o $@ $<
@@ -358,7 +368,7 @@ $(ASM_OBJ): %.o: %.S
 	@$(CC) $(CFLAGS) -c -o $@ $<
 
 $(PLUGIN_OBJ): %.so: Makefile.dep
-$(PLUGIN_OBJ): %.so: dep/%.d
+$(PLUGIN_OBJ): %.so: .dep/%.d
 
 # audio plugins
 audio_output/aout_dummy.so audio_output/aout_dsp.so: %.so: %.c
@@ -367,7 +377,11 @@ audio_output/aout_dummy.so audio_output/aout_dsp.so: %.so: %.c
 
 audio_output/aout_esd.so: %.so: %.c
 		@echo "compiling $*.so from $*.c"
+ifeq ($(SYS), BSD)
+		@$(CC) $(CCFLAGS) $(CFLAGS) -lesd -shared -o $@ $<
+else
 		@$(CC) $(CCFLAGS) $(CFLAGS) -laudiofile -lesd -shared -o $@ $<
+endif
 
 # video plugins
 interface/intf_dummy.so video_output/vout_dummy.so \
@@ -393,15 +407,15 @@ interface/intf_ggi.so video_output/vout_ggi.so: %.so: %.c
 ################################################################################
 
 # Note on dependancies: each .c file is associated with a .d file, which
-# depends of it. The .o file associated with a .c file depends of the .d, of the 
-# .c itself, and of Makefile. The .d files are stored in a separate dep/ 
+# depends of it. The .o file associated with a .c file depends of the .d, of the
+# .c itself, and of Makefile. The .d files are stored in a separate .dep/
 # directory.
 # The dep directory should be ignored by CVS.
 
-# Note on inclusions: depending of the target, the dependancies files must 
+# Note on inclusions: depending of the target, the dependancies files must
 # or must not be included. The problem is that if we ask make to include a file,
-# and this file does not exist, it is made before it can be included. In a 
-# general way, a .d file should be included if and only if the corresponding .o 
+# and this file does not exist, it is made before it can be included. In a
+# general way, a .d file should be included if and only if the corresponding .o
 # needs to be re-made.
 
 # Two makefiles are used: the main one (this one) has regular generic rules,

Makefile.dep

@@ -26,10 +26,10 @@ default:
 # .c and from itself.
 
 -include $(MAKECMDGOALS)
-$(dependancies): dep/%.d: %.c
-	@test -d dep/$(dir $*) || mkdir -p dep/$(dir $*)
+$(dependancies): .dep/%.d: %.c
+	@test -d .dep/$(dir $*) || mkdir -p .dep/$(dir $*)
 	@echo "generating dependancies for $*.c"
 	@$(SHELL) -ec '$(CC) $(DCFLAGS) $(CFLAGS) $< \
 		| sed '\''s/$(subst .,\.,$(notdir $*))\.o[ :]*/$(subst /,\/,$*).o \
-		dep\/$(subst /,\/,$*).d : /g'\'' > $@; \
+		.dep\/$(subst /,\/,$*).d : /g'\'' > $@; \
 		[ -s $@ ] || rm -f $@'

README

@@ -0,0 +1,86 @@
+
+               README for vlc, the VideoLAN Client
+
+
+
+... Introduction
+
+[ nothing appropriate yet ]
+
+
+
+... Running VideoLAN
+
+[ nothing appropriate yet ]
+
+
+
+... Troubleshooting
+
+[ nothing appropriate yet ]
+
+
+
+... Resources
+
+[ nothing appropriate yet ]
+
+
+
+... The team
+
+The following teachers were involved in the VideoLAN project :
+
+  Pierre Lecoy, teacher-cum-researcher at ECP,
+  Philippe Boutin, head of the LMI (MicroComputing Laboratory).
+
+The following students were members of the VideoLAN team :
+
+  Pierre Almeras <[email protected]>
+  Christophe Arnaud <[email protected]>
+  Antoine Brenner <[email protected]>
+  R�gis Duchesne <[email protected]>
+  Alexandre Francois <[email protected]>
+  Hugo Haas <[email protected]>
+  Mikael Journo <[email protected]>
+  Michel Lespinasse <[email protected]>
+  Christophe Ulses <[email protected]>
+  Pierre Vandecasteele <[email protected]>
+  Guillaume Vergnaud <[email protected]>
+
+  Olivier Baxa <[email protected]>
+  Patrice Bazerque <[email protected]>
+  Etienne Bernard <[email protected]>
+  Arnaud Bienvenu <[email protected]>
+  R�gis Cl�ment <[email protected]>
+  Alexandre Duret <[email protected]>
+  Eric Estievenart <[email protected]>
+  S�bastien Kurz <[email protected]>
+  Olivier Pomel <[email protected]>
+
+  Pierre Baillet <[email protected]>
+  Alban Fonrouge <[email protected]>
+  Jean-Philippe Grimaldi <[email protected]>
+  Andres Krapf <[email protected]>
+  Christophe Massiot <[email protected]>
+  Mathieu Poumeyrol <[email protected]>
+  Etienne Roy <[email protected]>
+  Vincent Seguin <[email protected]>
+  Benoit Steiner <[email protected]>
+
+  Arnaud de Bossoreille de Ribou <[email protected]>
+  Jean-Marc Dressler <[email protected]>
+  Ga�l Hendryckx <[email protected]>
+  Samuel Hocevar <[email protected]>
+  Brieuc Jeunhomme <[email protected]>
+  Michel Kaempf <[email protected]>
+  Florent Rougon <[email protected]>
+
+  St�phane Borel <[email protected]>
+  Renaud Dartus <[email protected]>
+  Henri Fallon <[email protected]>
+  Jean-Michel Grimaldi <[email protected]>
+  Damien Lucas <[email protected]>
+  R�mi Peyronnet <[email protected]>
+  Laurent Rossier <[email protected]>
+

include/audio_output.h

@@ -23,7 +23,6 @@
 
 /*****************************************************************************
  * Required headers:
- * - <sys/soundcard.h>                                       ( audio_buf_info )
  * - "common.h"                                                   ( boolean_t )
  * - "mtime.h"                                                      ( mtime_t )
  * - "threads.h"                                               ( vlc_thread_t )

include/config.h

@@ -41,10 +41,8 @@
  *****************************************************************************/
 
 /* Program version and copyright message */
-#define COPYRIGHT_MESSAGE               "VideoLAN Client v" PROGRAM_VERSION " - (c)1999-2000 VideoLAN"
-#define VERSION_MESSAGE                 "VideoLAN Client - (c)1999-2000 VideoLAN\n" \
-                                        "version " PROGRAM_VERSION " ( " PROGRAM_BUILD " )\n" \
-                                        "compilation options: " PROGRAM_OPTIONS
+#define COPYRIGHT_MESSAGE   "VideoLAN Client - version " PROGRAM_VERSION \
+                            " " PROGRAM_CODENAME " - (c)1996-2000 VideoLAN"
 
 /*****************************************************************************
  * General compilation options