ref: 0d817799e4288afb6a7f9fe02f6c0aaca4175a79
parent: 6288be6892eea448b8d239e06bdff779f95cfe87
author: Sam Hocevar <[email protected]>
date: Wed Apr 3 16:31:52 EST 2002
* ./ChangeLog: everything should be ready for the 1.1.0 release. * ./libdvdcss.spec: updated specfile for RPM generation. * ./missing: commited libtool's latest version of this file.
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,14 @@
HEAD
+ * Nothing yet.
+
+1.1.0
+Wed, 3 Apr 2002 18:26:23 +0200
+
+ * ./libdvdcss.spec: updated specfile for RPM generation.
+ * ./missing: commited libtool's latest version of this file.
+ * ./configure.in: fixed a Darwin define problem.
* ./src/dvdcss/dvdcss.h: moved dvdcss.h in a subdirectory so that we can
include <dvdcss/dvdcss.h> without having to make install.
* ./test/test.c: removed #ifdef DVDCSS_DIST.
--- a/configure
+++ b/configure
@@ -6055,6 +6055,44 @@
echo "$ac_t""no" 1>&6
fi
+ ac_safe=`echo "IOKit/storage/IODVDMediaBSDClient.h" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for IOKit/storage/IODVDMediaBSDClient.h""... $ac_c" 1>&6
+echo "configure:6061: checking for IOKit/storage/IODVDMediaBSDClient.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
+#line 6066 "configure"
+#include "confdefs.h"
+#include <IOKit/storage/IODVDMediaBSDClient.h>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:6071: \"$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*
+ eval "ac_cv_header_$ac_safe=yes"
+else
+ echo "$ac_err" >&5
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ eval "ac_cv_header_$ac_safe=no"
+fi
+rm -f conftest*
+fi
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+
+ cat >> confdefs.h <<\EOF
+#define DARWIN_DVD_IOCTL 1
+EOF
+
+
+else
+ echo "$ac_t""no" 1>&6
+fi
+
if test x$LINUX_DVD_STRUCT = x1; then
cat >> confdefs.h <<\EOF
#define HAVE_LINUX_DVD_STRUCT 1
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,5 +2,5 @@
* First release outside the vlc tree.
- -- Samuel Hocevar <[email protected]> Wed, 3 Apr 2002 07:15:50 +0200
+ -- Samuel Hocevar <[email protected]> Wed, 3 Apr 2002 18:26:23 +0200
--- a/libdvdcss.spec
+++ b/libdvdcss.spec
@@ -1,6 +1,6 @@
# This is borrowed and adapted from Mandrake's Cooker
%define name libdvdcss
-%define version 2.0.0-dev
+%define version 1.1.0
%define release 1
%define major 2
%define lib_name %{name}%{major}@@ -10,7 +10,7 @@
Version: %{version} Release: %{release}-Source0: http://www.videolan.org/pub/videolan/libdvcss/%{version}/%{name}-%{version}.tar.bz2+Source0: http://www.videolan.org/pub/videolan/libdvcss/%{version}/%{name}-%{version}.tar.gzLicense: GPL
Group: System/Libraries
URL: http://videolan.org/
@@ -19,8 +19,9 @@
%description
libdvdcss is a simple library designed for accessing DVDs like a block device
without having to bother about the decryption. The important features are:
- * Portability. Currently supported platforms are GNU/Linux, FreeBSD, BeOS
- and Windows. The MacOS X version is being worked on as well.
+ * Portability. Currently supported platforms are GNU/Linux, FreeBSD, NetBSD,
+ OpenBSD, BSD/OS, BeOS, Windows 95/98, Windows NT/2000, MacOS X, Solaris,
+ and HP-UX.
* Simplicity. There are currently 7 functions in the API, and we intend to
keep this number low.
* Freedom. libdvdcss is released under the General Public License, ensuring
@@ -36,8 +37,9 @@
%description -n %{lib_name}libdvdcss is a simple library designed for accessing DVDs like a block device
without having to bother about the decryption. The important features are:
- * Portability. Currently supported platforms are GNU/Linux, FreeBSD, BeOS
- and Windows. The MacOS X version is being worked on as well.
+ * Portability. Currently supported platforms are GNU/Linux, FreeBSD, NetBSD,
+ OpenBSD, BSD/OS, BeOS, Windows 95/98, Windows NT/2000, MacOS X, Solaris,
+ and HP-UX.
* Simplicity. There are currently 7 functions in the API, and we intend to
keep this number low.
* Freedom. libdvdcss is released under the General Public License, ensuring
@@ -66,7 +68,7 @@
%build
%configure
-make libdvdcss
+make
%install
%makeinstall
@@ -91,6 +93,10 @@
%{_includedir}/*%changelog
+* Wed Apr 03 2002 Samuel Hocevar <[email protected]>
+- version 1.1.0
+- first release outside the vlc tree
+
* Tue Oct 02 2001 Christophe Massiot <[email protected]>
- Imported Mandrake's vlc.spec into the CVS
--- a/missing
+++ b/missing
@@ -1,7 +1,7 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-# Copyright (C) 1996, 1997 Free Software Foundation, Inc.
-# Franc,ois Pinard <[email protected]>, 1996.
+# Copyright 1996, 1997, 1999, 2000 Free Software Foundation, Inc.
+# Originally by Fran,cois Pinard <[email protected]>, 1996.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -18,13 +18,39 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
# 02111-1307, USA.
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
if test $# -eq 0; then
echo 1>&2 "Try \`$0 --help' for more information"
exit 1
fi
+run=:
+
+# In the cases where this matters, `missing' is being run in the
+# srcdir already.
+if test -f configure.ac; then
+ configure_ac=configure.ac
+else
+ configure_ac=configure.in
+fi
+
case "$1" in
+--run)
+ # Try to run requested program, and just exit if it succeeds.
+ run=
+ shift
+ "$@" && exit 0
+ ;;
+esac
+# If it does not exist, or fails to run (possibly an outdated version),
+# try to emulate it.
+case "$1" in
+
-h|--h|--he|--hel|--help)
echo "\
$0 [OPTION]... PROGRAM [ARGUMENT]...
@@ -35,6 +61,7 @@
Options:
-h, --help display this help and exit
-v, --version output version information and exit
+ --run try to run the given command, and emulate it if it fails
Supported PROGRAM values:
aclocal touch file \`aclocal.m4'
@@ -43,13 +70,15 @@
automake touch all \`Makefile.in' files
bison create \`y.tab.[ch]', if possible, from existing .[ch]
flex create \`lex.yy.c', if possible, from existing .c
+ help2man touch the output file
lex create \`lex.yy.c', if possible, from existing .c
makeinfo touch the output file
+ tar try tar, gnutar, gtar, then tar without non-portable flags
yacc create \`y.tab.[ch]', if possible, from existing .[ch]"
;;
-v|--v|--ve|--ver|--vers|--versi|--versio|--version)
- echo "missing - GNU libit 0.0"
+ echo "missing 0.3 - GNU automake"
;;
-*)
@@ -61,7 +90,7 @@
aclocal)
echo 1>&2 "\
WARNING: \`$1' is missing on your system. You should only need it if
- you modified \`acinclude.m4' or \`configure.in'. You might want
+ you modified \`acinclude.m4' or \`${configure_ac}'. You might wantto install the \`Automake' and \`Perl' packages. Grab them from
any GNU archive site."
touch aclocal.m4
@@ -70,7 +99,7 @@
autoconf)
echo 1>&2 "\
WARNING: \`$1' is missing on your system. You should only need it if
- you modified \`configure.in'. You might want to install the
+ you modified \`${configure_ac}'. You might want to install the\`Autoconf' and \`GNU m4' packages. Grab them from any GNU
archive site."
touch configure
@@ -79,10 +108,10 @@
autoheader)
echo 1>&2 "\
WARNING: \`$1' is missing on your system. You should only need it if
- you modified \`acconfig.h' or \`configure.in'. You might want
+ you modified \`acconfig.h' or \`${configure_ac}'. You might wantto install the \`Autoconf' and \`GNU m4' packages. Grab them
from any GNU archive site."
- files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' configure.in`
+ files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}`test -z "$files" && files="config.h"
touch_files=
for f in $files; do
@@ -98,7 +127,7 @@
automake)
echo 1>&2 "\
WARNING: \`$1' is missing on your system. You should only need it if
- you modified \`Makefile.am', \`acinclude.m4' or \`configure.in'.
+ you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.You might want to install the \`Automake' and \`Perl' packages.
Grab them from any GNU archive site."
find . -type f -name Makefile.am -print |
@@ -159,7 +188,32 @@
fi
;;
+ help2man)
+ echo 1>&2 "\
+WARNING: \`$1' is missing on your system. You should only need it if
+ you modified a dependency of a manual page. You may need the
+ \`Help2man' package in order for those modifications to take
+ effect. You can get \`Help2man' from any GNU archive site."
+
+ file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+ if test -z "$file"; then
+ file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
+ fi
+ if [ -f "$file" ]; then
+ touch $file
+ else
+ test -z "$file" || exec >$file
+ echo ".ab help2man is required to generate this page"
+ exit 1
+ fi
+ ;;
+
makeinfo)
+ if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then
+ # We have makeinfo, but it failed.
+ exit 1
+ fi
+
echo 1>&2 "\
WARNING: \`$1' is missing on your system. You should only need it if
you modified a \`.texi' or \`.texinfo' file, or any other file
@@ -173,6 +227,45 @@
file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file`fi
touch $file
+ ;;
+
+ tar)
+ shift
+ if test -n "$run"; then
+ echo 1>&2 "ERROR: \`tar' requires --run"
+ exit 1
+ fi
+
+ # We have already tried tar in the generic part.
+ # Look for gnutar/gtar before invocation to avoid ugly error
+ # messages.
+ if (gnutar --version > /dev/null 2>&1); then
+ gnutar ${1+"$@"} && exit 0+ fi
+ if (gtar --version > /dev/null 2>&1); then
+ gtar ${1+"$@"} && exit 0+ fi
+ firstarg="$1"
+ if shift; then
+ case "$firstarg" in
+ *o*)
+ firstarg=`echo "$firstarg" | sed s/o//`
+ tar "$firstarg" ${1+"$@"} && exit 0+ ;;
+ esac
+ case "$firstarg" in
+ *h*)
+ firstarg=`echo "$firstarg" | sed s/h//`
+ tar "$firstarg" ${1+"$@"} && exit 0+ ;;
+ esac
+ fi
+
+ echo 1>&2 "\
+WARNING: I can't seem to be able to run \`tar' with the given arguments.
+ You may want to install GNU tar or Free paxutils, or check the
+ command line arguments."
+ exit 1
;;
*)