* fixed a dumb bug in the Makefile that prevented inclusion of the

-march=pentium directive. thanks Meuuh, blame sam.
  * fixed a warning in main.c.
  * separate Debian packages.
  * added request for ALSA support in the TODO list.
This commit is contained in:
Sam Hocevar 2000-08-15 23:35:31 +00:00
parent cefc73ef5c
commit af22a4b58c
28 changed files with 115 additions and 253 deletions

View File

@ -1,3 +1,4 @@
Wed Aug 16 01:07:14 CEST 2000
0.1.99g :
* removed all "*vlc" aliases except "gvlc" and "fbvlc". The other sucked.
@ -9,6 +10,11 @@
* fixed a few long lines.
* fixed 8bpp YUV.
* fixed the fscked up Bresenham algorithm in all YUV functions.
* fixed a dumb bug in the Makefile that prevented inclusion of the
-march=pentium directive. thanks Meuuh, blame sam.
* fixed a warning in main.c.
* separate Debian packages.
* added request for ALSA support in the TODO list.
Tue Aug 8 11:24:01 CEST 2000
0.1.99f :

View File

@ -16,6 +16,7 @@ SYS=@SYS@
PLUGINS=@PLUGINS@
SNAPSHOTDIR=vlc-@VLC_VERSION@
INSTALL=@INSTALL@
ARCH=@ARCH@
prefix=@prefix@
#----------------- do not change anything below this line ----------------------
@ -97,11 +98,12 @@ CCFLAGS += -fomit-frame-pointer
# Optimizations for x86 familiy
ifneq (,$(findstring 86,$(ARCH)))
CCFLAGS += -malign-double
#CCFLAGS += -march=pentium
# Eventual Pentium Pro optimizations
ifneq (,$(findstring pentiumpro,$(ARCH)))
ifneq ($(SYS), BSD)
CCFLAGS += -march=pentiumpro
else
CCFLAGS += -march=pentium
endif
endif
# Eventual MMX optimizations for x86
@ -356,7 +358,8 @@ distclean: clean
install:
mkdir -p $(prefix)/bin
$(INSTALL) vlc @ALIASES@ $(prefix)/bin
$(INSTALL) vlc $(prefix)/bin
for alias in @ALIASES@ ; do ln -s vlc $(prefix)/bin/$$alias ; done
mkdir -p $(prefix)/lib/videolan/vlc
$(INSTALL) -m 644 $(PLUGINS) $(prefix)/lib/videolan/vlc
mkdir -p $(prefix)/share/videolan
@ -401,7 +404,7 @@ else
$(CC) $(CCFLAGS) $(LCFLAGS) $(CFLAGS) --export-dynamic -rdynamic -o $@ $(C_OBJ) $(CPP_OBJ) $(ASM_OBJ)
endif
gvlc xvlc fbvlc ggivlc glidevlc: vlc
gvlc xvlc fbvlc: vlc
rm -f $@ && ln -s vlc $@
plugins: $(PLUGINS)

0
NEWS
View File

15
TODO
View File

@ -7,6 +7,14 @@
#
# Urgency values: Wishlist, Normal, Important, Critical
Task: 0x29
Difficulty: Medium
Urgency: Normal
Description: ALSA audio output support
ALSA is the Advanced Linux Sound Architecture and is believed to be
technically superior to the usual OSS support found in the Linux kernel.
Status: Todo
Task: 0x28
Difficulty: Guru
Urgency: Wishlist
@ -60,11 +68,12 @@ Description: Ogg/Vorbis audio decoder support
Status: Todo
Task: 0x23
Difficulty: Hard
Difficulty: Guru
Urgency: Normal
Description: Xv video output support
XFree 4.0 provides the Xv interface which can do hardware YUV on supported
hardware.
hardware. Unfortunately, there doesn't seem to be much documentation
available.
Status: Todo
Task: 0x22
@ -284,7 +293,7 @@ Description: Do separate packages
one should do separate packages: a core "vlc" package, and
"vlc-fb", "vlc-ggi", "vlc-esd" packages depending on the
core package.
Status: Todo
Status: Done 15 Aug 2000 (sam)
Task: 0x09
Difficulty: Easy

2
configure vendored
View File

