Version bump wrt #303711, thanks to Hubert Kowalski for reporting.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

6 files changed, 181 insertions, 4 deletions

diff --git a/media-libs/allegro/ChangeLog b/media-libs/allegro/ChangeLog
index 96ca0a00f057..3cc479799047 100644
--- a/media-libs/allegro/ChangeLog
+++ b/media-libs/allegro/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/allegro
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/allegro/ChangeLog,v 1.87 2009/11/11 06:59:44 mr_bones_ Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/allegro/ChangeLog,v 1.88 2010/03/16 14:01:16 ssuominen Exp $
+
+*allegro-4.4.1.1 (16 Mar 2010)
+
+  16 Mar 2010; Samuli Suominen <ssuominen@gentoo.org>
+  +allegro-4.4.1.1.ebuild, +files/allegro-4.4.1.1-optional_drivers.patch,
+  +files/allegro-4.4.1.1-shared.patch:
+  Version bump wrt #303711, thanks to Hubert Kowalski for reporting.
 
   11 Nov 2009; Michael Sterrett <mr_bones_@gentoo.org>
   allegro-4.2.2-r1.ebuild:
diff --git a/media-libs/allegro/Manifest b/media-libs/allegro/Manifest
index 69481c2c1e3a..66d3bb3b46ee 100644
--- a/media-libs/allegro/Manifest
+++ b/media-libs/allegro/Manifest
@@ -2,7 +2,11 @@ AUX allegro-4.2.2-autoconf.patch 1105 RMD160 bcf408f6f5f02feffb1cba96dc44dbfbc00
 AUX allegro-4.2.2-deplib.patch 587 RMD160 c3fc02e8fe00ac53ed50e3a86e19b3d58e75504b SHA1 b3cbebcfa6f9889d9abaf49de0d2e41c5f75ab9b SHA256 4d9d628488b938786c03dd9c07459ec8f5629ef5815350a2f8b8cad1bdaf1542
 AUX allegro-4.2.2-exec-stack.patch 4523 RMD160 71b77b6c29a46f478a731e7eff3b47285c89bd80 SHA1 6cd70fb48ca88df77a7bc00f5f5f2e37703b3cf4 SHA256 2d2924b847eac9bdf8cd43f56b11c53d62ae0b496e02d39b4bab6911ada4aa64
 AUX allegro-4.2.2-flags.patch 1776 RMD160 7f9610f4d8a1734eeffdc0835ed27a0d8d5189b6 SHA1 024645cef686d4c82b61518ea632783ec598f050 SHA256 85c869ba264f8d786045b0568b77acc7c7f929aa10f4d00f6b57941f2a1cf1ef
+AUX allegro-4.4.1.1-optional_drivers.patch 1500 RMD160 c3c261860fe46d62059cc4958d5019f493c6d27c SHA1 08c3dc9e9edf5fcd2834243c39d8296c5a9a0ee1 SHA256 b38d94cd954117b179bfb8e64001e7c687dc841314d525b99e5bd334a431c700
+AUX allegro-4.4.1.1-shared.patch 243 RMD160 88e5821d88b7e93091378af6766a91dc10daa727 SHA1 bc774db7b7e18b2d8611b205708eeb5c7a000752 SHA256 99c282c3c0377fafd613b81e3f3b13a817cabf1a7ab34219f1342a20c06c2d6d
 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
