1
0
mirror of https://github.com/mpv-player/mpv synced 2024-12-27 09:32:40 +00:00
Commit Graph

2514 Commits

Author SHA1 Message Date
reimar
fe2e888fd6 Search X11 headers and libraries also in /usr/local/..., should ease
compilation on FreeBSD.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30271 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-10 21:47:50 +00:00
reimar
5c459408bd Do not use FreeBSD's cpuinfo file on x86_64 either, as on x86_32 it will not
report 3Dnow availability.
Patch from FreeBSD ports.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30270 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-10 21:22:44 +00:00
reimar
4ecd4741e6 FFmpeg uses ifdef in Makefiles for CONFIG_MPEGAUDIO_HP and CONFIG_HARDCODED_TABLES.
Change the config.mak generation to take that into account and not generate a
definition for these if the features are disabled.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30269 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-10 20:32:19 +00:00
reimar
4e50b6df73 Fix OpenGL detection for OpenSolaris where -lXdamage is necessary.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30264 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-10 18:22:01 +00:00
reimar
fff96519ee Only print "using sdl-config" if we actually used it for SDL detection.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30263 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-10 16:00:07 +00:00
reimar
894acafa51 Prefer libdca over libdts
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30259 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-10 13:55:55 +00:00
reimar
e51a1598b4 Quote test arguments that may be empty
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30257 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-10 13:32:37 +00:00
reimar
71670752d0 Disable internal copy of liba52 by default, libavcodec should be an
adequate replacement.
If there are no complaints we should probably remove it within a few months.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30256 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-10 12:13:10 +00:00
reimar
7712ce86d8 IPv6 in FFmpeg is not supported for MinGW, so do not set CONFIG_IPV6 for that case.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30255 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-09 18:29:28 +00:00
reimar
43d4fedf59 Add several make variables to make --enable-hardcoded-tables actually compile.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30252 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-09 14:17:23 +00:00
reimar
13b9a20821 Add support for --enable-hardcoded-tables like FFmpeg has.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30251 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-09 13:39:26 +00:00
greg
83da389dce libass needs at least freetype 2.2.1
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30244 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-08 18:56:39 +00:00
diego
f80ece49a8 Move MatrixView video output check below OpenGL check, it depends on OpenGL.
patch by Francesco Lavra, francescolavra interfree it


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30226 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-05 10:54:41 +00:00
diego
c202adb9f4 Remove pointless variable declaration from DirectFB check.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30223 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-04 22:32:28 +00:00
diego
e4ce50305b Add missing stdlib.h #include to fribidi check.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30222 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-04 22:30:41 +00:00
diego
22298a8e57 Remove pointless printf call in libmp3lame test.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30221 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-04 22:29:55 +00:00
diego
ff44ac1a3c Pass proper parameters to dlopen/dlsym/vsscanf to avoid configure test warnings.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30220 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-04 22:28:44 +00:00
diego
09b8d9402f Pass a proper va_list type to vsscanf() test in configure.
This fixes the check on SuperH with CodeSourcery compilers.
patch by Bill Traynor, wmat naoi ca


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30219 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-04 21:57:13 +00:00
diego
da13681a21 cosmetics: tabs to spaces, some reindentation
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30200 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-04 12:24:07 +00:00
diego
0e3224805a Fix fribidi check to avoid spamming the console with error messages.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30199 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-04 12:12:57 +00:00
diego
c631f7bfa3 Add a few definitions used by FFmpeg to config.h:
CONFIG_IPV6, HAVE_SETMODE, HAVE_SYS_SELECT_H


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30196 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-04 11:13:49 +00:00
reimar
f31ed10742 Modify -vo direct3d so we do not have to link against d3d9.dll, it might
not be available on some rare systems.
Based on patch used for builds by Gianluigi Tiesi [sherpya netfarm it]


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30190 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-03 17:00:51 +00:00
reimar
9e7e04add6 Enable all FFmpeg protocols by default, they seem to build without issue
on Linux and MinGW, lets see if it works for everything else as well.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30188 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-03 16:46:31 +00:00
reimar
eff2254d58 Change vo_png to use FFmpeg's png encoder instead of libpng.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30186 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-03 16:26:30 +00:00
reimar
a7be2e180b Finally add matrixview vo.
Heavily cleaned up/fixed etc. by me, improvements are still possible though.
Patch originally by Pigeon <pigeon at pigeond.net>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30182 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-03 14:54:51 +00:00
reimar
c23a01e260 Fixup SDL configure check:
- Make it work without sdl-config which adds at least useless or even hurtful
  cflags and also does not work for cross-compiling
