Commit Graph

40 Commits

Author SHA1 Message Date
Valentine Barshak
79f77bf925 mplayer: Amend libmad selection
Do not set both --enable-mad and --disable-mad.

Signed-off-by: Valentine Barshak <gvaxon@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2012-10-04 23:29:41 +02:00
Valentine Barshak
63fbc1834f mplayer: Fix external libdvdread and libdvdnav support
This sets paths to dvdread-config and dvdnav-config,
and configuration options to enable external libdvdread
and libdvdnav support.

Signed-off-by: Valentine Barshak <gvaxon@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2012-10-04 23:26:56 +02:00
Peter Korsgaard
0b255b0649 mplayer: 1.1 version needs largefile support
Fixes http://autobuild.buildroot.net/results/7d084a1a8fd484f2c6df82ccd7b9d8aeebe68c2d

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2012-09-26 09:13:32 +02:00
Thomas Petazzoni
14af091234 mplayer: not supported on sh4a/sh4aeb
The mplayer configure script says that sh4a is not supported,
according to:

 http://autobuild.buildroot.org/results/c6457c2dea7c1df4d8e0f23995ebfb3285a85aed/build-end.log

Apparently, sh4 is supported, but not sh4a, even though it seems that
sh4a is a super-set of sh4. So it would probably not be too difficult
to get mplayer to build/work for sh4a, but we don't have hardware to
test this easily, and we can leave this work to the first developer
who will need mplayer on sh4a: let's only support what the upstream
package supports.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2012-09-20 14:08:01 +02:00
Kelvin Cheung
96f64475b1 mplayer: Update to version 1.1.
Update to version 1.1 (r34994).

remove --enable-largefiles configure option which was
deleted in r33321.

Discard mplayer-theora-fix.patch which is a backport
of r34498 and r34503.

Signed-off-by: Kelvin Cheung <keguang.zhang@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2012-08-21 13:20:31 +02:00
Arnout Vandecappelle (Essensium/Mind)
e1502ebc0c all packages: rename XXXTARGETS to xxx-package
Also remove the redundant $(call ...).

This is a purely mechanical change, performed with
find package linux toolchain boot -name \*.mk | \
  xargs sed -i -e 's/$(eval $(call GENTARGETS))/$(eval $(generic-package))/' \
               -e 's/$(eval $(call AUTOTARGETS))/$(eval $(autotools-package))/' \
               -e 's/$(eval $(call CMAKETARGETS))/$(eval $(cmake-package))/'

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2012-07-17 20:23:05 +02:00
Peter Korsgaard
46b71cb0be mplayer: fix libtheora linking issue
We cannot (easily) move to a newer upstream version where this is fixed
as ffmpeg moved to git / is no longer bundled, so instead this fix
is backported (upstream r34498 + r34503).

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2012-02-12 22:05:43 +01:00
Peter Korsgaard
5796753b6b mplayer: add optional vorbis dependency
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2012-01-27 11:18:52 +01:00
Peter Korsgaard
0327c24e5f mplayer: tremor now automatically pulls in libogg
So no need to explicitly depend on it.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2012-01-25 14:37:34 +01:00
Peter Korsgaard
c29fad1e1b mplayer: external tremor support needs ogg as well
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-11-19 15:56:48 +01:00
Peter Korsgaard
fd38100e11 mplayer: fix build on i386
Mplayer needs to be built with -fomit-frame-pointer on x86, otherwise
gcc errors out on the inline asm with too few registers.

Also disable yasm support, both because this mplayer revision forgets
to build the gpl'ed asm snippets (fixed in r32736), breaking the build
- And also to ensure the build is reproducable and doesn't use host
components behind the users' back (E.G. if yasm is available on host).

Once we have added yasm as a package, this can get removed again (and
mplayer svn rev bumped) for the performance boost it gives.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-11-14 22:14:53 +01:00
Kelvin Cheung
88b5a31f31 mplayer: Enable live and tv options
1.Enable TV interface.
2.Enable LIVE555 Streaming Media if live555 is available.

[Peter: cleanup CFLAGS/LDFLAGS handling]
Signed-off-by: Kelvin Cheung <keguang.zhang@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-11-09 23:42:23 +01:00
Thomas Petazzoni
0849e8193e package: remove useless arguments from GENTARGETS
Thanks to the pkgparentdir and pkgname functions, we can rewrite the
GENTARGETS macro in a way that avoids the need for each package to
repeat its name and the directory in which it is present.

