* 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

@@ -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 <mammon@lokmail.net>.
+  * 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.

configure.in

-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

debian/changelog

+vlc (0.2.81-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Samuel Hocevar <sam@zoy.org>  Fri, 27 Jul 2001 03:30:44 +0200
+
 vlc (0.2.80-1) unstable; urgency=low
 
   * New upstream release.

debian/changelog-css

+vlc-css (0.2.81-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Samuel Hocevar <sam@zoy.org>  Fri, 27 Jul 2001 03:30:44 +0200
+
 vlc-css (0.2.80-1) unstable; urgency=low
 
   * New upstream release.

debian/control

@@ -2,7 +2,7 @@ Source: vlc
 Section: graphics
 Priority: optional
 Maintainer: Samuel Hocevar <sam@zoy.org>
-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}

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

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: Stphane Borel <stef@via.ecp.fr>
  *          Samuel Hocevar <sam@zoy.org>
@@ -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 );

vlc.spec

 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 <sam@zoy.org>
 
@@ -13,6 +13,9 @@ Summary: VideoLAN Client.
 Summary(fr): Client VideoLAN.
 
 %changelog
+* Fri, Jul 27 2001 Samuel Hocevar <sam@zoy.org>
+New upstream release (0.2.81)
+
 * Tue Jun 5 2001 Samuel Hocevar <sam@zoy.org>
 New upstream release (0.2.80)