@ -590,7 +590,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
echo "$ac_t""$host" 1>&6
VLC_VERSION=0.1.99f
VLC_VERSION=0.1.99g
VLC_CODENAME=Onatopp

View File

@ -4,7 +4,7 @@ AC_CONFIG_HEADER(include/defs.h)
AC_CANONICAL_HOST
VLC_VERSION=0.1.99f
VLC_VERSION=0.1.99g
AC_SUBST(VLC_VERSION)
VLC_CODENAME=Onatopp
AC_SUBST(VLC_CODENAME)

4
debian/.cvsignore vendored
View File

@ -1 +1,5 @@
tmp
delete
files
*debhelper
*substvars

68
debian/changelog vendored
View File

@ -1,68 +0,0 @@
vlc (0.1.99f) unstable; urgency=low
* plugin detection now works
* "gvlc", "fbvlc", "ggivlc" aliases now work
* fixed functions that weren't properly inlined
* removed bloat from the MMX YUV plugin
* vlc.init becomes ~/.vlcrc
* removed float operations in the video decoder, and all emms asm functions
* borrowed linuxvideo's MMX motion compensation
* fixed an undefined symbol in the MMX YUV plugin
-- Samuel Hocevar <sam@via.ecp.fr> Tue, 8 Aug 2000 11:24:01 +0200
vlc (0.1.99e) unstable; urgency=low
* new bitstream syntax and slight performance increase
-- Samuel Hocevar <sam@via.ecp.fr> Thu, 20 Jul 2000 15:14:06 +0200
vlc (0.1.99d) unstable; urgency=low
* .deb is now more lintian-friendly
* removed a few useless warning messages
* new plugin API
* plugin auto-detection
* removed the default --enable-ppro option because it didn't work on K6-2
* the framebuffer client now leaves the console in a working state
* the dithered 8 bpp YUV transformation works again (blame bbp !)
* the YUV transformations are now plugins as well
* alternative symlinks like gvlc, fbvlc are now created at compile time
* borrowed libmpeg2's GPLed MMX YUV transformations (16 and 32 bits)
* fixed an endianness problem which occured on iMacs
-- Samuel Hocevar <sam@via.ecp.fr> Wed, 12 Jul 2000 01:24:40 +0200
vlc (0.1.99c) unstable; urgency=low
* Caught Delete Window event in Gnome and X11 modes
* Fixed manpage
* GGI output now works
* Fixed a segfault on exit for the Gnome plugin
* Sound support almost works under BeOS
-- Samuel Hocevar <sam@via.ecp.fr> Tue, 20 Jun 2000 03:01:12 +0200
vlc (0.1.99b) unstable; urgency=low
* Added a ChangeLog file
* Updated the VLAN code
* Fixed a bug preventing to quit
-- Samuel Hocevar <sam@via.ecp.fr> Sat, 17 Jun 2000 03:46:16 +0200
vlc (0.1.99a) unstable; urgency=low
* Fixed some compile flag errors
-- Samuel Hocevar <sam@via.ecp.fr> Thu, 15 Jun 2000 20:48:54 +0200
vlc (0.1.99-1) unstable; urgency=low
* Initial Release.
-- Samuel Hocevar <sam@via.ecp.fr> Mon, 13 Mar 2000 02:21:45 +0100
Local variables:
mode: debian-changelog
End:

50
debian/control vendored
View File

