From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id A58131388C0 for ; Mon, 29 Feb 2016 06:43:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 799ACE07E1; Mon, 29 Feb 2016 06:43:23 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1A9D6E07E1 for ; Mon, 29 Feb 2016 06:43:23 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EE8B8340B66 for ; Mon, 29 Feb 2016 06:43:20 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 91AA815E6 for ; Mon, 29 Feb 2016 06:43:18 +0000 (UTC) From: "Michael Sterrett" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Sterrett" Message-ID: <1456728186.54637c717de2ee1a029ec718c5b53e6e0719ebab.mr_bones_@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/allegro/, media-libs/allegro/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/allegro/allegro-5.0.11.ebuild media-libs/allegro/files/allegro-5.0.11-multilib.patch media-libs/allegro/files/allegro-5.0.11-underlink.patch media-libs/allegro/files/allegro-5.0.4-underlink.patch X-VCS-Directories: media-libs/allegro/ media-libs/allegro/files/ X-VCS-Committer: mr_bones_ X-VCS-Committer-Name: Michael Sterrett X-VCS-Revision: 54637c717de2ee1a029ec718c5b53e6e0719ebab X-VCS-Branch: master Date: Mon, 29 Feb 2016 06:43:18 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 9a49525b-b6d1-4787-b4a6-c6baa4ee0f2c X-Archives-Hash: 59c480a758f7c330b3b0b6afb8387cdb commit: 54637c717de2ee1a029ec718c5b53e6e0719ebab Author: Michael Sterrett gentoo org> AuthorDate: Mon Feb 29 06:33:22 2016 +0000 Commit: Michael Sterrett gentoo org> CommitDate: Mon Feb 29 06:43:06 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54637c71 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 ++++++++++ ...ro-5.0.4-underlink.patch => allegro-5.0.11-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 6d0496d..2ee1cc6 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 0000000..ffb0c25 --- /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