CaROS/meta-openembedded
3
1
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-01-01 13:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

vlc: Fix build on 32bit x86

Browse Source 
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Khem Raj 2024-03-09 12:34:16 -08:00
parent 29e772087c
commit b956b89fcd
No known key found for this signature in database
GPG Key ID: BB053355919D3314
2 changed files with 51 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
meta-multimedia/recipes-multimedia/vlc/vlc/0001-taglib-Fix-build-on-x86-32-bit.patch Normal file
View File

@ -0,0 +1,50 @@
From 5b921009b0db2c5c15aef7ce241d3c81f9c272c9 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Sat, 9 Mar 2024 12:26:39 -0800
Subject: [PATCH] taglib: Fix build on x86 32-bit
While compiling with clang, there are errors seen such as
on function override signature mismatches
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'))
240 | long tell() const
| ~~~~ ^
/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
156 | virtual offset_t tell() const = 0;
| ~~~~~~~~ ^
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'))
245 | long length()
| ~~~~ ^
/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
161 | virtual offset_t length() = 0;
| ~~~~~~~~ ^
Upstream-Status: Submitted [https://mailman.videolan.org/pipermail/vlc-devel/2024-March/143639.html]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
modules/meta_engine/taglib.cpp | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/modules/meta_engine/taglib.cpp b/modules/meta_engine/taglib.cpp
index f371485008..129fdf55f1 100644
--- a/modules/meta_engine/taglib.cpp
+++ b/modules/meta_engine/taglib.cpp
@@ -237,12 +237,12 @@ public:
return;
}
- long tell() const
+ offset_t tell() const
{
- return m_previousPos;
+ return (offset_t)m_previousPos;
}
- long length()
+ offset_t length()
{
uint64_t i_size;
if (vlc_stream_GetSize( m_stream, &i_size ) != VLC_SUCCESS)
--
2.44.0

1
meta-multimedia/recipes-multimedia/vlc/vlc_3.0.20.bb
View File

@ -24,6 +24,7 @@ SRC_URI = "https://get.videolan.org/${BPN}/${PV}/${BP}.tar.xz \
file://0005-ioctl-does-not-have-same-signature-between-glibc-and.patch \
file://0006-configure-Disable-incompatible-function-pointer-type.patch \
file://taglib-2.patch \
file://0001-taglib-Fix-build-on-x86-32-bit.patch \
"
SRC_URI[sha256sum] = "adc7285b4d2721cddf40eb5270cada2aaa10a334cb546fd55a06353447ba29b5"