[Peter: pkgdir->pkgparentdir]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-09-29 23:09:58 +02:00
Peter Korsgaard
8b4f5f2410 mplayer: fix libmad check
Closes #3757

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-05-18 22:03:57 +02:00
Bjørn Forsman
d60a445996 mplayer: bump version to fix build error
Bump mplayer to the first version that fixes this issue:

file.c:23:5: warning: "HAVE_MMAP" is not defined
file.c:25:7: warning: "HAVE_MAPVIEWOFFILE" is not defined
file.c:77:5: warning: "HAVE_MMAP" is not defined
file.c:87:7: warning: "HAVE_MAPVIEWOFFILE" is not defined
file.c:124:5: warning: "HAVE_MMAP" is not defined
file.c:126:7: warning: "HAVE_MAPVIEWOFFILE" is not defined
file.c: In function 'av_file_map':
file.c:50: error: 'HAVE_MMAP' undeclared (first use in this function)
file.c:50: error: (Each undeclared identifier is reported only once
file.c:50: error: for each function it appears in.)
make[2]: *** [file.o] Error 1

Signed-off-by: Bjørn Forsman <bjorn.forsman@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-02-10 20:15:53 +01:00
Thomas Petazzoni
6bcedeed37 mplayer: convert to gentargets, bump to a recent SVN version
Based on the conversion to gentargets done by Martin Banky, several
issues were fixed, and the mplayer package was improved:

 * Updated to a recent SVN version

 * Removed mandatory dependency on libmad

 * The AVR32 specific patch has been removed. It was a pain to remain
   blocked at the old 1.0-rc2 just for this patch. All this
   optimization work should have been submitted upstream, Buildroot is
   not the place to carry such heavy modifications.

 * Options were added to select whether mplayer and/or mencoder should
   be built/installed.

 * Support for additional options if packages have been selected:
   tremor, libmad, libtheora, libpng, jpeg, xlib_libX11,
   xlib_libXv. More could be added in the future.

 * Support for ARM-related optimization options. Similar improvements
   could be done for x86 and PowerPC architectures.

[Peter: fix build with !IPV6]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-12-14 01:28:08 +01:00
Peter Korsgaard
209b342531 mplayer: tighten alsa dependency
mplayer needs pcm+mixer support in alsa, but this isn't checked by
configure, so do it in mplayer.mk instead.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-11-04 13:10:23 +01:00
Peter Korsgaard
87e55feec7 mplayer: add optional sdl/freetype support
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-07-22 13:08:24 +02:00
Peter Korsgaard
89fc8a4f5a mplayer: fix build after efb1d8d3f4 (Cleanup TARGET_CONFIGURE_OPTS)
mplayer's configure script got confused by the equal sign (=) we now have
in TARGET_CC because of --sysroot=<path>.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-07-22 11:24:30 +02:00
Thomas Petazzoni
a1c8fa41f6 Update all packages to quote $(TARGET_CC)
Now that TARGET_CC contains several space-separated words, it must be
used quoted everywhere.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2010-07-07 08:20:21 +02:00
Peter Korsgaard
32ed970075 mplayer: disable parallel builds (make -jX)
The build system races with itself when building the internal vidix stuff
(x86 only), so use MAKE1.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-05-04 22:48:16 +02:00
Peter Korsgaard
23ff3c2786 mplayer: internal copies of libdvdread/libdvdcss require largefile support
So disable when we don't have largefile support in toolchain.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-05-04 21:38:14 +02:00
Thomas Petazzoni
ca2293b364 mplayer: use UTF-8 charset to avoid iconv dependency
The mplayer configure script was failing with:

  Checking for iconv program ... no
  No working iconv program found, use
  --charset=UTF-8 to continue anyway.
  If you also have problems with iconv library functions use --charset=noconv.
  Messages in the GTK-2 interface will be broken then.

Therefore, we pass --charset=UTF-8 instead of --charset=US-ASCII.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2010-02-23 20:34:56 +01:00
Will Newton
422ce6536b package: Remove unnecessary dependencies on uclibc.
A C library will have been built by the toolchain makefiles, so there is no
need for packages to explicitly depend on uclibc.

Signed-off-by: Will Newton <will.newton@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2009-09-03 20:22:38 +02:00
Will Newton
6fecd53e99 mplayer: Update mplayer to version 1.0rc2.
Closes #331.

- Remove patches applied upstream
 - Add updated avr32 patch from Hans-Christian Egtvedt.

Signed-off-by: Kelvin Cheung <keguang.zhang@gmail.com>
Signed-off-by: Will Newton <will.newton@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2009-07-27 17:17:04 +02:00
Peter Korsgaard
2bae136f05 mplayer: disable LIVE555 Streaming Media
LIVE555 was installed on the build system and was recognized by configure:
Checking for LIVE555 Streaming Media libraries ... yes (using distribution version)

