pool/taglib
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 202653 from home:sumski:hazard:to:your:stereo

Browse Source 
Update to 1.9.1, see changes file

OBS-URL: https://build.opensuse.org/request/show/202653
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/taglib?expand=0&rev=60
This commit is contained in:
Cristian Rodríguez 2013-10-13 18:41:16 +00:00 committed by Git OBS Bridge
parent da6c9807ec
commit 541dc040bb
7 changed files with 47 additions and 976 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

340
Added-check-if-file-is-open-before-attempting-to-rea.patch
View File

@ -1,340 +0,0 @@
From: gonemad <gonemad@gmail.com>
Date: Thu, 11 Oct 2012 21:20:03 -0400
Subject: Added check if file is open before attempting to read tags
Patch-mainline: yes
References: bnc#826228
Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
---
taglib/ape/apefile.cpp | 6 ++++--
taglib/asf/asffile.cpp | 6 ++++--
taglib/flac/flacfile.cpp | 9 ++++++---
taglib/it/itfile.cpp | 6 ++++--
taglib/mod/modfile.cpp | 6 ++++--
taglib/mp4/mp4file.cpp | 6 ++++--
taglib/mpc/mpcfile.cpp | 6 ++++--
taglib/ogg/flac/oggflacfile.cpp | 6 ++++--
taglib/ogg/speex/speexfile.cpp | 6 ++++--
taglib/ogg/vorbis/vorbisfile.cpp | 6 ++++--
taglib/s3m/s3mfile.cpp | 6 ++++--
taglib/wavpack/wavpackfile.cpp | 6 ++++--
taglib/xm/xmfile.cpp | 6 ++++--
13 files changed, 54 insertions(+), 27 deletions(-)
diff --git a/taglib/ape/apefile.cpp b/taglib/ape/apefile.cpp
index cb65224..bf6491f 100644
--- a/taglib/ape/apefile.cpp
+++ b/taglib/ape/apefile.cpp
@@ -90,14 +90,16 @@ APE::File::File(FileName file, bool readProperties,
Properties::ReadStyle propertiesStyle) : TagLib::File(file)
{
d = new FilePrivate;
- read(readProperties, propertiesStyle);
+ if(isOpen())
+ read(readProperties, propertiesStyle);
}
APE::File::File(IOStream *stream, bool readProperties,
Properties::ReadStyle propertiesStyle) : TagLib::File(stream)
{
d = new FilePrivate;
- read(readProperties, propertiesStyle);
+ if(isOpen())
+ read(readProperties, propertiesStyle);
}
APE::File::~File()
diff --git a/taglib/asf/asffile.cpp b/taglib/asf/asffile.cpp
index 455631f..6a3155a 100644
--- a/taglib/asf/asffile.cpp
+++ b/taglib/asf/asffile.cpp
@@ -372,14 +372,16 @@ ASF::File::File(FileName file, bool readProperties, Properties::ReadStyle proper
: TagLib::File(file)
{
d = new FilePrivate;
- read(readProperties, propertiesStyle);
+ if(isOpen())
+ read(readProperties, propertiesStyle);
}
ASF::File::File(IOStream *stream, bool readProperties, Properties::ReadStyle propertiesStyle)
: TagLib::File(stream)
{
d = new FilePrivate;
- read(readProperties, propertiesStyle);
+ if(isOpen())
+ read(readProperties, propertiesStyle);
}
ASF::File::~File()
diff --git a/taglib/flac/flacfile.cpp b/taglib/flac/flacfile.cpp
index c85d959..291c42d 100644
--- a/taglib/flac/flacfile.cpp
+++ b/taglib/flac/flacfile.cpp
@@ -109,7 +109,8 @@ FLAC::File::File(FileName file, bool readProperties,
TagLib::File(file)
{
d = new FilePrivate;
- read(readProperties, propertiesStyle);
+ if(isOpen())
+ read(readProperties, propertiesStyle);
}
FLAC::File::File(FileName file, ID3v2::FrameFactory *frameFactory,
@@ -118,7 +119,8 @@ FLAC::File::File(FileName file, ID3v2::FrameFactory *frameFactory,
{
d = new FilePrivate;
d->ID3v2FrameFactory = frameFactory;
- read(readProperties, propertiesStyle);
+ if(isOpen())
+ read(readProperties, propertiesStyle);
}
FLAC::File::File(IOStream *stream, ID3v2::FrameFactory *frameFactory,
@@ -127,7 +129,8 @@ FLAC::File::File(IOStream *stream, ID3v2::FrameFactory *frameFactory,
{
d = new FilePrivate;
d->ID3v2FrameFactory = frameFactory;
- read(readProperties, propertiesStyle);
+ if(isOpen())
+ read(readProperties, propertiesStyle);
}
FLAC::File::~File()
diff --git a/taglib/it/itfile.cpp b/taglib/it/itfile.cpp
index 4e04951..4807b9a 100644
--- a/taglib/it/itfile.cpp
+++ b/taglib/it/itfile.cpp
@@ -45,7 +45,8 @@ IT::File::File(FileName file, bool readProperties,
Mod::FileBase(file),
d(new FilePrivate(propertiesStyle))
{
- read(readProperties);
+ if(isOpen())
+ read(readProperties);
}
IT::File::File(IOStream *stream, bool readProperties,
@@ -53,7 +54,8 @@ IT::File::File(IOStream *stream, bool readProperties,
Mod::FileBase(stream),
d(new FilePrivate(propertiesStyle))
{
- read(readProperties);
+ if(isOpen())
+ read(readProperties);
}
IT::File::~File()
diff --git a/taglib/mod/modfile.cpp b/taglib/mod/modfile.cpp
index 25fc871..8700ca7 100644
--- a/taglib/mod/modfile.cpp
+++ b/taglib/mod/modfile.cpp
@@ -45,7 +45,8 @@ Mod::File::File(FileName file, bool readProperties,
Mod::FileBase(file),
d(new FilePrivate(propertiesStyle))
{
- read(readProperties);
+ if(isOpen())
+ read(readProperties);
}
Mod::File::File(IOStream *stream, bool readProperties,
@@ -53,7 +54,8 @@ Mod::File::File(IOStream *stream, bool readProperties,
Mod::FileBase(stream),
d(new FilePrivate(propertiesStyle))
{
- read(readProperties);
+ if(isOpen())
+ read(readProperties);
}
Mod::File::~File()
diff --git a/taglib/mp4/mp4file.cpp b/taglib/mp4/mp4file.cpp
index 0218557..6f7e48e 100644
--- a/taglib/mp4/mp4file.cpp
+++ b/taglib/mp4/mp4file.cpp
@@ -67,14 +67,16 @@ MP4::File::File(FileName file, bool readProperties, AudioProperties::ReadStyle a
: TagLib::File(file)
{
d = new FilePrivate;
- read(readProperties, audioPropertiesStyle);
+ if(isOpen())
+ read(readProperties, audioPropertiesStyle);
}
MP4::File::File(IOStream *stream, bool readProperties, AudioProperties::ReadStyle audioPropertiesStyle)
: TagLib::File(stream)
{
d = new FilePrivate;
- read(readProperties, audioPropertiesStyle);
+ if(isOpen())
+ read(readProperties, audioPropertiesStyle);
}
MP4::File::~File()
diff --git a/taglib/mpc/mpcfile.cpp b/taglib/mpc/mpcfile.cpp
index 519a046..7734eae 100644
--- a/taglib/mpc/mpcfile.cpp
+++ b/taglib/mpc/mpcfile.cpp
@@ -94,14 +94,16 @@ MPC::File::File(FileName file, bool readProperties,
Properties::ReadStyle propertiesStyle) : TagLib::File(file)
{
d = new FilePrivate;
- read(readProperties, propertiesStyle);
+ if(isOpen())
+ read(readProperties, propertiesStyle);
}
MPC::File::File(IOStream *stream, bool readProperties,
Properties::ReadStyle propertiesStyle) : TagLib::File(stream)
{
d = new FilePrivate;
- read(readProperties, propertiesStyle);
+ if(isOpen())
+ read(readProperties, propertiesStyle);
}
MPC::File::~File()
diff --git a/taglib/ogg/flac/oggflacfile.cpp b/taglib/ogg/flac/oggflacfile.cpp
index 9d9c303..e523f27 100644
--- a/taglib/ogg/flac/oggflacfile.cpp
+++ b/taglib/ogg/flac/oggflacfile.cpp
@@ -72,14 +72,16 @@ Ogg::FLAC::File::File(FileName file, bool readProperties,
Properties::ReadStyle propertiesStyle) : Ogg::File(file)
{
d = new FilePrivate;
- read(readProperties, propertiesStyle);
+ if(isOpen())
+ read(readProperties, propertiesStyle);
}
Ogg::FLAC::File::File(IOStream *stream, bool readProperties,
Properties::ReadStyle propertiesStyle) : Ogg::File(stream)
{
d = new FilePrivate;
- read(readProperties, propertiesStyle);
+ if(isOpen())
+ read(readProperties, propertiesStyle);
}
Ogg::FLAC::File::~File()
diff --git a/taglib/ogg/speex/speexfile.cpp b/taglib/ogg/speex/speexfile.cpp
index 3a4940a..58f6756 100644
--- a/taglib/ogg/speex/speexfile.cpp
+++ b/taglib/ogg/speex/speexfile.cpp
@@ -62,14 +62,16 @@ Speex::File::File(FileName file, bool readProperties,
Properties::ReadStyle propertiesStyle) : Ogg::File(file)
{
d = new FilePrivate;
- read(readProperties, propertiesStyle);
+ if(isOpen())
+ read(readProperties, propertiesStyle);
}
Speex::File::File(IOStream *stream, bool readProperties,
Properties::ReadStyle propertiesStyle) : Ogg::File(stream)
{
d = new FilePrivate;
- read(readProperties, propertiesStyle);
+ if(isOpen())
+ read(readProperties, propertiesStyle);
}
Speex::File::~File()
diff --git a/taglib/ogg/vorbis/vorbisfile.cpp b/taglib/ogg/vorbis/vorbisfile.cpp
index e2eed9e..a6753f5 100644
--- a/taglib/ogg/vorbis/vorbisfile.cpp
+++ b/taglib/ogg/vorbis/vorbisfile.cpp
@@ -67,14 +67,16 @@ Vorbis::File::File(FileName file, bool readProperties,
Properties::ReadStyle propertiesStyle) : Ogg::File(file)
{
d = new FilePrivate;
- read(readProperties, propertiesStyle);
+ if(isOpen())
+ read(readProperties, propertiesStyle);
}
Vorbis::File::File(IOStream *stream, bool readProperties,
Properties::ReadStyle propertiesStyle) : Ogg::File(stream)
{
d = new FilePrivate;
- read(readProperties, propertiesStyle);
+ if(isOpen())
+ read(readProperties, propertiesStyle);
}
Vorbis::File::~File()
diff --git a/taglib/s3m/s3mfile.cpp b/taglib/s3m/s3mfile.cpp
index 7ffdf91..1afe362 100644
--- a/taglib/s3m/s3mfile.cpp
+++ b/taglib/s3m/s3mfile.cpp
@@ -47,7 +47,8 @@ S3M::File::File(FileName file, bool readProperties,
Mod::FileBase(file),
d(new FilePrivate(propertiesStyle))
{
- read(readProperties);
+ if(isOpen())
+ read(readProperties);
}
S3M::File::File(IOStream *stream, bool readProperties,
@@ -55,7 +56,8 @@ S3M::File::File(IOStream *stream, bool readProperties,
Mod::FileBase(stream),
d(new FilePrivate(propertiesStyle))
{
- read(readProperties);
+ if(isOpen())
+ read(readProperties);
}
S3M::File::~File()
diff --git a/taglib/wavpack/wavpackfile.cpp b/taglib/wavpack/wavpackfile.cpp
index 49f7923..ea5a8f8 100644
--- a/taglib/wavpack/wavpackfile.cpp
+++ b/taglib/wavpack/wavpackfile.cpp
@@ -86,14 +86,16 @@ WavPack::File::File(FileName file, bool readProperties,
Properties::ReadStyle propertiesStyle) : TagLib::File(file)
{
d = new FilePrivate;
- read(readProperties, propertiesStyle);
+ if(isOpen())
+ read(readProperties, propertiesStyle);
}
WavPack::File::File(IOStream *stream, bool readProperties,
Properties::ReadStyle propertiesStyle) : TagLib::File(stream)
{
d = new FilePrivate;
- read(readProperties, propertiesStyle);
+ if(isOpen())
+ read(readProperties, propertiesStyle);
}
WavPack::File::~File()
diff --git a/taglib/xm/xmfile.cpp b/taglib/xm/xmfile.cpp
index c311a06..a0890c8 100644
--- a/taglib/xm/xmfile.cpp
+++ b/taglib/xm/xmfile.cpp
@@ -359,7 +359,8 @@ XM::File::File(FileName file, bool readProperties,
Mod::FileBase(file),
d(new FilePrivate(propertiesStyle))
{
- read(readProperties);
+ if(isOpen())
+ read(readProperties);
}
XM::File::File(IOStream *stream, bool readProperties,
@@ -367,7 +368,8 @@ XM::File::File(IOStream *stream, bool readProperties,
Mod::FileBase(stream),
d(new FilePrivate(propertiesStyle))
{
- read(readProperties);
+ if(isOpen())
+ read(readProperties);
}
XM::File::~File()
--
1.8.3.1

609
taglib-1.8-ds-rusxmms-r9.patch
View File

@ -1,609 +0,0 @@
diff -dPNur taglib-1.8/config-taglib.h.cmake taglib-1.8-ds/config-taglib.h.cmake
--- taglib-1.8/config-taglib.h.cmake 2012-09-06 20:03:15.000000000 +0200
+++ taglib-1.8-ds/config-taglib.h.cmake 2013-05-22 20:13:15.000000000 +0200
@@ -3,6 +3,8 @@
/* Define if you have libz */
#cmakedefine HAVE_ZLIB 1
+#cmakedefine HAVE_LIBRCC 1
+
#cmakedefine NO_ITUNES_HACKS 1
#cmakedefine WITH_ASF 1
#cmakedefine WITH_MP4 1
diff -dPNur taglib-1.8/ConfigureChecks.cmake taglib-1.8-ds/ConfigureChecks.cmake
--- taglib-1.8/ConfigureChecks.cmake 2012-09-06 20:03:15.000000000 +0200
+++ taglib-1.8-ds/ConfigureChecks.cmake 2013-05-22 20:13:15.000000000 +0200
@@ -14,6 +14,8 @@
set(HAVE_ZLIB 0)
endif()
+SET(HAVE_LIBRCC 1)
+
set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules)
find_package(CppUnit)
if(NOT CppUnit_FOUND AND BUILD_TESTS)
diff -dPNur taglib-1.8/examples/tagreader_c.c taglib-1.8-ds/examples/tagreader_c.c
--- taglib-1.8/examples/tagreader_c.c 2012-09-06 20:03:15.000000000 +0200
+++ taglib-1.8-ds/examples/tagreader_c.c 2013-05-22 20:13:15.000000000 +0200
@@ -38,7 +38,7 @@
TagLib_Tag *tag;
const TagLib_AudioProperties *properties;
- taglib_set_strings_unicode(FALSE);
+// taglib_set_strings_unicode(FALSE);
for(i = 1; i < argc; i++) {
printf("******************** \"%s\" ********************\n", argv[i]);
diff -dPNur taglib-1.8/examples/tagwriter.cpp taglib-1.8-ds/examples/tagwriter.cpp
--- taglib-1.8/examples/tagwriter.cpp 2012-09-06 20:03:15.000000000 +0200
+++ taglib-1.8-ds/examples/tagwriter.cpp 2013-05-22 20:13:15.000000000 +0200
@@ -92,7 +92,7 @@
if(isArgument(argv[i]) && i + 1 < argc && !isArgument(argv[i + 1])) {
char field = argv[i][1];
- TagLib::String value = argv[i + 1];
+ TagLib::String value(argv[i + 1], TagLib::String::Locale);
TagLib::List<TagLib::FileRef>::Iterator it;
for(it = fileList.begin(); it != fileList.end(); ++it) {
diff -dPNur taglib-1.8/taglib/CMakeLists.txt taglib-1.8-ds/taglib/CMakeLists.txt
--- taglib-1.8/taglib/CMakeLists.txt 2012-09-06 20:03:15.000000000 +0200
+++ taglib-1.8-ds/taglib/CMakeLists.txt 2013-05-22 20:13:15.000000000 +0200
@@ -35,6 +35,7 @@
audioproperties.h
taglib_export.h
${CMAKE_BINARY_DIR}/taglib_config.h
+ toolkit/rccpatch.h
toolkit/taglib.h
toolkit/tstring.h
toolkit/tlist.h
@@ -269,6 +270,7 @@
)
set(toolkit_SRCS
+ toolkit/rccpatch.cpp
toolkit/tstring.cpp
toolkit/tstringlist.cpp
toolkit/tbytevector.cpp
@@ -296,7 +298,7 @@
add_library(tag ${tag_LIB_SRCS} ${tag_HDRS})
if(ZLIB_FOUND)
- target_link_libraries(tag ${ZLIB_LIBRARIES})
+ target_link_libraries(tag rcc ${ZLIB_LIBRARIES})
endif()
set_target_properties(tag PROPERTIES
diff -dPNur taglib-1.8/taglib/mpeg/id3v1/id3v1tag.cpp taglib-1.8-ds/taglib/mpeg/id3v1/id3v1tag.cpp
--- taglib-1.8/taglib/mpeg/id3v1/id3v1tag.cpp 2012-09-06 20:03:15.000000000 +0200
+++ taglib-1.8-ds/taglib/mpeg/id3v1/id3v1tag.cpp 2013-05-22 20:13:15.000000000 +0200
@@ -64,17 +64,18 @@
String ID3v1::StringHandler::parse(const ByteVector &data) const
{
- return String(data, String::Latin1).stripWhiteSpace();
+ return String(data, String::Latin1ID3).stripWhiteSpace();
}
ByteVector ID3v1::StringHandler::render(const String &s) const
{
if(!s.isLatin1())
{
+ if (String::ID3WType(String::Latin1) == String::Latin1)
return ByteVector();
}
- return s.data(String::Latin1);
+ return s.data(String::Latin1ID3);
}
////////////////////////////////////////////////////////////////////////////////
@@ -247,7 +248,7 @@
d->track = uchar(data[offset + 29]);
}
else
- d->comment = data.mid(offset, 30);
+ d->comment = TagPrivate::stringHandler->parse(data.mid(offset, 30));
offset += 30;
diff -dPNur taglib-1.8/taglib/mpeg/id3v2/frames/commentsframe.cpp taglib-1.8-ds/taglib/mpeg/id3v2/frames/commentsframe.cpp
--- taglib-1.8/taglib/mpeg/id3v2/frames/commentsframe.cpp 2012-09-06 20:03:15.000000000 +0200
+++ taglib-1.8-ds/taglib/mpeg/id3v2/frames/commentsframe.cpp 2013-05-22 20:13:16.000000000 +0200
@@ -150,10 +150,10 @@
return;
}
- d->textEncoding = String::Type(data[0]);
+ d->textEncoding = String::ID3Type(data[0]);
d->language = data.mid(1, 3);
- int byteAlign = d->textEncoding == String::Latin1 || d->textEncoding == String::UTF8 ? 1 : 2;
+ int byteAlign = (d->textEncoding == String::Latin1 || d->textEncoding == String::Latin1ID3 || d->textEncoding == String::Latin1ID3V2 || d->textEncoding == String::UTF8) ? 1 : 2;
ByteVectorList l = ByteVectorList::split(data.mid(4), textDelimiter(d->textEncoding), byteAlign, 2);
@@ -174,10 +174,12 @@
String::Type encoding = d->textEncoding;
+ encoding = String::ID3WType(encoding);
+
encoding = checkTextEncoding(d->description, encoding);
encoding = checkTextEncoding(d->text, encoding);
-
- v.append(char(encoding));
+
+ v.append(char(String::ID3RealType(encoding)));
v.append(d->language.size() == 3 ? d->language : "XXX");
v.append(d->description.data(encoding));
v.append(textDelimiter(encoding));
diff -dPNur taglib-1.8/taglib/mpeg/id3v2/frames/textidentificationframe.cpp taglib-1.8-ds/taglib/mpeg/id3v2/frames/textidentificationframe.cpp
--- taglib-1.8/taglib/mpeg/id3v2/frames/textidentificationframe.cpp 2012-09-06 20:03:15.000000000 +0200
+++ taglib-1.8-ds/taglib/mpeg/id3v2/frames/textidentificationframe.cpp 2013-05-22 20:13:16.000000000 +0200
@@ -187,12 +187,12 @@
// read the string data type (the first byte of the field data)
- d->textEncoding = String::Type(data[0]);
+ d->textEncoding = String::ID3Type(data[0]);
// split the byte array into chunks based on the string type (two byte delimiter
// for unicode encodings)
- int byteAlign = d->textEncoding == String::Latin1 || d->textEncoding == String::UTF8 ? 1 : 2;
+ int byteAlign = (d->textEncoding == String::Latin1 || d->textEncoding == String::Latin1ID3 || d->textEncoding == String::Latin1ID3V2 || d->textEncoding == String::UTF8) ? 1 : 2;
// build a small counter to strip nulls off the end of the field
@@ -223,11 +223,14 @@
ByteVector TextIdentificationFrame::renderFields() const
{
- String::Type encoding = checkTextEncoding(d->fieldList, d->textEncoding);
+ String::Type encoding = d->textEncoding;
+
+ encoding = String::ID3WType(encoding);
+ encoding = checkTextEncoding(d->fieldList, encoding);
ByteVector v;
- v.append(char(encoding));
+ v.append(char(String::ID3RealType(encoding)));
for(StringList::ConstIterator it = d->fieldList.begin(); it != d->fieldList.end(); it++) {
diff -dPNur taglib-1.8/taglib/mpeg/id3v2/id3v2frame.cpp taglib-1.8-ds/taglib/mpeg/id3v2/id3v2frame.cpp
--- taglib-1.8/taglib/mpeg/id3v2/id3v2frame.cpp 2012-09-06 20:03:15.000000000 +0200
+++ taglib-1.8-ds/taglib/mpeg/id3v2/id3v2frame.cpp 2013-05-22 20:10:07.000000000 +0200
@@ -295,7 +295,7 @@
if((encoding == String::UTF8 || encoding == String::UTF16BE) && version != 4)
return String::UTF16;
- if(encoding != String::Latin1)
+ if((encoding != String::Latin1)&&(encoding != String::Latin1ID3V2))
return encoding;
for(StringList::ConstIterator it = fields.begin(); it != fields.end(); ++it) {
diff -dPNur taglib-1.8/taglib/toolkit/rccpatch.cpp taglib-1.8-ds/taglib/toolkit/rccpatch.cpp
--- taglib-1.8/taglib/toolkit/rccpatch.cpp 1970-01-01 01:00:00.000000000 +0100
+++ taglib-1.8-ds/taglib/toolkit/rccpatch.cpp 2013-05-22 20:13:16.000000000 +0200
@@ -0,0 +1,237 @@
+#include <stdlib.h>
+
+#include <string>
+#include "tstring.h"
+#include "tbytevector.h"
+
+//#define RCC_DEBUG
+
+
+#ifndef HAVE_LIBRCC
+# include <config.h>
+#endif
+
+#ifdef HAVE_LIBRCC
+# ifdef RCC_DEBUG
+# include <stdio.h>
+# endif /* RCC_DEBUG */
+# include <librcc.h>
+# include <string.h>
+#endif /* HAVE_LIBRCC */
+
+
+#ifdef HAVE_LIBRCC
+# define ID3_CLASS 0
+# define ID3V2_CLASS 1
+# define UTF_CLASS 2
+# define OUT_CLASS 3
+static rcc_class classes[] = {
+ { "id3", RCC_CLASS_STANDARD, NULL, NULL, "ID3 Encoding", 0 },
+ { "id3v2", RCC_CLASS_STANDARD, "id3", NULL, "ID3 v.2 Encoding", 0 },
+ { "utf", RCC_CLASS_KNOWN, "UTF-8", NULL, "Unicode Encoding", 0},
+ { "out", RCC_CLASS_TRANSLATE_LOCALE, "LC_CTYPE", NULL, "Output Encoding", 0 },
+ { NULL, RCC_CLASS_STANDARD, NULL, NULL, NULL, 0 }
+};
+
+static int rcc_initialized = 0;
+
+static rcc_context ctx = NULL;
+#endif /* HAVE_LIBRCC */
+
+
+void rccTaglibPatchFree() {
+#ifdef HAVE_LIBRCC
+ if (rcc_initialized) {
+ rccFree();
+ rcc_initialized = 0;
+ }
+#endif /* HAVE_LIBRCC */
+}
+
+void rccTaglibPatchInit() {
+#ifdef HAVE_LIBRCC
+ if (rcc_initialized) return;
+ rccInit();
+ rccInitDefaultContext(NULL, 0, 0, classes, 0);
+ rccLoad(NULL, "xmms");
+ rccInitDb4(NULL, NULL, 0);
+ rcc_initialized = 1;
+#endif /* HAVE_LIBRCC */
+}
+
+void rccTaglibPatchSetContext(void *newctx) {
+#ifdef HAVE_LIBRCC
+ if (newctx) {
+ ctx = (rcc_context)newctx;
+ rcc_initialized = 1;
+ }
+#endif /* HAVE_LIBRCC */
+}
+
+static void rccTaglibPatchTryInit() {
+#ifdef HAVE_LIBRCC
+ if (!rcc_initialized) {
+ rccTaglibPatchInit();
+ if (rcc_initialized) atexit(rccTaglibPatchFree);
+ }
+#endif /* HAVE_LIBRCC */
+}
+
+
+TagLib::ByteVector rccTaglibPatchRecodeOutput(const std::string &s) {
+ TagLib::ByteVector v;
+#ifdef HAVE_LIBRCC
+ size_t rlen;
+ char *res;
+
+ rccTaglibPatchTryInit();
+
+ res = rccSizedRecode(ctx, UTF_CLASS, OUT_CLASS, s.c_str(), s.length(), &rlen);
+#ifdef RCC_DEBUG
+ for (const unsigned char *c = (const unsigned char*)s.c_str(); *c; c++) {
+ if (*c > 127) {
+ printf(" Output: %s - %s\n", s.c_str(), res?res:"null");
+ break;
+ }
+ }
+#endif /* RCC_DEBUG */
+
+ if (res) v.setData(res, rlen);
+ else v.setData("", 0);
+ //v.setData(s.c_str(), s.length());
+
+ return v;
+#else
+ v.setData("", 0);
+
+ return v;
+#endif /* HAVE_LIBRCC */
+}
+
+TagLib::ByteVector rccTaglibPatchRecodeOutputID3(const std::string &s, bool v2 = false) {
+ TagLib::ByteVector v;
+#ifdef HAVE_LIBRCC
+ size_t rlen;
+ char *res;
+
+ rccTaglibPatchTryInit();
+
+ res = rccSizedRecode(ctx, UTF_CLASS, v2?ID3V2_CLASS:ID3_CLASS, s.c_str(), s.length(), &rlen);
+#ifdef RCC_DEBUG
+ for (const unsigned char *c = (const unsigned char*)s.c_str(); *c; c++) {
+ if (*c > 127) {
+ printf(" OutputID3(%i): %s - %s\n", v2, s.c_str(), res?res:"null");
+ break;
+ }
+ }
+#endif /* RCC_DEBUG */
+
+ if (res) v.setData(res, rlen);
+ else v.setData("", 0);
+ //v.setData(s.c_str(), s.length());
+
+ return v;
+#else
+ v.setData("", 0);
+
+ return v;
+#endif /* HAVE_LIBRCC */
+}
+
+TagLib::ByteVector rccTaglibPatchRecodeInput(const std::string &s) {
+ TagLib::ByteVector v;
+#ifdef HAVE_LIBRCC
+ size_t rlen;
+ char *res;
+
+ rccTaglibPatchTryInit();
+
+ res = rccSizedRecode(ctx, OUT_CLASS, UTF_CLASS, s.c_str(), s.length(), &rlen);
+#ifdef RCC_DEBUG
+ for (const unsigned char *c = (const unsigned char*)s.c_str(); *c; c++) {
+ if (*c > 127) {
+ printf(" Input: %s - %s\n", s.c_str(), res?res:"null");
+ break;
+ }
+ }
+#endif /* RCC_DEBUG */
+
+ if (res) v.setData(res, rlen);
+ else
+#endif /* HAVE_LIBRCC */
+ v.setData("", 0);
+
+ return v;
+}
+
+TagLib::ByteVector rccTaglibPatchRecodeInputID3(const std::string &s, bool v2 = false) {
+ TagLib::ByteVector v;
+#ifdef HAVE_LIBRCC
+ size_t rlen;
+ char *res;
+
+ rccTaglibPatchTryInit();
+
+ res = rccSizedRecode(ctx, v2?ID3V2_CLASS:ID3_CLASS, UTF_CLASS, s.c_str(), s.length(), &rlen);
+#ifdef RCC_DEBUG
+ for (const unsigned char *c = (const unsigned char*)s.c_str(); *c; c++) {
+ if (*c > 127) {
+ printf(" InputID3(%i): %s - %s\n", v2, s.c_str(), res?res:"null");
+ break;
+ }
+ }
+#endif /* RCC_DEBUG */
+ if (res) v.setData(res, rlen);
+ else
+#endif /* HAVE_LIBRCC */
+ v.setData("", 0);
+
+ return v;
+}
+
+TagLib::String::Type rccTaglibPatchGetLocaleType() {
+#ifdef HAVE_LIBRCC
+ size_t len;
+ char charset[32];
+
+ rccTaglibPatchTryInit();
+ if (!rccLocaleGetCharset(charset, NULL, 31)) {
+ if (!strncmp(charset, "UTF", 3)) {
+ len = strlen(charset);
+
+ if (charset[len-1]=='8') return TagLib::String::UTF8;
+ if (!strcmp(charset+(len-2),"16")) return TagLib::String::UTF16;
+ if (!strcmp(charset+(len-4),"16LE")) return TagLib::String::UTF16LE;
+ if (!strcmp(charset+(len-4),"16BE")) return TagLib::String::UTF16BE;
+ }
+ return TagLib::String::Latin1;
+ }
+#endif /* HAVE_LIBRCC */
+ return TagLib::String::UTF8;
+}
+
+TagLib::String::Type rccTaglibPatchGetID3Type() {
+#ifdef HAVE_LIBRCC
+ size_t len;
+ const char *charset;
+
+ rccTaglibPatchTryInit();
+
+ charset = rccGetCurrentCharsetName(ctx, ID3V2_CLASS);
+ if (charset) {
+ if (!strncmp(charset, "UTF", 3)) {
+ len = strlen(charset);
+
+ if (charset[len-1]=='8') return TagLib::String::UTF8;
+ if (!strcmp(charset+(len-2),"16")) return TagLib::String::UTF16;
+ if (!strcmp(charset+(len-4),"16LE")) return TagLib::String::UTF16LE;
+ if (!strcmp(charset+(len-4),"16BE")) return TagLib::String::UTF16BE;
+ }
+ return TagLib::String::Latin1ID3V2;
+ } else {
+ // Error or no-language configured: If Latin1ID3V2 is returned we normally will use the default unicode encoding unless Latin1 is selected by taglib
+ return TagLib::String::Latin1ID3V2;
+ }
+#endif /* HAVE_LIBRCC */
+ return TagLib::String::Latin1;
+}
diff -dPNur taglib-1.8/taglib/toolkit/rccpatch.h taglib-1.8-ds/taglib/toolkit/rccpatch.h
--- taglib-1.8/taglib/toolkit/rccpatch.h 1970-01-01 01:00:00.000000000 +0100
+++ taglib-1.8-ds/taglib/toolkit/rccpatch.h 2013-05-22 20:13:16.000000000 +0200
@@ -0,0 +1,20 @@
+#ifndef _RCC_PATCH_H
+#define _RCC_PATCH_H
+
+#include <string.h>
+#include "tstring.h"
+#include "tbytevector.h"
+
+void rccTaglibPatchFree();
+void rccTaglibPatchInit();
+void rccTaglibPatchSetContext(void *newctx);
+
+TagLib::ByteVector rccTaglibPatchRecodeOutput(const std::string &s);
+TagLib::ByteVector rccTaglibPatchRecodeInput(const std::string &s);
+TagLib::ByteVector rccTaglibPatchRecodeOutputID3(const std::string &s, bool v2 = false);
+TagLib::ByteVector rccTaglibPatchRecodeInputID3(const std::string &s, bool v2 = false);
+
+TagLib::String::Type rccTaglibPatchGetLocaleType();
+TagLib::String::Type rccTaglibPatchGetID3Type();
+
+#endif /* _RCC_PATCH_H */
diff -dPNur taglib-1.8/taglib/toolkit/tstring.cpp taglib-1.8-ds/taglib/toolkit/tstring.cpp
--- taglib-1.8/taglib/toolkit/tstring.cpp 2012-09-06 20:03:15.000000000 +0200
+++ taglib-1.8-ds/taglib/toolkit/tstring.cpp 2013-05-22 20:13:16.000000000 +0200
@@ -23,6 +23,7 @@
* http://www.mozilla.org/MPL/ *
***************************************************************************/
+#include "rccpatch.h"
#include "tstring.h"
#include "unicode.h"
#include "tdebug.h"
@@ -168,7 +169,7 @@
if(v.isEmpty())
return;
- if(t == Latin1 || t == UTF8) {
+ if(t == Latin1 || t == Latin1ID3 || t == Latin1ID3V2 || t == UTF8) {
int length = 0;
d->data.resize(v.size());
@@ -397,10 +398,38 @@
{
ByteVector v;
- switch(t) {
+ if (t == Locale) {
+ // The source is either Unicode or real Latin1 (if rcc is bypassed)
+ std::string s = to8Bit(true);
+
+ // In case of UTF8 locale, this probably will return NULL (no recoding needed), but we will take UTF8 path in the next swtich
+ v = rccTaglibPatchRecodeOutput(s);
+ if (v.size()) return v;
+ t = rccTaglibPatchGetLocaleType();
+ }
+
+ switch(t) {
+ case Latin1ID3:
+ case Latin1ID3V2:
+ {
+ std::string s = to8Bit(true);
+ if (t == Latin1ID3) v = rccTaglibPatchRecodeOutputID3(s, false);
+ else if (t == Latin1ID3V2) v = rccTaglibPatchRecodeOutputID3(s, true);
+ if (v.size()) break;
+
+ // we don't know if we got NULL because rcc is disabled (error) or UTF8 output is required
+ if ((t == Latin1ID3V2)&&(rccTaglibPatchGetID3Type() == UTF8)) {
+ v.setData(s.c_str(), s.length());
+ } else {
+ for(wstring::const_iterator it = d->data.begin(); it != d->data.end(); it++)
+ v.append(char(*it));
+ }
+ break;
+ }
case Latin1:
{
+ // We can have the UTF16 inside, but first 256 positions is equal to Latin1
for(wstring::const_iterator it = d->data.begin(); it != d->data.end(); it++)
v.append(char(*it));
break;
@@ -750,6 +779,34 @@
void String::prepare(Type t)
{
+ if (t == Locale) t = rccTaglibPatchGetLocaleType();
+
+ if ((t == Latin1)||(t == Latin1ID3)||(t == Latin1ID3V2)) {
+ std::string s = to8Bit(false);
+ ByteVector v;
+
+ if (t == Latin1ID3) v = rccTaglibPatchRecodeInputID3(s, false);
+ else if (t == Latin1ID3V2) v = rccTaglibPatchRecodeInputID3(s, true);
+ else /* Latin1 converted from Locale */ v = rccTaglibPatchRecodeInput(s);
+
+ if (v.size()) {
+ int length = 0;
+ d->data.resize(v.size());
+ wstring::iterator targetIt = d->data.begin();
+ for(ByteVector::ConstIterator it = v.begin(); it != v.end() && (*it); ++it) {
+ *targetIt = uchar(*it);
+ ++targetIt;
+ ++length;
+ }
+ d->data.resize(length);
+ t = UTF8;
+ } else {
+ // We don't know if we got UTF-8 encoded string or either rcc is disable or something is failed,
+ // since standard applications are really expecting here Latin1, it is safe to just check if we have violations of UTF8
+ //if (Unicode::isLegalUTF8(s)) t = UTF8;
+ }
+ }
+
switch(t) {
case UTF16:
{
@@ -839,6 +896,27 @@
std::ostream &operator<<(std::ostream &s, const String &str)
{
- s << str.to8Bit();
+ ByteVector bv = str.data(String::Locale);
+ s << bv;
return s;
}
+
+String::Type String::ID3Type(int i) {
+ if (i == Latin1) return Latin1ID3V2;
+ return Type(i);
+};
+
+String::Type String::ID3WType(Type type) {
+ Type rcc_type = rccTaglibPatchGetID3Type();
+ if ((rcc_type == Latin1ID3)||(rcc_type == Latin1ID3V2)||(rcc_type == Latin1)) {
+ if (type == Latin1) return rcc_type;
+ return type;
+ }
+
+ return rcc_type;
+};
+
+String::Type String::ID3RealType(Type type) {
+ if ((type == Latin1ID3)||(type == Latin1ID3V2)) return Latin1;
+ return type;
+}
diff -dPNur taglib-1.8/taglib/toolkit/tstring.h taglib-1.8-ds/taglib/toolkit/tstring.h
--- taglib-1.8/taglib/toolkit/tstring.h 2012-09-06 20:03:15.000000000 +0200
+++ taglib-1.8-ds/taglib/toolkit/tstring.h 2013-05-22 20:13:16.000000000 +0200
@@ -90,6 +90,18 @@
*/
enum Type {
/*!
+ * Determine using current locale settings
+ */
+ Locale = -1,
+ /*!
+ * Latin1 for ID3 tags.
+ */
+ Latin1ID3 = 65,
+ /*!
+ * Latin1 for ID3 tags.
+ */
+ Latin1ID3V2 = 66,
+ /*!
* IS08859-1, or <i>Latin1</i> encoding. 8 bit characters.
*/
Latin1 = 0,
@@ -112,6 +124,10 @@
UTF16LE = 4
};
+ static Type ID3Type(int i);
+ static Type ID3WType(Type type);
+ static Type ID3RealType(Type type);
+
/*!
* Constructs an empty String.
*/

12
taglib-1.8-version_fix.patch
View File

@ -1,12 +0,0 @@
diff -ur taglib-1.8/taglib/toolkit/taglib.h taglib-1.8.nu/taglib/toolkit/taglib.h
--- taglib-1.8/taglib/toolkit/taglib.h 2012-09-06 15:03:15.000000000 -0300
+++ taglib-1.8.nu/taglib/toolkit/taglib.h 2012-11-08 01:47:51.088000009 -0300
@@ -27,7 +27,7 @@
#define TAGLIB_H
#define TAGLIB_MAJOR_VERSION 1
-#define TAGLIB_MINOR_VERSION 7
+#define TAGLIB_MINOR_VERSION 8
#define TAGLIB_PATCH_VERSION 0
#if defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 1))

3
taglib-1.8.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:66d33481703c90236a0a9d1c38fd81b584ca7109ded049225f5463dcaffc209a
size 595937

3
taglib-1.9.1.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:72d371cd1419a87ae200447a53bff2be219283071e80fd12337928cc967dc71a
size 654074

45
taglib.changes
View File

@ -1,3 +1,44 @@
-------------------------------------------------------------------
Wed Oct 9 00:04:23 UTC 2013 - hrvoje.senjan@gmail.com
- Update to 1.9.1
* Fixed binary incompatible change in TagLib::Map and TagLib::List.
* Fixed constructing String from ByteVector.
* Fixed compilation on MSVC with the /Zc:wchar_t- option.
* Fixed detecting of RIFF files with invalid chunk sizes.
* Added TagLib::MP4::PropertyMap::codec().
-------------------------------------------------------------------
Sun Oct 6 23:51:11 UTC 2013 - hrvoje.senjan@gmail.com
- Update to 1.9
* Added support for the Ogg Opus file format.
* Added support for INFO tags in WAV files.
* Changed FileStream to use Windows file API.
* Included taglib-config.cmd script for Windows.
* New ID3v1::Tag methods for working directly with
genre numbers.
* New MPEG::File methods for checking which tags are saved in
the file.
* Added support for the PropertyMap API to ASF and MP4 files.
* Added MusicBrainz identifiers to the PropertyMap API.
* Allowed reading of MP4 cover art without an explicitly
specified format.
* Better parsing of corrupted FLAC files.
* Fixed saving of PropertyMap comments without description
into ID3v2 tags.
* Fixed crash when parsing certain XM files.
* Fixed compilation of unit test with clang.
* Better handling of files that can't be open or have
read-only permissions.
* Improved atomic reference counting.
* New hookable API for debug messages.
* More complete Windows install instructions.
* Many smaller bug fixes and performance improvements.
- Dropped taglib-1.8-ds-rusxmms-r9.patch, not required anymore
- Dropped Added-check-if-file-is-open-before-attempting-to-rea.patch
and taglib-1.8-version_fix.patch, merged upstream
-------------------------------------------------------------------
Fri Jun 21 17:45:11 UTC 2013 - jslaby@suse.com
@ -8,8 +49,8 @@ Fri Jun 21 17:45:11 UTC 2013 - jslaby@suse.com
-------------------------------------------------------------------
Sun Jun 9 04:30:50 UTC 2013 - crrodriguez@opensuse.org
- JUst like the rest of the system, taglib has to be built
with LFS support/ 64bit off_t in 32 bit archs.
- JUst like the rest of the system, taglib has to be built
with LFS support/ 64bit off_t in 32 bit archs.
-------------------------------------------------------------------
Thu May 23 11:54:34 UTC 2013 - davejplater@gmail.com

11
taglib.spec
View File

@ -17,7 +17,7 @@
Name: taglib
Version: 1.8
Version: 1.9.1
Release: 0
Summary: Audio Meta-Data Library
License: LGPL-2.1+ and MPL-1.1
@ -26,15 +26,9 @@ Url: http://taglib.github.io/
Source0: http://taglib.github.io/releases/taglib-%{version}.tar.gz
Source1: %{name}.desktop
Source100: baselibs.conf
# This patch is to fix bnc#814814.
Patch0: taglib-1.8-ds-rusxmms-r9.patch
Patch1: taglib-1.7.2-doxygen.patch
# PATCH-FIX-UPSTREAM taglib-1.8-version_fix.patch - fix version defines in taglib.h
Patch2: taglib-1.8-version_fix.patch
# Get example executables to build without rpath
Patch3: taglib-1.8-strip-rpath.patch
# PATCH-FIX-UPSTREAM Added-check-if-file-is-open-before-attempting-to-rea.patch
Patch4: Added-check-if-file-is-open-before-attempting-to-rea.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: cmake
BuildRequires: doxygen
@ -106,11 +100,8 @@ This package contains development files for taglib.
%prep
%setup -q
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3
%patch4 -p1
%build
mkdir build