Attachment #118347 for bug #160579

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

Lines 15-20 Link Here

(-)audio/firefly/Makefile (-4 / +14 lines)
15	MAINTAINER= mark@foster.cc	15	MAINTAINER= mark@foster.cc
16	COMMENT= Open-source media server for the Roku SoundBridge and iTunes	16	COMMENT= Open-source media server for the Roku SoundBridge and iTunes
		17	LICENSE= GPLv2
		18	LICENSE_FILE= ${WRKSRC}/COPYING
		19
17	BUILD_DEPENDS= ${LOCALBASE}/include/vorbis/codec.h:${PORTSDIR}/audio/libvorbis \	20	BUILD_DEPENDS= ${LOCALBASE}/include/vorbis/codec.h:${PORTSDIR}/audio/libvorbis \
18	${LOCALBASE}/include/FLAC/metadata.h:${PORTSDIR}/audio/flac	21	${LOCALBASE}/include/FLAC/metadata.h:${PORTSDIR}/audio/flac
19	RUN_DEPENDS= oggdec:${PORTSDIR}/audio/vorbis-tools \	22	RUN_DEPENDS= oggdec:${PORTSDIR}/audio/vorbis-tools \
Lines 27-39 Link Here
27	GNU_CONFIGURE= yes	30	GNU_CONFIGURE= yes
28	CONFIGURE_ENV= CFLAGS+="${PTHREAD_CFLAGS}" \	31	CONFIGURE_ENV= CFLAGS+="${PTHREAD_CFLAGS}" \
29	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \	32	CPPFLAGS+="${CPPFLAGS} -I${LOCALBASE}/include" \
30	LDFLAGS="-L${LOCALBASE}/lib" \	33	LDFLAGS+="-L${LOCALBASE}/lib" \
31	LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"	34	LIBS+="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
32	CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}	35	CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
33	CONFIGURE_ARGS= --prefix=${PREFIX} --with-id3tag=${PREFIX} \	36	CONFIGURE_ARGS= --prefix=${PREFIX} --with-id3tag=${PREFIX} \
34	--enable-sqlite3 --enable-oggvorbis --enable-flac	37	--enable-sqlite3 --enable-oggvorbis --enable-flac
		38	USE_ICONV= yes
		39	CONFIGURE_ARGS+= --enable-iconv
		40
		41	#PATCH_SITES+= http://www.kzsoft.to/~kazu/mt-daapd/patch/
		42	#PATCHFILES+= mt-daapd-svn-1586-cp932.patch
		43	#PATCH_DIST_STRIP+= -p1
		44
35	DAAPD_USER?= daapd	45	DAAPD_USER?= daapd
36	DAAPD_GROUP?= daapd	46	DAAPD_GROUP?= daapd
37	DAAPD_DBDIR?= ${PREFIX}/var/db/${PORTNAME}	47	DAAPD_DBDIR?= ${PREFIX}/var/db/${PORTNAME}
Lines 46-52 Link Here
46	USE_LDCONFIG= yes	56	USE_LDCONFIG= yes
47	pre-everything::	57	pre-everything::
48	@${ECHO_CMD} "Define vars bellow if you need:"	58	@${ECHO_CMD} "Define vars below if you need:"
49	@${ECHO_CMD} "DAAPD_USER=${DAAPD_USER} (default: daapd)"	59	@${ECHO_CMD} "DAAPD_USER=${DAAPD_USER} (default: daapd)"
50	@${ECHO_CMD} "DAAPD_GROUP=${DAAPD_GROUP} (default: daapd)"	60	@${ECHO_CMD} "DAAPD_GROUP=${DAAPD_GROUP} (default: daapd)"
51	@${ECHO_CMD} "DAAPD_DBDIR=${DAAPD_DBDIR} (default: ${PREFIX}/var/db/${PORTNAME})"	61	@${ECHO_CMD} "DAAPD_DBDIR=${DAAPD_DBDIR} (default: ${PREFIX}/var/db/${PORTNAME})"




--- src/scan-mp3.c.orig	2007-09-25 16:55:23.000000000 +0900
+++ src/scan-mp3.c	2011-09-05 13:52:16.000000000 +0900
@@ -18,6 +18,15 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */

+#define USE_CP932
+
+#ifdef USE_CP932
+    #define UNKNOWN_STR    "UNKNOWN"
+    #ifndef FILESYSTEM_CES
+        #define FILESYSTEM_CES "CP932"
+    #endif
+#endif
+
 #ifdef HAVE_CONFIG_H
 #  include "config.h"
 #endif
@@ -34,6 +43,10 @@
 #include <string.h>
 #include <time.h>

+#ifdef USE_CP932
+    #include <iconv.h>
+#endif
+
 #include "daapd.h"
 #include "conf.h"
 #include "err.h"
@@ -289,6 +302,96 @@
     return 1;
 }

