1
mirror of https://github.com/mpv-player/mpv synced 2025-01-09 01:36:25 +01:00
Commit Graph

2461 Commits

Author SHA1 Message Date
Uoti Urpala
1db1773ec2 Merge svn changes up to r29277 2009-05-08 23:50:26 +03:00
diego
86c9fb2e89 lirc anc lircc are MPlayer-only, so add LDFLAGS for MPlayer link only.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29277 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-08 16:21:03 +00:00
diego
5bad4ba482 The Apple remote code needs the Cocoa framework to link.
Apple remote LDFLAGS are only necessary for linking MPlayer.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29275 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-08 13:58:42 +00:00
diego
c12922d678 Add -framework Carbon to LDFLAGS when Mac OS X finder or bundle is enabled.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29274 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-07 21:34:56 +00:00
diego
ddb7269a1e cosmetics: Move Quartz and CoreVideo checks into the vo driver section.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29269 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-05 23:02:59 +00:00
diego
5bc20d8d3c LDFLAGS for CoreVideo and Quartz should be MPlayer-only.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29268 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-05 21:03:56 +00:00
diego
d0022933fe libdvdcss requires the Carbon framework to link on Mac OS X.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29267 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-05 18:45:59 +00:00
diego
bf26ad6611 cosmetics: Move $def_dvdcss to a more sensible place in config.h.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29266 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-05 18:04:53 +00:00
diego
d46d132b1f cosmetics: Move CoreAudio check to audio output section.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29265 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-05 17:57:44 +00:00
diego
ab5760ab33 Add #define for HAVE_DVDCSS_DVDCSS_H (needed by internal libdvdread) to config.h
instead of passing -D on the compiler command line.
This is more convenient and already done with most preprocessor definitions
needed by external libraries.
Previously the definition was passed on the command line because libdvdread was
missing the necessary config.h #include, which was now added.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29263 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-05 17:30:50 +00:00
diego
a3f5c392f5 cosmetics: indentation
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29261 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-05 17:17:17 +00:00
diego
c3d3743ad7 Allow disabling and enabling VCD support through command line parameters.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29260 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-05 17:15:54 +00:00
diego
ceb919a8c4 CoreAudio LDFLAGS should be MPlayer-only.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29259 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-05 09:08:53 +00:00
diego
9b7c75da73 Improve CoreAudio check: Use all required headers and frameworks.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29258 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-05 08:49:07 +00:00
diego
614a0e9800 Simplify Mac OS X Finder and Mac OS X Bundle file locations checks.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29257 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-05 08:46:37 +00:00
diego
114fa5bd06 CONFIG_QUICKTIME should be set depending on the state of QTX support.
This fixes linking on Mac OS X with vo_quartz disabled.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29255 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-04 18:29:55 +00:00
diego
27bc918ffe Rename macosx video output driver to corevideo.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29252 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-04 16:55:05 +00:00
diego
e3ec5b1fd3 Rename macosx audio output driver to coreaudio.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29251 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-04 14:53:47 +00:00
diego
9f45c3a0ae QuickTime codecs support requires -framework QuickTime to link on Mac OS X.
patch by Emanuele Giaquinta


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29250 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-04 14:49:42 +00:00
diego
51a6bec160 Replace QuickTime.h #include with Carbon.h, which is really needed.
patch by Emanuele Giaquinta


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29249 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-04 14:40:22 +00:00
diego
a094d6279b Improve CoreVideo check: Test more #includes, add -framework Carbon to LDFLAGS.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29247 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-04 13:16:04 +00:00
diego
0044b18877 Add information about configure options to config.mak.
This is useful for debugging and convenient outside of config.h.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29246 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-04 11:44:36 +00:00
diego
480a9e563c Revert previous two commits, the CoreVideo vo needs both OpenGL and Cocoa.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29238 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-04-26 08:59:18 +00:00
diego
ebbeef12db Fix typo in CoreVideo linker flags: the Carbon, not Cocoa framework is needed.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29236 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-04-25 18:43:35 +00:00
diego
2ce1ec49e7 Remove unnecessary -framework OpenGL from CoreVideo linker flags.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29235 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-04-25 18:39:19 +00:00
diego
1668788808 whitespace cosmetics: reindent Mac OS X checks, remove trailing whitespace
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29234 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-04-25 17:52:55 +00:00
diego
6f9ec12491 Split generic OS X API check into separate CoreAudio, CoreVideo, Quartz checks.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29233 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-04-25 17:48:48 +00:00
diego
86075b391c typo in XFORM asm check, noticed by Emanuele Giaquinta
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29232 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-04-25 16:37:08 +00:00
diego
d6b2a50fba Pass argc and argv parameters to main() function in SDL test.
SDL renames the main function via a macro and later passes it parameters.
This fixes the SDL check on at least Mac OS X, continues to work fine on Linux.
patch by vmrsss  vmrsss gmail com


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29221 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-04-23 07:39:39 +00:00
diego
e28b5cc631 Add HAVE_LDBRX to config.h for FFmpeg.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29200 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-04-20 00:10:45 +00:00
diego
7948a807fb Add check for XFORM ASM, needed by FFmpeg/PPC.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29199 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-04-20 00:10:09 +00:00
diego
4e1b85c726 Rely on POSIX-compatible head/tail versions that understand the -n option.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29185 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-04-16 10:02:10 +00:00
diego
b6d31704a9 Replace all `` by $(), it is more readable and easier to nest.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29183 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-04-15 20:00:26 +00:00
diego
10295ba5a0 Simplify OS detection functions.
The return statement in the functions appears unnecessary; remove it.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29182 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-04-15 17:08:41 +00:00
diego
a5eaafc179 Use extra_cflags variable instead of CFLAGS to add system-specific CFLAGS.
Otherwise the CFLAGS warning gets triggered and necessary CFLAGS are not set.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29171 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-04-12 17:07:30 +00:00
diego
3818abb4ae Move all CFLAGS checks together at the beginning of configure.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29169 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-04-10 18:29:01 +00:00
diego
465abf0b8d Move thread-related CFLAGS settings into pthread test.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29168 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-04-10 17:39:44 +00:00
diego
446980680f Remove unnecessary Darwin default CFLAGS and LDFLAGS.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29165 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-04-10 13:38:57 +00:00
diego
b4546308e8 Move darwin CFLAG settings to darwin section at the beginning of configure.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29164 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-04-10 13:37:59 +00:00
diego
01415637a0 Move amigaos CFLAG settings to amigaos section at the beginning of configure.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29163 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-04-10 13:12:28 +00:00
diego
e2023a9037 gcc <3.1 is unsupported on Darwin, no need to check for this.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29162 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-04-10 13:09:39 +00:00
Uoti Urpala
0e8c38c19b Merge svn changes up to r29154
Synchronizes runtime CPU detection handling in the build system with
latest FFmpeg.
2009-04-09 02:38:37 +03:00
ramiro
ca242e5f73 Rename RUNTIME_CPUDETECT to CONFIG_RUNTIME_CPUDETECT and always define it.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29154 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-04-08 20:21:21 +00:00
diego
79701be883 Fix wrong syntax in test example, noticed by Jason Holt, jholt google com.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29151 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-04-08 11:56:09 +00:00
Uoti Urpala
6dd56815b4 Merge svn changes up to r29150 2009-04-08 02:46:32 +03:00
diego
389853416f Fix passing CFLAGS and LDFLAGS with = in them as configure parameters.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29138 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-04-04 14:17:53 +00:00
Uoti Urpala
ce0bf1bd4a Merge svn changes up to r29136
Fixes compilation with latest FFmpeg.
2009-04-03 16:45:21 +03:00
cehoyos
431ac86c7b Fix compilation for newly added VAAPI_HWACCEL's.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29135 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-04-03 08:08:44 +00:00
Uoti Urpala
d136cf6882 Merge svn changes up to r29134 2009-04-02 23:55:13 +03:00
bircoph
a4861528c6 Support for libbs2b audio filter.
Add auto detection and selection routines to configure.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29131 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-04-02 19:01:23 +00:00