Skip to content

V
vlc-1.1
Commit 2816c900 authored by Sam Hocevar's avatar Sam Hocevar
Browse files
Options 

  * Disabled broken ALSA audio output. Closes Debian bugs #110869 and #119846.
  * Fixed build dependencies on libasound2-dev. Closes Debian bug #121057.
  * Changed configure.in so that libXv_pic is used instead of libXv.a when
    available. Closes Debian bug #111790.
parent a78ebd14
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 287 additions and 218 deletions
configure
View file @ 2816c900
This diff is collapsed.
configure.in
View file @ 2816c900
......@@ -904,6 +904,61 @@ AC_ARG_WITH(ggi,
fi
fi ])
dnl
dnl X11 module
dnl (enabled by default except on win32)
dnl
AC_ARG_ENABLE(x11,
[ --disable-x11 X11 support (default enabled)])
if test x$enable_x11 != xno &&
(test $SYS != mingw32 || test x$enable_x11 = xyes); then
if test x$x_includes = xNONE; then
x_includes=/usr/X11R6/include
fi
if test x$x_libraries = xNONE; then
x_libraries=/usr/X11R6/lib
fi
saved_CPPFLAGS=$CPPFLAGS
CPPFLAGS="$CPPFLAGS -I$x_includes"
AC_CHECK_HEADERS(X11/Xlib.h, [
PLUGINS="${PLUGINS} x11"
LIB_X11="-L$x_libraries -lX11 -lXext"
CFLAGS_X11="-I$x_includes"
]
CPPFLAGS=$saved_CPPFLAGS)
fi
dnl
dnl XVideo module
dnl (enabled by default except on win32)
dnl
AC_ARG_ENABLE(xvideo,
[ --disable-xvideo XVideo support (default enabled)])
if test x$enable_xvideo != xno &&
(test $SYS != mingw32 || test x$enable_xvideo = xyes); then
if test x$x_includes = xNONE; then
x_includes=/usr/X11R6/include
fi
if test x$x_libraries = xNONE; then
x_libraries=/usr/X11R6/lib
fi
saved_CPPFLAGS=$CPPFLAGS
CPPFLAGS="$CPPFLAGS -I$x_includes"
AC_CHECK_HEADERS(X11/extensions/Xv.h, [
saved_CFLAGS=$CFLAGS
CFLAGS="$CFLAGS -L$x_libraries -lX11 -lXext"
AC_CHECK_LIB(Xv_pic,XvSetPortAttribute,
PLUGINS="${PLUGINS} xvideo"
LIB_XVIDEO="-L$x_libraries -lX11 -lXext -lXv_pic"
XVIDEO_PIC="-L$x_libraries -lXxf86dga_pic -lXxf86vm_pic -lXv_pic",
BUILTINS="${BUILTINS} xvideo"
LIB_XVIDEO="-L$x_libraries -lX11 -lXext -lXv")
CFLAGS=$saved_CFLAGS
CFLAGS_XVIDEO="-I$x_includes"
]
CPPFLAGS=$saved_CPPFLAGS)
fi
dnl
dnl SDL module
dnl
......@@ -936,7 +991,18 @@ then
then
PLUGINS="${PLUGINS} sdl"
CFLAGS_SDL="`${SDL_CONFIG} --cflags`"
LIB_SDL="`${SDL_CONFIG} --libs | sed 's,-rdynamic,,'`"
SDL_VERSION="`${SDL_CONFIG} --version`"
if expr 1.2.2 \> $SDL_VERSION >/dev/null
then
LIB_SDL="`${SDL_CONFIG} --libs | sed 's,-rdynamic,,'`"
else
if test "x${XVIDEO_PIC}" != x
then
LIB_SDL="`${SDL_CONFIG} --library-libs` ${XVIDEO_PIC}"
else
LIB_SDL="`${SDL_CONFIG} --libs`"
fi
fi
save_CPPFLAGS=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $CFLAGS_SDL"
AC_CHECK_HEADERS(${SDL_HEADER}, AC_DEFINE_UNQUOTED(SDL_INCLUDE_FILE,
......@@ -946,7 +1012,7 @@ Please install it and try again. Alternatively you can also configure with
--disable-sdl.])
])
CPPFLAGS=$save_CPPFLAGS
if expr 1.1.5 \> `$SDL_CONFIG --version` >/dev/null
if expr 1.1.5 \> $SDL_VERSION >/dev/null
then
AC_MSG_ERROR([The development package for SDL is not installed.
Please install it and try again. Alternatively you can also configure with
......@@ -1116,54 +1182,6 @@ then
CPPFLAGS=$saved_CPPFLAGS
fi
dnl
dnl X11 module
dnl (enabled by default except on win32)
dnl
AC_ARG_ENABLE(x11,
[ --disable-x11 X11 support (default enabled)])
if test x$enable_x11 != xno &&
(test $SYS != mingw32 || test x$enable_x11 = xyes); then
if test x$x_includes = xNONE; then
x_includes=/usr/X11R6/include
fi
if test x$x_libraries = xNONE; then
x_libraries=/usr/X11R6/lib
fi
saved_CPPFLAGS=$CPPFLAGS
CPPFLAGS="$CPPFLAGS -I$x_includes"
AC_CHECK_HEADERS(X11/Xlib.h, [
PLUGINS="${PLUGINS} x11"
LIB_X11="-L$x_libraries -lX11 -lXext"
CFLAGS_X11="-I$x_includes"
]
CPPFLAGS=$saved_CPPFLAGS)
fi
dnl
dnl XVideo module
dnl (enabled by default except on win32)
dnl
AC_ARG_ENABLE(xvideo,
[ --disable-xvideo XVideo support (default enabled)])
if test x$enable_xvideo != xno &&
(test $SYS != mingw32 || test x$enable_xvideo = xyes); then
if test x$x_includes = xNONE; then
x_includes=/usr/X11R6/include
fi
if test x$x_libraries = xNONE; then
x_libraries=/usr/X11R6/lib
fi
saved_CPPFLAGS=$CPPFLAGS
CPPFLAGS="$CPPFLAGS -I$x_includes"
AC_CHECK_HEADERS(X11/extensions/Xv.h, [
BUILTINS="${BUILTINS} xvideo"
LIB_XVIDEO="-L$x_libraries -lX11 -lXext -lXv"
CFLAGS_X11="-I$x_includes"
]
CPPFLAGS=$saved_CPPFLAGS)
fi
dnl
dnl ALSA module
dnl
......
debian/control
View file @ 2816c900
......@@ -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, libglide2-dev [i386], libesd0-dev, libsdl1.2-dev, libqt-dev, libasound2-dev [alpha i386 ia64 m68k powerpc] (>=0.9.0beta7), libmad0-dev
Build-Depends: debhelper (>=2.2.0), xlibs-dev, xlibs-pic, libgnome-dev, libggi2-dev, libglide2-dev [i386], libesd0-dev, libsdl1.2-dev (>=1.2.2-3.1), libqt-dev, libasound2-dev [alpha i386 ia64 m68k powerpc] (>=0.9.0beta7), libmad0-dev
Standards-Version: 3.0.1
Package: vlc
......@@ -107,12 +107,3 @@ Description: Qt plugin for vlc
VideoLAN is a free MPEG, MPEG2 and DVD software solution.
.
This plugin adds a Qt interface to vlc, the VideoLAN Client.
Package: vlc-mad
Architecture: any
Depends: vlc (= ${Source-Version}), ${shlibs:Depends}
Description: MAD plugin for vlc
VideoLAN is a free MPEG, MPEG2 and DVD software solution.
.
This plugin adds support for libmad, the MPEG audio decoder library, to
the VideoLAN Client. MAD is 100% fixed-point based.
plugins/alsa/alsa.c
View file @ 2816c900
......@@ -2,7 +2,7 @@
* alsa.c : alsa plugin for vlc
*****************************************************************************
* Copyright (C) 2000-2001 VideoLAN
* $Id: alsa.c,v 1.11 2001/11/28 15:08:05 massiot Exp $
* $Id: alsa.c,v 1.11.2.1 2001/12/17 12:42:52 sam Exp $
*
* Authors: Henri Fallon <henri@videolan.org>
*
......@@ -58,6 +58,7 @@ MODULE_INIT_START
p_module->i_capabilities = MODULE_CAPABILITY_NULL
| MODULE_CAPABILITY_AOUT;
p_module->psz_longname = "Alsa audio module";
fprintf( stderr, "error: your have installed the alsa.so plugin. It is currently broken, please use ALSA's OSS emulation and the dsp.so plugin instead\n" );
MODULE_INIT_STOP
MODULE_ACTIVATE_START
......
plugins/alsa/aout_alsa.c
View file @ 2816c900
......@@ -2,7 +2,7 @@
* aout_alsa.c : Alsa functions library
*****************************************************************************
* Copyright (C) 2000-2001 VideoLAN
* $Id: aout_alsa.c,v 1.22.2.1 2001/12/17 01:36:59 sam Exp $
* $Id: aout_alsa.c,v 1.22.2.2 2001/12/17 12:42:52 sam Exp $
*
* Authors: Henri Fallon <henri@videolan.org> - Original Author
* Jeffrey Baker <jwbaker@acm.org> - Port to ALSA 1.0 API
......@@ -86,6 +86,9 @@ static int aout_Probe( probedata_t *p_data )
int i_open_return, i_close_return;
aout_sys_t local_sys;
/* XXX: alsa output is DISABLED */
return 0;
/* Open device */
i_open_return = snd_pcm_open( &(local_sys.p_alsa_handle), "default",
SND_PCM_STREAM_PLAYBACK, 0 );
......
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