From 54637c717de2ee1a029ec718c5b53e6e0719ebab Mon Sep 17 00:00:00 2001 From: Michael Sterrett Date: Mon, 29 Feb 2016 01:33:22 -0500 Subject: [PATCH] media-libs/allegro: fix building with multilib with patch from Azamat H. Hackimov (bug #563152) Package-Manager: portage-2.2.26 --- media-libs/allegro/allegro-5.0.11.ebuild | 4 ++-- media-libs/allegro/files/allegro-5.0.11-multilib.patch | 10 ++++++++++ ...-underlink.patch => allegro-5.0.11-underlink.patch} | 0 3 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 media-libs/allegro/files/allegro-5.0.11-multilib.patch rename media-libs/allegro/files/{allegro-5.0.4-underlink.patch => allegro-5.0.11-underlink.patch} (100%) 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 similarity index 100% rename from media-libs/allegro/files/allegro-5.0.4-underlink.patch rename to media-libs/allegro/files/allegro-5.0.11-underlink.patch -- 2.26.2