Commit Graph

2868 Commits

Author SHA1 Message Date
Uoti Urpala a77e5f07ed Merge branch 'mplayer1_changes' 2011-06-29 11:39:06 +03:00
Uoti Urpala 2d187f9750 stream/tvi_v4l2: Add V4L2 support for OpenBSD (and NetBSD)
Patch by Brad <brad@comstyle.com>.
2011-06-29 07:23:24 +03:00
diego 30e8f03f2d configure: handle X11 dependencies at depending checks
Make features depending on X check its availability at their
individual checks rather than having the X11 check disable them if
needed. This makes each individual feature check self-contained, which
is desirable.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33371 b3059339-0415-0410-9bf9-f77b7e298cf2
2011-06-29 07:02:19 +03:00
cehoyos 74a85b8600 configure: fix swab() check for Windows
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33339 b3059339-0415-0410-9bf9-f77b7e298cf2

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33349 b3059339-0415-0410-9bf9-f77b7e298cf2
2011-06-29 06:32:56 +03:00
Diego Biurrun 017c173d74 configure: Remove checks for default inline asm features
Remove checks for compiler support of >= 10 assembler operands and
named assembler arguments. Just assume the features are always
available. These features were only missing from obsolete GCC versions
which are not supported any more.
2011-06-28 19:04:22 +03:00
Hans-Kristian Arntzen 48e8556298 ao_rsound: add new RSound audio output driver 2011-06-26 06:19:42 +03:00
Uoti Urpala cbdb7e6305 vo_xvmc: drop XvMC support
Due to libavcodec changes vo_xvmc would have needed some modifications
to keep working. However, I think there's little real demand for XvMC,
so I'll just drop XvMC support. XvMC only supported MPEG-2, making it
of very limited usefulness nowadays, plus the vo_xvmc implementation
was not high quality and never worked particularly well or reliably
anyway.
2011-05-09 20:27:16 +03:00
Uoti Urpala 7e65428712 Merge branch 'mplayer1_changes' 2011-05-02 00:46:03 +03:00
diego e631474c76 configure: Make largefile support non-optional
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33314 b3059339-0415-0410-9bf9-f77b7e298cf2

rpm: Delete reference to removed --enable-largefiles configure option.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33321 b3059339-0415-0410-9bf9-f77b7e298cf2

Conflicts:

	rpm/mplayer.spec
2011-05-02 00:36:21 +03:00
Uoti Urpala d33877acb6 configure: abort if certain libraries can't be found
Change the behavior of the iconv, freetype, fontconfig and libass
tests when autodetection fails. They now abort instead of silently
creating a crippled build. Users who really want to build without
those features can use explicit --disable flags.
2011-04-20 21:53:56 +03:00
Uoti Urpala 1bdb0e4cc3 configure: fix --enable-3dfx override without dga
If --enable-3dfx is specified but dga is not available then 3dfx is
disabled nonetheless. However, this disabling is not done properly,
and libvo/vo_3dfx.c is still compiled (but cannot be used). Fix.

The behavior of automatically disabling vo_3dfx despite --enable-3dfx
is itself questionable, but I'm not changing that now.
2011-04-20 20:37:10 +03:00
Clément Bœsch 699bf9dcd3 vo_dga: replace xf86dga.h with Xxf86dga.h
xf86dga.h is deprecated and may be removed in the future.
2011-04-20 04:22:53 +03:00
reimar 4496b90f8b configure: print correct result variable for armv6t2 test
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32996 b3059339-0415-0410-9bf9-f77b7e298cf2
2011-04-13 02:19:54 +03:00
Uoti Urpala adc941419d configure: remove old GUI-related options
Remove --with-glib-config, --with-gtk-config, --enable-gui,
--disable-gui, --enable-gtk1, --disable-gtk1. The only one of these
that still had any effect was --enable-gui which printed a warning
about GUI removal and exited. The --with options were still shown in
help output, the rest had already been deleted from that.
2011-04-02 22:09:27 +03:00
Uoti Urpala f9b5f2870c mp3lib: drop internal mp3lib tree
Delete mp3lib which has been the default mp3 decoder until now. In
addition to being an unnecessary embedded library it now fails to
compile correctly with the new gcc-4.6, producing noise.

