From: Samuli Suominen Date: Wed, 17 Mar 2010 13:55:57 +0000 (+0000) Subject: Move loadpng.h back to /usr/include per upstream recommendation, #include "loadpng... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6e39140093b560c4309d16ca4fb678a4a06b9004;p=gentoo.git Move loadpng.h back to /usr/include per upstream recommendation, #include "loadpng.h" should pick correct one. Package-Manager: portage-2.2_rc67/cvs/Linux x86_64 --- diff --git a/media-libs/allegro/ChangeLog b/media-libs/allegro/ChangeLog index 2ca1d7160bef..cf342d2bc19e 100644 --- a/media-libs/allegro/ChangeLog +++ b/media-libs/allegro/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for media-libs/allegro # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/allegro/ChangeLog,v 1.89 2010/03/16 14:53:20 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/allegro/ChangeLog,v 1.90 2010/03/17 13:55:57 ssuominen Exp $ + +*allegro-4.4.1.1-r1 (17 Mar 2010) + + 17 Mar 2010; Samuli Suominen + +allegro-4.4.1.1-r1.ebuild: + Move loadpng.h back to /usr/include per upstream recommendation, #include + "loadpng.h" should pick correct one. 16 Mar 2010; Samuli Suominen allegro-4.4.1.1.ebuild, +files/allegro-4.4.1.1-rpath.patch: diff --git a/media-libs/allegro/Manifest b/media-libs/allegro/Manifest index e34f665d3b98..7cae2aba5453 100644 --- a/media-libs/allegro/Manifest +++ b/media-libs/allegro/Manifest @@ -8,6 +8,7 @@ AUX allegro-4.4.1.1-shared.patch 243 RMD160 88e5821d88b7e93091378af6766a91dc10da DIST allegro-4.2.2.tar.gz 3178406 RMD160 ea5b38f2eee95994bd134039822c6b0b6e78e04a SHA1 25e3854432cede0266632019ae912eb33cd18f8e SHA256 3e7fe701fa0fa99e0870e2c10e21e6592b0b58e6eb5e9844aff17db9a25d06a8 DIST allegro-4.4.1.1.tar.gz 4625438 RMD160 9167893e6ad33301bc23daeccb4fb899f16470d3 SHA1 1970570b54c4329c7bd6d103db01624c68f2e9be SHA256 4e29884cba88b289da5b22da93e8760d68a197d093b23f61e994f3594760d782 EBUILD allegro-4.2.2-r1.ebuild 2409 RMD160 f8ddf4422eef4fbabbb7278c7d750890589eaa5a SHA1 7a9f5b1ad2409485e2143654580ca421cbf7d463 SHA256 7cf7ce3594ed923dd4e4435c3d72378346fdce43d463251eeaa7f15208509f27 +EBUILD allegro-4.4.1.1-r1.ebuild 2624 RMD160 6485b85753be4e1f2226e3785db9bd62263fef28 SHA1 fce59dbd9bcf69405c980ec59930eeace1aff1e5 SHA256 32cd55513b464a8b42d4931b27f658c7335432411be7a0ae979be314db90af31 EBUILD allegro-4.4.1.1.ebuild 2897 RMD160 fe2295ce0300bfcf537a1c679f6c993be819aad7 SHA1 f00b4bdb1afe36e2425d944fbd3391af347ee0ed SHA256 ff11b417234cce6585aeeea7bdc8d39ce817e75c7311f26b86fc20afb0deb916 -MISC ChangeLog 11617 RMD160 6cb42d2095de79ab3615d99b4ed5384d6192e7ce SHA1 7448a8c1d30d361d3eba6b16c1510a4dfe3d84f5 SHA256 4f5b0333ecc1f720bf575e2186a4f48e905053989291ddd12beb7496c4528f56 +MISC ChangeLog 11852 RMD160 6ca0a89abf70e0f98433dbb7f7d131585026fe93 SHA1 ebefec1416cb1c73f3bdb8cee7609aa03196e229 SHA256 3cbd93578186228b58242e7947ec483472509b89c08369aade0c45f2ef22ba83 MISC metadata.xml 763 RMD160 df1a50a777f1771b0bda80595805ae299876b348 SHA1 b5aa55081543d69eca2a28bf89daffe1fb789d01 SHA256 36f46cc8c753f7334d34c94beaefd0eec0c6cd3774b5825ff9b946fedb6b218e diff --git a/media-libs/allegro/allegro-4.4.1.1-r1.ebuild b/media-libs/allegro/allegro-4.4.1.1-r1.ebuild new file mode 100644 index 000000000000..fe990f25812f --- /dev/null +++ b/media-libs/allegro/allegro-4.4.1.1-r1.ebuild @@ -0,0 +1,106 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-libs/allegro/allegro-4.4.1.1-r1.ebuild,v 1.1 2010/03/17 13:55:57 ssuominen Exp $ + +EAPI=2 +CMAKE_IN_SOURCE_BUILD=1 +inherit cmake-utils eutils + +DESCRIPTION="cross-platform multimedia library" +HOMEPAGE="http://alleg.sourceforge.net/" +SRC_URI="mirror://sourceforge/alleg/${P}.tar.gz" + +LICENSE="Allegro as-is GPL-2 ZLIB" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="alsa fbcon jack jpeg opengl oss png svga test +tools vga vorbis X" + +RDEPEND="alsa? ( media-libs/alsa-lib ) + jack? ( media-sound/jack-audio-connection-kit ) + jpeg? ( >=media-libs/jpeg-6b ) + png? ( >=media-libs/libpng-1.2 ) + svga? ( media-libs/svgalib ) + vorbis? ( media-libs/libvorbis ) + X? ( + x11-libs/libX11 + x11-libs/libXcursor + x11-libs/libXext + x11-libs/libXpm + x11-libs/libXt + x11-libs/libXxf86dga + x11-libs/libXxf86vm + opengl? ( virtual/opengl + virtual/glu ) + ) + !media-libs/allegrogl + !media-libs/jpgalleg" +DEPEND="${RDEPEND} + dev-util/pkgconfig + X? ( + x11-proto/xextproto + x11-proto/xf86dgaproto + x11-proto/xf86vidmodeproto + x11-proto/xproto + )" + +src_prepare() { + epatch "${FILESDIR}"/${P}-shared.patch \ + "${FILESDIR}"/${P}-optional_drivers.patch \ + "${FILESDIR}"/${P}-rpath.patch + + sed -i \ + -e "s:allegro-\${ALLEGRO_VERSION}:${PF}:" \ + docs/CMakeLists.txt || die +} + +src_configure() { + # WANT_LINUX_CONSOLE is by default OFF + # WANT_EXAMPLES doesn't install anything + + mycmakeargs=( + "-DDOCDIR=share/doc" + "-DINFODIR=share/info" + "-DMANDIR=share/man" + $(cmake-utils_use_want alsa) + "-DWANT_EXAMPLES=OFF" + $(cmake-utils_use_want jack) + $(cmake-utils_use_want jpeg JPGALLEG) + "-DWANT_LINUX_CONSOLE=OFF" + $(cmake-utils_use_want fbcon LINUX_FBCON) + $(cmake-utils_use_want svga LINUX_SVGALIB) + $(cmake-utils_use_want vga LINUX_VGA) + $(cmake-utils_use_want png LOADPNG) + $(cmake-utils_use_want vorbis LOGG) + $(cmake-utils_use_want oss) + $(cmake-utils_use_want test TESTS) + $(cmake-utils_use_want tools) + $(cmake-utils_use_want X X11) + ) + + if use X; then + mycmakeargs+=( + $(cmake-utils_use_want opengl ALLEGROGL) + ) + else + mycmakeargs+=( + "-DWANT_ALLEGROGL=OFF" + ) + fi + + cmake-utils_src_configure +} + +src_install() { + cmake-utils_src_install + + dohtml docs/html/*.html || die + doman docs/man/*.3 || die + + if use X; then + newbin setup/setup ${PN}-setup || die + insinto /usr/share/${PN} + doins {keyboard,language,setup/setup}.dat || die + newicon misc/icon.png ${PN}.png + make_desktop_entry ${PN}-setup "Allegro Setup" ${PN} "Settings" + fi +}