Commit Graph

47 Commits

Author SHA1 Message Date
Bernd Kuhls
31bfff09a9 package/ffmpeg: Sync with upstream to fix fminf-related build error
- upstream fixed the fminf build error, use the backported patch now
- renamed patch according to new naming convention

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-11-09 22:07:37 +01:00
Karoly Kasza
d402daaeae ffmpeg: typo fix
Add missing bracket.

Signed-off-by: Karoly Kasza <kaszak@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-11-07 09:50:54 +01:00
Thomas Petazzoni
ae2850b78c ffmpeg: use arch and cpu instead of tune
ffmpeg currently uses BR2_GCC_TARGET_TUNE as the --cpu option
value. However, there are multiple architectures for which
BR2_GCC_TARGET_TUNE is not used. After inspecting the ffmpeg configure
script, we concluded that using the BR2_GCC_TARGET_CPU value if
available, or the BR2_GCC_TARGET_ARCH value as a fallback was the
appropriate behavior.

This allows to remove the reference to BR2_GCC_TARGET_TUNE, which is
one step towards the removal of this option.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-11-07 00:08:07 +01:00
Bernd Kuhls
649907cd6a package/ffmpeg: bump version to 2.4.3
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-11-02 23:54:06 +01:00
Bernd Kuhls
f3765858c5 package/ffmpeg: Enable support for libavresample
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-10-28 19:35:07 +01:00
Thomas Petazzoni
3300e00ffb ffmpeg: fix ARM condition for --{enable, disable}-vfp
As noted by Arnout, not all ARMv6 have the VFP FPU, therefore instead
of using a condition on ARMv6 or ARMv7-A, this commit changes to use a
condition on BR2_ARM_CPU_HAS_VFPV2.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
2014-10-25 12:35:17 +02:00
Thomas Petazzoni
0ac115d546 ffmpeg: use the new BR2_ARM_CPU_ARM* options
Instead of using the Config.in options for each individual ARM core,
use the newly introduced BR2_ARM_CPU_ARM* options, which exist per ARM
architecture.

This commit is a blind conversion from the per-core options to the
per-architecture. It has the benefit of enabling the ARMv6
optimizations on all ARMv7-A cores, not only A5, A8, A9 and
A15. However, it doesn't fix the condition for
--enable-vfp/--disable-vfp for ARMv6 cores that don't have a FPU, it
is fixed in a follow-up commit.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
2014-10-25 12:35:09 +02:00
Thomas Petazzoni
adaf895e2b ffmpeg: remove dangling reference to BR2_arm10
BR2_arm10 has been removed in commit
d60489a6e5 ("arch: remove BR2_arm10t"),
so there is no point in keeping a reference to it in the ffmpeg
package.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Acked-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-10-20 11:09:10 +02:00
Bernd Kuhls
822a757456 infra: Move --enable/--disable-debug to package/Makefile.in
A lot of packages ignored BR2_ENABLE_DEBUG. This patch simplifies the handling of
this option by adding the corresponding configure option to the global Makefile
for target packages.

For host packages --disable-debug is added to the global Makefile.

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-10-19 17:07:14 +02:00
David du Colombier
3182056e98 ffmpeg: enable x264 support
Signed-off-by: David du Colombier <0intro@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-10-07 22:59:08 +02:00
Bernd Kuhls
7d7a1d62d8 package/ffmpeg: Bump version to 2.4.2
removed ffmpeg-0002-arm4-arm5.patch, applied upstream

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-10-07 22:26:57 +02:00
Thomas De Schampheleire
aaffd209fa packages: rename FOO_CONF_OPT into FOO_CONF_OPTS
To be consistent with the recent change of FOO_MAKE_OPT into FOO_MAKE_OPTS,
make the same change for FOO_CONF_OPT.

Sed command used:
   find * -type f | xargs sed -i 's#_CONF_OPT\>#&S#g'

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-10-04 18:54:16 +02:00
Bernd Kuhls
79449c2aec package/ffmpeg/ffmpeg.mk: Remove tabs
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-10-04 14:19:19 +02:00
Luca Ceresoli
a20aae6fb2 ffmpeg: fix license file
Somewhere between 1.2.7 and 2.3.1 (version bump in bf76f43191)
the LICENSE file has been renamed to LICENSE.md, so `make legal-info`
is currently broken. Update to the current file name.

Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-10-02 12:15:51 +02:00
David du Colombier
ad58c88c10 ffmpeg: enable libopus support
Signed-off-by: David du Colombier <0intro@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-10-01 19:46:41 +02:00
David du Colombier
8a966c83fa ffmpeg: enable libvpx support
Signed-off-by: David du Colombier <0intro@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-10-01 19:46:32 +02:00
Bernd Kuhls
4810601c85 package/ffmpeg: Fix compile error on arm4/arm5
Fixes
http://autobuild.buildroot.net/results/d7e/d7ea8db79210228103257b6a28fada38cca142cb/
http://autobuild.buildroot.net/results/ec7/ec71e4f16ee9106747dff5f15999cbd17903e76f/
http://autobuild.buildroot.net/results/be7/be72eb182eaccf0064a32c9dfc2ac1c0d6555506/
http://autobuild.buildroot.net/results/b35/b35b71e3d21394e7ca24f3b112d8a4047cd6c87b/
http://autobuild.buildroot.net/results/5bb/5bbc8b5cdcd99229a6813970293f98b044fc489d/
http://autobuild.buildroot.net/results/be5/be54e75c4171d1db0eaaaeb5f5df29751d7db57b/

[Thomas: update patch to indicate that it has been merged upstream,
and point to the upstream commit.]

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-09-23 21:43:59 +02:00
Bernd Kuhls
a32b5fdf1f package/ffmpeg: Bump version to 2.4.1
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-09-22 19:01:16 +02:00
Bernd Kuhls
76d5b12e76 package/ffmpeg: Enable armv6 support for Cortex cores
Fixes
http://autobuild.buildroot.net/results/cda/cdad51f610c339d2ad4c7d09c282cfb4b10770a0/
http://autobuild.buildroot.net/results/cd5/cd53af973d9722481c3298f484b399c9a2c286cf/
http://autobuild.buildroot.net/results/a9a/a9a2c49d923fd891945a24c9d0d147b3eea9b037/
http://autobuild.buildroot.net/results/d2f/d2f51632aea5727df9404e611e8e379567f03b61/
http://autobuild.buildroot.net/results/a62/a622dd113dcb7b352bcfebe3b3c7ac6ed286d7c7/
http://autobuild.buildroot.net/results/2ea/2eace18d0d32b4cbb6120b06d2bbe79d2b9857a7/
http://autobuild.buildroot.net/results/caa/caad4172db90879db51b66625b98aa0805e39c73/

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-09-22 19:01:00 +02:00
Danomi Manchego
a9a5a81599 ffmpeg: add --pkg-config to configure options
The ffmpeg does not understand the PKG_CONFIG env variable,
so it throws a line like this at the end of its configuration:

WARNING: .../output/host/usr/bin/arm-none-linux-gnueabi-pkg-config not found, library detection may fail.

Apparently, some of the indevs and outdevs need a pkg-config.
This patch adds the --pkg-config to let ffmpeg know where it
is.

[Thomas: remove unrelated formatting change.]

Signed-off-by: Danomi Manchego <danomimanchego123@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-09-21 22:54:48 +02:00
Danomi Manchego
ca57e88552 ffmpeg: enable or disable debug based on BR2_ENABLE_DEBUG
Rather than hard-code --disable-debug, selectively enable
or disable based on BR2_ENABLE_DEBUG.

(Similar to gst1-libav.)

[Thomas: do not make other changes such as reformatting the
--prefix=/usr line.]

Signed-off-by: Danomi Manchego <danomimanchego123@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-09-21 22:50:38 +02:00
Danomi Manchego
255aab75fc ffmpeg: consolidate duplicated config options
Commit 62ab07ef76 added a bunch
of hard-coded options.  Some of these options are then again
added (or negated) based on kconfig settings.  This patch removes
the hard coded swscale and postproc settings, as they are enabled
or disabled later.  It also moves the --disable-pic lower
as an else clause to the part that adds --enable-pic.

Signed-off-by: Danomi Manchego <danomimanchego123@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-09-21 22:48:34 +02:00
Bernd Kuhls
0f57fcb91b package/ffmpeg: Bump version to 2.4
Version 2.3 is unmaintained:
http://article.gmane.org/gmane.comp.video.ffmpeg.devel/183038

- removed ffmpeg-0002-bfin.patch, applied upstream
- added vlc-0004-libav.patch from upstream to fix VLC compilation

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-09-21 21:18:02 +02:00
Peter Korsgaard
5aedb8be68 Merge branch 'next'
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-09-01 15:22:07 +02:00
Bernd Kuhls
fb76cf9f03 package/ffmpeg: Bump version to 2.3.3
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-08-18 00:27:49 +02:00
Bernd Kuhls
12a3ecfc9a package/ffmpeg: prevent stripping the ffmpeg binary
Packages shouldn't strip executables by themselves, so that Buildroot
controls whether stripping should occur or not. This also fixes the
build on Blackfin FLAT where stripping actually doesn't work because
stripping FLAT binaries is not supported.

Inspired by Thomas:
http://git.buildroot.net/buildroot/commit/package/hdparm/hdparm.mk?id=11dbb615338cd768acc2c3138064ddf557e9b60b

Fixes
http://autobuild.buildroot.net/results/581/581c43b50c9717e53334eb156ece95fe499ccb04/
http://autobuild.buildroot.net/results/57a/57a1bdc22b803114c018fa007884385bf8355151/
http://autobuild.buildroot.net/results/d8a/d8a1aadebd302abc923bc4865e1242ab2479d641/

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-08-15 11:02:57 +02:00
Bernd Kuhls
2c881c4b1a package/ffmpeg: Bump version to 2.3.2
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-08-11 22:53:05 +02:00
Bernd Kuhls
02012d3373 package/ffmpeg: Fix bfin compile error
Fixes
http://autobuild.buildroot.net/results/ae0/ae056f267e907091d09d2a1546d6f1ae02fa23b9/

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-08-04 21:29:28 +02:00
Bernd Kuhls
bf76f43191 package/ffmpeg: Bump to version 2.3.1
- remove obsolete option --disable-vis
- add patch to fix compile error with uClibc
- add patch to fix compile error in freerdp

Compile-tested against all packages depending on ffmpeg using this defconfig:

BR2_TOOLCHAIN_EXTERNAL=y
BR2_PACKAGE_GSTREAMER=y
BR2_PACKAGE_GST_FFMPEG=y
BR2_PACKAGE_MPD=y
BR2_PACKAGE_MPD_FFMPEG=y
BR2_PACKAGE_XORG7=y
BR2_PACKAGE_FREERDP=y
BR2_PACKAGE_OPENCV=y
BR2_PACKAGE_OPENCV_WITH_FFMPEG=y
BR2_PACKAGE_MEDIASTREAMER=y
BR2_PACKAGE_MINIDLNA=y

VLC also compiled when the build of vlc-static is disabled in Makefiles,
otherwise this known error occurs:
http://autobuild.buildroot.net/results/022/022252176c051ff3365b2cb820f32aafc802803a/

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-08-03 10:22:23 +02:00
Bernd Kuhls
17240db143 ffmpeg: Add libva support
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-07-16 20:42:20 +02:00
Gustavo Zacarias
2cbb97b32b ffmpeg: bump to version 1.2.7
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-06-29 10:33:26 +02:00
Cody P Schafer
40e58dab0c powerpc: add BR2_POWERPC_CPU_HAS_ALTIVEC to replace adhoc deps/checks
Signed-off-by: Cody P Schafer <cody@linux.vnet.ibm.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-05-26 21:14:08 +02:00
Gustavo Zacarias
9359192162 ffmpeg: bump to version 1.2.6
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-05-23 22:06:43 +02:00
Gustavo Zacarias
befab216a2 arch/arm: drop ARM(7TDMI/720T/740T) support
The toolchain currently doesn't build for nommu ARM and is in need of
serious work.
Problem is there are no emulation targets and real ARM(7TDMI/720T/740T)
hardware that's capable of running linux (enough memory, having a
memory controller...) is VERY rare and uses very old versions to
make it usable.

The ARM nommu focus should go into Cortex M series processors that are
obtainable at reasonable cost on modern hardware that has external
memory controllers.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-05-08 16:53:49 +02:00
Max Filippov
5449aeadf9 Revert "ffmpeg: fix build for xtensa"
This reverts commit 4ec35e76b8.
Now that -mtext-section-literals is specified in the xtensa ABI this fix
is no longer needed.

Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-04-03 21:35:55 +02:00
Thomas De Schampheleire
7164a32632 packages: remove support for documentation on target
This patch removes deprecated symbol BR2_HAVE_DOCUMENTATION and all its
usage. Additionally, it removes the now unused BR2_DEPRECATED_SINCE_2012_11.

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-02-08 23:31:21 +01:00
Bernd Kuhls
4b959fcb67 ffmpeg: Bump version to 1.2.5
Signed-off-by: Bernd Kuhls <berndkuhls@hotmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-01-17 21:56:59 +01:00
Bernd Kuhls
0fff2505eb ffmpeg: Add mips related configure options to fix build errors
http://autobuild.buildroot.net/results/aa5/aa5cb447342af9995d8f198eb0a151fe6e3d5c19//
http://autobuild.buildroot.net/results/355/355f56f6b466521e2c4c71f69b06a0ca2a56949b//

Signed-off-by: Bernd Kuhls <berndkuhls@hotmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-01-14 22:44:17 +01:00
Bernd Kuhls
0e8e3c2879 ffmpeg: Add sse4 related options BR2_X86_CPU_HAS_SSE4 / BR2_X86_CPU_HAS_SSE4
Signed-off-by: Bernd Kuhls <berndkuhls@hotmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-01-13 22:28:42 +01:00
Peter Korsgaard
457b6467ed ffmpeg: fix build with gpl suboption and openssl
Openssl's license isn't compatible with GPL, so ffmpeg's configure script
only allows this combination if nonfree is enabled.

Fixes http://autobuild.buildroot.net/results/ed6/ed6129d584229ebe4a0b291bc6a1dd0be23cc92a/

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-01-13 13:11:39 +01:00
Bernd Kuhls
8eb78ba124 ffmpeg: Fix build error regarding missing host-yasm
Fixes http://autobuild.buildroot.net/results/b2a/b2aefd25431bab3d0f4fcf4c3e6de1ff6fc54ffa//

Signed-off-by: Bernd Kuhls <berndkuhls@hotmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-01-13 08:35:56 +01:00
Bernd Kuhls
62ab07ef76 ffmpeg: bump to version 1.2.4
Compile tested the following packages which depend on ffmpeg:

freerdp
mpd
gstreamer

For minidlna please see the separate patch for version bump to 1.1.1

Some compile options were taken from OpenELEC:
https://github.com/OpenELEC/OpenELEC.tv/blob/master/packages/multimedia/ffmpeg/build

[Peter: fix ARM VFP option, target tune, enable PIC for !static]
Signed-off-by: Bernd Kuhls <berndkuhls@hotmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-01-12 23:58:31 +01:00
Baruch Siach
4ec35e76b8 ffmpeg: fix build for xtensa
The ffmpeg package generates libraries that are too large for the xtensa
default placement of literals in a dedicated section. Use
-mtext-section-literal to place literals in the text section.

Fixes
http://autobuild.buildroot.net/results/606/60670d35f16c3b8fe19debf7f8e40a046a579520/

Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2013-12-25 12:28:20 +01:00
Thomas De Schampheleire
bed4e27868 Config.in files: whitespace cleanup
This patch fixes the following whitespace problems in Config.in files:
- trailing whitespace
- spaces instead of tabs for indentation
- help text not indented with tab + 2 spaces

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2013-11-11 22:19:30 +01:00
Thomas De Schampheleire
66bb10b7b0 Config.in files: unify comments of toolchain option dependencies
This patch lines up the comments in Config.in files that clarify which
toolchain options the package depends on.

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2013-10-14 22:45:57 +02:00
Gustavo Zacarias
4f92c64fd6 ffmpeg: security bump to version 0.8.15
Fixes several vulnerabilities.
TODO: update to a more modern branch.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2013-10-07 22:16:41 +02:00
Jérôme Pouiller
adf6511013 Remove multimedia subdirectory
Unless it was a group of sub-packages, packages was never regrouped by
category. multimedia/ was an exception to this rule.

This patch move packages/multimedia/ sub-directories to packages/. It
keeps two subdirectories for gstream 0.10 and gstreamer 1.X.

Signed-off-by: Jérôme Pouiller <jezz@sysmic.org>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-09-08 21:41:39 +02:00