- Update with two post-1.6.1 changes from 20091103.

This commit is contained in:
Michael Schwendt 2009-11-06 12:21:47 +00:00
parent 2ef23238ea
commit c286f517af
2 changed files with 38 additions and 1 deletions

View File

@ -0,0 +1,30 @@
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;

View File

@ -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 %{name}.
## 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@fedoraproject.org> - 1.6.1-2
- Update with two post-1.6.1 changes from 20091103.
* Sat Oct 31 2009 Michael Schwendt <mschwendt@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).