diff options
author | Otavio Salvador <otavio@ossystems.com.br> | 2022-04-04 20:23:10 -0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-04-04 20:23:10 -0300 |
commit | b6514bbbe3c1643d55fb42241759cfe2e9dd0a35 (patch) | |
tree | 2d10b15b96f19b2529947992947fd6204eff9077 /recipes-multimedia/gstreamer/gstreamer1.0-libav | |
parent | 36589d57ee3fa9d3aac891f42c16d45622b00750 (diff) | |
parent | 1c6c0f6523c0a62c15ac973aa782e108a652a61e (diff) | |
download | meta-freescale-b6514bbbe3c1643d55fb42241759cfe2e9dd0a35.tar.gz |
Merge pull request #1032 from thochstein/master
gstreamer: Upgrade 1.18.0.imx -> 1.18.5.imx
Diffstat (limited to 'recipes-multimedia/gstreamer/gstreamer1.0-libav')
5 files changed, 0 insertions, 162 deletions
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-libav/0001-Disable-yasm-for-libav-when-disable-yasm.patch b/recipes-multimedia/gstreamer/gstreamer1.0-libav/0001-Disable-yasm-for-libav-when-disable-yasm.patch deleted file mode 100644 index 1d99ad12..00000000 --- a/recipes-multimedia/gstreamer/gstreamer1.0-libav/0001-Disable-yasm-for-libav-when-disable-yasm.patch +++ /dev/null | |||
@@ -1,33 +0,0 @@ | |||
1 | From 54bba228ea52d01fd84941d97be23c03f9862b64 Mon Sep 17 00:00:00 2001 | ||
2 | From: Carlos Rafael Giani <dv@pseudoterminal.org> | ||
3 | Date: Sat, 6 Apr 2013 01:22:22 +0200 | ||
4 | Subject: [PATCH] Disable yasm for libav when --disable-yasm | ||
5 | |||
6 | Upstream-Status: Inappropriate [configuration] | ||
7 | |||
8 | Signed-off-by: Shane Wang <shane.wang@intel.com> | ||
9 | Signed-off-by: Carlos Rafael Giani <dv@pseudoterminal.org> | ||
10 | --- | ||
11 | configure.ac | 4 ++++ | ||
12 | 1 file changed, 4 insertions(+) | ||
13 | |||
14 | diff --git a/configure.ac b/configure.ac | ||
15 | index 22ede88..ef3c050 100644 | ||
16 | --- a/configure.ac | ||
17 | +++ b/configure.ac | ||
18 | @@ -305,6 +305,12 @@ else | ||
19 | emblibav_configure_args="$emblibav_configure_args --enable-gpl" | ||
20 | fi | ||
21 | |||
22 | + AC_ARG_ENABLE(yasm, | ||
23 | + [AC_HELP_STRING([--disable-yasm], [disable use of yasm assembler])]) | ||
24 | + if test "x$enable_yasm" = "xno"; then | ||
25 | + emblibav_configure_args="$emblibav_configure_args --disable-yasm" | ||
26 | + fi | ||
27 | + | ||
28 | # if we are cross-compiling, tell libav so | ||
29 | case $host in | ||
30 | *android*) | ||
31 | -- | ||
32 | 1.8.2 | ||
33 | |||
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-libav/0001-configure-check-for-armv7ve-variant.patch b/recipes-multimedia/gstreamer/gstreamer1.0-libav/0001-configure-check-for-armv7ve-variant.patch deleted file mode 100644 index b80d0739..00000000 --- a/recipes-multimedia/gstreamer/gstreamer1.0-libav/0001-configure-check-for-armv7ve-variant.patch +++ /dev/null | |||
@@ -1,35 +0,0 @@ | |||
1 | From aac5902d3c9cb35c771e760d0e487622aa2e116a Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Thu, 20 Apr 2017 10:38:18 -0700 | ||
4 | Subject: [PATCH] configure: check for armv7ve variant | ||
5 | |||
6 | OE passes -mcpu and -march via cmdline and if | ||
7 | package tries to detect one of it own then it | ||
8 | should be compatible otherwise, newer gcc7+ will | ||
9 | error out | ||
10 | |||
11 | Check for relevant preprocessor macro to determine | ||
12 | armv7ve architecture | ||
13 | |||
14 | Upstream-Status: Pending | ||
15 | |||
16 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
17 | --- | ||
18 | gst-libs/ext/libav/configure | 1 + | ||
19 | 1 file changed, 1 insertion(+) | ||
20 | |||
21 | diff --git a/gst-libs/ext/libav/configure b/gst-libs/ext/libav/configure | ||
22 | index 4a5e477..727818e 100755 | ||
23 | --- a/gst-libs/ext/libav/configure | ||
24 | +++ b/gst-libs/ext/libav/configure | ||
25 | @@ -4295,6 +4295,7 @@ elif enabled arm; then | ||
26 | elif check_arm_arch 6Z; then echo armv6z | ||
27 | elif check_arm_arch 6ZK; then echo armv6zk | ||
28 | elif check_arm_arch 6T2; then echo armv6t2 | ||
29 | + elif check_arm_arch EXT_IDIV; then echo armv7ve | ||
30 | elif check_arm_arch 7; then echo armv7 | ||
31 | elif check_arm_arch 7A 7_A; then echo armv7-a | ||
32 | elif check_arm_arch 7S; then echo armv7-a | ||
33 | -- | ||
34 | 2.12.2 | ||
35 | |||
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-libav/0001-fix-host-contamination.patch b/recipes-multimedia/gstreamer/gstreamer1.0-libav/0001-fix-host-contamination.patch deleted file mode 100644 index 120c0798..00000000 --- a/recipes-multimedia/gstreamer/gstreamer1.0-libav/0001-fix-host-contamination.patch +++ /dev/null | |||
@@ -1,36 +0,0 @@ | |||
1 | From c1700f867f876ee33c130a8e28b688e2b1d89663 Mon Sep 17 00:00:00 2001 | ||
2 | From: Anuj Mittal <anuj.mittal@intel.com> | ||
3 | Date: Wed, 11 Apr 2018 17:14:55 +0800 | ||
4 | Subject: [PATCH] Prevent host contamination | ||
5 | |||
6 | Remove reference to host $(libdir) from .la files. | ||
7 | |||
8 | Upstream-Status: Inappropriate [cross-compile specific] | ||
9 | |||
10 | Signed-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 | |||
15 | diff --git a/gst-libs/ext/Makefile.am b/gst-libs/ext/Makefile.am | ||
16 | index 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/recipes-multimedia/gstreamer/gstreamer1.0-libav/mips64_cpu_detection.patch b/recipes-multimedia/gstreamer/gstreamer1.0-libav/mips64_cpu_detection.patch deleted file mode 100644 index 7a0b4488..00000000 --- a/recipes-multimedia/gstreamer/gstreamer1.0-libav/mips64_cpu_detection.patch +++ /dev/null | |||
@@ -1,32 +0,0 @@ | |||
1 | It will add -mips64r6 and -mips64r2 to cmdline which will | ||
2 | cause conflicts | ||
3 | |||
4 | in OE we user mips32r2 and mips64r2 for mips arch versions | ||
5 | so there is no benefit of detecting it automatically by | ||
6 | poking at tools especially in cross env | ||
7 | |||
8 | Fixes errors like | ||
9 | |||
10 | linking -mnan=2008 module with previous -mnan=legacy modules | ||
11 | failed to merge target specific data of file | ||
12 | |||
13 | -Khem | ||
14 | Upstream-Status: Inappropriate [OE-Specific] | ||
15 | |||
16 | Index: gst-libav-1.10.1/gst-libs/ext/libav/configure | ||
17 | =================================================================== | ||
18 | --- gst-libav-1.10.1.orig/gst-libs/ext/libav/configure | ||
19 | +++ gst-libav-1.10.1/gst-libs/ext/libav/configure | ||
20 | @@ -5269,12 +5269,9 @@ elif enabled mips; then | ||
21 | |||
22 | # Enable minimum ISA based on selected options | ||
23 | if enabled mips64; then | ||
24 | - enabled mips64r6 && check_inline_asm_flags mips64r6 '"dlsa $0, $0, $0, 1"' '-mips64r6' | ||
25 | enabled mips64r2 && check_inline_asm_flags mips64r2 '"dext $0, $0, 0, 1"' '-mips64r2' | ||
26 | disabled mips64r6 && disabled mips64r2 && check_inline_asm_flags mips64r1 '"daddi $0, $0, 0"' '-mips64' | ||
27 | else | ||
28 | - enabled mips32r6 && check_inline_asm_flags mips32r6 '"aui $0, $0, 0"' '-mips32r6' | ||
29 | - enabled mips32r5 && check_inline_asm_flags mips32r5 '"eretnc"' '-mips32r5' | ||
30 | enabled mips32r2 && check_inline_asm_flags mips32r2 '"ext $0, $0, 0, 1"' '-mips32r2' | ||
31 | disabled mips32r6 && disabled mips32r5 && disabled mips32r2 && check_inline_asm_flags mips32r1 '"addi $0, $0, 0"' '-mips32' | ||
32 | fi | ||
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-libav/workaround-to-build-gst-libav-for-i586-with-gcc.patch b/recipes-multimedia/gstreamer/gstreamer1.0-libav/workaround-to-build-gst-libav-for-i586-with-gcc.patch deleted file mode 100644 index 36abf860..00000000 --- a/recipes-multimedia/gstreamer/gstreamer1.0-libav/workaround-to-build-gst-libav-for-i586-with-gcc.patch +++ /dev/null | |||
@@ -1,26 +0,0 @@ | |||
1 | Description: Workaround to build libav for i586 with gcc 4.9.2 by avoiding memset | ||
2 | Author: Bernhard Übelacker <bernhardu@vr-web.de> | ||
3 | |||
4 | --- | ||
5 | Bug-Debian: https://bugs.debian.org/783082 | ||
6 | Last-Update: 2015-04-28 | ||
7 | |||
8 | Upstream-Status: Backport [debian] | ||
9 | |||
10 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> | ||
11 | |||
12 | --- gst-libav-1.4.5.orig/gst-libs/ext/libav/libavcodec/h264_cabac.c | ||
13 | +++ gst-libav-1.4.5/gst-libs/ext/libav/libavcodec/h264_cabac.c | ||
14 | @@ -2020,7 +2020,11 @@ decode_intra_mb: | ||
15 | // In deblocking, the quantizer is 0 | ||
16 | h->cur_pic.qscale_table[mb_xy] = 0; | ||
17 | // All coeffs are present | ||
18 | - memset(h->non_zero_count[mb_xy], 16, 48); | ||
19 | + /*memset(h->non_zero_count[mb_xy], 16, 48);*/ | ||
20 | + /* avoiding this memset because it leads at least with gcc4.9.2 to error: 'asm' operand has impossible constraints */ | ||
21 | + for (size_t i = 0; i < 48; i++) { | ||
22 | + ( (unsigned char*)(h->non_zero_count[mb_xy]) ) [i] = 16; | ||
23 | + } | ||
24 | h->cur_pic.mb_type[mb_xy] = mb_type; | ||
25 | sl->last_qscale_diff = 0; | ||
26 | return 0; | ||