Commit d04b152b authored by Sam Hocevar's avatar Sam Hocevar

. disabled SDL parachute to let the vlc dump a core instead of staying stuck

 . patched 2 debian bugs
    (see http://bugs.debian.org/cgi-bin/pkgreport.cgi?pkg=vlc)
 . improved the snapshot generation
parent 3ea3f9ff
...@@ -16,7 +16,6 @@ OPTIMS=@OPTIMS@ ...@@ -16,7 +16,6 @@ OPTIMS=@OPTIMS@
SYS=@SYS@ SYS=@SYS@
PLUGINS=@PLUGINS@ PLUGINS=@PLUGINS@
SNAPSHOTDIR=vlc-@VLC_VERSION@
INSTALL=@INSTALL@ INSTALL=@INSTALL@
ARCH=@ARCH@ ARCH=@ARCH@
prefix=@prefix@ prefix=@prefix@
...@@ -441,23 +440,34 @@ show: ...@@ -441,23 +440,34 @@ show:
# ugliest of all, but I have no time to do it -- sam # ugliest of all, but I have no time to do it -- sam
snapshot: snapshot:
rm -rf /tmp/vlc-@VLC_VERSION@ /tmp/vlc-@VLC_VERSION@-nocss rm -rf /tmp/vlc-@VLC_VERSION@ /tmp/vlc-@VLC_VERSION@nocss
# copy archive in /tmp # copy archive in /tmp
find include src plugins -type d | while read i ; \ find -type d | while read i ; \
do mkdir -p /tmp/vlc-@VLC_VERSION@/$$i ; \ do mkdir -p /tmp/vlc-@VLC_VERSION@/$$i ; \
done done
find /tmp/vlc-@VLC_VERSION@ -type d -name CVS | xargs rmdir find debian -mindepth 1 -type d | grep -v CVS | while read i ; \
for i in debian doc lib share ; \ do rmdir $$i ; \
do mkdir /tmp/vlc-@VLC_VERSION@/$$i ; \ done
# CVS entries
find . -type f | grep CVS | while read i ; \
do cp $$i /tmp/vlc-@VLC_VERSION@/$$i ; \
done done
# .c .h .in .cpp # .c .h .in .cpp
find include src plugins -type f -name '*.[chi]*' | while read i ; \ find include src plugins -type f -name '*.[chi]*' | while read i ; \
do cp $$i /tmp/vlc-@VLC_VERSION@/$$i ; \ do cp $$i /tmp/vlc-@VLC_VERSION@/$$i ; \
done done
# copy misc files
cp vlc.spec AUTHORS COPYING ChangeLog INSTALL README TODO \ cp vlc.spec AUTHORS COPYING ChangeLog INSTALL README TODO \
Makefile.in Makefile.dep configure configure.in install-sh \ Makefile.in Makefile.dep configure configure.in install-sh \
config.sub config.guess todo.pl \ config.sub config.guess todo.pl \
/tmp/vlc-@VLC_VERSION@/ /tmp/vlc-@VLC_VERSION@/
for file in control vlc-gnome.menu vlc.copyright vlc.docs changelog \
rules vlc.1 vlc.dirs vlc.menu ; do \
cp debian/$$file /tmp/vlc-@VLC_VERSION@/debian/ ; done
for file in default8x16.psf default8x9.psf gvlc.png vlc.png ; do \
cp share/$$file /tmp/vlc-@VLC_VERSION@/share/ ; done
# build css-enabled archives
(cd /tmp ; tar cf vlc-@VLC_VERSION@.tar vlc-@VLC_VERSION@ ; \ (cd /tmp ; tar cf vlc-@VLC_VERSION@.tar vlc-@VLC_VERSION@ ; \
bzip2 -f -9 < vlc-@VLC_VERSION@.tar \ bzip2 -f -9 < vlc-@VLC_VERSION@.tar \
> vlc-@VLC_VERSION@.tar.bz2 ; \ > vlc-@VLC_VERSION@.tar.bz2 ; \
...@@ -473,16 +483,21 @@ snapshot: ...@@ -473,16 +483,21 @@ snapshot:
elsif (!$$i || /^#/) { print $$_; }' \ elsif (!$$i || /^#/) { print $$_; }' \
< $$x | grep -vi css >| /tmp/vlc-@VLC_VERSION@/$$x ; \ < $$x | grep -vi css >| /tmp/vlc-@VLC_VERSION@/$$x ; \
done done
(cd /tmp ; mv vlc-@VLC_VERSION@ vlc-@VLC_VERSION@-nocss ; \ rm -f /tmp/vlc-@VLC_VERSION@/debian/changelog
tar cf vlc-@VLC_VERSION@-nocss.tar vlc-@VLC_VERSION@-nocss ; \ sed 's/\(^vlc ([^-]*\)-/\1nocss-/' < debian/changelog \
bzip2 -f -9 < vlc-@VLC_VERSION@-nocss.tar \ > /tmp/vlc-@VLC_VERSION@/debian/changelog
> vlc-@VLC_VERSION@-nocss.tar.bz2 ; \
gzip -f -9 vlc-@VLC_VERSION@-nocss.tar ) # build nocss archives
mv /tmp/vlc-@VLC_VERSION@-nocss.tar.gz \ (cd /tmp ; mv vlc-@VLC_VERSION@ vlc-@VLC_VERSION@nocss ; \
/tmp/vlc-@VLC_VERSION@-nocss.tar.bz2 .. tar cf vlc-@VLC_VERSION@nocss.tar vlc-@VLC_VERSION@nocss ; \
bzip2 -f -9 < vlc-@VLC_VERSION@nocss.tar \
> vlc-@VLC_VERSION@nocss.tar.bz2 ; \
gzip -f -9 vlc-@VLC_VERSION@nocss.tar )
mv /tmp/vlc-@VLC_VERSION@nocss.tar.gz \
/tmp/vlc-@VLC_VERSION@nocss.tar.bz2 ..
# clean up # clean up
rm -rf /tmp/vlc-@VLC_VERSION@-nocss rm -rf /tmp/vlc-@VLC_VERSION@nocss
plugins: $(PLUGINS:%=lib/%.so) plugins: $(PLUGINS:%=lib/%.so)
......
vlc (0.2.50-1) unstable; urgency=low
* Only build vlc-glide under x86 (Closes: #84046).
* Switched PentiumPro optimization off (Closes: #83707).
-- Samuel Hocevar <sam@zoy.org> Mon, 5 Feb 2001 20:49:15 +0100
vlc (0.2.50-1) unstable; urgency=low vlc (0.2.50-1) unstable; urgency=low
* Unstable release. * Unstable release.
......
...@@ -32,7 +32,7 @@ Description: GGI plugin for the VideoLAN Client ...@@ -32,7 +32,7 @@ Description: GGI plugin for the VideoLAN Client
This is a GGI plugin for the VideoLAN Client. This is a GGI plugin for the VideoLAN Client.
Package: vlc-glide Package: vlc-glide
Architecture: any Architecture: i386
Depends: vlc (= ${Source-Version}), libglide2 Depends: vlc (= ${Source-Version}), libglide2
Description: Glide plugin for the VideoLAN Client Description: Glide plugin for the VideoLAN Client
VideoLAN is a free MPEG, MPEG2 and DVD software solution. VideoLAN is a free MPEG, MPEG2 and DVD software solution.
......
...@@ -12,11 +12,20 @@ build: build-stamp ...@@ -12,11 +12,20 @@ build: build-stamp
build-stamp: build-stamp:
dh_testdir dh_testdir
if [ $(DEB_BUILD_ARCH) = i386 ]; then \
./configure --prefix=/usr \ ./configure --prefix=/usr \
--mandir=\$${prefix}/share/man \ --mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info \ --infodir=\$${prefix}/share/info \
--enable-gnome --enable-fb --with-glide --with-ggi \ --enable-gnome --enable-fb --with-glide --with-ggi \
--with-sdl --enable-esd --enable-alsa --with-sdl --enable-esd --enable-alsa --disable-ppro ; \
else \
./configure --prefix=/usr \
--mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info \
--enable-gnome --enable-fb --with-ggi \
--with-sdl --enable-esd --enable-alsa ; \
fi
$(MAKE) $(MAKE)
touch build-stamp touch build-stamp
......
...@@ -107,7 +107,7 @@ static int aout_Probe( probedata_t *p_data ) ...@@ -107,7 +107,7 @@ static int aout_Probe( probedata_t *p_data )
SDL_AudioSpec desired, obtained; SDL_AudioSpec desired, obtained;
/* Start AudioSDL */ /* Start AudioSDL */
if( SDL_Init(SDL_INIT_AUDIO) != 0 ) if( SDL_Init(SDL_INIT_AUDIO | SDL_INIT_NOPARACHUTE) != 0 )
{ {
intf_DbgMsg( "aout: SDL_Init failed (%s)", SDL_GetError() ); intf_DbgMsg( "aout: SDL_Init failed (%s)", SDL_GetError() );
return( 0 ); return( 0 );
......
...@@ -95,7 +95,8 @@ int vout_SDLCreate( vout_thread_t *p_vout, char *psz_display, ...@@ -95,7 +95,8 @@ int vout_SDLCreate( vout_thread_t *p_vout, char *psz_display,
p_vout->p_sys->p_overlay = NULL; p_vout->p_sys->p_overlay = NULL;
/* Initialize library */ /* Initialize library */
if( SDL_Init(SDL_INIT_VIDEO | SDL_INIT_EVENTTHREAD) < 0 ) if( SDL_Init(SDL_INIT_VIDEO | SDL_INIT_EVENTTHREAD | SDL_INIT_NOPARACHUTE)
< 0 )
{ {
intf_ErrMsg( "error: can't initialize SDL library: %s", intf_ErrMsg( "error: can't initialize SDL library: %s",
SDL_GetError() ); SDL_GetError() );
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment