From 4b648f6e8d20fd66d878cc5dfbe9e5f632055419 Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Sat, 6 Jan 2024 05:53:01 +0100 Subject: [PATCH] newer libtag versions are too buggy; reverting bumping epoch before re-updating check if vlc, amarok, sayonara ... are still working [release 1.9.20130815git-2mamba;Sun Dec 07 2014] --- ...1-upstream-fix-crash-with-flac-files.patch | 128 ------------------ libtag.spec | 15 +- 2 files changed, 7 insertions(+), 136 deletions(-) delete mode 100644 libtag-1.9.1-upstream-fix-crash-with-flac-files.patch diff --git a/libtag-1.9.1-upstream-fix-crash-with-flac-files.patch b/libtag-1.9.1-upstream-fix-crash-with-flac-files.patch deleted file mode 100644 index 3a89ec3..0000000 --- a/libtag-1.9.1-upstream-fix-crash-with-flac-files.patch +++ /dev/null @@ -1,128 +0,0 @@ -From 4a7d31c87bf41c1de21cb725176d5b34c2a95720 Mon Sep 17 00:00:00 2001 -From: Tsuda Kageyu -Date: Thu, 14 Nov 2013 14:05:32 +0900 -Subject: [PATCH] Rewrote ByteVector::replace() simpler - ---- - taglib/toolkit/tbytevector.cpp | 77 +++++++++++++++--------------------------- - tests/test_bytevector.cpp | 5 +++ - 2 files changed, 33 insertions(+), 49 deletions(-) - -diff --git a/taglib/toolkit/tbytevector.cpp b/taglib/toolkit/tbytevector.cpp -index b658246..566a20f 100644 ---- a/taglib/toolkit/tbytevector.cpp -+++ b/taglib/toolkit/tbytevector.cpp -@@ -31,6 +31,7 @@ - #include - #include - #include -+#include - - #include - #include -@@ -508,62 +509,40 @@ ByteVector &ByteVector::replace(const ByteVector &pattern, const ByteVector &wit - if(pattern.size() == 0 || pattern.size() > size()) - return *this; - -- const uint withSize = with.size(); -- const uint patternSize = pattern.size(); -- int offset = 0; -+ const size_t withSize = with.size(); -+ const size_t patternSize = pattern.size(); -+ const ptrdiff_t diff = withSize - patternSize; -+ -+ size_t offset = 0; -+ while (true) -+ { -+ offset = find(pattern, offset); -+ if(offset == static_cast(-1)) // Use npos in taglib2. -+ break; - -- if(withSize == patternSize) { -- // I think this case might be common enough to optimize it - detach(); -- offset = find(pattern); -- while(offset >= 0) { -- ::memcpy(data() + offset, with.data(), withSize); -- offset = find(pattern, offset + withSize); -- } -- return *this; -- } - -- // calculate new size: -- uint newSize = 0; -- for(;;) { -- int next = find(pattern, offset); -- if(next < 0) { -- if(offset == 0) -- // pattern not found, do nothing: -- return *this; -- newSize += size() - offset; -- break; -+ if(diff < 0) { -+ ::memmove( -+ data() + offset + withSize, -+ data() + offset + patternSize, -+ size() - offset - patternSize); -+ resize(size() + diff); - } -- newSize += (next - offset) + withSize; -- offset = next + patternSize; -- } -- -- // new private data of appropriate size: -- ByteVectorPrivate *newData = new ByteVectorPrivate(newSize, 0); -- char *target = DATA(newData); -- const char *source = data(); -- -- // copy modified data into new private data: -- offset = 0; -- for(;;) { -- int next = find(pattern, offset); -- if(next < 0) { -- ::memcpy(target, source + offset, size() - offset); -- break; -+ else if(diff > 0) { -+ resize(size() + diff); -+ ::memmove( -+ data() + offset + withSize, -+ data() + offset + patternSize, -+ size() - diff - offset - patternSize); - } -- int chunkSize = next - offset; -- ::memcpy(target, source + offset, chunkSize); -- target += chunkSize; -- ::memcpy(target, with.data(), withSize); -- target += withSize; -- offset += chunkSize + patternSize; -- } - -- // replace private data: -- if(d->deref()) -- delete d; -+ ::memcpy(data() + offset, with.data(), with.size()); - -- d = newData; -+ offset += withSize; -+ if(offset > size() - patternSize) -+ break; -+ } - - return *this; - } -diff --git a/tests/test_bytevector.cpp b/tests/test_bytevector.cpp -index 9efd23a..eca74f8 100644 ---- a/tests/test_bytevector.cpp -+++ b/tests/test_bytevector.cpp -@@ -239,6 +239,11 @@ class TestByteVector : public CppUnit::TestFixture - a.replace(ByteVector("ab"), ByteVector()); - CPPUNIT_ASSERT_EQUAL(ByteVector("cdf"), a); - } -+ { -+ ByteVector a("abcdabf"); -+ a.replace(ByteVector("bf"), ByteVector("x")); -+ CPPUNIT_ASSERT_EQUAL(ByteVector("abcdax"), a); -+ } - } - - }; diff --git a/libtag.spec b/libtag.spec index a29b2a1..a57ed8f 100644 --- a/libtag.spec +++ b/libtag.spec @@ -1,16 +1,15 @@ Name: libtag Epoch: 1 -Version: 1.9.1 -Release: 1mamba +Version: 1.9.20130815git +Release: 2mamba Summary: Audio Meta-Data Editing Library Group: System/Multimedia Vendor: openmamba Distribution: openmamba Packager: Davide Madrisan URL: http://taglib.github.com/ -#Source: https://github.com/taglib/taglib.git/master/taglib-%{version}.tar.bz2 -Source: http://taglib.github.com/releases/taglib-%{version}.tar.gz -Patch0: libtag-1.9.1-upstream-fix-crash-with-flac-files.patch +Source: https://github.com/taglib/taglib.git/master/taglib-%{version}.tar.bz2 +#Source: http://taglib.github.com/releases/taglib-%{version}.tar.gz License: GPL ## AUTOBUILDREQ-BEGIN BuildRequires: glibc-devel @@ -36,7 +35,6 @@ This package contains static libraries and header files need for development. %prep %setup -q -n taglib-%{version} -%patch0 -p1 %build %cmake . \ @@ -72,8 +70,9 @@ This package contains static libraries and header files need for development. %{_libdir}/pkgconfig/taglib_c.pc %changelog -* Fri Dec 05 2014 Silvan Calarco 1.9.1-1mamba -- update to 1.9.1 +* Sun Dec 07 2014 Silvan Calarco 1.9.20130815git-2mamba +- newer libtag versions are too buggy; reverting bumping epoch +- before re-updating check if vlc, amarok, sayonara ... are still working * Thu Aug 15 2013 Silvan Calarco 1.9.20130815git-1mamba - update to 1.9.20130815git