diff --git a/Makefile.in b/Makefile.in index 7a19527bcfb4ac8a0154c1c7c872b12f936f5be6..f7ee8d769aa08b435c3e53e77d8f04178056a941 100644 --- a/Makefile.in +++ b/Makefile.in @@ -16,7 +16,6 @@ OPTIMS=@OPTIMS@ SYS=@SYS@ PLUGINS=@PLUGINS@ -SNAPSHOTDIR=vlc-@VLC_VERSION@ INSTALL=@INSTALL@ ARCH=@ARCH@ prefix=@prefix@ @@ -441,23 +440,34 @@ show: # ugliest of all, but I have no time to do it -- sam 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 - find include src plugins -type d | while read i ; \ + find -type d | while read i ; \ do mkdir -p /tmp/vlc-@VLC_VERSION@/$$i ; \ done - find /tmp/vlc-@VLC_VERSION@ -type d -name CVS | xargs rmdir - for i in debian doc lib share ; \ - do mkdir /tmp/vlc-@VLC_VERSION@/$$i ; \ + find debian -mindepth 1 -type d | grep -v CVS | while read i ; \ + do rmdir $$i ; \ + done + # CVS entries + find . -type f | grep CVS | while read i ; \ + do cp $$i /tmp/vlc-@VLC_VERSION@/$$i ; \ done # .c .h .in .cpp find include src plugins -type f -name '*.[chi]*' | while read i ; \ do cp $$i /tmp/vlc-@VLC_VERSION@/$$i ; \ done + # copy misc files cp vlc.spec AUTHORS COPYING ChangeLog INSTALL README TODO \ Makefile.in Makefile.dep configure configure.in install-sh \ config.sub config.guess todo.pl \ /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@ ; \ bzip2 -f -9 < vlc-@VLC_VERSION@.tar \ > vlc-@VLC_VERSION@.tar.bz2 ; \ @@ -473,16 +483,21 @@ snapshot: elsif (!$$i || /^#/) { print $$_; }' \ < $$x | grep -vi css >| /tmp/vlc-@VLC_VERSION@/$$x ; \ done - (cd /tmp ; mv vlc-@VLC_VERSION@ vlc-@VLC_VERSION@-nocss ; \ - 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 .. + rm -f /tmp/vlc-@VLC_VERSION@/debian/changelog + sed 's/\(^vlc ([^-]*\)-/\1nocss-/' < debian/changelog \ + > /tmp/vlc-@VLC_VERSION@/debian/changelog + + # build nocss archives + (cd /tmp ; mv vlc-@VLC_VERSION@ vlc-@VLC_VERSION@nocss ; \ + 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 - rm -rf /tmp/vlc-@VLC_VERSION@-nocss + rm -rf /tmp/vlc-@VLC_VERSION@nocss plugins: $(PLUGINS:%=lib/%.so) diff --git a/debian/changelog b/debian/changelog index 9f921ff8f9e22d5260bdeb867a577337b4d63f04..d5e5e85e749507217fd18361523d39f2e7f32aa7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +vlc (0.2.50-1) unstable; urgency=low + + * Only build vlc-glide under x86 (Closes: #84046). + * Switched PentiumPro optimization off (Closes: #83707). + + -- Samuel Hocevar Mon, 5 Feb 2001 20:49:15 +0100 + vlc (0.2.50-1) unstable; urgency=low * Unstable release. diff --git a/debian/control b/debian/control index a01502925519a460c9b74f38244e8b3b8a176595..e3d3ba0118ca175b7b599188b5327ae2b002bc80 100644 --- a/debian/control +++ b/debian/control @@ -32,7 +32,7 @@ Description: GGI plugin for the VideoLAN Client This is a GGI plugin for the VideoLAN Client. Package: vlc-glide -Architecture: any +Architecture: i386 Depends: vlc (= ${Source-Version}), libglide2 Description: Glide plugin for the VideoLAN Client VideoLAN is a free MPEG, MPEG2 and DVD software solution. diff --git a/debian/rules b/debian/rules index c190e8fe2dd5b1c5f25410017b56c04ea33688bd..240e1f018645ce499474a083b5f7aaab39deab10 100755 --- a/debian/rules +++ b/debian/rules @@ -12,11 +12,20 @@ build: build-stamp build-stamp: dh_testdir + if [ $(DEB_BUILD_ARCH) = i386 ]; then \ ./configure --prefix=/usr \ --mandir=\$${prefix}/share/man \ --infodir=\$${prefix}/share/info \ --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) touch build-stamp diff --git a/plugins/sdl/aout_sdl.c b/plugins/sdl/aout_sdl.c index cf59d48b7fb99d450939f00c3a611f9a4c8f2e9a..ac3d98cd6d63bbd9d61953c85571805461c676ab 100644 --- a/plugins/sdl/aout_sdl.c +++ b/plugins/sdl/aout_sdl.c @@ -107,7 +107,7 @@ static int aout_Probe( probedata_t *p_data ) SDL_AudioSpec desired, obtained; /* 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() ); return( 0 ); diff --git a/plugins/sdl/vout_sdl.c b/plugins/sdl/vout_sdl.c index 1edc69661c87cc98f2ff42df681ec206ce61c4a6..5936f57a0a9c54c1a14d358343402e3ad8dd9b17 100644 --- a/plugins/sdl/vout_sdl.c +++ b/plugins/sdl/vout_sdl.c @@ -95,7 +95,8 @@ int vout_SDLCreate( vout_thread_t *p_vout, char *psz_display, p_vout->p_sys->p_overlay = NULL; /* 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", SDL_GetError() );