Commit Graph

1514 Commits

Author SHA1 Message Date
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