From owner-freebsd-x11@FreeBSD.ORG Tue Dec 17 18:00:07 2013 Return-Path: Delivered-To: x11@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 180561B2; Tue, 17 Dec 2013 18:00:07 +0000 (UTC) Received: from mail.xcllnt.net (mail.xcllnt.net [50.0.150.214]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id D1BB11CE5; Tue, 17 Dec 2013 18:00:06 +0000 (UTC) Received: from [172.29.9.178] ([66.129.239.13]) (authenticated bits=0) by mail.xcllnt.net (8.14.7/8.14.7) with ESMTP id rBHI04Xw023742 (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=NO); Tue, 17 Dec 2013 10:00:05 -0800 (PST) (envelope-from marcel@xcllnt.net) Content-Type: multipart/signed; boundary="Apple-Mail=_4C5410FC-4A23-4C11-A711-843C98A4DADC"; protocol="application/pgp-signature"; micalg=pgp-sha1 Mime-Version: 1.0 (Mac OS X Mail 7.1 \(1827\)) Subject: Re: [ia64] graphics/dri breaks poudriere bulk From: Marcel Moolenaar In-Reply-To: <52AF3BB9.708@freebsd.org> Date: Tue, 17 Dec 2013 09:59:59 -0800 Message-Id: <7123B344-DAC1-492D-9367-F53886959D09@xcllnt.net> References: <3E272052-D3D6-4684-9B31-E638A41C4858@xcllnt.net> <52AB9164.20807@freebsd.org> <52AB93C0.3040004@freebsd.org> <20131214061455.GY59496@kib.kiev.ua> <52AC3CF1.2030103@freebsd.org> <20131214112009.GZ59496@kib.kiev.ua> <52AC3F65.20305@freebsd.org> <20131214113240.GB59496@kib.kiev.ua> <52AC42BF.8000307@freebsd.org> <20131214114601.GC59496@kib.kiev.ua> <52AC4654.1060002@freebsd.org> <0D36CB89-5769-4160-A850-594925FFE609@xcllnt.net> <52AF3BB9.708@freebsd.org> To: Niclas Zeising X-Mailer: Apple Mail (2.1827) Cc: x11@FreeBSD.org X-BeenThere: freebsd-x11@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: X11 on FreeBSD -- maintaining and support List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Dec 2013 18:00:07 -0000 --Apple-Mail=_4C5410FC-4A23-4C11-A711-843C98A4DADC Content-Type: multipart/mixed; boundary="Apple-Mail=_1DC9C650-99BB-458E-905C-92A1F1D13B06" --Apple-Mail=_1DC9C650-99BB-458E-905C-92A1F1D13B06 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=iso-8859-1 On Dec 16, 2013, at 9:43 AM, Niclas Zeising wrote: >> >> Sorry for the delay. I concur with what kib@ said. I'll see about >> fixing libdrm and the Mesa ports. > > No worries. And thanks for looking at this, I can't test ia64 myself. > Just let me know if I can help in any way. See attached diff. The diff can also be found in my home-directory in the custer as: ~marcel/dri.diff This builds, installs and deinstalls workout errors nor warnings for both old and new XORG -- on ia64 that is. There's no impact on x86 that I can see. PowerPC should be better, but I don't know the state of the ports for PowerPC to say anything about it working or not. The only non-obvious change is the definition of NOUVEAU for libdrm. It always gets build on ia64, so doesn't seem to be related to KMS. Note: the makefiles are rather hard to read with all the nested conditionals. Maybe using an approach like the following can keep it readable: ALL_DRI_DRIVERS=${INTEL_DRIVERS} ${NON_INTEL_DRIVERS} DRI_DRIVERS_i386=${ALL_DRI_DRIVERS} DRI_DRIVERS_amd64=${ALL_DRI_DRIVERS} DRI_DRIVERS_ia64=${NON_INTEL_DRIVERS} DRI_DRIVERS_powerpc=RADEON SWRAST DRI_DRIVERS=${DRI_DRIVERS_${ARCH}} This can be combined with the handling of WITH_NEW_XORG, which then only has to set INTEL_DRIVERS, NON_INTEL_DRIVERS, etc appropriately. Anyway, such a change is not for me to do, because I'm not a maintainer :-) FYI, -- Marcel Moolenaar marcel@xcllnt.net --Apple-Mail=_1DC9C650-99BB-458E-905C-92A1F1D13B06 Content-Disposition: attachment; filename=dri.diff Content-Type: application/octet-stream; name="dri.diff" Content-Transfer-Encoding: 7bit Index: dri/Makefile =================================================================== --- dri/Makefile (revision 336738) +++ dri/Makefile (working copy) @@ -41,7 +41,7 @@ PLIST_SUB+= VERSION=${MESADISTVERSION} -.if ${ARCH} == amd64 || ${ARCH} == i386 || ${ARCH} == ia64 +.if ${ARCH} == amd64 || ${ARCH} == i386 DRI_DRIVERS= ${ALL_DRI_DRIVERS} .endif @@ -58,6 +58,9 @@ CONFIGURE_ARGS+=--enable-gallium-llvm=no --without-gallium-drivers PLIST_SUB+= GALLIUM="@comment " . endif +. if ${ARCH} == ia64 +DRI_DRIVERS= R200 RADEON SWRAST +.endif . if ${ARCH} == powerpc DRI_DRIVERS= RADEON SWRAST . endif @@ -65,6 +68,9 @@ DRI_DRIVERS= SWRAST . endif .else # !defined(WITH_NEW_XORG) +. if ${ARCH} == ia64 +DRI_DRIVERS= R200 RADEON SWRAST MACH64 MGA R128 R300 R600 SAVAGE SIS TDFX UNICHROME +.endif . if ${ARCH} == powerpc DRI_DRIVERS= MACH64 RADEON SWRAST TDFX . elif ${ARCH} == sparc64 Index: libdrm/Makefile =================================================================== --- libdrm/Makefile (revision 336738) +++ libdrm/Makefile (working copy) @@ -34,10 +34,10 @@ .if ${ARCH} == "amd64" || ${ARCH} == "i386" CONFIGURE_ARGS+=--enable-libkms EXTRA_PATCHES+= ${FILESDIR}/extra-xf86drmMode.c -PLIST_SUB+= KMS="" NOUVEAU="" +PLIST_SUB+= KMS="" .else CONFIGURE_ARGS+=--disable-libkms -PLIST_SUB+= KMS="@comment " NOUVEAU="@comment " +PLIST_SUB+= KMS="@comment " .endif .if ${PORT_OPTIONS:MMANPAGES} @@ -62,16 +62,21 @@ CONFIGURE_ARGS= --enable-nouveau-experimental-api LIBDRM_VERSION= 2.4.17 LIBDRM_REVISION=1 -PLIST_SUB+= OLD="" NEW="@comment " NOUVEAU="" +PLIST_SUB+= OLD="" NEW="@comment " .endif -.if ${ARCH} == "amd64" || ${ARCH} == "i386" || ${ARCH} == "ia64" || ${ARCH} == "powerpc" +PLIST_SUB+= NOUVEAU="" +.if ${ARCH} == "amd64" || ${ARCH} == "i386" PLIST_SUB+= INTEL_DRIVER="" PLIST_SUB+= RADEON_DRIVERS="" .else PLIST_SUB+= INTEL_DRIVER="@comment " +.if ${ARCH} == "ia64" || ${ARCH} == "powerpc" +PLIST_SUB+= RADEON_DRIVERS="" +.else PLIST_SUB+= RADEON_DRIVERS="@comment " .endif +.endif pre-patch: @${REINPLACE_CMD} 's|{libdir}/pkgconfig|{prefix}/libdata/pkgconfig|g; \ --Apple-Mail=_1DC9C650-99BB-458E-905C-92A1F1D13B06 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=iso-8859-1 --Apple-Mail=_1DC9C650-99BB-458E-905C-92A1F1D13B06-- --Apple-Mail=_4C5410FC-4A23-4C11-A711-843C98A4DADC Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=signature.asc Content-Type: application/pgp-signature; name=signature.asc Content-Description: Message signed with OpenPGP using GPGMail -----BEGIN PGP SIGNATURE----- Comment: GPGTools - http://gpgtools.org iEYEARECAAYFAlKwkR8ACgkQpgWlLWHuifa/4gCdFdtHDg12j+saoD56Znuf6qdA jbQAnAp5O8UUwn7/n6m1LlpZaAeHInyS =GA8I -----END PGP SIGNATURE----- --Apple-Mail=_4C5410FC-4A23-4C11-A711-843C98A4DADC--