From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1064215-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id CDD8E138335
for <garchives@archives.gentoo.org>; Sat, 29 Dec 2018 12:16:12 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id BFC80E09B1;
Sat, 29 Dec 2018 12:16:11 +0000 (UTC)
Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 83E00E09B1
for <gentoo-commits@lists.gentoo.org>; Sat, 29 Dec 2018 12:16:11 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 16700335CCF
for <gentoo-commits@lists.gentoo.org>; Sat, 29 Dec 2018 12:16:10 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 5228C4D3
for <gentoo-commits@lists.gentoo.org>; Sat, 29 Dec 2018 12:16:08 +0000 (UTC)
From: "James Le Cuirot" <chewi@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "James Le Cuirot" <chewi@gentoo.org>
Message-ID: <1546085750.b765dc5d03b45bba1756ef66a5350d3e87deb16c.chewi@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: games-emulation/dosbox/
X-VCS-Repository: repo/gentoo
X-VCS-Files: games-emulation/dosbox/dosbox-0.74_p20160629-r2.ebuild games-emulation/dosbox/dosbox-9999.ebuild
X-VCS-Directories: games-emulation/dosbox/
X-VCS-Committer: chewi
X-VCS-Committer-Name: James Le Cuirot
X-VCS-Revision: b765dc5d03b45bba1756ef66a5350d3e87deb16c
X-VCS-Branch: master
Date: Sat, 29 Dec 2018 12:16:08 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: fbfbed8a-73f1-4da2-adfb-849f235396ef
X-Archives-Hash: 8c7a214876db528cc0cc02bc83502c61
commit: b765dc5d03b45bba1756ef66a5350d3e87deb16c
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 29 12:01:55 2018 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sat Dec 29 12:15:50 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b765dc5d
games-emulation/dosbox: Make X11 dependency optional
The x11-libs/libX11 dependency was missing although this was
transitively covered by libsdl[X]. It's not really required though and
DOSBox detects it somewhat automagically. If libX11 is present but
libsdl was not built with X support then the build actually fails. For
these reasons, we have to forcibly disable X11 using an autoconf cache
variable.
Package-Manager: Portage-2.3.53, Repoman-2.3.12
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
games-emulation/dosbox/dosbox-0.74_p20160629-r2.ebuild | 6 ++++--
games-emulation/dosbox/dosbox-9999.ebuild | 4 +++-
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/games-emulation/dosbox/dosbox-0.74_p20160629-r2.ebuild b/games-emulation/dosbox/dosbox-0.74_p20160629-r2.ebuild
index d9dccc1aa6a..14138bcda6d 100644
--- a/games-emulation/dosbox/dosbox-0.74_p20160629-r2.ebuild
+++ b/games-emulation/dosbox/dosbox-0.74_p20160629-r2.ebuild
@@ -16,14 +16,15 @@ SRC_URI="mirror://gentoo/dosbox-code-0-${PATCH}-dosbox-trunk.zip
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
-IUSE="alsa debug glide hardened opengl"
+IUSE="alsa debug glide hardened opengl X"
RDEPEND="alsa? ( media-libs/alsa-lib )
glide? ( media-libs/openglide )
opengl? ( virtual/glu virtual/opengl )
debug? ( sys-libs/ncurses:0 )
+ X? ( x11-libs/libX11 )
media-libs/libpng:0
- media-libs/libsdl[joystick,opengl?,video,X]
+ media-libs/libsdl[joystick,opengl?,video,X?]
media-libs/sdl-net
media-libs/sdl-sound"
DEPEND="${RDEPEND}
@@ -44,6 +45,7 @@ src_prepare() {
src_configure() {
use glide && append-cppflags -I"${EPREFIX}"/usr/include/openglide
+ ac_cv_lib_X11_main=$(usex X yes no) \
econf \
$(use_enable alsa alsa-midi) \
$(use_enable !hardened dynamic-core) \
diff --git a/games-emulation/dosbox/dosbox-9999.ebuild b/games-emulation/dosbox/dosbox-9999.ebuild
index a5bfff9c4f3..c8d3998bd01 100644
--- a/games-emulation/dosbox/dosbox-9999.ebuild
+++ b/games-emulation/dosbox/dosbox-9999.ebuild
@@ -21,12 +21,13 @@ HOMEPAGE="http://dosbox.sourceforge.net/"
LICENSE="GPL-2"
SLOT="0"
-IUSE="alsa debug glide hardened opengl"
+IUSE="alsa debug glide hardened opengl X"
DEPEND="alsa? ( media-libs/alsa-lib )
glide? ( media-libs/openglide )
opengl? ( virtual/glu virtual/opengl )
debug? ( sys-libs/ncurses:0 )
+ X? ( x11-libs/libX11 )
media-libs/libpng:0
media-libs/libsdl[joystick,opengl?,video,X]
media-libs/sdl-net
@@ -50,6 +51,7 @@ src_prepare() {
src_configure() {
use glide && append-cppflags -I"${EPREFIX}"/usr/include/openglide
+ ac_cv_lib_X11_main=$(usex X yes no) \
econf \
$(use_enable alsa alsa-midi) \
$(use_enable !hardened dynamic-core) \