summaryrefslogtreecommitdiffstats
path: root/meta/recipes-multimedia
diff options
context:
space:
mode:
authorCarlos Rafael Giani <dv@pseudoterminal.org>2015-11-05 17:20:00 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-11-16 11:39:35 +0000
commit2459ec2b3166d466e4e8d501731614291eb67633 (patch)
tree12c7901a4680a6e6e5be8d222660380e4a762f50 /meta/recipes-multimedia
parentbce06e751a4ab7ca9a90bfab41643a4a446d0e99 (diff)
downloadpoky-2459ec2b3166d466e4e8d501731614291eb67633.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. (From OE-Core rev: ef620928b5caadae939e2759b1c3933084ad9ebb) Signed-off-by: Carlos Rafael Giani <dv@pseudoterminal.org> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-multimedia')
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-libav.inc4
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-libav/workaround-to-build-gst-libav-for-i586-with-gcc.patch2
-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 84e6e95d36..5d86205cf8 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"
3LICENSE = "GPLv2+ & LGPLv2+ & ( (GPLv2+ & LGPLv2.1+) | (GPLv3+ & LGPLv3+) )" 3LICENSE = "GPLv2+ & LGPLv2+ & ( (GPLv2+ & LGPLv2.1+) | (GPLv3+ & LGPLv3+) )"
4LICENSE_FLAGS = "commercial" 4LICENSE_FLAGS = "commercial"
5HOMEPAGE = "http://www.gstreamer.net/" 5HOMEPAGE = "http://www.gstreamer.net/"
6DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base zlib bzip2" 6DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base zlib bzip2 xz"
7 7
8inherit autotools pkgconfig 8inherit autotools pkgconfig
9 9
@@ -12,7 +12,7 @@ inherit autotools pkgconfig
12# libav copy included in the gst-libav package. 12# libav copy included in the gst-libav package.
13PACKAGECONFIG ??= " orc yasm " 13PACKAGECONFIG ??= " orc yasm "
14PACKAGECONFIG[libav] = "--with-system-libav,,libav" 14PACKAGECONFIG[libav] = "--with-system-libav,,libav"
15PACKAGECONFIG[lgpl] = "--enable-lgpl,," 15PACKAGECONFIG[gpl] = "--enable-gpl,--disable-gpl,"
16PACKAGECONFIG[yasm] = "--enable-yasm,--disable-yasm,yasm-native" 16PACKAGECONFIG[yasm] = "--enable-yasm,--disable-yasm,yasm-native"
17PACKAGECONFIG[orc] = "--enable-orc,--disable-orc,orc" 17PACKAGECONFIG[orc] = "--enable-orc,--disable-orc,orc"
18 18
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 ccadea4d5c..36abf8607e 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>
22+ ( (unsigned char*)(h->non_zero_count[mb_xy]) ) [i] = 16; 22+ ( (unsigned char*)(h->non_zero_count[mb_xy]) ) [i] = 16;
23+ } 23+ }
24 h->cur_pic.mb_type[mb_xy] = mb_type; 24 h->cur_pic.mb_type[mb_xy] = mb_type;
25 h->last_qscale_diff = 0; 25 sl->last_qscale_diff = 0;
26 return 0; 26 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 97fc7ec3f8..99b01c8a92 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
3LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ 3LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
4 file://COPYING.LIB;md5=6762ed442b3822387a51c92d928ead0d \ 4 file://COPYING.LIB;md5=6762ed442b3822387a51c92d928ead0d \
5 file://ext/libav/gstav.h;beginline=1;endline=18;md5=a752c35267d8276fd9ca3db6994fca9c \ 5 file://ext/libav/gstav.h;beginline=1;endline=18;md5=a752c35267d8276fd9ca3db6994fca9c \
6 file://gst-libs/ext/libav/LICENSE;md5=ea66e97a7ac1db978cf3529068a8c948 \
7 file://gst-libs/ext/libav/COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ 6 file://gst-libs/ext/libav/COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
8 file://gst-libs/ext/libav/COPYING.GPLv3;md5=d32239bcb673463ab874e80d47fae504 \ 7 file://gst-libs/ext/libav/COPYING.GPLv3;md5=d32239bcb673463ab874e80d47fae504 \
9 file://gst-libs/ext/libav/COPYING.LGPLv2.1;md5=bd7a443320af8c812e4c18d1b79df004 \ 8 file://gst-libs/ext/libav/COPYING.LGPLv2.1;md5=bd7a443320af8c812e4c18d1b79df004 \
@@ -14,8 +13,8 @@ SRC_URI = " \
14 file://0001-Disable-yasm-for-libav-when-disable-yasm.patch \ 13 file://0001-Disable-yasm-for-libav-when-disable-yasm.patch \
15 file://workaround-to-build-gst-libav-for-i586-with-gcc.patch \ 14 file://workaround-to-build-gst-libav-for-i586-with-gcc.patch \
16" 15"
17SRC_URI[md5sum] = "f4922a46adbcbe7bd01331ff5dc7979d" 16SRC_URI[md5sum] = "058b22411e1690eee5b71d1ab44eab25"
18SRC_URI[sha256sum] = "605c62624604f3bb5c870844cc1f2711779cc533b004c2aa1d8c0d58557afbbc" 17SRC_URI[sha256sum] = "24d5e8e8b8c825af1a19aa80a27aba268ec383c8133fd4ef66e0e572ff6137a9"
19 18
20LIBAV_EXTRA_CONFIGURE_COMMON_ARG = "--target-os=linux \ 19LIBAV_EXTRA_CONFIGURE_COMMON_ARG = "--target-os=linux \
21 --cc='${CC}' --as='${CC}' --ld='${CC}' --nm='${NM}' --ar='${AR}' \ 20 --cc='${CC}' --as='${CC}' --ld='${CC}' --nm='${NM}' --ar='${AR}' \