@ -7,8 +7,52 @@ Standards-Version: 3.0.1
Package: vlc
Architecture: any
Depends: ${shlibs:Depends}
Description: VideoLAN Client - a free network-aware MPEG and DVD player
Description: VideoLAN Client - a free MPEG2 and DVD player
VideoLAN is a free MPEG2 software solution.
.
The VideoLAN Client allows to play MPEG2 Transport Streams from the
network or from a file, as well as direct DVD playback.
This is the VideoLAN Client. It plays MPEG2 files, DVDs, or MPEG2
streams from a network source.
Package: vlc-gnome
Architecture: any
Depends: vlc (= ${Source-Version}), ${shlibs:Depends}
Description: Gnome VideoLAN Client - a free MPEG2 and DVD player for Gnome
VideoLAN is a free MPEG2 software solution.
.
This is the Gnome version of the VideoLAN Client. It plays MPEG2 files,
DVDs, or MPEG2 streams from a network source.
Package: vlc-fb
Architecture: any
Depends: vlc (= ${Source-Version})
Description: Framebuffer VideoLAN Client - a free MPEG2 and DVD player
VideoLAN is a free MPEG2 software solution.
.
This is the Linux framebuffer version of the VideoLAN Client. It plays
MPEG2 files, DVDs, or MPEG2 streams from a network source.
Package: vlc-ggi
Architecture: any
Depends: vlc (= ${Source-Version}), ${shlibs:Depends}
Description: GGI plugin for the VideoLAN MPEG2 and DVD player vlc
VideoLAN is a free MPEG2 software solution.
.
This is a GGI plugin for the VideoLAN Client.
Package: vlc-glide
Architecture: any
Depends: vlc (= ${Source-Version}), libglide2
Description: Glide plugin for the VideoLAN MPEG2 and DVD player vlc
VideoLAN is a free MPEG2 software solution.
.
This is a Glide (3dfx) plugin for the VideoLAN Client.
Package: vlc-esd
Architecture: any
Depends: vlc (= ${Source-Version}), ${shlibs:Depends}
Description: Esound plugin for the VideoLAN MPEG2 and DVD player vlc
VideoLAN is a free MPEG2 software solution.
.
This plugin adds support for the Enlightened Sound Daemon to
the VideoLAN Client.

2
debian/dirs vendored
View File

@ -1,3 +1,5 @@
usr/bin
usr/lib/videolan/vlc
usr/share/videolan
usr/share/doc/vlc
usr/share/man/man1

1
debian/files vendored
View File

@ -1 +0,0 @@
vlc_0.1.99f_i386.deb graphics optional

View File

@ -1,10 +0,0 @@
# Automatically added by dh_installdocs
if [ "$1" = "configure" ]; then
if [ -d /usr/doc -a ! -e /usr/doc/vlc -a -d /usr/share/doc/vlc ]; then
ln -sf ../share/doc/vlc /usr/doc/vlc
fi
fi
# End automatically added section
# Automatically added by dh_installmenu
if [ "$1" = "configure" -a -x /usr/bin/update-menus ]; then update-menus ; fi
# End automatically added section

View File

@ -1,3 +0,0 @@
# Automatically added by dh_installmenu
if [ -x /usr/bin/update-menus ]; then update-menus ; fi
# End automatically added section

View File

@ -1,5 +0,0 @@
# Automatically added by dh_installdocs
if [ \( "$1" = "upgrade" -o "$1" = "remove" \) -a -L /usr/doc/vlc ]; then
rm -f /usr/doc/vlc
fi
# End automatically added section

16
debian/rules vendored
View File

@ -15,7 +15,8 @@ build-stamp:
./configure --prefix=/usr \
--mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info \
--enable-mmx --enable-gnome --enable-fb
--enable-mmx --enable-gnome --enable-fb \
--enable-ggi --enable-esd --enable-glide
$(MAKE)
touch build-stamp
@ -37,6 +38,13 @@ install: build
$(MAKE) install prefix=`pwd`/debian/tmp/usr
# make symlinks for packages
for alias in ggi gnome fb glide esd ; do \
ln -s vlc debian/tmp/usr/share/doc/vlc-$$alias ; done
ln -s vlc.1.gz debian/tmp/usr/share/man/man1/fbvlc.1.gz
ln -s vlc.1.gz debian/tmp/usr/share/man/man1/gvlc.1.gz
dh_movefiles
# Build architecture-independent files here.
binary-indep: build install
@ -55,10 +63,10 @@ binary-arch: build install
# dh_installpam
# dh_installinit
dh_installcron
dh_installmanpages
dh_installmanpages -Nvlc-gnome -Nvlc-fb -Nvlc-ggi -Nvlc-glide -Nvlc-esd
dh_installinfo
# dh_undocumented
dh_installchangelogs
dh_installchangelogs -Nvlc-gnome -Nvlc-fb -Nvlc-ggi -Nvlc-glide -Nvlc-esd
dh_link
dh_strip
dh_compress
@ -68,7 +76,7 @@ binary-arch: build install
# dh_makeshlibs
dh_installdeb
# dh_perl
dh_shlibdeps
dh_shlibdeps -Nvlc-glide
dh_gencontrol
dh_md5sums
dh_builddeb

