From f3d492e057aded0110d1347599f9b158369ea649 Mon Sep 17 00:00:00 2001 From: Michael Hanselmann Date: Thu, 15 Jun 2006 16:07:00 +0000 Subject: [PATCH] Added patch to fix crash with some skin files. Package-Manager: portage-2.1 --- media-sound/audacious/ChangeLog | 11 +- media-sound/audacious/Manifest | 41 +++---- .../audacious/audacious-1.1.0_beta2-r1.ebuild | 111 ++++++++++++++++++ .../audacious/files/digest-audacious-0.2.3 | 2 + .../files/digest-audacious-1.1.0_beta2-r1 | 6 + .../audacious/files/util-filesize.diff | 14 +++ 6 files changed, 164 insertions(+), 21 deletions(-) create mode 100644 media-sound/audacious/audacious-1.1.0_beta2-r1.ebuild create mode 100644 media-sound/audacious/files/digest-audacious-1.1.0_beta2-r1 create mode 100644 media-sound/audacious/files/util-filesize.diff diff --git a/media-sound/audacious/ChangeLog b/media-sound/audacious/ChangeLog index ed6a541c40a5..6f5a2fb863da 100644 --- a/media-sound/audacious/ChangeLog +++ b/media-sound/audacious/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for media-sound/audacious # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/audacious/ChangeLog,v 1.45 2006/06/12 20:40:48 chainsaw Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/audacious/ChangeLog,v 1.46 2006/06/15 16:07:00 hansmi Exp $ + + 15 Jun 2006; Michael Hanselmann + +files/util-filesize.diff, +audacious-1.1.0_beta2-r1.ebuild: + Added patch to fix crash with some skin files. + +*audacious-1.1.0_beta2-r1 (15 Jun 2006) + + 15 Jun 2006; <> audacious-1.1.0_beta2-r1.ebuild files/digest-audacious-1.1.0_beta2-r1 + # INSERT ENTRY HERE *audacious-1.1.0_beta2 (12 Jun 2006) diff --git a/media-sound/audacious/Manifest b/media-sound/audacious/Manifest index 7b82ce6d4a16..9d8faa991f4e 100644 --- a/media-sound/audacious/Manifest +++ b/media-sound/audacious/Manifest @@ -1,9 +1,10 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -DIST audacious-0.2.3.tgz 3246886 -DIST audacious-1.0.0.tgz 3248602 RMD160 358f580448f61e48520557cd8406ef9ec81073eb SHA256 c3b11f7755af0bc89330aa79907cf43e99227a6f935652c7cd529385e152c8cb -DIST audacious-1.1.0-dr1.tgz 3189815 RMD160 49a0df7e52f49f43de5a66da936604d771e3f1e5 SHA256 e772792198b61f8372ae2ea9f73efc23ae1703ad1421b632555c23bb0ce105cd +AUX util-filesize.diff 462 RMD160 d9417e2bdf44745150096f0173fc0a0dd448c82f SHA1 777409608e96b1945801ce4e2d706f7a3714dce0 SHA256 d198ef445bbf46486c39263d44139d7397fd9116fe1520c6ed7074b195a65a83 +MD5 249bb26ef28b6feeb6498e63051d03bc files/util-filesize.diff 462 +RMD160 d9417e2bdf44745150096f0173fc0a0dd448c82f files/util-filesize.diff 462 +SHA256 d198ef445bbf46486c39263d44139d7397fd9116fe1520c6ed7074b195a65a83 files/util-filesize.diff 462 +DIST audacious-0.2.3.tgz 3246886 RMD160 e4ac4a1d5036689a2362e50387419d362270e417 SHA1 f640d06053a5e9fabd367e69b22f572528c9e930 SHA256 e1c8efc805bb95eff8f2bb3d6de919dd67240b979f16af8f87429fbc92dd789b +DIST audacious-1.0.0.tgz 3248602 RMD160 358f580448f61e48520557cd8406ef9ec81073eb SHA1 3afa76cc716e23f740e323e72609e27de86000e3 SHA256 c3b11f7755af0bc89330aa79907cf43e99227a6f935652c7cd529385e152c8cb +DIST audacious-1.1.0-dr1.tgz 3189815 RMD160 49a0df7e52f49f43de5a66da936604d771e3f1e5 SHA1 b521d7b5210359932151d347e04840c1d9baf3ce SHA256 e772792198b61f8372ae2ea9f73efc23ae1703ad1421b632555c23bb0ce105cd DIST audacious-1.1.0-dr2.tgz 3270998 RMD160 1e91c41a3fd519674303b8b1207eab9a55768a51 SHA1 c096e166b67901bf4e9891bcf9125c6fdc21d074 SHA256 620c31ac372a2f91c4afd419387244f324d6396a5e54ccd39e64ac954526a7fc DIST gentoo_ice-xmms-0.2.tar.bz2 51839 RMD160 11439cbebf8c6dc5745c8593a79e88303d094544 SHA1 e97ebbf204e0d1b150265f9e67f0ed54d779e110 SHA256 d1be63368b76f4a8b1d5b0e955cd7a77177f56a7f0b828c6603d8fd2836422b1 EBUILD audacious-0.2.3.ebuild 2552 RMD160 93e522f8402adce72bb4dab97851eb25d3365bcf SHA1 775bdb48629c5672d7139a106955630e8c16f7a6 SHA256 b51202585e526af70395bd50fcde4ea314feafb7e449fbc3f1d32865603a6600 @@ -22,21 +23,25 @@ EBUILD audacious-1.1.0_beta1.ebuild 2693 RMD160 cf007e5816b3511de37e9a587184e814 MD5 52543e695bb143d0a822295f0dcb4c13 audacious-1.1.0_beta1.ebuild 2693 RMD160 cf007e5816b3511de37e9a587184e8147b92c86d audacious-1.1.0_beta1.ebuild 2693 SHA256 bd256f4d791df65ee6d2729b04506e1e12596aeb40dc701dc7768d664433ad07 audacious-1.1.0_beta1.ebuild 2693 +EBUILD audacious-1.1.0_beta2-r1.ebuild 2778 RMD160 fc532752a1656cb493ccd8aafd75ad95daef02c8 SHA1 0acc8f9cfecd19b8f5f20308629346e4f708f73e SHA256 0eee0a7842763af862b472e41667c2157907f6a5f5022b95b2390c4716c9c23f +MD5 dc3c1ae5d2d732fdb11c64a6009ce038 audacious-1.1.0_beta2-r1.ebuild 2778 +RMD160 fc532752a1656cb493ccd8aafd75ad95daef02c8 audacious-1.1.0_beta2-r1.ebuild 2778 +SHA256 0eee0a7842763af862b472e41667c2157907f6a5f5022b95b2390c4716c9c23f audacious-1.1.0_beta2-r1.ebuild 2778 EBUILD audacious-1.1.0_beta2.ebuild 2695 RMD160 159fd699f81f5c85e5031be908be5a3afbf85566 SHA1 af42fa9aa96445b3993a6acdb24b31788717bdde SHA256 ee0782fef95ad55c9a5696632a70b2d62bb2e037770f3911bf42a01f6145373c MD5 e92aaae75dd85c6319575d6221b1af5f audacious-1.1.0_beta2.ebuild 2695 RMD160 159fd699f81f5c85e5031be908be5a3afbf85566 audacious-1.1.0_beta2.ebuild 2695 SHA256 ee0782fef95ad55c9a5696632a70b2d62bb2e037770f3911bf42a01f6145373c audacious-1.1.0_beta2.ebuild 2695 -MISC ChangeLog 7968 RMD160 40cdb14af9a99feef079997b45086f300e8ac66f SHA1 19f90269db3e896564ad3cdc4e8a82fda94e7103 SHA256 2c7c1bd939a697e30ef05f5de177ccba99060b686a3b1bd544234c62510a423d -MD5 c0d3816731f3fa3baa834e6a2c09163b ChangeLog 7968 -RMD160 40cdb14af9a99feef079997b45086f300e8ac66f ChangeLog 7968 -SHA256 2c7c1bd939a697e30ef05f5de177ccba99060b686a3b1bd544234c62510a423d ChangeLog 7968 +MISC ChangeLog 8287 RMD160 482a7ae37626ce78fd356a7e41d978cabf042b07 SHA1 5e56fc805d8fc9e06d69d5ca2fb61a1e429bc949 SHA256 786fb658d3efe57abb2d4f52c3f6827312db8c2e9928f80f7f4b5ba360ffc6bf +MD5 bacd6a9d8623191b5f60e7aeef0c536e ChangeLog 8287 +RMD160 482a7ae37626ce78fd356a7e41d978cabf042b07 ChangeLog 8287 +SHA256 786fb658d3efe57abb2d4f52c3f6827312db8c2e9928f80f7f4b5ba360ffc6bf ChangeLog 8287 MISC metadata.xml 248 RMD160 f9de13e16a150195633b055ebe61bb4cea95160d SHA1 4ea80510c4e90c385ac851b4f82c36b4f91d9402 SHA256 6a8ca116bded5cdd92cb700f92acd22b01ae159ef1b69c60a03fc9859bb9b3d6 MD5 319fe8f45b51a2d31f8d4e9a4071ca10 metadata.xml 248 RMD160 f9de13e16a150195633b055ebe61bb4cea95160d metadata.xml 248 SHA256 6a8ca116bded5cdd92cb700f92acd22b01ae159ef1b69c60a03fc9859bb9b3d6 metadata.xml 248 -MD5 9df0e1c881fdd6d7e5c9f7234cb272ff files/digest-audacious-0.2.3 324 -RMD160 b24e6ed2a50dcad986d6cb61123816562f7f9351 files/digest-audacious-0.2.3 324 -SHA256 2f66bad1e0725aefa7497d14295c3a4e440d4599d377202c6725b969551fa5db files/digest-audacious-0.2.3 324 +MD5 f2c1bac89dd4b26750455eb7c8b8bf9a files/digest-audacious-0.2.3 500 +RMD160 4acff2d0d55544477c08cc4e389f15190a464826 files/digest-audacious-0.2.3 500 +SHA256 863715454a5c9955cedc5f2cdf695d6def3dc1b6cfe2f0a1e2dc19d0c7f07b4a files/digest-audacious-0.2.3 500 MD5 c208147e974fdba9e399a029cea95bd1 files/digest-audacious-1.0.0 500 RMD160 1c5fa06b79d45af42b7ececac7e21e4a45f6be37 files/digest-audacious-1.0.0 500 SHA256 578452a3884065ca25e3a5c6d84a876afceee8a31638c1495a3b20016ca49ad1 files/digest-audacious-1.0.0 500 @@ -49,10 +54,6 @@ SHA256 ab8d6a6c85723afd9464667f5977a5d4678b877607e2067e97afd5c66875db2a files/di MD5 fda6b7c74a82df4001029522d377da32 files/digest-audacious-1.1.0_beta2 512 RMD160 d2e4c4cef31cf9c56dbc974997e4fbd58043eff9 files/digest-audacious-1.1.0_beta2 512 SHA256 37f8959c66ef14ec5b987a742ac13b19ff1eee4ff3f660afbf04833233eec106 files/digest-audacious-1.1.0_beta2 512 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.3-ecc0.1.6 (GNU/Linux) - -iD8DBQFEjdFkp5vW4rUFj5oRAoOhAKCQNv06wa2ONdqfHjmcnTtYa+99yACgo41v -UZE22t7oRYMyxvE2R2lx05I= -=8PGO ------END PGP SIGNATURE----- +MD5 fda6b7c74a82df4001029522d377da32 files/digest-audacious-1.1.0_beta2-r1 512 +RMD160 d2e4c4cef31cf9c56dbc974997e4fbd58043eff9 files/digest-audacious-1.1.0_beta2-r1 512 +SHA256 37f8959c66ef14ec5b987a742ac13b19ff1eee4ff3f660afbf04833233eec106 files/digest-audacious-1.1.0_beta2-r1 512 diff --git a/media-sound/audacious/audacious-1.1.0_beta2-r1.ebuild b/media-sound/audacious/audacious-1.1.0_beta2-r1.ebuild new file mode 100644 index 000000000000..9fef71e83acf --- /dev/null +++ b/media-sound/audacious/audacious-1.1.0_beta2-r1.ebuild @@ -0,0 +1,111 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-sound/audacious/audacious-1.1.0_beta2-r1.ebuild,v 1.1 2006/06/15 16:07:00 hansmi Exp $ + +inherit flag-o-matic + +MY_P="${P/_beta/-dr}" +S="${WORKDIR}/${MY_P}" +DESCRIPTION="Audacious Player - Your music, your way, no exceptions" +HOMEPAGE="http://audacious-media-player.org/" +SRC_URI="http://audacious-media-player.org/beta/${MY_P}.tgz + mirror://gentoo/gentoo_ice-xmms-0.2.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86" +IUSE="aac alsa arts esd flac gnome jack lirc mmx modplug mp3 musepack nls oss sid sndfile timidity vorbis wma" + +RDEPEND="app-arch/unzip + net-misc/curl + media-libs/musicbrainz + >=x11-libs/gtk+-2.6 + >=gnome-base/libglade-2.3.1 + >=dev-cpp/libbinio-1.4 + alsa? ( >=media-libs/alsa-lib-1.0.9_rc2 ) + arts? ( kde-base/arts ) + esd? ( >=media-sound/esound-0.2.30 ) + flac? ( >=media-libs/libvorbis-1.0 + >=media-libs/flac-1.1.2 ) + gnome? ( >=gnome-base/gconf-2.6.0 ) + jack? ( >=media-libs/bio2jack-0.4 + media-libs/libsamplerate + media-sound/jack-audio-connection-kit ) + lirc? ( app-misc/lirc ) + modplug? ( media-libs/libmodplug ) + musepack? ( media-libs/libmpcdec + media-libs/taglib ) + mp3? ( media-libs/taglib ) + sid? ( media-libs/libsidplay ) + sndfile? ( media-libs/libsndfile ) + timidity? ( media-sound/timidity++ ) + vorbis? ( >=media-libs/libvorbis-1.0 + >=media-libs/libogg-1.0 )" +DEPEND="${RDEPEND} + nls? ( dev-util/intltool ) + >=dev-util/pkgconfig-0.9.0" + +mp3_warning() { + if ! useq mp3 ; then + echo + ewarn "MP3 support is now optional, you may want to enable the mp3 USE-flag" + echo + fi +} + +src_unpack() { + unpack ${A} + cd "${S}" + + epatch ${FILESDIR}/util-filesize.diff +} + +src_compile() { + mp3_warning + + # Bug #42893 + replace-flags "-Os" "-O2" + # Bug #86689 + is-flag "-O*" || append-flags -O + + econf \ + --with-dev-dsp=/dev/sound/dsp \ + --with-dev-mixer=/dev/sound/mixer \ + $(use_enable mmx simd) \ + $(use_enable gnome gconf) \ + $(use_enable vorbis) \ + $(use_enable esd) \ + $(use_enable mp3) \ + $(use_enable nls) \ + $(use_enable oss) \ + $(use_enable alsa) \ + $(use_enable arts) \ + $(use_enable flac) \ + $(use_enable aac) \ + $(use_enable modplug) \ + $(use_enable lirc) \ + $(use_enable sndfile) \ + $(use_enable wma) \ + $(use_enable sid) \ + $(use_enable musepack) \ + $(use_enable jack) \ + $(use_enable timidity) \ + || die + + emake || die "make failed" +} + +src_install() { + make DESTDIR="${D}" install || die + dodoc AUTHORS NEWS README + + # Gentoo_ice skin installation; bug #109772 + insinto /usr/share/audacious/Skins/gentoo_ice + doins "${WORKDIR}"/gentoo_ice/* + docinto gentoo_ice + dodoc "${WORKDIR}"/README +} + +pkg_postinst() { + mp3_warning +} diff --git a/media-sound/audacious/files/digest-audacious-0.2.3 b/media-sound/audacious/files/digest-audacious-0.2.3 index 2f8c0841e857..d151735b9228 100644 --- a/media-sound/audacious/files/digest-audacious-0.2.3 +++ b/media-sound/audacious/files/digest-audacious-0.2.3 @@ -1,4 +1,6 @@ MD5 c7ef54251f15d780c4938fbc1ba5855d audacious-0.2.3.tgz 3246886 +RMD160 e4ac4a1d5036689a2362e50387419d362270e417 audacious-0.2.3.tgz 3246886 +SHA256 e1c8efc805bb95eff8f2bb3d6de919dd67240b979f16af8f87429fbc92dd789b audacious-0.2.3.tgz 3246886 MD5 41eababfa8bad11e9e34e467cdfb86be gentoo_ice-xmms-0.2.tar.bz2 51839 RMD160 11439cbebf8c6dc5745c8593a79e88303d094544 gentoo_ice-xmms-0.2.tar.bz2 51839 SHA256 d1be63368b76f4a8b1d5b0e955cd7a77177f56a7f0b828c6603d8fd2836422b1 gentoo_ice-xmms-0.2.tar.bz2 51839 diff --git a/media-sound/audacious/files/digest-audacious-1.1.0_beta2-r1 b/media-sound/audacious/files/digest-audacious-1.1.0_beta2-r1 new file mode 100644 index 000000000000..d62a777c8729 --- /dev/null +++ b/media-sound/audacious/files/digest-audacious-1.1.0_beta2-r1 @@ -0,0 +1,6 @@ +MD5 98ecf3d0980341ce6645f5663550d21b audacious-1.1.0-dr2.tgz 3270998 +RMD160 1e91c41a3fd519674303b8b1207eab9a55768a51 audacious-1.1.0-dr2.tgz 3270998 +SHA256 620c31ac372a2f91c4afd419387244f324d6396a5e54ccd39e64ac954526a7fc audacious-1.1.0-dr2.tgz 3270998 +MD5 41eababfa8bad11e9e34e467cdfb86be gentoo_ice-xmms-0.2.tar.bz2 51839 +RMD160 11439cbebf8c6dc5745c8593a79e88303d094544 gentoo_ice-xmms-0.2.tar.bz2 51839 +SHA256 d1be63368b76f4a8b1d5b0e955cd7a77177f56a7f0b828c6603d8fd2836422b1 gentoo_ice-xmms-0.2.tar.bz2 51839 diff --git a/media-sound/audacious/files/util-filesize.diff b/media-sound/audacious/files/util-filesize.diff new file mode 100644 index 000000000000..858e13a4569c --- /dev/null +++ b/media-sound/audacious/files/util-filesize.diff @@ -0,0 +1,14 @@ +Index: audacious/util.c +=================================================================== +--- audacious/util.c (revision 1246) ++++ audacious/util.c (working copy) +@@ -403,7 +403,8 @@ + static gchar *open_buffer = NULL; + gchar *ret_buffer = NULL; + gint found_section = 0, len = 0; +- gsize filesize, off = 0; ++ static gsize filesize = 0; ++ gsize off = 0; + gchar *outbuf; + unsigned char x[] = { 0xff, 0xfe, 0x00 }; + guint counter; -- 2.26.2