- If using sdl-config, make it use the CFLAGS we actually use for compiling
  instead of something else. Thus #undef main is needed in the test program.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30178 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-03 11:33:33 +00:00
reimar
4a981bf09a Also detect fontconfig when it requires -liconv
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30176 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-03 09:11:20 +00:00
reimar
ec0c6d2a91 Change fribidi check to also work without fribidi-config.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30175 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-03 01:00:21 +00:00
reimar
2e557e3b28 Add support for JPEG2000 via FFmpeg/OpenJPEG
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30174 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-03 00:58:56 +00:00
reimar
f4f37e555a Fix typo in code disabling VIDIX on mingw64
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30168 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-02 16:55:41 +00:00
reimar
bb99b3f640 Disable vidix on 64 bit MinGW compiles, it seems to fail compiling and
certainly was never tested.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30167 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-02 16:47:26 +00:00
reimar
c1d166be18 Fix compilation if FreeType is not available, in particular do not try to build
libass and use the internal ass.h as a stub for structs needed for EOSD.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30166 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-01 18:51:59 +00:00
diego
dfe6cfd967 Allow passing variants of "mingw32" as system name to --target. This ensures
backwards compatibility after switching from "mingw32msvc" to "mingw32".


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30101 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-23 10:21:53 +00:00
diego
4e18fed064 Use "mingw32" instead of "mingw32msvc" as system name for MinGW with --target.
The former is the official name used by the MinGW project.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30089 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-20 19:12:20 +00:00
reimar
bfd01bdc17 Make ass_mp.h use the system-libass headers when the internal one is disabled.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30068 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-19 15:41:47 +00:00
reimar
1f4109d85e Experimental support for external libass.
So far probably only works with the libass from Ubuntu 9.10


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30066 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-19 15:18:22 +00:00
reimar
f97fd3eff0 Rename GL_* defines to CONFIG_GL_*
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30065 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-19 13:49:44 +00:00
reimar
140de2a9e2 Make the check for X11 and WIN32 backends for OpenGL separate.
This fixes compilation on Windows with X11 but no GLX available.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30063 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-19 10:52:32 +00:00
reimar
e0b789ec7b Disable winsock when we already found a working socklib instead of checking
blindly for cygwin and uselessly running the check on e.g. Linux.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29986 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-09 17:55:34 +00:00
lorenm
9c846b3df6 sync to x264-r1327. (only needed for x264-in-libavcodec)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29972 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-29 05:18:40 +00:00
diego
dd3bf9897d Add #defines for FFMPEG_LICENSE and FFMPEG_CONFIGURATION to config.h.
This is necessary to sync up with some recent FFmpeg changes.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29933 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-18 18:07:54 +00:00
reimar
ef1ae8272d Complete configure support for compiling in FFmpeg's protocol support.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29922 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-17 16:05:18 +00:00
cehoyos
153cac185c Do not dynamically load libvdpau.so.1, but link at compile time.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29903 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-11 22:26:38 +00:00
cehoyos
977c12c628 10l: Fix compilation without VDPAU.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29891 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-11 00:30:54 +00:00
reimar
42ec82c1e5 Use configure code to define PIC instead of duplicating the check in mangle.h.
While it is currently not necessary, it might be a good idea to move this outside
the x86-only block in configure, as well as adding -pie to LDFLAGS.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29877 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-10 13:08:36 +00:00
reimar
3cc24f5bee Remove macho64 special-case for yasm options, -DPIC is already added
by the PIC-detection code.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29856 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-08 19:32:57 +00:00
reimar
4c3dc1b10b Remove a pointless undeclared function reference, #error is assumed
to be enough to fail cc_check all over the place already.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29855 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-08 15:41:40 +00:00
reimar
e1ce8f9c41 Add a check if compiler creates PIC code and if so add -DPIC to YASMFLAGS.
Should make it possible to compile MPlayer as PIE on x86_64 e.g. on
hardened Gentoo and probably OpenBSD, too.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29853 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-08 15:38:59 +00:00
cehoyos
2a5611473c Remove CONFIG_TV_TELETEXT.
DVB teletext support is nearly finished, it will be possible to read
teletext from file, it will not be depending on reception any more.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29851 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-07 16:40:42 +00:00
cehoyos
423c415534 Separate teletext from tv support.
Path by Francesco Lavra, francescolavra interfree it


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29848 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-07 12:31:05 +00:00