# ChangeLog for media-plugins/audacious-plugins
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/audacious-plugins/ChangeLog,v 1.50 2007/04/10 18:59:22 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/audacious-plugins/ChangeLog,v 1.51 2007/04/13 20:26:24 chainsaw Exp $
+
+*audacious-plugins-1.3.3 (13 Apr 2007)
+
+ 13 Apr 2007; Tony Vroon <chainsaw@gentoo.org>
+ -files/1.3.0_rc2-freebsd-portability.patch,
+ -files/1.3.1-stricter-mp3-probe.patch, -audacious-plugins-1.3.1.ebuild,
+ -audacious-plugins-1.3.1-r1.ebuild, -audacious-plugins-1.3.2.ebuild,
+ +audacious-plugins-1.3.3.ebuild:
+ Carrying over stable keywords because of a security concern in the curl plugin.
10 Apr 2007; Gustavo Zacarias <gustavoz@gentoo.org>
audacious-plugins-1.3.2.ebuild:
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
-AUX 1.3.0_rc2-freebsd-portability.patch 1833 RMD160 dcee94df3a8b069056a6b0e98c0b3f6b201de6e3 SHA1 a9f2fcd7fbe6d3bc8399a814a64a8f4f19669e56 SHA256 5be60aca440dbe53d7ca25c517a80ee1e648179e174d7f3977c9f22ac01f755e
-MD5 2e3ac6898331f492fec0fbc663cb727e files/1.3.0_rc2-freebsd-portability.patch 1833
-RMD160 dcee94df3a8b069056a6b0e98c0b3f6b201de6e3 files/1.3.0_rc2-freebsd-portability.patch 1833
-SHA256 5be60aca440dbe53d7ca25c517a80ee1e648179e174d7f3977c9f22ac01f755e files/1.3.0_rc2-freebsd-portability.patch 1833
-AUX 1.3.1-stricter-mp3-probe.patch 6082 RMD160 f5f1c1dc874ed2b07f1947a768df5b094c32509a SHA1 e4067db1cce73064b0cd06b557632a89ecefd95f SHA256 219d2d846b3719880fd3c8063fb753a5edc22661f886ce8eb86e05a13496afbc
-MD5 a0ad51c0dfa0cf188cf0e4fed89710db files/1.3.1-stricter-mp3-probe.patch 6082
-RMD160 f5f1c1dc874ed2b07f1947a768df5b094c32509a files/1.3.1-stricter-mp3-probe.patch 6082
-SHA256 219d2d846b3719880fd3c8063fb753a5edc22661f886ce8eb86e05a13496afbc files/1.3.1-stricter-mp3-probe.patch 6082
DIST audacious-plugins-1.2.2.tgz 2178529 RMD160 b986bb1e12fd0b3c5f0e1dde994781fb556a1d3c SHA1 300888007539fe8bcdb7fd474a7466b7f09371a2 SHA256 0422cdb510c9f7c90ceb206b4f7317e3b7ea8a66809f78976a1231d2fc073049
DIST audacious-plugins-1.2.5.tgz 2339867 RMD160 ce102649e5cf15239bcab5a204d368869dbe851d SHA1 daa5df222e982f1a56115c455c1289b21f48f264 SHA256 29d812db9a17ef50dc38db9ac354ab2ba31047829a0c1316a549177328ffb6c3
-DIST audacious-plugins-1.3.1.tgz 2905465 RMD160 5d5169fc4caf5ee10374f42d925652cef73eca49 SHA1 35c1a952abdd35bf843711182f8bc9cc34c5a9b2 SHA256 d882603786b5b5e41bdc6e481e8bdabb9cb86a29f411a4bc39078ea98c9a57a5
-DIST audacious-plugins-1.3.2.tgz 2962380 RMD160 43fcb033d2de7c07f4e85b301f6b28f04067923d SHA1 51c6099d61b7db6153f8df6f4d5c40c9a6f374c0 SHA256 590ba683268e3f282abe9fb47b89a86de5e57a54cb2600a8f9aa5f8d42d79ec5
+DIST audacious-plugins-1.3.3.tgz 2963141 RMD160 53b6f3156b76454f20c5084fbd35334f2a9397c3 SHA1 a6359f79463f7fbb78f41cd436df050513bcf17e SHA256 67a968d77524f6d902a2180c31742e124fe27584dc7be2d4646dfe0fb0509580
EBUILD audacious-plugins-1.2.2-r1.ebuild 2566 RMD160 70c60bd7a9c04093707b80a4af44219528fba8bb SHA1 0a85917857e9ffe7c4aa8501385372b8ef78aed7 SHA256 5dfbcfa26a071a449144c24f5f099e1308ece4cc451bf3225fff2fd500b93173
MD5 a0623f087a52773392db32bd295d0b3a audacious-plugins-1.2.2-r1.ebuild 2566
RMD160 70c60bd7a9c04093707b80a4af44219528fba8bb audacious-plugins-1.2.2-r1.ebuild 2566
MD5 bf0c904379e0b0881ba8c10f40539f75 audacious-plugins-1.2.5.ebuild 2594
RMD160 16f61b88b52284e79bf915d55be4d6397c4a188f audacious-plugins-1.2.5.ebuild 2594
SHA256 00812831314e5a8b6945ff889dcea8077417dda0a4d4efc7008e37d50a537dad audacious-plugins-1.2.5.ebuild 2594
-EBUILD audacious-plugins-1.3.1-r1.ebuild 3316 RMD160 729fd2d9cd602914de44b8aad0e956b0e1b747d9 SHA1 7f9229c1641023c0a226e4ac476cd62efaf27716 SHA256 56d97bf2d9c50da1e05ce109b281ecfd9130ce4f171e78a91bd4bd3950e3bfeb
-MD5 262f8faa869018ed511c27102c793edd audacious-plugins-1.3.1-r1.ebuild 3316
-RMD160 729fd2d9cd602914de44b8aad0e956b0e1b747d9 audacious-plugins-1.3.1-r1.ebuild 3316
-SHA256 56d97bf2d9c50da1e05ce109b281ecfd9130ce4f171e78a91bd4bd3950e3bfeb audacious-plugins-1.3.1-r1.ebuild 3316
-EBUILD audacious-plugins-1.3.1.ebuild 3214 RMD160 1a4fd574cc7301d1cbceb0e8fdc619c451baf21c SHA1 1176ee61ff39463e4008ec69cbcd82ca1d3ad74c SHA256 1aa28c1fd6e11e4c46d3d751ccc4ac0912d24a8ea2e76298157494ea6c15c070
-MD5 003acf673ab3740714e22bef21f3e35e audacious-plugins-1.3.1.ebuild 3214
-RMD160 1a4fd574cc7301d1cbceb0e8fdc619c451baf21c audacious-plugins-1.3.1.ebuild 3214
-SHA256 1aa28c1fd6e11e4c46d3d751ccc4ac0912d24a8ea2e76298157494ea6c15c070 audacious-plugins-1.3.1.ebuild 3214
-EBUILD audacious-plugins-1.3.2.ebuild 3181 RMD160 365e0473e4dc95dbc28302b8088ac32f9b3b1693 SHA1 dfd1af02c7e5dd3925240a7dd0272267040cbac3 SHA256 93e9fd1c07da1be207dd7731a5729da71a9fe6660bd3df9878b78e072b63d420
-MD5 87b47381309e31c5f0d576f9ae83c62d audacious-plugins-1.3.2.ebuild 3181
-RMD160 365e0473e4dc95dbc28302b8088ac32f9b3b1693 audacious-plugins-1.3.2.ebuild 3181
-SHA256 93e9fd1c07da1be207dd7731a5729da71a9fe6660bd3df9878b78e072b63d420 audacious-plugins-1.3.2.ebuild 3181
-MISC ChangeLog 10812 RMD160 346fe3ea85abbc1df05fc87916d2fe58d79e5427 SHA1 3a73d134034bd8f6ad5f16a0502a3c6f936dca60 SHA256 0d0884339c895e674d2967cee0649d6b2525fead8179a9ee93af7b29736826b3
-MD5 3c85dfafb1c57fbc1114ef3142683d71 ChangeLog 10812
-RMD160 346fe3ea85abbc1df05fc87916d2fe58d79e5427 ChangeLog 10812
-SHA256 0d0884339c895e674d2967cee0649d6b2525fead8179a9ee93af7b29736826b3 ChangeLog 10812
+EBUILD audacious-plugins-1.3.3.ebuild 3181 RMD160 26f84b60338aaf5d8e9936b480adc6f3a5762ec5 SHA1 f0784b96bca01cc9f97dc705f175ab0d1b4093d1 SHA256 b00488f02b0526a44e8d09b7cfd2976a37fd7bbed496367a4efa448b12bf605c
+MD5 6e06455b1aa5a5b6fbe35ab56f99be2c audacious-plugins-1.3.3.ebuild 3181
+RMD160 26f84b60338aaf5d8e9936b480adc6f3a5762ec5 audacious-plugins-1.3.3.ebuild 3181
+SHA256 b00488f02b0526a44e8d09b7cfd2976a37fd7bbed496367a4efa448b12bf605c audacious-plugins-1.3.3.ebuild 3181
+MISC ChangeLog 11209 RMD160 36dee3a00de0149742be0ea3b99ab29fd0e68a15 SHA1 fcf3bd9753cdff782bbcdc0b1e34115d8a078bf8 SHA256 304e2dd4fc5fb6ebf44ba5d9546fb5afb7e6729aaa725105a44aa29ba20b9c24
+MD5 ed8a97030fa7dda03505bce51f9ffd7c ChangeLog 11209
+RMD160 36dee3a00de0149742be0ea3b99ab29fd0e68a15 ChangeLog 11209
+SHA256 304e2dd4fc5fb6ebf44ba5d9546fb5afb7e6729aaa725105a44aa29ba20b9c24 ChangeLog 11209
MISC metadata.xml 248 RMD160 f9de13e16a150195633b055ebe61bb4cea95160d SHA1 4ea80510c4e90c385ac851b4f82c36b4f91d9402 SHA256 6a8ca116bded5cdd92cb700f92acd22b01ae159ef1b69c60a03fc9859bb9b3d6
MD5 319fe8f45b51a2d31f8d4e9a4071ca10 metadata.xml 248
RMD160 f9de13e16a150195633b055ebe61bb4cea95160d metadata.xml 248
MD5 05bf85634d63ac06167acb779b7f83c9 files/digest-audacious-plugins-1.2.5 265
RMD160 38e68bb0dc992408a3da6eb3fbb1c6c7ae81682e files/digest-audacious-plugins-1.2.5 265
SHA256 9587f8a2b5e6993a28518c5c58744d0bd58cff6dbd7931dc3ea9dd0cfefdc8e9 files/digest-audacious-plugins-1.2.5 265
-MD5 cf158b3e0486dc9a374074edd24494d0 files/digest-audacious-plugins-1.3.1 265
-RMD160 ffbb594b06c16fb8754c05d02a9f624e19ee66a7 files/digest-audacious-plugins-1.3.1 265
-SHA256 4073589e4d3fd78b5c8802197f61f8a40a4bc04bf37b4a470e072b851bb66bfe files/digest-audacious-plugins-1.3.1 265
-MD5 cf158b3e0486dc9a374074edd24494d0 files/digest-audacious-plugins-1.3.1-r1 265
-RMD160 ffbb594b06c16fb8754c05d02a9f624e19ee66a7 files/digest-audacious-plugins-1.3.1-r1 265
-SHA256 4073589e4d3fd78b5c8802197f61f8a40a4bc04bf37b4a470e072b851bb66bfe files/digest-audacious-plugins-1.3.1-r1 265
-MD5 f48eb2e329214ee13d4f5a627ef8fe44 files/digest-audacious-plugins-1.3.2 265
-RMD160 b6f36be3e16a9fb5cfac1c07715bce429eb43363 files/digest-audacious-plugins-1.3.2 265
-SHA256 52da499ca7f523c8554689040c30b39f0cbaae2881ab96bfedaabce2d8715f17 files/digest-audacious-plugins-1.3.2 265
+MD5 de52a1526b9bbd8494b8ef2e65386db8 files/digest-audacious-plugins-1.3.3 265
+RMD160 252aaf9d2ac27cf5b57d59c06760b2f7ac8d2449 files/digest-audacious-plugins-1.3.3 265
+SHA256 3267c4b51f468701e5d426f022d49e5f0053d3ab8b4abde826ffa6517abe67c5 files/digest-audacious-plugins-1.3.3 265
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6-ecc01.6 (GNU/Linux)
+Version: GnuPG v2.0.3 (GNU/Linux)
-iD8DBQFGG96SKRy60XGEcJIRArC9AJ9NRSCI1M/toSDFVuyeJ72Kzjz4CACfQG34
-m+F8UA6l9agUIOvsNgWJM8o=
-=CUO2
+iD8DBQFGH+cVp5vW4rUFj5oRAo5vAKCjsFITJRNA6BKNghPLxU7tn/Z11wCeLdhJ
+5qjOL4t4gIzTqz5LSbj/v20=
+=rNkb
-----END PGP SIGNATURE-----
+++ /dev/null
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/audacious-plugins/audacious-plugins-1.3.1-r1.ebuild,v 1.2 2007/03/11 23:21:05 welp Exp $
-
-inherit eutils flag-o-matic
-
-MY_P=${P/_/-}
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="Audacious Player - Your music, your way, no exceptions"
-HOMEPAGE="http://audacious-media-player.org/"
-SRC_URI="http://static.audacious-media-player.org/release/${MY_P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="aac adplug alsa arts chardet esd flac jack lirc mad modplug musepack nls opengl oss sid sndfile timidity tta vorbis wavpack wma pulseaudio"
-
-RDEPEND="app-arch/unzip
- dev-libs/libxml2
- media-libs/libsamplerate
- net-misc/curl
- >=media-sound/audacious-1.3.0-r1
- >=x11-libs/gtk+-2.6
- >=gnome-base/libglade-2.3.1
- >=media-libs/libsdl-1.2.5
- media-libs/taglib
- adplug? ( >=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 )
- jack? ( >=media-libs/bio2jack-0.4
- media-sound/jack-audio-connection-kit )
- lirc? ( app-misc/lirc )
- mad? ( media-libs/libmad )
- musepack? ( media-libs/libmpcdec )
- opengl? ( =media-libs/libprojectm-0.99* )
- sid? ( media-libs/libsidplay )
- sndfile? ( media-libs/libsndfile )
- timidity? ( media-sound/timidity++ )
- tta? ( media-libs/libid3tag )
- vorbis? ( >=media-libs/libvorbis-1.0
- >=media-libs/libogg-1.0 )
- pulseaudio? ( >=media-sound/pulseaudio-0.9.3 )
- wavpack? ( >=media-sound/wavpack-4.31 )
- wma? ( >=media-libs/libmms-0.3 )"
-
-DEPEND="${RDEPEND}
- nls? ( dev-util/intltool )
- >=dev-util/pkgconfig-0.9.0
- !media-plugins/audacious-docklet
- !=media-plugins/audacious-plugins-ugly-1.2.0"
-
-mp3_warning() {
- if ! useq mad ; then
- echo
- ewarn "MP3 support is optional, you may want to enable the mad USE-flag"
- echo
- fi
-}
-
-src_unpack() {
- unpack ${A}
- cd ${S}
- epatch ${FILESDIR}/${PV}-stricter-mp3-probe.patch
-}
-
-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 \
- --enable-paranormal \
- $(use_enable vorbis) \
- $(use_enable esd) \
- $(use_enable mad 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) \
- $(use_enable pulseaudio pulse) \
- $(use_enable chardet) \
- $(use_enable wavpack) \
- $(use_enable tta) \
- $(use_enable opengl projectm) \
- $(use_enable adplug) \
- || die
-
- emake || die "make failed"
-}
-
-src_install() {
- make DESTDIR="${D}" install || die
- dodoc AUTHORS NEWS
-}
-
-pkg_postinst() {
- mp3_warning
- elog "Note that you need to recompile *all* third-party plugins to use Audacious 1.3 builds."
- elog "To clarify, that means all plugins *not* contained in this ebuild. Failure to do so may cause "
- elog "the player to crash. Rebuild, and if that fails, unmerge, any third-party plugins before you "
- elog "report a bug."
-}
+++ /dev/null
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/audacious-plugins/audacious-plugins-1.3.1.ebuild,v 1.2 2007/03/11 01:14:44 kloeri Exp $
-
-inherit eutils flag-o-matic
-
-MY_P=${P/_/-}
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="Audacious Player - Your music, your way, no exceptions"
-HOMEPAGE="http://audacious-media-player.org/"
-SRC_URI="http://static.audacious-media-player.org/release/${MY_P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="aac adplug alsa arts chardet esd flac jack lirc mad modplug musepack nls opengl oss sid sndfile timidity tta vorbis wavpack wma pulseaudio"
-
-RDEPEND="app-arch/unzip
- dev-libs/libxml2
- media-libs/libsamplerate
- net-misc/curl
- >=media-sound/audacious-1.3.0-r1
- >=x11-libs/gtk+-2.6
- >=gnome-base/libglade-2.3.1
- >=media-libs/libsdl-1.2.5
- media-libs/taglib
- adplug? ( >=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 )
- jack? ( >=media-libs/bio2jack-0.4
- media-sound/jack-audio-connection-kit )
- lirc? ( app-misc/lirc )
- mad? ( media-libs/libmad )
- musepack? ( media-libs/libmpcdec )
- opengl? ( =media-libs/libprojectm-0.99* )
- sid? ( media-libs/libsidplay )
- sndfile? ( media-libs/libsndfile )
- timidity? ( media-sound/timidity++ )
- tta? ( media-libs/libid3tag )
- vorbis? ( >=media-libs/libvorbis-1.0
- >=media-libs/libogg-1.0 )
- pulseaudio? ( >=media-sound/pulseaudio-0.9.3 )
- wavpack? ( >=media-sound/wavpack-4.31 )
- wma? ( >=media-libs/libmms-0.3 )"
-
-DEPEND="${RDEPEND}
- nls? ( dev-util/intltool )
- >=dev-util/pkgconfig-0.9.0
- !media-plugins/audacious-docklet
- !=media-plugins/audacious-plugins-ugly-1.2.0"
-
-mp3_warning() {
- if ! useq mad ; then
- echo
- ewarn "MP3 support is optional, you may want to enable the mad USE-flag"
- echo
- fi
-}
-
-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 \
- --enable-paranormal \
- $(use_enable vorbis) \
- $(use_enable esd) \
- $(use_enable mad 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) \
- $(use_enable pulseaudio pulse) \
- $(use_enable chardet) \
- $(use_enable wavpack) \
- $(use_enable tta) \
- $(use_enable opengl projectm) \
- $(use_enable adplug) \
- || die
-
- emake || die "make failed"
-}
-
-src_install() {
- make DESTDIR="${D}" install || die
- dodoc AUTHORS NEWS
-}
-
-pkg_postinst() {
- mp3_warning
- elog "Note that you need to recompile *all* third-party plugins to use Audacious 1.3 builds."
- elog "To clarify, that means all plugins *not* contained in this ebuild. Failure to do so may cause "
- elog "the player to crash. Rebuild, and if that fails, unmerge, any third-party plugins before you "
- elog "report a bug."
-}
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/audacious-plugins/audacious-plugins-1.3.2.ebuild,v 1.3 2007/04/10 18:59:22 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/audacious-plugins/audacious-plugins-1.3.3.ebuild,v 1.1 2007/04/13 20:26:24 chainsaw Exp $
inherit eutils flag-o-matic
+++ /dev/null
-diff -ruN audacious-plugins-1.3.0-rc2.orig/configure.ac audacious-plugins-1.3.0-rc2/configure.ac
---- audacious-plugins-1.3.0-rc2.orig/configure.ac 2007-02-25 22:41:03 -0300
-+++ audacious-plugins-1.3.0-rc2/configure.ac 2007-02-27 05:23:02 -0300
-@@ -876,7 +876,11 @@
- AC_CHECK_HEADERS(wchar.h)
- AC_CHECK_HEADERS(fts.h)
-
--AC_CHECK_FUNCS([mkdtemp getmntinfo statvfs strtoul lrintf])
-+AC_CHECK_DECL([lrintf],[AC_DEFINE(HAVE_LRINTF,1)],[AC_CHECK_FUNCS([lrintf])],[
-+#define _ISOC9X_SOURCE
-+#include <math.h>
-+])
-+AC_CHECK_FUNCS([mkdtemp getmntinfo statvfs strtoul])
-
-
- if test "${ac_cv_header_linux_cdrom_h}" = "yes" || test "${ac_cv_header_sys_cdio_h}" = "yes"
-diff -ruN audacious-plugins-1.3.0-rc2.orig/src/aosd/ghosd.h audacious-plugins-1.3.0-rc2/src/aosd/ghosd.h
---- audacious-plugins-1.3.0-rc2.orig/src/aosd/ghosd.h 2007-01-31 16:50:36 -0300
-+++ audacious-plugins-1.3.0-rc2/src/aosd/ghosd.h 2007-02-27 03:18:36 -0300
-@@ -10,7 +10,7 @@
-
- #include <cairo/cairo.h>
-
--#include <values.h> /* MAXINT */
-+#include <limits.h> /* INT_MAX */
- #include <sys/time.h> /* timeval */
-
- typedef struct _Ghosd Ghosd;
-@@ -32,7 +32,7 @@
- Ghosd *ghosd_new(void);
- void ghosd_destroy(Ghosd* ghosd);
-
--#define GHOSD_COORD_CENTER MAXINT
-+#define GHOSD_COORD_CENTER INT_MAX
- void ghosd_set_transparent(Ghosd *ghosd, int transparent);
- void ghosd_set_position(Ghosd *ghosd, int x, int y, int width, int height);
- void ghosd_set_render(Ghosd *ghosd, GhosdRenderFunc render_func,
-diff -ruN audacious-plugins-1.3.0-rc2.orig/src/tta/id3.c audacious-plugins-1.3.0-rc2/src/tta/id3.c
---- audacious-plugins-1.3.0-rc2.orig/src/tta/id3.c 2006-11-22 14:55:20 -0300
-+++ audacious-plugins-1.3.0-rc2/src/tta/id3.c 2007-02-27 03:17:09 -0300
-@@ -1,5 +1,4 @@
- #include <stdio.h>
--#include <malloc.h>
- #include <string.h>
- #include "ttalib.h"
- #include "id3genre.h"
\ No newline at end of file
+++ /dev/null
-Index: plugin.c
-===================================================================
---- src/madplug/plugin.c (revision 1699)
-+++ src/madplug/plugin.c (working copy)
-@@ -54,6 +54,21 @@
-
- extern gboolean scan_file(struct mad_info_t *info, gboolean fast);
-
-+static gint mp3_bitrate_table[5][16] = {
-+ { 0, 32, 64, 96, 128, 160, 192, 224, 256, 288, 320, 352, 384, 416, 448, -1 }, /* MPEG1 L1 */
-+ { 0, 32, 48, 56, 64, 80, 96, 112, 128, 160, 192, 224, 256, 320, 384, -1 }, /* MPEG1 L2 */
-+ { 0, 32, 40, 48, 56, 64, 80, 96, 112, 128, 160, 192, 224, 256, 320, -1 }, /* MPEG1 L3 */
-+ { 0, 32, 48, 56, 64, 80, 96, 112, 128, 144, 160, 176, 192, 224, 256, -1 }, /* MPEG2(.5) L1 */
-+ { 0, 8, 16, 24, 32, 40, 48, 56, 64, 80, 96, 112, 128, 144, 160, -1 } /* MPEG2(.5) L2,L3 */
-+};
-+
-+static gint mp3_samplerate_table[4][4] = {
-+ { 11025, 12000, 8000, -1 }, /* MPEG2.5 */
-+ { -1, -1, -1, -1 }, /* Reserved */
-+ { 22050, 24000, 16000, -1 }, /* MPEG2 */
-+ { 44100, 48000, 32000, -1 } /* MPEG1 */
-+};
-+
- /*
- * Function extname (filename)
- *
-@@ -162,32 +177,77 @@
- {
- }
-
--static gboolean mp3_head_check(guint32 head)
-+static gboolean mp3_head_check(guint32 head, gint *frameSize)
- {
-- /*
-- * First two bytes must be a sync header (11 bits all 1)
-- * http://www.mp3-tech.org/programmer/frame_header.html
-+ gint version, layer, bitIndex, bitRate, sampleIndex, sampleRate, padding;
-+
-+ /* http://www.mp3-tech.org/programmer/frame_header.html
-+ * Bits 21-31 must be set (frame sync)
- */
- if ((head & 0xffe00000) != 0xffe00000)
- return FALSE;
-
-- /* check if bits 18 and 19 are set */
-- if (!((head >> 17) & 3))
-- return FALSE;
-+ /* check if layer bits (17-18) are good */
-+ layer = (head >> 17) & 0x3;
-+ if (!layer)
-+ return FALSE; /* 00 = reserved */
-+ layer = 3 - layer;
-
-- /* check if bits 13 - 16 are all set */
-- if (((head >> 12) & 0xf) == 0xf)
-- return FALSE;
-+ /* check if bitrate index bits (12-15) are acceptable */
-+ bitIndex = (head >> 12) & 0xf;
-
-- /* check if bits 13 - 16 are all not set */
-- if (!((head >> 12) & 0xf))
-+ /* 1111 and 0000 are reserved values for all layers */
-+ if (bitIndex == 0xf || bitIndex == 0)
- return FALSE;
-
-- /* check if bit 11 and 12 are both set */
-- if (((head >> 10) & 0x3) == 0x3)
-+ /* check samplerate index bits (10-11) */
-+ sampleIndex = (head >> 10) & 0x3;
-+ if (sampleIndex == 0x3)
- return FALSE;
--
-- /* check if bits 17 - 20 are all set */
-+
-+ /* check version bits (19-20) and get bitRate */
-+ version = (head >> 19) & 0x03;
-+ switch (version) {
-+ case 0: /* 00 = MPEG Version 2.5 */
-+ case 2: /* 10 = MPEG Version 2 */
-+ if (layer == 1)
-+ bitRate = mp3_bitrate_table[3][bitIndex];
-+ else
-+ bitRate = mp3_bitrate_table[4][bitIndex];
-+ break;
-+
-+ case 1: /* 01 = reserved */
-+ return FALSE;
-+
-+ case 3: /* 11 = MPEG Version 1 */
-+ bitRate = mp3_bitrate_table[layer][bitIndex];
-+ break;
-+
-+ default:
-+ return FALSE;
-+ }
-+
-+ /* check layer II restrictions vs. bitrate */
-+ if (layer == 2) {
-+ gint chanMode = (head >> 6) & 0x3;
-+
-+ if (chanMode == 0x3) {
-+ /* single channel with bitrate > 192 */
-+ if (bitRate > 192)
-+ return FALSE;
-+ } else {
-+ /* any other mode with bitrates 32-56 and 80 */
-+ if (((bitRate >= 32 && bitRate <= 56) || bitRate == 80))
-+ return FALSE;
-+ }
-+ }
-+
-+ /* calculate approx. frame size */
-+ padding = (head >> 9) & 1;
-+ sampleRate = mp3_samplerate_table[version][sampleIndex];
-+ *frameSize = (144 * bitRate * 1000) / (sampleRate + padding);
-+
-+ /* check if bits 16 - 19 are all set (MPEG 1 Layer I, not protected?) */
- if (((head >> 19) & 1) == 1 &&
- ((head >> 17) & 3) == 3 && ((head >> 16) & 1) == 1)
- return FALSE;
-@@ -219,10 +279,10 @@
- {
- guint32 check;
- gchar *ext = extname(filename);
-- gint cyc = 0;
-+ gint cyc = 0, chkcount = 0, chksize = 4096;
- guchar buf[4];
- guchar tmp[4096];
-- gint ret, i;
-+ gint ret, i, frameSize;
-
- info.remote = FALSE;
-
-@@ -247,6 +307,7 @@
- gchar *tmp = g_filename_to_utf8(filename, -1, NULL, NULL, NULL);
- g_message("vfs_fread failed @1 %s", tmp);
- g_free(tmp);
-+ return 0;
- }
-
- check = mp3_head_convert(buf);
-@@ -262,29 +323,40 @@
- gchar *tmp = g_filename_to_utf8(filename, -1, NULL, NULL, NULL);
- g_message("vfs_fread failed @2 %s", tmp);
- g_free(tmp);
-+ return 0;
- }
-
- if (memcmp(buf, "RMP3", 4) == 0)
- return 1;
- }
-
-- while (!mp3_head_check(check))
-+ // check data for frame header
-+ while (!mp3_head_check(check, &frameSize))
- {
-- if((ret = vfs_fread(tmp, 1, 4096, fin)) == 0){
-+ if((ret = vfs_fread(tmp, 1, chksize, fin)) == 0){
- gchar *tmp = g_filename_to_utf8(filename, -1, NULL, NULL, NULL);
- g_message("vfs_fread failed @3 %s", tmp);
- g_free(tmp);
-+ return 0;
- }
- for (i = 0; i < ret; i++)
- {
- check <<= 8;
- check |= tmp[i];
-
-- if (mp3_head_check(check))
-- return 1;
-+ if (mp3_head_check(check, &frameSize)) {
-+ /* when the first matching frame header is found, we check for
-+ * another frame by seeking to the approximate start of the
-+ * next header ... also reduce the check size.
-+ */
-+ if (++chkcount >= 3) return 1;
-+ vfs_fseek(fin, frameSize-4, SEEK_CUR);
-+ check = 0;
-+ chksize = 8;
-+ }
- }
-
-- if (++cyc > 1024)
-+ if (++cyc > 32)
- return 0;
- }
-
+++ /dev/null
-MD5 900f9732661fcd7f0a7f63d0a1e212e3 audacious-plugins-1.3.1.tgz 2905465
-RMD160 5d5169fc4caf5ee10374f42d925652cef73eca49 audacious-plugins-1.3.1.tgz 2905465
-SHA256 d882603786b5b5e41bdc6e481e8bdabb9cb86a29f411a4bc39078ea98c9a57a5 audacious-plugins-1.3.1.tgz 2905465
+++ /dev/null
-MD5 900f9732661fcd7f0a7f63d0a1e212e3 audacious-plugins-1.3.1.tgz 2905465
-RMD160 5d5169fc4caf5ee10374f42d925652cef73eca49 audacious-plugins-1.3.1.tgz 2905465
-SHA256 d882603786b5b5e41bdc6e481e8bdabb9cb86a29f411a4bc39078ea98c9a57a5 audacious-plugins-1.3.1.tgz 2905465
+++ /dev/null
-MD5 5cfcc2d02e811109b6233ce736722708 audacious-plugins-1.3.2.tgz 2962380
-RMD160 43fcb033d2de7c07f4e85b301f6b28f04067923d audacious-plugins-1.3.2.tgz 2962380
-SHA256 590ba683268e3f282abe9fb47b89a86de5e57a54cb2600a8f9aa5f8d42d79ec5 audacious-plugins-1.3.2.tgz 2962380
--- /dev/null
+MD5 520187b4840c534001604195ce603ed9 audacious-plugins-1.3.3.tgz 2963141
+RMD160 53b6f3156b76454f20c5084fbd35334f2a9397c3 audacious-plugins-1.3.3.tgz 2963141
+SHA256 67a968d77524f6d902a2180c31742e124fe27584dc7be2d4646dfe0fb0509580 audacious-plugins-1.3.3.tgz 2963141
projects / gentoo.git / commitdiff