diff options
| author |   Alfredo Tupone <tupone@gentoo.org> | 2011-06-06 22:10:05 +0000 |
|---|---|---|
| committer | Alfredo Tupone <tupone@gentoo.org> | 2011-06-06 22:10:05 +0000 |
| commit | a103f126c83fe3acf061dd3ba0a3edf92bde5dd1 (patch) | |
| tree | c1b43ff25ff04008a0edd7f74aadd5519ada4699 /media-libs | |
| parent | http://my.opera.com/desktopteam/blog/2011/06/06/post-search-and-platform-fixes (diff) | |
| download | gentoo-2-a103f126c83fe3acf061dd3ba0a3edf92bde5dd1.tar.gz gentoo-2-a103f126c83fe3acf061dd3ba0a3edf92bde5dd1.tar.bz2 gentoo-2-a103f126c83fe3acf061dd3ba0a3edf92bde5dd1.zip | |
Fix underlink. Bug #367673
(Portage version: 2.1.9.50/cvs/Linux x86_64)
Diffstat (limited to 'media-libs')
| -rw-r--r-- | media-libs/allegro/ChangeLog | 7 | ||||
| -rw-r--r-- | media-libs/allegro/allegro-4.4.1.1-r1.ebuild | 3 | ||||
| -rw-r--r-- | media-libs/allegro/allegro-5.0.1.ebuild | 4 | ||||
| -rw-r--r-- | media-libs/allegro/files/allegro-4.4.1.1-underlink.patch | 11 | ||||
| -rw-r--r-- | media-libs/allegro/files/allegro-5.0.1-underlink.patch | 11 |
5 files changed, 33 insertions, 3 deletions
diff --git a/media-libs/allegro/ChangeLog b/media-libs/allegro/ChangeLog index 1cf2b23d0663..3c2a8c178b2e 100644 --- a/media-libs/allegro/ChangeLog +++ b/media-libs/allegro/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-libs/allegro # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/allegro/ChangeLog,v 1.102 2011/04/02 11:52:01 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/allegro/ChangeLog,v 1.103 2011/06/06 22:10:05 tupone Exp $ + + 06 Jun 2011; Tupone Alfredo <tupone@gentoo.org> allegro-4.4.1.1-r1.ebuild, + +files/allegro-4.4.1.1-underlink.patch, allegro-5.0.1.ebuild, + +files/allegro-5.0.1-underlink.patch: + Fix underlink. Bug #367673 by Diego Elio Pettenò 02 Apr 2011; Raúl Porcel <armin76@gentoo.org> allegro-4.4.1.1-r1.ebuild: Drop ia64 keywords diff --git a/media-libs/allegro/allegro-4.4.1.1-r1.ebuild b/media-libs/allegro/allegro-4.4.1.1-r1.ebuild index 3929c9c1248c..6e7d296c297f 100644 --- a/media-libs/allegro/allegro-4.4.1.1-r1.ebuild +++ b/media-libs/allegro/allegro-4.4.1.1-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 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.11 2011/04/02 11:52:01 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/allegro/allegro-4.4.1.1-r1.ebuild,v 1.12 2011/06/06 22:10:05 tupone Exp $ EAPI=2 CMAKE_IN_SOURCE_BUILD=1 @@ -46,6 +46,7 @@ DEPEND="${RDEPEND} src_prepare() { epatch "${FILESDIR}"/${P}-shared.patch \ "${FILESDIR}"/${P}-optional_drivers.patch \ + "${FILESDIR}"/${P}-underlink.patch \ "${FILESDIR}"/${P}-rpath.patch sed -i \ diff --git a/media-libs/allegro/allegro-5.0.1.ebuild b/media-libs/allegro/allegro-5.0.1.ebuild index ff6e93614574..f63eee9d66b0 100644 --- a/media-libs/allegro/allegro-5.0.1.ebuild +++ b/media-libs/allegro/allegro-5.0.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/allegro/allegro-5.0.1.ebuild,v 1.4 2011/04/02 11:37:56 xarthisius Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/allegro/allegro-5.0.1.ebuild,v 1.5 2011/06/06 22:10:05 tupone Exp $ EAPI=2 inherit cmake-utils @@ -44,6 +44,8 @@ DEPEND="${RDEPEND} x11-proto/xproto )" +PATCHES=( "${FILESDIR}"/${P}-underlink.patch ) + src_configure() { local mycmakeargs=( $(cmake-utils_use_want alsa) diff --git a/media-libs/allegro/files/allegro-4.4.1.1-underlink.patch b/media-libs/allegro/files/allegro-4.4.1.1-underlink.patch new file mode 100644 index 000000000000..33dc9d260b2d --- /dev/null +++ b/media-libs/allegro/files/allegro-4.4.1.1-underlink.patch @@ -0,0 +1,11 @@ +--- CMakeLists.txt.old 2011-06-06 23:46:06.057320691 +0200 ++++ CMakeLists.txt 2011-06-06 23:46:21.900313261 +0200 +@@ -392,7 +392,7 @@ + message(FATAL_ERROR "Unix port requires pthreads support.") + endif() + set(ALLEGRO_HAVE_LIBPTHREAD 1) +- list(APPEND PLATFORM_LIBS m ${CMAKE_THREAD_LIBS_INIT}) ++ list(APPEND PLATFORM_LIBS dl m ${CMAKE_THREAD_LIBS_INIT}) + list(APPEND PLATFORM_SOURCES ${ALLEGRO_SRC_UNIX_FILES}) + + if(WANT_OSS) diff --git a/media-libs/allegro/files/allegro-5.0.1-underlink.patch b/media-libs/allegro/files/allegro-5.0.1-underlink.patch new file mode 100644 index 000000000000..7702c1d2c6db --- /dev/null +++ b/media-libs/allegro/files/allegro-5.0.1-underlink.patch @@ -0,0 +1,11 @@ +--- CMakeLists.txt.old 2011-06-06 23:56:09.367125536 +0200 ++++ CMakeLists.txt 2011-06-06 23:56:19.311748807 +0200 +@@ -703,7 +703,7 @@ + + if(ALLEGRO_UNIX) # not MACOSX + list(APPEND LIBRARY_SOURCES ${ALLEGRO_SRC_UNIX_FILES}) +- list(APPEND PLATFORM_LIBS m ${CMAKE_THREAD_LIBS_INIT}) ++ list(APPEND PLATFORM_LIBS dl m ${CMAKE_THREAD_LIBS_INIT}) + endif(ALLEGRO_UNIX) + + if(SUPPORT_X11) |