Attachment #184922 for bug #221157

View | Details | Raw Unified | Return to bug 221157
Collapse All | Expand All




# $FreeBSD$

PORTNAME=	taglib
PORTVERSION=	1.11.1
CATEGORIES=	audio
MASTER_SITES=	http://taglib.github.io/releases/


MAINTAINER=	jhale@FreeBSD.org
COMMENT=	Library for manipulating ID3 tags and Ogg comments

LICENSE=	LGPL21 MPL11
LICENSE_COMB=	dual
LICENSE_FILE_LGPL21=	${WRKSRC}/COPYING.LGPL
LICENSE_FILE_MPL=	${WRKSRC}/COPYING.MPL


USES=		cmake cpe pathfix
CMAKE_ARGS=	-DWITH_ASF:BOOL=ON \
		-DWITH_MP4:BOOL=ON \
		-DBUILD_SHARED_LIBS:BOOL=ON

USE_LDCONFIG=	yes

CPE_VENDOR=	scott_wheeler

OPTIONS_DEFINE=	RCC
OPTIONS_SUB=	yes

# The official patches for this can be obtained from:
#   http://darksoft.org/files/rusxmms/patches/
# however, they do not seem to yet have any for taglib-1.11.1.
# So instead, use:
#   https://sourceforge.net/p/qmmp-dev/code/HEAD/tree/trunk/extras/package/win32/contrib/taglib-rusxmms/
#
RCC_DESC=		Build with RusXMMS librcc patches (experimental)
RCC_LIB_DEPENDS=	librcc.so:devel/librcc
RCC_EXTRA_PATCHES=	${FILESDIR}/extrapatch-rcc

Lines 1-2 Link Here

(-)audio/taglib/distinfo (-2 / +3 lines)
1	SHA256 (taglib-1.10.tar.gz) = 24c32d50042cb0ddf162eb263f8ac75c5a158e12bf32ed534c1d5c71ee369baa	1	TIMESTAMP = 1501054372
2	SIZE (taglib-1.10.tar.gz) = 1233893	2	SHA256 (taglib-1.11.1.tar.gz) = b6d1a5a610aae6ff39d93de5efd0fdc787aa9e9dc1e7026fa4c961b26563526b
		3	SIZE (taglib-1.11.1.tar.gz) = 1261620




Obtained from:
	https://sourceforge.net/p/qmmp-dev/code/HEAD/tree/trunk/extras/package/win32/contrib/taglib-rusxmms/taglib-1.11.1-ds-rusxmms.patch?format=raw

diff --git CMakeLists.txt CMakeLists.txt
index a59efc9..eda2f53 100644
--- CMakeLists.txt
+++ CMakeLists.txt
@@ -120,6 +120,8 @@ if(NOT HAVE_ZLIB AND ZLIB_SOURCE)
   set(HAVE_ZLIB_SOURCE 1)
 endif()
 
+SET(HAVE_LIBRCC 1)
+
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 configure_file(config.h.cmake "${CMAKE_CURRENT_BINARY_DIR}/config.h")
 
diff --git config.h.cmake config.h.cmake
index 7eb5993..8d4a541 100644
--- config.h.cmake
+++ config.h.cmake
@@ -30,4 +30,7 @@
 /* Indicates whether debug messages are shown even in release mode */
 #cmakedefine   TRACE_IN_RELEASE 1
 
+/* Defined if you have LibRCC from RusXMMS project */
+#cmakedefine   HAVE_LIBRCC 1
+
 #cmakedefine TESTS_DIR "@TESTS_DIR@"
diff --git examples/tagreader_c.c examples/tagreader_c.c
index 0436992..e0f17d8 100644
--- examples/tagreader_c.c
+++ examples/tagreader_c.c
@@ -38,7 +38,7 @@ int main(int argc, char *argv[])
   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 --git examples/tagwriter.cpp examples/tagwriter.cpp
