Commit 7291e0a7 authored by Sam Hocevar's avatar Sam Hocevar

(new in MAIN)

  * ./src/interface/interface.c: interfaces are no longer attached only to
    p_vlc.
  * ./src/libvlc.c, ./src/misc/modules.c, ./src/playlist/playlist.c,
    ./src/input/input.c: improvements in the playlist handling (not quite that
    yet though).
(ported from v0_4_1_branch)
  * ./configure.in, ./plugins/mpeg_system/mpeg_ts.c: fixed libdvbpsi handling.
  * ./src/misc/configuration.c: fixed the --nofoo option handling.
  * ./src/interface/main.c: fixed two compilation warnings under Solaris.
parent c4c5b603
...@@ -4,6 +4,11 @@ ...@@ -4,6 +4,11 @@
HEAD HEAD
* ./src/interface/interface.c: interfaces are no longer attached only to
p_vlc.
* ./src/libvlc.c, ./src/misc/modules.c, ./src/playlist/playlist.c,
./src/input/input.c: improvements in the playlist handling (not quite that
yet though).
* ./plugins/spudec/spu_decoder.c: we now use FIND_ANYWHERE to find a vout. * ./plugins/spudec/spu_decoder.c: we now use FIND_ANYWHERE to find a vout.
* ./plugins/dvd/dvd_es.c, ./plugins/satellite/input_satellite.c, * ./plugins/dvd/dvd_es.c, ./plugins/satellite/input_satellite.c,
./plugins/dvdread/input_dvdread.c: updated outdated variable names. ./plugins/dvdread/input_dvdread.c: updated outdated variable names.
...@@ -35,8 +40,21 @@ HEAD ...@@ -35,8 +40,21 @@ HEAD
* ALL: the first libvlc commit. * ALL: the first libvlc commit.
0.4.1 0.4.1
Not released yet Mon, 3 Jun 2002 23:43:35 +0200
* ./configure.in, ./plugins/mpeg_system/mpeg_ts.c: fixed libdvbpsi handling.
* ./src/misc/configuration.c: fixed the --nofoo option handling.
* ./src/interface/main.c: fixed two compilation warnings under Solaris.
* ./plugins/avi/avi.c, ./plugins/mpeg_system/mpeg_audio.c: ES will be
selected only once.
* ./plugins/win32/waveout.c: waveOutUnprepareHeader() was never being
called. This should fix the memory leak some people reported when using
the waveout plugin.
* ./src/misc/netutils.c: factored code common to the interfaces into the
network_ChannelJoin function.
* ./plugins/mga/xmga.c, ./plugins/x11/xcommon.c, ./plugins/sdl/vout_sdl.c,
./plugins/directx/vout_events.c: we can now use keys F1 to F12 to switch
channels from the video output window.
* ./plugins/motion/motionmmx.c: MMX motion optimizations courtesy of * ./plugins/motion/motionmmx.c: MMX motion optimizations courtesy of
Vladimir Chernyshov <greengrass@writeme.com>. Vladimir Chernyshov <greengrass@writeme.com>.
* ./plugins/dvdread/dvdread.c: disabled the dvdread plugin because it * ./plugins/dvdread/dvdread.c: disabled the dvdread plugin because it
......
...@@ -58,20 +58,21 @@ builtins_CFLAGS := @builtins_CFLAGS@ ...@@ -58,20 +58,21 @@ builtins_CFLAGS := @builtins_CFLAGS@
a52_CFLAGS = @a52_CFLAGS@ a52_CFLAGS = @a52_CFLAGS@
arts_CFLAGS = @arts_CFLAGS@ arts_CFLAGS = @arts_CFLAGS@
chroma_i420_yuy2_mmx_CFLAGS = @chroma_i420_yuy2_mmx_CFLAGS@
directx_CFLAGS = @directx_CFLAGS@
dvd_CFLAGS = @dvd_CFLAGS@ dvd_CFLAGS = @dvd_CFLAGS@
dvdread_CFLAGS = @dvdread_CFLAGS@ dvdread_CFLAGS = @dvdread_CFLAGS@
mpeg_ts_dvbpsi_CFLAGS = @mpeg_ts_dvbpsi_CFLAGS@
directx_CFLAGS = @directx_CFLAGS@
esd_CFLAGS = @esd_CFLAGS@ esd_CFLAGS = @esd_CFLAGS@
ffmpeg_CFLAGS = @ffmpeg_CFLAGS@ ffmpeg_CFLAGS = @ffmpeg_CFLAGS@
glide_CFLAGS = @glide_CFLAGS@ glide_CFLAGS = @glide_CFLAGS@
gnome_CFLAGS = @gnome_CFLAGS@ gnome_CFLAGS = @gnome_CFLAGS@
gtk_CFLAGS = @gtk_CFLAGS@ gtk_CFLAGS = @gtk_CFLAGS@
kde_CFLAGS = @kde_CFLAGS@
idctaltivec_CFLAGS = @idctaltivec_CFLAGS@ idctaltivec_CFLAGS = @idctaltivec_CFLAGS@
kde_CFLAGS = @kde_CFLAGS@
mad_CFLAGS = @mad_CFLAGS@ mad_CFLAGS = @mad_CFLAGS@
memcpyaltivec_CFLAGS = @memcpyaltivec_CFLAGS@ memcpyaltivec_CFLAGS = @memcpyaltivec_CFLAGS@
motionaltivec_CFLAGS = @motionaltivec_CFLAGS@ motionaltivec_CFLAGS = @motionaltivec_CFLAGS@
mpeg_ts_dvbpsi_CFLAGS = @mpeg_ts_dvbpsi_CFLAGS@
qt_CFLAGS = @qt_CFLAGS@ qt_CFLAGS = @qt_CFLAGS@
sdl_CFLAGS = @sdl_CFLAGS@ sdl_CFLAGS = @sdl_CFLAGS@
x11_CFLAGS = @x11_CFLAGS@ x11_CFLAGS = @x11_CFLAGS@
...@@ -94,7 +95,6 @@ directx_LDFLAGS = @directx_LDFLAGS@ ...@@ -94,7 +95,6 @@ directx_LDFLAGS = @directx_LDFLAGS@
dsp_LDFLAGS = @dsp_LDFLAGS@ dsp_LDFLAGS = @dsp_LDFLAGS@
dvd_LDFLAGS = @dvd_LDFLAGS@ dvd_LDFLAGS = @dvd_LDFLAGS@
dvdread_LDFLAGS = @dvdread_LDFLAGS@ dvdread_LDFLAGS = @dvdread_LDFLAGS@
mpeg_ts_dvbpsi_LDFLAGS = @mpeg_ts_dvbpsi_LDFLAGS@
esd_LDFLAGS = @esd_LDFLAGS@ esd_LDFLAGS = @esd_LDFLAGS@
filter_distort_LDFLAGS = @filter_distort_LDFLAGS@ filter_distort_LDFLAGS = @filter_distort_LDFLAGS@
ffmpeg_LDFLAGS = @ffmpeg_LDFLAGS@ ffmpeg_LDFLAGS = @ffmpeg_LDFLAGS@
...@@ -115,6 +115,7 @@ macosx_LDFLAGS = @macosx_LDFLAGS@ ...@@ -115,6 +115,7 @@ macosx_LDFLAGS = @macosx_LDFLAGS@
mad_LDFLAGS = @mad_LDFLAGS@ mad_LDFLAGS = @mad_LDFLAGS@
memcpyaltivec_LDFLAGS = @memcpyaltivec_LDFLAGS@ memcpyaltivec_LDFLAGS = @memcpyaltivec_LDFLAGS@
motionaltivec_LDFLAGS = @motionaltivec_LDFLAGS@ motionaltivec_LDFLAGS = @motionaltivec_LDFLAGS@
mpeg_ts_dvbpsi_LDFLAGS = @mpeg_ts_dvbpsi_LDFLAGS@
ncurses_LDFLAGS = @ncurses_LDFLAGS@ ncurses_LDFLAGS = @ncurses_LDFLAGS@
qnx_LDFLAGS = @qnx_LDFLAGS@ qnx_LDFLAGS = @qnx_LDFLAGS@
qt_LDFLAGS = @qt_LDFLAGS@ qt_LDFLAGS = @qt_LDFLAGS@
......
...@@ -47,7 +47,7 @@ Urgency: Wishlist ...@@ -47,7 +47,7 @@ Urgency: Wishlist
Description: Share stream information between vlc and vls Description: Share stream information between vlc and vls
vls should send misc TS packets to let us know what the stream PID vls should send misc TS packets to let us know what the stream PID
contain, such as the language, or the subtitle palette. contain, such as the language, or the subtitle palette.
Status: Todo Status: Done (collective work)
Task: 0x59 Task: 0x59
Difficulty: Hard Difficulty: Hard
...@@ -137,7 +137,7 @@ Description: Fix all known DVD playback issues ...@@ -137,7 +137,7 @@ Description: Fix all known DVD playback issues
A few DVDs are still reported not to work at all. Try to find what is 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 causing this, have a more robust DVD input, and list all discs reported
to work flawlessly to prevent bug regression. to work flawlessly to prevent bug regression.
Status: Todo Status: Done (collective work)
Task: 0x4e Task: 0x4e
Difficulty: Hard Difficulty: Hard
...@@ -169,7 +169,7 @@ Urgency: Normal ...@@ -169,7 +169,7 @@ Urgency: Normal
Description: Write AVI input plugin Description: Write AVI input plugin
.avi files can use MPEG codec, if this is the case it shouldn't be .avi files can use MPEG codec, if this is the case it shouldn't be
hard to read those files -> Meuuh hard to read those files -> Meuuh
Status: Todo Status: Done 23 Apr 2002 (fenrir)
Task: 0x4a Task: 0x4a
Difficulty: Medium Difficulty: Medium
...@@ -459,7 +459,7 @@ Difficulty: Hard ...@@ -459,7 +459,7 @@ Difficulty: Hard
Urgency: Wishlist Urgency: Wishlist
Description: MP3 support Description: MP3 support
The vlc cannot play MPEG1/2 layer 3 yet. It might be nice to fix that. The vlc cannot play MPEG1/2 layer 3 yet. It might be nice to fix that.
Status: Todo Status: Done 10 May 2002 (fenrir)
Task: 0x25 Task: 0x25
Difficulty: Hard Difficulty: Hard
......
This diff is collapsed.
...@@ -3,16 +3,22 @@ AC_INIT(include/main.h) ...@@ -3,16 +3,22 @@ AC_INIT(include/main.h)
AC_CONFIG_HEADER(include/defs.h) AC_CONFIG_HEADER(include/defs.h)
AC_CANONICAL_SYSTEM AC_CANONICAL_SYSTEM
CONFIGURE_LINE="$0 $*"
PACKAGE="vlc" PACKAGE="vlc"
VERSION="0.4.0" VERSION="0.5.0-cvs"
CODENAME=Ourumov CODENAME="Natalya"
dnl Save CFLAGS and LDFLAGS dnl
save_CFLAGS="${CFLAGS}" dnl Save *FLAGS
dnl
save_CPPFLAGS="${CPPFLAGS}" save_CPPFLAGS="${CPPFLAGS}"
save_CFLAGS="${CFLAGS}"
save_LDFLAGS="${LDFLAGS}" save_LDFLAGS="${LDFLAGS}"
dnl
dnl Check for tools dnl Check for tools
dnl
AC_PROG_MAKE_SET AC_PROG_MAKE_SET
AC_PROG_CC AC_PROG_CC
AC_PROG_CPP AC_PROG_CPP
...@@ -21,7 +27,9 @@ dnl Find the right ranlib, even when cross-compiling ...@@ -21,7 +27,9 @@ dnl Find the right ranlib, even when cross-compiling
AC_CHECK_TOOL(RANLIB, ranlib, :) AC_CHECK_TOOL(RANLIB, ranlib, :)
AC_CHECK_TOOL(STRIP, strip, :) AC_CHECK_TOOL(STRIP, strip, :)
dnl
dnl Check for GNU make dnl Check for GNU make
dnl
AC_PATH_PROG(GMAKE, gmake, no) AC_PATH_PROG(GMAKE, gmake, no)
if test "x$GMAKE" = "xno"; then if test "x$GMAKE" = "xno"; then
AC_CACHE_CHECK([whether GNU make is installed], AC_CACHE_CHECK([whether GNU make is installed],
...@@ -48,6 +56,11 @@ AM_GNU_GETTEXT ...@@ -48,6 +56,11 @@ AM_GNU_GETTEXT
dnl AM_PROG_LIBTOOL dnl AM_PROG_LIBTOOL
AC_PROG_INSTALL AC_PROG_INSTALL
dnl
dnl Set default LDFLAGS
dnl
vlc_LDFLAGS="${LDFLAGS}"
dnl dnl
dnl Check the operating system dnl Check the operating system
dnl dnl
...@@ -120,6 +133,10 @@ AC_CHECK_FUNC(connect,,[ ...@@ -120,6 +133,10 @@ AC_CHECK_FUNC(connect,,[
ipv4_LDFLAGS="${ipv4_LDFLAGS} -lsocket" ipv4_LDFLAGS="${ipv4_LDFLAGS} -lsocket"
vlc_LDFLAGS="${vlc_LDFLAGS} -lsocket" vlc_LDFLAGS="${vlc_LDFLAGS} -lsocket"
)]) )])
AC_CHECK_FUNC(send,,[
AC_CHECK_LIB(socket,send,
http_LDFLAGS="${http_LDFLAGS} -lsocket"
)])
AC_CHECK_FUNC(gethostbyname,,[ AC_CHECK_FUNC(gethostbyname,,[
AC_CHECK_LIB(nsl,gethostbyname,ipv4_LDFLAGS="${ipv4_LDFLAGS} -lnsl") AC_CHECK_LIB(nsl,gethostbyname,ipv4_LDFLAGS="${ipv4_LDFLAGS} -lnsl")
]) ])
...@@ -137,7 +154,7 @@ AC_CHECK_FUNC(inet_aton,,[ ...@@ -137,7 +154,7 @@ AC_CHECK_FUNC(inet_aton,,[
AC_CHECK_LIB(resolv,inet_aton,ipv4_LDFLAGS="${ipv4_LDFLAGS} -lresolv") AC_CHECK_LIB(resolv,inet_aton,ipv4_LDFLAGS="${ipv4_LDFLAGS} -lresolv")
]) ])
AC_CHECK_FUNC(textdomain,,[ AC_CHECK_FUNC(textdomain,,[
AC_CHECK_LIB(intl,textdomain,save_LDFLAGS="${save_LDFLAGS} -lintl") AC_CHECK_LIB(intl,textdomain,vlc_LDFLAGS="${vlc_LDFLAGS} -lintl")
]) ])
dnl Check for getopt dnl Check for getopt
...@@ -154,6 +171,7 @@ AC_CHECK_LIB(m,cos, ...@@ -154,6 +171,7 @@ AC_CHECK_LIB(m,cos,
imdct_LDFLAGS="${imdct_LDFLAGS} -lm" imdct_LDFLAGS="${imdct_LDFLAGS} -lm"
filter_distort_LDFLAGS="${filter_distort_LDFLAGS} -lm") filter_distort_LDFLAGS="${filter_distort_LDFLAGS} -lm")
AC_CHECK_LIB(m,pow, AC_CHECK_LIB(m,pow,
ffmpeg_LDFLAGS="${ffmpeg_LDFLAGS} -lm"
imdct_LDFLAGS="${imdct_LDFLAGS} -lm" imdct_LDFLAGS="${imdct_LDFLAGS} -lm"
imdct3dn_LDFLAGS="${imdct3dn_LDFLAGS} -lm" imdct3dn_LDFLAGS="${imdct3dn_LDFLAGS} -lm"
imdctsse_LDFLAGS="${imdctsse_LDFLAGS} -lm" imdctsse_LDFLAGS="${imdctsse_LDFLAGS} -lm"
...@@ -183,12 +201,15 @@ dnl Check for misc headers ...@@ -183,12 +201,15 @@ dnl Check for misc headers
AC_EGREP_HEADER(pthread_cond_t,pthread.h,[ AC_EGREP_HEADER(pthread_cond_t,pthread.h,[
AC_DEFINE(PTHREAD_COND_T_IN_PTHREAD_H, 1, AC_DEFINE(PTHREAD_COND_T_IN_PTHREAD_H, 1,
Define if <pthread.h> defines pthread_cond_t.)]) Define if <pthread.h> defines pthread_cond_t.)])
AC_EGREP_HEADER(pthread_once,pthread.h,[
AC_DEFINE(PTHREAD_ONCE_IN_PTHREAD_H, 1,
Define if <pthread.h> defines pthread_once.)])
AC_EGREP_HEADER(strncasecmp,strings.h,[ AC_EGREP_HEADER(strncasecmp,strings.h,[
AC_DEFINE(STRNCASECMP_IN_STRINGS_H, 1, AC_DEFINE(STRNCASECMP_IN_STRINGS_H, 1,
Define if <strings.h> defines strncasecmp.)]) Define if <strings.h> defines strncasecmp.)])
dnl Check for headers dnl Check for headers
AC_CHECK_HEADERS(getopt.h strings.h) AC_CHECK_HEADERS(stdint.h getopt.h strings.h inttypes.h sys/int_types.h)
AC_CHECK_HEADERS(sys/sockio.h fcntl.h sys/types.h sys/time.h sys/times.h) AC_CHECK_HEADERS(sys/sockio.h fcntl.h sys/types.h sys/time.h sys/times.h)
AC_CHECK_HEADERS(dlfcn.h image.h) AC_CHECK_HEADERS(dlfcn.h image.h)
AC_CHECK_HEADERS(arpa/inet.h net/if.h netinet/in.h sys/socket.h) AC_CHECK_HEADERS(arpa/inet.h net/if.h netinet/in.h sys/socket.h)
...@@ -254,17 +275,17 @@ fi ...@@ -254,17 +275,17 @@ fi
dnl Check for -W or -w flags dnl Check for -W or -w flags
AC_CACHE_CHECK([if \$CC accepts -Wall -Winline], AC_CACHE_CHECK([if \$CC accepts -Wall -Winline],
[ac_cv_c_Wall_Winline], [ac_cv_c_Wall_Winline],
[CFLAGS="${save_CFLAGS} -Wall -Winline" [CFLAGS="-Wall -Winline ${save_CFLAGS}"
AC_TRY_COMPILE([],,ac_cv_c_Wall_Winline=yes, ac_cv_c_Wall_Winline=no)]) AC_TRY_COMPILE([],,ac_cv_c_Wall_Winline=yes, ac_cv_c_Wall_Winline=no)])
if test x"$ac_cv_c_Wall_Winline" != x"no"; then if test x"$ac_cv_c_Wall_Winline" != x"no"; then
save_CFLAGS="${save_CFLAGS} -Wall -Winline" save_CFLAGS="-Wall -Winline ${save_CFLAGS}"
else else
AC_CACHE_CHECK([if \$CC accepts -wall -winline], AC_CACHE_CHECK([if \$CC accepts -wall -winline],
[ac_cv_c_wall_winline], [ac_cv_c_wall_winline],
[CFLAGS="${save_CFLAGS} -wall -winline" [CFLAGS="-wall -winline ${save_CFLAGS}"
AC_TRY_COMPILE([],,ac_cv_c_wall_winline=yes, ac_cv_c_wall_winline=no)]) AC_TRY_COMPILE([],,ac_cv_c_wall_winline=yes, ac_cv_c_wall_winline=no)])
if test x"$ac_cv_c_wall_winline" != x"no"; then if test x"$ac_cv_c_wall_winline" != x"no"; then
save_CFLAGS="${save_CFLAGS} -wall -winline" save_CFLAGS="-wall -winline ${save_CFLAGS}"
fi fi
fi fi
...@@ -327,6 +348,8 @@ AC_CACHE_CHECK([if \$CC accepts -fomit-frame-pointer], ...@@ -327,6 +348,8 @@ AC_CACHE_CHECK([if \$CC accepts -fomit-frame-pointer],
AC_TRY_COMPILE([],,ac_cv_c_omit_frame_pointer=yes, ac_cv_c_omit_frame_pointer=no)]) AC_TRY_COMPILE([],,ac_cv_c_omit_frame_pointer=yes, ac_cv_c_omit_frame_pointer=no)])
if test x"$ac_cv_c_omit_frame_pointer" != x"no"; then if test x"$ac_cv_c_omit_frame_pointer" != x"no"; then
CFLAGS_OPTIM_NODEBUG="${CFLAGS_OPTIM_NODEBUG} -fomit-frame-pointer" CFLAGS_OPTIM_NODEBUG="${CFLAGS_OPTIM_NODEBUG} -fomit-frame-pointer"
# this plugin does not compile without -fomit-frame-pointer, damn gcc!
chroma_i420_yuy2_mmx_CFLAGS="${chroma_i420_yuy2_mmx_CFLAGS} -fomit-frame-pointer"
fi fi
dnl Check for Darwin plugin linking flags dnl Check for Darwin plugin linking flags
...@@ -376,36 +399,6 @@ if test x"$ac_cv_c_attribute_aligned" != x"0"; then ...@@ -376,36 +399,6 @@ if test x"$ac_cv_c_attribute_aligned" != x"0"; then
[$ac_cv_c_attribute_aligned],[Maximum supported data alignment]) [$ac_cv_c_attribute_aligned],[Maximum supported data alignment])
fi fi
dnl End of the bizarre compilation tests
CFLAGS="${save_CFLAGS}"
CPPFLAGS="${save_CPPFLAGS}"
LDFLAGS="${save_LDFLAGS}"
dnl Check for boolean_t
AC_CACHE_CHECK([for boolean_t in sys/types.h],
[ac_cv_c_boolean_t_sys_types_h],
[AC_TRY_COMPILE([#include <sys/types.h>], [boolean_t foo;],
ac_cv_c_boolean_t_sys_types_h=yes, ac_cv_c_boolean_t_sys_types_h=no)])
if test x"$ac_cv_c_boolean_t_sys_types_h" != x"no"; then
AC_DEFINE(BOOLEAN_T_IN_SYS_TYPES_H, 1, Define if <sys/types.h> defines boolean_t.)
fi
AC_CACHE_CHECK([for boolean_t in pthread.h],
[ac_cv_c_boolean_t_pthread_h],
[AC_TRY_COMPILE([#include <pthread.h>], [boolean_t foo;],
ac_cv_c_boolean_t_pthread_h=yes, ac_cv_c_boolean_t_pthread_h=no)])
if test x"$ac_cv_c_boolean_t_pthread_h" != x"no"; then
AC_DEFINE(BOOLEAN_T_IN_PTHREAD_H, 1, Define if <pthread.h> defines boolean_t.)
fi
AC_CACHE_CHECK([for boolean_t in cthreads.h],
[ac_cv_c_boolean_t_cthreads_h],
[AC_TRY_COMPILE([#include <cthreads.h>], [boolean_t foo;],
ac_cv_c_boolean_t_cthreads_h=yes, ac_cv_c_boolean_t_cthreads_h=no)])
if test x"$ac_cv_c_boolean_t_cthreads_h" != x"no"; then
AC_DEFINE(BOOLEAN_T_IN_CTHREADS_H, 1, Define if <cthreads.h> defines boolean_t.)
fi
dnl dnl
dnl Check the CPU dnl Check the CPU
dnl dnl
...@@ -421,8 +414,8 @@ esac ...@@ -421,8 +414,8 @@ esac
dnl dnl
dnl default modules dnl default modules
dnl dnl
BUILTINS="${BUILTINS} idct idctclassic motion imdct downmix chroma_i420_rgb chroma_i420_yuy2 chroma_i422_yuy2 chroma_i420_ymga mpeg_adec ac3_adec mpeg_vdec" BUILTINS="${BUILTINS} idct idctclassic motion imdct downmix mpeg_adec ac3_adec mpeg_vdec"
PLUGINS="${PLUGINS} dummy null rc logger mpeg_es mpeg_ps mpeg_ts mpeg_audio file udp http ipv4 memcpy lpcm_adec ac3_spdif spudec filter_deinterlace filter_invert filter_wall filter_transform filter_distort filter_clone fx_scope" PLUGINS="${PLUGINS} dummy null rc logger mpeg_es mpeg_audio mpeg_ps mpeg_ts file udp http ipv4 memcpy lpcm_adec ac3_spdif spudec filter_deinterlace filter_invert filter_wall filter_transform filter_distort filter_clone filter_crop fx_scope chroma_i420_rgb chroma_i420_yuy2 chroma_i422_yuy2 chroma_i420_ymga"
dnl dnl
dnl Accelerated modules dnl Accelerated modules
...@@ -435,7 +428,8 @@ ALTIVEC_MODULES="idctaltivec motionaltivec memcpyaltivec" ...@@ -435,7 +428,8 @@ ALTIVEC_MODULES="idctaltivec motionaltivec memcpyaltivec"
AC_CACHE_CHECK([if \$CC groks MMX inline assembly], AC_CACHE_CHECK([if \$CC groks MMX inline assembly],
[ac_cv_mmx_inline], [ac_cv_mmx_inline],
[AC_TRY_COMPILE(,[void *p;asm volatile("packuswb %%mm1,%%mm2"::"r"(p));], [CFLAGS="${save_CFLAGS}"
AC_TRY_COMPILE(,[void *p;asm volatile("packuswb %%mm1,%%mm2"::"r"(p));],
ac_cv_mmx_inline=yes, ac_cv_mmx_inline=no)]) ac_cv_mmx_inline=yes, ac_cv_mmx_inline=no)])
if test x"$ac_cv_mmx_inline" != x"no"; then if test x"$ac_cv_mmx_inline" != x"no"; then
ACCEL_MODULES="${ACCEL_MODULES} ${MMX_MODULES}" ACCEL_MODULES="${ACCEL_MODULES} ${MMX_MODULES}"
...@@ -443,7 +437,8 @@ fi ...@@ -443,7 +437,8 @@ fi
AC_CACHE_CHECK([if \$CC groks MMX EXT inline assembly], AC_CACHE_CHECK([if \$CC groks MMX EXT inline assembly],
[ac_cv_mmxext_inline], [ac_cv_mmxext_inline],
[AC_TRY_COMPILE(,[void *p;asm volatile("maskmovq %%mm1,%%mm2"::"r"(p));], [CFLAGS="${save_CFLAGS}"
AC_TRY_COMPILE(,[void *p;asm volatile("maskmovq %%mm1,%%mm2"::"r"(p));],
ac_cv_mmxext_inline=yes, ac_cv_mmxext_inline=no)]) ac_cv_mmxext_inline=yes, ac_cv_mmxext_inline=no)])
if test x"$ac_cv_mmxext_inline" != x"no"; then if test x"$ac_cv_mmxext_inline" != x"no"; then
ACCEL_MODULES="${ACCEL_MODULES} ${MMXEXT_MODULES}" ACCEL_MODULES="${ACCEL_MODULES} ${MMXEXT_MODULES}"
...@@ -451,7 +446,8 @@ fi ...@@ -451,7 +446,8 @@ fi
AC_CACHE_CHECK([if \$CC groks 3D Now! inline assembly], AC_CACHE_CHECK([if \$CC groks 3D Now! inline assembly],
[ac_cv_3dnow_inline], [ac_cv_3dnow_inline],
[AC_TRY_COMPILE(,[void *p;asm volatile("pfadd %%mm1,%%mm2"::"r"(p));], [CFLAGS="${save_CFLAGS}"
AC_TRY_COMPILE(,[void *p;asm volatile("pfadd %%mm1,%%mm2"::"r"(p));],
ac_cv_3dnow_inline=yes, ac_cv_3dnow_inline=no)]) ac_cv_3dnow_inline=yes, ac_cv_3dnow_inline=no)])
if test x"$ac_cv_3dnow_inline" != x"no"; then if test x"$ac_cv_3dnow_inline" != x"no"; then
AC_DEFINE(CAN_COMPILE_3DNOW, 1, Define if \$CC groks 3D Now! inline assembly.) AC_DEFINE(CAN_COMPILE_3DNOW, 1, Define if \$CC groks 3D Now! inline assembly.)
...@@ -460,29 +456,29 @@ fi ...@@ -460,29 +456,29 @@ fi
AC_CACHE_CHECK([if \$CC groks SSE inline assembly], AC_CACHE_CHECK([if \$CC groks SSE inline assembly],
[ac_cv_sse_inline], [ac_cv_sse_inline],
[AC_TRY_COMPILE(,[void *p;asm volatile("xorps %%xmm1,%%xmm2"::"r"(p));], [CFLAGS="${save_CFLAGS}"
AC_TRY_COMPILE(,[void *p;asm volatile("xorps %%xmm1,%%xmm2"::"r"(p));],
ac_cv_sse_inline=yes, ac_cv_sse_inline=no)]) ac_cv_sse_inline=yes, ac_cv_sse_inline=no)])
if test x"$ac_cv_sse_inline" != x"no" -a x$SYS != xmingw32; then if test x"$ac_cv_sse_inline" != x"no" -a x$SYS != xmingw32; then
AC_DEFINE(CAN_COMPILE_SSE, 1, Define if \$CC groks SSE inline assembly.) AC_DEFINE(CAN_COMPILE_SSE, 1, Define if \$CC groks SSE inline assembly.)
ACCEL_MODULES="${ACCEL_MODULES} ${SSE_MODULES}" ACCEL_MODULES="${ACCEL_MODULES} ${SSE_MODULES}"
fi fi
# don't try to grok altivec with native mingw32 it doesn't work right now # don't try to grok AltiVec with native mingw32 it doesn't work right now
# we should be able to remove this test with future versions of mingw32 # we should be able to remove this test with future versions of mingw32
if test x$SYS != xmingw32; then if test x$SYS != xmingw32; then
AC_CACHE_CHECK([if \$CC groks Altivec inline assembly], AC_CACHE_CHECK([if \$CC groks AltiVec inline assembly],
[ac_cv_altivec_inline], [ac_cv_altivec_inline],
[AC_TRY_COMPILE(,[asm volatile("vperm 0,1,2,3");], [CFLAGS="${save_CFLAGS}"
AC_TRY_COMPILE(,[asm volatile("vperm 0,1,2,3");],
ac_cv_altivec_inline=yes, ac_cv_altivec_inline=yes,
[save_CFLAGS=$CFLAGS [CFLAGS="$save_CFLAGS -Wa,-m7400"
CFLAGS="$CFLAGS -Wa,-m7400"
AC_TRY_COMPILE(,[asm volatile("vperm 0,1,2,3");], AC_TRY_COMPILE(,[asm volatile("vperm 0,1,2,3");],
[ac_cv_altivec_inline="-Wa,-m7400"], [ac_cv_altivec_inline="-Wa,-m7400"],
ac_cv_altivec_inline=no) ac_cv_altivec_inline=no)
CFLAGS=$save_CFLAGS
])]) ])])
if test x"$ac_cv_altivec_inline" != x"no"; then if test x"$ac_cv_altivec_inline" != x"no"; then
AC_DEFINE(CAN_COMPILE_ALTIVEC, 1, Define if \$CC groks ALTIVEC inline assembly.) AC_DEFINE(CAN_COMPILE_ALTIVEC, 1, Define if \$CC groks AltiVec inline assembly.)
if test x"$ac_cv_altivec_inline" != x"yes"; then if test x"$ac_cv_altivec_inline" != x"yes"; then
idctaltivec_CFLAGS="$idctaltivec_CFLAGS $ac_cv_altivec_inline" idctaltivec_CFLAGS="$idctaltivec_CFLAGS $ac_cv_altivec_inline"
motionaltivec_CFLAGS="$motionaltivec_CFLAGS $ac_cv_altivec_inline" motionaltivec_CFLAGS="$motionaltivec_CFLAGS $ac_cv_altivec_inline"
...@@ -492,10 +488,9 @@ if test x"$ac_cv_altivec_inline" != x"no"; then ...@@ -492,10 +488,9 @@ if test x"$ac_cv_altivec_inline" != x"no"; then
ACCEL_MODULES="${ACCEL_MODULES} ${ALTIVEC_MODULES}" ACCEL_MODULES="${ACCEL_MODULES} ${ALTIVEC_MODULES}"
fi fi
AC_CACHE_CHECK([if \$CC groks Altivec C extensions], AC_CACHE_CHECK([if \$CC groks AltiVec C extensions],
[ac_cv_c_altivec], [ac_cv_c_altivec],
[save_CFLAGS=$CFLAGS [CFLAGS="$save_CFLAGS -faltivec"
CFLAGS="$CFLAGS -faltivec"
# Darwin test # Darwin test
AC_TRY_COMPILE(,[vec_mtvscr((vector unsigned int)(0));], AC_TRY_COMPILE(,[vec_mtvscr((vector unsigned int)(0));],
ac_cv_c_altivec=-faltivec, [ ac_cv_c_altivec=-faltivec, [
...@@ -504,10 +499,9 @@ AC_CACHE_CHECK([if \$CC groks Altivec C extensions], ...@@ -504,10 +499,9 @@ AC_CACHE_CHECK([if \$CC groks Altivec C extensions],
AC_TRY_COMPILE(,[vec_mtvscr((vector unsigned int)(0));], AC_TRY_COMPILE(,[vec_mtvscr((vector unsigned int)(0));],
[ac_cv_c_altivec="-fvec"], ac_cv_c_altivec=no) [ac_cv_c_altivec="-fvec"], ac_cv_c_altivec=no)
]) ])
CFLAGS=$save_CFLAGS
]) ])
if test x"$ac_cv_c_altivec" != x"no"; then if test x"$ac_cv_c_altivec" != x"no"; then
AC_DEFINE(CAN_COMPILE_C_ALTIVEC, 1, Define if your compiler groks C altivec extensions.) AC_DEFINE(CAN_COMPILE_C_ALTIVEC, 1, Define if your compiler groks C AltiVec extensions.)
idctaltivec_CFLAGS="$idctaltivec_CFLAGS $ac_cv_c_altivec" idctaltivec_CFLAGS="$idctaltivec_CFLAGS $ac_cv_c_altivec"
motionaltivec_CFLAGS="$motionaltivec_CFLAGS $ac_cv_c_altivec" motionaltivec_CFLAGS="$motionaltivec_CFLAGS $ac_cv_c_altivec"
memcpyaltivec_CFLAGS="$memcpyaltivec_CFLAGS $ac_cv_c_altivec" memcpyaltivec_CFLAGS="$memcpyaltivec_CFLAGS $ac_cv_c_altivec"
...@@ -517,10 +511,8 @@ fi ...@@ -517,10 +511,8 @@ fi
AC_CACHE_CHECK([if linker needs -framework vecLib], AC_CACHE_CHECK([if linker needs -framework vecLib],
[ac_cv_ld_altivec], [ac_cv_ld_altivec],
[save_LDFLAGS=$LDFLAGS [LDFLAGS="$vlc_LDFLAGS -framework vecLib"
LDFLAGS="$LDFLAGS -framework vecLib"
AC_TRY_LINK([],,ac_cv_ld_altivec=yes,ac_cv_ld_altivec=no) AC_TRY_LINK([],,ac_cv_ld_altivec=yes,ac_cv_ld_altivec=no)
LDFLAGS=$save_LDFLAGS
]) ])
if test x"$ac_cv_ld_altivec" != x"no"; then if test x"$ac_cv_ld_altivec" != x"no"; then
idctaltivec_LDFLAGS="${idctaltivec_LDFLAGS} -framework vecLib" idctaltivec_LDFLAGS="${idctaltivec_LDFLAGS} -framework vecLib"
...@@ -555,7 +547,7 @@ dnl ...@@ -555,7 +547,7 @@ dnl
if test x${target_cpu} = xi686 -o x${target_cpu} = xi586 -o x${target_cpu} = xx86 -o x${target_cpu} = xi386 if test x${target_cpu} = xi686 -o x${target_cpu} = xi586 -o x${target_cpu} = xx86 -o x${target_cpu} = xi386
then then
ARCH="${ARCH} mmx" ARCH="${ARCH} mmx"
BUILTINS="${BUILTINS} ${ACCEL_MODULES}" PLUGINS="${PLUGINS} ${ACCEL_MODULES}"
fi fi
dnl dnl
...@@ -570,7 +562,7 @@ dnl ...@@ -570,7 +562,7 @@ dnl
dnl AltiVec acceleration dnl AltiVec acceleration
dnl dnl
AC_ARG_ENABLE(altivec, AC_ARG_ENABLE(altivec,
[ --disable-altivec disable altivec optimizations (default enabled on PPC)], [ --disable-altivec disable AltiVec optimizations (default enabled on PPC)],
[ if test x$enable_altivec = xyes; then ARCH="${ARCH} altivec"; [ if test x$enable_altivec = xyes; then ARCH="${ARCH} altivec";
BUILTINS="${BUILTINS} ${ACCEL_MODULES}"; fi ], BUILTINS="${BUILTINS} ${ACCEL_MODULES}"; fi ],
[ if test x${target_cpu} = xpowerpc; then ARCH="${ARCH} altivec"; [ if test x${target_cpu} = xpowerpc; then ARCH="${ARCH} altivec";
...@@ -685,6 +677,7 @@ then ...@@ -685,6 +677,7 @@ then
fi fi
CPPFLAGS="$save_CPPFLAGS $test_CFLAGS" CPPFLAGS="$save_CPPFLAGS $test_CFLAGS"
AC_CHECK_HEADERS(dvdread/dvd_reader.h, [ AC_CHECK_HEADERS(dvdread/dvd_reader.h, [
CFLAGS="${save_CFLAGS}"
AC_TRY_COMPILE([#include <dvdread/dvd_reader.h>], AC_TRY_COMPILE([#include <dvdread/dvd_reader.h>],
[void foo() { int i=DVD_VIDEO_LB_LEN; }],[ [void foo() { int i=DVD_VIDEO_LB_LEN; }],[
PLUGINS="${PLUGINS} dvdread" PLUGINS="${PLUGINS} dvdread"
...@@ -725,8 +718,8 @@ then ...@@ -725,8 +718,8 @@ then
x|xyes) x|xyes)
if test "x$with_dvbpsi_tree" = x if test "x$with_dvbpsi_tree" = x
then then
AC_CHECK_HEADERS(src/descriptors/dr.h, AC_CHECK_HEADERS(dvbpsi/dr.h,
[ PLUGINS="${PLUGINS} dvbpsi" [ PLUGINS="${PLUGINS} mpeg_ts_dvbpsi"
mpeg_ts_dvbpsi_LDFLAGS="${mpeg_ts_dvbpsi_LDFLAGS} -ldvbpsi" ], [], mpeg_ts_dvbpsi_LDFLAGS="${mpeg_ts_dvbpsi_LDFLAGS} -ldvbpsi" ], [],
[ AC_MSG_ERROR([cannot find libdvbpsi headers]) ]) [ AC_MSG_ERROR([cannot find libdvbpsi headers]) ])
else else
...@@ -825,6 +818,7 @@ dnl ipv6 plugin - not for QNX yet ...@@ -825,6 +818,7 @@ dnl ipv6 plugin - not for QNX yet
dnl dnl
if test x$SYS != xnto && test "x$SYS" != "xmingw32" if test x$SYS != xnto && test "x$SYS" != "xmingw32"
then then
CFLAGS="$save_CFLAGS"
AC_CHECK_FUNC(inet_pton,[PLUGINS="${PLUGINS} ipv6"]) AC_CHECK_FUNC(inet_pton,[PLUGINS="${PLUGINS} ipv6"])
fi fi
if test "x$SYS" = "xmingw32" if test "x$SYS" = "xmingw32"
...@@ -896,18 +890,14 @@ then ...@@ -896,18 +890,14 @@ then
AC_MSG_ERROR([the specified tree doesn't have mad.h]) AC_MSG_ERROR([the specified tree doesn't have mad.h])
fi fi
else else
save_CFLAGS=$CFLAGS CFLAGS="$vlc_CFLAGS $mad_CFLAGS"
save_LDFLAGS=$LDFLAGS LDFLAGS="$vlc_LDFLAGS $mad_LDFLAGS"
CFLAGS="$CFLAGS $mad_CFLAGS"
LDFLAGS="$LDFLAGS $mad_LDFLAGS"
AC_CHECK_HEADERS(mad.h, , AC_CHECK_HEADERS(mad.h, ,
[ AC_MSG_ERROR([Cannot find development headers for libmad...]) ]) [ AC_MSG_ERROR([Cannot find development headers for libmad...]) ])
AC_CHECK_LIB(mad, mad_bit_init, [ AC_CHECK_LIB(mad, mad_bit_init, [
PLUGINS="${PLUGINS} mad" PLUGINS="${PLUGINS} mad"
mad_LDFLAGS="${mad_LDFLAGS} -lmad" ], mad_LDFLAGS="${mad_LDFLAGS} -lmad" ],
[ AC_MSG_ERROR([Cannot find libmad library...]) ]) [ AC_MSG_ERROR([Cannot find libmad library...]) ])
CFLAGS=$save_CFLAGS
LDFLAGS=$save_LDFLAGS
fi fi
fi fi
...@@ -1083,11 +1073,9 @@ if test x$enable_xvideo != xno && ...@@ -1083,11 +1073,9 @@ if test x$enable_xvideo != xno &&
if test x$x_libraries = xNONE; then if test x$x_libraries = xNONE; then
x_libraries=/usr/X11R6/lib x_libraries=/usr/X11R6/lib
fi fi
save_CPPFLAGS=$CPPFLAGS
CPPFLAGS="$save_CPPFLAGS -I$x_includes" CPPFLAGS="$save_CPPFLAGS -I$x_includes"
AC_CHECK_HEADERS(X11/extensions/Xv.h, [ AC_CHECK_HEADERS(X11/extensions/Xv.h, [
save_CFLAGS=$CFLAGS CFLAGS="$save_CFLAGS -L$x_libraries -lX11 -lXext"
CFLAGS="$CFLAGS -L$x_libraries -lX11 -lXext"
AC_CHECK_LIB(Xv_pic,XvSetPortAttribute, AC_CHECK_LIB(Xv_pic,XvSetPortAttribute,
# We have Xv_pic, that's good, we can build an xvideo.so plugin ! # We have Xv_pic, that's good, we can build an xvideo.so plugin !
PLUGINS="${PLUGINS} xvideo" PLUGINS="${PLUGINS} xvideo"
...@@ -1097,7 +1085,6 @@ if test x$enable_xvideo != xno && ...@@ -1097,7 +1085,6 @@ if test x$enable_xvideo != xno &&
BUILTINS="${BUILTINS} xvideo" BUILTINS="${BUILTINS} xvideo"
xvideo_LDFLAGS="${xvideo_LDFLAGS} -L$x_libraries -lX11 -lXext -lXv" xvideo_LDFLAGS="${xvideo_LDFLAGS} -L$x_libraries -lX11 -lXext -lXv"
xvideo_CFLAGS="${xvideo_CFLAGS} -I$x_includes") xvideo_CFLAGS="${xvideo_CFLAGS} -I$x_includes")
CFLAGS="$save_CFLAGS"
] ]
CPPFLAGS="$save_CPPFLAGS") CPPFLAGS="$save_CPPFLAGS")
fi fi
...@@ -1588,18 +1575,26 @@ fi ...@@ -1588,18 +1575,26 @@ fi
dnl dnl
dnl Profiling dnl Profiling
dnl dnl