1
debian/substvars vendored
View File

@ -1 +0,0 @@
shlibs:Depends=gdk-imlib1 (>= 1.9.8-4), libart2 (>= 1.2.4-1), libaudiofile0, libc6 (>= 2.1.2), libdb2 (>= 1:2.4.14-7), libesd0 (>= 0.2.16) | libesd-alsa0 (>= 0.2.16), libglib1.2 (>= 1.2.0), libgnome32 (>= 1.2.4-1), libgnomesupport0 (>= 1.2.4-1), libgnomeui32 (>= 1.2.4-1), libgtk1.2 (>= 1.2.8-1), xlib6g (>= 3.3.6-4), zlib1g (>= 1:1.1.3)

2
debian/vlc-esd.files vendored Normal file
View File

@ -0,0 +1,2 @@
usr/lib/videolan/vlc/esd.so
usr/share/doc/vlc-esd

4
debian/vlc-fb.files vendored Normal file
View File

@ -0,0 +1,4 @@
usr/lib/videolan/vlc/fb.so
usr/bin/fbvlc
usr/share/doc/vlc-fb
usr/share/man/man1/fbvlc.1.gz

2
debian/vlc-ggi.files vendored Normal file
View File

@ -0,0 +1,2 @@
usr/lib/videolan/vlc/ggi.so
usr/share/doc/vlc-ggi

2
debian/vlc-glide.files vendored Normal file
View File

@ -0,0 +1,2 @@
usr/lib/videolan/vlc/glide.so
usr/share/doc/vlc-glide

5
debian/vlc-gnome.files vendored Normal file
View File

@ -0,0 +1,5 @@
usr/lib/videolan/vlc/gnome.so
usr/bin/gvlc
usr/share/videolan/gvlc.png
usr/share/doc/vlc-gnome
usr/share/man/man1/gvlc.1.gz

3
debian/vlc-gnome.menu vendored Normal file
View File

@ -0,0 +1,3 @@
?package(vlc-gnome):command="/usr/bin/gvlc" hotkey="V" needs="X11" \
section="Apps/Graphics" title="Gnome VideoLAN Client" \
icon="/usr/share/videolan/gvlc.png"

145
debian/vlc.1 vendored
View File

