Remove patch for taglib v2 compatibility as it is now included in source.

3 files changed, 3 insertions, 33 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8ab9fb5cfbf9..dce901c6c2ed 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = vlc-git
 	pkgdesc = Multi-platform MPEG, VCD/DVD, and DivX player
-	pkgver = 4.0.0.r27536.g051c1c067e
+	pkgver = 4.0.0.r27672.gf030c94478
 	pkgrel = 1
 	url = https://code.videolan.org/videolan/vlc
 	arch = i686
@@ -166,16 +166,14 @@ pkgbase = vlc-git
 	optdepends = aom: AOM AV1 codec
 	optdepends = srt: SRT input/output plugin
 	optdepends = dav1d: dav1d AV1 decoder
-	provides = vlc=4.0.0.r27536.g051c1c067e
+	provides = vlc=4.0.0.r27672.gf030c94478
 	conflicts = vlc
 	options = !emptydirs
 	source = git+https://code.videolan.org/videolan/vlc.git
 	source = vlc-live-media-2021.patch
-	source = vlc-taglib.patch
 	source = update-vlc-plugin-cache.hook
 	b2sums = SKIP
 	b2sums = 76103422a1eaad40d33bfb7897bf25c1b5748729270974bec13f642f2861c4458f0dc07b5fb68d9ba4fae6e44d4a6c8e4d67af7ec10e0c117f1b804dd06868e3
-	b2sums = ec197481ad89301f0bed4180cd712d667c9b48925cad036b73ed386757c222d1061e02bf6e5c8676913a0802e96fdf1171a6b94b27ef876663d67ea25af65a28
 	b2sums = fe3849f45fb91d3697573a9c23b90b78ff0bef5f94c42bc6e7c14427637f45f2fc86786803fb9b36c657ac2c50f6bf3c860cd763248711308ceab2bfcf7be49a
 
 pkgname = vlc-git
diff --git a/PKGBUILD b/PKGBUILD
index 0628b5de444c..f7bf29c02ba1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,7 +12,7 @@
 
 pkgname="vlc-git"
 pkgdesc="Multi-platform MPEG, VCD/DVD, and DivX player"
-pkgver=4.0.0.r27536.g051c1c067e
+pkgver=4.0.0.r27672.gf030c94478
 pkgrel=1
 url='https://code.videolan.org/videolan/vlc'
 arch=('i686' 'x86_64')
@@ -103,11 +103,9 @@ provides=("${_name}=${pkgver}")
 options=(!emptydirs)
 source=('git+https://code.videolan.org/videolan/vlc.git'
         'vlc-live-media-2021.patch'
-        'vlc-taglib.patch'
         'update-vlc-plugin-cache.hook')
 b2sums=('SKIP'
         '76103422a1eaad40d33bfb7897bf25c1b5748729270974bec13f642f2861c4458f0dc07b5fb68d9ba4fae6e44d4a6c8e4d67af7ec10e0c117f1b804dd06868e3'
-	'ec197481ad89301f0bed4180cd712d667c9b48925cad036b73ed386757c222d1061e02bf6e5c8676913a0802e96fdf1171a6b94b27ef876663d67ea25af65a28'
         'fe3849f45fb91d3697573a9c23b90b78ff0bef5f94c42bc6e7c14427637f45f2fc86786803fb9b36c657ac2c50f6bf3c860cd763248711308ceab2bfcf7be49a')
 
 pkgver() {
@@ -123,7 +121,6 @@ prepare() {
   sed -e 's:truetype/ttf-dejavu:TTF:g' -i modules/visualization/projectm.cpp
   sed -e 's|-Werror-implicit-function-declaration||g' -i configure
   patch -Np1 < "${srcdir}"/vlc-live-media-2021.patch
-  patch -Np1 < "${srcdir}"/vlc-taglib.patch
   sed 's|whoami|echo builduser|g' -i configure
   sed 's|hostname -f|echo arch|g' -i configure
   autoreconf -vf
diff --git a/vlc-taglib.patch b/vlc-taglib.patch
deleted file mode 100644
index 1b72b593fda9..000000000000
--- a/vlc-taglib.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/modules/meta_engine/taglib.cpp
-+++ b/modules/meta_engine/taglib.cpp
-@@ -227,11 +227,11 @@
-         // Let's stay Read-Only for now
-     }
- 
--    void insert(const ByteVector&, ulong, ulong)
-+    void insert(const ByteVector&, offset_t, size_t)
-     {
-     }
- 
--    void removeBlock(ulong, ulong)
-+    void removeBlock(offset_t, size_t)
-     {
-     }
- 
-@@ -1392,7 +1392,7 @@
-         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()) )
-     {