Skip to content

V
vlc-gpu
Commit 79a45f72 authored by Sam Hocevar's avatar Sam Hocevar
Browse files
Options 

  * Updated TODO list with Henri's Apr 6th post.
  * Built-in modules support almost finished.

    Now you can compile any module within vlc, even the Gnome, Qt, SDL
  and GGI modules at the same time, resulting in an awful extra fat
  vlc binary with gazillons of library dependecies.

    The only exception is that the Gnome and Gtk+ modules can't be
  compiled together into vlc. But you can have one compiled built-in
  and the other as a plugin.

    Another consequence is that libdl should no longer be needed under
  MacOS X. I'll check this as soon as possible.
parent 5b51669f
Hide whitespace changes
Inline Side-by-side
Showing with 584 additions and 187 deletions
ChangeLog
View file @ 79a45f72
......@@ -4,7 +4,9 @@
HEAD
* A few Makefile fixes for BeOS
* Updated TODO list.
* Built-in modules support almost finished.
* A few Makefile fixes for BeOS.
* XVideo patches by Shane Harper <shanegh@optusnet.com.au>.
* Beginning of the built-in modules support.
* Got rid of the sleep() hack in beos_specific.cpp.
......
Makefile
View file @ 79a45f72
###############################################################################
# vlc (VideoLAN Client) main makefile
# (c)1998 VideoLAN
###############################################################################
# This makefile is the main makefile for the VideoLAN client.
# vlc (VideoLAN Client) main Makefile - (c)1998 VideoLAN
###############################################################################
include Makefile.opts
......@@ -36,8 +33,8 @@ PLUGINS_TARGETS := alsa/alsa beos/beos darwin/darwin dsp/dsp dummy/dummy \
#
# Translate plugin names
#
PLUGINS_OBJ := $(shell for i in $(PLUGINS) ; do echo " "$(PLUGINS_TARGETS)" " | sed 's@.*/\('$$i'\) .*@lib/\1.so@ ; s@^ .*@@' ; done)
BUILTINS_OBJ := $(shell for i in $(BUILTINS) ; do echo " "$(PLUGINS_TARGETS)" " | sed 's@.*/\('$$i'\) .*@lib/\1.a@ ; s@^ .*@@' ; done)
PLUGINS_OBJ := $(shell for i in : $(PLUGINS) ; do echo " "$(PLUGINS_TARGETS)" " | sed 's@.*/\('$$i'\) .*@lib/\1.so@ ; s@^ .*@@' ; done)
BUILTINS_OBJ := $(shell for i in : $(BUILTINS) ; do echo " "$(PLUGINS_TARGETS)" " | sed 's@.*/\('$$i'\) .*@lib/\1.a@ ; s@^ .*@@' ; done)
#
# C Objects
......@@ -164,8 +161,18 @@ export
#
all: vlc ${ALIASES} plugins vlc.app
Makefile.opts:
@echo
@echo "Sorry, you need to run ./configure before using this makefile."
@echo "To make clean or make distclean, use this:"
@echo
@echo " touch Makefile.opts Makefile.modules && make distclean"
@echo
@exit 1
clean:
for d in $(PLUGINS_DIR) ; do ( cd plugins/$${d} && make clean ) ; done
for d in $(PLUGINS_DIR) ; do ( cd plugins/$${d} && $(MAKE) clean ) ; done
rm -f plugins/*/*.o plugins/*/*.moc plugins/*/*.bak
rm -f $(C_OBJ) $(CPP_OBJ)
rm -f src/*/*.o extras/*/*.o
rm -f lib/*.so lib/*.a vlc gnome-vlc gvlc kvlc qvlc
......@@ -204,6 +211,7 @@ show:
@echo PLUGINS_OBJ: $(PLUGINS_OBJ)
@echo BUILTINS_OBJ: $(BUILTINS_OBJ)
# ugliest of all, but I have no time to do it -- sam
snapshot:
rm -Rf /tmp/vlc-${PROGRAM_VERSION}* /tmp/vlc-${PROGRAM_VERSION}nocss*
......@@ -331,12 +339,12 @@ endif
#
plugins: $(PLUGINS_OBJ)
$(PLUGINS_OBJ): FORCE
cd $(shell echo " "$(PLUGINS_TARGETS)" " | sed 's@.* \([^/]*/\)'$(@:lib/%.so=%)' .*@plugins/\1@ ; s@^ .*@@') && make $(@:%=../../%)
cd $(shell echo " "$(PLUGINS_TARGETS)" " | sed 's@.* \([^/]*/\)'$(@:lib/%.so=%)' .*@plugins/\1@ ; s@^ .*@@') && $(MAKE) $(@:%=../../%)
#
# Built-in modules target
#
builtins: $(BUILTINS_OBJ)
$(BUILTINS_OBJ): FORCE
cd $(shell echo " "$(PLUGINS_TARGETS)" " | sed 's@.* \([^/]*/\)'$(@:lib/%.a=%)' .*@plugins/\1@ ; s@^ .*@@') && make $(@:%=../../%)
cd $(shell echo " "$(PLUGINS_TARGETS)" " | sed 's@.* \([^/]*/\)'$(@:lib/%.a=%)' .*@plugins/\1@ ; s@^ .*@@') && $(MAKE) $(@:%=../../%)
Makefile.modules.in
View file @ 79a45f72
......@@ -26,10 +26,3 @@ PLCFLAGS += -shared
endif
endif
#
# Libraries for special cases
#
LIB_GGI = @LIB_GGI@
LIB_GLIDE = @LIB_GLIDE@
LIB_SDL = @LIB_SDL@
Makefile.opts.in
View file @ 79a45f72
......@@ -7,28 +7,57 @@
# Configuration
###############################################################################
# Debugging mode on or off (set to 1 to activate)
DEBUG=@DEBUG@
STATS=@STATS@
OPTIMS=@OPTIMS@
GETOPT=@GETOPT@
PLUGINS:=@PLUGINS@
BUILTINS:=@BUILTINS@
SYS=@SYS@
ALIASES=@ALIASES@
INSTALL=@INSTALL@
ARCH=@ARCH@
exec_prefix=@exec_prefix@
prefix=@prefix@
bindir=@bindir@
datadir=@datadir@
libdir=@libdir@
#
# Compilation options
#
DEBUG = @DEBUG@
STATS = @STATS@
OPTIMS = @OPTIMS@
GETOPT = @GETOPT@
PLUGINS := @PLUGINS@
BUILTINS := @BUILTINS@
SYS = @SYS@
ALIASES =@ALIASES@
INSTALL = @INSTALL@
ARCH = @ARCH@
#
# Build environment
#
CC = @CC@
SHELL = @SHELL@
#
# Installation environment
#
exec_prefix = @exec_prefix@
prefix = @prefix@
bindir = @bindir@
datadir = @datadir@
libdir = @libdir@
CC=@CC@
SHELL=@SHELL@
#
# Libraries for special cases
#
LIB_ALSA = @LIB_ALSA@
LIB_BEOS = @LIB_BEOS@
LIB_DARWIN = @LIB_DARWIN@
LIB_ESD = @LIB_ESD@
LIB_GGI = @LIB_GGI@
LIB_GLIDE = @LIB_GLIDE@
LIB_GNOME = @LIB_GNOME@
LIB_GTK = @LIB_GTK@
LIB_IDCTALTIVEC = @LIB_IDCTALTIVEC@
LIB_MACOSX = @LIB_MACOSX@
LIB_NCURSES = @LIB_NCURSES@
LIB_QT = @LIB_QT@
LIB_TS = @LIB_TS@
LIB_SDL = @LIB_SDL@
LIB_X11 = @LIB_X11@
LIB_XVIDEO = @LIB_XVIDEO@
LIB_YUV = @LIB_YUV@
###############################################################################
# Configuration pre-processing
......@@ -81,13 +110,12 @@ INCLUDE += -Iinclude -Iextras -I/usr/local/include
#
# Libraries
#
LIB = @LIB@ -L/usr/local/lib
LIB += @LIB@ -L/usr/local/lib
ifeq ($(SYS),beos)
LIB += -lbe -lroot -lgame
else
LIB += -lm
endif
#
# Libraries needed by built-in modules
#
LIB += $(shell for i in ${BUILTINS} ; do echo $$i | tr '[a-z]' '[A-Z]' | sed 's/.*/$$LIB_&/' ; done)
#
# C compiler flags: mainstream compilation
......
TODO
View file @ 79a45f72
......@@ -7,6 +7,138 @@
#
# Urgency values: Wishlist, Normal, Important, Critical
Task: 0x5e
Difficulty: Hard
Urgency: Wishlist
Description: All-in-one interface window
Find a way for the interface plugin to provide video output capabilities
and have it display the stream in the same window.
Status: Todo
Task: 0x5d
Difficulty: Guru
Urgency: Normal
Description: Win32 port
Win32 is probably the most common desktop platform, we should support it
as well. Besides, most students at Centrale use Windows and VideoLAN was
originally designed for them.
Status: Todo
Task: 0x5c
Difficulty: Normal
Urgency: Wishlist
Description: Infrared support
Write a plugin which listens to the infrared port and sends appropriate
commands to the application. This can either be an interface plugin, or,
preferably, a new kind of interface-agnostic "command" plugin.
Status: Todo
Task: 0x5b
Difficulty: Hard
Urgency: Critical
Description: Fix the FreeBSD port
The FreeBSD port of vlc doesn't run, probably because of a pthread
issue. This should be investigated.
Status: Todo
Task: 0x5a
Difficulty: Hard
Urgency: Wishlist
Description: Share stream information between vlc and vls
vls should send misc TS packets to let us know what the stream PID
contain, such as the language, or the subtitle palette.
Status: Todo
Task: 0x59
Difficulty: Hard
Urgency: Important
Description: Cope with vls/vlc clock jitter
The internal clocks of the server and the client are not assured to be
in perfect synchronization, which may be annoying when playing a movie.
Reduce this jitter by using a well-chosen filter.
Status: Todo
Task: 0x58
Difficulty: Normal
Urgency: Critical
Description: Language and subtitles selection in network input
The vls will probably have to be modified as well.
Status: Todo
Task: 0x57
Difficulty: Guru
Urgency: Low
Description: Full DVD navigation
Once the core DVD navigation features are ready (see item 0x52), port the
interface and video output modules so that they can handle it.
Status: Todo
Task: 0x56
Difficulty: Important
Urgency: Normal
Description: XVideo video output
XVideo is reported to work a bit better than the SDL wrapper on some
configurations. Modify the X11 plugin so that it supports XVideo.
Status: Done 1 Apr 2001 (shane)
Task: 0x55
Difficulty: Hard
Urgency: Critical
Description: Video output IV
The new video output should support subtitles both in software and hardware
YUV (see item 0x4d). One should also care about XVideo buffers, there is a
way to directly decode into them, which would improve performances.
Status: Todo
Task: 0x54
Difficulty: Hard
Urgency: Wishlist
Description: Hardware AC3 decoding
Some soundcards directly grok Dolby AC3. This would spare a lot of CPU time.
Status: Todo
Task: 0x53
Difficulty: Normal
Urgency: Critical
Description: Fix AC3 decoder
The AC3 decoder still has a few quality issues; fix them, and try to add
MMX support to it as well.
Status: Todo
Task: 0x52
Difficulty: Guru
Urgency: Low
Description: DVD navigation core features
We need an interpreter for the DVD virtual machine to make it easier to
browse DVDs later.
Status: Todo
Task: 0x51
Difficulty: Easy
Urgency: Normal
Description: Better subtitle color handling
The subtitle palette is pretty ugly for the moment, since we don't parse
the color information. Find it in the IFO file and pass the information to
the video output.
Status: Todo
Task: 0x50
Difficulty: Hard
Urgency: Critical
Description: Multi-angle multi-language support
Some DVDs have several languages encoded in the same video stream, we
need to properly parse them.
Status: Todo
Task: 0x4f
Difficulty: Hard
Urgency: Critical
Description: Fix all known DVD playback issues
A few DVDs are still reported not to work at all. Try to find what is
causing this, have a more robust DVD input, and list all discs reported
to work flawlessly to prevent bug regression.
Status: Todo
Task: 0x4e
Difficulty: Hard
Urgency: High
......@@ -260,7 +392,7 @@ Description: Enable compiled-in plugins
Some plugins may have their place inside the main program, such as the
dummy plugin, or the beos plugin under BeOS. We should allow to link
them with the main app.
Status: Todo
Status: Done 15 Apr 2001 (sam)
Task: 0x31
Difficulty: Easy
......@@ -516,7 +648,7 @@ Urgency: Normal
Description: Draw a vlc icon
The vlc needs an icon. It should render well in 48x48 but
can be any size.
Status: Todo
Status: Done 11 Apr 2001 (sam)
Task: 0x0f
Difficulty: Easy
......
configure
View file @ 79a45f72
......@@ -2248,9 +2248,9 @@ else
echo "$ac_t""no" 1>&6
fi
echo $ac_n "checking for powl in -lm""... $ac_c" 1>&6
echo "configure:2253: checking for powl in -lm" >&5
ac_lib_var=`echo m'_'powl | sed 'y%./+-%__p_%'`
echo $ac_n "checking for pow in -lm""... $ac_c" 1>&6
echo "configure:2253: checking for pow in -lm" >&5
ac_lib_var=`echo m'_'pow | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
......@@ -2262,10 +2262,10 @@ cat > conftest.$ac_ext <<EOF
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
char powl();
char pow();
int main() {
powl()
pow()
; return 0; }
EOF
if { (eval echo configure:2272: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
......@@ -2283,7 +2283,7 @@ LIBS="$ac_save_LIBS"
fi
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
echo "$ac_t""yes" 1>&6
LIB=${LIB}" -lm"
LIB_YUV=${LIB_YUV}" -lm"
else
echo "$ac_t""no" 1>&6
fi
......@@ -3085,6 +3085,8 @@ EOF
fi
ARCH=${host_cpu}
#PLUGINS=${PLUGINS}"ps ts yuv idct idctclassic motion "
BUILTINS=${BUILTINS}"ps ts yuv idct idctclassic motion "
if test x$host_os = xbeos; then
......@@ -3097,17 +3099,17 @@ for ac_hdr in sys/ioctl.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
echo "configure:3101: checking for $ac_hdr" >&5
echo "configure:3103: checking for $ac_hdr" >&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 3106 "configure"
#line 3108 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:3111: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
{ (eval echo configure:3113: \"$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*
......@@ -3127,23 +3129,23 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
cat >> confdefs.h <<EOF
#define $ac_tr_hdr 1
EOF
#PLUGINS=${PLUGINS}"dvd "
BUILTINS=${BUILTINS}"dvd "
for ac_hdr in linux/cdrom.h
BUILTINS=${BUILTINS}"dvd "
for ac_hdr in linux/cdrom.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
echo "configure:3137: checking for $ac_hdr" >&5
echo "configure:3139: checking for $ac_hdr" >&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 3142 "configure"
#line 3144 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:3147: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
{ (eval echo configure:3149: \"$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*
......@@ -3169,28 +3171,30 @@ else
fi
done
cat > conftest.$ac_ext <<EOF
#line 3174 "configure"
cat > conftest.$ac_ext <<EOF
#line 3176 "configure"
#include "confdefs.h"
#include <linux/cdrom.h>
EOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
egrep "dvd" >/dev/null 2>&1; then
rm -rf conftest*
cat >> confdefs.h <<\EOF
cat >> confdefs.h <<\EOF
#define LINUX_DVD 1
EOF
fi
rm -f conftest*
else
echo "$ac_t""no" 1>&6
fi
done
ARCH=${host_cpu}
# Check whether --enable-dummy or --disable-dummy was given.
if test "${enable_dummy+set}" = set; then
enableval="$enable_dummy"
......@@ -3198,8 +3202,8 @@ if test "${enable_dummy+set}" = set; then
fi
if test x$enable_dummy != xno; then
#PLUGINS=${PLUGINS}"dummy ";
BUILTINS=${BUILTINS}"dummy "; fi
# Check whether --enable-null or --disable-null was given.
if test "${enable_null+set}" = set; then
enableval="$enable_null"
......@@ -3207,8 +3211,8 @@ if test "${enable_null+set}" = set; then
fi
if test x$enable_null != xno; then
#PLUGINS=${PLUGINS}"null ";
BUILTINS=${BUILTINS}"null "; fi
# Check whether --enable-ppro or --disable-ppro was given.
if test "${enable_ppro+set}" = set; then
enableval="$enable_ppro"
......@@ -3217,27 +3221,29 @@ else
if test x${host_cpu} = xi686; then ARCH=${ARCH}" ppro"; fi
fi
# Check whether --enable-mmx or --disable-mmx was given.
if test "${enable_mmx+set}" = set; then
enableval="$enable_mmx"
if test x$enableval = xyes; then ARCH=${ARCH}" mmx";
#PLUGINS=${PLUGINS}${ACCEL_PLUGINS};
BUILTINS=${BUILTINS}}${ACCEL_PLUGINS}; fi
else
if test x${host_cpu} = xi686 -o x${host_cpu} = xi586 -o x${host_cpu} = xx86; then ARCH=${ARCH}" mmx";
#PLUGINS=${PLUGINS}${ACCEL_PLUGINS};
BUILTINS=${BUILTINS}${ACCEL_PLUGINS}; fi
fi
# Check whether --enable-altivec or --disable-altivec was given.
if test "${enable_altivec+set}" = set; then
enableval="$enable_altivec"
if test x$enableval = xyes; then ARCH=${ARCH}" altivec";
#PLUGINS=${PLUGINS}"idctaltivec ";
BUILTINS=${BUILTINS}"idctaltivec "; fi
BUILTINS=${BUILTINS}"idctaltivec "
LIB_IDCTALTIVEC="-framework vecLib"
fi
fi
#[ if test -d /System/Library/Frameworks/vecLib.framework; then ARCH=${ARCH}" altivec"; PLUGINS=${PLUGINS}"idctaltivec "; fi ])
# Check whether --enable-css or --disable-css was given.
if test "${enable_css+set}" = set; then
enableval="$enable_css"
......@@ -3250,18 +3256,21 @@ if test x${CSS} = x1; then cat >> confdefs.h <<\EOF
#define HAVE_CSS 1
EOF
fi
# Check whether --enable-debug or --disable-debug was given.
if test "${enable_debug+set}" = set; then
enableval="$enable_debug"
if test x$enableval = xyes; then DEBUG=1; fi
fi
# Check whether --enable-stats or --disable-stats was given.
if test "${enable_stats+set}" = set; then
enableval="$enable_stats"
if test x$enableval = xyes; then STATS=1; fi
fi
# Check whether --enable-optimizations or --disable-optimizations was given.
if test "${enable_optimizations+set}" = set; then
enableval="$enable_optimizations"
......@@ -3274,8 +3283,8 @@ fi
SYS=${host_os}
if test x$host_os = xbeos; then
PLUGINS=${PLUGINS}"beos "
LIB=${LIB}" -lbe -lgame -lroot"
BUILTINS=${BUILTINS}"beos "
LIB_BEOS="-lbe -lgame -lroot -ltracker"
else
......@@ -3290,38 +3299,52 @@ if test x$enable_dsp != xno; then
PLUGINS=${PLUGINS}"dsp "
fi
fi
# Check whether --enable-esd or --disable-esd was given.
if test "${enable_esd+set}" = set; then
enableval="$enable_esd"
if test x$enable_esd = xyes; then PLUGINS=${PLUGINS}"esd "; fi
if test x$enable_esd = xyes; then
PLUGINS=${PLUGINS}"esd "
LIB_ESD="`esd-config --libs`"
fi
fi
# Check whether --enable-darwin or --disable-darwin was given.
if test "${enable_darwin+set}" = set; then
enableval="$enable_darwin"
if test x$enable_darwin = xyes; then PLUGINS=${PLUGINS}"darwin "; fi
if test x$enable_darwin = xyes; then
PLUGINS=${PLUGINS}"darwin "
LIB_DARWIN="-framework CoreAudio"
fi
fi
# Check whether --enable-macosx or --disable-macosx was given.
if test "${enable_macosx+set}" = set; then
enableval="$enable_macosx"
if test x$enable_macosx = xyes; then PLUGINS=${PLUGINS}"macosx "; fi
if test x$enable_macosx = xyes; then
BUILTINS=${BUILTINS}"macosx "
LIB_MACOSX="-framework CoreAudio -framework Carbon -framework AGL"
LIB_TS=${LIB_TS}" -framework AGL -framework Carbon"
LIB_SDL=${LIB_SDL}" -framework AGL -framework Carbon"
fi
else
for ac_hdr in Carbon/Carbon.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
echo "configure:3315: checking for $ac_hdr" >&5
echo "configure:3338: checking for $ac_hdr" >&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 3320 "configure"
#line 3343 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:3325: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
{ (eval echo configure:3348: \"$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*
......@@ -3341,7 +3364,11 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
cat >> confdefs.h <<EOF
#define $ac_tr_hdr 1
EOF
PLUGINS=${PLUGINS}"macosx "
BUILTINS=${BUILTINS}"macosx "
LIB_MACOSX="-framework CoreAudio -framework Carbon -framework AGL"
LIB_TS=${LIB_TS}" -framework AGL -framework Carbon"
LIB_SDL=${LIB_SDL}" -framework AGL -framework Carbon"
else
echo "$ac_t""no" 1>&6
fi
......@@ -3349,12 +3376,14 @@ done
fi
# Check whether --enable-fb or --disable-fb was given.
if test "${enable_fb+set}" = set; then
enableval="$enable_fb"
if test x$enable_fb = xyes; then PLUGINS=${PLUGINS}"fb "; fi
fi
# Check whether --with-ggi or --without-ggi was given.
if test "${with_ggi+set}" = set; then
withval="$with_ggi"
......@@ -3370,6 +3399,7 @@ if test "${with_ggi+set}" = set; then
fi
fi
# Check whether --with-sdl or --without-sdl was given.
if test "${with_sdl+set}" = set; then
withval="$with_sdl"
......@@ -3378,24 +3408,24 @@ if test "${with_sdl+set}" = set; then
PLUGINS=${PLUGINS}"sdl ";
if test "x$withval" != "xyes";
then
LIB_SDL="-L/usr/X11R6/lib -L"$withval"/lib -l"$withval
LIB_SDL=${LIB_SDL}" -L/usr/X11R6/lib -L"$withval"/lib -l"$withval
INCLUDE=${INCLUDE}" -I"$withval"/include"
else
for ac_hdr in SDL/SDL.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
echo "configure:3389: checking for $ac_hdr" >&5
echo "configure:3419: checking for $ac_hdr" >&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 3394 "configure"
#line 3424 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:3399: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
{ (eval echo configure:3429: \"$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*
......@@ -3422,7 +3452,7 @@ echo "Cannot find SDL headers !"; exit
fi
done
LIB_SDL="-L/usr/X11R6/lib -lSDL"
LIB_SDL=${LIB_SDL}" -L/usr/X11R6/lib -lSDL"
fi
fi
fi
......@@ -3433,17 +3463,17 @@ fi
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
echo "configure:3437: checking for $ac_hdr" >&5
echo "configure:3467: checking for $ac_hdr" >&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 3442 "configure"
#line 3472 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:3447: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
{ (eval echo configure:3477: \"$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*
......@@ -3464,13 +3494,14 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
#define $ac_tr_hdr 1
EOF
PLUGINS=${PLUGINS}"sdl "
LIB_SDL="-L/usr/X11R6/lib -lSDL"
LIB_SDL=${LIB_SDL}" -L/usr/X11R6/lib -lSDL"
else
echo "$ac_t""no" 1>&6
fi
done
fi
# Check whether --with-glide or --without-glide was given.
if test "${with_glide+set}" = set; then
withval="$with_glide"
......@@ -3486,30 +3517,46 @@ if test "${with_glide+set}" = set; then
fi
fi
# Check whether --enable-ncurses or --disable-ncurses was given.
if test "${enable_ncurses+set}" = set; then
enableval="$enable_ncurses"
if test x$enable_ncurses = xyes; then PLUGINS=${PLUGINS}"ncurses "; fi
if test x$enable_ncurses = xyes; then
PLUGINS=${PLUGINS}"ncurses "
LIB_NCURSES="-lncurses"
fi
fi
# Check whether --enable-qt or --disable-qt was given.
if test "${enable_qt+set}" = set; then
enableval="$enable_qt"
if test x$enable_qt = xyes; then PLUGINS=${PLUGINS}"qt "; ALIASES=${ALIASES}"qvlc "; fi
if test x$enable_qt = xyes; then
PLUGINS=${PLUGINS}"qt "
ALIASES=${ALIASES}"qvlc "
LIB_QT="-lqt -L${QTDIR}/lib"
fi
fi
# Check whether --enable-kde or --disable-kde was given.
if test "${enable_kde+set}" = set; then
enableval="$enable_kde"
if test x$enable_kde = xyes; then PLUGINS=${PLUGINS}"kde "; ALIASES=${ALIASES}"kvlc "; fi
fi
# Check whether --enable-gnome or --disable-gnome was given.
if test "${enable_gnome+set}" = set; then
enableval="$enable_gnome"
if test x$enable_gnome = xyes; then PLUGINS=${PLUGINS}"gnome "; ALIASES=${ALIASES}"gnome-vlc "; fi
if test x$enable_gnome = xyes; then
PLUGINS=${PLUGINS}"gnome "
ALIASES=${ALIASES}"gnome-vlc "
LIB_GNOME="`gnome-config --libs gnomeui | sed 's,-rdynamic,,'`"
fi
fi
# Check whether --enable-gtk or --disable-gtk was given.
if test "${enable_gtk+set}" = set; then
enableval="$enable_gtk"
......@@ -3518,9 +3565,12 @@ fi
if test x$enable_gtk != xno; then
if which gtk-config; then
PLUGINS=${PLUGINS}"gtk "; ALIASES=${ALIASES}"gvlc "
PLUGINS=${PLUGINS}"gtk "
ALIASES=${ALIASES}"gvlc "
LIB_GTK="`gtk-config --libs gtk | sed 's,-rdynamic,,'`"
fi
fi
# Check whether --enable-x11 or --disable-x11 was given.
if test "${enable_x11+set}" = set; then
enableval="$enable_x11"
......@@ -3532,17 +3582,17 @@ if test x$enable_x11 != xno; then
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
echo "configure:3536: checking for $ac_hdr" >&5
echo "configure:3586: checking for $ac_hdr" >&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 3541 "configure"
#line 3591 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:3546: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
{ (eval echo configure:3596: \"$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*
......@@ -3562,17 +3612,24 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
cat >> confdefs.h <<EOF
#define $ac_tr_hdr 1
EOF
PLUGINS=${PLUGINS}"x11 "
PLUGINS=${PLUGINS}"x11 "
LIB_X11="-L/usr/X11R6/lib -lX11 -lXext"
else
echo "$ac_t""no" 1>&6
fi
done
fi
# Check whether --enable-xvideo or --disable-xvideo was given.
if test "${enable_xvideo+set}" = set; then
enableval="$enable_xvideo"
if test x$enable_xvideo = xyes; then PLUGINS=${PLUGINS}"xvideo "; fi
if test x$enable_xvideo = xyes; then
PLUGINS=${PLUGINS}"xvideo "
LIB_XVIDEO="-L/usr/X11R6/lib -lX11 -lXext"
fi
fi
......@@ -3581,17 +3638,17 @@ if test "${enable_alsa+set}" = set; then
enableval="$enable_alsa"
if test x$enable_alsa = xyes; then ac_safe=`echo "sys/asoundlib.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for sys/asoundlib.h""... $ac_c" 1>&6
echo "configure:3585: checking for sys/asoundlib.h" >&5
echo "configure:3642: checking for sys/asoundlib.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 3590 "configure"
#line 3647 "configure"
#include "confdefs.h"
#include <sys/asoundlib.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:3595: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
{ (eval echo configure:3652: \"$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*
......@@ -3608,7 +3665,7 @@ fi
if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
echo "$ac_t""yes" 1>&6
echo $ac_n "checking for main in -lasound""... $ac_c" 1>&6
echo "configure:3612: checking for main in -lasound" >&5
echo "configure:3669: checking for main in -lasound" >&5
ac_lib_var=`echo asound'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
......@@ -3616,14 +3673,14 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lasound $LIBS"
cat > conftest.$ac_ext <<EOF
#line 3620 "configure"
#line 3677 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
if { (eval echo configure:3627: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo configure:3684: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
......@@ -3648,7 +3705,10 @@ else
echo "$ac_t""no" 1>&6
have_alsa="false"
fi
if test $have_alsa = true; then PLUGINS=${PLUGINS}"alsa "; fi; fi
if test $have_alsa = true; then
PLUGINS=${PLUGINS}"alsa "
LIB_ALSA="-lasound"
fi; fi
fi
......@@ -3665,6 +3725,20 @@ fi
......@@ -3831,9 +3905,23 @@ s%@OPTIMS@%$OPTIMS%g
s%@CSS@%$CSS%g
s%@LCFLAGS@%$LCFLAGS%g
s%@LIB@%$LIB%g
s%@LIB_SDL@%$LIB_SDL%g
s%@LIB_GLIDE@%$LIB_GLIDE%g
s%@LIB_ALSA@%$LIB_ALSA%g
s%@LIB_BEOS@%$LIB_BEOS%g
s%@LIB_DARWIN@%$LIB_DARWIN%g
s%@LIB_ESD@%$LIB_ESD%g
s%@LIB_GGI@%$LIB_GGI%g
s%@LIB_GLIDE@%$LIB_GLIDE%g
s%@LIB_GNOME@%$LIB_GNOME%g
s%@LIB_GTK@%$LIB_GTK%g
s%@LIB_IDCTALTIVEC@%$LIB_IDCTALTIVEC%g
s%@LIB_MACOSX@%$LIB_MACOSX%g
s%@LIB_NCURSES@%$LIB_NCURSES%g
s%@LIB_QT@%$LIB_QT%g
s%@LIB_TS@%$LIB_TS%g
s%@LIB_SDL@%$LIB_SDL%g
s%@LIB_X11@%$LIB_X11%g
s%@LIB_XVIDEO@%$LIB_XVIDEO%g
s%@LIB_YUV@%$LIB_YUV%g
CEOF
EOF
......
configure.in
View file @ 79a45f72
......@@ -45,7 +45,7 @@ AC_SUBST(GETOPT)
AC_FUNC_MMAP
AC_TYPE_SIGNAL
AC_CHECK_LIB(dl,dlopen,LIB=${LIB}" -ldl")
AC_CHECK_LIB(m,powl,LIB=${LIB}" -lm")
AC_CHECK_LIB(m,pow,LIB_YUV=${LIB_YUV}" -lm")
AC_CHECK_LIB(pthread,pthread_create,LIB=${LIB}" -lpthread")
AC_CHECK_LIB(threads,thread_create,LIB=${LIB}" -lthreads")
......@@ -100,7 +100,11 @@ AC_C_CONST
AC_TYPE_SIZE_T
AC_HEADER_TIME
dnl default plugins
ARCH=${host_cpu}
dnl
dnl default modules
dnl
#PLUGINS=${PLUGINS}"ps ts yuv idct idctclassic motion "
BUILTINS=${BUILTINS}"ps ts yuv idct idctclassic motion "
if test x$host_os = xbeos; then
......@@ -109,52 +113,87 @@ else
ACCEL_PLUGINS="yuvmmx idctmmx idctmmxext motionmmx motionmmxext "
fi
dnl Checks for DVD ioctls
AC_CHECK_HEADERS(sys/ioctl.h,
[#PLUGINS=${PLUGINS}"dvd "
BUILTINS=${BUILTINS}"dvd "
AC_CHECK_HEADERS(linux/cdrom.h)
AC_EGREP_HEADER(dvd,linux/cdrom.h,[AC_DEFINE(LINUX_DVD,1,DVD support for linux)])])
ARCH=${host_cpu}
dnl
dnl DVD module: check for DVD ioctls
dnl
AC_CHECK_HEADERS(sys/ioctl.h,[
BUILTINS=${BUILTINS}"dvd "
AC_CHECK_HEADERS(linux/cdrom.h)
AC_EGREP_HEADER(dvd,linux/cdrom.h,[
AC_DEFINE(LINUX_DVD,1, DVD support for linux)
])
])
dnl
dnl dummy plugin
dnl
AC_ARG_ENABLE(dummy,
[ --disable-dummy dummy module (default enabled)])
if test x$enable_dummy != xno; then
#PLUGINS=${PLUGINS}"dummy ";
BUILTINS=${BUILTINS}"dummy "; fi
dnl
dnl null plugin
dnl
AC_ARG_ENABLE(null,
[ --disable-null Null module (default enabled)])
if test x$enable_null != xno; then
#PLUGINS=${PLUGINS}"null ";
BUILTINS=${BUILTINS}"null "; fi
dnl
dnl PentiumPro acceleration
dnl
AC_ARG_ENABLE(ppro,
[ --disable-ppro Disable PentiumPro optimizations (default enabled for x86)],
[ if test x$enableval = xyes; then ARCH=${ARCH}" ppro"; fi ],
[ if test x${host_cpu} = xi686; then ARCH=${ARCH}" ppro"; fi ])
dnl
dnl MMX acceleration
dnl
AC_ARG_ENABLE(mmx,
[ --disable-mmx Disable MMX optimizations (default enabled for x86)],
[ if test x$enableval = xyes; then ARCH=${ARCH}" mmx";
#PLUGINS=${PLUGINS}${ACCEL_PLUGINS};
BUILTINS=${BUILTINS}}${ACCEL_PLUGINS}; fi ],
[ if test x${host_cpu} = xi686 -o x${host_cpu} = xi586 -o x${host_cpu} = xx86; then ARCH=${ARCH}" mmx";
#PLUGINS=${PLUGINS}${ACCEL_PLUGINS};
BUILTINS=${BUILTINS}${ACCEL_PLUGINS}; fi ])
dnl
dnl AltiVec acceleration
dnl
AC_ARG_ENABLE(altivec,
[ --enable-altivec Enable altivec optimizations (default disabled since it is broken)],
[ if test x$enableval = xyes; then ARCH=${ARCH}" altivec";
#PLUGINS=${PLUGINS}"idctaltivec ";
BUILTINS=${BUILTINS}"idctaltivec "; fi ])
BUILTINS=${BUILTINS}"idctaltivec "
LIB_IDCTALTIVEC="-framework vecLib"
fi ])
#[ if test -d /System/Library/Frameworks/vecLib.framework; then ARCH=${ARCH}" altivec"; PLUGINS=${PLUGINS}"idctaltivec "; fi ])
dnl
dnl CSS DVD decryption
dnl
AC_ARG_ENABLE(css,
[ --disable-css Disable DVD CSS decryption (default enabled)],
[ if test x$enableval = xyes; then CSS=1; else CSS=0; fi ], [ CSS=1; ])
if test x${CSS} = x1; then AC_DEFINE(HAVE_CSS, 1, Define if you want DVD CSS decryption.) fi
dnl
dnl Debugging mode
dnl
AC_ARG_ENABLE(debug,
[ --enable-debug Enable debug mode (default disabled)],
[ if test x$enableval = xyes; then DEBUG=1; fi ])
dnl
dnl Enable/disable statistics
dnl
AC_ARG_ENABLE(stats,
[ --enable-stats Enable printing of statistics (default disabled)],
[ if test x$enableval = xyes; then STATS=1; fi ])
dnl
dnl Enable/disable optimizations
dnl
AC_ARG_ENABLE(optimizations,
[ --disable-optimizations Disable compiler optimizations (default enabled)],
[ if test x$enableval = xno; then OPTIMS=0; fi ],
......@@ -162,14 +201,17 @@ AC_ARG_ENABLE(optimizations,
SYS=${host_os}
dnl special cases
dnl special case for BeOS
if test x$host_os = xbeos; then
PLUGINS=${PLUGINS}"beos "
LIB=${LIB}" -lbe -lgame -lroot"
BUILTINS=${BUILTINS}"beos "
LIB_BEOS="-lbe -lgame -lroot -ltracker"
dnl default case
else
dnl
dnl OSS /dev/dsp module
dnl
AC_ARG_ENABLE(dsp,
[ --disable-dsp Linux /dev/dsp support (default enabled)])
if test x$enable_dsp != xno; then
......@@ -177,19 +219,55 @@ if test x$enable_dsp != xno; then
PLUGINS=${PLUGINS}"dsp "
fi
fi
dnl
dnl Esound module
dnl
AC_ARG_ENABLE(esd,
[ --enable-esd Esound library support (default disabled)],
[if test x$enable_esd = xyes; then PLUGINS=${PLUGINS}"esd "; fi])
[if test x$enable_esd = xyes; then
PLUGINS=${PLUGINS}"esd "
LIB_ESD="`esd-config --libs`"
fi])
dnl
dnl Darwin module
dnl
AC_ARG_ENABLE(darwin,
[ --enable-darwin Darwin sound support (default disabled)],
[if test x$enable_darwin = xyes; then PLUGINS=${PLUGINS}"darwin "; fi])
[if test x$enable_darwin = xyes; then
PLUGINS=${PLUGINS}"darwin "
LIB_DARWIN="-framework CoreAudio"
fi])
dnl
dnl MacOS X module
dnl
AC_ARG_ENABLE(macosx,
[ --enable-macosx Mac OS X interface support (default enabled in Mac OS X)],
[if test x$enable_macosx = xyes; then PLUGINS=${PLUGINS}"macosx "; fi],
[AC_CHECK_HEADERS(Carbon/Carbon.h, PLUGINS=${PLUGINS}"macosx ")])
[if test x$enable_macosx = xyes; then
BUILTINS=${BUILTINS}"macosx "
LIB_MACOSX="-framework CoreAudio -framework Carbon -framework AGL"
LIB_TS=${LIB_TS}" -framework AGL -framework Carbon"
LIB_SDL=${LIB_SDL}" -framework AGL -framework Carbon"
fi],
[AC_CHECK_HEADERS(Carbon/Carbon.h,
BUILTINS=${BUILTINS}"macosx "
LIB_MACOSX="-framework CoreAudio -framework Carbon -framework AGL"
LIB_TS=${LIB_TS}" -framework AGL -framework Carbon"
LIB_SDL=${LIB_SDL}" -framework AGL -framework Carbon"
)])
dnl
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])
dnl
dnl GGI module
dnl
AC_ARG_WITH(ggi,
[ --with-ggi[=name] GGI support (default disabled)],
[ if test "x$withval" != "xno";
......@@ -202,6 +280,10 @@ AC_ARG_WITH(ggi,
LIB_GGI="-lggi"
fi
fi ])
dnl
dnl SDL module
dnl
AC_ARG_WITH(sdl,
[ --with-sdl[=name] SDL support (default enabled)],
[ if test "x$withval" != "xno";
......@@ -209,19 +291,23 @@ AC_ARG_WITH(sdl,
PLUGINS=${PLUGINS}"sdl ";
if test "x$withval" != "xyes";
then
LIB_SDL="-L/usr/X11R6/lib -L"$withval"/lib -l"$withval
LIB_SDL=${LIB_SDL}" -L/usr/X11R6/lib -L"$withval"/lib -l"$withval
INCLUDE=${INCLUDE}" -I"$withval"/include"
else
AC_CHECK_HEADERS(SDL/SDL.h, , [echo "Cannot find SDL headers !"; exit])
LIB_SDL="-L/usr/X11R6/lib -lSDL"
LIB_SDL=${LIB_SDL}" -L/usr/X11R6/lib -lSDL"
fi
fi ])
if test "x$withval" = "x";
then
AC_CHECK_HEADERS(SDL/SDL.h,
[PLUGINS=${PLUGINS}"sdl "
LIB_SDL="-L/usr/X11R6/lib -lSDL"])
LIB_SDL=${LIB_SDL}" -L/usr/X11R6/lib -lSDL"])
fi
dnl
dnl Glide module
dnl
AC_ARG_WITH(glide,
[ --with-glide[=name] Glide (3dfx) support (default disabled)],
[ if test "x$withval" != "xno";
......@@ -234,40 +320,97 @@ AC_ARG_WITH(glide,
LIB_GLIDE="-lglide2x"
fi
fi ])
dnl
dnl ncurses module
dnl
AC_ARG_ENABLE(ncurses,
[ --enable-ncurses ncurses interface support (default disabled)],
[if test x$enable_ncurses = xyes; then PLUGINS=${PLUGINS}"ncurses "; fi])
[if test x$enable_ncurses = xyes; then
PLUGINS=${PLUGINS}"ncurses "
LIB_NCURSES="-lncurses"
fi])
dnl
dnl Qt module
dnl
AC_ARG_ENABLE(qt,
[ --enable-qt Qt interface support (default disabled)],
[if test x$enable_qt = xyes; then PLUGINS=${PLUGINS}"qt "; ALIASES=${ALIASES}"qvlc "; fi])
[if test x$enable_qt = xyes; then
PLUGINS=${PLUGINS}"qt "
ALIASES=${ALIASES}"qvlc "
LIB_QT="-lqt -L${QTDIR}/lib"
fi])
dnl
dnl KDE module
dnl
AC_ARG_ENABLE(kde,
[ --enable-kde KDE interface support (default disabled)],
[if test x$enable_kde = xyes; then PLUGINS=${PLUGINS}"kde "; ALIASES=${ALIASES}"kvlc "; fi])
dnl
dnl Gnome module
dnl
AC_ARG_ENABLE(gnome,
[ --enable-gnome Gnome interface support (default disabled)],
[if test x$enable_gnome = xyes; then PLUGINS=${PLUGINS}"gnome "; ALIASES=${ALIASES}"gnome-vlc "; fi])
[if test x$enable_gnome = xyes; then
PLUGINS=${PLUGINS}"gnome "
ALIASES=${ALIASES}"gnome-vlc "
LIB_GNOME="`gnome-config --libs gnomeui | sed 's,-rdynamic,,'`"
fi])
dnl
dnl Gtk+ module
dnl
AC_ARG_ENABLE(gtk,
[ --disable-gtk Gtk+ support (default enabled)])
if test x$enable_gtk != xno; then
if which gtk-config; then
PLUGINS=${PLUGINS}"gtk "; ALIASES=${ALIASES}"gvlc "
PLUGINS=${PLUGINS}"gtk "
ALIASES=${ALIASES}"gvlc "
LIB_GTK="`gtk-config --libs gtk | sed 's,-rdynamic,,'`"
fi
fi
dnl
dnl X11 module
dnl
AC_ARG_ENABLE(x11,
[ --disable-x11 X11 support (default enabled)])
if test x$enable_x11 != xno; then
AC_CHECK_HEADERS(X11/Xlib.h, [PLUGINS=${PLUGINS}"x11 "])
AC_CHECK_HEADERS(X11/Xlib.h, [
PLUGINS=${PLUGINS}"x11 "
LIB_X11="-L/usr/X11R6/lib -lX11 -lXext"
])
fi
dnl
dnl XVideo module
dnl
AC_ARG_ENABLE(xvideo,
[ --enable-xvideo XVideo interface support (default disabled)],
[if test x$enable_xvideo = xyes; then PLUGINS=${PLUGINS}"xvideo "; fi])
[if test x$enable_xvideo = xyes; then
PLUGINS=${PLUGINS}"xvideo "
LIB_XVIDEO="-L/usr/X11R6/lib -lX11 -lXext"
fi])
dnl
dnl ALSA module
dnl
AC_ARG_ENABLE(alsa,
[ --enable-alsa Alsa sound drivers support (Only for linux) (default disabled)],
[if test x$enable_alsa = xyes; then AC_CHECK_HEADER(sys/asoundlib.h, AC_CHECK_LIB(asound, main, have_alsa="true", have_alsa="false"),have_alsa="false") if test $have_alsa = true; then PLUGINS=${PLUGINS}"alsa "; fi; fi])
[if test x$enable_alsa = xyes; then AC_CHECK_HEADER(sys/asoundlib.h, AC_CHECK_LIB(asound, main, have_alsa="true", have_alsa="false"),have_alsa="false") if test $have_alsa = true; then
PLUGINS=${PLUGINS}"alsa "
LIB_ALSA="-lasound"
fi; fi])
dnl end of non-BeOS stuff
fi
dnl
dnl Configuration is finished
dnl
AC_SUBST(SYS)
AC_SUBST(ARCH)
AC_SUBST(PLUGINS)
......@@ -282,9 +425,23 @@ AC_SUBST(CSS)
AC_SUBST(LCFLAGS)
AC_SUBST(LIB)
AC_SUBST(LIB_SDL)
AC_SUBST(LIB_GLIDE)
AC_SUBST(LIB_ALSA)
AC_SUBST(LIB_BEOS)
AC_SUBST(LIB_DARWIN)
AC_SUBST(LIB_ESD)
AC_SUBST(LIB_GGI)
AC_SUBST(LIB_GLIDE)
AC_SUBST(LIB_GNOME)
AC_SUBST(LIB_GTK)
AC_SUBST(LIB_IDCTALTIVEC)
AC_SUBST(LIB_MACOSX)
AC_SUBST(LIB_NCURSES)
AC_SUBST(LIB_QT)
AC_SUBST(LIB_TS)
AC_SUBST(LIB_SDL)
AC_SUBST(LIB_X11)
AC_SUBST(LIB_XVIDEO)
AC_SUBST(LIB_YUV)
AC_OUTPUT([Makefile.opts Makefile.modules include/config.h])
......
plugins/alsa/Makefile
View file @ 79a45f72
......@@ -49,7 +49,7 @@ $(STD_BUILTIN_OBJ): %-BUILTIN.o: %.c
# Real targets
#
../../lib/alsa.so: $(PLUGIN_ALSA)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) -lasound
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(LIB_ALSA)
../../lib/alsa.a: $(BUILTIN_ALSA)
ar r $@ $^
......
plugins/beos/Makefile
View file @ 79a45f72
......@@ -49,7 +49,7 @@ $(BUILTIN_BEOS): %-BUILTIN.o: %.cpp
# Real targets
#
../../lib/beos.so: $(PLUGIN_BEOS)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) -lbe -lgame -lroot -ltracker
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(LIB_BEOS)
../../lib/beos.a: $(BUILTIN_BEOS)
ar r $@ $^
......
plugins/darwin/Makefile
View file @ 79a45f72
......@@ -49,7 +49,7 @@ $(STD_BUILTIN_OBJ): %-BUILTIN.o: %.c
# Real targets
#
../../lib/darwin.so: $(PLUGIN_DARWIN)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) -framework CoreAudio
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(LIB_DARWIN)
../../lib/darwin.a: $(BUILTIN_DARWIN)
ar r $@ $^
......
plugins/esd/Makefile
View file @ 79a45f72
......@@ -49,11 +49,7 @@ $(STD_BUILTIN_OBJ): %-BUILTIN.o: %.c
# Real targets
#
../../lib/esd.so: $(PLUGIN_ESD)
ifneq (,$(findstring bsd,$(SYS)))
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) -lesd
else
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) -laudiofile -lesd
endif
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(LIB_ESD)
../../lib/esd.a: $(BUILTIN_ESD)
ar r $@ $^
......
plugins/gnome/Makefile
View file @ 79a45f72
......@@ -47,7 +47,7 @@ $(BUILTIN_GNOME): %-BUILTIN.o: %.c
# Real targets
#
../../lib/gnome.so: $(PLUGIN_GNOME)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) `gnome-config --libs gnomeui | sed 's,-rdynamic,,'`
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(LIB_GNOME)
../../lib/gnome.a: $(BUILTIN_GNOME)
ar r $@ $^
......
plugins/gtk/Makefile
View file @ 79a45f72
......@@ -47,7 +47,7 @@ $(BUILTIN_GTK): %-BUILTIN.o: %.c
# Real targets
#
../../lib/gtk.so: $(PLUGIN_GTK)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) `gtk-config --libs gtk | sed 's,-rdynamic,,'`
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(LIB_GTK)
../../lib/gtk.a: $(BUILTIN_GTK)
ar r $@ $^
......
plugins/idct/Makefile
View file @ 79a45f72
......@@ -107,7 +107,7 @@ $(BUILTIN_IDCTALTIVEC): %-BUILTIN-IDCTALTIVEC.o: %.c
ar r $@ $^
../../lib/idctaltivec.so: $(PLUGIN_IDCTALTIVEC) $(PLUGIN_IDCTCOMMON)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) -framework vecLib
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(LIB_IDCTALTIVEC)
../../lib/idctaltivec.a: $(BUILTIN_IDCTALTIVEC)
ar r $@ $^
......
plugins/macosx/Makefile
View file @ 79a45f72
......@@ -47,7 +47,7 @@ $(BUILTIN_MACOSX): %-BUILTIN.o: %.c
# Real targets
#
../../lib/macosx.so: $(PLUGIN_MACOSX)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) -framework CoreAudio -framework Carbon -framework AGL
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(LIB_MACOSX)
../../lib/macosx.a: $(BUILTIN_MACOSX)
ar r $@ $^
......
plugins/motion/Makefile
View file @ 79a45f72
......@@ -88,9 +88,3 @@ $(BUILTIN_MOTIONMMXEXT): %-BUILTIN-MOTIONMMXEXT.o: %.c
../../lib/motionmmxext.a: $(BUILTIN_MOTIONMMXEXT)
ar r $@ $^
../../lib/motionaltivec.so: $(PLUGIN_MOTIONALTIVEC) $(PLUGIN_MOTIONCOMMON)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) -framework vecLib
../../lib/motionaltivec.a: $(BUILTIN_MOTIONALTIVEC)
ar r $@ $^
plugins/mpeg/Makefile
View file @ 79a45f72
......@@ -57,11 +57,7 @@ $(STD_BUILTIN_OBJ): %-BUILTIN.o: %.c
ar r $@ $^
../../lib/ts.so: $(PLUGIN_TS)
ifneq (,$(findstring darwin,$(SYS)))
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) -framework AGL -framework Carbon
else
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS)
endif
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(LIB_TS)
../../lib/ts.a: $(BUILTIN_TS)
ar r $@ $^
......
plugins/qt/Makefile
View file @ 79a45f72
......@@ -41,17 +41,17 @@ $(PLUGIN_QT): %.o: %.moc
$(PLUGIN_QT:%.o=%.moc): %.moc: %.cpp
moc -i $< -o $@
$(BUILTIN_QT): %.o: .dep/%.dpp
$(BUILTIN_QT): %-BUILTIN.o: .dep/%.dpp
$(BUILTIN_QT): %.o: %.moc
$(CC) $(CFLAGS) -DBUILTIN -I/usr/include/qt -I${QTDIR}/include -c -o $@ $(<:%.moc=%.cpp)
$(BUILTIN_QT:%.o=%.moc): %.moc: %.cpp
$(CC) $(CFLAGS) -DBUILTIN -I/usr/include/qt -I${QTDIR}/include -c -o $@ $(<:%-BUILTIN.moc=%.cpp)
$(BUILTIN_QT:%.o=%.moc): %-BUILTIN.moc: %.cpp
moc -i $< -o $@
#
# Real targets
#
../../lib/qt.so: $(PLUGIN_QT)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) -lqt -L${QTDIR}/lib
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(LIB_QT)
../../lib/qt.a: $(BUILTIN_QT)
ar r $@ $^
......
plugins/qt/intf_qt.cpp
View file @ 79a45f72
......@@ -2,7 +2,7 @@
* intf_qt.cpp: Qt interface
*****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN
* $Id: intf_qt.cpp,v 1.2 2001/03/18 00:01:13 sam Exp $
* $Id: intf_qt.cpp,v 1.3 2001/04/15 10:54:46 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
......@@ -140,7 +140,11 @@ private:
QLabel *p_date;
};
#include "intf_qt.moc"
#ifdef BUILTIN
# include "intf_qt-BUILTIN.moc"
#else
# include "intf_qt.moc"
#endif
#define SLIDER_MIN 0x00000
#define SLIDER_MAX 0x10000
......
plugins/sdl/Makefile
View file @ 79a45f72
......@@ -35,23 +35,19 @@ $(cdependancies): %.d: FORCE
$(ALL_OBJ): %.o: ../../Makefile.dep Makefile
$(STD_PLUGIN_OBJ): %.o: .dep/%.d
$(STD_PLUGIN_OBJ): %.o: %.c
$(PLUGIN_SDL): %.o: .dep/%.d
$(PLUGIN_SDL): %.o: %.c
$(CC) $(CFLAGS) $(PCFLAGS) -c -o $@ $<
$(STD_BUILTIN_OBJ): %-BUILTIN.o: .dep/%.d
$(STD_BUILTIN_OBJ): %-BUILTIN.o: %.c
$(BUILTIN_SDL): %-BUILTIN.o: .dep/%.d
$(BUILTIN_SDL): %-BUILTIN.o: %.c
$(CC) $(CFLAGS) -DBUILTIN -c -o $@ $<
#
# Real targets
#
../../lib/sdl.so: $(PLUGIN_SDL)
ifneq (,$(findstring darwin,$(SYS)))
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(LIB_SDL) -framework Carbon -framework AGL
else
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(LIB_SDL)
endif
../../lib/sdl.a: $(BUILTIN_SDL)
ar r $@ $^
......
plugins/text/Makefile
View file @ 79a45f72
......@@ -47,7 +47,7 @@ $(BUILTIN_NCURSES): %-BUILTIN.o: %.c
# Real targets
#
../../lib/ncurses.so: $(PLUGIN_NCURSES)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) -lncurses
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(LIB_NCURSES)
../../lib/ncurses.a: $(BUILTIN_NCURSES)
ar r $@ $^
......
plugins/x11/Makefile
View file @ 79a45f72
......@@ -53,9 +53,9 @@ $(STD_BUILTIN_OBJ): %-BUILTIN.o: %.c
#
../../lib/x11.so: $(PLUGIN_X11)
ifeq ($(SYS),nto-qnx)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) -L/usr/X11R6/lib -lX11 -lXext -lsocket
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(LIB_X11) -lsocket
else
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) -L/usr/X11R6/lib -lX11 -lXext
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(LIB_X11)
endif
../../lib/x11.a: $(BUILTIN_X11)
......@@ -63,9 +63,9 @@ endif
../../lib/xvideo.so: $(PLUGIN_XVIDEO)
ifeq ($(SYS),nto-qnx)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) -L/usr/X11R6/lib -lX11 -lXext -lXv -lsocket
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(LIB_XVIDEO) -lsocket
else
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) -L/usr/X11R6/lib -lX11 -lXext -lXv
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(LIB_XVIDEO)
endif
../../lib/xvideo.a: $(BUILTIN_XVIDEO)
......
plugins/yuv/Makefile
View file @ 79a45f72
......@@ -52,7 +52,7 @@ $(STD_BUILTIN_OBJ): %-BUILTIN.o: %.c
# Real targets
#
../../lib/yuv.so: $(PLUGIN_YUV)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(LIB_YUV)
../../lib/yuv.a: $(BUILTIN_YUV)
ar r $@ $^
......
src/misc/modules.c
View file @ 79a45f72
......@@ -2,7 +2,7 @@
* modules.c : Built-in and plugin modules management functions
*****************************************************************************
* Copyright (C) 2001 VideoLAN
* $Id: modules.c,v 1.23 2001/04/15 04:19:58 sam Exp $
* $Id: modules.c,v 1.24 2001/04/15 10:54:46 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
* Ethan C. Baldridge <BaldridgeE@cadmus.com>
......@@ -276,6 +276,9 @@ void module_ManageBank( module_bank_t * p_bank )
intf_WarnMsg( 3, "module: hiding unused module `%s'",
p_module->psz_name );
HideModule( p_module );
/* Break here, so that we only hide one module at a time */
break;
}
}
}
......
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