After the deletion the default decoder priority for mp3 will be first
libmpg123 (a newer version of the code that mp3lib was based on) if
available, then ffmp3float which should be available in all normal
compiles. I think that some tweaking may be required as these decoder
alternatives get wider testing, but any problems should be solvable
and there should be no need for mp3lib.
2011-04-02 07:28:53 +03:00
Diogo Franco 5c731e2ea6 configure, Windows: support static pthreads on Windows
Windows pthreads requires certain functions to be called to initialize
itself. It can do that through DllMain but no such luck when linked
statically; mplayer needs to call the initialization explicitly.
2011-03-30 14:50:47 +03:00
Uoti Urpala 9f6b8e30d2 configure: remove --ffmpeg-source-dir help output
As things currently are the --ffmpeg-source-dir option will cause a
compilation failure. Maybe the video filters that depend on internal
FFmpeg headers to work should be deleted completely; for now I'll
remove the option from the help output as it can only confuse normal
users.
2011-03-01 23:56:41 +02:00
Uoti Urpala e786c70de9 build: change version number generation
Force Makefile to always run version.sh to potentially regenerate
version.h. Drop compiler version and 'git-' prefix from version
number. Match only git tags starting 'v'+number when generating
version number; leave the 'v' out from the result.
2011-02-19 19:07:12 +02:00
Uoti Urpala d9c79b7dc6 configure: fix --enable-libvorbis with tremor installed
Autodetected libvorbis prevented tremor test from running, but
--enable-libvorbis didn't. Add an explicit check to disable tremor in
that case.
2011-02-18 16:16:30 +02:00
reimar 179cb785e9 configure: disable libmpcdec by default
Disable libmpcdec (musepack) support by default, FFmpeg has a decoder
that works better for us and is used by default.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32826 b3059339-0415-0410-9bf9-f77b7e298cf2
2011-02-15 18:46:17 +02:00
Uoti Urpala 398643d0d7 configure: remove unused maemo check
configure had a check for some libraries specific to the maemo
platform. Apparently the code which would have used the results of
this check was never added. Remove the unused check.
2011-02-15 16:42:55 +02:00
Uoti Urpala ac443f6fd5 configure: use LINGUAS environment variable for messages
Previously the default with --enable-translation was to install all
language files if --language-msg was not explicitly specified. Change
the default to the languages set with the --language option or LINGUAS
environment variable if those are set; if neither is set then the
default is still to install all message languages.
2011-02-15 16:33:27 +02:00
Uoti Urpala b7e2899655 configure: abort if FFmpeg libraries are not found
Abort if FFmpeg libraries are not found unless --disable-ffmpeg was
explicitly specified. Note that even if you disable FFmpeg, libavutil
and libswscale are still required and you'll need to add linker flags
for them manually; I didn't try to clean up that case (few people
will want to do that).

