rpms/taglib/F-12 taglib-1.6.1-20091103.patch, NONE, 1.1 taglib.spec, 1.48, 1.49
Michael Schwendt
mschwendt at fedoraproject.org
Fri Nov 6 12:21:47 UTC 2009
Author: mschwendt
Update of /cvs/pkgs/rpms/taglib/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18193/F-12
Modified Files:
taglib.spec
Added Files:
taglib-1.6.1-20091103.patch
Log Message:
* Fri Nov 6 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.6.1-2
- Update with two post-1.6.1 changes from 20091103.
taglib-1.6.1-20091103.patch:
fileref.cpp | 1 +
flac/flacfile.cpp | 9 +++++++--
2 files changed, 8 insertions(+), 2 deletions(-)
--- NEW FILE taglib-1.6.1-20091103.patch ---
diff -Nur taglib-1.6.1-orig/taglib/fileref.cpp taglib-1.6.1/taglib/fileref.cpp
--- taglib-1.6.1-orig/taglib/fileref.cpp 2009-10-24 14:45:58.000000000 +0200
+++ taglib-1.6.1/taglib/fileref.cpp 2009-11-06 13:16:51.055129147 +0100
@@ -227,6 +227,7 @@
File *file = new Ogg::FLAC::File(fileName, readAudioProperties, audioPropertiesStyle);
if (file->isValid())
return file;
+ delete file;
return new Ogg::Vorbis::File(fileName, readAudioProperties, audioPropertiesStyle);
}
if(ext == "FLAC")
diff -Nur taglib-1.6.1-orig/taglib/flac/flacfile.cpp taglib-1.6.1/taglib/flac/flacfile.cpp
--- taglib-1.6.1-orig/taglib/flac/flacfile.cpp 2009-07-12 23:53:18.000000000 +0200
+++ taglib-1.6.1/taglib/flac/flacfile.cpp 2009-11-06 13:16:42.613128986 +0100
@@ -416,8 +416,13 @@
// Found the vorbis-comment
if(blockType == VorbisComment) {
- d->xiphCommentData = readBlock(length);
- d->hasXiphComment = true;
+ if(!d->hasXiphComment) {
+ d->xiphCommentData = readBlock(length);
+ d->hasXiphComment = true;
+ }
+ else {
+ debug("FLAC::File::scan() -- multiple Vorbis Comment blocks found, using the first one");
+ }
}
nextBlockOffset += length + 4;
Index: taglib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/taglib/F-12/taglib.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- taglib.spec 31 Oct 2009 11:53:09 -0000 1.48
+++ taglib.spec 6 Nov 2009 12:21:47 -0000 1.49
@@ -12,7 +12,7 @@
Name: taglib
Version: 1.6.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Audio Meta-Data Library
Group: System Environment/Libraries
@@ -30,6 +30,8 @@ Patch1: taglib-1.5b1-multilib.patch
# try 2, kiss omit -L%_libdir
Patch2: taglib-1.5rc1-multilib.patch
+Patch3: taglib-1.6.1-20091103.patch
+
BuildRequires: cmake
BuildRequires: pkgconfig
BuildRequires: zlib-devel
@@ -82,6 +84,8 @@ Files needed when building software with
## omit for now
%patch2 -p1 -b .multilib
+%patch3 -p1 -b .20091103
+
%build
mkdir -p %{_target_platform}
@@ -153,6 +157,9 @@ rm -rf %{buildroot}
%changelog
+* Fri Nov 6 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.6.1-2
+- Update with two post-1.6.1 changes from 20091103.
+
* Sat Oct 31 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.6.1-1
- Update to 1.6.1 (bug-fixes, of which one is considered a fix for
a serious bug: saving of Ogg FLAC comments).
More information about the scm-commits
mailing list