Commit Graph

9 Commits

Author SHA1 Message Date
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