upg vlc vulkan-headers

2024-01-27 01:49:48 +02:00 · 2024-01-27 01:49:48 +02:00 · 57a031e34c
parent 98b9316dcf
commit 57a031e34c
5 changed files with 81 additions and 13 deletions
--- a/vlc/PKGBUILD
+++ b/vlc/PKGBUILD
@ -10,7 +10,7 @@ _vlcver=3.0.20
 # optional fixup version including hyphen
 _vlcfixupver=
 pkgver=${_vlcver}${_vlcfixupver//-/.r}
-pkgrel=06
+pkgrel=07
 pkgdesc='Multi-platform MPEG, VCD/DVD, and DivX player - no systemd,avahi,dbus '
 url='https://www.videolan.org/vlc/'
 # NOTE: switch to ffmpeg4.4, as ffmpeg >= 5 requires extensive changes disabling VAAPI (only supported with vlc >= 4)
@ -101,7 +101,8 @@ replaces=('vlc-plugin')
 options=('!emptydirs')
 #options=('debug' '!emptydirs') ## uncomment this and comment the above options to produce the debug pkg
 source=(https://download.videolan.org/${pkgname}/${_vlcver}/${pkgname}-${_vlcver}${_vlcfixupver}.tar.xz{,.asc}
-        update-vlc-plugin-cache.hook)
+        update-vlc-plugin-cache.hook
+        taglib-2.patch)

 prepare() {
  cd ${pkgname}-${_vlcver}
@ -259,7 +260,7 @@ validpgpkeys=('65F7C6B4206BD057A7EB73787180713BE58D1ADC') # VideoLAN Release Sig

 sha256sums=(adc7285b4d2721cddf40eb5270cada2aaa10a334cb546fd55a06353447ba29b5  # vlc-3.0.20.tar.xz
 	241ac2d9393d9158bd339dcc6c0b36c9c5bfb4327c9b025a1cf62dbbc6912aab  # vlc-3.0.20.tar.xz.asc
-	b98043683dd90d3f5a3f501212dfc629839b661100de5ac79fd30cb7b4a06f13) # update-vlc-plugin-cache.hook
-
-##  b469297dc555a36eadbfd35228e01d16b3a7bb29635eb1e0cfdc5d797516b80b  vlc-3.0.20-06-x86_64.pkg.tar.lz
+	b98043683dd90d3f5a3f501212dfc629839b661100de5ac79fd30cb7b4a06f13  # update-vlc-plugin-cache.hook
+	db41f3a11d4df28251f1baaf41bc0913227ff1e77680e43d7efa172e6ae1cc29) # taglib-2.patch

+##  9e66e390f9db8d5522e09fd2e31d8302e1d2af14d3043dba27f3dcda6b398948  vlc-3.0.20-07-x86_64.pkg.tar.lz
--- a/vlc/PKGBUILD-arch
+++ b/vlc/PKGBUILD-arch
@ -8,7 +8,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')
@ -202,10 +202,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() {
--- a/vlc/taglib-2.patch
+++ b/vlc/taglib-2.patch
@ -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()) )
+     {
--- a/vulkan-headers/PKGBUILD
+++ b/vulkan-headers/PKGBUILD
@ -7,7 +7,7 @@

 pkgname=vulkan-headers
 _pkgname=Vulkan-Headers
-pkgver=1.3.274
+pkgver=1.3.276
 pkgrel=01
 epoch=1
 pkgdesc="Vulkan header files"
@ -39,7 +39,9 @@ arch=(x86_64)

 license=('APACHE')

-sha256sums=(3458dd9049d561d0863069b1dd752cd4a04ca31fc090a58124691d61bff5b62a) # vulkan-headers-1.3.274.tar.gz
- 
-##  d865904a9992531e48b7fbfcf1ecb6ba24b1a10176ea4db62f7603b1a386e3d5  vulkan-headers-1_1.3.274-01-x86_64.pkg.tar.lz
+sha256sums=(91d4695fd99cc4431740e25199f540cdee23483900243e0f395e0807868589c6) # vulkan-headers-1.3.276.tar.gz
+
+##  NOTE NOTE change the epoch : into _ for sourceforge
+
+##  adb17acf55b7b606eb45590271f2a4b1c2729ab42d637605fe01b115a8ea5e83  vulkan-headers-1_1.3.276-01-x86_64.pkg.tar.lz

--- a/vulkan-headers/PKGBUILD-arch
+++ b/vulkan-headers/PKGBUILD-arch
@ -2,7 +2,7 @@

 pkgname=vulkan-headers
 _pkgname=Vulkan-Headers
-pkgver=1.3.274
+pkgver=1.3.276
 pkgrel=1
 epoch=1
 pkgdesc="Vulkan header files"
@ -13,7 +13,7 @@ makedepends=(cmake git)
 provides=("vulkan-hpp=${pkgver}")
 groups=(vulkan-devel)
 source=("${pkgname}-${pkgver}.tar.gz::https://github.com/KhronosGroup/Vulkan-Headers/archive/v${pkgver}.tar.gz")
-sha256sums=('3458dd9049d561d0863069b1dd752cd4a04ca31fc090a58124691d61bff5b62a')
+sha256sums=('91d4695fd99cc4431740e25199f540cdee23483900243e0f395e0807868589c6')

 build() {
  cd Vulkan-Headers*