diff options
author | Carlos Rafael Giani <dv@pseudoterminal.org> | 2015-11-05 17:20:00 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-11-16 11:33:39 +0000 |
commit | ef620928b5caadae939e2759b1c3933084ad9ebb (patch) | |
tree | 1c33f869ca5e5c09f3bdbc74f65e136e0d7e8298 /meta | |
parent | dac60a424e30b1a24ec3767a84f49eb8ffbadf48 (diff) | |
download | openembedded-core-contrib-ef620928b5caadae939e2759b1c3933084ad9ebb.tar.gz |
gstreamer1.0-libav: upgrade to version 1.6.1
The lgpl PACKAGECONFIG is replaced by a gpl one,
since the LGPL build is the default now. There is no
--enable-lgpl switch anymore, it got replaced by
--enable-gpl.
Signed-off-by: Carlos Rafael Giani <dv@pseudoterminal.org>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-multimedia/gstreamer/gstreamer1.0-libav.inc | 4 | ||||
-rw-r--r-- | meta/recipes-multimedia/gstreamer/gstreamer1.0-libav/workaround-to-build-gst-libav-for-i586-with-gcc.patch | 2 | ||||
-rw-r--r-- | meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.6.1.bb (renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.4.5.bb) | 5 |
3 files changed, 5 insertions, 6 deletions
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav.inc index 84e6e95d360..5d86205cf89 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav.inc +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav.inc @@ -3,7 +3,7 @@ SECTION = "multimedia" LICENSE = "GPLv2+ & LGPLv2+ & ( (GPLv2+ & LGPLv2.1+) | (GPLv3+ & LGPLv3+) )" LICENSE_FLAGS = "commercial" HOMEPAGE = "http://www.gstreamer.net/" -DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base zlib bzip2" +DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base zlib bzip2 xz" inherit autotools pkgconfig @@ -12,7 +12,7 @@ inherit autotools pkgconfig # libav copy included in the gst-libav package. PACKAGECONFIG ??= " orc yasm " PACKAGECONFIG[libav] = "--with-system-libav,,libav" -PACKAGECONFIG[lgpl] = "--enable-lgpl,," +PACKAGECONFIG[gpl] = "--enable-gpl,--disable-gpl," PACKAGECONFIG[yasm] = "--enable-yasm,--disable-yasm,yasm-native" PACKAGECONFIG[orc] = "--enable-orc,--disable-orc,orc" diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav/workaround-to-build-gst-libav-for-i586-with-gcc.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav/workaround-to-build-gst-libav-for-i586-with-gcc.patch index ccadea4d5c3..36abf8607e6 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav/workaround-to-build-gst-libav-for-i586-with-gcc.patch +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav/workaround-to-build-gst-libav-for-i586-with-gcc.patch @@ -22,5 +22,5 @@ Signed-off-by: Robert Yang <liezhi.yang@windriver.com> + ( (unsigned char*)(h->non_zero_count[mb_xy]) ) [i] = 16; + } h->cur_pic.mb_type[mb_xy] = mb_type; - h->last_qscale_diff = 0; + sl->last_qscale_diff = 0; return 0; diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.4.5.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.6.1.bb index 97fc7ec3f8a..99b01c8a92c 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.4.5.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.6.1.bb @@ -3,7 +3,6 @@ include gstreamer1.0-libav.inc LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://COPYING.LIB;md5=6762ed442b3822387a51c92d928ead0d \ file://ext/libav/gstav.h;beginline=1;endline=18;md5=a752c35267d8276fd9ca3db6994fca9c \ - file://gst-libs/ext/libav/LICENSE;md5=ea66e97a7ac1db978cf3529068a8c948 \ file://gst-libs/ext/libav/COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://gst-libs/ext/libav/COPYING.GPLv3;md5=d32239bcb673463ab874e80d47fae504 \ file://gst-libs/ext/libav/COPYING.LGPLv2.1;md5=bd7a443320af8c812e4c18d1b79df004 \ @@ -14,8 +13,8 @@ SRC_URI = " \ file://0001-Disable-yasm-for-libav-when-disable-yasm.patch \ file://workaround-to-build-gst-libav-for-i586-with-gcc.patch \ " -SRC_URI[md5sum] = "f4922a46adbcbe7bd01331ff5dc7979d" -SRC_URI[sha256sum] = "605c62624604f3bb5c870844cc1f2711779cc533b004c2aa1d8c0d58557afbbc" +SRC_URI[md5sum] = "058b22411e1690eee5b71d1ab44eab25" +SRC_URI[sha256sum] = "24d5e8e8b8c825af1a19aa80a27aba268ec383c8133fd4ef66e0e572ff6137a9" LIBAV_EXTRA_CONFIGURE_COMMON_ARG = "--target-os=linux \ --cc='${CC}' --as='${CC}' --ld='${CC}' --nm='${NM}' --ar='${AR}' \ |