diff options
author | Jeremy Huddleston <eradicator@gentoo.org> | 2005-01-05 09:17:53 +0000 |
---|---|---|
committer | Jeremy Huddleston <eradicator@gentoo.org> | 2005-01-05 09:17:53 +0000 |
commit | e1c90ae0d15e776641db885ed35eadcd86c39159 (patch) | |
tree | a561188952cad941db8b016bb6d22707a6fcd5d5 /media-plugins | |
parent | Added ~amd64 to keywords, closes bug 70039. (Manifest recommit) (diff) | |
download | gentoo-2-e1c90ae0d15e776641db885ed35eadcd86c39159.tar.gz gentoo-2-e1c90ae0d15e776641db885ed35eadcd86c39159.tar.bz2 gentoo-2-e1c90ae0d15e776641db885ed35eadcd86c39159.zip |
Fix character conversion bug #75218 thanks to Miles Egan <miles@caddr.com>.
Diffstat (limited to 'media-plugins')
7 files changed, 91 insertions, 16 deletions
diff --git a/media-plugins/xmms-musepack/ChangeLog b/media-plugins/xmms-musepack/ChangeLog index e53798ef947f..daf09eaf1bc4 100644 --- a/media-plugins/xmms-musepack/ChangeLog +++ b/media-plugins/xmms-musepack/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for media-plugins/xmms-musepack -# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-musepack/ChangeLog,v 1.27 2004/12/19 05:29:13 eradicator Exp $ +# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-musepack/ChangeLog,v 1.28 2005/01/05 09:17:53 eradicator Exp $ + +*xmms-musepack-1.1-r1 (05 Jan 2005) + + 05 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org> + +files/xmms-musepack-1.1-glib.patch, +xmms-musepack-1.1-r1.ebuild: + Fix character conversion bug #75218 thanks to Miles Egan <miles@caddr.com>. 18 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org> xmms-musepack-1.1.ebuild, -xmms-musepack-1.1_alpha10.ebuild: diff --git a/media-plugins/xmms-musepack/Manifest b/media-plugins/xmms-musepack/Manifest index b2b97c5226d5..52d73b81cd40 100644 --- a/media-plugins/xmms-musepack/Manifest +++ b/media-plugins/xmms-musepack/Manifest @@ -1,17 +1,10 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - MD5 8d6e46523ba1ec22ab2c1eca4186bd47 ChangeLog 5135 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158 MD5 afba68e06dbc57e7fc6892be886da0db xmms-musepack-1.1.ebuild 666 +MD5 380b0c6712571c9a587da05dd555a515 xmms-musepack-1.1-r1.ebuild 766 MD5 f309aa5390313a477b701fce2e78b508 xmms-musepack-1.00.ebuild 1593 MD5 15869ff792a8fcc6f89e2968d7049ab3 files/digest-xmms-musepack-1.1 70 +MD5 15869ff792a8fcc6f89e2968d7049ab3 files/digest-xmms-musepack-1.1-r1 70 +MD5 0278897d38e13c0ab23fb09ac67f4270 files/xmms-musepack-1.1-glib.patch 1379 MD5 4e97b5144a2c0a49cb7e1ef0ef9e33c3 files/digest-xmms-musepack-1.00 70 MD5 9fd390603c336d139e7a8a2ec1ffb183 files/xmms-musepack-1.00-bad-makefile.patch 1796 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.2.6 (GNU/Linux) - -iD8DBQFBxRGzArHZZzCEUG0RAgUqAJoD2jCLsmKwdRjgkr6lUknkKs0JfwCfS/3r -LSCBVEUg/HnGx7ArPXoMxp0= -=uPsZ ------END PGP SIGNATURE----- diff --git a/media-plugins/xmms-musepack/files/digest-xmms-musepack-1.1-r1 b/media-plugins/xmms-musepack/files/digest-xmms-musepack-1.1-r1 new file mode 100644 index 000000000000..b9f821b689be --- /dev/null +++ b/media-plugins/xmms-musepack/files/digest-xmms-musepack-1.1-r1 @@ -0,0 +1 @@ +MD5 8aed0b02562ee3913b5fd058d2c14ccf xmms-musepack-1.1.tar.bz2 207369 diff --git a/media-plugins/xmms-musepack/files/xmms-musepack-1.1-glib.patch b/media-plugins/xmms-musepack/files/xmms-musepack-1.1-glib.patch new file mode 100644 index 000000000000..14792cfb6980 --- /dev/null +++ b/media-plugins/xmms-musepack/files/xmms-musepack-1.1-glib.patch @@ -0,0 +1,46 @@ +diff -ru xmms-musepack-1.1/src/libmpc.cpp xmms-musepack-1.1-patched/src/libmpc.cpp +--- xmms-musepack-1.1/src/libmpc.cpp 2004-11-28 08:15:57.000000000 -0800 ++++ xmms-musepack-1.1-patched/src/libmpc.cpp 2004-12-29 15:21:10.810832296 -0800 +@@ -12,6 +12,7 @@ + } + #include <glib.h> + #include <gtk/gtk.h> ++#include <iconv.h> + #include <math.h> + #include "tags.h" + #include "equalizer.h" +@@ -115,12 +116,28 @@ + } + #endif + +-static char* convertUTF8toLocale(char* utf8) { +- char* temp=g_locale_from_utf8 (utf8, -1, NULL, NULL, NULL); +- if(temp==NULL) +- return g_strdup(utf8); +- else +- return temp; ++static char* ++convertUTF8toLocale(char* utf8) ++{ ++ // note - opens a new iconv descriptor for each call ++ // will have to find a way to reuse the descriptor if this turns ++ // out to be too slow ++ iconv_t idesc = iconv_open("", "UTF-8"); ++ if (idesc == (iconv_t) -1) { ++ perror("iconv_open failed"); ++ return g_strdup(utf8); ++ } ++ ++ size_t in_left = strlen(utf8); ++ size_t out_left = 2 * in_left + 1; ++ char *buf = (char *)g_malloc(out_left); ++ char *in = utf8; ++ char *out = buf; ++ ++ memset(buf, 0, out_left); ++ size_t err = iconv(idesc, &in, &in_left, &out, &out_left); ++ iconv_close(idesc); ++ return buf; + } + + static void convertLE32to16(MPC_SAMPLE_FORMAT* sample_buffer, char* xmms_buffer, unsigned int status) { diff --git a/media-plugins/xmms-musepack/xmms-musepack-1.00.ebuild b/media-plugins/xmms-musepack/xmms-musepack-1.00.ebuild index 64ccaffb8e86..86a65bc91446 100644 --- a/media-plugins/xmms-musepack/xmms-musepack-1.00.ebuild +++ b/media-plugins/xmms-musepack/xmms-musepack-1.00.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2004 Gentoo Foundation +# Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-musepack/xmms-musepack-1.00.ebuild,v 1.2 2004/09/03 08:15:01 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-musepack/xmms-musepack-1.00.ebuild,v 1.3 2005/01/05 09:17:53 eradicator Exp $ inherit eutils diff --git a/media-plugins/xmms-musepack/xmms-musepack-1.1-r1.ebuild b/media-plugins/xmms-musepack/xmms-musepack-1.1-r1.ebuild new file mode 100644 index 000000000000..175c7ccbabb0 --- /dev/null +++ b/media-plugins/xmms-musepack/xmms-musepack-1.1-r1.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-musepack/xmms-musepack-1.1-r1.ebuild,v 1.1 2005/01/05 09:17:53 eradicator Exp $ + +IUSE="" + +inherit eutils + +DESCRIPTION="XMMS plugin to play audio files encoded with Andree Buschmann's encoder Musepack (mpc, mp+, mpp)" +HOMEPAGE="http://www.musepack.net" +SRC_URI="http://www.saunalahti.fi/grimmel/musepack.net/linux/plugins/${P}.tar.bz2" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~sparc ~x86" + +DEPEND="media-sound/xmms + >=media-libs/libmusepack-1.0.3" + +src_unpack() { + unpack ${A} + cd ${S} + epatch ${FILESDIR}/${PN}-1.1-glib.patch +} + +src_install() { + make DESTDIR="${D}" install || die + dodoc README +} diff --git a/media-plugins/xmms-musepack/xmms-musepack-1.1.ebuild b/media-plugins/xmms-musepack/xmms-musepack-1.1.ebuild index e3c7fc6ba433..647c5e865cfe 100644 --- a/media-plugins/xmms-musepack/xmms-musepack-1.1.ebuild +++ b/media-plugins/xmms-musepack/xmms-musepack-1.1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2004 Gentoo Foundation +# Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-musepack/xmms-musepack-1.1.ebuild,v 1.3 2004/12/19 05:29:13 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-musepack/xmms-musepack-1.1.ebuild,v 1.4 2005/01/05 09:17:53 eradicator Exp $ IUSE="" |