Later this led to a linker error:
ld: cannot find -lliveMedia

Disable LIVE555, since it's not available in Buildroot.

Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de>
2009-03-28 13:10:17 +00:00
Peter Korsgaard
2440801bd1 mplayer: add -fomit-frame-pointer for i386
This seems to be required to compile some of the inline asm.

This solves the following compiler errors:
h264.c: In function 'decode_cabac_residual':
h264.c:6158: warning: passing argument 4 of 'decode_significance_8x8_x86' discards qualifiers from pointer target type
cabac.h: In function 'get_cabac_noinline':
cabac.h:513: error: can't find a register in class 'GENERAL_REGS' while reloading 'asm'
cabac.h:513: error: 'asm' operand has impossible constraints

While searching several weeks ago, I hit the following URL, which
unfortunately currently doesn't seem to work anymore and I can't
remember what the bug was about.

Also see http://bugs.uclibc.org/view.php?id=4604

Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de>
2009-01-26 09:22:52 +00:00
Peter Korsgaard
3c0dea728e mplayer: add patch due to missing sys/timeb.h
This include file is only available, if uClibc is compiled with
UCLIBC_SUSV3_LEGACY defined and ftime() is not needed in this part of
mplayer at all.

This solves the following compiler error:
win32.c:67:23: error: sys/timeb.h: No such file or directory

Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de>
2009-01-26 09:22:47 +00:00
Peter Korsgaard
81dc300b4d mplayer: fix non-largefile build 2009-01-20 09:29:50 +00:00
Peter Korsgaard
999026df2b mplayer: fix configure for powerpc-linux 2009-01-20 09:12:06 +00:00
Peter Korsgaard
49c682dcab mplayer: force cross-compile mode 2009-01-20 09:11:57 +00:00
Hans-Christian Egtvedt
877a486ac9 mplayer: add patch to fix compilation against alsa-lib 1.0.18
This adds a patch to fix compilation against alsa-lib 1.0.18. It is basically a
grab of the change from mplayer repository. It also refreshes the other patches
so they apply clean.

Signed-off-by: Hans-Christian Egtvedt <hans-christian.egtvedt@atmel.com>
2009-01-20 06:17:12 +00:00
Peter Korsgaard
4a7bfd2775 package/: convert to DOWNLOAD helper 2009-01-16 11:42:52 +00:00
Hans-Christian Egtvedt
5851eae5f0 mplayer: set charset explisit to US-ASCII to ease intl compile
This patch set the charset selected by mplayer to US-ASCII because mplayer
configure script have problems detecting working cross compiled iconv tools
2008-12-04 16:49:06 +00:00
Hans-Christian Egtvedt
e3e34dab93 mplayer: use $(if ...) to add dependencies to mplayer
This patch will add needed libraries with $(if ...) syntax. This should ease
readability and make it easy for others to spot where the depencies are added.

Signed-off-by: Hans-Christian Egtvedt <hans-christian.egtvedt@atmel.com>
2008-12-01 13:33:33 +00:00
Hans-Christian Egtvedt
fb11bbf5e9 mplayer: remove not needed $(strip ...) calls in Makefile
Signed-off-by: Hans-Christian Egtvedt <hans-christian.egtvedt@atmel.com>
2008-12-01 13:08:43 +00:00
Hans-Christian Egtvedt
377e554200 mplayer: make sure alsa-lib is installed before mplayer
This patch adds alsa-lib to a dependency for mplayer if it is selected in
kconfig.

Signed-off-by: Hans-Christian Egtvedt <hans-christian.egtvedt@atmel.com>
2008-12-01 12:53:09 +00:00
Hans-Christian Egtvedt
8c149d286a mplayer: add dependency libraries to a variable
This patch will put dependency libraries in a variable and add this to the
dependencies to build mplayer. This is done to ease adding new libraries in the
future.

Signed-off-by: Hans-Christian Egtvedt <hans-christian.egtvedt@atmel.com>
2008-12-01 12:48:58 +00:00
Hans-Christian Egtvedt
8248a4a144 mplayer: disable ivtv video output
This patch disabled ivtv video output, since it does not compile with Linux
kernel 2.6.27 headers.

Signed-off-by: Hans-Christian Egtvedt <hans-christian.egtvedt@atmel.com>
2008-12-01 12:32:50 +00:00
Peter Korsgaard
50f2a3981f mplayer, vlc: move into multimedia category
Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de>
2008-11-15 21:33:14 +00:00