From: Matsuu Takuto Date: Thu, 16 Nov 2006 16:49:50 +0000 (+0000) Subject: Fixed compilation failure, bug #154734. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0850b664830a6dfb328d48df382f0587afa5a3d7;p=gentoo.git Fixed compilation failure, bug #154734. Package-Manager: portage-2.1.1-r1 --- diff --git a/media-sound/audacity/ChangeLog b/media-sound/audacity/ChangeLog index d661599ff4eb..48b9242941ec 100644 --- a/media-sound/audacity/ChangeLog +++ b/media-sound/audacity/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for media-sound/audacity # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/audacity/ChangeLog,v 1.51 2006/11/10 16:36:18 dberkholz Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/audacity/ChangeLog,v 1.52 2006/11/16 16:49:50 matsuu Exp $ + +*audacity-1.3.2-r1 (16 Nov 2006) + + 16 Nov 2006; MATSUU Takuto + +files/audacity-1.3.2-disable-optimization.patch, + +audacity-1.3.2-r1.ebuild: + Fixed compilation failure, bug #154734. 10 Nov 2006; Donnie Berkholz ; audacity-1.3.2.ebuild: diff --git a/media-sound/audacity/Manifest b/media-sound/audacity/Manifest index 9e76da212408..fd0f90d02d21 100644 --- a/media-sound/audacity/Manifest +++ b/media-sound/audacity/Manifest @@ -6,6 +6,10 @@ AUX audacity-1.3.0b-x86.patch 1278 RMD160 3b9a2af0fc9c4c4b6287112cd035205c6eb508 MD5 7824e4b13601ac393e05a72a195ef97b files/audacity-1.3.0b-x86.patch 1278 RMD160 3b9a2af0fc9c4c4b6287112cd035205c6eb508c7 files/audacity-1.3.0b-x86.patch 1278 SHA256 865b06b9089d5fc0af194268316aa09deba80fabb1e058708d13e47f364e5dea files/audacity-1.3.0b-x86.patch 1278 +AUX audacity-1.3.2-disable-optimization.patch 728 RMD160 263c163c26b26851e7ebb6967c8ee20f3346744a SHA1 e127caf717baab7ff184bae78d646bb93dcf8c43 SHA256 312feb7a326bbfb167673976122ddc3d1283e6fde7cd93ae248a6b9a93401246 +MD5 94db7bade2576db7f3154d3f3a0326e5 files/audacity-1.3.2-disable-optimization.patch 728 +RMD160 263c163c26b26851e7ebb6967c8ee20f3346744a files/audacity-1.3.2-disable-optimization.patch 728 +SHA256 312feb7a326bbfb167673976122ddc3d1283e6fde7cd93ae248a6b9a93401246 files/audacity-1.3.2-disable-optimization.patch 728 AUX audacity-1.3.2-gentoo.patch 2622 RMD160 a20d0f882f74f60a8ef7b684baa3df07f1ffab11 SHA1 4a3f3aa0da30cb295a4551d72622975ec34f7367 SHA256 f70e26e8210d45eb0be48fbe5f683beec03bfda4620792c49ceff630d8ac8259 MD5 42377fd09f1b0b5ed3886549bbb4f088 files/audacity-1.3.2-gentoo.patch 2622 RMD160 a20d0f882f74f60a8ef7b684baa3df07f1ffab11 files/audacity-1.3.2-gentoo.patch 2622 @@ -20,14 +24,18 @@ EBUILD audacity-1.3.0b.ebuild 1590 RMD160 9db875326c079bbe354d57e356e80042a0e177 MD5 3112308da3a84bb03bac837256f6d824 audacity-1.3.0b.ebuild 1590 RMD160 9db875326c079bbe354d57e356e80042a0e177c1 audacity-1.3.0b.ebuild 1590 SHA256 834dc0652f8d18e683738a2d06093a9f73120972e6d40aee9d6ab30c759ce0b0 audacity-1.3.0b.ebuild 1590 +EBUILD audacity-1.3.2-r1.ebuild 1990 RMD160 08a804ce841814a953860065f1ea0de4039dc3b1 SHA1 7b38231ab9bf3572f3dc94a64c740d4f7fb8f317 SHA256 93f311d2653a5796b5f6167188bcc6f97cc5233c453cd3bafa6ef841ff52d077 +MD5 baa8dc289307da7ae60597cc317ad96c audacity-1.3.2-r1.ebuild 1990 +RMD160 08a804ce841814a953860065f1ea0de4039dc3b1 audacity-1.3.2-r1.ebuild 1990 +SHA256 93f311d2653a5796b5f6167188bcc6f97cc5233c453cd3bafa6ef841ff52d077 audacity-1.3.2-r1.ebuild 1990 EBUILD audacity-1.3.2.ebuild 1904 RMD160 a1b28b8eef1e91d2b2b92b2139f7f1da777e56a4 SHA1 5cb230b3b0c9b4e0ead71cf45edb50f27501496e SHA256 f2735965bcb6986a26d51171df34ff51e3df8b783b298143291f9a5be70abbfa MD5 92a7997a97b27486bfa8b8649647b6ed audacity-1.3.2.ebuild 1904 RMD160 a1b28b8eef1e91d2b2b92b2139f7f1da777e56a4 audacity-1.3.2.ebuild 1904 SHA256 f2735965bcb6986a26d51171df34ff51e3df8b783b298143291f9a5be70abbfa audacity-1.3.2.ebuild 1904 -MISC ChangeLog 9553 RMD160 cdb9aeea1834228b0445e17040e0a7b19b8d98e6 SHA1 b07eec74b738bc68a7740a6056a52eb2dc11bb04 SHA256 e171671490f2e083367bbf45346c6818f5c5aed77ec78dd4d15e7f3f76042a32 -MD5 5cd6443948b4aeb87c957b7426fef78a ChangeLog 9553 -RMD160 cdb9aeea1834228b0445e17040e0a7b19b8d98e6 ChangeLog 9553 -SHA256 e171671490f2e083367bbf45346c6818f5c5aed77ec78dd4d15e7f3f76042a32 ChangeLog 9553 +MISC ChangeLog 9757 RMD160 86c4c0d259d338b65c84899f4beb61edd166eed3 SHA1 e4d6b2aaf4aa2095270b15e125d496831c081a3d SHA256 18f8993412cc20da719f59d8b31c14929eb40873b2f7f9f93dece1d2e143ae60 +MD5 ee24197f124ca8c30e69399ae5e6816e ChangeLog 9757 +RMD160 86c4c0d259d338b65c84899f4beb61edd166eed3 ChangeLog 9757 +SHA256 18f8993412cc20da719f59d8b31c14929eb40873b2f7f9f93dece1d2e143ae60 ChangeLog 9757 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e metadata.xml 158 @@ -38,3 +46,6 @@ SHA256 6b57e9e5b74084d73ba901bf32af44a0e9b4bf4eb1da81905f1f7ae523d91e27 files/di MD5 e4cb0c698f065ef88bab1eba174707aa files/digest-audacity-1.3.2 259 RMD160 8c96101c6f992bb514996875537ada9adde0edab files/digest-audacity-1.3.2 259 SHA256 707a1fdb467f1d843eb4978eac90c42d2a428918549578c186d6c568808aaaa5 files/digest-audacity-1.3.2 259 +MD5 e4cb0c698f065ef88bab1eba174707aa files/digest-audacity-1.3.2-r1 259 +RMD160 8c96101c6f992bb514996875537ada9adde0edab files/digest-audacity-1.3.2-r1 259 +SHA256 707a1fdb467f1d843eb4978eac90c42d2a428918549578c186d6c568808aaaa5 files/digest-audacity-1.3.2-r1 259 diff --git a/media-sound/audacity/audacity-1.3.2-r1.ebuild b/media-sound/audacity/audacity-1.3.2-r1.ebuild new file mode 100644 index 000000000000..e3d35af64924 --- /dev/null +++ b/media-sound/audacity/audacity-1.3.2-r1.ebuild @@ -0,0 +1,85 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-sound/audacity/audacity-1.3.2-r1.ebuild,v 1.1 2006/11/16 16:49:50 matsuu Exp $ + +inherit eutils autotools + +IUSE="flac ladspa libsamplerate mp3 sse unicode vorbis" + +MY_P="${PN}-src-${PV}" +DESCRIPTION="Free crossplatform audio editor" +HOMEPAGE="http://audacity.sourceforge.net/" +SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86" +RESTRICT="test" + +DEPEND=">=x11-libs/wxGTK-2.6 + >=app-arch/zip-2.3 + dev-libs/expat + vorbis? ( >=media-libs/libvorbis-1.0 ) + mp3? ( >=media-libs/libmad-0.14.2b + media-libs/libid3tag ) + flac? ( media-libs/flac ) + >=media-libs/libsndfile-1.0.0 + libsamplerate? ( >=media-libs/libsamplerate-0.1.2 )" +RDEPEND="${DEPEND} + mp3? ( >=media-sound/lame-3.70 )" + +S="${WORKDIR}/${MY_P}-beta" + +src_unpack() { + unpack ${A} + + cd "${S}" + epatch "${FILESDIR}"/${P}-gentoo.patch + if ! use sse ; then + epatch "${FILESDIR}"/${P}-no-msse.patch + epatch "${FILESDIR}"/${P}-disable-optimization.patch + fi + + eautoreconf || die + pushd "${S}"/lib-src/soundtouch + eautoreconf + popd +} + +src_compile() { + local myconf + + myconf="${myconf} --with-libsndfile=system" + myconf="${myconf} --with-libexpat=system" + + if use libsamplerate ; then + myconf="${myconf} --with-libsamplerate=system --without-libresample" + else + myconf="${myconf} --without-libsamplerate" # --with-libresample=local + fi + + econf \ + $(use_enable unicode) \ + $(use_with ladspa) \ + $(use_with vorbis vorbis system) \ + $(use_with mp3 libmad system) \ + $(use_with mp3 id3tag system) \ + $(use_with flac flac system) \ + ${myconf} || die + + # parallel borks + emake -j1 || die +} + +src_install() { + emake DESTDIR="${D}" install || die + + # Remove bad doc install + rm -rf "${D}"/usr/share/doc + + # Install our docs + dodoc README.txt + + insinto /usr/share/audacity/ + newins images/AudacityLogo48x48.xpm audacity.xpm +} diff --git a/media-sound/audacity/files/audacity-1.3.2-disable-optimization.patch b/media-sound/audacity/files/audacity-1.3.2-disable-optimization.patch new file mode 100644 index 000000000000..98583ce74db0 --- /dev/null +++ b/media-sound/audacity/files/audacity-1.3.2-disable-optimization.patch @@ -0,0 +1,11 @@ +diff -Naur audacity-src-1.3.2-beta.orig/lib-src/soundtouch/include/STTypes.h audacity-src-1.3.2-beta/lib-src/soundtouch/include/STTypes.h +--- audacity-src-1.3.2-beta.orig/lib-src/soundtouch/include/STTypes.h 2006-10-29 08:06:01.000000000 +0900 ++++ audacity-src-1.3.2-beta/lib-src/soundtouch/include/STTypes.h 2006-11-17 01:27:15.000000000 +0900 +@@ -92,7 +92,6 @@ + /// However, if you're having difficulties getting the optimized routines + /// compiled with your compler (e.g. some gcc compiler versions may be picky), + /// you may wish to disable the optimizations to make the library compile. +- #define ALLOW_OPTIMIZATIONS 1 + + + // If defined, allows the SIMD-optimized routines to take minor shortcuts diff --git a/media-sound/audacity/files/digest-audacity-1.3.2-r1 b/media-sound/audacity/files/digest-audacity-1.3.2-r1 new file mode 100644 index 000000000000..760a330b81a9 --- /dev/null +++ b/media-sound/audacity/files/digest-audacity-1.3.2-r1 @@ -0,0 +1,3 @@ +MD5 bf63673140254f1283dfd55b61ff2422 audacity-src-1.3.2.tar.gz 6683449 +RMD160 b61747103675881bdf32762deea7635a2827b0de audacity-src-1.3.2.tar.gz 6683449 +SHA256 aa37c00014ee79516fb5dce4c56e1038a7eaf5ad22a10743f0609ed186baf621 audacity-src-1.3.2.tar.gz 6683449