Changeset 4945d2bb3621b899aca49359c435d0dcfcc2ec1b

Timestamp:

27/07/01 16:43:30 (7 years ago)

Author:

Sam Hocevar <sam@videolan.org>

git-committer:

Sam Hocevar <sam@videolan.org> 996245010 +0000

git-parent:

[16c530705f597ed19608c7d8edf9d4c003cd5691]

git-author:

Sam Hocevar <sam@videolan.org> 996245010 +0000

Message:

• 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.
  

Files:

• ChangeLog (modified) (2 diffs)
• configure (modified) (22 diffs)
• configure.in (modified) (6 diffs)
• debian/changelog (modified) (1 diff)
• debian/changelog-css (modified) (1 diff)
• debian/control (modified) (2 diffs)
• debian/rules (modified) (4 diffs)
• extras/libdvdcss/videolan/dvdcss.h (modified) (2 diffs)
• vlc.spec (modified) (2 diffs)

ChangeLog

@@ -4 +4 @@
-
-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
@@ -11 +31 @@
-  * 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.

configure

@@ -31 +31 @@
-  --enable-pth            Enable GNU Pth support (default disabled)"
-ac_help="$ac_help
-use another libdvdcss (default is local one
+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)"
@@ -635 +635 @@
-
-
-0
-
-1
+1
+
+2
-
-VLC_CODENAME=Ourumov
@@ -3747 +3747 @@
-if test "${with_dvdcss+set}" = set; then
-  withval="$with_dvdcss"
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-      if test x${CAN_BUILD_LIBDVDCSS} = x1
-      then
@@ -3758 +3770 @@
-        LIB_DVD_PLUGIN="${LIB_DVD_PLUGIN} -L../../lib -ldvdcss"
-      fi
-
+
+
-      # existing libdvdcss
-      BUILTINS="${BUILTINS} dvd"
@@ -3768 +3781 @@
-      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
@@ -3871 +3884 @@
-set dummy esd-config; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-74
+87
-if eval "test \"`echo '$''{'ac_cv_path_ESD_CONFIG'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
@@ -3938 +3951 @@
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-41
+54
-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
-46
+59
-#include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-51
+64
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
@@ -3993 +4006 @@
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-3996
+4009
-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
-01
+14
-#include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-06
+19
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
@@ -4080 +4093 @@
-set dummy sdl-config; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-83
+96
-if eval "test \"`echo '$''{'ac_cv_path_SDL_CONFIG'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
@@ -4118 +4131 @@
-set dummy sdl11-config; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-21
+34
-if eval "test \"`echo '$''{'ac_cv_path_SDL_CONFIG'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
@@ -4157 +4170 @@
-set dummy sdl12-config; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-60
+73
-if eval "test \"`echo '$''{'ac_cv_path_SDL_CONFIG'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
@@ -4197 +4210 @@
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-00
+13
-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
-05
+18
-#include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-10
+23
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
@@ -4267 +4280 @@
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-70
+83
-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
-75
+88
-#include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-80
+93
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
@@ -4315 +4328 @@
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-18
+31
-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
-23
+36
-#include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-28
+41
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
@@ -4429 +4442 @@
-set dummy gtk-config; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-32
+45
-if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
@@ -4489 +4502 @@
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-492
+505
-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
-497
+510
-#include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-02
+15
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
@@ -4551 +4564 @@
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-54
+67
-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
-59
+72
-#include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-64
+77
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
@@ -4597 +4610 @@
-if test "${enable_alsa+set}" = set; then
-  enableval="$enable_alsa"
-
+
+
+
-echo $ac_n "checking for sys/asoundlib.h""... $ac_c" 1>&6
-02
+17
-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
-07
+22
-#include "confdefs.h"
-#include <sys/asoundlib.h>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-12
+27
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
@@ -4626 +4641 @@
-  echo "$ac_t""yes" 1>&6
-  echo $ac_n "checking for main in -lasound""... $ac_c" 1>&6
-29
+44
-ac_lib_var=`echo asound'_'main | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -4634 +4649 @@
-LIBS="-lasound  $LIBS"
-cat > conftest.$ac_ext <<EOF
-37
+52
-#include "confdefs.h"
-
@@ -4641 +4656 @@
-; return 0; }
-EOF
-44
+59
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
@@ -4666 +4681 @@
-have_alsa="false"
-fi
-
-
-
-
+
+
+
+
+
+
+
-fi
-

configure.in

@@ -1 @@
-
+ and libdvdcss
-AC_INIT(include/main.h)
-AC_CONFIG_HEADER(include/defs.h)
@@ -5 +5 @@
-AC_CANONICAL_HOST
-
-0
+1
-AC_SUBST(VLC_VERSION)
-1
+2
-AC_SUBST(LIBDVDCSS_VERSION)
-VLC_CODENAME=Ourumov
@@ -323 +323 @@
-STATIC_LIBDVDCSS=0
-AC_ARG_WITH(dvdcss,
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-      if test x${CAN_BUILD_LIBDVDCSS} = x1
-      then
@@ -335 +347 @@
-        LIB_DVD_PLUGIN="${LIB_DVD_PLUGIN} -L../../lib -ldvdcss"
-      fi
-
+
+
-      # existing libdvdcss
-      BUILTINS="${BUILTINS} dvd"
@@ -345 +358 @@
-      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
@@ -705 +718 @@
-AC_ARG_ENABLE(alsa,
-  [  --enable-alsa           Alsa sound drivers support (Only for linux) (default disabled)],
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-dnl  end of non-BeOS stuff

debian/changelog

@@ +1 @@
+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
-

debian/changelog-css

@@ +1 @@
+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
-

debian/control

@@ -3 +3 @@
-Priority: optional
-Maintainer: Samuel Hocevar <sam@zoy.org>
-6g-dev, libgnome-dev, libggi2-dev, libglide3-dev [i386], libesd0-dev, libsdl1.2-dev, libqt-dev, libasound2
+s-dev, libgnome-dev, libggi2-dev, libglide3-dev [i386], libesd0-dev, libsdl1.2-dev, libqt-dev, libasound1
-Standards-Version: 3.0.1
-
@@ -45 +45 @@
- 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

debian/rules

@@ -18 +18 @@
-        --infodir=\$${prefix}/share/info \
-        --enable-gnome --enable-gtk --enable-fb --with-glide \
---enable-alsa 
+
-        --enable-qt --disable-ppro ; \
-    else \
@@ -25 +25 @@
-        --infodir=\$${prefix}/share/info \
-        --enable-gnome --enable-gtk --enable-fb \
---enable-alsa 
+
-        --enable-qt ; \
-    fi
@@ -50 +50 @@
-    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
- alsa
+
-    if [ $(DEB_BUILD_ARCH) = i386 ]; then aliases=$$aliases" glide" ; fi ; \
-    for alias in `echo $$aliases` ; do \
@@ -124 +128 @@
-#   dh_installinit
-    #dh_installcron
-alsa -Nvlc-
+
-    #dh_installinfo
-#   dh_undocumented
-alsa -Nvlc-
+
-    dh_link
-    dh_strip

extras/libdvdcss/videolan/dvdcss.h

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 1998-2001 VideoLAN
-4 2001/07/11 02:01:03
+5 2001/07/27 14:43:30
- *
- * Authors: St�ane Borel <stef@via.ecp.fr>
@@ -46 +46 @@
-                                    int i_flags );
-extern int           dvdcss_close ( dvdcss_handle );
-crack
+title
-                                    int i_block );
-extern int           dvdcss_seek  ( dvdcss_handle,

vlc.spec

@@ -1 +1 @@
-Name: vlc
-0
+1
-Release: 2
-Copyright: GPL
-Url: http://www.videolan.org/
-Group: X11/Applications/Graphics
-0/vlc-0.2.80
+1/vlc-0.2.81
-Prefix: /usr
-Packager: Samuel Hocevar <sam@zoy.org>
@@ -14 +14 @@
-
-%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)