mirror of https://github.com/KDE/kasts.git
Update flatpak manifest (to align with flathub)
This commit is contained in:
parent
ebd6f72509
commit
8e92044748
|
@ -2,7 +2,7 @@
|
||||||
"id": "org.kde.kasts",
|
"id": "org.kde.kasts",
|
||||||
"branch": "master",
|
"branch": "master",
|
||||||
"runtime": "org.kde.Platform",
|
"runtime": "org.kde.Platform",
|
||||||
"runtime-version": "6.6",
|
"runtime-version": "6.7",
|
||||||
"sdk": "org.kde.Sdk",
|
"sdk": "org.kde.Sdk",
|
||||||
"command": "kasts",
|
"command": "kasts",
|
||||||
"tags": ["nightly"],
|
"tags": ["nightly"],
|
||||||
|
@ -43,8 +43,8 @@
|
||||||
"sources": [
|
"sources": [
|
||||||
{
|
{
|
||||||
"type": "archive",
|
"type": "archive",
|
||||||
"url": "https://get.videolan.org/vlc/3.0.20/vlc-3.0.20.tar.xz",
|
"url": "https://get.videolan.org/vlc/3.0.21/vlc-3.0.21.tar.xz",
|
||||||
"sha256": "adc7285b4d2721cddf40eb5270cada2aaa10a334cb546fd55a06353447ba29b5",
|
"sha256": "24dbbe1d7dfaeea0994d5def0bbde200177347136dbfe573f5b6a4cee25afbb0",
|
||||||
"x-checker-data": {
|
"x-checker-data": {
|
||||||
"type": "anitya",
|
"type": "anitya",
|
||||||
"project-id": 6504,
|
"project-id": 6504,
|
||||||
|
@ -55,6 +55,10 @@
|
||||||
{
|
{
|
||||||
"type": "patch",
|
"type": "patch",
|
||||||
"path": "src/kmediasession/.patches/vlc-ignore-time-for-cache.patch"
|
"path": "src/kmediasession/.patches/vlc-ignore-time-for-cache.patch"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "patch",
|
||||||
|
"path": "src/kmediasession/.patches/vlc-taglib-2.patch"
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
|
@ -65,7 +69,8 @@
|
||||||
"-Dmanpage=false",
|
"-Dmanpage=false",
|
||||||
"-Dvapi=false",
|
"-Dvapi=false",
|
||||||
"-Dgtk_doc=false",
|
"-Dgtk_doc=false",
|
||||||
"-Dintrospection=false"
|
"-Dintrospection=false",
|
||||||
|
"-Dcrypto=disabled"
|
||||||
],
|
],
|
||||||
"sources": [
|
"sources": [
|
||||||
{
|
{
|
||||||
|
@ -86,8 +91,8 @@
|
||||||
"sources": [
|
"sources": [
|
||||||
{
|
{
|
||||||
"type": "archive",
|
"type": "archive",
|
||||||
"url": "https://github.com/frankosterfeld/qtkeychain/archive/0.14.2.tar.gz",
|
"url": "https://github.com/frankosterfeld/qtkeychain/archive/0.14.3.tar.gz",
|
||||||
"sha256": "cf2e972b783ba66334a79a30f6b3a1ea794a1dc574d6c3bebae5ffd2f0399571",
|
"sha256": "a22c708f351431d8736a0ac5c562414f2b7bb919a6292cbca1ff7ac0849cb0a7",
|
||||||
"x-checker-data": {
|
"x-checker-data": {
|
||||||
"type": "anitya",
|
"type": "anitya",
|
||||||
"project-id": 4138,
|
"project-id": 4138,
|
||||||
|
|
|
@ -0,0 +1,66 @@
|
||||||
|
# SPDX-FileCopyrightText: 2024 Antonio Rojas
|
||||||
|
#
|
||||||
|
# SPDX-License-Identifier: LGPL-2.1-or-later
|
||||||
|
diff --git a/modules/meta_engine/taglib.cpp b/modules/meta_engine/taglib.cpp
|
||||||
|
index 84b401c795..f371485008 100644
|
||||||
|
--- a/modules/meta_engine/taglib.cpp
|
||||||
|
+++ b/modules/meta_engine/taglib.cpp
|
||||||
|
@@ -185,7 +185,7 @@ public:
|
||||||
|
ByteVector res(length, 0);
|
||||||
|
ssize_t i_read = vlc_stream_Read( m_stream, res.data(), length);
|
||||||
|
if (i_read < 0)
|
||||||
|
- return ByteVector::null;
|
||||||
|
+ return ByteVector();
|
||||||
|
else if ((size_t)i_read != length)
|
||||||
|
res.resize(i_read);
|
||||||
|
return res;
|
||||||
|
@@ -465,7 +465,7 @@ static void ReadMetaFromASF( ASF::Tag* tag, demux_meta_t* p_demux_meta, vlc_meta
|
||||||
|
static void ReadMetaFromBasicTag(const Tag* tag, vlc_meta_t *dest)
|
||||||
|
{
|
||||||
|
#define SET( accessor, meta ) \
|
||||||
|
- if( !tag->accessor().isNull() && !tag->accessor().isEmpty() ) \
|
||||||
|
+ if( !tag->accessor().isEmpty() ) \
|
||||||
|
vlc_meta_Set##meta( dest, tag->accessor().toCString(true) )
|
||||||
|
#define SETINT( accessor, meta ) \
|
||||||
|
if( tag->accessor() ) \
|
||||||
|
@@ -806,15 +806,15 @@ static void ReadMetaFromMP4( MP4::Tag* tag, demux_meta_t *p_demux_meta, vlc_meta
|
||||||
|
{
|
||||||
|
MP4::Item list;
|
||||||
|
#define SET( keyName, metaName ) \
|
||||||
|
- if( tag->itemListMap().contains(keyName) ) \
|
||||||
|
+ if( tag->itemMap().contains(keyName) ) \
|
||||||
|
{ \
|
||||||
|
- list = tag->itemListMap()[keyName]; \
|
||||||
|
+ list = tag->itemMap()[keyName]; \
|
||||||
|
vlc_meta_Set##metaName( p_meta, list.toStringList().front().toCString( true ) ); \
|
||||||
|
}
|
||||||
|
#define SET_EXTRA( keyName, metaName ) \
|
||||||
|
- if( tag->itemListMap().contains(keyName) ) \
|
||||||
|
+ if( tag->itemMap().contains(keyName) ) \
|
||||||
|
{ \
|
||||||
|
- list = tag->itemListMap()[keyName]; \
|
||||||
|
+ list = tag->itemMap()[keyName]; \
|
||||||
|
vlc_meta_AddExtra( p_meta, metaName, list.toStringList().front().toCString( true ) ); \
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -824,9 +824,9 @@ static void ReadMetaFromMP4( MP4::Tag* tag, demux_meta_t *p_demux_meta, vlc_meta
|
||||||
|
#undef SET
|
||||||
|
#undef SET_EXTRA
|
||||||
|
|
||||||
|
- if( tag->itemListMap().contains("covr") )
|
||||||
|
+ if( tag->itemMap().contains("covr") )
|
||||||
|
{
|
||||||
|
- MP4::CoverArtList list = tag->itemListMap()["covr"].toCoverArtList();
|
||||||
|
+ MP4::CoverArtList list = tag->itemMap()["covr"].toCoverArtList();
|
||||||
|
const char *psz_format = list[0].format() == MP4::CoverArt::PNG ? "image/png" : "image/jpeg";
|
||||||
|
|
||||||
|
msg_Dbg( p_demux_meta, "Found embedded art (%s) is %i bytes",
|
||||||
|
@@ -1337,7 +1337,7 @@ static int WriteMeta( vlc_object_t *p_this )
|
||||||
|
if( RIFF::AIFF::File* riff_aiff = dynamic_cast<RIFF::AIFF::File*>(f.file()) )
|
||||||
|
WriteMetaToId3v2( riff_aiff->tag(), p_item );
|
||||||
|
else if( RIFF::WAV::File* riff_wav = dynamic_cast<RIFF::WAV::File*>(f.file()) )
|
||||||
|
- WriteMetaToId3v2( riff_wav->tag(), p_item );
|
||||||
|
+ WriteMetaToId3v2( riff_wav->ID3v2Tag(), p_item );
|
||||||
|
}
|
||||||
|
else if( TrueAudio::File* trueaudio = dynamic_cast<TrueAudio::File*>(f.file()) )
|
||||||
|
{
|
Loading…
Reference in New Issue