diff options
| author |   Michael Sterrett <mr_bones_@gentoo.org> | 2016-02-29 01:33:22 -0500 |
|---|---|---|
| committer | Michael Sterrett <mr_bones_@gentoo.org> | 2016-02-29 01:43:06 -0500 |
| commit | 54637c717de2ee1a029ec718c5b53e6e0719ebab (patch) | |
| tree | 8be12eba7c24ef090f8e14ce2b21f13b3b9e38d4 | |
| parent | dev-libs/libmirage: clean up old (diff) | |
| download | gentoo-54637c717de2ee1a029ec718c5b53e6e0719ebab.tar.gz gentoo-54637c717de2ee1a029ec718c5b53e6e0719ebab.tar.bz2 gentoo-54637c717de2ee1a029ec718c5b53e6e0719ebab.zip | |
media-libs/allegro: fix building with multilib with patch from Azamat H. Hackimov (bug #563152)
Package-Manager: portage-2.2.26
| -rw-r--r-- | media-libs/allegro/allegro-5.0.11.ebuild | 4 | ||||
| -rw-r--r-- | media-libs/allegro/files/allegro-5.0.11-multilib.patch | 10 | ||||
| -rw-r--r-- | media-libs/allegro/files/allegro-5.0.11-underlink.patch (renamed from media-libs/allegro/files/allegro-5.0.4-underlink.patch) | 0 |
3 files changed, 12 insertions, 2 deletions
diff --git a/media-libs/allegro/allegro-5.0.11.ebuild b/media-libs/allegro/allegro-5.0.11.ebuild index 6d0496dabaa6..2ee1cc697820 100644 --- a/media-libs/allegro/allegro-5.0.11.ebuild +++ b/media-libs/allegro/allegro-5.0.11.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -39,7 +39,7 @@ DEPEND="${RDEPEND} >=x11-proto/xf86vidmodeproto-2.3.1-r1[${MULTILIB_USEDEP}] >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]" -PATCHES=( "${FILESDIR}"/${PN}-5.0.4-underlink.patch ) +PATCHES=( "${FILESDIR}"/${P}-{underlink,multilib}.patch ) MULTILIB_WRAPPED_HEADERS=( /usr/include/allegro5/allegro_native_dialog.h ) diff --git a/media-libs/allegro/files/allegro-5.0.11-multilib.patch b/media-libs/allegro/files/allegro-5.0.11-multilib.patch new file mode 100644 index 000000000000..ffb0c25fc8b6 --- /dev/null +++ b/media-libs/allegro/files/allegro-5.0.11-multilib.patch @@ -0,0 +1,10 @@ +--- CMakeLists.txt.old 2013-06-16 10:16:08.000000000 +0600 ++++ CMakeLists.txt 2016-02-25 14:32:40.350446191 +0500 +@@ -560,7 +560,6 @@ + endif(SUPPORT_X11 AND NOT SUPPORT_OPENGL) + + if(SUPPORT_X11) +- set(CMAKE_REQUIRED_LIBRARIES ${X11_LIBRARIES}) + + check_library_exists(Xcursor XcursorImageCreate "" CAN_XCURSOR) + if(CAN_XCURSOR) diff --git a/media-libs/allegro/files/allegro-5.0.4-underlink.patch b/media-libs/allegro/files/allegro-5.0.11-underlink.patch index 7702c1d2c6db..7702c1d2c6db 100644 --- a/media-libs/allegro/files/allegro-5.0.4-underlink.patch +++ b/media-libs/allegro/files/allegro-5.0.11-underlink.patch |