+#ifdef USE_CP932
+#define MAX_ICONV_BUF 1024
+
+typedef enum {
+    ICONV_OK,
+    ICONV_TRYNEXT,
+    ICONV_FATAL
+}   iconv_result;
+
+static iconv_result do_convert(const char* to_ces, const char* from_ces,
+                   char *inbuf,  size_t inbytesleft,
+                   char *outbuf_orig, size_t outbytesleft_orig) {
+    size_t rc;
+    iconv_result ret = ICONV_OK;
+
+    size_t outbytesleft = outbytesleft_orig - 1;
+    char* outbuf = outbuf_orig;
+
+    iconv_t cd  = iconv_open(to_ces, from_ces);
+    if (cd == (iconv_t)-1) {
+        return ICONV_FATAL;
+    }
+    rc = iconv(cd, &inbuf, &inbytesleft, &outbuf, &outbytesleft);
+    if (rc == (size_t)-1) {
+        if (errno == E2BIG) {
+            ret = ICONV_FATAL;
+        } else {
+            ret = ICONV_TRYNEXT;
+            memset(outbuf_orig, '\0', outbytesleft_orig);
+        }
+    }
+    iconv_close(cd);
+
+    return ret;
+}
+
+static unsigned char* get_utf8_text(const id3_ucs4_t* native_text) {
+    unsigned char* utf8_text = NULL;
+    char * in, * in8, * iconv_buf;
+    iconv_result rc;
+
+    in = (char*)id3_ucs4_latin1duplicate(native_text);
+    if (!in) goto out;
+
+    in8 = (char*)id3_ucs4_utf8duplicate(native_text);
+    if (!in8) {
+      free(in);
+      goto out;
+    }
+
+    iconv_buf = (char*)calloc(MAX_ICONV_BUF, sizeof(char));
+    if (!iconv_buf) {
+      free(in); free(in8);
+      goto out;
+    }
+
+    /* (1) try utf8 -> cp932 */
+    rc = do_convert("CP932", "UTF-8", in8, strlen(in8), iconv_buf, MAX_ICONV_BUF);
+    if (rc == ICONV_OK) {
+        utf8_text = (unsigned char*)in8;
+        free(iconv_buf);
+    } else if (rc == ICONV_TRYNEXT) {
+        /* (2) try cp932 -> utf8 */
+        rc = do_convert("UTF-8", "CP932", in, strlen(in), iconv_buf, MAX_ICONV_BUF);
+        if (rc == ICONV_OK) {
+            utf8_text = (unsigned char*)iconv_buf;
+        } else if (rc == ICONV_TRYNEXT) {
+            /* (3) try euc-jp -> utf8 */
+            rc = do_convert("UTF-8", "EUC-JP", in, strlen(in), iconv_buf, MAX_ICONV_BUF);
+            if (rc == ICONV_OK) {
+                utf8_text = (unsigned char*)iconv_buf;
+            } else if (rc == ICONV_TRYNEXT) {
+                /* utf-8 including non-japanese char? fallback. */
+                utf8_text = (unsigned char*)id3_ucs4_utf8duplicate(native_text);
+                free(iconv_buf);
+            }
+        }
+        free(in8);
+    }
+    free(in);
+
+  out:
+    if (!utf8_text) {
+        utf8_text = (unsigned char*)strdup(UNKNOWN_STR);
+    }
+
+    return utf8_text;
+}
+#endif
+
 int scan_mp3_get_mp3tags(char *file, MP3FILE *pmp3) {
     struct id3_file *pid3file;
     struct id3_tag *pid3tag;
@@ -352,8 +455,11 @@
             if(native_text) {
                 have_utf8=1;

-
+#ifdef USE_CP932
+		utf8_text = (char *)get_utf8_text(native_text);
+#else
                 utf8_text = (char*)id3_ucs4_utf8duplicate(native_text);
+#endif
                 if(utf8_text)
                     mem_register(utf8_text,0);


Return to bug 160579

Line 0 Link Here

(-)audio/firefly/files/patch-src_scan-mp3.c (+139 lines)
		1	--- src/scan-mp3.c.orig 2007-09-25 16:55:23.000000000 +0900
		2	+++ src/scan-mp3.c 2011-09-05 13:52:16.000000000 +0900
		3	@@ -18,6 +18,15 @@
		4	* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
		5	*/
		6
		7	+#define USE_CP932
		8	+
		9	+#ifdef USE_CP932
		10	+ #define UNKNOWN_STR "UNKNOWN"
		11	+ #ifndef FILESYSTEM_CES
		12	+ #define FILESYSTEM_CES "CP932"
		13	+ #endif
		14	+#endif
		15	+
		16	#ifdef HAVE_CONFIG_H
		17	# include "config.h"
		18	#endif
		19	@@ -34,6 +43,10 @@
		20	#include <string.h>
		21	#include <time.h>
		22
		23	+#ifdef USE_CP932
		24	+ #include <iconv.h>
		25	+#endif
		26	+
		27	#include "daapd.h"
		28	#include "conf.h"
		29	#include "err.h"
		30	@@ -289,6 +302,96 @@
		31	return 1;
		32	}
		33
		34	+#ifdef USE_CP932
		35	+#define MAX_ICONV_BUF 1024
		36	+
		37	+typedef enum {
		38	+ ICONV_OK,
		39	+ ICONV_TRYNEXT,
		40	+ ICONV_FATAL
		41	+} iconv_result;
		42	+
		43	+static iconv_result do_convert(const char* to_ces, const char* from_ces,
		44	+ char *inbuf, size_t inbytesleft,
		45	+ char *outbuf_orig, size_t outbytesleft_orig) {
		46	+ size_t rc;
		47	+ iconv_result ret = ICONV_OK;
		48	+
		49	+ size_t outbytesleft = outbytesleft_orig - 1;
		50	+ char* outbuf = outbuf_orig;
		51	+
		52	+ iconv_t cd = iconv_open(to_ces, from_ces);
		53	+ if (cd == (iconv_t)-1) {
		54	+ return ICONV_FATAL;
		55	+ }
		56	+ rc = iconv(cd, &inbuf, &inbytesleft, &outbuf, &outbytesleft);
		57	+ if (rc == (size_t)-1) {
		58	+ if (errno == E2BIG) {
		59	+ ret = ICONV_FATAL;
		60	+ } else {
		61	+ ret = ICONV_TRYNEXT;
		62	+ memset(outbuf_orig, '\0', outbytesleft_orig);
		63	+ }
		64	+ }
65	+ iconv_close(cd);
66	+
67	+ return ret;
68	+}
69	+
70	+static unsigned char* get_utf8_text(const id3_ucs4_t* native_text) {
71	+ unsigned char* utf8_text = NULL;
72	+ char * in, * in8, * iconv_buf;
73	+ iconv_result rc;
74	+
75	+ in = (char*)id3_ucs4_latin1duplicate(native_text);
76	+ if (!in) goto out;
77	+
78	+ in8 = (char*)id3_ucs4_utf8duplicate(native_text);
79	+ if (!in8) {
80	+ free(in);
81	+ goto out;
82	+ }
83	+
84	+ iconv_buf = (char*)calloc(MAX_ICONV_BUF, sizeof(char));
85	+ if (!iconv_buf) {
86	+ free(in); free(in8);
87	+ goto out;
88	+ }
89	+
90	+ /* (1) try utf8 -> cp932 */
91	+ rc = do_convert("CP932", "UTF-8", in8, strlen(in8), iconv_buf, MAX_ICONV_BUF);
92	+ if (rc == ICONV_OK) {
93	+ utf8_text = (unsigned char*)in8;
94	+ free(iconv_buf);
95	+ } else if (rc == ICONV_TRYNEXT) {
96	+ /* (2) try cp932 -> utf8 */
97	+ rc = do_convert("UTF-8", "CP932", in, strlen(in), iconv_buf, MAX_ICONV_BUF);
98	+ if (rc == ICONV_OK) {
99	+ utf8_text = (unsigned char*)iconv_buf;
100	+ } else if (rc == ICONV_TRYNEXT) {
101	+ /* (3) try euc-jp -> utf8 */
102	+ rc = do_convert("UTF-8", "EUC-JP", in, strlen(in), iconv_buf, MAX_ICONV_BUF);
103	+ if (rc == ICONV_OK) {
104	+ utf8_text = (unsigned char*)iconv_buf;
105	+ } else if (rc == ICONV_TRYNEXT) {
106	+ /* utf-8 including non-japanese char? fallback. */
107	+ utf8_text = (unsigned char*)id3_ucs4_utf8duplicate(native_text);
108	+ free(iconv_buf);
109	+ }
110	+ }
111	+ free(in8);
112	+ }
113	+ free(in);
114	+
115	+ out:
116	+ if (!utf8_text) {
117	+ utf8_text = (unsigned char*)strdup(UNKNOWN_STR);
118	+ }
119	+
120	+ return utf8_text;
121	+}
122	+#endif
123	+
124	int scan_mp3_get_mp3tags(char file, MP3FILE pmp3) {
125	struct id3_file *pid3file;
126	struct id3_tag *pid3tag;
127	@@ -352,8 +455,11 @@
128	if(native_text) {
129	have_utf8=1;
130
131	-
132	+#ifdef USE_CP932
133	+ utf8_text = (char *)get_utf8_text(native_text);
134	+#else
135	utf8_text = (char*)id3_ucs4_utf8duplicate(native_text);
136	+#endif
137	if(utf8_text)
138	mem_register(utf8_text,0);
139