0
0
mirror of https://github.com/mpv-player/mpv.git synced 2024-09-20 20:03:10 +02:00
Commit Graph

1645 Commits

Author SHA1 Message Date
rtogni
811a1f6c09 Fix compilation if no libogg/libvoribs installed
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22004 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-24 10:31:51 +00:00
diego
8274bd8f89 Rename a few variables to match FFmpeg.
patch by Brett Goulder, predatorfreak dcaf-security org


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22003 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-24 07:36:50 +00:00
rtogni
46df662025 Fix compilation after ffmpeg changes in r7619
Some libraries still need tweaks


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22002 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-24 00:10:47 +00:00
diego
93288a8c97 Bring MPlayer closer to compilation after latest FFmpeg changes.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21998 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-23 10:06:02 +00:00
reimar
b53b90261e Fix compilation: define CONFIG_ZLIB in config.mak
Compilation without zlib untested.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21988 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-21 21:38:41 +00:00
diego
726ccc3118 Move ldconfig platform differences into configure where they belong.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21973 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-20 21:19:58 +00:00
diego
eca0abbc21 Move ranlib setting to a more sensible place.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21972 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-20 21:14:14 +00:00
diego
a6cc078d26 Move toolame vs twolame logic into the $_toolame=auto case.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21927 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-14 22:58:25 +00:00
diego
acc38e2745 Make twolame disable toolame.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21925 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-14 22:42:35 +00:00
diego
811cec046e Move twolame check before toolame check.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21924 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-14 22:35:10 +00:00
vayne
68e9c8462a fix typo for gettimeofday()
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21916 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-13 21:26:54 +00:00
diego
d9d8d70d63 Add missing config.mak entry for gettimeofday().
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21891 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-13 04:12:05 +00:00
reimar
ef9578fe0c 10l, typo breaks compilation because HAVE_SYS_MMAN_H is not set correctly
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21877 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-10 22:58:32 +00:00
diego
33593191d3 Split strl.c into strl(cat|cpy).c and move #ifdefs into the build system.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21875 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-10 20:23:24 +00:00
diego
7db81061d7 Split fseeko.c into fseeko.c and ftello.c, move #ifdefs into the build system.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21874 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-10 19:35:41 +00:00
diego
b2c4df0543 Move #ifdef directives around complete files into the build system.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21873 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-10 19:07:42 +00:00
diego
d1f409719c GNU/kFreeBSD support, closes Bugzilla #704.
patch by Petr Salinger, Petr.Salinger seznam cz


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21866 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-10 14:56:23 +00:00
diego
e311db3344 CONFIG_DTS was renamed to CONFIG_LIBDTS in FFmpeg.
patch by Vladislav Naumov, vladislav.naumov gmail com


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21862 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-10 13:20:08 +00:00
diego
8665071a0e Remove superfluous CONFIG_X11_GRAB_DEVICE_DEMUXER=no.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21850 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-07 11:52:46 +00:00
reimar
d5bdde3b18 Set default values for proc and iproc for x86_32 case.
They will also be used for runtime cpudetection (and fixes compilation of that).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21841 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-06 17:50:12 +00:00
reimar
c9614cb422 move runtime cpu detection check after detection of host architecture,
since it uses the host architecture to check if it is supported.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21825 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-05 10:05:05 +00:00
diego
18a6a24925 100l syntax error
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21757 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-24 02:05:18 +00:00
diego
6b3fb8a7c9 cosmetics: Fix indentation after last commit.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21756 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-24 00:45:26 +00:00
diego
4830ec1716 Run less CPU checks when runtime CPU detection is enabled.
inspired by a patch from Zuxy Meng, zuxy.meng gmail com


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21755 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-24 00:43:09 +00:00
diego
b8a070b99a Exit when runtime CPU detection is requested on unsupported arches.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21754 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-24 00:10:19 +00:00
diego
69891eb990 Rename x86 test to x86_32 and provide an x86 test for both x86_32 and x86_64.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21753 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-24 00:08:57 +00:00
diego
0ff3dfbf90 Extend runtime CPU detection to x86-64.
inspired by a patch from Zuxy Meng, zuxy.meng gmail com


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21752 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-23 23:55:58 +00:00
diego
07e24dd787 Fix disabling individual demuxers, parsers and decoders
based on a patch by Nicolas Baradakis, nbk sitadelle com


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21735 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-23 02:47:38 +00:00
diego
e72cb98ab0 cosmetics: Rename variables to simplify upcoming patches.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21734 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-23 01:08:51 +00:00
diego
c79f94209a Remove x11grab hack, it's now disabled by default in FFmpeg.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21733 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-23 00:10:33 +00:00
reimar
d46bda5fe3 Color console had a big bug nobody noticed, so mark this feature as
unsupported, since that is what it seems to be.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21670 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-18 18:55:46 +00:00
reimar
e77e273b3d Compilation fix hacks: disable libavformat X11 grabber and
move -L flags from _libs_mplayer to _ld_extra


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21623 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-15 09:41:39 +00:00
corey
2427b71459 Add missing redirect to /dev/null.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21611 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-13 23:24:29 +00:00
diego
fa5ab5c257 Ugly hotfix for --disable-mencoder.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21607 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-13 10:59:14 +00:00
reimar
f4b7a0e4d1 Get rid on -DGNU_SOURCE for internal code, imported libs should be fixed
ASAP, too, though


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21604 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-12 20:29:30 +00:00
diego
33763370c0 Fix --extra-libs-mplayer and --extra-libs-mencoder.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21590 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-11 10:23:33 +00:00
reimar
01a497c0c5 10l, forgot to add _inc_x11 to X11 cc check
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21588 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-11 08:59:43 +00:00
reimar
f13de61088 Better default CFLAGS for non-gnu, non-intel compilers
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21585 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-10 22:12:48 +00:00
reimar
c0d15a1516 Add x11 include path only to _inc_extra if X11 is actually enabled.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21574 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-10 15:10:46 +00:00
reimar
7d4e8a36bb Support OpenAL headers in OpenAL/ instead of AL/ and OpenAL on MacOSX in general.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21572 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-10 14:07:08 +00:00
nplourde
f4e41d5209 do not force arch and isysroot in osx
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21540 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-09 00:09:45 +00:00
nplourde
56acf06a21 force ppc arch and 10.3.9 sys lib on ppc mac
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21504 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-04 23:56:03 +00:00
reimar
b20ee9dff3 Move cddb "autodetection" so it also works for libcdio
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21496 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-04 20:28:27 +00:00
reimar
84c2a2c927 Add full support for en-/disabling cddb support
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21495 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-04 20:20:32 +00:00
diego
8413c966a8 Use fallback XAnim and Real codecs directories when autodetection is skipped.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21451 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-02 20:54:51 +00:00
diego
af70335917 Remove warning about missing codecs directory, the condition is always true.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21450 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-02 20:49:35 +00:00
diego
cbe3bc8899 Add /usr/local/lib and /usr/local/include to the linker/compiler
search paths by default. Closes bug #650.
patch by sci-fi (at) hush (dot) ai


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21379 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-29 11:07:30 +00:00
diego
6add846d7c sdl-config --libs under mingw32 will give -lmingw32, which leads to
multiple definition of main and causes subsequent feature checks to fail.
patch by Zuxy Meng, zuxy.meng gmail com


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21377 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-29 10:33:42 +00:00
aurel
0eb06c7bda Sync with FFmpeg changes for encoder/decoder registration.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21371 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-29 08:55:24 +00:00
diego
0810e42750 Make MPlayer/MEncoder print the compile-time configuration in verbose mode.
based on a patch by Brian Murray, brian game-sat com


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21358 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-28 18:29:24 +00:00
diego
8d2dfb5ebf support Intel Core 2 and AMD Geode in the processor detection routines
patch from Zuxy Meng, zuxy.meng gmail com


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21355 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-28 12:04:59 +00:00
diego
59d7009493 Merge _ld_arch into _ld_extra.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21346 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-27 22:55:46 +00:00
diego
4f1264ab01 Disable cddb on Darwin at Reimar's request.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21344 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-27 22:48:54 +00:00
diego
fbf78cef93 _ld_sock is already in _ld_extra.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21343 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-27 22:34:03 +00:00
diego
a96d2ce940 Add a config.mak variable for CDDB.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21342 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-27 22:02:06 +00:00
diego
57d5e4eb12 Sync with FFmpeg changes for (de)muxer registration.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21322 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-27 13:19:34 +00:00
reimar
c11d7afb27 Move checking/defining HAVE_LINUX_DVD_STRUCT etc. to dvdcss check,
since dvdread does not use them. Also seems to allow building with
(external) dvdnav and internal dvdcss.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21278 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-26 18:37:51 +00:00
reimar
4e7dedf315 -lwinmm is always (also for mencoder) needed on windows for osdep/timer-win2.c
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21270 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-26 14:13:39 +00:00
uau
a5ddf3c531 Revert r21251 (moving loader/config.h contents to main config.h).
There are #ifdef TRACE tests in libav* and defining TRACE in toplevel
config.h breaks things.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21265 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-26 13:17:50 +00:00
reimar
0fe6e9fbd2 Set _win32codecsdir fallback also with --enable-win32
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21256 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-26 11:56:54 +00:00
diego
33d70768f9 Move contents of loader/config.h to configure/config.h, there are
multiple files by that name, this can cause problems.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21251 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-25 20:53:43 +00:00
reimar
3b0e10aee2 Add support for compiling with ICC 9.1. Currently needs --target=generic-linux,
since ICC does not (properly) support __attribute__((used)), even though
the documentation claims otherwise.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21239 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-25 18:00:59 +00:00
reimar
8845289943 Add generic target that allow compiling without any assembler or otherwise
architecture specific code (except endiannes of course).
Usage example: ./configure --target=generic-linux


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21237 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-25 17:58:33 +00:00
diego
c64125cf0b Rename CONFIG_MP3LAME variable, the variable for LAME support in FFmpeg
had the same name.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21196 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-24 23:32:39 +00:00
diego
35571e7b3e Get rid of _ld_gtk and _ld_glib.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21180 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-22 19:35:41 +00:00
diego
00a9c9831d Get rid of _ld_vorbis.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21178 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-22 19:26:52 +00:00
uau
544233bded Make compilation depending on USE_OSD unconditional.
USE_OSD was hardcoded to true in configure, manually turning it off
would break compilation, and most OSD-related code wasn't affected by it
anyway so it did nothing useful.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21177 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-22 19:21:16 +00:00
diego
6982f81d90 Get rid of _xmms_lib.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21176 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-22 19:19:47 +00:00
diego
a16043a187 _ld_static does not need to be in both EXTRA_LIB and EXTRALIBS_MPLAYER.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21175 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-22 19:13:13 +00:00
diego
67ce77e970 Cosmetics to make the next patches more readable.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21174 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-22 19:12:09 +00:00
diego
a576d63a1b Remove _ld_x11.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21169 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-22 16:42:04 +00:00
diego
536f37b082 typo noticed by Carl Eugen Hoyos, cehoyos ag.or.at
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21166 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-22 12:05:27 +00:00
diego
e322276d93 Remove _ld_gif and _ld_theora.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21165 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-22 09:51:34 +00:00
diego
3e9a5c9b0b Remove _ld_freetype and _ld_fontconfig, they are no longer necessary.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21164 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-22 09:36:33 +00:00
uau
2b50b7ddab Make compilation depending on USE_SUB unconditional.
USE_SUB was hardcoded to true in configure, manually turning it off
would break compilation, and there's no apparent reason why having all
subtitle code under #ifdefs (even working ones) would be worth the
clutter.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21156 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-21 20:48:17 +00:00
reimar
738e5816b9 Fix SVN r21075, it completely disabled OpenGL in almost all cases.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21145 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-21 17:36:39 +00:00
diego
84cbc3b50c Treat fontconfig and FreeType linker flags just like any other linker flag.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21144 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-21 17:20:32 +00:00
diego
2f3c36c494 Remove stray -I from include dirs in live555 check, it was being duplicated.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21143 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-21 16:46:31 +00:00
diego
d021529c71 cosmetics: EXTRA_LIB_MENCODER --> EXTRALIBS_MENCODER
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21140 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-21 16:23:35 +00:00
diego
998308f4b2 _ld_tmp vs _ld_x264 typo
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21139 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-21 16:15:39 +00:00
diego
a2a96f7b32 Remove --with-x11libdir and --with-livelibdir.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21138 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-21 16:13:11 +00:00
diego
f1f4317665 Attempt to properly fix linking of encoding libs used by libavcodec.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21137 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-21 16:00:00 +00:00
diego
a2f2b75f7c ALSA can be used by both MPlayer and MEncoder.
patch by Carl Eugen Hoyos, cehoyos (at) ag.or.at


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21133 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-21 15:15:13 +00:00
diego
ce672fbf1b Fix linking when libavcodec uses x264.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21132 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-21 15:12:55 +00:00
diego
196ec9d95f Remove _ld_x264 _toolame_lib _twolame_lib, they are no longer needed.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21131 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-21 13:53:32 +00:00
diego
7c04fdf4c4 _ld_xv does not exist anymore.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21130 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-21 13:45:11 +00:00
diego
c16c950f59 Add _libs_mplayer and _libs_mencoder to cc_check.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21129 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-21 13:44:42 +00:00
diego
9a74bfd165 Introduce _libs_mplayer and _libs_mencoder to get rid of some _ld_ variables.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21128 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-21 13:18:56 +00:00
diego
cc9eb2aac3 Move FFmpeg library dependencies into the Makefile just like everything else.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21127 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-21 12:49:46 +00:00
diego
40b99d0282 Move some Win32 LDFLAGS into _ld_extra.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21126 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-21 12:16:12 +00:00
diego
43c4abaf0c Merge MPlayer-specific libs into one variable.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21125 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-21 12:12:19 +00:00
diego
406f7d342d Remove _ld_win32, this is handled by the Makefile.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21124 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-21 12:04:41 +00:00
diego
ef10c853f9 Remove --with-xmmsplugindir and --with-xmmslibdir.
This is not perfect, whoever cares about this feature do it properly, please.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21112 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-20 17:08:13 +00:00
diego
a1a3ffb77d Remove --with-x264libdir.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21111 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-20 16:59:09 +00:00
diego
07b02cc94a Remove --with-xvidlibdir.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21110 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-20 16:51:09 +00:00
diego
8ac4f3fce1 Remove --with-toolamelibdir from help output as well.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21109 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-20 16:40:07 +00:00
diego
deeb85eb2b Remove --with-toolamelibdir.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21108 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-20 16:14:47 +00:00
diego
2b1b586634 Add support for disabling MPlayer compilation.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21107 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-20 16:14:01 +00:00
diego
71c7b6353e Deliver dependency handling from redundancy.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21105 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-20 14:45:33 +00:00
diego
78c81d5323 another 100l typo noticed by Carl Eugen Hoyos, cehoyos (at) ag or at
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21092 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-20 01:31:15 +00:00
diego
0cacea020e Some more cleanups for LDFLAGS handling.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21091 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-20 00:59:05 +00:00
diego
e7a8c1e478 100l typos, noticed by Carl Eugen Hoyos, cehoyos (at) ag or at
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21090 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-20 00:55:57 +00:00
diego
9f13bd3d81 Some cleanups for LDFLAGS handling, next part.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21089 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-20 00:19:43 +00:00
diego
645c9046ba Remove settled FIXME.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21081 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-19 22:15:59 +00:00
nplourde
cb6ba13ba9 disable x11 gl support on osx
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21075 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-19 19:12:29 +00:00
voroshil
c9b485e94c Add *BSD BT848 radio support
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21001 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-18 06:53:33 +00:00
diego
a7c46b9025 Remove obsolete Xvid 3 support.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21000 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-18 02:40:19 +00:00
iive
9b11abbff7 When testing lame preset presence, use actuall lame_set_preset() function to test its availablility in the library.
Now it only tests include definitions.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20945 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-15 20:51:27 +00:00
diego
233ae1cc4a MEMALIGN_HACK --> CONFIG_MEMALIGN_HACK
patch by "Hervé W.", H.O.W.aka.V+mplayer gmail com


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20924 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-14 16:51:06 +00:00
ods15
f916c5d0c4 update to libnut, rename nut.h->libnut.h
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20909 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-14 06:01:54 +00:00
reimar
ec8d0c6bf8 Fix compilation with latest libavformat/avidec.c by adding ENABLE_ defines
for all ffmpeg-related CONFIG_ defines, just like ffmpeg's configure.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20869 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-12 18:28:12 +00:00
diego
2126ae4eea Mac OS X Server support
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20865 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-12 16:34:33 +00:00
rathann
866ba3f296 Disable linking mplayer (and internal static libavcodec) with
libmp3lame/faac/x264 if --disable-encoder=mp3lame/faac/x264
options are passed to configure.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20827 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-09 23:14:33 +00:00
diego
66e1b5c8ed Allow disabling internal libdvdcss.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20821 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-09 18:25:42 +00:00
diego
34fee45e00 Reset _ld_xvid so that stray libs do not appear on the link command line.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20797 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-08 19:58:10 +00:00
diego
5601fa28f7 Remove unused variables.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20793 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-08 18:46:42 +00:00
diego
bd776149b1 Rename xvid4 variable/option back to xvid so as not to break scripts.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20792 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-08 18:46:03 +00:00
diego
2afd79af34 cosmetics: Fix indentation after last commit.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20790 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-08 18:36:46 +00:00
diego
7accc82228 Separate XviD 3 and XviD 4 tests.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20789 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-08 18:35:32 +00:00
diego
d9a87e081e Remove some DivX 4 leftovers.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20786 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-08 17:37:50 +00:00
diego
78a3bf6c9b Create binaries with proper executable suffix under Windows.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20771 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-08 00:13:33 +00:00
diego
855455432a _inputmodules vs _noinputmodules typo fix
noticed by Klaus Müller, mk.2001 web de


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20758 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-07 21:05:03 +00:00
reimar
9d3fe04dce r20650 inverted the gtk1 check before setting charset, this
disabling all charset conversions.
Fix to always use UTF-8 as default now.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20748 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-07 17:21:34 +00:00
diego
3829ecb1a2 Remove remnants of long-gone libfame.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20739 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-06 22:57:14 +00:00
diego
4e960189e8 typo
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20737 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-06 18:05:38 +00:00
diego
c9219b3ec5 output cosmetics
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20736 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-06 16:23:04 +00:00
diego
7f0dd1183f Remove hackish setting of extra libraries through --enable-static=-lfoo,
--extra-libs is supposed to be used for this.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20732 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-06 00:18:06 +00:00
diego
ed974e7c72 Remove deprecated install-path option.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20731 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-06 00:13:37 +00:00
diego
a61e6aeafd spelling/grammar/wording/consistency for the help output
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20730 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-06 00:09:07 +00:00
diego
f427444831 Fix tdfx-related copy + paste typos, patch by Ville Skyttä, ville.skytta iki fi.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20719 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-05 18:27:07 +00:00
diego
226ebff4c8 Remove empty variable.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20681 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-05 09:04:32 +00:00
diego
ab1f876349 output cosmetics
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20680 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-05 00:10:10 +00:00
diego
71eb96f6ba Fix some echo -n occurrences, patch by sci-fi@hush.ai.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20679 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-05 00:02:48 +00:00
reimar
ee1ee5aa19 Extended/reworked fontconfig test to work without pkg-config with versions
that need -lz


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20663 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-04 11:57:03 +00:00
diego
0384045e30 Streamline and simplify internal vs external libdvdread handling.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20651 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-03 22:03:58 +00:00
kraymer
630302ad63 remove charset files (all of them are in UTF-8 now anyway)
change build system accordingly


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20650 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-03 21:52:35 +00:00
diego
376951ca72 libmpdvdkit2 --> libdvdread, it just contains libdvdread now.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20631 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-03 13:48:52 +00:00
reimar
95b056ba35 remove accidential ';' (that's what too much C programming does to you ;-) )
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20612 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-02 18:14:12 +00:00
reimar
6988f3c1a3 Check for existence of libcdio_paranoia, not libcdio, since the former is
what we actually need.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20611 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-02 18:12:19 +00:00
reimar
25106020f2 Useless break in libcdio pkg-config check
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20610 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-02 18:07:00 +00:00
reimar
9e5e10f5ff Remove spurious $_inc_tmp in libcdio check
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20609 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-02 18:05:22 +00:00
diego
1ec48461d7 Rework binary codec directory handling. Don't use directories from other
programs, just try a few default locations + proper fallback.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20604 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-01 20:31:18 +00:00
reimar
f5733d23f0 libcdio also needs to link against libcdio_paranoia
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20594 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-01 18:54:10 +00:00
diego
f5b73e683c Support for recent changes to ARCH_X86 handling in FFmpeg.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20590 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-01 18:17:18 +00:00
reimar
cda906290e Proper libcdio detection also without pkg-config
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20589 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-01 18:15:06 +00:00
reimar
2e18f6e6a5 gcc optimized != 0 check for extern function away, thus linking
would still always succeed in cdda and cdio tests.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20582 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-01 17:05:17 +00:00
reimar
f3dec715cd Test proper linking for cdda/cdio
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20576 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-01 10:49:52 +00:00
diego
8a041b9ea1 Fix codec directory fallback, it was overriding the autodetection.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20570 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-31 17:55:54 +00:00
diego
9113811f28 Implement proper codecs directory fallback.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20564 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-31 15:16:12 +00:00
diego
b2d41e2c34 Rename all codecs directory options.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20560 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-31 14:47:34 +00:00