Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.netbsd.org", Issuer "Postmaster NetBSD.org" (verified OK)) by mollari.NetBSD.org (Postfix) with ESMTPS id 5B7D67A272 for ; Sat, 3 Jun 2017 07:54:09 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id C2D6C84DF5; Sat, 3 Jun 2017 07:54:08 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 51B3184DE5 for ; Sat, 3 Jun 2017 07:54:08 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id hyQXafvkO6sv for ; Sat, 3 Jun 2017 07:54:07 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id A990384CEE for ; Sat, 3 Jun 2017 07:54:07 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id A1748FBEE; Sat, 3 Jun 2017 07:54:07 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1496476447268460" MIME-Version: 1.0 Date: Sat, 3 Jun 2017 07:54:07 +0000 From: "Maya Rashish" Subject: CVS commit: pkgsrc/graphics/libepoxy To: pkgsrc-changes@NetBSD.org Reply-To: maya@netbsd.org X-Mailer: log_accum Message-Id: <20170603075407.A1748FBEE@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1496476447268460 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: maya Date: Sat Jun 3 07:54:07 UTC 2017 Modified Files: pkgsrc/graphics/libepoxy: Makefile Log Message: libepoxy: set PLIST.egl=yes in the Darwin case in case it's supported. simplify logic. only functional change should be fixing Darwin builds. To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 pkgsrc/graphics/libepoxy/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1496476447268460 Content-Disposition: inline Content-Length: 1169 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/graphics/libepoxy/Makefile diff -u pkgsrc/graphics/libepoxy/Makefile:1.21 pkgsrc/graphics/libepoxy/Makefile:1.22 --- pkgsrc/graphics/libepoxy/Makefile:1.21 Fri May 26 17:40:44 2017 +++ pkgsrc/graphics/libepoxy/Makefile Sat Jun 3 07:54:07 2017 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2017/05/26 17:40:44 adam Exp $ +# $NetBSD: Makefile,v 1.22 2017/06/03 07:54:07 maya Exp $ DISTNAME= libepoxy-1.4.2 CATEGORIES= graphics @@ -33,16 +33,13 @@ CONFIGURE_ARGS+= --enable-glx=yes PLIST.glx= yes .include "../../graphics/MesaLib/buildlink3.mk" .include "../../x11/libX11/buildlink3.mk" -. if ${OPSYS} == "Darwin" -CONFIGURE_ARGS+= --enable-egl=${MESALIB_SUPPORTS_EGL} -. if ${X11_TYPE} == "modular" -CPPFLAGS+= -DGLX_LIB=\"${PREFIX}/lib/libGL.dylib\" -. endif -. else # ! Darwin + CONFIGURE_ARGS+= --enable-egl=${MESALIB_SUPPORTS_EGL} -. if !empty(MESALIB_SUPPORTS_EGL:Myes) +. if !empty(MESALIB_SUPPORTS_EGL:Myes) PLIST.egl= yes -. endif +. endif +. if ${OPSYS} == "Darwin" && ${X11_TYPE} == "modular" +CPPFLAGS+= -DGLX_LIB=\"${PREFIX}/lib/libGL.dylib\" . endif .else # ! x11 CONFIGURE_ARGS+= --enable-glx=no --_----------=_1496476447268460--