Commit ddec0b93 authored by Sam Hocevar's avatar Sam Hocevar

  * ./plugins/win32: skeleton for the win32 interface Ipkiss is developing.
  * ./config.guess ./config.sub: latest GNU versions.
  * ./configure.in: when possible, xvideo is compiled as a plugin.
  * ./vlc.spec: fixed a few minor inaccuracies.
  * ./debian/control: vlc-gui is no longer depended on, but rather recommended.
  * ./src/interface/main.c: --spumargin flag; use this to force displaying
    subtitles at the bottom of the screen instead of putting them in the
    middle, for instance: `--spumargin 5'.
parent 85523bcf
List of known vlc bugs
$Id: BUGS,v 1.4 2002/01/09 02:01:14 sam Exp $
$Id: BUGS,v 1.5 2002/01/21 00:52:06 sam Exp $
Please try to keep this file up to date. Also, grep for FIXME in the
source files for more and more bugs to fix.
......@@ -41,6 +41,9 @@ Video output:
* The MGA video output plugin makes the picture stutter when MGA_NUM_FRAMES
is set to a value higher than 1.
* The SPU decoder doesn't detect when the video output failed to launch
itself, and we segfault.
Chroma transformations:
* The only working YUV2RGB transformation function is the MMX version
......
List of vlc plugins
$Id: MODULES,v 1.1 2002/01/04 14:01:34 sam Exp $
$Id: MODULES,v 1.2 2002/01/21 00:52:06 sam Exp $
* ac3_adec: software AC3 decoder.
......@@ -25,12 +25,16 @@ $Id: MODULES,v 1.1 2002/01/04 14:01:34 sam Exp $
* directx: audio output and video output module using the DirectX API.
* downmix: downmix module, used by the AC3 decoder.
* downmixsse: SSE accelerated version of downmix.
* downmix3dn: 3D Now! accelerated version of downmix.
* dsp: audio output module using the OSS /dev/dsp interface.
* dummy: dummy audio output, video output, interface and input modules.
* null: a module with no capabilities.
* dvd: input module for accessing DVDs.
* dvdread: input module for accessing DVDs, uses libdvdread.
......@@ -58,12 +62,6 @@ $Id: MODULES,v 1.1 2002/01/04 14:01:34 sam Exp $
* gtk: interface using the Gtk+ widget set.
* downmix: downmix module, used by the AC3 decoder.
* downmixsse: SSE accelerated version of downmix.
* downmix3dn: 3D Now! accelerated version of downmix.
* idct: inverse DCT module, used by the video decoder.
* idctclassic: another version of idct.
......@@ -119,16 +117,18 @@ $Id: MODULES,v 1.1 2002/01/04 14:01:34 sam Exp $
* mpeg_vdec: MPEG and MPEG2 video decoder.
* ncurses: interface module using the ncurses library.
* null: a module with no capabilities.
* qt: interface module using the Qt widget set.
* rc: interface module using stdio.
* sdl: audio output and video output module using the SDL library.
* spudec: DVD subtitles decoder.
* ncurses: interface module using the ncurses library.
* rc: interface module using stdio.
* vcd: input module for accessing Video CDs.
* x11: video output module using the X11 API.
......
......@@ -48,6 +48,7 @@ PLUGINS_DIR := ac3_adec \
spudec \
text \
vcd \
win32 \
x11
PLUGINS_TARGETS := ac3_adec/ac3_adec \
......@@ -117,6 +118,7 @@ PLUGINS_TARGETS := ac3_adec/ac3_adec \
text/ncurses \
text/rc \
vcd/vcd \
win32/win32 \
x11/x11 \
x11/xvideo
......@@ -142,6 +144,10 @@ ifeq ($(NEED_GETOPT),1)
C_OBJ += extras/GNUgetopt/getopt.o extras/GNUgetopt/getopt1.o
endif
ifeq ($(NEED_SYMBOLS),1)
C_OBJ += src/misc/symbols.o
endif
ifeq ($(SYS),beos)
CPP_OBJ := src/misc/beos_specific.o
endif
......
......@@ -74,7 +74,7 @@ $(SRC_CPP:%.cpp=%.$(suff).$(module_name)): %.$(suff).$(module_name): %.cpp
$(CC) $(CFLAGS) $(CFLAGS_EXTRA) -c $< -o $@
../$(module_name).so: $(EXTRA_DEP) $(OBJ_ALL)
$(CC) $(OBJ_ALL) $(PLDFLAGS) $(LIB_$(MODULE_NAME)) -o $@
$(CC) $(OBJ_ALL) $(PLDFLAGS) $(LIB_$(MODULE_NAME)) -o $@ && chmod -x $@
../$(module_name).a: $(EXTRA_DEP) $(OBJ_ALL)
rm -f $@ && ar rc $@ $(OBJ_ALL) && $(RANLIB) $@
......
......@@ -97,6 +97,7 @@ LIB_QNX = @LIB_QNX@
LIB_QT = @LIB_QT@
LIB_RC = @LIB_RC@
LIB_SDL = @LIB_SDL@
LIB_WIN32 = @LIB_WIN32@
LIB_X11 = @LIB_X11@
LIB_XVIDEO = @LIB_XVIDEO@
......@@ -119,6 +120,7 @@ CFLAGS_MAD = @CFLAGS_MAD@
CFLAGS_MOTIONALTIVEC = @CFLAGS_MOTIONALTIVEC@
CFLAGS_QT = @CFLAGS_QT@
CFLAGS_SDL = @CFLAGS_SDL@
CFLAGS_WIN32 = @CFLAGS_WIN32@
CFLAGS_X11 = @CFLAGS_X11@
CFLAGS_XVIDEO = @CFLAGS_XVIDEO@
......
#! /bin/sh
# Attempt to guess a canonical system name.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
# Free Software Foundation, Inc.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
# 2000, 2001, 2002 Free Software Foundation, Inc.
timestamp='2001-11-26'
timestamp='2002-01-02'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
......@@ -135,23 +135,21 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
# object file format. This provides both forward
# compatibility and a consistent mechanism for selecting the
# object file format.
# Determine the machine/vendor (is the vendor relevant).
case "${UNAME_MACHINE}" in
amiga) machine=m68k-unknown ;;
arm32) machine=arm-unknown ;;
atari*) machine=m68k-atari ;;
sun3*) machine=m68k-sun ;;
mac68k) machine=m68k-apple ;;
macppc) machine=powerpc-apple ;;
hp3[0-9][05]) machine=m68k-hp ;;
ibmrt|romp-ibm) machine=romp-ibm ;;
sparc*) machine=`uname -p`-unknown ;;
*) machine=${UNAME_MACHINE}-unknown ;;
#
# Note: NetBSD doesn't particularly care about the vendor
# portion of the name. We always set it to "unknown".
UNAME_MACHINE_ARCH=`(uname -p) 2>/dev/null` || \
UNAME_MACHINE_ARCH=unknown
case "${UNAME_MACHINE_ARCH}" in
arm*) machine=arm-unknown ;;
sh3el) machine=shl-unknown ;;
sh3eb) machine=sh-unknown ;;
*) machine=${UNAME_MACHINE_ARCH}-unknown ;;
esac
# The Operating System including object format, if it has switched
# to ELF recently, or will in the future.
case "${UNAME_MACHINE}" in
i386|sparc|amiga|arm*|hp300|mvme68k|vax|atari|luna68k|mac68k|news68k|next68k|pc532|sun3*|x68k)
case "${UNAME_MACHINE_ARCH}" in
arm*|i386|m68k|ns32k|sh3*|sparc|vax)
eval $set_cc_for_build
if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
| grep __ELF__ >/dev/null
......@@ -291,6 +289,9 @@ EOF
*:[Aa]miga[Oo][Ss]:*:*)
echo ${UNAME_MACHINE}-unknown-amigaos
exit 0 ;;
*:[Mm]orph[Oo][Ss]:*:*)
echo ${UNAME_MACHINE}-unknown-morphos
exit 0 ;;
*:OS/390:*:*)
echo i370-ibm-openedition
exit 0 ;;
......@@ -736,6 +737,9 @@ EOF
i*:PW*:*)
echo ${UNAME_MACHINE}-pc-pw32
exit 0 ;;
x86:Interix*:3*)
echo i386-pc-interix3
exit 0 ;;
i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
# How do we know it's Interix rather than the generic POSIX subsystem?
# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
......@@ -767,10 +771,24 @@ EOF
echo ${UNAME_MACHINE}-unknown-linux-gnu
exit 0 ;;
mips:Linux:*:*)
case `sed -n '/^byte/s/^.*: \(.*\) endian/\1/p' < /proc/cpuinfo` in
big) echo mips-unknown-linux-gnu && exit 0 ;;
little) echo mipsel-unknown-linux-gnu && exit 0 ;;
esac
eval $set_cc_for_build
sed 's/^ //' << EOF >$dummy.c
#undef CPU
#undef mips
#undef mipsel
#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
CPU=mipsel
#else
#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
CPU=mips
#else
CPU=
#endif
#endif
EOF
eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
rm -f $dummy.c
test x"${CPU}" != x && echo "${CPU}-pc-linux-gnu" && exit 0
;;
ppc:Linux:*:*)
echo powerpc-unknown-linux-gnu
......@@ -843,32 +861,25 @@ EOF
esac
# Determine whether the default compiler is a.out or elf
eval $set_cc_for_build
cat >$dummy.c <<EOF
#include <features.h>
#ifdef __cplusplus
#include <stdio.h> /* for printf() prototype */
int main (int argc, char *argv[]) {
#else
int main (argc, argv) int argc; char *argv[]; {
#endif
#ifdef __ELF__
# ifdef __GLIBC__
# if __GLIBC__ >= 2
printf ("%s-pc-linux-gnu\n", argv[1]);
# else
printf ("%s-pc-linux-gnulibc1\n", argv[1]);
# endif
# else
printf ("%s-pc-linux-gnulibc1\n", argv[1]);
# endif
#else
printf ("%s-pc-linux-gnuaout\n", argv[1]);
#endif
return 0;
}
sed 's/^ //' << EOF >$dummy.c
#include <features.h>
#ifdef __ELF__
# ifdef __GLIBC__
# if __GLIBC__ >= 2
LIBC=gnu
# else
LIBC=gnulibc1
# endif
# else
LIBC=gnulibc1
# endif
#else
LIBC=gnuaout
#endif
EOF
$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm -f $dummy.c $dummy && exit 0
rm -f $dummy.c $dummy
eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
rm -f $dummy.c
test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
;;
i*86:DYNIX/ptx:4*:*)
......
#! /bin/sh
# Configuration validation subroutine script.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
# Free Software Foundation, Inc.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
# 2000, 2001, 2002 Free Software Foundation, Inc.
timestamp='2001-12-03'
timestamp='2002-01-02'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
......@@ -227,6 +227,7 @@ case $basic_machine in
1750a | 580 \
| a29k \
| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
| c4x | clipper \
| d10v | d30v | dsp16xx \
......@@ -278,7 +279,8 @@ case $basic_machine in
580-* \
| a29k-* \
| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
| alphapca5[67]-* | arc-* \
| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
| arm-* | armbe-* | armle-* | armv*-* \
| avr-* \
| bs2000-* \
......@@ -419,6 +421,14 @@ case $basic_machine in
decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
basic_machine=mips-dec
;;
decsystem10* | dec10*)
basic_machine=pdp10-dec
os=-tops10
;;
decsystem20* | dec20*)
basic_machine=pdp10-dec
os=-tops20
;;
delta | 3300 | motorola-3300 | motorola-delta \
| 3300-motorola | delta-motorola)
basic_machine=m68k-motorola
......@@ -621,6 +631,10 @@ case $basic_machine in
basic_machine=m68k-rom68k
os=-coff
;;
morphos)
basic_machine=powerpc-unknown
os=-morphos
;;
msdos)
basic_machine=i386-pc
os=-msdos
......@@ -882,6 +896,10 @@ case $basic_machine in
tx39el)
basic_machine=mipstx39el-unknown
;;
toad1)
basic_machine=pdp10-xkl
os=-tops20
;;
tower | tower-32)
basic_machine=m68k-ncr
;;
......@@ -1075,7 +1093,7 @@ case $os in
| -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \
| -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
| -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
| -os2* | -vos* | -palmos* | -uclinux* | -nucleus*)
| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* | -morphos*)
# Remember, each alternative MUST END IN *, to match a version number.
;;
-qnx*)
......@@ -1210,6 +1228,7 @@ case $basic_machine in
arm*-semi)
os=-aout
;;
# This must come before the *-dec entry.
pdp10-*)
os=-tops20
;;
......
This diff is collapsed.
......@@ -310,8 +310,8 @@ esac
dnl
dnl default modules
dnl
BUILTINS="${BUILTINS} mpeg_es mpeg_ps mpeg_ts memcpy idct idctclassic motion imdct downmix chroma_i420_rgb chroma_i420_yuy2 chroma_i422_yuy2 chroma_i420_ymga mpeg_adec lpcm_adec ac3_adec mpeg_vdec"
PLUGINS="${PLUGINS} ac3_spdif spudec filter_deinterlace filter_invert filter_wall filter_transform filter_distort"
BUILTINS="${BUILTINS} mpeg_es mpeg_ps mpeg_ts memcpy idct idctclassic motion imdct downmix chroma_i420_rgb chroma_i420_yuy2 chroma_i422_yuy2 chroma_i420_ymga mpeg_adec ac3_adec mpeg_vdec"
PLUGINS="${PLUGINS} lpcm_adec ac3_spdif spudec filter_deinterlace filter_invert filter_wall filter_transform filter_distort"
dnl
dnl Accelerated modules
......@@ -431,8 +431,8 @@ case x"${target_os}" in
x*mingw32*)
SYS=mingw32
AC_CHECK_TOOL(WINDRES, windres, :)
LIB_MPEG_TS="-lws2_32"
LIB_RC="-lws2_32"
LIB_MPEG_TS="${LIB_MPEG_TS} -lws2_32"
LIB_RC="${LIB_RC} -lws2_32"
;;
x*nto*)
SYS=nto
......@@ -824,10 +824,10 @@ AC_ARG_WITH(mad,
[ --with-mad[=PATH] libmad module (default disabled)],
[ if test "x$with_val" != "xno"; then
if test -n $with_val; then
CFLAGS_MAD="-I$with_val/include"
LIB_MAD="-L$with_val/lib -lmad"
CFLAGS_MAD="${CFLAGS_MAD} -I$with_val/include"
LIB_MAD="${LIB_MAD} -L$with_val/lib -lmad"
else
LIB_MAD="-lmad"
LIB_MAD="${LIB_MAD} -lmad"
fi
save_CFLAGS=$CFLAGS
save_LDFLAGS=$LDFLAGS
......@@ -881,8 +881,8 @@ AC_ARG_ENABLE(esd,
if test x${ESD_CONFIG} != xno
then
PLUGINS="${PLUGINS} esd"
CFLAGS_ESD="`${ESD_CONFIG} --cflags`"
LIB_ESD="`${ESD_CONFIG} --libs`"
CFLAGS_ESD="${CFLAGS_ESD} `${ESD_CONFIG} --cflags`"
LIB_ESD="${LIB_ESD} `${ESD_CONFIG} --libs`"
fi
fi])
......@@ -897,8 +897,8 @@ AC_ARG_ENABLE(arts,
if test x${ARTS_CONFIG} != xno
then
PLUGINS="${PLUGINS} arts"
CFLAGS_ARTS="`${ARTS_CONFIG} --cflags`"
LIB_ARTS="`${ARTS_CONFIG} --libs `"
CFLAGS_ARTS="${CFLAGS_ARTS} `${ARTS_CONFIG} --cflags`"
LIB_ARTS="${LIB_ARTS} `${ARTS_CONFIG} --libs `"
fi
fi])
......@@ -910,14 +910,14 @@ AC_ARG_ENABLE(macosx,
[if test x$enable_macosx = xyes
then
BUILTINS="${BUILTINS} macosx"
LIB_MACOSX="-framework CoreAudio -framework Cocoa -framework AGL -framework QuickTime -lobjc"
CFLAGS_MACOSX="-ObjC"
LIB_MACOSX="${LIB_MACOSX} -framework CoreAudio -framework Cocoa -framework AGL -framework QuickTime -lobjc"
CFLAGS_MACOSX="${CFLAGS_MACOSX} -ObjC"
LIB="${LIB} -ObjC"
fi],
[AC_CHECK_HEADERS(Cocoa/Cocoa.h,
BUILTINS="${BUILTINS} macosx"
LIB_MACOSX="-framework CoreAudio -framework Cocoa -framework AGL -framework QuickTime -lobjc"
CFLAGS_MACOSX="-ObjC"
LIB_MACOSX="${LIB_MACOSX} -framework CoreAudio -framework Cocoa -framework AGL -framework QuickTime -lobjc"
CFLAGS_MACOSX="${CFLAGS_MACOSX} -ObjC"
LIB="${LIB} -ObjC"
)])
......@@ -930,7 +930,7 @@ AC_ARG_ENABLE(qnx,
then
AC_CHECK_HEADERS(Ph.h, [
PLUGINS="${PLUGINS} qnx"
LIB_QNX="-lasound -lph"
LIB_QNX="${LIB_QNX} -lasound -lph"
])
fi
......@@ -964,9 +964,9 @@ AC_ARG_WITH(ggi,
PLUGINS="${PLUGINS} ggi"
if test "x$withval" != "xyes"
then
LIB_GGI="-l"$withval
LIB_GGI="${LIB_GGI} -l$withval"
else
LIB_GGI="-lggi"
LIB_GGI="${LIB_GGI} -lggi"
fi
fi ])
......@@ -1001,8 +1001,8 @@ then
if test x${SDL_CONFIG} != xno
then
PLUGINS="${PLUGINS} sdl"
CFLAGS_SDL="`${SDL_CONFIG} --cflags`"
LIB_SDL="`${SDL_CONFIG} --libs | sed 's,-rdynamic,,'`"
CFLAGS_SDL="${CFLAGS_SDL} `${SDL_CONFIG} --cflags`"
LIB_SDL="${LIB_SDL} `${SDL_CONFIG} --libs | sed 's,-rdynamic,,'`"
save_CPPFLAGS=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $CFLAGS_SDL"
AC_CHECK_HEADERS(${SDL_HEADER}, AC_DEFINE_UNQUOTED(SDL_INCLUDE_FILE,
......@@ -1041,13 +1041,13 @@ then
then
AC_CHECK_HEADERS(directx.h,
[ PLUGINS="${PLUGINS} directx"
LIB_DIRECTX="-lgdi32" ])
LIB_DIRECTX="${LIB_DIRECTX} -lgdi32" ])
else
AC_MSG_CHECKING(for directX headers in ${withval})
if test -f ${withval}/include/directx.h
then
PLUGINS="${PLUGINS} directx"
LIB_DIRECTX="-L${withval}/lib -lgdi32"
LIB_DIRECTX="${LIB_DIRECTX} -L${withval}/lib -lgdi32"
INCLUDE="${INCLUDE} -I${withval}/include"
AC_MSG_RESULT(yes)
else
......@@ -1058,6 +1058,16 @@ then
fi
fi
dnl
dnl Windows MFC interface module
dnl
AC_ARG_ENABLE(win32,
[ --enable-win32 Windows DirectX support (default disabled)])
if test "x$enableval" = "xyes"
then
PLUGINS="${PLUGINS} win32"
fi
dnl
dnl Glide module
dnl
......@@ -1068,11 +1078,11 @@ AC_ARG_WITH(glide,
PLUGINS="${PLUGINS} glide"
if test "x$withval" != "xyes"
then
LIB_GLIDE="-l"$withval" -lm"
LIB_GLIDE="${LIB_GLIDE} -l$withval -lm"
else
LIB_GLIDE="-lglide2x -lm"
LIB_GLIDE="${LIB_GLIDE} -lglide2x -lm"
fi
CFLAGS_GLIDE="-I/usr/include/glide"
CFLAGS_GLIDE="${CFLAGS_GLIDE} -I/usr/include/glide"
fi ])
dnl
......@@ -1082,7 +1092,7 @@ AC_ARG_ENABLE(ncurses,
[ --enable-ncurses ncurses interface support (default disabled)],
[if test x$enable_ncurses = xyes; then
PLUGINS="${PLUGINS} ncurses"
LIB_NCURSES="-lncurses"
LIB_NCURSES="${LIB_NCURSES} -lncurses"
fi])
dnl
......@@ -1093,8 +1103,8 @@ AC_ARG_ENABLE(qt,
[if test x$enable_qt = xyes; then
PLUGINS="${PLUGINS} qt"
ALIASES="${ALIASES} qvlc"
LIB_QT="-lqt -L${QTDIR}/lib"
CFLAGS_QT="-I/usr/include/qt -I${QTDIR}/include"
LIB_QT="${LIB_QT} -lqt -L${QTDIR}/lib"
CFLAGS_QT="${CFLAGS_QT} -I/usr/include/qt -I${QTDIR}/include"
if test -x ${QTDIR}/bin/moc
then
MOC=${QTDIR}/bin/moc
......@@ -1132,8 +1142,8 @@ AC_ARG_ENABLE(gnome,
AC_PATH_PROG(GNOME_CONFIG, gnome-config, no)
if test -x ${GNOME_CONFIG}
then
CFLAGS_GNOME="`${GNOME_CONFIG} --cflags gtk gnomeui`"
LIB_GNOME="`${GNOME_CONFIG} --libs gnomeui | sed 's,-rdynamic,,'`"
CFLAGS_GNOME="${CFLAGS_GNOME} `${GNOME_CONFIG} --cflags gtk gnomeui`"
LIB_GNOME="${LIB_GNOME} `${GNOME_CONFIG} --libs gnomeui | sed 's,-rdynamic,,'`"
fi
# now look for the gnome.h header
saved_CPPFLAGS=$CPPFLAGS
......@@ -1171,8 +1181,8 @@ then
then
AC_MSG_ERROR([Your development package for Gtk+ is too old, you need at least version 1.2.0. Please upgrade and try again. Alternatively you can also configure with --disable-gtk.])
fi
CFLAGS_GTK="`${GTK_CONFIG} --cflags gtk`"
LIB_GTK="`${GTK_CONFIG} --libs gtk | sed 's,-rdynamic,,'`"
CFLAGS_GTK="${CFLAGS_GTK} `${GTK_CONFIG} --cflags gtk`"
LIB_GTK="${LIB_GTK} `${GTK_CONFIG} --libs gtk | sed 's,-rdynamic,,'`"
fi
# now look for the gtk.h header
saved_CPPFLAGS=$CPPFLAGS
......@@ -1231,9 +1241,18 @@ if test x$enable_xvideo != xno &&
saved_CPPFLAGS=$CPPFLAGS
CPPFLAGS="$CPPFLAGS -I$x_includes"
AC_CHECK_HEADERS(X11/extensions/Xv.h, [
BUILTINS="${BUILTINS} xvideo"
LIB_XVIDEO="${LIB_XVIDEO} -L$x_libraries -lX11 -lXext -lXv"
CFLAGS_XVIDEO="${CFLAGS_XVIDEO} -I$x_includes"
saved_CFLAGS=$CFLAGS
CFLAGS="$CFLAGS -L$x_libraries -lX11 -lXext"
AC_CHECK_LIB(Xv_pic,XvSetPortAttribute,
# We have Xv_pic, that's good, we can build an xvideo.so plugin !
PLUGINS="${PLUGINS} xvideo"
LIB_XVIDEO="${LIB_XVIDEO} -L$x_libraries -lX11 -lXext -lXv_pic"
CFLAGS_XVIDEO="${CFLAGS_XVIDEO} -I$x_includes",
# We don't have Xv_pic, let's make xvideo.a as builtin
BUILTINS="${BUILTINS} xvideo"
LIB_XVIDEO="${LIB_XVIDEO} -L$x_libraries -lX11 -lXext -lXv"
CFLAGS_XVIDEO="${CFLAGS_XVIDEO} -I$x_includes")
CFLAGS=$saved_CFLAGS
]
CPPFLAGS=$saved_CPPFLAGS)
fi
......@@ -1250,7 +1269,7 @@ AC_ARG_ENABLE(alsa,
if test x$have_alsa = xtrue
then
PLUGINS="${PLUGINS} alsa"
LIB_ALSA="-lasound -lm -ldl"
LIB_ALSA="${LIB_ALSA} -lasound -lm -ldl"
fi
fi])
......@@ -1355,6 +1374,7 @@ AC_SUBST(LIB_QNX)
AC_SUBST(LIB_QT)
AC_SUBST(LIB_RC)
AC_SUBST(LIB_SDL)
AC_SUBST(LIB_WIN32)
AC_SUBST(LIB_X11)
AC_SUBST(LIB_XVIDEO)
......@@ -1374,6 +1394,7 @@ AC_SUBST(CFLAGS_MAD)
AC_SUBST(CFLAGS_MOTIONALTIVEC)
AC_SUBST(CFLAGS_QT)
AC_SUBST(CFLAGS_SDL)
AC_SUBST(CFLAGS_WIN32)
AC_SUBST(CFLAGS_X11)
AC_SUBST(CFLAGS_XVIDEO)
......
......@@ -17,7 +17,8 @@ Standards-Version: 3.5.6
Package: vlc
Architecture: any
Depends: ${shlibs:Depends}, vlc-gui
Depends: ${shlibs:Depends}
Recommends: vlc-gui
Suggests: vlc-gnome
Description: a free MPEG and DVD player
VideoLAN is a free MPEG, MPEG2 and DVD software solution.
......
......@@ -321,6 +321,10 @@
#define VOUT_DEPTH_VAR "vlc_depth"
#define VOUT_DEPTH_DEFAULT 15
/* Default SPU margin is -1, which means we don't force their position */
#define VOUT_SPUMARGIN_VAR "vlc_spumargin"
#define VOUT_SPUMARGIN_DEFAULT -1
/* Multiplier value for aspect ratio calculation (2^7 * 3^3 * 5^3) */
#define VOUT_ASPECT_FACTOR 432000
......
......@@ -2,7 +2,7 @@
* macosx.c : MacOS X plugin for vlc
*****************************************************************************
* Copyright (C) 2001 VideoLAN
* $Id: macosx.c,v 1.11 2002/01/19 19:54:01 gbazin Exp $
* $Id: macosx.c,v 1.12 2002/01/21 00:52:07 sam Exp $
*
* Authors: Colin Delacroix <colin@zoy.org>
* Eugenio Jarosiewicz <ej0@cise.ufl.edu>
......@@ -42,8 +42,6 @@ void _M( intf_getfunctions )( function_list_t * p_function_list );
* Build configuration tree.
*****************************************************************************/
MODULE_CONFIG_START
ADD_WINDOW( "Configuration for MacOS X module" )
ADD_COMMENT( "Ha, ha -- nothing to configure yet" )
MODULE_CONFIG_STOP
MODULE_INIT_START
......
......@@ -182,11 +182,15 @@ static int vout_Create( vout_thread_t *p_vout )
*****************************************************************************/
static int vout_Init( vout_thread_t *p_vout )
{
if( p_vout->p_sys->i_mode == MODE_NORMAL_MEM ||
p_vout->p_sys->i_mode == MODE_SHARED_MEM )
/* These variables are only used if we are in overlay mode */
int i_ret;
PgScalerProps_t props;
switch( p_vout->p_sys->i_mode )
{
case MODE_NORMAL_MEM:
case MODE_SHARED_MEM:
/* create images for [shared] memory blit */
if( !( p_vout->p_sys->p_image[0] = PhCreateImage( NULL,
p_vout->p_sys->dim.w, p_vout->p_sys->dim.h,
p_vout->p_sys->i_img_type, NULL, 0,
......@@ -210,11 +214,10 @@ static int vout_Init( vout_thread_t *p_vout )
p_vout->i_bytes_per_line = p_vout->p_sys->p_image[0]->bpl;
p_vout->pf_setbuffers( p_vout, p_vout->p_sys->p_image[0]->image,
p_vout->p_sys->p_image[1]->image );
}
else if( p_vout->p_sys->i_mode == MODE_VIDEO_MEM )
{
/* create offscreen contexts for video memory blit */
break;
case MODE_VIDEO_MEM:
/* create offscreen contexts for video memory blit */
if( ( p_vout->p_sys->p_ctx[0] = PdCreateOffscreenContext( 0,
p_vout->p_sys->dim.w, p_vout->p_sys->dim.h,
Pg_OSC_MEM_PAGE_ALIGN ) ) == NULL )
......@@ -255,12 +258,8 @@ static int vout_Init( vout_thread_t *p_vout )
p_vout->i_bytes_per_line * p_vout->p_sys->dim.h );
p_vout->pf_setbuffers( p_vout, p_vout->p_sys->p_buf[0],
p_vout->p_sys->p_buf[1] );
}
else if( p_vout->p_sys->i_mode == MODE_VIDEO_OVERLAY )
{
int i_ret;
PgScalerProps_t props;
case MODE_VIDEO_OVERLAY:
props.size = sizeof( props );