Commit 460360a8 authored by Sam Hocevar's avatar Sam Hocevar

  * Added a dummy libdvdcss so that the DVD plugin can be used without
    libdvdcss. It will try to dlopen() libdvdcss at runtime, though,
    and will use the dummy functions only if it couldn't find a valid
    libdvdcss. This is probably only useful to package maintainers.

  * Tidied the snapshot-* Makefile rules.
  * Tidied the modules Makefiles.
  * Removed useless stuff in the debian/ directory.
  * Removed the "make all" kludge in the Makefile.opts rule. I hope this
    patch is harmless on all systems.
parent f82f7f25
......@@ -125,6 +125,7 @@ D: Bug fixes
N: Jon Lech Johansen
E: jon-vl@nanocrew.net
C: jlj
D: PS input fixes
D: Win32 DVD input port
D: QNX RTOS plug-in
......
......@@ -87,6 +87,13 @@ ifneq (,$(BUILTINS))
BUILTIN_OBJ := $(shell for i in $(BUILTINS) ; do echo " "$(PLUGINS_TARGETS)" " | sed -e 's@.*/\('$$i'\) .*@plugins/\1.a@' -e 's@^ .*@@' ; done)
endif
#
# Misc variables
#
VLC_QUICKVERSION := $(shell grep 'VLC_VERSION=' configure.in | cut -f2 -d=)
LIBDVDCSS_QUICKVERSION := $(shell grep 'LIBDVDCSS_VERSION=' configure.in | cut -f2 -d=)
# All symbols must be exported
export
......@@ -97,21 +104,37 @@ export
#
# Virtual targets
#
all: Makefile.opts vlc ${ALIASES} plugins vlc.app
all: Makefile.opts vlc ${ALIASES} vlc.app
Makefile.opts:
@echo "**** No configuration found, running ./configure..."
./configure
$(MAKE) all
exit
# Include Makefile.opts again in case we just generated it
ifneq (1,$(HAVE_MAKEFILE_OPTS))
-include Makefile.opts
endif
show:
@echo CC: $(CC)
@echo CFLAGS: $(CFLAGS)
@echo DCFLAGS: $(DCFLAGS)
@echo LCFLAGS: $(LCFLAGS)
@echo C_OBJ: $(C_OBJ)
@echo CPP_OBJ: $(CPP_OBJ)
@echo PLUGIN_OBJ: $(PLUGIN_OBJ)
@echo BUILTIN_OBJ: $(BUILTIN_OBJ)
#
# Cleaning rules
#
clean: libdvdcss-clean plugins-clean vlc-clean
rm -f src/*/*.o extras/*/*.o
rm -f lib/*.so lib/*.so.* lib/*.a
rm -f plugins/*.so plugins/*.so.* plugins/*.a
rm -f lib/*.so* lib/*.a
rm -f plugins/*.so plugins/*.a
libdvdcss-clean:
cd extras/libdvdcss && $(MAKE) clean
-cd extras/libdvdcss && $(MAKE) clean
plugins-clean:
for dir in $(PLUGINS_DIR) ; do \
......@@ -133,6 +156,9 @@ distclean: clean
rm -Rf .dep
rm -f .gdb_history
#
# Install/uninstall rules
#
install: libdvdcss-install vlc-install plugins-install
uninstall: libdvdcss-uninstall vlc-uninstall plugins-uninstall
......@@ -164,94 +190,98 @@ ifneq (,$(PLUGINS))
endif
plugins-uninstall:
ifneq (,$(PLUGINS))
rm -f $(DESTDIR)$(libdir)/videolan/vlc/*.so
endif
libdvdcss-install:
cd extras/libdvdcss && $(MAKE) install
-cd extras/libdvdcss && $(MAKE) install
libdvdcss-uninstall:
cd extras/libdvdcss && $(MAKE) uninstall
-cd extras/libdvdcss && $(MAKE) uninstall
show:
@echo CC: $(CC)
@echo CFLAGS: $(CFLAGS)
@echo DCFLAGS: $(DCFLAGS)
@echo LCFLAGS: $(LCFLAGS)
@echo C_OBJ: $(C_OBJ)
@echo CPP_OBJ: $(CPP_OBJ)
@echo objects: $(objects)
@echo cppobjects: $(cppobjects)
@echo PLUGIN_OBJ: $(PLUGIN_OBJ)
@echo BUILTIN_OBJ: $(BUILTIN_OBJ)
# ugliest of all, but I have no time to do it -- sam
snapshot: clean Makefile.opts
rm -Rf /tmp/vlc-${PROGRAM_VERSION}* /tmp/vlc-${PROGRAM_VERSION}nocss*
# copy archive in /tmp
#
# Package generation rules
#
snapshot-common: clean
rm -Rf /tmp/vlc
# Copy directory structure in /tmp
find -type d | grep -v CVS | grep -v '\.dep' | while read i ; \
do mkdir -p /tmp/vlc-${PROGRAM_VERSION}/$$i ; \
do mkdir -p /tmp/vlc/$$i ; \
done
find debian -mindepth 1 -maxdepth 1 -type d | \
while read i ; do rm -Rf /tmp/vlc-${PROGRAM_VERSION}/$$i ; done
# .c .h .in .cpp .glade
while read i ; do rm -Rf /tmp/vlc/$$i ; done
# Copy .c .h .in .cpp and .glade files
find include src plugins -type f -name '*.[chig]*' | while read i ; \
do cp $$i /tmp/vlc-${PROGRAM_VERSION}/$$i ; done
# Makefiles
find . plugins -type f -name Makefile | while read i ; \
do cp $$i /tmp/vlc-${PROGRAM_VERSION}/$$i ; done
# extra files
cp -a extras/* /tmp/vlc-${PROGRAM_VERSION}/extras
cp -a doc/* /tmp/vlc-${PROGRAM_VERSION}/doc
find /tmp/vlc-${PROGRAM_VERSION}/extras \
/tmp/vlc-${PROGRAM_VERSION}/doc \
-type d -name CVS | while read i ; \
do rm -Rf $$i ; \
done
# copy misc files
cp vlc.spec AUTHORS COPYING ChangeLog INSTALL INSTALL.libdvdcss \
INSTALL-win32.txt README TODO todo.pl \
Makefile.opts.in Makefile.dep Makefile.modules \
do cp $$i /tmp/vlc/$$i ; done
# Copy plugin Makefiles
find plugins -type f -name Makefile | while read i ; \
do cp $$i /tmp/vlc/$$i ; done
# Copy extra programs and documentation
cp -a extras/* /tmp/vlc/extras
cp -a doc/* /tmp/vlc/doc
find /tmp/vlc/extras /tmp/vlc/doc \
-type d -name CVS -o -type f -name '.*' | while read i ; \
do rm -Rf $$i ; done
# Copy misc files
cp vlc.spec AUTHORS COPYING TODO todo.pl ChangeLog README* INSTALL* \
Makefile Makefile.opts.in Makefile.dep Makefile.modules \
configure configure.in install-sh config.sub config.guess \
/tmp/vlc-${PROGRAM_VERSION}/
for file in control control-css vlc-gtk.menu vlc.copyright vlc.docs \
changelog changelog-css rules rules-css vlc.dirs vlc.desktop \
gvlc.desktop gnome-vlc.desktop vlc.menu ; do \
cp debian/$$file /tmp/vlc-${PROGRAM_VERSION}/debian/ ; \
done
for file in default8x16.psf default8x9.psf vlc_beos.rsrc vlc.icns \
gvlc_win32.ico vlc_win32_rc.rc ; do \
cp share/$$file /tmp/vlc-${PROGRAM_VERSION}/share/ ; \
done
for icon in vlc gvlc qvlc gnome-vlc kvlc ; do \
cp share/$$icon.xpm share/$$icon.png \
/tmp/vlc-${PROGRAM_VERSION}/share/ ; done
# build css-enabled archives
(cd /tmp ; tar cf vlc-${PROGRAM_VERSION}.tar vlc-${PROGRAM_VERSION} ; \
bzip2 -f -9 < vlc-${PROGRAM_VERSION}.tar \
> vlc-${PROGRAM_VERSION}.tar.bz2 ; \
gzip -f -9 vlc-${PROGRAM_VERSION}.tar )
mv /tmp/vlc-${PROGRAM_VERSION}.tar.gz \
/tmp/vlc-${PROGRAM_VERSION}.tar.bz2 ..
# clean up
rm -Rf /tmp/vlc-${PROGRAM_VERSION}*
libdvdcss-snapshot: clean Makefile.opts
rm -Rf /tmp/libdvdcss-${LIBDVDCSS_VERSION}* \
/tmp/libdvdcss-${LIBDVDCSS_VERSION}nocss*
# copy archive in /tmp
find include extras doc lib -type d | grep -v CVS | grep -v '\.dep' | \
while read i ; do \
mkdir -p /tmp/libdvdcss-${LIBDVDCSS_VERSION}/$$i ; \
done
# .c .h .in .cpp .glade
find include extras -type f -name '*.[chig]*' | while read i ; \
do cp $$i /tmp/libdvdcss-${LIBDVDCSS_VERSION}/$$i ; done
# Makefiles
/tmp/vlc/
# Copy Debian control files
for file in debian/*dirs debian/*menu debian/*desktop ; do \
cp $$file /tmp/vlc/debian ; done
for file in control changelog rules vlc.copyright vlc.docs ; do \
cp debian/$$file /tmp/vlc/debian/ ; done
# Copy fonts and icons
for file in share/*png share/*xpm share/*psf ; do \
cp $$file /tmp/vlc/share ; done
for file in vlc_beos.rsrc vlc.icns gvlc_win32.ico vlc_win32_rc.rc ; do \
cp share/$$file /tmp/vlc/share/ ; done
snapshot: snapshot-common
# Build archives and clean up
F=vlc-${VLC_QUICKVERSION}; \
rm -Rf /tmp/$$F ; mv /tmp/vlc /tmp/$$F; \
(cd /tmp ; tar cf $$F.tar $$F ; bzip2 -f -9 < $$F.tar > $$F.tar.bz2; \
gzip -f -9 $$F.tar ); mv /tmp/$$F.tar.gz /tmp/$$F.tar.bz2 ..; \
rm -Rf /tmp/$$F
snapshot-nocss: snapshot-common
# Remove libdvdcss
rm -Rf /tmp/vlc/extras/libdvdcss
rm -f /tmp/vlc/*.libdvdcss
# Fix debian information
rm -f /tmp/vlc/debian/libdvdcss*
rm -f /tmp/vlc/debian/control
sed -e 's#^ DVDs# unencrypted DVDs#' < debian/control \
| awk '{if(gsub("Package: libdvdcss",$$0))a=1;if(a==0)print $$0;if(a==1&&$$0=="")a=0}' \
> /tmp/vlc/debian/control
rm -f /tmp/vlc/debian/rules
sed -e 's#^\(export LIBDVDCSS_FLAGS=\).*#\1"--without-dvdcss"#' < debian/rules \
| awk '{if($$0=="# libdvdcss start")a=1;if(a==0)print $$0;if($$0=="# libdvdcss stop")a=0}' \
> /tmp/vlc/debian/rules
chmod +x /tmp/vlc/debian/rules
# Build css-disabled archives and clean up
F=vlc-${VLC_QUICKVERSION}; G=vlc-${VLC_QUICKVERSION}-nocss; \
rm -Rf /tmp/$$F ; mv /tmp/vlc /tmp/$$F; \
(cd /tmp ; tar cf $$G.tar $$F ; bzip2 -f -9 < $$G.tar > $$G.tar.bz2; \
gzip -f -9 $$G.tar ); mv /tmp/$$G.tar.gz /tmp/$$G.tar.bz2 ..; \
rm -Rf /tmp/$$F
libdvdcss-snapshot: snapshot-common
# Remove vlc sources and icons, doc, debian directory...
rm -Rf /tmp/vlc/src /tmp/vlc/share /tmp/vlc/plugins /tmp/vlc/doc
rm -Rf /tmp/vlc/extras/GNUgetopt /tmp/vlc/extras/MacOSX_app
rm -Rf /tmp/vlc/debian
# Remove useless headers
rm -f /tmp/vlc/include/*
for file in defs.h.in config.h.in common.h int_types.h ; \
do cp include/$$file /tmp/vlc/include/ ; done
# Remove misc files (??? - maybe not really needed)
rm -f /tmp/vlc/vlc.spec /tmp/vlc/INSTALL-win32.txt
mv /tmp/vlc/INSTALL.libdvdcss /tmp/vlc/INSTALL
mv /tmp/vlc/README.libdvdcss /tmp/vlc/README
# Fix Makefile
rm -f /tmp/vlc/Makefile
sed -e 's#^install:#install-unused:#' \
-e 's#^uninstall:#uninstall-unused:#' \
-e 's#^clean:#clean-unused:#' \
......@@ -259,32 +289,22 @@ libdvdcss-snapshot: clean Makefile.opts
-e 's#^libdvdcss-install:#install:#' \
-e 's#^libdvdcss-uninstall:#uninstall:#' \
-e 's#^libdvdcss-clean:#clean:#' \
< Makefile > /tmp/libdvdcss-${LIBDVDCSS_VERSION}/Makefile
# extra files
cp -a extras/* /tmp/libdvdcss-${LIBDVDCSS_VERSION}/extras
cp -a doc/* /tmp/libdvdcss-${LIBDVDCSS_VERSION}/doc
find /tmp/libdvdcss-${LIBDVDCSS_VERSION}/extras \
/tmp/libdvdcss-${LIBDVDCSS_VERSION}/doc \
-type d -name CVS | while read i ; \
do rm -Rf $$i ; \
done
# copy misc files
cp AUTHORS COPYING ChangeLog INSTALL INSTALL.libdvdcss README \
TODO todo.pl Makefile.opts.in Makefile.dep Makefile.modules \
configure configure.in install-sh config.sub config.guess \
/tmp/libdvdcss-${LIBDVDCSS_VERSION}/
< Makefile > /tmp/vlc/Makefile
# Build archives and clean up
F=libdvdcss-${LIBDVDCSS_QUICKVERSION}; \
rm -Rf /tmp/$$F ; mv /tmp/vlc /tmp/$$F; \
(cd /tmp ; tar cf $$F.tar $$F ; bzip2 -f -9 < $$F.tar > $$F.tar.bz2; \
gzip -f -9 $$F.tar ); mv /tmp/$$F.tar.gz /tmp/$$F.tar.bz2 ..; \
rm -Rf /tmp/$$F
# build css-enabled archives
(cd /tmp ; tar cf libdvdcss-${LIBDVDCSS_VERSION}.tar \
libdvdcss-${LIBDVDCSS_VERSION} ; \
bzip2 -f -9 < libdvdcss-${LIBDVDCSS_VERSION}.tar \
> libdvdcss-${LIBDVDCSS_VERSION}.tar.bz2 ; \
gzip -f -9 libdvdcss-${LIBDVDCSS_VERSION}.tar )
mv /tmp/libdvdcss-${LIBDVDCSS_VERSION}.tar.gz \
/tmp/libdvdcss-${LIBDVDCSS_VERSION}.tar.bz2 ..
deb:
dpkg-buildpackage -rfakeroot -us -uc
# clean up
rm -Rf /tmp/libdvdcss-${LIBDVDCSS_VERSION}*
#
# Gtk/Gnome/* aliases and OS X application
#
gnome-vlc gvlc kvlc qvlc: vlc
rm -f $@ && ln -s vlc $@
.PHONY: vlc.app
vlc.app: Makefile.opts
......@@ -305,13 +325,6 @@ endif
FORCE:
#
# GTK/Gnome aliases - don't add too many aliases which could bloat
# the namespace
#
gnome-vlc gvlc kvlc qvlc: vlc
rm -f $@ && ln -s vlc $@
#
# Generic rules (see below)
#
......@@ -329,16 +342,14 @@ ifneq (,$(BUILTINS))
echo "int module_"$$i"_ActivateModule( module_t* );" >> $@ ; \
echo "int module_"$$i"_DeactivateModule( module_t* );" >> $@ ; \
done
endif
ifneq (,$(BUILTINS))
echo "" >> $@ ;
printf "#define ALLOCATE_ALL_BUILTINS() do { " >> $@ ;
for i in $(BUILTINS) ; do \
printf "ALLOCATE_BUILTIN("$$i"); " >> $@ ; \
done
echo "} while( 0 );" >> $@ ;
endif
echo "" >> $@ ;
endif
$(C_OBJ): %.o: Makefile.opts Makefile.dep Makefile
$(C_OBJ): %.o: .dep/%.d
......@@ -359,7 +370,7 @@ endif
#
# Main application target
#
vlc: Makefile.opts Makefile.dep Makefile $(H_OBJ) $(C_OBJ) $(CPP_OBJ) $(BUILTIN_OBJ) $(RESOURCE_OBJ)
vlc: Makefile.opts Makefile.dep Makefile $(H_OBJ) $(C_OBJ) $(CPP_OBJ) $(BUILTIN_OBJ) $(RESOURCE_OBJ) plugins
$(CC) $(CFLAGS) -o $@ $(C_OBJ) $(CPP_OBJ) $(BUILTIN_OBJ) $(RESOURCE_OBJ) $(LCFLAGS)
ifeq ($(SYS),beos)
xres -o $@ ./share/vlc_beos.rsrc
......@@ -371,14 +382,14 @@ endif
#
plugins: Makefile.modules Makefile.opts Makefile.dep Makefile $(PLUGIN_OBJ)
$(PLUGIN_OBJ): FORCE
cd $(shell echo " "$(PLUGINS_TARGETS)" " | sed -e 's@.* \([^/]*/\)'$(@:plugins/%.so=%)' .*@plugins/\1@' -e 's@^ .*@@') && $(MAKE) $(@:%=../../%)
cd $(shell echo " "$(PLUGINS_TARGETS)" " | sed -e 's@.* \([^/]*/\)'$(@:plugins/%.so=%)' .*@plugins/\1@' -e 's@^ .*@@') && $(MAKE) $(@:plugins/%=../%)
#
# Built-in modules target
#
builtins: Makefile.modules Makefile.opts Makefile.dep Makefile $(BUILTIN_OBJ)
$(BUILTIN_OBJ): FORCE
cd $(shell echo " "$(PLUGINS_TARGETS)" " | sed -e 's@.* \([^/]*/\)'$(@:plugins/%.a=%)' .*@plugins/\1@' -e 's@^ .*@@') && $(MAKE) $(@:%=../../%)
cd $(shell echo " "$(PLUGINS_TARGETS)" " | sed -e 's@.* \([^/]*/\)'$(@:plugins/%.a=%)' .*@plugins/\1@' -e 's@^ .*@@') && $(MAKE) $(@:plugins/%=../%)
#
# libdvdcss target
......
......@@ -3,6 +3,8 @@
# (c)1998 VideoLAN
###############################################################################
HAVE_MAKEFILE_OPTS = 1
###############################################################################
# Configuration
###############################################################################
......@@ -96,6 +98,7 @@ CFLAGS_X11 = @CFLAGS_X11@
#
# Other special cases
#
OBJ_DVD = @OBJ_DVD@
LOCAL_LIBDVDCSS = @LOCAL_LIBDVDCSS@
###############################################################################
......
README for libdvdcss, a portable abstraction library for DVD decryption
Introduction
============
libdvdcss is part of the VideoLAN project, a full MPEG2 client/server
solution. The VideoLAN Client can also be used as a standalone program
to play MPEG2 streams from a hard disk or a DVD.
Building, Installing and Running libdvdcss
==========================================
See the INSTALL or INSTALL.libdvdcss file for this.
Troubleshooting
===============
A mailing-list has been set up for support and discussion about vlc and
libdvdcss. Its address is :
<vlc@videolan.org>
To subscribe, send a mail to <listar@videolan.org> with the following
words in the mail body :
subscribe vlc
To unsubscribe, do the same with the words :
unsubscribe vlc
When reporting bugs, try to be as precise as possible (which OS, which
distribution, what plugins you were trying, and so on).
Resources
=========
The VideoLAN web site at http://www.videolan.org/ is a good start for
information about MPEG and DVD playing. Have a look at the documentation
section, as well as the bookmarks.
This diff is collapsed.
dnl Autoconf settings for vlc and libdvdcss
AC_INIT(include/main.h)
AC_INIT(include/common.h)
AC_CONFIG_HEADER(include/defs.h)
AC_CANONICAL_HOST
VLC_VERSION=0.2.81
AC_SUBST(VLC_VERSION)
LIBDVDCSS_VERSION=0.0.2
AC_SUBST(LIBDVDCSS_VERSION)
VLC_CODENAME=Ourumov
AC_SUBST(VLC_CODENAME)
HAVE_VLC=0
if test -r src/interface/main.c; then
HAVE_VLC=1
VLC_VERSION=0.2.81
AC_SUBST(VLC_VERSION)
VLC_CODENAME=Ourumov
AC_SUBST(VLC_CODENAME)
fi
HAVE_LIBDVDCSS=0
if test -r extras/libdvdcss/libdvdcss.c; then
HAVE_LIBDVDCSS=1
LIBDVDCSS_VERSION=0.0.2
AC_SUBST(LIBDVDCSS_VERSION)
fi
dnl Save CFLAGS
save_CFLAGS="${CFLAGS}"
......@@ -109,7 +118,7 @@ void foo() { int meuh; ntohl(meuh); }],,
AC_MSG_RESULT(yes), AC_MSG_RESULT(no))
dnl Check for inline function size limit
CFLAGS="${save_CFLAGS} -finline-limit=12"
CFLAGS="${save_CFLAGS} -finline-limit=31337"
AC_MSG_CHECKING([if \$CC accepts -finline-limit])
AC_TRY_COMPILE([],,
save_CFLAGS="${save_CFLAGS} -finline-limit=31337"; AC_MSG_RESULT(yes),
......@@ -177,14 +186,17 @@ dnl
dnl libdvdcss: check for DVD ioctls
dnl
dnl default is no
CAN_BUILD_LIBDVDCSS=0
dnl for windoze
AC_CHECK_HEADERS(winioctl.h,[
CAN_BUILD_LIBDVDCSS=1
CAN_BUILD_LIBDVDCSS="${HAVE_LIBDVDCSS}"
])
dnl for Un*x
dnl for Un*x and BeOS
AC_CHECK_HEADERS(sys/ioctl.h,[
CAN_BUILD_LIBDVDCSS=1
CAN_BUILD_LIBDVDCSS="${HAVE_LIBDVDCSS}"
AC_CHECK_HEADERS(sys/cdio.h sys/dvdio.h linux/cdrom.h)
BSD_DVD_STRUCT=0
dnl
......@@ -216,6 +228,7 @@ AC_CHECK_HEADERS(sys/ioctl.h,[
])
])
dnl
dnl Check the operating system
dnl
......@@ -318,8 +331,9 @@ dnl DVD module: check for installed libdvdcss or local libdvdcss
dnl
LOCAL_LIBDVDCSS=0
STATIC_LIBDVDCSS=0
DUMMY_LIBDVDCSS=0
AC_ARG_WITH(dvdcss,
[ --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)],
[ --with-dvdcss[=name] way to use libdvdcss, either 'yes' or 'no', or '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
......@@ -344,6 +358,15 @@ AC_ARG_WITH(dvdcss,
LIB_DVD_PLUGIN="${LIB_DVD_PLUGIN} -L../../lib -ldvdcss"
fi
;;
xno)
# don't use libdvdcss at all, build a DVD module that can dlopen() it
DUMMY_LIBDVDCSS=1
BUILTINS="${BUILTINS} dvd"
OBJ_DVD="${OBJ_DVD} dummy_dvdcss.o"
CFLAGS_DVD="${CFLAGS_DVD} -DGOD_DAMN_DMCA"
LIB_DVD="${LIB_DVD} -ldl"
LIB_DVD_PLUGIN="${LIB_DVD_PLUGIN} -ldl"
;;
*)
# existing libdvdcss
BUILTINS="${BUILTINS} dvd"
......@@ -356,6 +379,7 @@ AC_ARG_WITH(dvdcss,
LIB_DVD_PLUGIN="${LIB_DVD_PLUGIN} -ldvdcss"
esac ],
# user didn't decide, we choose to use local libdvdcss and link statically
# if libdvdcss is in the archive, or to use the dummy replacement otherwise.
[ if test x${CAN_BUILD_LIBDVDCSS} = x1
then
LOCAL_LIBDVDCSS=1
......@@ -364,25 +388,16 @@ AC_ARG_WITH(dvdcss,
CFLAGS_DVD="${CFLAGS_DVD} -I../../extras/libdvdcss"
LIB_DVD="${LIB_DVD} lib/libdvdcss.a"
LIB_DVD_PLUGIN="${LIB_DVD_PLUGIN} ../../lib/libdvdcss.a"
else
# XXX: no check for libdl is done, don't try this at home !
DUMMY_LIBDVDCSS=1
BUILTINS="${BUILTINS} dvd"
OBJ_DVD="${OBJ_DVD} dummy_dvdcss.o"
CFLAGS_DVD="${CFLAGS_DVD} -DGOD_DAMN_DMCA"
LIB_DVD="${LIB_DVD} -ldl"
LIB_DVD_PLUGIN="${LIB_DVD_PLUGIN} -ldl"
fi ])
dnl
dnl CSS DVD decryption (for libdvdcss)
dnl
CSS=0
AC_ARG_ENABLE(css,
[ --disable-css Disable DVD CSS decryption (default enabled)],
[ if test x$enableval = xyes
then
CSS=1
fi ],
[ CSS=1; ])
if test x${CSS} = x1
then
AC_DEFINE(HAVE_CSS, 1, Define if you want DVD CSS decryption.)
fi
dnl
dnl dummy plugin
dnl
......@@ -502,7 +517,10 @@ dnl Linux framebuffer module
dnl
AC_ARG_ENABLE(fb,
[ --enable-fb Linux framebuffer support (default disabled)],
[if test x$enable_fb = xyes; then PLUGINS="${PLUGINS} fb"; fi])
[ if test x$enable_fb = xyes
then
PLUGINS="${PLUGINS} fb"
fi ])
dnl
dnl GGI module
......@@ -767,7 +785,6 @@ AC_SUBST(TRACE)
AC_SUBST(PROFILING)
AC_SUBST(OPTIMS)
AC_SUBST(GETOPT)
AC_SUBST(CSS)
AC_SUBST(MOC)
AC_SUBST(WINDRES)
......@@ -804,6 +821,8 @@ AC_SUBST(CFLAGS_GTK)
AC_SUBST(CFLAGS_SDL)
AC_SUBST(CFLAGS_X11)
AC_SUBST(OBJ_DVD)
AC_SUBST(LOCAL_LIBDVDCSS)
AC_OUTPUT([Makefile.opts include/config.h])
......@@ -813,8 +832,11 @@ global configuration
--------------------
system : ${SYS}
architecture : ${ARCH}
optimizations : ${OPTIMS}
optimizations : ${OPTIMS}"
if test x${HAVE_VLC} = x1
then
echo "
vlc configuration
-----------------
vlc version : ${VLC_VERSION}
......@@ -825,20 +847,32 @@ profiling : ${PROFILING}
need builtin getopt : ${GETOPT}
built-in modules :${BUILTINS}
plugin modules :${PLUGINS}
vlc aliases :${ALIASES}
vlc aliases :${ALIASES}"
fi
echo "
libdvdcss configuration
-----------------------
need to be built : ${LOCAL_LIBDVDCSS}"
can be built : ${CAN_BUILD_LIBDVDCSS}
will be built : ${LOCAL_LIBDVDCSS}"
if test x${LOCAL_LIBDVDCSS} = x1
then
echo "link statically : ${STATIC_LIBDVDCSS}
CSS decryption : ${CSS}"
echo "link statically : ${STATIC_LIBDVDCSS}"
else
echo "use dummy replacement : ${DUMMY_LIBDVDCSS}"
fi
echo "
You may now tune Makefile.opts at your convenience. To build vlc and its
plugins, type \`make vlc plugins'. If you want to build libdvdcss only,
type \`make libdvdcss'."
You may now tune Makefile.opts at your convenience, for instance to choose
which modules get compiled as plugins.
"
if test x${HAVE_VLC} = x1
then
echo "To build vlc and its plugins, type \`make vlc'."
fi
if test x${HAVE_LIBDVDCSS} = x1
then
echo "To build libdvdcss only, type \`make libdvdcss'."
fi
echo ""
vlc-css (0.2.81-1) unstable; urgency=low
* New upstream release.
-- Samuel Hocevar <sam@zoy.org> Sat, 28 Jul 2001 04:13:57 +0200
vlc-css (0.2.80-1) unstable; urgency=low
* New upstream release.
-- Samuel Hocevar <sam@zoy.org> Tue, 5 Jun 2001 04:41:06 +0200
vlc-css (0.2.73-2) unstable; urgency=low
* We now build without MMX in the main application (Closes: #96036).
-- Samuel Hocevar <sam@zoy.org> Fri, 4 May 2001 07:13:04 +0200
vlc-css (0.2.73-1) unstable; urgency=low
* New upstream release.
-- Samuel Hocevar <sam@zoy.org> Sat, 28 Apr 2001 07:02:35 +0200
vlc-css (0.2.72-1) unstable; urgency=low
* New upstream release.
-- Samuel Hocevar <sam@zoy.org> Mon, 16 Apr 2001 14:33:53 +0200
vlc-css (0.2.71-1) unstable; urgency=low
* New upstream release.
-- Samuel Hocevar <sam@zoy.org> Fri, 13 Apr 2001 08:13:26 +0200
vlc-css (0.2.70-1) unstable; urgency=low
* New upstream release.
-- Samuel Hocevar <sam@zoy.org> Sat, 7 Apr 2001 05:52:00 +0200
vlc-css (0.2.63-3) unstable; urgency=low
* New vlc package.
-- Samuel Hocevar <sam@zoy.org> Wed, 7 Mar 2001 20:47:48 +0100
vlc-css (0.2.63-2) unstable; urgency=low
* Fixed versioned dependencies against vlc.
-- Samuel Hocevar <sam@zoy.org> Mon, 5 Mar 2001 21:37:19 +0100
vlc-css (0.2.63-1) unstable; urgency=low
* New upstream release.
-- Samuel Hocevar <sam@zoy.org> Mon, 5 Mar 2001 00:41:16 +0100
vlc-css (0.2.62-2) unstable; urgency=low
* Removed a few lintian warnings.
-- Samuel Hocevar <sam@zoy.org> Sat, 3 Mar 2001 10:29:31 +0100
vlc-css (0.2.62-1) unstable; urgency=low
* Initial Release.
-- Samuel Hocevar <sam@zoy.org> Fri, 2 Mar 2001 17:58:26 +0100
Local variables:
mode: debian-changelog
End:
......@@ -2,7 +2,7 @@ Source: vlc
Section: graphics
Priority: optional
Maintainer: Samuel Hocevar <sam@zoy.org>
Build-Depends: debhelper (>=2.2.0), xlibs-dev, libgnome-dev, libggi2-dev, libglide3-dev [i386], libesd0-dev, libsdl1.2-dev, libqt-dev, libasound1-dev
Build-Depends: debhelper (>=2.2.0), xlibs-dev, libgnome-dev, libggi2-dev, libglide3-dev [i386], libesd0-dev, libsdl1.2-dev, libqt-dev, libasound2-dev
Standards-Version: 3.0.1
Package: vlc
......@@ -12,9 +12,28 @@ Suggests: vlc-sdl, vlc-esd, vlc-gnome
Description: a free MPEG and DVD player
VideoLAN is a free MPEG, MPEG2 and DVD software solution.
.
This is vlc, the VideoLAN Client. It plays MPEG and MPEG2 files, unencrypted
This is vlc, the VideoLAN Client. It plays MPEG and MPEG2 files,
DVDs, or MPEG streams from a network source.
Package: libdvdcss0.0.2
Architecture: any
Depends: ${shlibs:Depends}
Description: a portable abstraction library for DVD decryption
libdvdcss is a portable abstraction library for DVD decryption, it
provides a simple API to access a DVD device as a block device.
.
This package contains the libdvdcss0 runtime library.
Package: libdvdcss0.0.2-dev
Architecture: any
Depends: libdvdcss0.0.2 (= ${Source-Version}), libc6-dev
Description: development files for libdvdcss0
libdvdcss is a portable abstraction library for DVD decryption, it
provides a simple API to access a DVD device as a block device.
.
This package contains the header files and static library needed to
compile applications that use libdvdcss0.
Package: vlc-gnome
Architecture: any