| 1 |
commit: 54637c717de2ee1a029ec718c5b53e6e0719ebab |
| 2 |
Author: Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Feb 29 06:33:22 2016 +0000 |
| 4 |
Commit: Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Feb 29 06:43:06 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54637c71 |
| 7 |
|
| 8 |
media-libs/allegro: fix building with multilib with patch from Azamat H. Hackimov (bug #563152) |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.26 |
| 11 |
|
| 12 |
media-libs/allegro/allegro-5.0.11.ebuild | 4 ++-- |
| 13 |
media-libs/allegro/files/allegro-5.0.11-multilib.patch | 10 ++++++++++ |
| 14 |
...ro-5.0.4-underlink.patch => allegro-5.0.11-underlink.patch} | 0 |
| 15 |
3 files changed, 12 insertions(+), 2 deletions(-) |
| 16 |
|
| 17 |
diff --git a/media-libs/allegro/allegro-5.0.11.ebuild b/media-libs/allegro/allegro-5.0.11.ebuild |
| 18 |
index 6d0496d..2ee1cc6 100644 |
| 19 |
--- a/media-libs/allegro/allegro-5.0.11.ebuild |
| 20 |
+++ b/media-libs/allegro/allegro-5.0.11.ebuild |
| 21 |
@@ -1,4 +1,4 @@ |
| 22 |
-# Copyright 1999-2015 Gentoo Foundation |
| 23 |
+# Copyright 1999-2016 Gentoo Foundation |
| 24 |
# Distributed under the terms of the GNU General Public License v2 |
| 25 |
# $Id$ |
| 26 |
|
| 27 |
@@ -39,7 +39,7 @@ DEPEND="${RDEPEND} |
| 28 |
>=x11-proto/xf86vidmodeproto-2.3.1-r1[${MULTILIB_USEDEP}] |
| 29 |
>=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]" |
| 30 |
|
| 31 |
-PATCHES=( "${FILESDIR}"/${PN}-5.0.4-underlink.patch ) |
| 32 |
+PATCHES=( "${FILESDIR}"/${P}-{underlink,multilib}.patch ) |
| 33 |
|
| 34 |
MULTILIB_WRAPPED_HEADERS=( /usr/include/allegro5/allegro_native_dialog.h ) |
| 35 |
|
| 36 |
|
| 37 |
diff --git a/media-libs/allegro/files/allegro-5.0.11-multilib.patch b/media-libs/allegro/files/allegro-5.0.11-multilib.patch |
| 38 |
new file mode 100644 |
| 39 |
index 0000000..ffb0c25 |
| 40 |
--- /dev/null |
| 41 |
+++ b/media-libs/allegro/files/allegro-5.0.11-multilib.patch |
| 42 |
@@ -0,0 +1,10 @@ |
| 43 |
+--- CMakeLists.txt.old 2013-06-16 10:16:08.000000000 +0600 |
| 44 |
++++ CMakeLists.txt 2016-02-25 14:32:40.350446191 +0500 |
| 45 |
+@@ -560,7 +560,6 @@ |
| 46 |
+ endif(SUPPORT_X11 AND NOT SUPPORT_OPENGL) |
| 47 |
+ |
| 48 |
+ if(SUPPORT_X11) |
| 49 |
+- set(CMAKE_REQUIRED_LIBRARIES ${X11_LIBRARIES}) |
| 50 |
+ |
| 51 |
+ check_library_exists(Xcursor XcursorImageCreate "" CAN_XCURSOR) |
| 52 |
+ if(CAN_XCURSOR) |
| 53 |
|
| 54 |
diff --git a/media-libs/allegro/files/allegro-5.0.4-underlink.patch b/media-libs/allegro/files/allegro-5.0.11-underlink.patch |
| 55 |
similarity index 100% |
| 56 |
rename from media-libs/allegro/files/allegro-5.0.4-underlink.patch |
| 57 |
rename to media-libs/allegro/files/allegro-5.0.11-underlink.patch |
Archives