From 4945d2bb3621b899aca49359c435d0dcfcc2ec1b Mon Sep 17 00:00:00 2001 From: Sam Hocevar Date: Fri, 27 Jul 2001 14:43:30 +0000 Subject: [PATCH] * Updated version numbers for imminent release. * Fixed the --with-dvdcss flag: o --with-dvdcss - build libdvdcss, link statically (also default behaviour) o --with-dvdcss=local-static - build libdvdcss, link statically o --with-dvdcss=local-shared - build libdvdcss, link dynamically o --with-dvdcss=/foo/bar - don't build libdvdcss, use libdvdcss in /foo/bar * Fixed an omission in the dvdcss.h header. --- ChangeLog | 23 ++++++ configure | 108 +++++++++++++++++------------ configure.in | 44 ++++++++---- debian/changelog | 6 ++ debian/changelog-css | 6 ++ debian/control | 11 +-- debian/rules | 14 ++-- extras/libdvdcss/videolan/dvdcss.h | 4 +- vlc.spec | 7 +- 9 files changed, 146 insertions(+), 77 deletions(-) diff --git a/ChangeLog b/ChangeLog index 69a93a3f47..2a156e10ea 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,26 @@ #===================# HEAD + * Nothing yet. + +0.2.81 +Fri, 27 Jul 2001 03:30:44 +0200 + + * Changed libdvdcss API to force binary incompatibility. Yeah, this is + evil, but if we don't do it now we'll have to do it when more people + are using it. + * Fixed minor libdvdcss stuff such as the soname and compilation flags. + * New --with-dvdcss flag. + * Fixed a bug in aout spdif with dolby stereo (use of obsolete PTS). + * Format asm functions for gcc, fixed the segfaults with imdct_sse. + * Now using gcc -pipe. + * (Hopefully) fixed the #@!$ field pictures bug. + * Fixed the MMX YUV plugin issues with gcc 2.96 and 3.0. + * Updated TODO, cosmetic changes. + * Now use sdl-config for SDL. + * Fixed a stupid bug in buffer management with field pictures. + * Fixed a reinit bug after a discontinuity - such as seek(). + * The spdif audio output won't kill itself anymore at the beginning. * dvdcss_readv() optimisations for Win32. * Fixed _win32_dvdcss_aread() to work around the WinASPI32 64kb transfer size restriction. @@ -10,6 +30,9 @@ HEAD * dvd_ifo.c now takes into account error messages from UDFFindFile. * Fixed the "quit" event handling in directx/vout_events.c. * Temporarily disabled aout_Probe() in aout_SDL (libSDL bug). + * ncurses compilation fix by Michael Mondragon . + * Fix for large inline functions and gcc 3.0. + * Fixed the gnome plugin so that it does not include gtk headers. * libdvdcss segfault fixes. * Tuned constants, since it seems to make people happy. * Fixed the "paused movie won't restart" bug. diff --git a/configure b/configure index 411e858ace..9e7cdfdc14 100755 --- a/configure +++ b/configure @@ -30,7 +30,7 @@ ac_help="$ac_help ac_help="$ac_help --enable-pth Enable GNU Pth support (default disabled)" ac_help="$ac_help - --with-dvdcss[=name] use another libdvdcss (default is local one)" + --with-dvdcss[=name] way to use libdvdcss, either local-static, local-shared or a path to another libdvdcss such as /usr/local (default local-static)" ac_help="$ac_help --disable-css Disable DVD CSS decryption (default enabled)" ac_help="$ac_help @@ -634,9 +634,9 @@ host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` echo "$ac_t""$host" 1>&6 -VLC_VERSION=0.2.80 +VLC_VERSION=0.2.81 -LIBDVDCSS_VERSION=0.0.1 +LIBDVDCSS_VERSION=0.0.2 VLC_CODENAME=Ourumov @@ -3746,9 +3746,21 @@ STATIC_LIBDVDCSS=0 # Check whether --with-dvdcss or --without-dvdcss was given. if test "${with_dvdcss+set}" = set; then withval="$with_dvdcss" - if test "x$withval" == "xno" - then - # local libdvdcss + case "x${withval}" in + xlocal-static|xyes) + # local libdvdcss, statically linked + if test x${CAN_BUILD_LIBDVDCSS} = x1 + then + LOCAL_LIBDVDCSS=1 + STATIC_LIBDVDCSS=1 + BUILTINS="${BUILTINS} dvd" + CFLAGS_DVD="${CFLAGS_DVD} -I../../extras/libdvdcss" + LIB_DVD="${LIB_DVD} lib/libdvdcss.a" + LIB_DVD_PLUGIN="${LIB_DVD_PLUGIN} ../../lib/libdvdcss.a" + fi + ;; + xlocal-shared) + # local libdvdcss, dynamically linked if test x${CAN_BUILD_LIBDVDCSS} = x1 then LOCAL_LIBDVDCSS=1 @@ -3757,7 +3769,8 @@ if test "${with_dvdcss+set}" = set; then LIB_DVD="${LIB_DVD} -Llib -ldvdcss" LIB_DVD_PLUGIN="${LIB_DVD_PLUGIN} -L../../lib -ldvdcss" fi - else + ;; + *) # existing libdvdcss BUILTINS="${BUILTINS} dvd" if test "x$withval" != "xyes" @@ -3767,7 +3780,7 @@ if test "${with_dvdcss+set}" = set; then fi LIB_DVD="${LIB_DVD} -ldvdcss" LIB_DVD_PLUGIN="${LIB_DVD_PLUGIN} -ldvdcss" - fi + esac else # user didn't decide, we choose to use local libdvdcss and link statically if test x${CAN_BUILD_LIBDVDCSS} = x1 @@ -3870,7 +3883,7 @@ if test "${enable_esd+set}" = set; then # Extract the first word of "esd-config", so it can be a program name with args. set dummy esd-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3874: checking for $ac_word" >&5 +echo "configure:3887: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_ESD_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3937,17 +3950,17 @@ else do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3941: checking for $ac_hdr" >&5 +echo "configure:3954: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3951: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3964: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -3992,17 +4005,17 @@ fi do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3996: checking for $ac_hdr" >&5 +echo "configure:4009: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4006: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4019: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4079,7 +4092,7 @@ EOF # Extract the first word of "sdl-config", so it can be a program name with args. set dummy sdl-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4083: checking for $ac_word" >&5 +echo "configure:4096: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_SDL_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4117,7 +4130,7 @@ fi # Extract the first word of "sdl11-config", so it can be a program name with args. set dummy sdl11-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4121: checking for $ac_word" >&5 +echo "configure:4134: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_SDL_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4156,7 +4169,7 @@ fi # Extract the first word of "sdl12-config", so it can be a program name with args. set dummy sdl12-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4160: checking for $ac_word" >&5 +echo "configure:4173: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_SDL_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4196,17 +4209,17 @@ fi do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4200: checking for $ac_hdr" >&5 +echo "configure:4213: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4210: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4223: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4266,17 +4279,17 @@ if test "${with_directx+set}" = set; then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4270: checking for $ac_hdr" >&5 +echo "configure:4283: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4280: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4293: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4314,17 +4327,17 @@ fi do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4318: checking for $ac_hdr" >&5 +echo "configure:4331: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4328: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4341: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4428,7 +4441,7 @@ if test x$enable_gtk != xno; then # Extract the first word of "gtk-config", so it can be a program name with args. set dummy gtk-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4432: checking for $ac_word" >&5 +echo "configure:4445: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4488,17 +4501,17 @@ if test x$enable_x11 != xno; then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4492: checking for $ac_hdr" >&5 +echo "configure:4505: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4502: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4515: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4550,17 +4563,17 @@ if test x$enable_xvideo != xno; then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4554: checking for $ac_hdr" >&5 +echo "configure:4567: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4564: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4577: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4596,19 +4609,21 @@ fi # Check whether --enable-alsa or --disable-alsa was given. if test "${enable_alsa+set}" = set; then enableval="$enable_alsa" - if test x$enable_alsa = xyes; then ac_safe=`echo "sys/asoundlib.h" | sed 'y%./+-%__p_%'` + if test x$enable_alsa = xyes + then + ac_safe=`echo "sys/asoundlib.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for sys/asoundlib.h""... $ac_c" 1>&6 -echo "configure:4602: checking for sys/asoundlib.h" >&5 +echo "configure:4617: checking for sys/asoundlib.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4612: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4627: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4625,7 +4640,7 @@ fi if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for main in -lasound""... $ac_c" 1>&6 -echo "configure:4629: checking for main in -lasound" >&5 +echo "configure:4644: checking for main in -lasound" >&5 ac_lib_var=`echo asound'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4633,14 +4648,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lasound $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4659: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4665,10 +4680,13 @@ else echo "$ac_t""no" 1>&6 have_alsa="false" fi - if test x$have_alsa = xtrue; then - PLUGINS="${PLUGINS} alsa" - LIB_ALSA="-lasound" - fi; fi + + if test x$have_alsa = xtrue + then + PLUGINS="${PLUGINS} alsa" + LIB_ALSA="-lasound" + fi + fi fi diff --git a/configure.in b/configure.in index 4ffc0aa8b8..1c0ba32a22 100644 --- a/configure.in +++ b/configure.in @@ -1,12 +1,12 @@ -dnl Autoconf settings for vlc +dnl Autoconf settings for vlc and libdvdcss AC_INIT(include/main.h) AC_CONFIG_HEADER(include/defs.h) AC_CANONICAL_HOST -VLC_VERSION=0.2.80 +VLC_VERSION=0.2.81 AC_SUBST(VLC_VERSION) -LIBDVDCSS_VERSION=0.0.1 +LIBDVDCSS_VERSION=0.0.2 AC_SUBST(LIBDVDCSS_VERSION) VLC_CODENAME=Ourumov AC_SUBST(VLC_CODENAME) @@ -322,10 +322,22 @@ dnl LOCAL_LIBDVDCSS=0 STATIC_LIBDVDCSS=0 AC_ARG_WITH(dvdcss, - [ --with-dvdcss[=name] use another libdvdcss (default is local one)], - [ if test "x$withval" == "xno" - then - # local libdvdcss + [ --with-dvdcss[=name] way to use libdvdcss, either local-static, local-shared or a path to another libdvdcss such as /usr/local (default local-static)], + [ case "x${withval}" in + xlocal-static|xyes) + # local libdvdcss, statically linked + if test x${CAN_BUILD_LIBDVDCSS} = x1 + then + LOCAL_LIBDVDCSS=1 + STATIC_LIBDVDCSS=1 + BUILTINS="${BUILTINS} dvd" + CFLAGS_DVD="${CFLAGS_DVD} -I../../extras/libdvdcss" + LIB_DVD="${LIB_DVD} lib/libdvdcss.a" + LIB_DVD_PLUGIN="${LIB_DVD_PLUGIN} ../../lib/libdvdcss.a" + fi + ;; + xlocal-shared) + # local libdvdcss, dynamically linked if test x${CAN_BUILD_LIBDVDCSS} = x1 then LOCAL_LIBDVDCSS=1 @@ -334,7 +346,8 @@ AC_ARG_WITH(dvdcss, LIB_DVD="${LIB_DVD} -Llib -ldvdcss" LIB_DVD_PLUGIN="${LIB_DVD_PLUGIN} -L../../lib -ldvdcss" fi - else + ;; + *) # existing libdvdcss BUILTINS="${BUILTINS} dvd" if test "x$withval" != "xyes" @@ -344,7 +357,7 @@ AC_ARG_WITH(dvdcss, fi LIB_DVD="${LIB_DVD} -ldvdcss" LIB_DVD_PLUGIN="${LIB_DVD_PLUGIN} -ldvdcss" - fi ], + esac ], # user didn't decide, we choose to use local libdvdcss and link statically [ if test x${CAN_BUILD_LIBDVDCSS} = x1 then @@ -704,10 +717,15 @@ dnl ALSA module dnl AC_ARG_ENABLE(alsa, [ --enable-alsa Alsa sound drivers support (Only for linux) (default disabled)], - [if test x$enable_alsa = xyes; then AC_CHECK_HEADER(sys/asoundlib.h, AC_CHECK_LIB(asound, main, have_alsa="true", have_alsa="false"),have_alsa="false") if test x$have_alsa = xtrue; then - PLUGINS="${PLUGINS} alsa" - LIB_ALSA="-lasound" - fi; fi]) + [if test x$enable_alsa = xyes + then + AC_CHECK_HEADER(sys/asoundlib.h, AC_CHECK_LIB(asound, main, have_alsa="true", have_alsa="false"),have_alsa="false") + if test x$have_alsa = xtrue + then + PLUGINS="${PLUGINS} alsa" + LIB_ALSA="-lasound" + fi + fi]) dnl end of non-BeOS stuff fi diff --git a/debian/changelog b/debian/changelog index 38cd19644c..13ff3bb04d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +vlc (0.2.81-1) unstable; urgency=low + + * New upstream release. + + -- Samuel Hocevar Fri, 27 Jul 2001 03:30:44 +0200 + vlc (0.2.80-1) unstable; urgency=low * New upstream release. diff --git a/debian/changelog-css b/debian/changelog-css index 7ef4e0c8a2..2b01de30fa 100644 --- a/debian/changelog-css +++ b/debian/changelog-css @@ -1,3 +1,9 @@ +vlc-css (0.2.81-1) unstable; urgency=low + + * New upstream release. + + -- Samuel Hocevar Fri, 27 Jul 2001 03:30:44 +0200 + vlc-css (0.2.80-1) unstable; urgency=low * New upstream release. diff --git a/debian/control b/debian/control index 71d480c435..e9c90ab64c 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: vlc Section: graphics Priority: optional Maintainer: Samuel Hocevar -Build-Depends: debhelper (>=2.2.0), xlib6g-dev, libgnome-dev, libggi2-dev, libglide3-dev [i386], libesd0-dev, libsdl1.2-dev, libqt-dev, libasound2-dev +Build-Depends: debhelper (>=2.2.0), xlibs-dev, libgnome-dev, libggi2-dev, libglide3-dev [i386], libesd0-dev, libsdl1.2-dev, libqt-dev, libasound1-dev Standards-Version: 3.0.1 Package: vlc @@ -44,15 +44,6 @@ Description: Esound plugin for vlc This plugin adds support for the Enlightened Sound Daemon to vlc, the VideoLAN Client. -Package: vlc-alsa -Architecture: any -Depends: vlc (= ${Source-Version}), ${shlibs:Depends} -Description: ALSA plugin for vlc - VideoLAN is a free MPEG, MPEG2 and DVD software solution. - . - This plugin adds support for the Advanced Linux Sound Architecture to - vlc, the VideoLAN Client. - Package: vlc-sdl Architecture: any Depends: vlc (= ${Source-Version}), ${shlibs:Depends} diff --git a/debian/rules b/debian/rules index 51c3867640..5cc3e2e500 100755 --- a/debian/rules +++ b/debian/rules @@ -17,14 +17,14 @@ build-stamp: --mandir=\$${prefix}/share/man \ --infodir=\$${prefix}/share/info \ --enable-gnome --enable-gtk --enable-fb --with-glide \ - --with-ggi --with-sdl --enable-esd --enable-alsa \ + --with-ggi --with-sdl --enable-esd \ --enable-qt --disable-ppro ; \ else \ ./configure --prefix=/usr \ --mandir=\$${prefix}/share/man \ --infodir=\$${prefix}/share/info \ --enable-gnome --enable-gtk --enable-fb \ - --with-ggi --with-sdl --enable-esd --enable-alsa \ + --with-ggi --with-sdl --enable-esd \ --enable-qt ; \ fi @@ -49,8 +49,12 @@ install: build DESTDIR=`pwd`/debian/vlc/ $(MAKE) install prefix=/usr + # get rid of libdvdcss for the moment + rm -f debian/vlc/usr/lib/libdvdcss* + rm -Rf debian/vlc/usr/include + # make symlinks for packages - aliases="ggi gtk gnome esd sdl qt alsa" ; \ + aliases="ggi gtk gnome esd sdl qt" ; \ if [ $(DEB_BUILD_ARCH) = i386 ]; then aliases=$$aliases" glide" ; fi ; \ for alias in `echo $$aliases` ; do \ mkdir -p debian/vlc-$$alias/usr/share/doc/ ; \ @@ -123,10 +127,10 @@ binary-arch: build install # dh_installpam # dh_installinit #dh_installcron -# dh_installmanpages -Nvlc-gnome -Nvlc-gtk -Nvlc-ggi -Nvlc-glide -Nvlc-esd -Nvlc-alsa -Nvlc-sdl -Nvlc-qt doc/vlc.1 +# dh_installmanpages -Nvlc-gnome -Nvlc-gtk -Nvlc-ggi -Nvlc-glide -Nvlc-esd -Nvlc-sdl -Nvlc-qt doc/vlc.1 #dh_installinfo # dh_undocumented - dh_installchangelogs -Nvlc-gnome -Nvlc-gtk -Nvlc-ggi -Nvlc-glide -Nvlc-esd -Nvlc-alsa -Nvlc-sdl -Nvlc-qt + dh_installchangelogs -Nvlc-gnome -Nvlc-gtk -Nvlc-ggi -Nvlc-glide -Nvlc-esd -Nvlc-sdl -Nvlc-qt dh_link dh_strip dh_compress diff --git a/extras/libdvdcss/videolan/dvdcss.h b/extras/libdvdcss/videolan/dvdcss.h index acdc53ebd1..c6c0ada7e9 100644 --- a/extras/libdvdcss/videolan/dvdcss.h +++ b/extras/libdvdcss/videolan/dvdcss.h @@ -2,7 +2,7 @@ * libdvdcss.h: DVD reading library, exported functions. ***************************************************************************** * Copyright (C) 1998-2001 VideoLAN - * $Id: dvdcss.h,v 1.4 2001/07/11 02:01:03 sam Exp $ + * $Id: dvdcss.h,v 1.5 2001/07/27 14:43:30 sam Exp $ * * Authors: Stéphane Borel * Samuel Hocevar @@ -45,7 +45,7 @@ typedef struct dvdcss_s* dvdcss_handle; extern dvdcss_handle dvdcss_open ( char *psz_target, int i_flags ); extern int dvdcss_close ( dvdcss_handle ); -extern int dvdcss_crack ( dvdcss_handle, +extern int dvdcss_title ( dvdcss_handle, int i_block ); extern int dvdcss_seek ( dvdcss_handle, int i_blocks ); diff --git a/vlc.spec b/vlc.spec index d12fc7027d..aadcbdec16 100644 --- a/vlc.spec +++ b/vlc.spec @@ -1,10 +1,10 @@ Name: vlc -Version: 0.2.80 +Version: 0.2.81 Release: 2 Copyright: GPL Url: http://www.videolan.org/ Group: X11/Applications/Graphics -Source0: http://www.videolan.org/packages/0.2.80/vlc-0.2.80.tar.gz +Source0: http://www.videolan.org/packages/0.2.81/vlc-0.2.81.tar.gz Prefix: /usr Packager: Samuel Hocevar @@ -13,6 +13,9 @@ Summary: VideoLAN Client. Summary(fr): Client VideoLAN. %changelog +* Fri, Jul 27 2001 Samuel Hocevar +New upstream release (0.2.81) + * Tue Jun 5 2001 Samuel Hocevar New upstream release (0.2.80) -- 2.39.2