mirror of
https://github.com/archlinuxarm/PKGBUILDs.git
synced 2024-11-18 22:54:00 +00:00
extra/vlc to 3.0.20-7
This commit is contained in:
parent
94546df1fd
commit
e68b9ab57d
3 changed files with 70 additions and 3 deletions
|
@ -1,7 +1,7 @@
|
|||
pkgbase = vlc
|
||||
pkgdesc = Multi-platform MPEG, VCD/DVD, and DivX player
|
||||
pkgver = 3.0.20
|
||||
pkgrel = 6
|
||||
pkgrel = 7
|
||||
url = https://www.videolan.org/vlc/
|
||||
arch = x86_64
|
||||
license = GPL-2.0-or-later
|
||||
|
@ -190,9 +190,11 @@ pkgbase = vlc
|
|||
source = https://download.videolan.org/vlc/3.0.20/vlc-3.0.20.tar.xz
|
||||
source = https://download.videolan.org/vlc/3.0.20/vlc-3.0.20.tar.xz.asc
|
||||
source = update-vlc-plugin-cache.hook
|
||||
source = taglib-2.patch
|
||||
validpgpkeys = 65F7C6B4206BD057A7EB73787180713BE58D1ADC
|
||||
sha512sums = 02e58fb52dd75bf483ac4b298aecf86463b13d4782173d164adba6e4552d9262ff5e2ee1cbe1bce2c8a809801b79f328c6a8c475d34ae62aefaea02ae5ade406
|
||||
sha512sums = SKIP
|
||||
sha512sums = b247510ffeadfd439a5dadd170c91900b6cdb05b5ca00d38b1a17c720ffe5a9f75a32e0cb1af5ebefdf1c23c5acc53513ed983a736e8fa30dd8fad237ef49dd3
|
||||
sha512sums = ea0d1e1dfed16dac8f9027eb55d987dee59630568b9744ceb42bfa134ea9295252d83574f3d793a76a5be3b02661c1731ed366003b6b55b2d7f02fde70586ff3
|
||||
|
||||
pkgname = vlc
|
||||
|
|
|
@ -11,7 +11,7 @@ _vlcver=3.0.20
|
|||
# optional fixup version including hyphen
|
||||
_vlcfixupver=
|
||||
pkgver=${_vlcver}${_vlcfixupver//-/.r}
|
||||
pkgrel=6
|
||||
pkgrel=7
|
||||
pkgdesc='Multi-platform MPEG, VCD/DVD, and DivX player'
|
||||
url='https://www.videolan.org/vlc/'
|
||||
arch=('x86_64')
|
||||
|
@ -205,10 +205,12 @@ options=('!emptydirs')
|
|||
source=(
|
||||
https://download.videolan.org/${pkgname}/${_vlcver}/${pkgname}-${_vlcver}${_vlcfixupver}.tar.xz{,.asc}
|
||||
update-vlc-plugin-cache.hook
|
||||
taglib-2.patch
|
||||
)
|
||||
sha512sums=('02e58fb52dd75bf483ac4b298aecf86463b13d4782173d164adba6e4552d9262ff5e2ee1cbe1bce2c8a809801b79f328c6a8c475d34ae62aefaea02ae5ade406'
|
||||
'SKIP'
|
||||
'b247510ffeadfd439a5dadd170c91900b6cdb05b5ca00d38b1a17c720ffe5a9f75a32e0cb1af5ebefdf1c23c5acc53513ed983a736e8fa30dd8fad237ef49dd3')
|
||||
'b247510ffeadfd439a5dadd170c91900b6cdb05b5ca00d38b1a17c720ffe5a9f75a32e0cb1af5ebefdf1c23c5acc53513ed983a736e8fa30dd8fad237ef49dd3'
|
||||
'ea0d1e1dfed16dac8f9027eb55d987dee59630568b9744ceb42bfa134ea9295252d83574f3d793a76a5be3b02661c1731ed366003b6b55b2d7f02fde70586ff3')
|
||||
validpgpkeys=('65F7C6B4206BD057A7EB73787180713BE58D1ADC') # VideoLAN Release Signing Key
|
||||
|
||||
prepare() {
|
||||
|
|
63
extra/vlc/taglib-2.patch
Normal file
63
extra/vlc/taglib-2.patch
Normal file
|
@ -0,0 +1,63 @@
|
|||
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 a new issue