diff options
| author |   Seemant Kulleen <seemant@gentoo.org> | 2003-09-15 17:09:46 +0000 |
|---|---|---|
| committer | Seemant Kulleen <seemant@gentoo.org> | 2003-09-15 17:09:46 +0000 |
| commit | 3d66dfa608806595a1c56d16ac058b6e4d75bf30 (patch) | |
| tree | 70aaf90d97a667f04f5e5c8b1371fe0f55ec90d2 /media-sound/xmms | |
| parent | cleanup (diff) | |
| download | gentoo-2-3d66dfa608806595a1c56d16ac058b6e4d75bf30.tar.gz gentoo-2-3d66dfa608806595a1c56d16ac058b6e4d75bf30.tar.bz2 gentoo-2-3d66dfa608806595a1c56d16ac058b6e4d75bf30.zip | |
cjk patch patched
Diffstat (limited to 'media-sound/xmms')
| -rw-r--r-- | media-sound/xmms/ChangeLog | 8 | ||||
| -rw-r--r-- | media-sound/xmms/Manifest | 4 | ||||
| -rw-r--r-- | media-sound/xmms/files/xmms-1.2.8-mpg123j.patch | 6 |
3 files changed, 12 insertions, 6 deletions
diff --git a/media-sound/xmms/ChangeLog b/media-sound/xmms/ChangeLog index 255061ef3bea..846c3a373117 100644 --- a/media-sound/xmms/ChangeLog +++ b/media-sound/xmms/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for media-sound/xmms # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms/ChangeLog,v 1.70 2003/09/15 13:46:19 seemant Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms/ChangeLog,v 1.71 2003/09/15 17:09:44 seemant Exp $ + + 15 Sep 2003; Seemant Kulleen <seemant@gentoo.org> + files/xmms-1.2.8-mpg123j.patch: + the cjk patch was fixed, so now xmms will compile with cjk support turned on. + This is hopefully the last we'll see of issues with -r2. Thanks to: Michael + Dillon <gsvalore@lordlegacy.com> in the same bug report #28768 15 Sep 2003; Seemant Kulleen <seemant@gentoo.org> files/xmms-1.2.8-dtd.patch: diff --git a/media-sound/xmms/Manifest b/media-sound/xmms/Manifest index e854b173b546..0b1d59843e54 100644 --- a/media-sound/xmms/Manifest +++ b/media-sound/xmms/Manifest @@ -4,7 +4,7 @@ MD5 1f4fb5fbbf7591ead0b68071825b2de3 xmms-1.2.7-r25.ebuild 5652 MD5 5013cb7f0010b3daa8efd1548cbe83b4 xmms-1.2.7-r20.ebuild 4923 MD5 0ee64fc05669ecd516d7239e2a575e8d xmms-1.2.8.ebuild 4350 MD5 092d1ae9348717c6e29072cbc747275e xmms-1.2.8-r1.ebuild 3813 -MD5 cedba99167e210acf6bd9041557ef382 ChangeLog 13324 +MD5 1a961b58beb5b18bbf691b97878e495c ChangeLog 13634 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158 MD5 e7e0c91780b115aaad1a1ed534bf7ae8 files/xmms-ipv6-20020408-mmx.patch 9210 MD5 2ef620caed6093dff90ace3118832937 files/xmms-1.2.8-sid-songpos.patch 8959 @@ -24,7 +24,7 @@ MD5 b4d1fd03bbe7ceb4b756394354b3956e files/xmms-russian-charset.patch 110410 MD5 777b6bd0dd19ffa348f27ec2a214b8f4 files/xmms-1.2.8-jump.patch 3025 MD5 a03fa7e2151194a6db4850897d16d128 files/xmms-1.2.7-mpg123j.patch 9333 MD5 b60b5cc65172d2b807335e5e315860c2 files/xmms-1.2.8-sigterm.patch 1062 -MD5 39f39107d92e83b2e4af125ac73e248d files/xmms-1.2.8-mpg123j.patch 9390 +MD5 7e309cbe68bd60e8d05257a2d21174ea files/xmms-1.2.8-mpg123j.patch 9390 MD5 3137a462e1b8c82c5c2a8d7c4d983ee9 files/xmms-ipv6-20020408-nommx.patch 9214 MD5 a84fd04b04f9f3e586bcbaaad4b4b4f0 files/xmms-1.2.8-russian-charset.patch 110709 MD5 344a691c05256b9b1259c5e47ec644cc files/xmms-diskwriter-audio.patch 1039 diff --git a/media-sound/xmms/files/xmms-1.2.8-mpg123j.patch b/media-sound/xmms/files/xmms-1.2.8-mpg123j.patch index 097ba4d36cd3..a91ff339319c 100644 --- a/media-sound/xmms/files/xmms-1.2.8-mpg123j.patch +++ b/media-sound/xmms/files/xmms-1.2.8-mpg123j.patch @@ -248,13 +248,15 @@ diff -urN xmms-1.2.8/Input/mpg123/id3_frame_text.c xmms-1.2.8-jp/Input/mpg123/id { char *text16 = (char *) frame->fr_data + 1; -@@ -161,11 +169,16 @@ +@@ -161,11 +169,15 @@ return NULL; } } - - if (*(guint8 *) frame->fr_data == ID3_ENCODING_ISO_8859_1) - return g_strdup((char *) frame->fr_data + 1); +- else +- return id3_utf16_to_ascii(((char *) frame->fr_data + 1)); + switch (*(guint8 *) frame->fr_data) { + case ID3_ENCODING_ISO_8859_1: + case ID3_ENCODING_UTF8: @@ -262,8 +264,6 @@ diff -urN xmms-1.2.8/Input/mpg123/id3_frame_text.c xmms-1.2.8-jp/Input/mpg123/id + case ID3_ENCODING_UTF16: + case ID3_ENCODING_UTF16BE: + default: - else -- return id3_utf16_to_ascii(((char *) frame->fr_data + 1)); + return id3_utf16_to_ascii(((char *) frame->fr_data + 1)); + } } |