Also fix the fallback test used if pkg-config doesn't find the
libraries: fix wrong header name and drop forced -lavcore which isn't
present in all FFmpeg versions. This shouldn't make a difference for
normal use since the pkg-config test should succeed if the libraries
are available.
2011-02-08 19:07:17 +02:00
Uoti Urpala dbb47bb2ec configure: print "Unknown parameter: " error to stderr
Print the "Unknown parameter: " line shown for unrecognized configure
options to stderr; other fatal errors are already directed there.
2011-02-02 02:18:51 +02:00
Uoti Urpala ed575cb710 configure: drop unused liblzo and bzlib tests
The configure liblzo test was left over from MEncoder functionality,
bzlib from internal FFmpeg build. Remove both.
2011-02-02 00:18:16 +02:00
Uoti Urpala 3bf725c39f configure: prefer libvorbis to libvorbisidec/tremor
libvorbis and libvorbisidec cannot both be enabled at the same time.
Change configure to enable libvorbis by default if both are
available. It's the more common library, and if someone want to do a
special build for FPU-less systems he can select the library
manually.
2011-02-01 21:30:53 +02:00
Uoti Urpala 6122d83981 tremor: drop internal tremor library
Drop internal copy of the tremor library. Note that the internal ogg
demuxer (which is still sometimes useful to work around libavformat
ogg demuxer problems, though it's itself quite buggy) now cannot be
compiled without either external libvorbis or libvorbisidec (tremor).
2011-02-01 21:28:03 +02:00
Uoti Urpala 7cd7416c73 libmpeg2: drop libmpeg2 support
libavcodec mpeg2 decoder has been the default for a while and seems to
work fine.
2011-02-01 20:10:27 +02:00
Uoti Urpala 626d5ed628 vo_zr2: drop Zoran support
There were multiple files specific to Zoran support, and they also
depended on internal FFmpeg headers (so it would probably have been
hard to get them to compile now even if you tried). It's obsolete now,
so just drop the whole mess.
2011-01-31 16:03:11 +02:00
Uoti Urpala b138ca43ca vo_dxr2, ao_dxr2: drop dxr2 support
dxr2 support had been broken quite a while and nobody noticed. There
were finally commits to fix it in the svn repo, but rather than apply
those I'll just drop dxr2 support.
2011-01-31 16:03:10 +02:00
Uoti Urpala 6d534cd3cb vidix: drop VIDIX support
By now VIDIX is too obscure to justify the amount of code and
complexity it requires in the sources. Although there is no pressing
need to drop it just now from a code point of view, I'll rather remove
it before release than release with VIDIX support and then drop it
later.

Some of the manpage mentions of VIDIX were in "this option supported
for these VOs" lists that looked outdated and failed to mention vdpau
for example. Replace such incorrect lists with a generic "not
supported for all VOs" mention.
2011-01-31 16:03:10 +02:00
diego c1dfa22eba cosmetics: configure: Drop leading underscore from _need_* variables
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32816 b3059339-0415-0410-9bf9-f77b7e298cf2
2011-01-31 16:03:10 +02:00
diego 1ff555e2ed configure: add return_check and return_statement_check helpers
cosmetics: Move header_check helper function.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32803 b3059339-0415-0410-9bf9-f77b7e298cf2

Add return_check() helper function and use it to simplify some checks.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32805 b3059339-0415-0410-9bf9-f77b7e298cf2

Add return_statement_check() helper function and use it to simplify some checks.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32806 b3059339-0415-0410-9bf9-f77b7e298cf2
2011-01-31 16:03:10 +02:00
reimar 6bed5460eb configure: Define _XOPEN_SOURCE to 600 in mkstemp check
Define _XOPEN_SOURCE to 600 instead of 500 in mkstemp check, this is
consistent to the use in libavcodec, consistent with other
_XOPEN_SOURCE defines in tests and it fixes detection on Solaris that
refuses to compile system headers when combining std=c99 with
_XOPEN_SOURCE 500.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32759 b3059339-0415-0410-9bf9-f77b7e298cf2
2011-01-31 16:03:10 +02:00
diego af0e2107b2 configure: add define_statement_check function
Add define_statement_check function and use it to simplify some checks.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32758 b3059339-0415-0410-9bf9-f77b7e298cf2

Simplify a bunch of configure checks with the statement_check function.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32760 b3059339-0415-0410-9bf9-f77b7e298cf2
2011-01-31 16:03:10 +02:00
diego d5a4a63d4b configure: simplify some tests
Simplify vector declarations and fast inttypes check with statement_check().

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32744 b3059339-0415-0410-9bf9-f77b7e298cf2

Drop unnecessary Xlib.h #include from Xss screensaver extensions check.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32745 b3059339-0415-0410-9bf9-f77b7e298cf2

configure: Simplify *BSD ioctl_meteor.h check.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32746 b3059339-0415-0410-9bf9-f77b7e298cf2

Add sys/time.h #include to videodev.h/videodev2.h checks.

Older kernels had broken videodev* headers that lacked the required #include.
patch by Michael Lampe, mlampe0 googlemail com

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32747 b3059339-0415-0410-9bf9-f77b7e298cf2

Revert previous wrong simplification of AltiVec vector declarations check.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32749 b3059339-0415-0410-9bf9-f77b7e298cf2

cosmetics: Drop some unnecessary end-of-line backslashes after &&/||.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32752 b3059339-0415-0410-9bf9-f77b7e298cf2

cosmetics: Get rid of some backslashes at the end of lines.

This is done by either moving the logical &&/|| operators to the
preceding line or by merging the two lines together.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32753 b3059339-0415-0410-9bf9-f77b7e298cf2
2011-01-31 16:03:09 +02:00
diego 42ed53f221 libfaad2:/ Remove forked internal libfaad2 copy
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32741 b3059339-0415-0410-9bf9-f77b7e298cf2

Remove AAC/FAAD2 installation instructions.

There is nothing special about building and installing FAAD2, so there is
no longer a need to keep maintaining instructions for it.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32742 b3059339-0415-0410-9bf9-f77b7e298cf2
2011-01-31 16:00:58 +02:00
reimar c46bd9a252 build: cygwin: don't rely on _WIN32 being defined
configure: Compilation fixes for current Cygwin

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32724 b3059339-0415-0410-9bf9-f77b7e298cf2

Do not #define _WIN32 on the command line for Cygwin.

Newer Cygwin versions no longer do this and hopefully we should be able
to survive without this hack as well.  This change necessitates adapting
two #ifdefs in the MPlayer codebase.  It is committed untested as I do
not have access to a Cygwin system.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32763 b3059339-0415-0410-9bf9-f77b7e298cf2
2011-01-29 04:04:53 +02:00
Uoti Urpala ec55a188e4 configure: remove obsolete things used for internal FFmpeg build
Remove some definitions from generated config.h/config.mak that were
only used when building internal FFmpeg. Remove Solaris mlib test.
Also fix definition of --disable-ffmpeg in configure help output.
2011-01-25 03:15:26 +02:00
Clément Bœsch b16a8fa406 configure: remove MEncoder-related options and tests
Also remove one MEncoder variable reference from TOOLS/vivodump rule
in Makefile.
2011-01-25 02:18:06 +02:00
diego dbc9a080f4 configure: Do not enable rpath on NetBSD
patch extracted from the NetBSD pkgsrc tree

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32573 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-08 18:03:35 +02:00
diego e4230c554c configure: Enable joystick support on FreeBSD
patch extracted from the FreeBSD ports tree

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32572 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-08 18:03:35 +02:00
Uoti Urpala d707da9e65 build: enable vf_geq if libavutil version installs eval.h
New enough libavutil versions allow building vf_geq.c without
requiring internal FFmpeg headers.
2010-11-06 23:29:07 +02:00
diego 4aa55a7725 configure: Fix detection of mips processor variants
patch by Graham Gower, graham.gower gmail com

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32522 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:18:38 +02:00
siretart 1f97094c8d configure: check if libdvdcss has been removed from tree
In some scenarios it might make sense to redistribute a copy of the
mplayer sources that does not contain the internal libdvdcss copy. In
order to not require the configure parameter
--disable-libdvdcss-internal, this change checks that the libdvdcss
directory actually exists when no particular behavior has been
requested.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32493 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:18:37 +02:00
diego abca2a253e configure: Ensure that CONFIG_NETWORK is #defined to 0 or 1
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32441 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:18:08 +02:00
diego 448a8a4032 configure: simplify X11, IVTV and V4l2 checks
Simplify some X11 checks with the help of statement_check_broken().

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32428 b3059339-0415-0410-9bf9-f77b7e298cf2

Remove some unnecessary #includes from IVTV and V4L2 checks.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32429 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:18:08 +02:00
diego 671de0948b configure: simplify some checks
Simplify some configure checks through statement_check{_broken}().

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32380 b3059339-0415-0410-9bf9-f77b7e298cf2

Drop two unnecessary Xlib.h #includes and use helper functions.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32388 b3059339-0415-0410-9bf9-f77b7e298cf2

Revert accidentally committed changes.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32389 b3059339-0415-0410-9bf9-f77b7e298cf2

Remove unnecessary Xlib.h #include from xf86keysym check.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32390 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:18:08 +02:00
diego 3b51e2ff55 configure: Rename function_check{_broken}() --> statement_check{_broken}()
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32379 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:18:08 +02:00
diego d835d7890a configure: simplify some tests
Remove some unnecessary windows.h #includes in configure checks.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32363 b3059339-0415-0410-9bf9-f77b7e298cf2

configure: simplify Direct3D and Windows waveout tests

Simplify Direct3D check with header_check().

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32364 b3059339-0415-0410-9bf9-f77b7e298cf2

Simplify Windows waveout test with header_check_broken().

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32365 b3059339-0415-0410-9bf9-f77b7e298cf2

Simplify ENCA check.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32371 b3059339-0415-0410-9bf9-f77b7e298cf2

Remove unnecessary linux/types.h #include from Apple IR check.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32373 b3059339-0415-0410-9bf9-f77b7e298cf2

Simplify jpeglib check with header_check_broken().

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32375 b3059339-0415-0410-9bf9-f77b7e298cf2

Simplify inet_pton/inet_aton checks with function_check().

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32376 b3059339-0415-0410-9bf9-f77b7e298cf2

Remove unnecessary sys/types.h #include from shm check.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32378 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:18:08 +02:00