diff options
author | Khem Raj <raj.khem@gmail.com> | 2024-03-09 12:34:16 -0800 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2024-03-09 12:35:14 -0800 |
commit | b956b89fcdef50bf21064e4678f619384a8cebba (patch) | |
tree | 07db7dd8de426ee9053e37a4ce738268d56b4dfa /meta-multimedia | |
parent | 29e772087c95dcf3e38d2becaf8958b5027a23fc (diff) | |
download | meta-openembedded-b956b89fcdef50bf21064e4678f619384a8cebba.tar.gz |
vlc: Fix build on 32bit x86
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-multimedia')
-rw-r--r-- | meta-multimedia/recipes-multimedia/vlc/vlc/0001-taglib-Fix-build-on-x86-32-bit.patch | 50 | ||||
-rw-r--r-- | meta-multimedia/recipes-multimedia/vlc/vlc_3.0.20.bb | 1 |
2 files changed, 51 insertions, 0 deletions
diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc/0001-taglib-Fix-build-on-x86-32-bit.patch b/meta-multimedia/recipes-multimedia/vlc/vlc/0001-taglib-Fix-build-on-x86-32-bit.patch new file mode 100644 index 000000000..2dff9b63c --- /dev/null +++ b/meta-multimedia/recipes-multimedia/vlc/vlc/0001-taglib-Fix-build-on-x86-32-bit.patch | |||
@@ -0,0 +1,50 @@ | |||
1 | From 5b921009b0db2c5c15aef7ce241d3c81f9c272c9 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Sat, 9 Mar 2024 12:26:39 -0800 | ||
4 | Subject: [PATCH] taglib: Fix build on x86 32-bit | ||
5 | |||
6 | While compiling with clang, there are errors seen such as | ||
7 | on function override signature mismatches | ||
8 | |||
9 | meta_engine/taglib.cpp:240:10: error: virtual function 'tell' has a different return type ('long') than the function it overrides (which has return type 'offset_t' (aka 'long long')) | ||
10 | 240 | long tell() const | ||
11 | | ~~~~ ^ | ||
12 | /mnt/b/yoe/master/build/tmp/work/core2-32-yoe-linux/vlc/3.0.20/recipe-sysroot/usr/include/taglib/tiostream.h:156:22: note: overridden virtual function is here | ||
13 | 156 | virtual offset_t tell() const = 0; | ||
14 | | ~~~~~~~~ ^ | ||
15 | meta_engine/taglib.cpp:245:10: error: virtual function 'length' has a different return type ('long') than the function it overrides (which has return type 'offset_t' (aka 'long long')) | ||
16 | 245 | long length() | ||
17 | | ~~~~ ^ | ||
18 | /mnt/b/yoe/master/build/tmp/work/core2-32-yoe-linux/vlc/3.0.20/recipe-sysroot/usr/include/taglib/tiostream.h:161:22: note: overridden virtual function is here | ||
19 | 161 | virtual offset_t length() = 0; | ||
20 | | ~~~~~~~~ ^ | ||
21 | |||
22 | Upstream-Status: Submitted [https://mailman.videolan.org/pipermail/vlc-devel/2024-March/143639.html] | ||
23 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
24 | --- | ||
25 | modules/meta_engine/taglib.cpp | 6 +++--- | ||
26 | 1 file changed, 3 insertions(+), 3 deletions(-) | ||
27 | |||
28 | diff --git a/modules/meta_engine/taglib.cpp b/modules/meta_engine/taglib.cpp | ||
29 | index f371485008..129fdf55f1 100644 | ||
30 | --- a/modules/meta_engine/taglib.cpp | ||
31 | +++ b/modules/meta_engine/taglib.cpp | ||
32 | @@ -237,12 +237,12 @@ public: | ||
33 | return; | ||
34 | } | ||
35 | |||
36 | - long tell() const | ||
37 | + offset_t tell() const | ||
38 | { | ||
39 | - return m_previousPos; | ||
40 | + return (offset_t)m_previousPos; | ||
41 | } | ||
42 | |||
43 | - long length() | ||
44 | + offset_t length() | ||
45 | { | ||
46 | uint64_t i_size; | ||
47 | if (vlc_stream_GetSize( m_stream, &i_size ) != VLC_SUCCESS) | ||
48 | -- | ||
49 | 2.44.0 | ||
50 | |||
diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.20.bb b/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.20.bb index 85af2f9bb..d25a20ae0 100644 --- a/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.20.bb +++ b/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.20.bb | |||
@@ -24,6 +24,7 @@ SRC_URI = "https://get.videolan.org/${BPN}/${PV}/${BP}.tar.xz \ | |||
24 | file://0005-ioctl-does-not-have-same-signature-between-glibc-and.patch \ | 24 | file://0005-ioctl-does-not-have-same-signature-between-glibc-and.patch \ |
25 | file://0006-configure-Disable-incompatible-function-pointer-type.patch \ | 25 | file://0006-configure-Disable-incompatible-function-pointer-type.patch \ |
26 | file://taglib-2.patch \ | 26 | file://taglib-2.patch \ |
27 | file://0001-taglib-Fix-build-on-x86-32-bit.patch \ | ||
27 | " | 28 | " |
28 | SRC_URI[sha256sum] = "adc7285b4d2721cddf40eb5270cada2aaa10a334cb546fd55a06353447ba29b5" | 29 | SRC_URI[sha256sum] = "adc7285b4d2721cddf40eb5270cada2aaa10a334cb546fd55a06353447ba29b5" |
29 | 30 | ||