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

(Portage version: 2.2_rc67/cvs/Linux x86_64)

5 files changed, 175 insertions, 2 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/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>