2013-06-06 01:53:30 +02:00
|
|
|
################################################################################
|
2007-07-23 10:12:39 +02:00
|
|
|
#
|
|
|
|
|
# mplayer
|
|
|
|
|
#
|
2013-06-06 01:53:30 +02:00
|
|
|
################################################################################
|
2013-06-06 01:53:25 +02:00
|
|
|
|
2016-05-28 11:27:24 +02:00
|
|
|
MPLAYER_VERSION = 1.3.0
|
2012-08-21 12:13:48 +02:00
|
|
|
MPLAYER_SOURCE = MPlayer-$(MPLAYER_VERSION).tar.xz
|
|
|
|
|
MPLAYER_SITE = http://www.mplayerhq.hu/MPlayer/releases
|
2015-10-07 22:15:54 +02:00
|
|
|
MPLAYER_DEPENDENCIES = host-pkgconf
|
2017-03-30 15:43:32 +02:00
|
|
|
MPLAYER_LICENSE = GPL-2.0
|
2015-10-07 22:15:54 +02:00
|
|
|
MPLAYER_LICENSE_FILES = LICENSE Copyright
|
2011-11-08 12:16:17 +01:00
|
|
|
MPLAYER_CFLAGS = $(TARGET_CFLAGS)
|
|
|
|
|
MPLAYER_LDFLAGS = $(TARGET_LDFLAGS)
|
|
|
|
|
|
mplayer: fix detection of X.org
As reported in bug #8206, the mplayer configure script fails to detect
the availability of X11 header/library if the X.org development packages
are not installed on the build machine.
This is due to the logic used by the mplayer configure script, which
looks like this:
for I in $(echo $extra_cflags | sed s/-I//g) /usr/include ; do
if test -f "$I/X11/Xlib.h" ; then
_x11_headers="yes"
So, in other words, it:
1/ Parses the --extra-cflags option, and finds the -I options in there.
2/ Looks in /usr/include
Since $(STAGING_DIR)/usr/include is in the compiler built-in search path
for headers, we currently don't explicitly pass it in --extra-cflags, so
mplayer only looks in /usr/include. If you have X11 headers there thanks
to being installed on your build machine, everything works fine (the
rest of the build logic really uses the headers and libraries of the
cross-compiler). But if you don't have X11 headers in /usr/include, the
configure scripts assumes X11 is not available.
Since fixing the hand-written configure script of mplayer, hosted in a
Subversion repository, is beyond sanity, we simply work around this
problem by passing the appropriate -I$(STAGING_DIR)/usr/include option
in --extra-cflags.
Before this patch, during the configure script:
Checking for X11 headers presence ... no (check if the dev(el) packages are installed)
Checking for X11 ... no (check if the dev(el) packages are installed)
And then, the mplayer binary:
0x00000001 (NEEDED) Shared library: [librt.so.0]
0x00000001 (NEEDED) Shared library: [libz.so.1]
0x00000001 (NEEDED) Shared library: [libpthread.so.0]
0x00000001 (NEEDED) Shared library: [libdl.so.0]
0x00000001 (NEEDED) Shared library: [libm.so.0]
0x00000001 (NEEDED) Shared library: [libc.so.0]
With this patch, during the configure script:
Checking for X11 headers presence ... yes
Checking for X11 ... yes
And then, the mplayer binary:
0x00000001 (NEEDED) Shared library: [librt.so.0]
0x00000001 (NEEDED) Shared library: [libz.so.1]
0x00000001 (NEEDED) Shared library: [libpthread.so.0]
0x00000001 (NEEDED) Shared library: [libdl.so.0]
0x00000001 (NEEDED) Shared library: [libm.so.0]
0x00000001 (NEEDED) Shared library: [libXext.so.6]
0x00000001 (NEEDED) Shared library: [libX11.so.6]
0x00000001 (NEEDED) Shared library: [libXinerama.so.1]
0x00000001 (NEEDED) Shared library: [libXxf86vm.so.1]
0x00000001 (NEEDED) Shared library: [libc.so.0]
Fixes bug #8206
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2016-08-31 23:17:26 +02:00
|
|
|
# Adding $(STAGING_DIR)/usr/include in the header path is normally not
|
|
|
|
|
# needed. Except that mplayer's configure script has a completely
|
|
|
|
|
# brain-damaged way of looking for X11/Xlib.h (it parses extra-cflags
|
|
|
|
|
# for -I options).
|
|
|
|
|
MPLAYER_CFLAGS += -I$(STAGING_DIR)/usr/include
|
|
|
|
|
|
2010-11-04 13:09:14 +01:00
|
|
|
# mplayer needs pcm+mixer support, but configure fails to check for it
|
|
|
|
|
ifeq ($(BR2_PACKAGE_ALSA_LIB)$(BR2_PACKAGE_ALSA_LIB_MIXER)$(BR2_PACKAGE_ALSA_LIB_PCM),yyy)
|
|
|
|
|
MPLAYER_DEPENDENCIES += alsa-lib
|
.mk files: bulk aligment and whitespace cleanup of assignments
The Buildroot coding style defines one space around make assignments and
does not align the assignment symbols.
This patch does a bulk fix of offending packages. The package
infrastructures (or more in general assignments to calculated variable
names, like $(2)_FOO) are not touched.
Alignment of line continuation characters (\) is kept as-is.
The sed command used to do this replacement is:
find * -name "*.mk" | xargs sed -i \
-e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\s*$#\1 \2#'
-e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\s*\([^\\]\+\)$#\1 \2 \3#'
-e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\s*\([^\\ \t]\+\s*\\\)\s*$#\1 \2 \3#'
-e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\(\s*\\\)#\1 \2\3#'
Brief explanation of this command:
^\([A-Z0-9a-z_]\+\) a regular variable at the beginning of the line
\([?:+]\?=\) any assignment character =, :=, ?=, +=
\([^\\]\+\) any string not containing a line continuation
\([^\\ \t]\+\s*\\\) string, optional whitespace, followed by a
line continuation character
\(\s*\\\) optional whitespace, followed by a line
continuation character
Hence, the first subexpression handles empty assignments, the second
handles regular assignments, the third handles regular assignments with
line continuation, and the fourth empty assignments with line
continuation.
This expression was tested on following test text: (initial tab not
included)
FOO = spaces before
FOO = spaces before and after
FOO = tab before
FOO = tab and spaces before
FOO = tab after
FOO = tab and spaces after
FOO = spaces and tab after
FOO = \
FOO = bar \
FOO = bar space \
FOO = \
GENIMAGE_DEPENDENCIES = host-pkgconf libconfuse
FOO += spaces before
FOO ?= spaces before and after
FOO :=
FOO =
FOO =
FOO =
FOO =
$(MAKE1) CROSS_COMPILE=$(TARGET_CROSS) -C
AT91BOOTSTRAP3_DEFCONFIG = \
AXEL_DISABLE_I18N=--i18n=0
After this bulk change, following manual fixups were done:
- fix line continuation alignment in cegui06 and spice (the sed
expression leaves the number of whitespace between the value and line
continuation character intact, but the whitespace before that could have
changed, causing misalignment.
- qt5base was reverted, as this package uses extensive alignment which
actually makes the code more readable.
Finally, the end result was manually reviewed.
Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Cc: Yann E. Morin <yann.morin.1998@free.fr>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-10-07 09:06:03 +02:00
|
|
|
MPLAYER_CONF_OPTS += --enable-alsa
|
2010-11-04 13:09:14 +01:00
|
|
|
else
|
.mk files: bulk aligment and whitespace cleanup of assignments
The Buildroot coding style defines one space around make assignments and
does not align the assignment symbols.
This patch does a bulk fix of offending packages. The package
infrastructures (or more in general assignments to calculated variable
names, like $(2)_FOO) are not touched.
Alignment of line continuation characters (\) is kept as-is.
The sed command used to do this replacement is:
find * -name "*.mk" | xargs sed -i \
-e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\s*$#\1 \2#'
-e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\s*\([^\\]\+\)$#\1 \2 \3#'
-e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\s*\([^\\ \t]\+\s*\\\)\s*$#\1 \2 \3#'
-e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\(\s*\\\)#\1 \2\3#'
Brief explanation of this command:
^\([A-Z0-9a-z_]\+\) a regular variable at the beginning of the line
\([?:+]\?=\) any assignment character =, :=, ?=, +=
\([^\\]\+\) any string not containing a line continuation
\([^\\ \t]\+\s*\\\) string, optional whitespace, followed by a
line continuation character
\(\s*\\\) optional whitespace, followed by a line
continuation character
Hence, the first subexpression handles empty assignments, the second
handles regular assignments, the third handles regular assignments with
line continuation, and the fourth empty assignments with line
continuation.
This expression was tested on following test text: (initial tab not
included)
FOO = spaces before
FOO = spaces before and after
FOO = tab before
FOO = tab and spaces before
FOO = tab after
FOO = tab and spaces after
FOO = spaces and tab after
FOO = \
FOO = bar \
FOO = bar space \
FOO = \
GENIMAGE_DEPENDENCIES = host-pkgconf libconfuse
FOO += spaces before
FOO ?= spaces before and after
FOO :=
FOO =
FOO =
FOO =
FOO =
$(MAKE1) CROSS_COMPILE=$(TARGET_CROSS) -C
AT91BOOTSTRAP3_DEFCONFIG = \
AXEL_DISABLE_I18N=--i18n=0
After this bulk change, following manual fixups were done:
- fix line continuation alignment in cegui06 and spice (the sed
expression leaves the number of whitespace between the value and line
continuation character intact, but the whitespace before that could have
changed, causing misalignment.
- qt5base was reverted, as this package uses extensive alignment which
actually makes the code more readable.
Finally, the end result was manually reviewed.
Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Cc: Yann E. Morin <yann.morin.1998@free.fr>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-10-07 09:06:03 +02:00
|
|
|
MPLAYER_CONF_OPTS += --disable-alsa
|
2010-11-04 13:09:14 +01:00
|
|
|
endif
|
2010-07-22 12:49:17 +02:00
|
|
|
|
2007-07-23 10:12:39 +02:00
|
|
|
ifeq ($(BR2_ENDIAN),"BIG")
|
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-12 22:54:03 +01:00
|
|
|
MPLAYER_CONF_OPTS += --enable-big-endian
|
2007-07-23 10:12:39 +02:00
|
|
|
else
|
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-12 22:54:03 +01:00
|
|
|
MPLAYER_CONF_OPTS += --disable-big-endian
|
2007-07-23 10:12:39 +02:00
|
|
|
endif
|
|
|
|
|
|
2015-10-14 16:15:24 +02:00
|
|
|
ifeq ($(BR2_PACKAGE_ZLIB),y)
|
|
|
|
|
MPLAYER_DEPENDENCIES += zlib
|
|
|
|
|
MPLAYER_CONF_OPTS += \
|
|
|
|
|
--enable-decoder=apng \
|
|
|
|
|
--enable-encoder=apng \
|
|
|
|
|
--enable-decoder=tdsc
|
|
|
|
|
else
|
|
|
|
|
MPLAYER_CONF_OPTS += \
|
|
|
|
|
--disable-decoder=apng \
|
|
|
|
|
--disable-encoder=apng \
|
|
|
|
|
--disable-decoder=tdsc
|
|
|
|
|
endif
|
|
|
|
|
|
2010-07-22 12:49:17 +02:00
|
|
|
ifeq ($(BR2_PACKAGE_SDL),y)
|
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-12 22:54:03 +01:00
|
|
|
MPLAYER_CONF_OPTS += \
|
|
|
|
|
--enable-sdl \
|
|
|
|
|
--with-sdl-config=$(STAGING_DIR)/usr/bin/sdl-config
|
2010-07-22 12:49:17 +02:00
|
|
|
MPLAYER_DEPENDENCIES += sdl
|
|
|
|
|
else
|
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-12 22:54:03 +01:00
|
|
|
MPLAYER_CONF_OPTS += --disable-sdl
|
2010-07-22 12:49:17 +02:00
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
ifeq ($(BR2_PACKAGE_FREETYPE),y)
|
2017-04-21 17:24:48 +02:00
|
|
|
MPLAYER_CONF_OPTS += \
|
2010-07-22 12:49:17 +02:00
|
|
|
--enable-freetype \
|
|
|
|
|
--with-freetype-config=$(STAGING_DIR)/usr/bin/freetype-config
|
|
|
|
|
MPLAYER_DEPENDENCIES += freetype
|
|
|
|
|
else
|
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-12 22:54:03 +01:00
|
|
|
MPLAYER_CONF_OPTS += --disable-freetype
|
|
|
|
|
endif
|
|
|
|
|
|
2015-03-29 19:11:22 +02:00
|
|
|
# We intentionally don't pass --enable-fontconfig, to let the
|
|
|
|
|
# autodetection find which library to link with.
|
|
|
|
|
ifeq ($(BR2_PACKAGE_FONTCONFIG),y)
|
|
|
|
|
MPLAYER_DEPENDENCIES += fontconfig
|
|
|
|
|
else
|
|
|
|
|
MPLAYER_CONF_OPTS += --disable-fontconfig
|
|
|
|
|
endif
|
|
|
|
|
|
2015-03-29 19:11:25 +02:00
|
|
|
ifeq ($(BR2_PACKAGE_LIBENCA),y)
|
|
|
|
|
MPLAYER_CONF_OPTS += --enable-enca
|
|
|
|
|
MPLAYER_DEPENDENCIES += libenca
|
|
|
|
|
else
|
|
|
|
|
MPLAYER_CONF_OPTS += --disable-enca
|
|
|
|
|
endif
|
|
|
|
|
|
2015-03-29 19:11:23 +02:00
|
|
|
# We intentionally don't pass --enable-fribidi, to let the
|
|
|
|
|
# autodetection find which library to link with.
|
|
|
|
|
ifeq ($(BR2_PACKAGE_LIBFRIBIDI),y)
|
|
|
|
|
MPLAYER_DEPENDENCIES += libfribidi
|
|
|
|
|
else
|
|
|
|
|
MPLAYER_CONF_OPTS += --disable-fribidi
|
|
|
|
|
endif
|
|
|
|
|
|
2015-03-29 19:11:30 +02:00
|
|
|
# We intentionally don't pass --enable-libiconv, to let the
|
|
|
|
|
# autodetection find which library to link with.
|
|
|
|
|
ifeq ($(BR2_PACKAGE_LIBICONV),y)
|
|
|
|
|
MPLAYER_DEPENDENCIES += libiconv
|
|
|
|
|
else
|
|
|
|
|
MPLAYER_CONF_OPTS += --disable-iconv
|
|
|
|
|
endif
|
|
|
|
|
|
2015-03-29 19:11:19 +02:00
|
|
|
# We intentionally don't pass --enable-termcap, in order to let the
|
|
|
|
|
# autodetection find with which library to link with. Otherwise, we
|
|
|
|
|
# would have to pass it manually.
|
|
|
|
|
ifeq ($(BR2_PACKAGE_NCURSES),y)
|
|
|
|
|
MPLAYER_DEPENDENCIES += ncurses
|
|
|
|
|
else
|
|
|
|
|
MPLAYER_CONF_OPTS += --disable-termcap
|
|
|
|
|
endif
|
|
|
|
|
|
2016-03-11 15:32:18 +01:00
|
|
|
# mplayer doesn't pick up libsmbclient cflags
|
|
|
|
|
ifeq ($(BR2_PACKAGE_SAMBA4),y)
|
|
|
|
|
MPLAYER_CFLAGS += `$(PKG_CONFIG_HOST_BINARY) --cflags smbclient`
|
2015-03-29 19:11:20 +02:00
|
|
|
MPLAYER_CONF_OPTS += --enable-smb
|
2016-03-11 15:32:18 +01:00
|
|
|
MPLAYER_DEPENDENCIES += samba4
|
2015-03-29 19:11:20 +02:00
|
|
|
else
|
|
|
|
|
MPLAYER_CONF_OPTS += --disable-smb
|
|
|
|
|
endif
|
|
|
|
|
|
2015-03-29 19:11:21 +02:00
|
|
|
ifeq ($(BR2_PACKAGE_LIBBLURAY),y)
|
|
|
|
|
MPLAYER_CONF_OPTS += --enable-bluray
|
|
|
|
|
MPLAYER_DEPENDENCIES += libbluray
|
|
|
|
|
else
|
|
|
|
|
MPLAYER_CONF_OPTS += --disable-bluray
|
|
|
|
|
endif
|
|
|
|
|
|
2015-03-29 19:11:31 +02:00
|
|
|
# cdio support is broken in buildroot atm due to missing libcdio-paranoia
|
|
|
|
|
# package and this patch
|
|
|
|
|
# https://github.com/pld-linux/mplayer/blob/master/mplayer-libcdio.patch
|
|
|
|
|
MPLAYER_CONF_OPTS += --disable-libcdio
|
|
|
|
|
|
2015-11-08 16:55:17 +01:00
|
|
|
# We intentionally don't pass --enable-dvdread, to let the
|
|
|
|
|
# autodetection find which library to link with.
|
2012-09-26 11:34:51 +02:00
|
|
|
ifeq ($(BR2_PACKAGE_LIBDVDREAD),y)
|
2017-04-21 17:24:48 +02:00
|
|
|
MPLAYER_CONF_OPTS += \
|
2016-06-19 18:20:27 +02:00
|
|
|
--with-dvdread-config="$(PKG_CONFIG_HOST_BINARY) dvdread"
|
2012-09-26 11:34:51 +02:00
|
|
|
MPLAYER_DEPENDENCIES += libdvdread
|
|
|
|
|
endif
|
|
|
|
|
|
2015-11-19 11:06:11 +01:00
|
|
|
# We intentionally don't pass --enable-dvdnav to let the autodetection
|
|
|
|
|
# find which library to link with.
|
2012-09-26 11:34:51 +02:00
|
|
|
ifeq ($(BR2_PACKAGE_LIBDVDNAV),y)
|
2017-04-21 17:24:48 +02:00
|
|
|
MPLAYER_CONF_OPTS += \
|
2016-06-19 18:20:27 +02:00
|
|
|
--with-dvdnav-config="$(PKG_CONFIG_HOST_BINARY) dvdnav"
|
2012-09-26 11:34:51 +02:00
|
|
|
MPLAYER_DEPENDENCIES += libdvdnav
|
|
|
|
|
endif
|
|
|
|
|
|
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-12 22:54:03 +01:00
|
|
|
ifeq ($(BR2_PACKAGE_MPLAYER_MPLAYER),y)
|
|
|
|
|
MPLAYER_CONF_OPTS += --enable-mplayer
|
|
|
|
|
else
|
|
|
|
|
MPLAYER_CONF_OPTS += --disable-mplayer
|
2010-07-22 12:49:17 +02:00
|
|
|
endif
|
|
|
|
|
|
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-12 22:54:03 +01:00
|
|
|
ifeq ($(BR2_PACKAGE_MPLAYER_MENCODER),y)
|
|
|
|
|
MPLAYER_CONF_OPTS += --enable-mencoder
|
|
|
|
|
else
|
|
|
|
|
MPLAYER_CONF_OPTS += --disable-mencoder
|
2009-01-26 10:22:52 +01:00
|
|
|
endif
|
|
|
|
|
|
2015-03-29 19:11:27 +02:00
|
|
|
ifeq ($(BR2_PACKAGE_FAAD2),y)
|
|
|
|
|
MPLAYER_DEPENDENCIES += faad2
|
|
|
|
|
MPLAYER_CONF_OPTS += --enable-faad
|
|
|
|
|
else
|
|
|
|
|
MPLAYER_CONF_OPTS += --disable-faad
|
|
|
|
|
endif
|
|
|
|
|
|
2015-03-29 19:11:33 +02:00
|
|
|
ifeq ($(BR2_PACKAGE_LAME),y)
|
|
|
|
|
MPLAYER_DEPENDENCIES += lame
|
|
|
|
|
MPLAYER_CONF_OPTS += --enable-mp3lame
|
|
|
|
|
else
|
|
|
|
|
MPLAYER_CONF_OPTS += --disable-mp3lame
|
|
|
|
|
endif
|
|
|
|
|
|
2015-03-29 19:11:24 +02:00
|
|
|
# We intentionally don't pass --disable-ass-internal --enable-ass and
|
|
|
|
|
# let autodetection find which library to link with.
|
|
|
|
|
ifeq ($(BR2_PACKAGE_LIBASS),y)
|
|
|
|
|
MPLAYER_DEPENDENCIES += libass
|
|
|
|
|
endif
|
|
|
|
|
|
2015-03-29 19:11:34 +02:00
|
|
|
# We intentionally don't pass --enable-libmpeg2 and let autodetection
|
|
|
|
|
# find which library to link with.
|
|
|
|
|
ifeq ($(BR2_PACKAGE_LIBMPEG2),y)
|
|
|
|
|
MPLAYER_DEPENDENCIES += libmpeg2
|
|
|
|
|
MPLAYER_CONF_OPTS += --disable-libmpeg2-internal
|
|
|
|
|
endif
|
|
|
|
|
|
2016-06-04 10:00:20 +02:00
|
|
|
# We intentionally don't pass --enable-mpg123, to let the
|
|
|
|
|
# autodetection find which library to link with.
|
|
|
|
|
ifeq ($(BR2_PACKAGE_MPG123),y)
|
|
|
|
|
MPLAYER_DEPENDENCIES += mpg123
|
|
|
|
|
else
|
|
|
|
|
MPLAYER_CONF_OPTS += --disable-mpg123
|
|
|
|
|
endif
|
|
|
|
|
|
2012-01-25 14:35:18 +01:00
|
|
|
ifeq ($(BR2_PACKAGE_TREMOR),y)
|
|
|
|
|
MPLAYER_DEPENDENCIES += tremor
|
2015-10-06 15:42:54 +02:00
|
|
|
MPLAYER_CONF_OPTS += --enable-tremor
|
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-12 22:54:03 +01:00
|
|
|
endif
|
2007-07-23 10:12:39 +02:00
|
|
|
|
2015-11-08 16:55:17 +01:00
|
|
|
# We intentionally don't pass --enable-libvorbis, to let the
|
|
|
|
|
# autodetection find which library to link with.
|
2012-01-27 11:18:52 +01:00
|
|
|
ifeq ($(BR2_PACKAGE_LIBVORBIS),y)
|
|
|
|
|
MPLAYER_DEPENDENCIES += libvorbis
|
|
|
|
|
endif
|
|
|
|
|
|
2011-05-18 22:03:27 +02:00
|
|
|
ifeq ($(BR2_PACKAGE_LIBMAD),y)
|
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-12 22:54:03 +01:00
|
|
|
MPLAYER_DEPENDENCIES += libmad
|
2012-09-28 11:19:25 +02:00
|
|
|
MPLAYER_CONF_OPTS += --enable-mad
|
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-12 22:54:03 +01:00
|
|
|
else
|
|
|
|
|
MPLAYER_CONF_OPTS += --disable-mad
|
|
|
|
|
endif
|
|
|
|
|
|
2011-11-08 12:16:17 +01:00
|
|
|
ifeq ($(BR2_PACKAGE_LIVE555),y)
|
|
|
|
|
MPLAYER_DEPENDENCIES += live555
|
|
|
|
|
MPLAYER_CONF_OPTS += --enable-live
|
|
|
|
|
MPLAYER_LIVE555 = liveMedia groupsock UsageEnvironment BasicUsageEnvironment
|
|
|
|
|
MPLAYER_CFLAGS += \
|
2014-11-17 09:18:14 +01:00
|
|
|
$(addprefix -I$(STAGING_DIR)/usr/include/,$(MPLAYER_LIVE555))
|
2011-11-08 12:16:17 +01:00
|
|
|
MPLAYER_LDFLAGS += $(addprefix -l,$(MPLAYER_LIVE555)) -lstdc++
|
|
|
|
|
else
|
|
|
|
|
MPLAYER_CONF_OPTS += --disable-live
|
|
|
|
|
endif
|
|
|
|
|
|
2015-03-29 19:11:18 +02:00
|
|
|
ifeq ($(BR2_PACKAGE_GIFLIB),y)
|
|
|
|
|
MPLAYER_DEPENDENCIES += giflib
|
|
|
|
|
MPLAYER_CONF_OPTS += --enable-gif
|
|
|
|
|
else
|
|
|
|
|
MPLAYER_CONF_OPTS += --disable-gif
|
|
|
|
|
endif
|
|
|
|
|
|
2017-03-12 12:44:57 +01:00
|
|
|
# We intentionally don't pass --enable-pulse, to let the
|
|
|
|
|
# autodetection find which library to link with.
|
|
|
|
|
ifeq ($(BR2_PACKAGE_PULSEAUDIO),y)
|
|
|
|
|
MPLAYER_DEPENDENCIES += pulseaudio
|
|
|
|
|
endif
|
|
|
|
|
|
2015-03-29 19:11:28 +02:00
|
|
|
# We intentionally don't pass --enable-librtmp to let autodetection
|
|
|
|
|
# find which library to link with.
|
|
|
|
|
ifeq ($(BR2_PACKAGE_RTMPDUMP),y)
|
|
|
|
|
MPLAYER_DEPENDENCIES += rtmpdump
|
|
|
|
|
else
|
|
|
|
|
MPLAYER_CONF_OPTS += --disable-librtmp
|
|
|
|
|
endif
|
|
|
|
|
|
2015-03-29 19:11:29 +02:00
|
|
|
ifeq ($(BR2_PACKAGE_SPEEX),y)
|
|
|
|
|
MPLAYER_DEPENDENCIES += speex
|
|
|
|
|
MPLAYER_CONF_OPTS += --enable-speex
|
|
|
|
|
else
|
|
|
|
|
MPLAYER_CONF_OPTS += --disable-speex
|
|
|
|
|
endif
|
|
|
|
|
|
2015-03-29 19:11:26 +02:00
|
|
|
ifeq ($(BR2_PACKAGE_LZO),y)
|
|
|
|
|
MPLAYER_DEPENDENCIES += lzo
|
|
|
|
|
MPLAYER_CONF_OPTS += --enable-liblzo
|
|
|
|
|
else
|
|
|
|
|
MPLAYER_CONF_OPTS += --disable-liblzo
|
|
|
|
|
endif
|
|
|
|
|
|
2015-03-29 19:11:32 +02:00
|
|
|
MPLAYER_DEPENDENCIES += $(if $(BR2_PACKAGE_BZIP2),bzip2)
|
2016-01-17 22:18:20 +01:00
|
|
|
MPLAYER_DEPENDENCIES += $(if $(BR2_PACKAGE_HAS_LIBGL),libgl)
|
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-12 22:54:03 +01:00
|
|
|
MPLAYER_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBTHEORA),libtheora)
|
|
|
|
|
MPLAYER_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBPNG),libpng)
|
2016-01-17 22:18:20 +01:00
|
|
|
MPLAYER_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBVPX),libvpx)
|
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-12 22:54:03 +01:00
|
|
|
MPLAYER_DEPENDENCIES += $(if $(BR2_PACKAGE_JPEG),jpeg)
|
2016-01-17 22:18:20 +01:00
|
|
|
MPLAYER_DEPENDENCIES += $(if $(BR2_PACKAGE_OPUS),opus)
|
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-12 22:54:03 +01:00
|
|
|
MPLAYER_DEPENDENCIES += $(if $(BR2_PACKAGE_XLIB_LIBX11),xlib_libX11)
|
2015-07-07 23:00:19 +02:00
|
|
|
MPLAYER_DEPENDENCIES += $(if $(BR2_PACKAGE_XLIB_LIBXEXT),xlib_libXext)
|
|
|
|
|
MPLAYER_DEPENDENCIES += $(if $(BR2_PACKAGE_XLIB_LIBXINERAMA),xlib_libXinerama)
|
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-12 22:54:03 +01:00
|
|
|
MPLAYER_DEPENDENCIES += $(if $(BR2_PACKAGE_XLIB_LIBXV),xlib_libXv)
|
2015-07-07 23:00:19 +02:00
|
|
|
MPLAYER_DEPENDENCIES += $(if $(BR2_PACKAGE_XLIB_LIBXXF86VM),xlib_libXxf86vm)
|
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-12 22:54:03 +01:00
|
|
|
|
|
|
|
|
# ARM optimizations
|
2014-10-21 22:26:55 +02:00
|
|
|
ifeq ($(BR2_ARM_CPU_ARMV5),y)
|
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-12 22:54:03 +01:00
|
|
|
MPLAYER_CONF_OPTS += --enable-armv5te
|
|
|
|
|
endif
|
2007-07-23 10:12:39 +02:00
|
|
|
|
2014-11-06 23:35:44 +01:00
|
|
|
ifeq ($(BR2_ARM_CPU_ARMV6)$(BR2_ARM_CPU_ARMV7A),y)
|
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-12 22:54:03 +01:00
|
|
|
MPLAYER_CONF_OPTS += --enable-armv6
|
|
|
|
|
endif
|
|
|
|
|
|
2016-05-28 11:03:12 +02:00
|
|
|
ifeq ($(BR2_aarch64),y)
|
|
|
|
|
MPLAYER_CONF_OPTS += --enable-armv8
|
|
|
|
|
endif
|
|
|
|
|
|
mplayer: fix ARM floating point related build failures
This commit fixes two separate, but related build failures:
* A failure that was happening when the ARM CPU supports NEON,
floating point is enabled, but not with the NEON FPU. In this case,
the NEON ARM assembly is rejected by the assembler, with messages
like "Error: selected FPU does not support instruction -- `vmul.f32
q0,q0,q1'". To fix this, we pass -mfpu=neon when we build mplayer
with NEON support.
Fixes:
http://autobuild.buildroot.org/results/257/257a10e9cb5022bb09e0c6a03844be5b5b3e0bd4/
* A failure that was happening when the ARM CPU supports NEON, but
the configuration is anyway using soft-float. In this case, mplayer
attempts to compile NEON floating point instructions, but this
obviously fail in a soft-float context, with errors such as 'Error:
selected processor does not support ARM mode `vmov d0,r7,r8''. To
fix this, we do not allow NEON to be enabled when we are in a
soft-float configuration.
Fixes:
http://autobuild.buildroot.org/results/7b3/7b3c89fcd496c0bc80063f63ecd58c827e8077ea/
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-04-21 09:57:00 +02:00
|
|
|
ifeq ($(BR2_ARM_SOFT_FLOAT),)
|
2012-12-13 23:25:30 +01:00
|
|
|
ifeq ($(BR2_ARM_CPU_HAS_NEON),y)
|
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-12 22:54:03 +01:00
|
|
|
MPLAYER_CONF_OPTS += --enable-neon
|
mplayer: fix ARM floating point related build failures
This commit fixes two separate, but related build failures:
* A failure that was happening when the ARM CPU supports NEON,
floating point is enabled, but not with the NEON FPU. In this case,
the NEON ARM assembly is rejected by the assembler, with messages
like "Error: selected FPU does not support instruction -- `vmul.f32
q0,q0,q1'". To fix this, we pass -mfpu=neon when we build mplayer
with NEON support.
Fixes:
http://autobuild.buildroot.org/results/257/257a10e9cb5022bb09e0c6a03844be5b5b3e0bd4/
* A failure that was happening when the ARM CPU supports NEON, but
the configuration is anyway using soft-float. In this case, mplayer
attempts to compile NEON floating point instructions, but this
obviously fail in a soft-float context, with errors such as 'Error:
selected processor does not support ARM mode `vmov d0,r7,r8''. To
fix this, we do not allow NEON to be enabled when we are in a
soft-float configuration.
Fixes:
http://autobuild.buildroot.org/results/7b3/7b3c89fcd496c0bc80063f63ecd58c827e8077ea/
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-04-21 09:57:00 +02:00
|
|
|
MPLAYER_CFLAGS += -mfpu=neon
|
|
|
|
|
endif
|
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-12 22:54:03 +01:00
|
|
|
endif
|
|
|
|
|
|
2017-04-09 15:00:03 +02:00
|
|
|
define MPLAYER_DISABLE_INLINE_ASM
|
|
|
|
|
$(SED) 's,#define HAVE_INLINE_ASM 1,#define HAVE_INLINE_ASM 0,g' \
|
|
|
|
|
$(@D)/config.h
|
2017-04-10 22:41:21 +02:00
|
|
|
$(SED) 's,#define HAVE_MMX_INLINE 1,#define HAVE_MMX_INLINE 0,g' \
|
|
|
|
|
$(@D)/config.h
|
2017-04-10 22:41:22 +02:00
|
|
|
$(SED) 's,#define HAVE_MMX_EXTERNAL 1,#define HAVE_MMX_EXTERNAL 0,g' \
|
|
|
|
|
$(@D)/config.h
|
2017-04-09 15:00:03 +02:00
|
|
|
endef
|
|
|
|
|
|
2011-11-14 22:14:53 +01:00
|
|
|
ifeq ($(BR2_i386),y)
|
2017-04-09 15:00:03 +02:00
|
|
|
MPLAYER_POST_CONFIGURE_HOOKS += MPLAYER_DISABLE_INLINE_ASM
|
2011-11-14 22:14:53 +01:00
|
|
|
endif
|
|
|
|
|
|
2015-11-08 17:22:32 +01:00
|
|
|
ifeq ($(BR2_X86_CPU_HAS_MMX),y)
|
2016-05-28 09:50:08 +02:00
|
|
|
MPLAYER_CONF_OPTS += \
|
|
|
|
|
--enable-mmx \
|
2017-07-05 13:14:19 +02:00
|
|
|
--yasm=$(HOST_DIR)/bin/yasm
|
2015-11-08 17:22:32 +01:00
|
|
|
MPLAYER_DEPENDENCIES += host-yasm
|
|
|
|
|
else
|
2016-05-28 09:50:08 +02:00
|
|
|
MPLAYER_CONF_OPTS += \
|
|
|
|
|
--disable-mmx \
|
|
|
|
|
--yasm=''
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
ifeq ($(BR2_X86_CPU_HAS_SSE),y)
|
2017-04-10 22:41:19 +02:00
|
|
|
MPLAYER_CONF_OPTS += --enable-mmxext --enable-sse
|
2016-05-28 09:50:08 +02:00
|
|
|
else
|
2017-04-10 22:41:19 +02:00
|
|
|
MPLAYER_CONF_OPTS += --disable-mmxext --disable-sse
|
2016-05-28 09:50:08 +02:00
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
ifeq ($(BR2_X86_CPU_HAS_SSE2),y)
|
|
|
|
|
MPLAYER_CONF_OPTS += --enable-sse2
|
|
|
|
|
else
|
|
|
|
|
MPLAYER_CONF_OPTS += --disable-sse2
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
ifeq ($(BR2_X86_CPU_HAS_SSE3),y)
|
|
|
|
|
MPLAYER_CONF_OPTS += --enable-sse3
|
|
|
|
|
else
|
|
|
|
|
MPLAYER_CONF_OPTS += --disable-sse3
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
ifeq ($(BR2_X86_CPU_HAS_SSSE3),y)
|
|
|
|
|
MPLAYER_CONF_OPTS += --enable-ssse3
|
|
|
|
|
else
|
|
|
|
|
MPLAYER_CONF_OPTS += --disable-ssse3
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
ifeq ($(BR2_X86_CPU_HAS_SSE4),y)
|
|
|
|
|
MPLAYER_CONF_OPTS += --enable-sse4
|
|
|
|
|
else
|
|
|
|
|
MPLAYER_CONF_OPTS += --disable-sse4
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
ifeq ($(BR2_X86_CPU_HAS_SSE42),y)
|
|
|
|
|
MPLAYER_CONF_OPTS += --enable-sse42
|
|
|
|
|
else
|
|
|
|
|
MPLAYER_CONF_OPTS += --disable-sse42
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
ifeq ($(BR2_X86_CPU_HAS_AVX),y)
|
|
|
|
|
MPLAYER_CONF_OPTS += --enable-avx
|
|
|
|
|
else
|
|
|
|
|
MPLAYER_CONF_OPTS += --disable-avx
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
ifeq ($(BR2_X86_CPU_HAS_AVX2),y)
|
|
|
|
|
MPLAYER_CONF_OPTS += --enable-avx2
|
|
|
|
|
else
|
|
|
|
|
MPLAYER_CONF_OPTS += --disable-avx2
|
2015-11-08 17:22:32 +01:00
|
|
|
endif
|
|
|
|
|
|
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-12 22:54:03 +01:00
|
|
|
define MPLAYER_CONFIGURE_CMDS
|
|
|
|
|
(cd $(@D); rm -rf config.cache; \
|
2007-07-23 10:12:39 +02:00
|
|
|
$(TARGET_CONFIGURE_OPTS) \
|
2007-07-23 14:40:43 +02:00
|
|
|
$(TARGET_CONFIGURE_ARGS) \
|
2007-07-23 10:12:39 +02:00
|
|
|
./configure \
|
|
|
|
|
--prefix=/usr \
|
|
|
|
|
--confdir=/etc \
|
|
|
|
|
--target=$(GNU_TARGET_NAME) \
|
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-12 22:54:03 +01:00
|
|
|
--host-cc="$(HOSTCC)" \
|
2010-07-06 09:27:32 +02:00
|
|
|
--cc="$(TARGET_CC)" \
|
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-12 22:54:03 +01:00
|
|
|
--as="$(TARGET_AS)" \
|
2010-02-21 16:55:21 +01:00
|
|
|
--charset=UTF-8 \
|
2011-11-08 12:16:17 +01:00
|
|
|
--extra-cflags="$(MPLAYER_CFLAGS)" \
|
|
|
|
|
--extra-ldflags="$(MPLAYER_LDFLAGS)" \
|
2007-07-23 10:12:39 +02:00
|
|
|
--enable-fbdev \
|
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-12 22:54:03 +01:00
|
|
|
$(MPLAYER_CONF_OPTS) \
|
2009-01-20 10:11:57 +01:00
|
|
|
--enable-cross-compile \
|
2008-12-01 13:32:50 +01:00
|
|
|
--disable-ivtv \
|
2007-07-23 10:12:39 +02:00
|
|
|
--enable-dynamic-plugins \
|
2015-04-19 14:40:00 +02:00
|
|
|
--enable-inet6 \
|
2007-08-21 21:20:18 +02:00
|
|
|
)
|
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-12 22:54:03 +01:00
|
|
|
endef
|
2007-07-23 10:12:39 +02:00
|
|
|
|
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-12 22:54:03 +01:00
|
|
|
define MPLAYER_BUILD_CMDS
|
2016-10-14 00:13:23 +02:00
|
|
|
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)
|
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-12 22:54:03 +01:00
|
|
|
endef
|
2007-07-23 10:12:39 +02:00
|
|
|
|
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-12 22:54:03 +01:00
|
|
|
define MPLAYER_INSTALL_TARGET_CMDS
|
2016-10-14 00:13:23 +02:00
|
|
|
$(TARGET_MAKE_ENV) $(MAKE) DESTDIR=$(TARGET_DIR) -C $(@D) install
|
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-12 22:54:03 +01:00
|
|
|
endef
|
2007-09-25 14:01:27 +02:00
|
|
|
|
2012-07-03 00:07:32 +02:00
|
|
|
$(eval $(generic-package))
|