index ed8b0d7..6a7a263 100644
--- examples/tagwriter.cpp
+++ examples/tagwriter.cpp
@@ -115,7 +115,7 @@ int main(int argc, char *argv[])
     if(isArgument(argv[i]) && i + 1 < argc && !isArgument(argv[i + 1])) {

 
       TagLib::List<TagLib::FileRef>::ConstIterator it;
       for(it = fileList.begin(); it != fileList.end(); ++it) {
diff --git taglib/CMakeLists.txt taglib/CMakeLists.txt
index 000f793..e30471e 100644
--- taglib/CMakeLists.txt
+++ taglib/CMakeLists.txt
@@ -42,6 +42,7 @@ set(tag_HDRS
   audioproperties.h
   taglib_export.h
   ${CMAKE_CURRENT_BINARY_DIR}/../taglib_config.h

   toolkit/taglib.h
   toolkit/tstring.h
   toolkit/tlist.h
@@ -297,6 +298,7 @@ set(xm_SRCS
 )
 
 set(toolkit_SRCS

   toolkit/tstring.cpp
   toolkit/tstringlist.cpp
   toolkit/tbytevector.cpp
@@ -345,7 +347,7 @@ set(tag_LIB_SRCS
 add_library(tag ${tag_LIB_SRCS} ${tag_HDRS})
 
 if(ZLIB_FOUND)

+  target_link_libraries(tag rcc ${ZLIB_LIBRARIES})
 endif()
 
 if(HAVE_BOOST_ATOMIC)
diff --git taglib/mpeg/id3v1/id3v1tag.cpp taglib/mpeg/id3v1/id3v1tag.cpp
index ca93041..dca5f7a 100644
--- taglib/mpeg/id3v1/id3v1tag.cpp
+++ taglib/mpeg/id3v1/id3v1tag.cpp
@@ -69,15 +69,15 @@ StringHandler::StringHandler()
 
 String ID3v1::StringHandler::parse(const ByteVector &data) const
 {

 
 ByteVector ID3v1::StringHandler::render(const String &s) const
 {
-  if(s.isLatin1())
-    return s.data(String::Latin1);
-  else
+  if(!s.isLatin1() && String::ID3WType(String::Latin1) == String::Latin1)
     return ByteVector();
+    
 
-  return s.data(String::Latin1);
+  return s.data(String::Latin1ID3);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -262,7 +262,7 @@ void ID3v1::Tag::parse(const ByteVector &data)
     d->track   = static_cast<unsigned char>(data[offset + 29]);
   }
   else
-    d->comment = data.mid(offset, 30);
+    d->comment = stringHandler->parse(data.mid(offset, 30));
 
   offset += 30;
 
diff --git taglib/mpeg/id3v2/frames/commentsframe.cpp taglib/mpeg/id3v2/frames/commentsframe.cpp
index b561832..9cfaba2 100644
--- taglib/mpeg/id3v2/frames/commentsframe.cpp
+++ taglib/mpeg/id3v2/frames/commentsframe.cpp
@@ -148,10 +148,10 @@ void CommentsFrame::parseFields(const ByteVector &data)
     return;
   }
 

 
   ByteVectorList l = ByteVectorList::split(data.mid(4), textDelimiter(d->textEncoding), byteAlign, 2);
 
@@ -171,11 +171,13 @@ ByteVector CommentsFrame::renderFields() const
   ByteVector v;
 
   String::Type encoding = d->textEncoding;
+  
+  encoding = String::ID3WType(encoding);
 
+  encoding = String::ID3WType(encoding);
+
   encoding = checkTextEncoding(d->description, encoding);
   encoding = checkTextEncoding(d->text, encoding);
 

   v.append(d->language.size() == 3 ? d->language : "XXX");
   v.append(d->description.data(encoding));
   v.append(textDelimiter(encoding));
diff --git taglib/mpeg/id3v2/frames/textidentificationframe.cpp taglib/mpeg/id3v2/frames/textidentificationframe.cpp
index d9d3b29..74f69da 100644
--- taglib/mpeg/id3v2/frames/textidentificationframe.cpp
+++ taglib/mpeg/id3v2/frames/textidentificationframe.cpp
@@ -191,12 +191,12 @@ void TextIdentificationFrame::parseFields(const ByteVector &data)
 
   // read the string data type (the first byte of the field data)
 

 
   // build a small counter to strip nulls off the end of the field
 
@@ -227,11 +227,14 @@ void TextIdentificationFrame::parseFields(const ByteVector &data)
 
 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);
 

 
   for(StringList::ConstIterator it = d->fieldList.begin(); it != d->fieldList.end(); it++) {
 
diff --git taglib/mpeg/id3v2/id3v2frame.cpp taglib/mpeg/id3v2/id3v2frame.cpp
index 1f896fa..ef9d91d 100644
--- taglib/mpeg/id3v2/id3v2frame.cpp
+++ taglib/mpeg/id3v2/id3v2frame.cpp
@@ -297,7 +297,7 @@ String::Type Frame::checkEncoding(const StringList &fields, String::Type encodin
   if((encoding == String::UTF8 || encoding == String::UTF16BE) && version != 4)
     return String::UTF16;
 

     return encoding;
 
   for(StringList::ConstIterator it = fields.begin(); it != fields.end(); ++it) {
diff --git taglib/toolkit/rccpatch.cpp taglib/toolkit/rccpatch.cpp
new file mode 100644
index 0000000..af99323
--- /dev/null
+++ taglib/toolkit/rccpatch.cpp
@@ -0,0 +1,237 @@
+#include <stdlib.h>

+#endif /* HAVE_LIBRCC */
+    return TagLib::String::Latin1;
+}
diff --git taglib/toolkit/rccpatch.h taglib/toolkit/rccpatch.h
new file mode 100644
index 0000000..31f4410
--- /dev/null
+++ taglib/toolkit/rccpatch.h
@@ -0,0 +1,20 @@
+#ifndef _RCC_PATCH_H

+TagLib::String::Type rccTaglibPatchGetID3Type();
+
+#endif /* _RCC_PATCH_H */
diff --git taglib/toolkit/tstring.cpp taglib/toolkit/tstring.cpp
index 8328790..278256f 100644
--- taglib/toolkit/tstring.cpp
+++ taglib/toolkit/tstring.cpp
@@ -42,6 +42,7 @@
 #include <trefcounter.h>
 #include <tutils.h>
 
+#include "rccpatch.h"
 #include "tstring.h"
 
 namespace
@@ -120,15 +121,37 @@ namespace
     else
       return String::UTF16BE;
   }
+  
+  void copyFromUTF8(std::wstring &data, const char *s, size_t length);
 
   // Converts a Latin-1 string into UTF-16(without BOM/CPU byte order)
   // and copies it to the internal buffer.
-  void copyFromLatin1(std::wstring &data, const char *s, size_t length)
+  void copyFromLatin1(std::wstring &data, const char *s, size_t length, bool prepare = false, String::Type t = String::Latin1)
   {
     data.resize(length);
 
     for(size_t i = 0; i < length; ++i)
       data[i] = static_cast<unsigned char>(s[i]);
+      
+         
+    // librcc conversation
+    if (prepare) {
+     
+     ByteVector v;
+     std::string str = std::string(s, length);
+    
+     if (t == String::Latin1ID3) v = rccTaglibPatchRecodeInputID3(str, false);
+     else if (t == String::Latin1ID3V2) v = rccTaglibPatchRecodeInputID3(str, true);
+     else /* Latin1 converted from Locale */ v = rccTaglibPatchRecodeInput(str);
+
+     if (v.size()) {
+       copyFromUTF8(data, v.data(), v.size());
+     } 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;
+     }
+    }      
   }
 
   // Converts a UTF-8 string into UTF-16(without BOM/CPU byte order)
@@ -264,8 +287,11 @@ String::String(const String &s) :
 String::String(const std::string &s, Type t) :
   d(new StringPrivate())
 {
-  if(t == Latin1)
-    copyFromLatin1(d->data, s.c_str(), s.length());
+  if(t == Locale)
+   t = rccTaglibPatchGetLocaleType();
+
+  if(t == Latin1 || t == Latin1ID3 || t == Latin1ID3V2)
+    copyFromLatin1(d->data, s.c_str(), s.length(), true, t);
   else if(t == String::UTF8)
     copyFromUTF8(d->data, s.c_str(), s.length());
   else {
@@ -312,8 +338,11 @@ String::String(const wchar_t *s, Type t) :
 String::String(const char *s, Type t) :
   d(new StringPrivate())
 {
-  if(t == Latin1)
-    copyFromLatin1(d->data, s, ::strlen(s));
+  if(t == Locale)
+    t = rccTaglibPatchGetLocaleType();
+
+  if(t == Latin1 || t == Latin1ID3 || t == Latin1ID3V2)
+    copyFromLatin1(d->data, s, ::strlen(s), true, t);
   else if(t == String::UTF8)
     copyFromUTF8(d->data, s, ::strlen(s));
   else {
@@ -344,9 +373,13 @@ String::String(const ByteVector &v, Type t) :
 String::String(char c, Type t)
   : d(new StringPrivate(1, static_cast<uchar>(c)))
 {
   if(v.isEmpty())
     return;
+    
+  if(t == Locale)
+   t = rccTaglibPatchGetLocaleType();
+
+   if(t == Latin1 || t == Latin1ID3 || t == Latin1ID3V2)
+     copyFromLatin1(d->data, v.data(), v.size(), true, t);
   }
 }
@@ -248,8 +258,11 @@ String::String(const ByteVector &v, Type
   if(v.isEmpty())
     return;
 
-  if(t == Latin1)
-    copyFromLatin1(d->data, v.data(), v.size());
+  if(t == Locale)
+    t = rccTaglibPatchGetLocaleType();
+
+  if(t == Latin1 || t == Latin1ID3 || t == Latin1ID3V2)
+    copyFromLatin1(v.data(), v.size(), true, t);
   else if(t == UTF8)
     copyFromUTF8(d->data, v.data(), v.size());
   else
@@ -499,8 +532,38 @@ bool String::isNull() const
 
 ByteVector String::data(Type t) const
 {
-  switch(t)
-  {
+   ByteVector v;
+
+  if (t == Locale) {
+        // The source is either Unicode or real Latin1 (if rcc is bypassed)
+    std::string s = to8Bit(true);

   case Latin1:
     {
       ByteVector v(size(), 0);
@@ -822,7 +885,35 @@ const TagLib::String operator+(const TagLib::String &s1, const char *s2)
 // private members
 ////////////////////////////////////////////////////////////////////////////////
 
-void String::copyFromLatin1(const char *s, size_t length)
+void String::copyFromLatin1(const char *s, size_t length, bool prepare, Type t)
 {
   d->data.resize(length);
-
   for(size_t i = 0; i < length; ++i)
     d->data[i] = static_cast<uchar>(s[i]);
+
+  // librcc conversation
+  if (prepare) {
+    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()) {
+      copyFromUTF8(v.data(), v.size());
+    } 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;
+    }
+  }
 }
 
 void String::copyFromUTF8(const char *s, size_t length)
@@ -859,7 +918,33 @@ const TagLib::String operator+(const Tag
 
 std::ostream &operator<<(std::ostream &s, const TagLib::String &str)
 {
-  s << str.to8Bit();

+    return Latin1;
+  return type;
+}
+
+
diff --git taglib/toolkit/tstring.h taglib/toolkit/tstring.h
index b1be04b..b21f297 100644
--- taglib/toolkit/tstring.h
+++ taglib/toolkit/tstring.h
@@ -96,6 +96,18 @@ namespace TagLib {
      */
     enum Type {
       /*!
+        * Determine using current locale settings
+        */
+      Locale = -1,
+       /*!
+        * Latin1 for ID3 tags.
+        */
+      Latin1ID3 = 65,
+       /*!
+        * Latin1 for ID3v2 tags.
+        */
+      Latin1ID3V2 = 66,
+      /*!
        * IS08859-1, or <i>Latin1</i> encoding.  8 bit characters.
        */
       Latin1 = 0,
@@ -117,6 +129,10 @@ namespace TagLib {
        */
       UTF16LE = 4
     };
+    
+    static Type ID3Type(int i);
+    static Type ID3WType(Type type);
+    static Type ID3RealType(Type type);
 
     /*!
      * Constructs an empty String.
      */
@@ -519,7 +535,7 @@ namespace TagLib {
      * Converts a \e Latin-1 string into \e UTF-16(without BOM/CPU byte order)
      * and copies it to the internal buffer.
      */
-    void copyFromLatin1(const char *s, size_t length);
+    void copyFromLatin1(const char *s, size_t length, bool prepare = false, Type t = Latin1);
 
     /*!
      * Converts a \e UTF-8 string into \e UTF-16(without BOM/CPU byte order)

Lines 56-61 Link Here

(-)audio/taglib/pkg-plist (-1 / +2 lines)
56	include/taglib/opusfile.h	56	include/taglib/opusfile.h
57	include/taglib/opusproperties.h	57	include/taglib/opusproperties.h
58	include/taglib/ownershipframe.h	58	include/taglib/ownershipframe.h
		59	include/taglib/podcastframe.h
59	include/taglib/popularimeterframe.h	60	include/taglib/popularimeterframe.h
60	include/taglib/privateframe.h	61	include/taglib/privateframe.h
61	%%RCC%%include/taglib/rccpatch.h	62	%%RCC%%include/taglib/rccpatch.h
Lines 106-112 Link Here
106	include/taglib/xmproperties.h	107	include/taglib/xmproperties.h
107	lib/libtag.so	108	lib/libtag.so
108	lib/libtag.so.1	109	lib/libtag.so.1
109	lib/libtag.so.1.15.1	110	lib/libtag.so.1.17.0
110	lib/libtag_c.so	111	lib/libtag_c.so
111	lib/libtag_c.so.0	112	lib/libtag_c.so.0
112	lib/libtag_c.so.0.0.0	113	lib/libtag_c.so.0.0.0

Return to bug 221157

Lines 2-8 Link Here

(-)audio/taglib/Makefile (-3 / +11 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= taglib	4	PORTNAME= taglib
5	PORTVERSION= 1.10	5	PORTVERSION= 1.11.1
6	CATEGORIES= audio	6	CATEGORIES= audio
7	MASTER_SITES= http://taglib.github.io/releases/	7	MASTER_SITES= http://taglib.github.io/releases/
8		8
Lines 9-15 Link Here
9	MAINTAINER= jhale@FreeBSD.org	9	MAINTAINER= jhale@FreeBSD.org
10	COMMENT= Library for manipulating ID3 tags and Ogg comments	10	COMMENT= Library for manipulating ID3 tags and Ogg comments
11		11
12	LICENSE= LGPL21 MPL	12	LICENSE= LGPL21 MPL11
13	LICENSE_COMB= dual	13	LICENSE_COMB= dual
14	LICENSE_FILE_LGPL21= ${WRKSRC}/COPYING.LGPL	14	LICENSE_FILE_LGPL21= ${WRKSRC}/COPYING.LGPL
15	LICENSE_FILE_MPL= ${WRKSRC}/COPYING.MPL	15	LICENSE_FILE_MPL= ${WRKSRC}/COPYING.MPL
Lines 16-22 Link Here
16		16
17	USES= cmake cpe pathfix	17	USES= cmake cpe pathfix
18	CMAKE_ARGS= -DWITH_ASF:BOOL=ON \	18	CMAKE_ARGS= -DWITH_ASF:BOOL=ON \
19	-DWITH_MP4:BOOL=ON	19	-DWITH_MP4:BOOL=ON \
		20	-DBUILD_SHARED_LIBS:BOOL=ON
		21
20	USE_LDCONFIG= yes	22	USE_LDCONFIG= yes
21		23
22	CPE_VENDOR= scott_wheeler	24	CPE_VENDOR= scott_wheeler
Lines 24-29 Link Here
24	OPTIONS_DEFINE= RCC	26	OPTIONS_DEFINE= RCC
25	OPTIONS_SUB= yes	27	OPTIONS_SUB= yes
26		28
		29	# The official patches for this can be obtained from:
		30	# http://darksoft.org/files/rusxmms/patches/
		31	# however, they do not seem to yet have any for taglib-1.11.1.
		32	# So instead, use:
		33	# https://sourceforge.net/p/qmmp-dev/code/HEAD/tree/trunk/extras/package/win32/contrib/taglib-rusxmms/
		34	#
27	RCC_DESC= Build with RusXMMS librcc patches (experimental)	35	RCC_DESC= Build with RusXMMS librcc patches (experimental)
28	RCC_LIB_DEPENDS= librcc.so:devel/librcc	36	RCC_LIB_DEPENDS= librcc.so:devel/librcc
29	RCC_EXTRA_PATCHES= ${FILESDIR}/extrapatch-rcc	37	RCC_EXTRA_PATCHES= ${FILESDIR}/extrapatch-rcc