-MISC ChangeLog 11185 RMD160 ac45dce9e1ba108304db70b6cccca02e17e67667 SHA1 dcf5678a2ac3739fa83b0e2604ef0f492bc9b215 SHA256 1884b96eccb6061a1825562d27f63a4a166ecdc1346a69a2edce3d43abe5d9c4
-MISC metadata.xml 717 RMD160 f9b6c4bbade2f548e4ec6ea05d23e49b6fbfdf5e SHA1 e0671b5ddff48fb22b917e153fab2e92555ba534 SHA256 8ff21d29ac568f1603666f4266f2266a44a4e6e45555f62763607693fdc68f5a
+EBUILD allegro-4.4.1.1.ebuild 2591 RMD160 31ed8c165bfcefa1ab959d4a2d31299383fda0e3 SHA1 883c2c26344dae407801f8535a4d1cddaa7f5df4 SHA256 a360bc4af7e0169b0963f9a11867c33c3f5b65d0ae64d905ede6255c79ddd7a2
+MISC ChangeLog 11454 RMD160 495935fae06821d2c1682ab1c7c5bb5661b0bed9 SHA1 2115f9640063c62c30c59dddeac29c4379f02deb SHA256 d67c99dcaf02fdf59fb1c21f31e427e39c4206837686c517290963bb3e3fdb69
+MISC metadata.xml 763 RMD160 df1a50a777f1771b0bda80595805ae299876b348 SHA1 b5aa55081543d69eca2a28bf89daffe1fb789d01 SHA256 36f46cc8c753f7334d34c94beaefd0eec0c6cd3774b5825ff9b946fedb6b218e
diff --git a/media-libs/allegro/allegro-4.4.1.1.ebuild b/media-libs/allegro/allegro-4.4.1.1.ebuild
new file mode 100644
index 000000000000..1b01fcdd752c
--- /dev/null
+++ b/media-libs/allegro/allegro-4.4.1.1.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.ebuild,v 1.1 2010/03/16 14:01:16 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
+
+	# loadpng.h is too common for /usr/include, see src_install
+	sed -i \
+		-e 's:-I${includedir}:-I${includedir}/loadpng:' \
+		misc/loadpng.pc.in || die
+
+	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
+
+	doman docs/man/*.3 || die
+
+	if use png; then
+		dodir /usr/include/loadpng
+		mv -vf "${D}"/usr/include/loadpng.h "${D}"/usr/include/loadpng || die
+	fi
+}
diff --git a/media-libs/allegro/files/allegro-4.4.1.1-optional_drivers.patch b/media-libs/allegro/files/allegro-4.4.1.1-optional_drivers.patch
new file mode 100644
index 000000000000..328ebb7b0bb0
--- /dev/null
+++ b/media-libs/allegro/files/allegro-4.4.1.1-optional_drivers.patch
@@ -0,0 +1,48 @@
+--- CMakeLists.txt
++++ CMakeLists.txt
+@@ -376,6 +376,10 @@
+ # Platform drivers
+ #
+ 
++option(WANT_OSS "Build OSS support" on)
++option(WANT_ALSA "Build ALSA support" on)
++option(WANT_JACK "Build JACK support" on)
++
+ set(PLATFORM_SOURCES)
+ set(PLATFORM_LIBS)              # always link with these libraries
+ set(PLATFORM_LIBS_NON_MODULES)  # only link with these if modules disabled
+@@ -391,13 +395,16 @@
+     list(APPEND PLATFORM_LIBS m ${CMAKE_THREAD_LIBS_INIT})
+     list(APPEND PLATFORM_SOURCES ${ALLEGRO_SRC_UNIX_FILES})
+ 
++    if(WANT_OSS)
+     include(AllegroFindOSS)
+     if(OSS_FOUND)
+         set(ALLEGRO_WITH_OSSDIGI 1)
+         set(ALLEGRO_WITH_OSSMIDI 1)
+         include_directories(SYSTEM ${OSS_INCLUDE_DIR})
+     endif(OSS_FOUND)
++    endif(WANT_OSS)
+ 
++    if(WANT_ALSA)
+     pkg_check_modules(ALSA alsa)
+     if(ALSA_FOUND)
+         # ALSA 0.5 is beyond obsolete.
+@@ -409,7 +416,9 @@
+         add_our_module(alleg-alsadigi src/unix/alsa9.c ${ALSA_LIBRARIES})
+         add_our_module(alleg-alsamidi src/unix/alsamidi.c ${ALSA_LIBRARIES})
+     endif(ALSA_FOUND)
++    endif(WANT_ALSA)
+ 
++    if(WANT_JACK)
+     pkg_check_modules(JACK jack)
+     if(JACK_FOUND)
+         set(ALLEGRO_WITH_JACKDIGI 1)
+@@ -417,6 +426,7 @@
+         list(APPEND PLATFORM_LIBS_NON_MODULES ${JACK_LIBRARIES})
+         add_our_module(alleg-jack src/unix/jack.c ${JACK_LIBRARIES})
+     endif(JACK_FOUND)
++    endif(WANT_JACK)
+ 
+     # This is untested.
+     check_library_exists(audio alOpenPort "" SGIAUDIO_FOUND)
diff --git a/media-libs/allegro/files/allegro-4.4.1.1-shared.patch b/media-libs/allegro/files/allegro-4.4.1.1-shared.patch
new file mode 100644
index 000000000000..665c03e31204
--- /dev/null
+++ b/media-libs/allegro/files/allegro-4.4.1.1-shared.patch
@@ -0,0 +1,11 @@
+--- CMakeLists.txt
++++ CMakeLists.txt
+@@ -830,7 +830,7 @@
+ option(WANT_LOGG "Enable logg" on)
+ option(WANT_JPGALLEG "Enable JPGAlleg" on)
+ 
+-if(WANT_FRAMEWORKS)
++if(SHARED)
+     set(ADDON_LINKAGE SHARED)
+ else()
+     set(ADDON_LINKAGE STATIC)
diff --git a/media-libs/allegro/metadata.xml b/media-libs/allegro/metadata.xml
index 330ce910d9b2..975ae5435cd3 100644
--- a/media-libs/allegro/metadata.xml
+++ b/media-libs/allegro/metadata.xml
@@ -13,5 +13,6 @@ and a GUI.
 </longdescription>
   <use>
     <flag name="vga">Enables the VGA graphics driver</flag>
+	<flag name="tools">Enable extra tools</flag>
   </use>
 </pkgmetadata>