@ -1,145 +0,0 @@
.\" Hey, EMACS: -*- nroff -*-
.\" First parameter, NAME, should be all caps
.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
.\" other parameters are allowed: see man(7), man(1)
.TH VLC 1 "July 30, 2000"
.\" Please adjust this date whenever revising the manpage.
.\"
.\" Some roff macros, for reference:
.\" .nh disable hyphenation
.\" .hy enable hyphenation
.\" .ad l left justify
.\" .ad b justify to both left and right margins
.\" .nf disable filling
.\" .fi enable filling
.\" .br insert line break
.\" .sp <n> insert n+1 empty lines
.\" for manpage-specific macros, see man(7)
.SH NAME
vlc \- The VideoLAN Client
.SH SYNOPSIS
.B vlc
.RI [ OPTIONS ]
.RI [ PARAMETERS ]
.RI [ FILE ]...
.SH DESCRIPTION
This manual page documents briefly the
.B vlc
, a free MPEG2 player.
.SH OPTIONS
.B vlc
follows the usual GNU command line syntax, with long
options starting with two dashes (`-').
A summary of options is included below.
.TP
.B \-\-noaudio
Disable audio output.
.TP
.B \-\-aout <plugin>
Specify an audio output plugin: "dsp", "esd", for instance.
.TP
.B \-\-stereo, \-\-mono
Choose stereo or mono audio output
.TP
.B \-\-novideo
Disable video output.
.TP
.B \-\-vout <plugin>
Specify a video output plugin: "gnome", "fb", "glide", for instance.
.TP
.B \-\-yuv <plugin>
Specify a YUV plugin: "mmx", "nommx", for instance.
.TP
.B \-\-display <display>
Specify the display name.
.TP
.B \-\-width <w>, \-\-height <h>
Choose the display coordinates.
.TP
.B \-g, \-\-grayscale
Grayscale output.
.TP
.B \-\-color
Color output.
.TP
.B \-a, \-\-dvdaudio [ ac3 | lpcm | mpeg | off ]
Choose the audio channel type. Most DVDs have AC3 audio channels, but
you can also have Linear PCM or MPEG layer 2 sound. Also, one might decide
not to activate the audio channel.
.TP
.B \-c, \-\-dvdchannel [ 0\-15 ]
Select the audio channel. Most DVDs only have one or two audio channels,
but some of them have a great number of available languages. Note that the
audio channel will also depend on the channel type.
.TP
.B \-s, \-\-dvdsubtitle [ 0\-31 ]
Select the subtitle channel, if there is one in the stream.
.TP
.B \-\-novlans
Disable VLANs support.
.TP
.B \-\-server <host>, \-\-port <port>
Choose the video server address and port.
.TP
.B \-\-synchro <type>
Choose a fixed synchro value instead of the internal auto-adaptative
heuristics based on CPU usage.
`I' displays only I images, `IP' displays I and P images, `IP+'
displays I and P images and every second B image, and `IPB' forces
displaying of all images.
Note that the vlc is certainly going to crash if you ask it to
display more images than your CPU can cope with.
.TP
.B \-h, \-\-help
Print help and exit.
.TP
.B \-H, \-\-longhelp
Print long help and exit.
.TP
.B \-v, \-\-version
Output version information and exit.
.SH PARAMETERS
.B vlc
also accepts a lot of parameters to customize its behaviour.
.TP
.B Interface parameters:
vlc_init=<filename> initialization script
vlc_channels=<filename> channels list
.TP
.B Audio parameters:
vlc_aout=<method name> audio method
vlc_dsp=<filename> dsp device path
vlc_stereo={1|0} stereo or mono output
vlc_audio_rate=<rate> output rate
.TP
.B Video parameters:
vlc_vout=<method name> display method
vlc_display=<display> display used
vlc_width=<width> display width
vlc_height=<height> dislay height
vlc_fb_dev=<filename> framebuffer device path
vlc_grayscale={1|0} grayscale or color output
.TP
.B DVD parameters:
vlc_dvd_audio={ac3|lpcm|mpeg|off} audio type
vlc_dvd_channel=[0-15] audio channel
vlc_dvd_subtitle=[0-31] subtitle channel
.TP
.B Input parameters:
vlc_server=<hostname> video server
vlc_server_port=<port> video server port
vlc_iface=<interface> network interface
vlc_vlan_server=<host> vlan server
vlc_vlan_port=<port> vlan server port
.TP
.B Synchro parameters:
vlc_synchro=<type> synchro algorithm
.SH SEE ALSO
.BR vls (1), vlms (1)
.br
.SH AUTHOR
This manual page was written by the VideoLAN Team <videolan@via.ecp.fr>,
for the Debian GNU/Linux system (but may be used by others).

View File

@ -1,4 +1,5 @@
AUTHORS
INSTALL
NEWS
README
TODO
ChangeLog

BIN
share/gvlc.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.9 KiB

View File

@ -149,7 +149,7 @@ static void Version ( void );
static void InitSignalHandler ( void );
static void SignalHandler ( int i_signal );
#ifdef HAVE_MMX
static int TestMMX ( void );
int TestMMX ( void );
#endif
/*****************************************************************************

View File

@ -1,10 +1,10 @@
Name: vlc
Version: 0.1.99f
Version: 0.1.99g
Release: 1
Copyright: GPL
Url: http://www.videolan.org/
Group: X11/Applications/Graphics
Source0: http://www.videolan.org/packages/0.1.99f/vlc-0.1.99f.tar.gz
Source0: http://www.videolan.org/packages/0.1.99g/vlc-0.1.99g.tar.gz
Packager: Samuel Hocevar <sam@via.ecp.fr>
Buildroot: /tmp/vlc-build
@ -42,7 +42,7 @@ make install prefix=$RPM_BUILD_ROOT/usr
%attr(-, root, root) /usr/bin/vlc
%attr(-, root, root) /usr/share/videolan
%attr(-, root, root) /usr/lib/videolan
%attr(-, root, root) %doc AUTHORS COPYING INSTALL NEWS README doc
%attr(-, root, root) %doc ChangeLog AUTHORS COPYING INSTALL README doc
%clean
rm -rf $RPM_BUILD_ROOT