Commit dd5d92a4 authored by Sam Hocevar's avatar Sam Hocevar

  * ./Makefile.modules: modules now depend on Makefile.opts.
  * ./configure.in: added (hopefully) explicit messages on how to get
    libdvdcss and link vlc with it.
  * ./plugins/dvdread/input_dvdread.c: removed inclusion of dvd_udf.h.
parent 3fdc9959
......@@ -4,6 +4,10 @@
HEAD
* ./Makefile.modules: modules now depend on Makefile.opts.
* ./configure.in: added (hopefully) explicit messages on how to get
libdvdcss and link vlc with it.
* ./plugins/dvdread/input_dvdread.c: removed inclusion of dvd_udf.h.
* ./plugins/ogg/*: added preliminary files for an Ogg/Vorbis decoder a
contributor is currently working on.
* ALL: removed libdvdcss from the vlc tree.
......
......@@ -56,7 +56,7 @@ clean:
FORCE:
$(OBJ_ALL): ../../Makefile.modules ../../Makefile.dep ../../Makefile Makefile
$(OBJ_ALL): ../../Makefile.modules ../../Makefile.dep ../../Makefile ../../Makefile.opts Makefile
$(OBJ_ALL): $(H_DEP:%=../../include/%)
$(C_DEP): %.d: FORCE
......
This diff is collapsed.
......@@ -556,28 +556,59 @@ if test "x$enableval" != "xno"
then
AC_ARG_WITH(dvdcss,
[ --with-dvdcss=PATH libdvdcss headers and libraries])
AC_ARG_WITH(dvdcss-tree,
[ --with-dvdcss-tree=PATH libdvdcss tree for static linking])
case "x$with_dvdcss" in
x)
AC_CHECK_HEADERS(dvdcss/dvdcss.h,
[ PLUGINS="${PLUGINS} dvd"
LIB_DVD="${LIB_DVD} -ldvdcss" ])
if test "x$with_dvdcss_tree" = x
then
AC_CHECK_HEADERS(dvdcss/dvdcss.h,
[ PLUGINS="${PLUGINS} dvd"
LIB_DVD="${LIB_DVD} -ldvdcss" ],
[ AC_MSG_WARN([libdvdcss is no longer provided with vlc; please get libdvdcss from http://www.videolan.org/libdvdcss/ and build it. Then either use --with-dvdcss=<path/where/libdvdcss/was/installed> for dynamic linking (recommended under Unix) or --with-dvdcss-tree=<path/where/libdvdcss/was/built> for static linking (recommended under BeOS, Windows, MacOS X). Alternatively you can use --disable-dvd to disable the DVD plugin.])
AC_MSG_ERROR([cannot find libdvdcss headers]) ])
else
AC_MSG_CHECKING(for libdvdcss.a in ${with_dvdcss_tree})
real_dvdcss_tree="`cd ${with_dvdcss_tree} 2>/dev/null && pwd`"
if test "x$real_dvdcss_tree" = x
then
dnl The given directory can't be found
AC_MSG_RESULT(no)
AC_MSG_ERROR([cannot cd to ${with_dvdcss_tree}])
fi
if test -f "${real_dvdcss_tree}/src/.libs/libdvdcss.a"
then
dnl Use a custom libdvdcss
AC_MSG_RESULT(${real_dvdcss_tree}/src/.libs/libdvdcss.a)
BUILTINS="${BUILTINS} dvd"
LIB_DVD="${LIB_DVD} ${real_dvdcss_tree}/src/.libs/libdvdcss.a"
CFLAGS_DVD="${CFLAGS_DVD} -I${real_dvdcss_tree}/src"
else
dnl The given libdvdcss wasn't built
AC_MSG_RESULT(no)
AC_MSG_ERROR([cannot find ${real_dvdcss_tree}/src/.libs/libdvdcss.a, make sure you compiled libdvdcss in ${with_dvdcss_tree}])
fi
fi
;;
xno)
dnl Compile without dvdcss (dlopen version, works only under Linux)
PLUGINS="${PLUGINS} dvd"
CFLAGS_DVD="${CFLAGS_DVD} -DGOD_DAMN_DMCA"
LIB_DVD="${LIB_DVD} -ldl"
;;
*)
AC_MSG_CHECKING(for dvdcss headers in ${withval})
if test -f ${withval}/include/dvdcss/dvdcss.h
AC_MSG_CHECKING(for dvdcss headers in ${with_dvdcss})
if test -f ${with_dvdcss}/include/dvdcss/dvdcss.h
then
dnl Use ${with_dvdcss}/include/dvdcss/dvdcss.h
AC_MSG_RESULT(yes)
PLUGINS="${PLUGINS} dvd"
LIB_DVD="${LIB_DVD} -L${withval}/lib -ldvd"
CFLAGS_DVD="${CFLAGS_DVD} -I${withval}/include"
LIB_DVD="${LIB_DVD} -L${with_dvdcss}/lib -ldvd"
CFLAGS_DVD="${CFLAGS_DVD} -I${with_dvdcss}/include"
else
dnl No libdvdcss could be found, sorry
AC_MSG_RESULT(no)
AC_MSG_ERROR([Cannot find ${withval}/dvdcss/dvdcss.h])
AC_MSG_ERROR([cannot find ${with_dvdcss}/include/dvdcss/dvdcss.h])
fi
;;
esac
......@@ -717,7 +748,7 @@ dnl
dnl ogg vorbis plugin
dnl
AC_ARG_ENABLE(vorbis,
[ --enable-vorbis Ogg/Vorbis decoder support (default enabled)])
[ --enable-vorbis Ogg/Vorbis decoder support (default enabled)])
if test "x$enableval" != "xno"
then
AC_CHECK_HEADERS(ogg/ogg.h, [
......@@ -1103,7 +1134,7 @@ AC_ARG_ENABLE(gnome,
ALIASES="${ALIASES} gnome-vlc"
],[
AC_MSG_ERROR([Can't find gnome headers. Please install the gnome
developement librairie or remove the --enable-gnome option])
developement tools or remove the --enable-gnome option])
])
CPPFLAGS=$saved_CPPFLAGS
......
......@@ -2,7 +2,7 @@
* dvd.c : DVD input module for vlc
*****************************************************************************
* Copyright (C) 2000-2001 VideoLAN
* $Id: dvd.c,v 1.27 2002/04/03 06:23:07 sam Exp $
* $Id: dvd.c,v 1.28 2002/04/03 16:22:23 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
......@@ -68,17 +68,12 @@ MODULE_CONFIG_STOP
MODULE_INIT_START
ADD_CAPABILITY( DEMUX, 0 )
#ifndef WIN32
# ifdef GOD_DAMN_DMCA
#ifdef GOD_DAMN_DMCA
SET_DESCRIPTION( "DVD input module, uses libdvdcss if present" )
ADD_CAPABILITY( ACCESS, 90 )
# else
SET_DESCRIPTION( "DVD input module, linked with libdvdcss" )
ADD_CAPABILITY( ACCESS, 100 )
# endif
#else
SET_DESCRIPTION( "DVD input module" )
ADD_CAPABILITY( ACCESS, 0 )
SET_DESCRIPTION( "DVD input module, uses libdvdcss" )
ADD_CAPABILITY( ACCESS, 100 )
#endif
ADD_SHORTCUT( "dvd" )
MODULE_INIT_STOP
......
......@@ -6,7 +6,7 @@
* It depends on: libdvdread for ifo files and block reading.
*****************************************************************************
* Copyright (C) 2001 VideoLAN
* $Id: input_dvdread.c,v 1.34 2002/03/18 19:14:52 sam Exp $
* $Id: input_dvdread.c,v 1.35 2002/04/03 16:22:23 sam Exp $
*
* Author: Stphane Borel <stef@via.ecp.fr>
*
......@@ -61,6 +61,12 @@
# include "input_iovec.h"
#endif
#include <dvdread/dvd_reader.h>
#include <dvdread/ifo_types.h>
#include <dvdread/ifo_read.h>
#include <dvdread/nav_read.h>
#include <dvdread/nav_print.h>
#include "stream_control.h"
#include "input_ext-intf.h"
#include "input_ext-dec.h"
......
......@@ -2,7 +2,7 @@
* input_dvdread.h: thread structure of the DVD plugin
*****************************************************************************
* Copyright (C) 1999-2001 VideoLAN
* $Id: input_dvdread.h,v 1.7 2002/04/03 06:23:08 sam Exp $
* $Id: input_dvdread.h,v 1.8 2002/04/03 16:22:23 sam Exp $
*
* Author: Stphane Borel <stef@via.ecp.fr>
*
......@@ -25,14 +25,6 @@
* Preamble
*****************************************************************************/
/* dvdread includes */
#include <dvdread/dvd_reader.h>
#include <dvdread/ifo_types.h>
#include <dvdread/ifo_read.h>
#include <dvdread/dvd_udf.h>
#include <dvdread/nav_read.h>
#include <dvdread/nav_print.h>
/* Logical block size for DVD-VIDEO */
#define LB2OFF(x) ((off_t)(x) * (off_t)(DVD_VIDEO_LB_LEN))
#define OFF2LB(x) ((x) >> 11)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment