Commit Graph

23 Commits

Author SHA1 Message Date
Andreas Oberritter 9782db00d4 libav: fix floating dependency on libasound
(From OE-Core rev: 8c6cb85745ca580f7b0e7ff98006c76a85534de0)

Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2015-03-25 12:39:41 +00:00
Ross Burton c1e4e27443 libav: add PACKAGECONFIG for VA-API
Intel BSPs want to enable VA-API support so add a PACKAGECONFIG statement to
enable it if required.

(From OE-Core rev: 1e737fb0c032cb9f8f9869eeda80850bea05ad50)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2015-03-22 08:50:00 +00:00
Martin Jansa 09aa2b1ed8 libav: drop older 0.8.* and use libav-9 by default
(From OE-Core rev: 4ceff7d0a1f28eb1ce5d288111015bff8d5e9a7e)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2015-01-29 15:36:50 +00:00
Martin Jansa 872b656e88 libpostproc: import from meta-oe
(From OE-Core rev: bb6f073adb1613930a14c9c6f9d7d9ae2e7b59c0)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2015-01-29 15:36:50 +00:00
Martin Jansa f63f4b5240 libav: drop unused FFMPEG_LIBS and move libpostproc only to 0.8.11
* standalone libpostproc recipe depends on libav, but current PACKAGES_DYNAMIC indicated
  that libav-9.13 also provides libpostproc

(From OE-Core rev: b142504d4e4e83d030c45e48ea333c387e8f5c88)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2015-01-23 11:36:29 +00:00
Paul Eggleton 58bd515fde libav: update 9.x version to 9.16
(From OE-Core rev: 32e95316db40d20bb2aa7dd48e35114f3ea7a0ee)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-08-15 18:21:47 +01:00
Paul Eggleton ab8365bc2a libav: update 0.8 version to 0.8.15
(From OE-Core rev: 1bfa027e4667248eeb74ee12fad84e82415efc4b)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-08-15 18:21:47 +01:00
Matthieu Crapet 3b1beeb510 libav: fix PACKAGECONFIG for theora and libvorbis
Switches must not be in EXTRA_OECONF anymore.

(From OE-Core rev: 251a5cc8c940f54f058588977734fd0ede664c3c)

Signed-off-by: Matthieu Crapet <Matthieu.Crapet@ingenico.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-07-29 09:58:26 +01:00
Matthieu Crapet 70c933e3ab libav: add PACKAGECONFIG for theora, libvorbis, speex and openssl
Dropped libvorvis dependency because there is already a (better) builtin vorbis codec.
Don't confuse codec names: "vorbis" (builtin) and "libvorbis" (using external library).

Changes:
- add --enable-nonfree when faac or openssl are used
- add DESCRIPTION
- sort PACKAGECONFIG entries

Tested with libav-0.8.11 & libav-9.13.

Note: Be sure to have a recent version of bitbake (2014-06-11 or better) including this:
http://cgit.openembedded.org/bitbake/commit/?id=2e742c03e8dfdfa67899e7f5d579ed14bd87e139
It affects behavior of bb.utils.contains_any

(From OE-Core rev: 62eede9de6fa1c76fa97ca5c6ba2d31309759b10)

Signed-off-by: Matthieu Crapet <Matthieu.Crapet@ingenico.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-07-03 17:41:17 +01:00
Paul Eggleton ac9707c501 libav: upgrade 9.x version to 9.13
(From OE-Core rev: 937a0da0861abb7656762b2a3fb69eb275dd4a9a)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-05-21 09:09:02 +01:00
Paul Eggleton 646fd85652 libav: upgrade 0.8.x version to 0.8.11
(From OE-Core rev: 206f34ac0c0b65768ec2b553a0cb8b93fe7e5ae3)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-05-21 09:09:02 +01:00
Otavio Salvador 4c14b09498 Globally replace 'base_contains' calls with 'bb.utils.contains'
The base_contains is kept as a compatibility method and we ought to
not use it in OE-Core so we can remove it from base metadata in
future.

(From OE-Core rev: d83b16dbf0862be387f84228710cb165c6d2b03b)

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-04-25 17:19:19 +01:00
Khem Raj 4961972550 libav: Add libsdl to DEPENDS only when x11 is enabled
When we have opengl in distro features but not x11 and try to
build libav then it calls out to build libsdl which inturn has depependency on libglu
and libglu fails to build

ld: error: cannot find -lGL
| collect2: error: ld returned 1 exit status
| make: *** [libGLU.la] Error 1
| ERROR: oe_runmake failed

since libglu wants glx enabled in mesa and glx in mesa is (righly) enabled only when x11
is in distro features.

This breaks the dependency chain leading to this problem

(From OE-Core rev: fe9fe5ca5039743fc80d14f0518b95929c458b1a)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-04-23 11:43:26 +01:00
Matthieu Crapet b88321ac78 recipes: convert remaining SUMMARY/DESCRIPTION cosmetic issues (part 2)
Completes previous commit b5292d4115a4555a66b5e35acdc67dd71fb8577f.
Updates SUMMARY[doc] (meta/conf/documentation.conf).

Changes:
- rename DESCRIPTION with length < 80 to (non present tag) SUMMARY
- drop final point character at the end of SUMMARY string
- remove trailing whitespace of SUMMARY line

Note: don't bump PR

(From OE-Core rev: ad17dfd31a2b97b3e610a0ea0889f5ecb2a63b97)

Signed-off-by: Matthieu Crapet <Matthieu.Crapet@ingenico.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-02-20 14:28:13 +00:00
Paul Eggleton 8ee784e0a0 libav: add libpostproc to PROVIDES (for 0.8.x version only)
There is a separate libpostproc recipe in meta-oe for use with 9.x and
later versions of libav for those few that need libpostproc; however if
you just add meta-oe and try to build libpostproc without selecting the
libav 9.x version recipe, you'll be building the libpostproc recipe
together with libav 0.8.x, which provides its own libpostproc; this
leads to confusing errors at packaging time. In order to flag up that
these conflict more appropriately, add libpostproc to PROVIDES
explicitly so that you at least get a multiple providers error at the
start of the build.

Fixes [YOCTO #5335].

(From OE-Core rev: e8f9420fe901675fc1a8d4e41302c2faa4a7dc4a)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-12-21 17:22:38 +00:00
Andrei Gherzan a90ad435e1 libav: Use "BP" and "libav" patch directory
(From OE-Core rev: 176d0557b97bc60c38f0ebf6592b89864e76807e)

Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-12-14 09:11:12 +00:00
Andrei Gherzan e7d1921fb8 libav: Add v9.10
This version includes libavresample needed for packages like xbmc.
To use this version add:
PREFERRED_VERSION_libav = "9.10".
Removed git version as being an older version of a 9.X release.

(From OE-Core rev: d142fcea02438e06338a1d1a5644667fdda59172)

Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-12-10 17:42:44 +00:00
Andrei Gherzan e2e6756083 libav: Update to v0.8.9
(From OE-Core rev: a3c906102d19924ad3b38ef1cd3d8094dd35aa64)

Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-12-05 14:25:29 +00:00
Nick D'Ademo bd9f9abbdd libav: install libraries to right directory when multilib is enabled
Explicitly set libdir and shlibdir to ${libdir} in EXTRA_OECONF. Otherwise, default library path of ${prefix}/lib is used which is incorrect in a multilib build.

(From OE-Core rev: e16b6bab8d5286cdf58d808ef4c195127d69a8c8)

Signed-off-by: Nick D'Ademo <nickdademo@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-11-29 09:52:58 +00:00
Robert Yang 8bec473ad5 libav: use CCLD as ld
The libav uses gcc as the ld, but it doesn't use CCLD, it may have
problems when target arch is 64 bit since it doesn't use the "-m64", the
poky's toolchain is fine since use "x86_64-poky-linux-gcc" without
"-m64" is default to 64 bit, but external toolchain *may* default to 32
bit (for example, when multilib is enabled and both 64 and 32 bit use
the same gcc, then the default arch can be either of them), then there
would be errors, the error is just like we run this in poky:

$ x86_64-poky-linux-gcc -m32 <file.c>

ld: skipping incompatible /path/to/sysroot/usr/lib64/x86_64-poky-linux/4.8.2/libgcc.a
when searching for -lgcc

Use CCLD as the ld will fix the problem since CCLD has been set
correctly.

(From OE-Core rev: 7afbc62be0e4720fb7cd2e44ec9e438a7e4ff78f)

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-11-27 11:51:23 +00:00
Diego Rondini ea4eafcba3 libav: Add libswscale to PACKAGES_DYNAMIC
Add libswscale to PACKAGES_DYNAMIC because it was missing. Adding it also allows libswscale to get included in an image using IMAGE_INSTALL.

(From OE-Core rev: b57e7fa8b35cfcf9af6ca72d51bdf67e49254ac2)

Signed-off-by: Diego Rondini <diego.ml@zoho.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-10-14 16:55:25 +01:00
Paul Eggleton a897186059 libav: make X11 dependencies dependent on DISTRO_FEATURES
This enables building libav when x11 is not in DISTRO_FEATURES.

(From OE-Core rev: 9b7131e855293064e044cd79259eb350a14f319b)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-09-24 17:24:12 +01:00
Paul Eggleton 4acdab05e9 libav: add from meta-oe, update and tweak
Changes from the meta-oe recipe:
* Update stable recipe to 0.8.8
* Update git recipe to the tag for 9.8 (for now)
* Switch over to a tarball for the release version recipe
* Add LICENSE_FLAGS = "commercial"
* Set SUMMARY instead of DESCRIPTION
* Add yasm-native to DEPENDS since there is now a recipe for it
* Remove libvpx from DEPENDS and add a PACKAGECONFIG option for it,
  disabled by default since it wasn't actually being enabled
* Add a PACKAGECONFIG option for x11 to enable/disable x11grab, and
  add the proper DEPENDS if so (still defaults to enabled)
* Add a number of other PACKAGECONFIG options, replacing some old
  comments as well as offering the ability to disable x264.
* Hide text relocation warning when building for i586 (PIC can't be
  enabled for 32-bit x86).
* Drop PR

Notes for the git recipe:
* This hasn't been able to be built recently in meta-oe since there was
  a circular dependency between libav and libpostproc. libpostproc is
  part of libav 0.8.x but was split out in 9+ and is not needed at all
  anymore by libav itself, so this dependency was removed.
* Additionally the recipe was filtering out the option to enable
  libpostproc but this option wasn't being added by the inc file and
  thus the filter wasn't doing anything, so I dropped this as well.

(From OE-Core rev: 9a670f780b1f1204d426017ff9a95842ad85800e)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-08-13 23:05:58 +01:00