Hello community,
here is the log from the commit of package taglib for openSUSE:Factory checked in at 2012-03-09 21:28:45
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/taglib (Old)
and /work/SRC/openSUSE:Factory/.taglib.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "taglib", Maintainer is "CrRodriguez@novell.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/taglib/taglib.changes 2011-09-23 12:47:24.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.taglib.new/taglib.changes 2012-03-09 21:28:46.000000000 +0100
@@ -1,0 +2,5 @@
+Thu Mar 8 01:01:13 YEKT 2012 - avm-xandry@yandex.ru
+
+- Add rusxmms patch to be fixed https://features.opensuse.org/313273
+
+-------------------------------------------------------------------
New:
----
taglib-1.6-ds-rusxmms.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ taglib.spec ++++++
--- /var/tmp/diff_new_pack.qCUGpY/_old 2012-03-09 21:28:47.000000000 +0100
+++ /var/tmp/diff_new_pack.qCUGpY/_new 2012-03-09 21:28:47.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package taglib
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -15,20 +15,19 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-# norootforbuild
-
Name: taglib
Version: 1.7
-Release: 6
-License: LGPL-2.1+ ; MPL-1.1
+Release: 0
Summary: Audio Meta-Data Library
-Url: http://ktown.kde.org/~wheeler/taglib/
+License: LGPL-2.1+ ; MPL-1.1
Group: System/Libraries
+Url: http://ktown.kde.org/~wheeler/taglib/
# http://ktown.kde.org/~wheeler/files/src/taglib-1.7.tar.gz
Source0: %{name}-%{version}.tar.bz2
Source1: %{name}.desktop
Source100: baselibs.conf
+Patch1: taglib-1.6-ds-rusxmms.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: cmake
BuildRequires: doxygen
@@ -40,6 +39,7 @@
%if 0%{?suse_version}
BuildRequires: update-desktop-files
%endif
+BuildRequires: librcc-devel
BuildRequires: zlib-devel
Requires: libtag1 = %{version}
Requires: libtag_c0 = %{version}
@@ -51,8 +51,8 @@
TrueAudio, WAV, AIFF, MP4 and ASF files.
%package -n libtag1
-License: LGPL-2.1+
Summary: Audio Meta-Data Library
+License: LGPL-2.1+
Group: System/Libraries
# Without this the old taglib package containing the libraries isn't removed when this package is installed.
# The only alternative is for the libraries to Require: taglib version-release, badness 440
@@ -65,8 +65,8 @@
TrueAudio, WAV, AIFF, MP4 and ASF files.
%package -n libtag_c0
-License: LGPL-2.1+
Summary: Audio Meta-Data Library
+License: LGPL-2.1+
Group: System/Libraries
# Without this the old taglib package containing the libraries isn't removed when this package is installed.
# The only alternative is for the libraries to Require: taglib version-release, badness 440
@@ -79,12 +79,12 @@
TrueAudio, WAV, AIFF, MP4 and ASF files.
%package -n libtag-devel
-License: LGPL-2.1+
Summary: Development files for taglib
+License: LGPL-2.1+
Group: Development/Libraries/C and C++
Requires: libstdc++-devel
-Requires: libtag_c0 = %{version}-%{release}
Requires: libtag1 = %{version}-%{release}
+Requires: libtag_c0 = %{version}-%{release}
# taglib-devel was last used in openSUSE 11.4 (taglib-devel-1.6.2)
# The last taglib-devel used was version 1.6.3 from multimedia:libs.
Provides: taglib-devel = %{version}
@@ -95,6 +95,7 @@
%prep
%setup -q
+%patch1 -p1
%build
mkdir build
++++++ taglib-1.6-ds-rusxmms.patch ++++++
diff -dPNur taglib-1.6/config-taglib.h.cmake taglib-1.6-ds/config-taglib.h.cmake
--- taglib-1.6/config-taglib.h.cmake 2008-11-12 09:17:11.000000000 +0100
+++ taglib-1.6-ds/config-taglib.h.cmake 2009-10-02 17:53:08.000000000 +0200
@@ -6,6 +6,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.6/ConfigureChecks.cmake taglib-1.6-ds/ConfigureChecks.cmake
--- taglib-1.6/ConfigureChecks.cmake 2008-12-21 22:46:41.000000000 +0100
+++ taglib-1.6-ds/ConfigureChecks.cmake 2009-10-02 17:53:08.000000000 +0200
@@ -14,6 +14,8 @@
#check for libz using the cmake supplied FindZLIB.cmake
FIND_PACKAGE(ZLIB)
+SET(HAVE_LIBRCC 1)
+
IF(ZLIB_FOUND)
SET(HAVE_ZLIB 1)
ELSE(ZLIB_FOUND)
diff -dPNur taglib-1.6/taglib/CMakeLists.txt taglib-1.6-ds/taglib/CMakeLists.txt
--- taglib-1.6/taglib/CMakeLists.txt 2009-09-13 12:19:34.000000000 +0200
+++ taglib-1.6-ds/taglib/CMakeLists.txt 2009-10-02 17:53:08.000000000 +0200
@@ -163,6 +163,7 @@
)
SET(toolkit_SRCS
+toolkit/rccpatch.cpp
toolkit/tstring.cpp
toolkit/tstringlist.cpp
toolkit/tbytevector.cpp
@@ -190,7 +191,7 @@
add_library(tag SHARED ${tag_LIB_SRCS})
endif(ENABLE_STATIC)
-TARGET_LINK_LIBRARIES(tag )
+TARGET_LINK_LIBRARIES(tag rcc)
if(ZLIB_FOUND)
TARGET_LINK_LIBRARIES(tag ${ZLIB_LIBRARIES})
endif(ZLIB_FOUND)
diff -dPNur taglib-1.6/taglib/mpeg/id3v1/id3v1tag.cpp taglib-1.6-ds/taglib/mpeg/id3v1/id3v1tag.cpp
--- taglib-1.6/taglib/mpeg/id3v1/id3v1tag.cpp 2008-02-04 16:11:56.000000000 +0100
+++ taglib-1.6-ds/taglib/mpeg/id3v1/id3v1tag.cpp 2009-10-02 17:53:08.000000000 +0200
@@ -59,17 +59,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);
}
////////////////////////////////////////////////////////////////////////////////
@@ -240,7 +241,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.6/taglib/mpeg/id3v2/frames/commentsframe.cpp taglib-1.6-ds/taglib/mpeg/id3v2/frames/commentsframe.cpp
--- taglib-1.6/taglib/mpeg/id3v2/frames/commentsframe.cpp 2008-02-04 16:11:56.000000000 +0100
+++ taglib-1.6-ds/taglib/mpeg/id3v2/frames/commentsframe.cpp 2009-10-02 17:53:08.000000000 +0200
@@ -136,10 +136,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 || String::Latin1ID3 || String::Latin1ID3V2 || d->textEncoding == String::UTF8) ? 1 : 2;
ByteVectorList l = ByteVectorList::split(data.mid(4), textDelimiter(d->textEncoding), byteAlign, 2);
@@ -155,10 +155,12 @@
String::Type encoding = d->textEncoding;
+ encoding = String::ID3WType(encoding);
+
encoding = checkEncoding(d->description, encoding);
encoding = checkEncoding(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.6/taglib/mpeg/id3v2/frames/textidentificationframe.cpp taglib-1.6-ds/taglib/mpeg/id3v2/frames/textidentificationframe.cpp
--- taglib-1.6/taglib/mpeg/id3v2/frames/textidentificationframe.cpp 2008-02-04 16:11:56.000000000 +0100
+++ taglib-1.6-ds/taglib/mpeg/id3v2/frames/textidentificationframe.cpp 2009-10-02 17:53:08.000000000 +0200
@@ -105,12 +105,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
@@ -139,11 +139,14 @@
ByteVector TextIdentificationFrame::renderFields() const
{
- String::Type encoding = checkEncoding(d->fieldList, d->textEncoding);
+ String::Type encoding = d->textEncoding;
+
+ encoding = String::ID3WType(encoding);
+ encoding = checkEncoding(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.6/taglib/toolkit/CMakeLists.txt taglib-1.6-ds/taglib/toolkit/CMakeLists.txt
--- taglib-1.6/taglib/toolkit/CMakeLists.txt 2006-09-20 14:52:28.000000000 +0200
+++ taglib-1.6-ds/taglib/toolkit/CMakeLists.txt 2009-10-02 17:53:08.000000000 +0200
@@ -1 +1 @@
-INSTALL( FILES taglib.h tstring.h tlist.h tlist.tcc tstringlist.h tbytevector.h tbytevectorlist.h tfile.h tmap.h tmap.tcc DESTINATION ${INCLUDE_INSTALL_DIR}/taglib)
+INSTALL( FILES rccpatch.h taglib.h tstring.h tlist.h tlist.tcc tstringlist.h tbytevector.h tbytevectorlist.h tfile.h tmap.h tmap.tcc DESTINATION ${INCLUDE_INSTALL_DIR}/taglib)
diff -dPNur taglib-1.6/taglib/toolkit/rccpatch.cpp taglib-1.6-ds/taglib/toolkit/rccpatch.cpp
--- taglib-1.6/taglib/toolkit/rccpatch.cpp 1970-01-01 01:00:00.000000000 +0100
+++ taglib-1.6-ds/taglib/toolkit/rccpatch.cpp 2009-10-02 17:53:08.000000000 +0200
@@ -0,0 +1,198 @@
+#include