From: Diego Elio Pettenò Date: Sun, 18 Jun 2006 11:44:23 +0000 (+0000) Subject: Add patch to fix strict-aliasing breakage. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b93bbe01501b21fae10ae590d21831e5a4b30936;p=gentoo.git Add patch to fix strict-aliasing breakage. Package-Manager: portage-2.1.1_pre1 --- diff --git a/media-sound/amarok/ChangeLog b/media-sound/amarok/ChangeLog index b22545510c87..51c858a4b17b 100644 --- a/media-sound/amarok/ChangeLog +++ b/media-sound/amarok/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for media-sound/amarok # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.141 2006/06/08 11:52:22 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.142 2006/06/18 11:44:23 flameeyes Exp $ + +*amarok-1.4.0a-r1 (18 Jun 2006) + + 18 Jun 2006; Diego Pettenò + +files/amarok-1.4.0a-strict-aliasing.patch, +amarok-1.4.0a-r1.ebuild: + Add patch to fix strict-aliasing breakage. 08 Jun 2006; Diego Pettenò amarok-1.4.0a.ebuild: Update description line for 1.4.0a ebuild as now it's Amarok rather than diff --git a/media-sound/amarok/Manifest b/media-sound/amarok/Manifest index e179e9698821..2e11395f8974 100644 --- a/media-sound/amarok/Manifest +++ b/media-sound/amarok/Manifest @@ -1,20 +1,28 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 +AUX amarok-1.4.0a-strict-aliasing.patch 435 RMD160 6c3ee58300525889b786b2220a2457d02ac665dd SHA1 5bf970810d683e84e18c8808c2b648e69e4030ab SHA256 72069f37be46abf539b10ab937abe5e3eaf77d5ee973dfdbf203bdb031506cf5 +MD5 6a938d8f94e5b0faeb25349df3416c2f files/amarok-1.4.0a-strict-aliasing.patch 435 +RMD160 6c3ee58300525889b786b2220a2457d02ac665dd files/amarok-1.4.0a-strict-aliasing.patch 435 +SHA256 72069f37be46abf539b10ab937abe5e3eaf77d5ee973dfdbf203bdb031506cf5 files/amarok-1.4.0a-strict-aliasing.patch 435 DIST amarok-1.3.8.tar.bz2 8728423 RMD160 14c5e38a515b4ebb11dd93f74511fa2f6247809b SHA1 08fbf6637593c41bf33f580633f75e343d4053e4 SHA256 6159837fd52c56bd00855cdd8ae8ba85f803572571ebb86efb01bf36e898a0a1 DIST amarok-1.4.0a.tar.bz2 13045009 RMD160 47ae8f9e23aec02f825fe3791eae63520f56394e SHA1 0274e7d7b780ab10c0d1357fe852d895d86dd409 SHA256 46d298226ff855c68b1d179d900441fd3c2329f42a938c3fc842a218ab762344 EBUILD amarok-1.3.8.ebuild 3850 RMD160 9d9204068051becdf48a4ba3cd376c47a09a6cb7 SHA1 2f0bf65799c3877f80c2aa4e15516da81be46897 SHA256 7ba5a17ce306f7a6382a53f0e561018c64a3199d27b82f90798517a32d97fd4f MD5 d0833753931e0f132fdc45289f4d2f92 amarok-1.3.8.ebuild 3850 RMD160 9d9204068051becdf48a4ba3cd376c47a09a6cb7 amarok-1.3.8.ebuild 3850 SHA256 7ba5a17ce306f7a6382a53f0e561018c64a3199d27b82f90798517a32d97fd4f amarok-1.3.8.ebuild 3850 +EBUILD amarok-1.4.0a-r1.ebuild 2492 RMD160 9d945a7756a04773ed1d782e180561a374e9da34 SHA1 28565a0853ab70919248999a634c061172ff36df SHA256 a0d30ab4295083193ddfe8c616008f5714375e1356cba06afd5940321d7fb356 +MD5 4051c2a83503960ab387d032e42b06be amarok-1.4.0a-r1.ebuild 2492 +RMD160 9d945a7756a04773ed1d782e180561a374e9da34 amarok-1.4.0a-r1.ebuild 2492 +SHA256 a0d30ab4295083193ddfe8c616008f5714375e1356cba06afd5940321d7fb356 amarok-1.4.0a-r1.ebuild 2492 EBUILD amarok-1.4.0a.ebuild 2439 RMD160 4619b596fc05550cdca4300acdf2f47b1df02cf5 SHA1 98e922321b645babb349a62f5e394ad2e4c27fc9 SHA256 9df3dbec5919fb9edf86234bfa890f6fbcad4a4d4132a4c7b35258126e6d4c51 MD5 66ff953ef493f59c74057c8fe535b2af amarok-1.4.0a.ebuild 2439 RMD160 4619b596fc05550cdca4300acdf2f47b1df02cf5 amarok-1.4.0a.ebuild 2439 SHA256 9df3dbec5919fb9edf86234bfa890f6fbcad4a4d4132a4c7b35258126e6d4c51 amarok-1.4.0a.ebuild 2439 -MISC ChangeLog 22689 RMD160 e2a6acf785d555527c781f3f7af54c16bb10fa7e SHA1 457906788090d3693f0fd2130f07de0a8d0b5d04 SHA256 384822ef8a68368ea51de3864f04417225ea9de5968b8f50d35d589d33d0e54b -MD5 12e6dd71e9ea4e8f428111c9a7692fcd ChangeLog 22689 -RMD160 e2a6acf785d555527c781f3f7af54c16bb10fa7e ChangeLog 22689 -SHA256 384822ef8a68368ea51de3864f04417225ea9de5968b8f50d35d589d33d0e54b ChangeLog 22689 +MISC ChangeLog 22893 RMD160 3410f9fa8786d735ae2cf09597cf1e63f8a9259e SHA1 500aa2c7920b9ac0611a80115e5056e37f12b488 SHA256 6ccd4eae57d384bd2da14fae00d990aa1a0752fc013ef1dd8d286386f27cf523 +MD5 d6b2d12cfd02d46be149200fb2de53e1 ChangeLog 22893 +RMD160 3410f9fa8786d735ae2cf09597cf1e63f8a9259e ChangeLog 22893 +SHA256 6ccd4eae57d384bd2da14fae00d990aa1a0752fc013ef1dd8d286386f27cf523 ChangeLog 22893 MISC metadata.xml 266 RMD160 3ce35cecb3927850e61ee5bad2e0e4b210c0df3e SHA1 d41658ffae344562e8579d219bd3f746d4cba624 SHA256 c2f316075bb660460a285a5474235615f5946bb47df6e6f0c9c4de9ed64edf26 MD5 986cc6d7e9a21474e34336045796ffaa metadata.xml 266 RMD160 3ce35cecb3927850e61ee5bad2e0e4b210c0df3e metadata.xml 266 @@ -25,10 +33,13 @@ SHA256 0904b3a3edc74467df4ec29c59ee0bb684eab9376ad863ab7a74b0323847bc53 files/di MD5 cdf1a1729e2f6c8062405c6312459f21 files/digest-amarok-1.4.0a 250 RMD160 1d3c3510efc7b822b36277d72e3131debd140f0d files/digest-amarok-1.4.0a 250 SHA256 f3b9961d6146de70b5f5c181f756e63fd23dbafdf7cfc254108ac7d876b304b2 files/digest-amarok-1.4.0a 250 +MD5 cdf1a1729e2f6c8062405c6312459f21 files/digest-amarok-1.4.0a-r1 250 +RMD160 1d3c3510efc7b822b36277d72e3131debd140f0d files/digest-amarok-1.4.0a-r1 250 +SHA256 f3b9961d6146de70b5f5c181f756e63fd23dbafdf7cfc254108ac7d876b304b2 files/digest-amarok-1.4.0a-r1 250 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.3 (GNU/Linux) -iD8DBQFEiA99AiZjviIA2XgRAivqAJ90z3ul+QXwT/RiLGdwi5DwcU3l0wCgxI1q -qII3r8IycJedDheqJF9QDDI= -=49By +iD8DBQFElTyfAiZjviIA2XgRAqFhAKDexPIXCVe1dhyqkjUEoW/0xMMQcQCfSQQH +4HXbjopqoy4RGf587cZBX2k= +=b1jW -----END PGP SIGNATURE----- diff --git a/media-sound/amarok/amarok-1.4.0a-r1.ebuild b/media-sound/amarok/amarok-1.4.0a-r1.ebuild new file mode 100644 index 000000000000..b37d4af01b78 --- /dev/null +++ b/media-sound/amarok/amarok-1.4.0a-r1.ebuild @@ -0,0 +1,84 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-1.4.0a-r1.ebuild,v 1.1 2006/06/18 11:44:23 flameeyes Exp $ + +LANGS="az bg br ca cs cy da de el en_GB es et fi fr ga gl he hi hu is it ja km +ko lt nb nl nn pa pl pt pt_BR ro ru rw sl sr sr@Latn sv ta tg th tr uk uz +zh_CN zh_TW" +LANGS_DOC="da de es et fr it nl pl pt pt_BR ru sv" + +USE_KEG_PACKAGING=1 + +inherit kde eutils flag-o-matic + +PKG_SUFFIX="" + +MY_PV="${PV/_rc/_RC}" +MY_PV="${MY_PV/_beta/-beta}${PKG_SUFFIX}" +MY_S="${PN}-${MY_PV/_RC*/}" +S="${WORKDIR}/${MY_S/0a/0}" + +DESCRIPTION="Advanced audio player based on KDE framework." +HOMEPAGE="http://amarok.kde.org/" + +if [[ ${MY_PV} == ${MY_PV/_RC*/} ]]; then + SRC_URI="mirror://sourceforge/amarok/${PN}-${MY_PV}.tar.bz2" +else + RESTRICT="nomirror" + SRC_URI="http://rokymotion.pwsp.net/nightly-builds/${MY_PV/_RC*/}/${PN}-${MY_PV}.tar.bz2" +fi +LICENSE="GPL-2" + +SLOT="0" +KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" +IUSE="aac exscalibar flac kde mysql noamazon opengl postgres +xmms visualization musicbrainz ipod ifp real" +# kde: enables compilation of the konqueror sidebar plugin + +DEPEND="kde? ( || ( kde-base/konqueror kde-base/kdebase ) ) + >=media-libs/xine-lib-1_rc4 + musicbrainz? ( >=media-libs/tunepimp-0.3 ) + >=media-libs/taglib-1.4 + mysql? ( >=dev-db/mysql-4.0.16 ) + postgres? ( dev-db/postgresql ) + opengl? ( virtual/opengl ) + xmms? ( >=media-sound/xmms-1.2 ) + visualization? ( media-libs/libsdl + =media-plugins/libvisual-plugins-0.2* ) + ipod? ( media-libs/libgpod ) + aac? ( media-libs/libmp4v2 ) + exscalibar? ( media-libs/exscalibar ) + ifp? ( media-libs/libifp ) + real? ( media-video/realplayer )" + +RDEPEND="${DEPEND} + dev-lang/ruby" + +DEPEND="${DEPEND} + >=dev-util/pkgconfig-0.9.0" + +need-kde 3.3 + +PATCHES="${FILESDIR}/${P}-strict-aliasing.patch" + +src_compile() { + append-flags -fno-inline + + # Extra, unsupported engines are forcefully disabled. + local myconf="$(use_enable mysql) $(use_enable postgres postgresql) + $(use_with opengl) $(use_with xmms) + $(use_with visualization libvisual) + $(use_enable !noamazon amazon) + $(use_with musicbrainz) + $(use_with exscalibar) + $(use_with ipod libgpod) + $(use_with aac mp4v2) + $(use_with ifp) + $(use_with real helix) + --with-xine + --without-mas + --without-nmm" + + kde_src_compile +} + diff --git a/media-sound/amarok/files/amarok-1.4.0a-strict-aliasing.patch b/media-sound/amarok/files/amarok-1.4.0a-strict-aliasing.patch new file mode 100644 index 000000000000..3a39ba957694 --- /dev/null +++ b/media-sound/amarok/files/amarok-1.4.0a-strict-aliasing.patch @@ -0,0 +1,14 @@ +Index: amarok-1.4.0/amarok/src/sqlite/Makefile.am +=================================================================== +--- amarok-1.4.0.orig/amarok/src/sqlite/Makefile.am ++++ amarok-1.4.0/amarok/src/sqlite/Makefile.am +@@ -7,7 +7,8 @@ KDE_CFLAGS = \ + libsqlite_la_CFLAGS = \ + $(all_includes) \ + -DTHREADSAFE=1 \ +- -DHAVE_USLEEP=1 ++ -DHAVE_USLEEP=1 \ ++ -fno-strict-aliasing + + libsqlite_la_LDFLAGS = \ + $(LIBPTHREAD) diff --git a/media-sound/amarok/files/digest-amarok-1.4.0a-r1 b/media-sound/amarok/files/digest-amarok-1.4.0a-r1 new file mode 100644 index 000000000000..c5817c537dba --- /dev/null +++ b/media-sound/amarok/files/digest-amarok-1.4.0a-r1 @@ -0,0 +1,3 @@ +MD5 3ceffe6465290eef618861cdb81b420a amarok-1.4.0a.tar.bz2 13045009 +RMD160 47ae8f9e23aec02f825fe3791eae63520f56394e amarok-1.4.0a.tar.bz2 13045009 +SHA256 46d298226ff855c68b1d179d900441fd3c2329f42a938c3fc842a218ab762344 amarok-1.4.0a.tar.bz2 13045009