summaryrefslogtreecommitdiffstats
path: root/meta/recipes-multimedia
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-multimedia')
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-libav/0001-fix-host-contamination.patch36
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-libav/0001-hevcpred_msa.c-Fix-build-by-Including-libavcodec-hev.patch33
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.12.4.bb21
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.14.0.bb (renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0-libav.inc)19
4 files changed, 55 insertions, 54 deletions
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav/0001-fix-host-contamination.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav/0001-fix-host-contamination.patch
new file mode 100644
index 0000000000..120c0798ea
--- /dev/null
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav/0001-fix-host-contamination.patch
@@ -0,0 +1,36 @@
1From c1700f867f876ee33c130a8e28b688e2b1d89663 Mon Sep 17 00:00:00 2001
2From: Anuj Mittal <anuj.mittal@intel.com>
3Date: Wed, 11 Apr 2018 17:14:55 +0800
4Subject: [PATCH] Prevent host contamination
5
6Remove reference to host $(libdir) from .la files.
7
8Upstream-Status: Inappropriate [cross-compile specific]
9
10Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
11---
12 gst-libs/ext/Makefile.am | 4 ++--
13 1 file changed, 2 insertions(+), 2 deletions(-)
14
15diff --git a/gst-libs/ext/Makefile.am b/gst-libs/ext/Makefile.am
16index 6cdc048..a19d255 100644
17--- a/gst-libs/ext/Makefile.am
18+++ b/gst-libs/ext/Makefile.am
19@@ -49,7 +49,7 @@ echo " GEN $1.la" && \
20 echo "library_names=''" && \
21 echo "old_library='$1.a'" && \
22 echo "inherited_linker_flags=''" && \
23- echo "dependency_libs=' -L$(libdir) $(if $2,$(foreach dep,$2,$(abs_builddir)/$(dep).la)) $(call find_library_la,$3 $(LIBM),$(LDFLAGS)) '" && \
24+ echo "dependency_libs=' -L $(if $2,$(foreach dep,$2,$(abs_builddir)/$(dep).la)) $(call find_library_la,$3 $(LIBM),$(LDFLAGS)) '" && \
25 echo "weak_library_names=''" && \
26 echo "current=" && \
27 echo "age=" && \
28@@ -58,7 +58,7 @@ echo " GEN $1.la" && \
29 echo "shouldnotlink=no" && \
30 echo "dlopen=''" && \
31 echo "dlpreopen=''" && \
32- echo "libdir='$(libdir)'") > $1.la
33+ echo "libdir=''") > $1.la
34 endef
35
36 libavutil.la:
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav/0001-hevcpred_msa.c-Fix-build-by-Including-libavcodec-hev.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav/0001-hevcpred_msa.c-Fix-build-by-Including-libavcodec-hev.patch
deleted file mode 100644
index afbfc84db5..0000000000
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav/0001-hevcpred_msa.c-Fix-build-by-Including-libavcodec-hev.patch
+++ /dev/null
@@ -1,33 +0,0 @@
1From b5226c096a0b7049874858e94a59d43e10ba3fd2 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Thu, 21 Sep 2017 10:22:56 -0700
4Subject: [PATCH] hevcpred_msa.c: Fix build by Including libavcodec/hevcdec.h
5
6src/libavcodec/mips/hevcpred_msa.c:1913:32: error: unknown type name 'HEVCContext'; did you mean 'HEVCPredContext'?
7 void ff_intra_pred_8_16x16_msa(HEVCContext *s, int x0, int y0, int c_idx)
8 ^~~~~~~~~~~
9 HEVCPredContext
10
11Signed-off-by: Khem Raj <raj.khem@gmail.com>
12---
13Upstream-Status: Pending
14
15 gst-libs/ext/libav/libavcodec/mips/hevcpred_msa.c | 2 +-
16 1 file changed, 1 insertion(+), 1 deletion(-)
17
18diff --git a/gst-libs/ext/libav/libavcodec/mips/hevcpred_msa.c b/gst-libs/ext/libav/libavcodec/mips/hevcpred_msa.c
19index 6a3b281..963c64c 100644
20--- a/gst-libs/ext/libav/libavcodec/mips/hevcpred_msa.c
21+++ b/gst-libs/ext/libav/libavcodec/mips/hevcpred_msa.c
22@@ -18,7 +18,7 @@
23 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
24 */
25
26-#include "libavcodec/hevc.h"
27+#include "libavcodec/hevcdec.h"
28 #include "libavutil/mips/generic_macros_msa.h"
29 #include "hevcpred_mips.h"
30
31--
322.14.1
33
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.12.4.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.12.4.bb
deleted file mode 100644
index af547ba602..0000000000
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.12.4.bb
+++ /dev/null
@@ -1,21 +0,0 @@
1require gstreamer1.0-libav.inc
2
3LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
4 file://COPYING.LIB;md5=6762ed442b3822387a51c92d928ead0d \
5 file://ext/libav/gstav.h;beginline=1;endline=18;md5=a752c35267d8276fd9ca3db6994fca9c \
6 file://gst-libs/ext/libav/COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
7 file://gst-libs/ext/libav/COPYING.GPLv3;md5=d32239bcb673463ab874e80d47fae504 \
8 file://gst-libs/ext/libav/COPYING.LGPLv2.1;md5=bd7a443320af8c812e4c18d1b79df004 \
9 file://gst-libs/ext/libav/COPYING.LGPLv3;md5=e6a600fd5e1d9cbde2d983680233ad02"
10
11SRC_URI = "http://gstreamer.freedesktop.org/src/gst-libav/gst-libav-${PV}.tar.xz \
12 file://0001-Disable-yasm-for-libav-when-disable-yasm.patch \
13 file://workaround-to-build-gst-libav-for-i586-with-gcc.patch \
14 file://mips64_cpu_detection.patch \
15 file://0001-configure-check-for-armv7ve-variant.patch \
16 file://0001-hevcpred_msa.c-Fix-build-by-Including-libavcodec-hev.patch \
17 "
18SRC_URI[md5sum] = "8a851bf2e475e90a3fdac9506e3e4dbd"
19SRC_URI[sha256sum] = "2a56aa5d2d8cd912f2bce17f174713d2c417ca298f1f9c28ee66d4aa1e1d9e62"
20
21S = "${WORKDIR}/gst-libav-${PV}"
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.14.0.bb
index c2283061cc..ee2a043f81 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav.inc
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.14.0.bb
@@ -4,6 +4,25 @@ SECTION = "multimedia"
4 4
5LICENSE = "GPLv2+ & LGPLv2+ & ( (GPLv2+ & LGPLv2.1+) | (GPLv3+ & LGPLv3+) )" 5LICENSE = "GPLv2+ & LGPLv2+ & ( (GPLv2+ & LGPLv2.1+) | (GPLv3+ & LGPLv3+) )"
6LICENSE_FLAGS = "commercial" 6LICENSE_FLAGS = "commercial"
7LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
8 file://COPYING.LIB;md5=6762ed442b3822387a51c92d928ead0d \
9 file://ext/libav/gstav.h;beginline=1;endline=18;md5=a752c35267d8276fd9ca3db6994fca9c \
10 file://gst-libs/ext/libav/COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
11 file://gst-libs/ext/libav/COPYING.GPLv3;md5=d32239bcb673463ab874e80d47fae504 \
12 file://gst-libs/ext/libav/COPYING.LGPLv2.1;md5=bd7a443320af8c812e4c18d1b79df004 \
13 file://gst-libs/ext/libav/COPYING.LGPLv3;md5=e6a600fd5e1d9cbde2d983680233ad02"
14
15SRC_URI = "http://gstreamer.freedesktop.org/src/gst-libav/gst-libav-${PV}.tar.xz \
16 file://0001-Disable-yasm-for-libav-when-disable-yasm.patch \
17 file://workaround-to-build-gst-libav-for-i586-with-gcc.patch \
18 file://mips64_cpu_detection.patch \
19 file://0001-configure-check-for-armv7ve-variant.patch \
20 file://0001-fix-host-contamination.patch \
21 "
22SRC_URI[md5sum] = "943045b9e937ffc5c6cfa0bd5c44230d"
23SRC_URI[sha256sum] = "fb134b4d3e054746ef8b922ff157b0c7903d1fdd910708a45add66954da7ef89"
24
25S = "${WORKDIR}/gst-libav-${PV}"
7 26
8DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base zlib bzip2 xz" 27DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base zlib bzip2 xz"
9 28
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-10 12:45:46 +0000