From owner-freebsd-x11@FreeBSD.ORG Sun Sep 8 08:58:09 2013 Return-Path: Delivered-To: x11@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 06B31A06 for ; Sun, 8 Sep 2013 08:58:09 +0000 (UTC) (envelope-from portscout@FreeBSD.org) Received: from portscout.freebsd.org (unknown [IPv6:2001:1900:2254:206a::50:123]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id E988E22C6 for ; Sun, 8 Sep 2013 08:58:08 +0000 (UTC) Received: from portscout.freebsd.org ([127.0.1.123]) by portscout.freebsd.org (8.14.7/8.14.7) with ESMTP id r888w8Em084586 for ; Sun, 8 Sep 2013 08:58:08 GMT (envelope-from portscout@portscout.freebsd.org) Received: (from portscout@localhost) by portscout.freebsd.org (8.14.7/8.14.6/Submit) id r888w8bf084585; Sun, 8 Sep 2013 08:58:08 GMT (envelope-from portscout) Message-Id: <201309080858.r888w8bf084585@portscout.freebsd.org> Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain MIME-Version: 1.0 Date: Sun, 8 Sep 2013 08:58:08 +0000 From: portscout@FreeBSD.org To: x11@freebsd.org Subject: FreeBSD ports you maintain which are out of date X-Mailer: portscout/0.8.1 X-BeenThere: freebsd-x11@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: X11 on FreeBSD -- maintaining and support List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Sep 2013 08:58:09 -0000 Dear port maintainer, The portscout new distfile checker has detected that one or more of your ports appears to be out of date. Please take the opportunity to check each of the ports listed below, and if possible and appropriate, submit/commit an update. If any ports have already been updated, you can safely ignore the entry. You will not be e-mailed again for any of the port/version combinations below. Full details can be found at the following URL: http://portscout.freebsd.org/x11@freebsd.org.html Port | Current version | New version ------------------------------------------------+-----------------+------------ x11/libXv | 1.0.9 | 1.0.10 ------------------------------------------------+-----------------+------------ x11/xman | 1.1.2 | 1.1.3 ------------------------------------------------+-----------------+------------ x11-drivers/xf86-video-intel | 2.7.1 | 2.99.902 ------------------------------------------------+-----------------+------------ x11-wm/twm | 1.0.7 | 1.0.8 ------------------------------------------------+-----------------+------------ If any of the above results are invalid, please check the following page for details on how to improve portscout's detection and selection of distfiles on a per-port basis: http://portscout.freebsd.org/info/portscout-portconfig.txt If wish to stop receiving portscout reminders, please contact portscout@FreeBSD.org Thanks. From owner-freebsd-x11@FreeBSD.ORG Sun Sep 8 10:20:01 2013 Return-Path: Delivered-To: freebsd-x11@smarthost.ysv.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 ESMTP id 53417E72 for ; Sun, 8 Sep 2013 10:20:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (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 255152631 for ; Sun, 8 Sep 2013 10:20:01 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.7/8.14.7) with ESMTP id r88AK1J1000722 for ; Sun, 8 Sep 2013 10:20:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.7/8.14.7/Submit) id r88AK0nW000530; Sun, 8 Sep 2013 10:20:00 GMT (envelope-from gnats) Date: Sun, 8 Sep 2013 10:20:00 GMT Message-Id: <201309081020.r88AK0nW000530@freefall.freebsd.org> To: freebsd-x11@FreeBSD.org Cc: From: Tijl Coosemans Subject: Re: ports/181838: [patch] x11-servers/xorg-server: fix TLS variables with clang X-BeenThere: freebsd-x11@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: Tijl Coosemans List-Id: X11 on FreeBSD -- maintaining and support List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Sep 2013 10:20:01 -0000 The following reply was made to PR ports/181838; it has been noted by GNATS. From: Tijl Coosemans To: Niclas Zeising Cc: bug-followup@FreeBSD.org Subject: Re: ports/181838: [patch] x11-servers/xorg-server: fix TLS variables with clang Date: Sun, 8 Sep 2013 12:18:15 +0200 On Sat, 07 Sep 2013 23:51:32 +0200 Niclas Zeising wrote: > On 09/06/13 23:22, Tijl Coosemans wrote: >> On Fri, 06 Sep 2013 22:18:27 +0200 Niclas Zeising wrote: >>> Can you please elaborate a bit on this, exactly what happends when >>> setting that configure variable? >> >> The configure script tests how to declare a thread-local variable. For >> clang and gcc this is done using the __thread keyword like this: >> >> __thread int thread_specific_int_var; >> >> Other compilers use __declspec(thread) instead of __thread. >> >> The code in configure comes from the XORG_TLS call in configure.ac. >> XORG_TLS is defined in m4/xorg-tls.m4. Here are the relevant bits: >> >> AC_MSG_CHECKING(for thread local storage (TLS) support) >> AC_CACHE_VAL(ac_cv_tls, [ >> ac_cv_tls=none >> keywords="__thread __declspec(thread)" >> for kw in $keywords ; do >> AC_TRY_COMPILE([int $kw test;], [], ac_cv_tls=$kw) >> done >> ]) >> AC_MSG_RESULT($ac_cv_tls) >> >> The for-loop runs over the elements in $keywords and sets ac_cv_tls >> to the keyword if the compiler accepts it. The problem is that clang >> accepts __declspec(thread) but it doesn't actually work (there's a >> warning about this but no error) so when the for-loop ends ac_cv_tls >> is set to __declspec(thread). Because the test is inside AC_CACHE_VAL >> it can be skipped by defining ac_cv_tls which is what the patch does. >> >> I found a similar test in pixman but there the for-loop contains a >> break so it ends on the first successful keyword (i.e. __thread). >> >>> Have you tried and ensured that this doesn't break xserver built with >>> gcc? >> >> No, I currently don't have gcc installed, but the keyword for gcc is >> also __thread. You could search for __thread in a config.log generated >> with gcc to verify this. > > Looking through the git history of xorg-server, I noticed that this test > has changed in later versions. I changed the TLS test to mimic this > way, and it seems to work. I just want a second set of eyes, can you > please test the attached patch? Yes that works too. It's the same as in the pixman configure script. From owner-freebsd-x11@FreeBSD.ORG Sun Sep 8 11:19:15 2013 Return-Path: Delivered-To: freebsd-x11@smarthost.ysv.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 ESMTP id 6C287D2B; Sun, 8 Sep 2013 11:19:15 +0000 (UTC) (envelope-from zeising@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (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 40AFB289D; Sun, 8 Sep 2013 11:19:15 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.7/8.14.7) with ESMTP id r88BJFSf097129; Sun, 8 Sep 2013 11:19:15 GMT (envelope-from zeising@freefall.freebsd.org) Received: (from zeising@localhost) by freefall.freebsd.org (8.14.7/8.14.7/Submit) id r88BJFcu097053; Sun, 8 Sep 2013 11:19:15 GMT (envelope-from zeising) Date: Sun, 8 Sep 2013 11:19:15 GMT Message-Id: <201309081119.r88BJFcu097053@freefall.freebsd.org> To: tijl@FreeBSD.org, zeising@FreeBSD.org, freebsd-x11@FreeBSD.org From: zeising@FreeBSD.org Subject: Re: ports/181838: [patch] x11-servers/xorg-server: fix TLS variables with clang X-BeenThere: freebsd-x11@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: X11 on FreeBSD -- maintaining and support List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Sep 2013 11:19:15 -0000 Synopsis: [patch] x11-servers/xorg-server: fix TLS variables with clang State-Changed-From-To: open->analyzed State-Changed-By: zeising State-Changed-When: Sun Sep 8 11:18:18 UTC 2013 State-Changed-Why: The issue has been resolved and a patch comitted to the xorg development repo. It will be merged to the ports tree soon. http://www.freebsd.org/cgi/query-pr.cgi?pr=181838 From owner-freebsd-x11@FreeBSD.ORG Mon Sep 9 09:09:47 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 ESMTP id CA1C79B3 for ; Mon, 9 Sep 2013 09:09:47 +0000 (UTC) (envelope-from portscout@FreeBSD.org) Received: from portscout.freebsd.org (unknown [IPv6:2001:1900:2254:206a::50:123]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id B87B02172 for ; Mon, 9 Sep 2013 09:09:47 +0000 (UTC) Received: from portscout.freebsd.org ([127.0.1.123]) by portscout.freebsd.org (8.14.7/8.14.7) with ESMTP id r8999lVG065137 for ; Mon, 9 Sep 2013 09:09:47 GMT (envelope-from portscout@portscout.freebsd.org) Received: (from portscout@localhost) by portscout.freebsd.org (8.14.7/8.14.6/Submit) id r8999lUC065131; Mon, 9 Sep 2013 09:09:47 GMT (envelope-from portscout) Message-Id: <201309090909.r8999lUC065131@portscout.freebsd.org> Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain MIME-Version: 1.0 Date: Mon, 9 Sep 2013 09:09:47 +0000 From: portscout@FreeBSD.org To: x11@freebsd.org Subject: FreeBSD ports you maintain which are out of date X-Mailer: portscout/0.8.1 X-BeenThere: freebsd-x11@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: X11 on FreeBSD -- maintaining and support List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Sep 2013 09:09:47 -0000 Dear port maintainer, The portscout new distfile checker has detected that one or more of your ports appears to be out of date. Please take the opportunity to check each of the ports listed below, and if possible and appropriate, submit/commit an update. If any ports have already been updated, you can safely ignore the entry. You will not be e-mailed again for any of the port/version combinations below. Full details can be found at the following URL: http://portscout.freebsd.org/x11@freebsd.org.html Port | Current version | New version ------------------------------------------------+-----------------+------------ x11/libXrandr | 1.4.1 | 1.4.2 ------------------------------------------------+-----------------+------------ x11/xinit | 1.3.2 | 1.3.3 ------------------------------------------------+-----------------+------------ x11/xlsclients | 1.1.2 | 1.1.3 ------------------------------------------------+-----------------+------------ x11/xrdb | 1.0.9 | 1.1.0 ------------------------------------------------+-----------------+------------ If any of the above results are invalid, please check the following page for details on how to improve portscout's detection and selection of distfiles on a per-port basis: http://portscout.freebsd.org/info/portscout-portconfig.txt If wish to stop receiving portscout reminders, please contact portscout@FreeBSD.org Thanks. From owner-freebsd-x11@FreeBSD.ORG Mon Sep 9 11:06:59 2013 Return-Path: Delivered-To: freebsd-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 ESMTP id 1B9A5EA9 for ; Mon, 9 Sep 2013 11:06:59 +0000 (UTC) (envelope-from owner-bugmaster@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (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 E1DA52A17 for ; Mon, 9 Sep 2013 11:06:58 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.7/8.14.7) with ESMTP id r89B6wrw030652 for ; Mon, 9 Sep 2013 11:06:58 GMT (envelope-from owner-bugmaster@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.7/8.14.7/Submit) id r89B6wxp029945 for freebsd-x11@FreeBSD.org; Mon, 9 Sep 2013 11:06:58 GMT (envelope-from owner-bugmaster@FreeBSD.org) Date: Mon, 9 Sep 2013 11:06:58 GMT Message-Id: <201309091106.r89B6wxp029945@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: gnats set sender to owner-bugmaster@FreeBSD.org using -f From: FreeBSD bugmaster To: freebsd-x11@FreeBSD.org Subject: Current problem reports assigned to freebsd-x11@FreeBSD.org X-BeenThere: freebsd-x11@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: X11 on FreeBSD -- maintaining and support List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Sep 2013 11:06:59 -0000 Note: to view an individual PR, use: http://www.freebsd.org/cgi/query-pr.cgi?pr=(number). The following is a listing of current problems submitted by FreeBSD users. These represent problem reports covering all versions including experimental development code and obsolete releases. S Tracker Resp. Description -------------------------------------------------------------------------------- a ports/181838 x11 [patch] x11-servers/xorg-server: fix TLS variables wit o ports/181660 x11 [patch] x11-servers/xorg-server: fix typos and new xor o ports/181513 x11 graphics/libGL needs python, but lacks explicit depend o ports/181318 x11 x11-servers/xorg-server does not compile or ARM o ports/181202 x11 x11-servers/xorg: xorg-7.x meta package missing o ports/181140 x11 [patch]x11/pixman fix typo & build issue on arm o ports/180096 x11 [patch] x11/xorg-libraries: add missing dependency o ports/180023 x11 x11-servers/xorg: xorg (WITH_NEW_XORG) on 10-CURRENT i o ports/178670 x11 x11/xorg: X does not refresh upper 1/4 screen in some a ports/178170 x11 [patch] x11-servers/xorg-server: xkb misbehaviour on k o ports/176705 x11 graphics/libGL : Fix complitation (not useability) on o ports/176703 x11 graphics/dri : Fix complitation (not useability) on AR o ports/175532 x11 x11/xdm: /bin/cp -n /usr/local/share/examples/xdm/Give o ports/171422 x11 graphics/libGL build error with python3.2 o ports/170852 x11 [PATCH] x11-fonts/encodings: encodings.dir includes bo o ports/170690 x11 x11-servers/xorg-server eats memory o ports/169794 x11 x11/xdm, several /usr/local/lib/X11/xdm/ files missing o ports/169561 x11 [patch] x11-toolkits/libXmu: disable specs o ports/169560 x11 [patch] x11/libICE: disable specs o ports/169559 x11 [patch] x11-fonts/fontsproto: disable specs o ports/166163 x11 graphics/dri: gthumb port crashes (SIGSEGV) within the o ports/160963 x11 [patch] x11/bigreqsproto: disable specs a ports/159792 x11 [patch] USB HID devices support for x11-drivers/xf86-i f ports/158513 x11 Broken Xvideo in x11-drivers/xf86-video-intel drivers s ports/156405 x11 x11-drivers/xf86-video-ati driver: no hardware renderi o ports/155696 x11 [patch] x11-servers/xorg-server: chase AIGLX altered d o ports/154502 x11 x11/xdm authorization failure when used with E17 windo o ports/149743 x11 x11/xorg: garbled window since Xorg-7.5 o ports/148591 x11 information note for x11-drivers/xf86-input-synaptics 29 problems total. From owner-freebsd-x11@FreeBSD.ORG Mon Sep 9 12:06:50 2013 Return-Path: Delivered-To: freebsd-x11@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id EA44B33A for ; Mon, 9 Sep 2013 12:06:50 +0000 (UTC) (envelope-from sunk.cs@gmail.com) Received: from mail-ea0-x235.google.com (mail-ea0-x235.google.com [IPv6:2a00:1450:4013:c01::235]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 800E42F22 for ; Mon, 9 Sep 2013 12:06:50 +0000 (UTC) Received: by mail-ea0-f181.google.com with SMTP id d10so3056650eaj.26 for ; Mon, 09 Sep 2013 05:06:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:content-transfer-encoding :in-reply-to:user-agent; bh=a1fXDsFOTNnSyA0jwdgcT2ElnQTOalZZh6F7AET3ja0=; b=yj+GQ6m/i7EN/fXmJL/tFobJTLbm2lsBfDPZajXgm4es/9aPdKvUCNmHu1Aeak0jYY 7HclfPC0w0Pj4p9+31OHC99WstrIXSaynKMIEO9/a6/Np5oU8x3gMWnDSmiygjn77ZHD EI3QZQZ2P8FpDBZgK8FM8CHeKUuovpXxNJsQk1noO4nGWQCdpCMKUq5bN68WBKru2AU/ Qy5b61Mddv2yG7nDfSLwN7ocFp9ZdzWmEEitSh46Zp9B44D1/b6+H3qcBU/vw6EyEDmQ 2IWHvtTC1IC4L9MqJWqPMo7pcPuSc2M626H3qZ6mkBpiS/NY8gpk19QWUYP9eKAa+RAv tsJg== X-Received: by 10.14.194.131 with SMTP id m3mr3952408een.45.1378728408861; Mon, 09 Sep 2013 05:06:48 -0700 (PDT) Received: from localhost ([2001:620:600:4400:a6ba:dbff:fef0:3a99]) by mx.google.com with ESMTPSA id p5sm21499301eeg.5.1969.12.31.16.00.00 (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 09 Sep 2013 05:06:47 -0700 (PDT) Date: Mon, 9 Sep 2013 14:06:45 +0200 From: Ke Sun To: =?iso-8859-1?Q?Jean-S=E9bastien_P=E9dron?= Subject: Re: unsupported synaptics touchpad Message-ID: <20130909120645.GA5517@probe.unige.ch> References: <20130822155651.GA32146@probe.unige.ch> <52171DE6.7030909@FreeBSD.org> <20130823091753.GA21594@probe.unige.ch> <52175C5E.2080007@FreeBSD.org> <20130823150007.GA31164@probe.unige.ch> <521E3828.9000605@FreeBSD.org> <20130829143122.GA757@probe.unige.ch> <5220A94F.6030800@FreeBSD.org> <5227A575.90805@dumbbell.fr> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <5227A575.90805@dumbbell.fr> User-Agent: Mutt/1.5.21 (2010-09-15) Cc: freebsd-x11@freebsd.org X-BeenThere: freebsd-x11@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: X11 on FreeBSD -- maintaining and support List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Sep 2013 12:06:51 -0000 Does that mean that I tap on the touchpad, and that I click the touchpad left button, is exactly the same button to X? It is possible to disable this button and use the right button for left clicking by tunning xorg.conf? Best, Ke Sun On Wed, Sep 04, 2013 at 11:26:13PM +0200, Jean-Sébastien Pédron wrote: > Le 30/08/2013 16:16, Jean-Sébastien Pédron a écrit : > >I'll try to prepare a patch for that, but maybe not before a few days. > > I'm stupid: a patch is not possible because taps are handled by the > hardware in the default mode... > > Unfortunately, I don't see any solution for now, without a proper > driver for your touchpad :-/ > > -- > Jean-Sébastien Pédron From owner-freebsd-x11@FreeBSD.ORG Mon Sep 9 12:51:04 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 ESMTP id 437021C8; Mon, 9 Sep 2013 12:51:04 +0000 (UTC) (envelope-from zeising@freebsd.org) Received: from mail.lysator.liu.se (mail.lysator.liu.se [IPv6:2001:6b0:17:f0a0::3]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 8A3482219; Mon, 9 Sep 2013 12:51:02 +0000 (UTC) Received: from mail.lysator.liu.se (localhost [127.0.0.1]) by mail.lysator.liu.se (Postfix) with ESMTP id 5624F40029; Mon, 9 Sep 2013 14:50:59 +0200 (CEST) Received: by mail.lysator.liu.se (Postfix, from userid 1004) id 379424002A; Mon, 9 Sep 2013 14:50:59 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on bernadotte.lysator.liu.se X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=AWL,T_FRT_LOLITA1 autolearn=disabled version=3.3.1 X-Spam-Score: 0.0 Received: from mx.daemonic.se (unknown [94.254.45.105]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.lysator.liu.se (Postfix) with ESMTPSA id 05AD540029; Mon, 9 Sep 2013 14:50:47 +0200 (CEST) Received: from mailscanner.daemonic.se (mailscanner.daemonic.se [IPv6:2001:470:dca9:0:1::6]) by mx.daemonic.se (Postfix) with ESMTPS id 3cYTkb3cgyz8hVm; Mon, 9 Sep 2013 14:50:47 +0200 (CEST) X-Virus-Scanned: amavisd-new at daemonic.se Received: from mx.daemonic.se ([IPv6:2001:470:dca9:0:1::3]) (using TLS with cipher CAMELLIA256-SHA) by mailscanner.daemonic.se (mailscanner.daemonic.se [IPv6:2001:470:dca9:0:1::6]) (amavisd-new, port 10025) with ESMTPS id R2Ia2dIrXI5o; Mon, 9 Sep 2013 14:50:13 +0200 (CEST) Received: from mail.daemonic.se (mail.daemonic.se [10.1.0.4]) by mx.daemonic.se (Postfix) with ESMTPS id 3cYTjx2rdpz8hVt; Mon, 9 Sep 2013 14:50:13 +0200 (CEST) Received: from vivi.daemonic.se (vivi.daemonic.se [10.32.0.4]) by mail.daemonic.se (Postfix) with ESMTPSA id 3cYTjx1vC2z9Ctq; Mon, 9 Sep 2013 14:50:13 +0200 (CEST) Message-ID: <522DC3EB.4060607@freebsd.org> Date: Mon, 09 Sep 2013 14:49:47 +0200 From: Niclas Zeising User-Agent: Mutt/1.5.21 MIME-Version: 1.0 To: x11@FreeBSD.org, ports@FreeBSD.org Subject: [CFT] Update of xorg libraries and MESA X-Enigmail-Version: 1.5.1 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="----enig2BRQOLGEICLWVXUDNLJOL" X-Virus-Scanned: ClamAV using ClamSMTP X-Mailman-Approved-At: Mon, 09 Sep 2013 13:11:22 +0000 X-BeenThere: freebsd-x11@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: x11@FreeBSD.org List-Id: X11 on FreeBSD -- maintaining and support List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Sep 2013 12:51:04 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) ------enig2BRQOLGEICLWVXUDNLJOL Content-Type: multipart/mixed; boundary="------------010302050208010508050208" This is a multi-part message in MIME format. --------------010302050208010508050208 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable [Cross-posted between x11@ and ports@, please respect reply-to] Hi! It is time once again to update parts of the FreeBSD xorg stack, and the x11@ team needs YOUR help in testing! The attached patch, also available in the latest updated version at http://people.freebsd.org/~zeising/xorg-mesaupdate.diff updates various xorg related libraries and drivers, most of this is visible for all users of xorg. xorg-server now has the possibility to use devd instead of hal for autoconfiguration. It also updates the MESA stack (libGL, dri) and libdrm for users of the new xorg stack (WITH_NEW_XORG=3D). Last, but definitely not least, it enables KMS for ati graphics cards, if you have the latest current, and compile with WITH_NEW_XORG=3D. It also contains a shlib version bumb of pixman, and ports depending on pixman. Be aware of this when updating pixman. Please test this on as many platforms and versions of FreeBSD as possible, both the old and new stack, so that we can try to avoid any regressions or other issues. The plan is to have this in the ports tree in a few weeks, at the most. To use the patch, check out the ports tree, preferably using svn and apply the patch using svn patch /path/to/patch. It should be possible to apply the patch using patch as well, but this is not tested. After the patch is applied, recompile the updated ports. See UPDATING for further instructions regarding libGL, dri and pixman. This is important! Please let us know of any issues, or if everything is working without a hitch. For more information, see https://wiki.freebsd.org/Graphics and https://wiki.freebsd.org/Xorg , or come talk to us in #freebsd-xorg@EFNet on IRC. Regards! --=20 Niclas Zeising FreeBSD x11@ team --------------010302050208010508050208 Content-Type: text/x-patch; name="xorg-mesaupdate.diff" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="xorg-mesaupdate.diff" Index: Mk/bsd.port.mk =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- Mk/bsd.port.mk (revision 326808) +++ Mk/bsd.port.mk (working copy) @@ -350,7 +350,7 @@ # MAKE_ENV are extended with a DISPLAY variable. # # USE_GL - A list of Mesa or GL related dependencies needed by the port= =2E -# Supported components are: glut, glu, glw, and gl. +# Supported components are: egl, glesv2, glut, glu, glw, and gl. # If set to "yes", this is equivalent to "glu". Note that # glew and glut depend on glu, glw and glu depend on gl. ## @@ -1882,13 +1882,15 @@ =20 PKG_IGNORE_DEPENDS?=3D 'this_port_does_not_exist' =20 -_GL_gl_LIB_DEPENDS=3D GL.1:${PORTSDIR}/graphics/libGL +_GL_glesv2_LIB_DEPENDS=3D libGLESv2.so:${PORTSDIR}/grahpics/libglesv2 +_GL_egl_LIB_DEPENDS=3D libEGL.so:${PORTSDIR}/graphics/libEGL +_GL_gl_LIB_DEPENDS=3D libGL.so:${PORTSDIR}/graphics/libGL _GL_gl_USE_XORG=3D glproto dri2proto -_GL_glew_LIB_DEPENDS=3D GLEW.1:${PORTSDIR}/graphics/glew -_GL_glu_LIB_DEPENDS=3D GLU.1:${PORTSDIR}/graphics/libGLU +_GL_glew_LIB_DEPENDS=3D libGLEW.so:${PORTSDIR}/graphics/glew +_GL_glu_LIB_DEPENDS=3D libGLU.so:${PORTSDIR}/graphics/libGLU _GL_glu_USE_XORG=3D glproto dri2proto -_GL_glw_LIB_DEPENDS=3D GLw.1:${PORTSDIR}/graphics/libGLw -_GL_glut_LIB_DEPENDS=3D glut.12:${PORTSDIR}/graphics/freeglut +_GL_glw_LIB_DEPENDS=3D libGLw.so:${PORTSDIR}/graphics/libGLw +_GL_glut_LIB_DEPENDS=3D libglut.so:${PORTSDIR}/graphics/freeglut =20 .if defined(USE_GL) . if ${USE_GL:L} =3D=3D "yes" Index: UPDATING =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- UPDATING (revision 326808) +++ UPDATING (working copy) @@ -5,6 +5,33 @@ You should get into the habit of checking this file for changes each tim= e you update your ports collection, before attempting any port upgrades. =20 +201309xx: + AFFECTS: users of x11/pixman + AUTHOR: zeising@FreeBSD.org + + The library version of x11/pixman has changed, and portrevision has + been bumped in all dependent ports. If you have external software tha= t + depends on pixman, this software needs to be recompiled. + To recompile all software dependent on pixman, run: + =20 + # portmaster -r pixman + or + # portupgrade -rf pixman + +201309xx: + AFFECTS: users of graphics/libGL, graphics/dri and other MESA ports + AUTHOR: zeising@FreeBSD.org + + The graphics/libGL, graphics/dri and related MESA ports have been + updated to 9.1 when compiled with WITH_NEW_XORG=3D set. It is necessa= ry + to remove the old versions of both ports before updating. + + # pkg_delete -f libGl-\* dri-\* + or + # pkg delete -f libGL dri + followed by + # portmaster -a + 20130904: AFFECTS: 10-CURRENT users with any port depending on converters/libico= nv AUTHOR: madpilot@FreeBSD.org @@ -553,7 +580,7 @@ settings in rc.conf prior to restarting postgrey. =20 20130525: - AFFECTS: users of x11/xorg and all X.Org ports + AFFECTS: users of x11/xorg and all xorg ports AUTHOR: zeising@FreeBSD.org =20 X.Org, including libraries and some drivers, was updated. If you are Index: astro/viking/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- astro/viking/Makefile (revision 326808) +++ astro/viking/Makefile (working copy) @@ -3,6 +3,7 @@ =20 PORTNAME=3D viking PORTVERSION=3D 1.4.2 +PORTREVISION=3D 1 CATEGORIES=3D astro MASTER_SITES=3D SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}/ =20 Index: cad/pdnmesh/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- cad/pdnmesh/Makefile (revision 326808) +++ cad/pdnmesh/Makefile (working copy) @@ -3,7 +3,7 @@ =20 PORTNAME=3D pdnmesh PORTVERSION=3D 0.2.2 -PORTREVISION=3D 2 +PORTREVISION=3D 3 CATEGORIES=3D cad MASTER_SITES=3D SF/${PORTNAME}/${PORTNAME}-source/${PORTVERSION} =20 Index: cad/repsnapper/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- cad/repsnapper/Makefile (revision 326808) +++ cad/repsnapper/Makefile (working copy) @@ -3,6 +3,7 @@ =20 PORTNAME=3D repsnapper PORTVERSION=3D 2.2.0b3 +PORTREVISION=3D 1 CATEGORIES=3D cad MASTER_SITES=3D https://codeload.github.com/timschmidt/repsnapper/tar.gz= / DISTNAME=3D ${PORTVERSION} Index: deskutils/pinot/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- deskutils/pinot/Makefile (revision 326808) +++ deskutils/pinot/Makefile (working copy) @@ -3,7 +3,7 @@ =20 PORTNAME=3D pinot PORTVERSION=3D 1.06 -PORTREVISION=3D 1 +PORTREVISION=3D 2 CATEGORIES=3D deskutils MASTER_SITES=3D ${MASTER_SITE_GOOGLE_CODE} #MASTER_SITES=3D http://colinf.chez.com/pinot/ Index: devel/xorg-macros/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- devel/xorg-macros/Makefile (revision 326808) +++ devel/xorg-macros/Makefile (working copy) @@ -2,7 +2,7 @@ # $FreeBSD$ =20 PORTNAME=3D xorg-macros -PORTVERSION=3D 1.17 +PORTVERSION=3D 1.17.1 CATEGORIES=3D devel x11 DISTNAME=3D util-macros-$(PORTVERSION) =20 Index: devel/xorg-macros/distinfo =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- devel/xorg-macros/distinfo (revision 326808) +++ devel/xorg-macros/distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (xorg/util/util-macros-1.17.tar.bz2) =3D 7d79edde72fc17dcdc56cfbe= 2f8ff384d1bffd1d8c58c0fd25970f5b2ccb75ed -SIZE (xorg/util/util-macros-1.17.tar.bz2) =3D 77029 +SHA256 (xorg/util/util-macros-1.17.1.tar.bz2) =3D 5e52654f2a0b04223cf28a= 9d7fd62cf288852e639ac13a75172fd47d0d6ac625 +SIZE (xorg/util/util-macros-1.17.1.tar.bz2) =3D 79105 Index: emulators/catapult/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- emulators/catapult/Makefile (revision 326808) +++ emulators/catapult/Makefile (working copy) @@ -3,7 +3,7 @@ =20 PORTNAME=3D catapult PORTVERSION=3D 0.9.1 -PORTREVISION=3D 1 +PORTREVISION=3D 2 CATEGORIES=3D emulators MASTER_SITES=3D SF/openmsx/openmsx/${PORTVERSION} DISTNAME=3D openmsx-${PORTNAME}-${PORTVERSION} @@ -32,8 +32,7 @@ USE_GNOME=3D gdkpixbuf2 glib20 gtk20 libxml2 USE_WX=3D 2.6+ USE_PYTHON_BUILD=3Dyes -USE_GMAKE=3D yes -USES=3D gettext iconv +USES=3D gettext gmake iconv USE_XORG=3D ice pixman sm x11 xau xcb xcomposite xcursor xdamage xdmcp \= xext xfixes xi xinerama xrandr xrender xxf86vm MAKEFILE=3D GNUmakefile Index: emulators/qemu-devel/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- emulators/qemu-devel/Makefile (revision 326808) +++ emulators/qemu-devel/Makefile (working copy) @@ -3,7 +3,7 @@ =20 PORTNAME=3D qemu PORTVERSION=3D 1.6.0 -PORTREVISION=3D 1 +PORTREVISION=3D 2 CATEGORIES=3D emulators MASTER_SITES=3D http://wiki.qemu.org/download/:release \ LOCAL/nox:snapshot @@ -14,13 +14,12 @@ MAINTAINER=3D nox@FreeBSD.org COMMENT=3D QEMU CPU Emulator - development version =20 -LIB_DEPENDS=3D pixman-1:${PORTSDIR}/x11/pixman - HAS_CONFIGURE=3D yes USE_BZIP2=3D yes USES=3D gmake pkgconfig bison USE_PERL5_BUILD=3D yes USE_PYTHON_BUILD=3D -2.7 +USE_XORG=3D pixman USE_GNOME+=3D glib20 PATCH_STRIP=3D -p1 MAKE_ENV+=3D BSD_MAKE=3D"${MAKE}" Index: emulators/tme/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- emulators/tme/Makefile (revision 326808) +++ emulators/tme/Makefile (working copy) @@ -3,7 +3,7 @@ =20 PORTNAME=3D tme PORTVERSION=3D 0.8 -PORTREVISION=3D 1 +PORTREVISION=3D 2 CATEGORIES=3D emulators MASTER_SITES=3D http://people.csail.mit.edu/fredette/tme/ =20 @@ -21,9 +21,8 @@ expat:${PORTSDIR}/textproc/expat2 \ fontconfig:${PORTSDIR}/x11-fonts/fontconfig =20 -USES=3D pkgconfig gettext iconv perl5 +USES=3D pkgconfig gettext gmake iconv perl5 USE_GNOME=3D gdkpixbuf2 gtk20 -USE_GMAKE=3D yes USE_AUTOTOOLS=3D libtool libltdl CONFIGURE_ENV=3D ac_cv_have_isinff=3Dno CONFIGURE_ARGS=3D --datadir=3D${WRKDIR}/tmproot --disable-warnings Index: games/klavaro/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- games/klavaro/Makefile (revision 326808) +++ games/klavaro/Makefile (working copy) @@ -3,7 +3,7 @@ =20 PORTNAME=3D klavaro PORTVERSION=3D 1.9.6 -PORTREVISION=3D 1 +PORTREVISION=3D 2 CATEGORIES=3D games MASTER_SITES=3D SF/${PORTNAME}/ =20 @@ -22,9 +22,8 @@ fontconfig:${PORTSDIR}/x11-fonts/fontconfig \ gtkdatabox:${PORTSDIR}/x11-toolkits/gtkdatabox =20 -USES=3D pkgconfig gettext iconv +USES=3D pkgconfig gettext gmake iconv USE_BZIP2=3D yes -USE_GMAKE=3D yes USE_XORG=3D pixman x11 xau xcb xcomposite xcursor xdamage xdmcp xext \ xfixes xi xinerama xrandr xrender USE_GNOME=3D gtk20 Index: graphics/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/Makefile (revision 326808) +++ graphics/Makefile (working copy) @@ -484,6 +484,7 @@ SUBDIR +=3D leptonica SUBDIR +=3D lfview SUBDIR +=3D lib3ds + SUBDIR +=3D libEGL SUBDIR +=3D libGL SUBDIR +=3D libGLU SUBDIR +=3D libGLw @@ -505,6 +506,7 @@ SUBDIR +=3D libgeotiff SUBDIR +=3D libgfx SUBDIR +=3D libggi + SUBDIR +=3D libglesv2 SUBDIR +=3D libgltext SUBDIR +=3D libgnomecanvas SUBDIR +=3D libgnomecanvas-reference Index: graphics/cairo/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/cairo/Makefile (revision 326808) +++ graphics/cairo/Makefile (working copy) @@ -4,7 +4,7 @@ =20 PORTNAME=3D cairo PORTVERSION=3D 1.10.2 -PORTREVISION=3D 5 +PORTREVISION=3D 6 PORTEPOCH?=3D 2 CATEGORIES=3D graphics MASTER_SITES=3D http://cairographics.org/releases/ Index: graphics/dri/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/dri/Makefile (revision 326808) +++ graphics/dri/Makefile (working copy) @@ -9,55 +9,76 @@ =20 COMMENT=3D OpenGL hardware acceleration drivers for the DRI =20 -LIB_DEPENDS=3D drm:${PORTSDIR}/graphics/libdrm \ - expat:${PORTSDIR}/textproc/expat2 +LIB_DEPENDS=3D libdrm.so:${PORTSDIR}/graphics/libdrm \ + libexpat.so:${PORTSDIR}/textproc/expat2 =20 USES=3D pkgconfig USE_XORG=3D glproto x11 xext xxf86vm xdamage xfixes dri2proto =20 +.include + +# gcc from base can't handle some code in mesa 9.1+ +# We only care for 9.x and 8.x, not for old pre-clang default current. +# This is for 0b0000 binary which gcc 4.3+ understands and is in the i96= 5 driver. +.if defined(WITH_NEW_XORG) +. if ${OSVERSION} >=3D 901000 && ${OSVERSION} < 902502 \ + && (${ARCH} =3D=3D i386 || ${ARCH} =3D=3D amd64) +CC=3Dclang +CXX=3Dclang++ +CPP=3Dclang-cpp +. elif ${OSVERSION} < 901500 +USE_GCC=3Dyes +. endif +.endif + +.if ${ARCH} =3D=3D ia64 +#BROKEN=3D does not install on ia64 +.endif + ALL_DRI_DRIVERS=3DI915 I965 R200 RADEON SWRAST =20 -.if ! defined(WITH_NEW_XORG) +.if !defined(WITH_NEW_XORG) ALL_DRI_DRIVERS+=3DI810 MACH64 MGA R128 R300 R600 SAVAGE SIS TDFX UNICHR= OME .endif =20 .include "${.CURDIR}/../../graphics/libGL/bsd.mesalib.mk" =20 -OPTIONS_DEFINE_i386=3D ${ALL_DRI_DRIVERS} -OPTIONS_DEFINE_amd64=3D ${OPTIONS_DEFINE_i386} +PLIST_SUB+=3D VERSION=3D${MESADISTVERSION} =20 -.if defined(WITH_NEW_XORG) -OPTIONS_DEFINE_powerpc=3D RADEON SWRAST -OPTIONS_DEFINE_sparc64=3D RADEON SWRAST -.else -OPTIONS_DEFINE_powerpc=3D MACH64 RADEON SWRAST TDFX -OPTIONS_DEFINE_sparc64=3D MACH64 RADEON SWRAST +.if ${ARCH} =3D=3D amd64 || ${ARCH} =3D=3D i386 +DRI_DRIVERS=3D ${ALL_DRI_DRIVERS} .endif =20 -OPTIONS_DEFAULT=3D${OPTIONS_DEFINE} +.if defined(WITH_NEW_XORG) +. if defined(WITH_GALLIUM) && (${ARCH} =3D=3D i386 || ${ARCH} =3D=3D amd= 64) +BUILD_DEPENDS+=3D llvm-config33:${PORTSDIR}/devel/llvm33 +RUN_DEPENDS+=3D llvm-config33:${PORTSDIR}/devel/llvm33 +CONFIGURE_ENV+=3D LLVM_CONFIG=3D${LOCALBASE}/bin/llvm-config33 =20 -I810_DESC=3D Include DRI support for Intel i810 -I915_DESC=3D Include DRI support for Intel i915 -I965_DESC=3D Include DRI support for Intel i965 -MACH64_DESC=3D Include DRI support for AMD/ATI Mach64 -MGA_DESC=3D Include DRI support for Matrox -R128_DESC=3D Include DRI support for AMD/ATI R128 -R200_DESC=3D Include DRI support for AMD/ATI R200 -R300_DESC=3D Include DRI support for AMD/ATI R300 -R600_DESC=3D Include DRI support for AMD/ATI R600 -RADEON_DESC=3D Include DRI support for AMD/ATI RADEON -SAVAGE_DESC=3D Include DRI support for S3/Via Savage -SIS_DESC=3D Include DRI support for SiS 300 and 6326 -SWRAST_DESC=3D Include generic software DRI support -TDFX_DESC=3D Include DRI support for 3dfx Voodoo -UNICHROME_DESC=3D Include DRI support for S3/Via Unichrome +CONFIGURE_ARGS+=3D--enable-gallium-llvm --disable-gallium-egl =20 -.include +CONFIGURE_ARGS+=3D--with-gallium-drivers=3Dr300,r600,radeonsi,svga,swras= t +PLIST_SUB+=3D GALLIUM=3D"" +. else +CONFIGURE_ARGS+=3D--enable-gallium-llvm=3Dno --without-gallium-drivers +PLIST_SUB+=3D GALLIUM=3D"@comment " +. endif +. if ${ARCH} =3D=3D powerpc || ${ARCH} =3D=3D ia64 +DRI_DRIVERS=3D RADEON SWRAST +. endif +. if ${ARCH} =3D=3D sparc64 +DRI_DRIVERS=3D SWRAST +. endif +.else # !defined(WITH_NEW_XORG) +. if ${ARCH} =3D=3D powerpc +DRI_DRIVERS=3D MACH64 RADEON SWRAST TDFX +. elif ${ARCH} =3D=3D sparc64 +DRI_DRIVERS=3D MACH64 RADEON SWRAST +. endif +.endif # defined(WITH_NEW_XORG) =20 -DRI_DRIVERS=3D .for _d in ${ALL_DRI_DRIVERS} -.if ${PORT_OPTIONS:M${_d}} -DRI_DRIVERS+=3D ${_d} +.if ${DRI_DRIVERS:M${_d}} PLIST_SUB+=3D ${_d}_DRIVER=3D"" .else PLIST_SUB+=3D ${_d}_DRIVER=3D"@comment " @@ -64,16 +85,31 @@ .endif .endfor =20 -.if ${ARCH} =3D=3D "ia64" -BROKEN=3D does not install on ia64 -.endif - -.if !(${ARCH} =3D=3D "amd64" || ${ARCH} =3D=3D "i386") +.if !(${ARCH} =3D=3D amd64 || ${ARCH} =3D=3D i386) CONFIGURE_ARGS+=3D--disable-gallium-intel .endif CONFIGURE_ARGS+=3D--with-dri-drivers=3D"${DRI_DRIVERS:L}" =20 +.if defined(WITH_NEW_XORG) && !defined(WITH_GALLIUM) \ + && (${ARCH} =3D=3D i386 || ${ARCH} =3D=3D amd64) +pre-everything:: + @${ECHO_MSG} "" + @${ECHO_MSG} "For r300, r600, radeonsi and swrast gallium based drivers= =2E" + @${ECHO_MSG} "Please define WITH_GALLIUM in /etc/make.conf" + @${ECHO_MSG} "Note that gallium support is highly experimental." + @${ECHO_MSG} "" +.endif + do-install: +.if !defined(WITH_NEW_XORG) cd ${WRKSRC}/src/mesa; ${GMAKE} install-dri +.else + cd ${WRKSRC}/src/mesa/libdricore; ${GMAKE} install + cd ${WRKSRC}/src/mesa/drivers/dri; ${GMAKE} install +. if defined(WITH_GALLIUM) && (${ARCH} =3D=3D i386 || ${ARCH} =3D=3D amd= 64) + cd ${WRKSRC}/src/gallium/drivers/radeon; ${GMAKE} install + cd ${WRKSRC}/src/gallium/targets; ${GMAKE} install +. endif +.endif =20 .include Index: graphics/dri/pkg-plist =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/dri/pkg-plist (revision 326808) +++ graphics/dri/pkg-plist (working copy) @@ -1,19 +1,38 @@ +%%NEW%%%%I965_DRIVER%%etc/drirc include/GL/internal/dri_interface.h %%OLD%%%%I810_DRIVER%%lib/dri/i810_dri.so +%%NEW%%%%I915_DRIVER%%lib/dri/i915_dri.la %%I915_DRIVER%%lib/dri/i915_dri.so +%%NEW%%%%I965_DRIVER%%lib/dri/i965_dri.la %%I965_DRIVER%%lib/dri/i965_dri.so %%OLD%%%%MACH64_DRIVER%%lib/dri/mach64_dri.so %%OLD%%%%MGA_DRIVER%%lib/dri/mga_dri.so %%OLD%%%%R128_DRIVER%%lib/dri/r128_dri.so +%%NEW%%%%R200_DRIVER%%lib/dri/r200_dri.la %%R200_DRIVER%%lib/dri/r200_dri.so %%OLD%%%%R300_DRIVER%%lib/dri/r300_dri.so +%%NEW%%%%GALLIUM%%lib/dri/r300_dri.la +%%NEW%%%%GALLIUM%%lib/dri/r300_dri.so %%OLD%%%%R600_DRIVER%%lib/dri/r600_dri.so +%%NEW%%%%GALLIUM%%lib/dri/r600_dri.la +%%NEW%%%%GALLIUM%%lib/dri/r600_dri.so +%%NEW%%%%RADEON_DRIVER%%lib/dri/radeon_dri.la %%RADEON_DRIVER%%lib/dri/radeon_dri.so +%%NEW%%%%GALLIUM%%lib/dri/radeonsi_dri.la +%%NEW%%%%GALLIUM%%lib/dri/radeonsi_dri.so %%OLD%%%%SAVAGE_DRIVER%%lib/dri/savage_dri.so %%OLD%%%%SIS_DRIVER%%lib/dri/sis_dri.so +%%NEW%%%%SWRAST_DRIVER%%lib/dri/swrast_dri.la %%SWRAST_DRIVER%%lib/dri/swrast_dri.so %%OLD%%%%TDFX_DRIVER%%lib/dri/tdfx_dri.so %%OLD%%%%UNICHROME_DRIVER%%lib/dri/unichrome_dri.so +%%NEW%%%%GALLIUM%%lib/dri/vmwgfx_dri.la +%%NEW%%%%GALLIUM%%lib/dri/vmwgfx_dri.so +%%NEW%%lib/libdricore%%VERSION%%.la +%%NEW%%lib/libdricore%%VERSION%%.so +%%NEW%%lib/libdricore%%VERSION%%.so.1 +%%NEW%%%%GALLIUM%%lib/libllvmradeon%%VERSION%%.la +%%NEW%%%%GALLIUM%%lib/libllvmradeon%%VERSION%%.so libdata/pkgconfig/dri.pc @dirrm lib/dri @dirrmtry include/GL/internal Index: graphics/libEGL/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libEGL/Makefile (revision 0) +++ graphics/libEGL/Makefile (working copy) @@ -0,0 +1,30 @@ +# Created by: kwm@FreeBSD.org +# $FreeBSD$ + +PORTNAME=3D libEGL +PORTVERSION=3D ${MESAVERSION} +CATEGORIES=3D graphics + +COMMENT=3D OpenEGL library + +LIB_DEPENDS+=3D libpthread-stubs.so:${PORTSDIR}/devel/libpthread-stubs + +.if ! defined(WITH_NEW_XORG) +IGNORE=3D Please enable WITH_NEW_XORG, libEGL needs libdrm higher then = 2.4.24 +.endif + +USE_XORG=3D x11 xau xcb xdmcp + +# stuff not needed by libEGL but configure wants it +USE_XORG+=3D glproto dri2proto xext xdamage xfixes +LIB_DEPENDS+=3D libexpat.so:${PORTSDIR}/textproc/expat2 \ + libdrm.so:${PORTSDIR}/graphics/libdrm + +BUILD_WKRSRC=3D ${WRKSRC}/src/egl +INSTALL_WRKSRC=3D ${WRKSRC}/src/egl + +WITH_NEW_XORG=3D yes + +.include +.include "${.CURDIR}/../../graphics/libGL/bsd.mesalib.mk" +.include Property changes on: graphics/libEGL/Makefile ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +FreeBSD=3D%H \ No newline at end of property Index: graphics/libEGL/pkg-descr =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libEGL/pkg-descr (revision 0) +++ graphics/libEGL/pkg-descr (working copy) @@ -0,0 +1,3 @@ +This package contains the EGL utility library. + +WWW: http://www.freedesktop.org/Software/xorg Property changes on: graphics/libEGL/pkg-descr ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: graphics/libEGL/pkg-plist =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libEGL/pkg-plist (revision 0) +++ graphics/libEGL/pkg-plist (working copy) @@ -0,0 +1,11 @@ +include/EGL/egl.h +include/EGL/eglext.h +include/EGL/eglmesaext.h +include/EGL/eglplatform.h +include/KHR/khrplatform.h +lib/libEGL.la +lib/libEGL.so +lib/libEGL.so.1 +libdata/pkgconfig/egl.pc +@dirrmtry include/KHR +@dirrmtry include/EGL Property changes on: graphics/libEGL/pkg-plist ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: graphics/libGL/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/Makefile (revision 326808) +++ graphics/libGL/Makefile (working copy) @@ -3,14 +3,13 @@ =20 PORTNAME=3D libGL PORTVERSION=3D ${MESAVERSION} -PORTREVISION=3D 4 +PORTREVISION=3D ${LIBGLREVISION} CATEGORIES=3D graphics =20 -MAINTAINER=3D x11@FreeBSD.org COMMENT=3D OpenGL library that renders using GLX or DRI =20 -LIB_DEPENDS+=3D drm:${PORTSDIR}/graphics/libdrm \ - expat:${PORTSDIR}/textproc/expat2 +LIB_DEPENDS+=3D libdrm.so:${PORTSDIR}/graphics/libdrm \ + libexpat.so:${PORTSDIR}/textproc/expat2 =20 USES=3D pkgconfig USE_XORG=3D glproto x11 xext xxf86vm xdamage xfixes dri2proto:both @@ -17,9 +16,28 @@ =20 SUB_FILES=3D pkg-install pkg-deinstall =20 +.include + +.if defined(WITH_NEW_XORG) +LIBGLREVISION=3D 0 +.else +LIBGLREVISION=3D 4 +.endif + do-install: +.if ! defined(WITH_NEW_XORG) ${RM} -f ${WRKSRC}/include/GL/glu*.h + @${MKDIR} ${PREFIX}/lib/.libGL cd ${WRKSRC}/src/mesa; ${GMAKE} install-libgl +.else + cd ${WRKSRC}/src/mesa; ${GMAKE} install-pkgconfigDATA + cd ${WRKSRC}/src/glx; ${GMAKE} install + ${MKDIR} ${PREFIX}/include/GL + cd ${WRKSRC}/include/GL && ${COPYTREE_SHARE} \*.h ${PREFIX}/include/GL/= + @${MKDIR} ${PREFIX}/lib/.libGL + ${INSTALL_LIB} ${WRKSRC}/src/glx/.libs/libGL.so ${PREFIX}/lib/.libGL/ + ${INSTALL_LIB} ${WRKSRC}/src/glx/.libs/libGL.so.1 ${PREFIX}/lib/.libGL/= +.endif =20 post-install: @PKG_PREFIX=3D${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL @@ -26,10 +44,8 @@ =20 .include "${.CURDIR}/bsd.mesalib.mk" =20 -.include - .if !(${ARCH} =3D=3D "amd64" || ${ARCH} =3D=3D "i386") CONFIGURE_ARGS+=3D--disable-gallium-intel .endif =20 -.include +.include Index: graphics/libGL/bsd.mesalib.mk =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/bsd.mesalib.mk (revision 326808) +++ graphics/libGL/bsd.mesalib.mk (working copy) @@ -1,16 +1,12 @@ -#-*- mode: Fundamental; tab-width: 4; -*- -# ex:ts=3D4 +# bsd.mesalib.mk - shared code between MesaLib ports. # -# bsd.mesa.mk - an attempt to refactor MesaLib ports. -# -# Created by: Florent Thoumie -# # !!! Here be dragons !!! (they seem to be everywhere these days) # # Remember to upgrade the following ports everytime you bump MESAVERSION= : # +# - graphics/libEGL # - graphics/libGL -# - graphics/libGLU +# - grahpics/libglesv2 # - graphics/dri # # $FreeBSD$ @@ -21,7 +17,7 @@ MESADISTVERSION=3D${MESABASEVERSION}${MESASUBVERSION:C/^(.)/-\1/} =20 .if defined(WITH_NEW_XORG) -MESABASEVERSION=3D 8.0.5 +MESABASEVERSION=3D 9.1.6 # if there is a subversion, include the '-' between 7.11-rc2 for example= =2E MESASUBVERSION=3D =09 PLIST_SUB+=3D OLD=3D"@comment " NEW=3D"" @@ -35,64 +31,80 @@ DISTFILES=3D MesaLib-${MESADISTVERSION}${EXTRACT_SUFX} MAINTAINER?=3D x11@FreeBSD.org =20 -# HACK: added lang/python as build dependency - we need to check, which = -# python versions are cleanly supported by Mesa BUILD_DEPENDS+=3D makedepend:${PORTSDIR}/devel/makedepend \ - python:${PORTSDIR}/lang/python \ + python2:${PORTSDIR}/lang/python2 \ ${PYTHON_SITELIBDIR}/libxml2.py:${PORTSDIR}/textproc/py-libxml2 =20 -USES+=3D bison -USE_PYTHON_BUILD=3Dyes +USES=3D bison gmake pathfix pkgconfig shebangfix +USE_PYTHON_BUILD=3D-2.7 USE_BZIP2=3D yes -USE_GMAKE=3D yes USE_LDCONFIG=3D yes GNU_CONFIGURE=3D yes =20 CPPFLAGS+=3D -I${LOCALBASE}/include LDFLAGS+=3D -L${LOCALBASE}/lib -CONFIGURE_ARGS+=3D--enable-gallium-llvm=3Dno --without-gallium-drivers \= - --disable-egl =20 +.if ${OSVERSION} < 1000033 +BUILD_DEPENDS+=3D ${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex +CONFIGURE_ENV+=3Dac_cv_prog_LEX=3D${LOCALBASE}/bin/flex +.endif + .if defined(WITH_NEW_XORG) -EXTRA_PATCHES+=3D ${PATCHDIR}/extra-configure \ - ${PATCHDIR}/extra-src-glsl_ir_constant_expression.cpp \ - ${PATCHDIR}/extra-src__gallium__include__pipe__p_config.h \ - ${PATCHDIR}/extra-src__mesa__drivers__dri__nouveau__nouveau_array.c \ - ${PATCHDIR}/extra-src__mesa__drivers__dri__nouveau__nouveau_render_t.c= \ - ${PATCHDIR}/extra-src_glx_XF86dri.c +USE_AUTOTOOLS=3D autoconf:env automake:env libtool:env +# probably be shared lib, and in it own port. +CONFIGURE_ARGS+=3D --enable-shared-glapi=3Dno +# we need to reapply these patches because we doing wierd stuff with aut= ogen +REAPPLY_PATCHES=3D \ + ${PATCHDIR}/patch-configure \ + ${PATCHDIR}/patch-src_egl_main_Makefile.in \ + ${PATCHDIR}/patch-src_glx_Makefile.in \ + ${PATCHDIR}/patch-src_mapi_es2api_Makefile.in \ + ${PATCHDIR}/patch-src_mapi_shared-glapi_Makefile.in \ + ${PATCHDIR}/patch-src_mesa_drivers_dri_common_Makefile.in \ + ${PATCHDIR}/patch-src_mesa_drivers_dri_common_xmlpool_Makefile.in \ + ${PATCHDIR}/patch-src_mesa_libdricore_Makefile.in + +python_OLD_CMD=3D "/usr/bin/env[[:space:]]python" +python_CMD=3D ${LOCALBASE}/bin/python2 +SHEBANG_FILES=3D src/gallium/*/*/*.py src/gallium/tools/trace/*.py \ + src/gallium/drivers/svga/svgadump/svga_dump.py \ + src/glsl/tests/compare_ir src/mapi/glapi/gen/*.py \ + src/mapi/mapi/mapi_abi.py .else -EXTRA_PATCHES+=3D ${PATCHDIR}/extra-configure-old \ - ${PATCHDIR}/extra-mach64_context.h-old \ - ${PATCHDIR}/extra-src__mesa__x86-64__glapi_x86-64.S \ - ${PATCHDIR}/extra-src__mesa__x86-64__xform4.S \ - ${PATCHDIR}/extra-src__mesa__x86__glapi_x86.S \ - ${PATCHDIR}/extra-src__mesa__x86__read_rgba_span_x86.S \ - ${PATCHDIR}/extra-src_glx_x11_XF86dri.c -CONFIGURE_ARGS+=3D--disable-glut --disable-glw -.endif +CONFIGURE_ARGS+=3D--disable-glut --disable-glw --disable-glu =20 ALL_TARGET=3D default +.endif =20 MASTERDIR=3D ${.CURDIR}/../../graphics/libGL +.if defined(WITH_NEW_XORG) PATCHDIR=3D ${MASTERDIR}/files +.else +PATCHDIR=3D ${MASTERDIR}/files-old +.endif DESCR=3D ${.CURDIR}/pkg-descr PLIST=3D ${.CURDIR}/pkg-plist WRKSRC=3D ${WRKDIR}/Mesa-${MESADISTVERSION} =20 -.if !defined(ARCH) -ARCH!=3D uname -p -.endif - COMPONENT=3D ${PORTNAME:L:C/^lib//:C/mesa-//} =20 -.if ${COMPONENT:Mglu} =3D=3D "" -CONFIGURE_ARGS+=3D --disable-glu +.if ${COMPONENT:Mglesv2} =3D=3D "" +CONFIGURE_ARGS+=3D --disable-gles2 +.else +CONFIGURE_ARGS+=3D --enable-gles2 .endif =20 +.if ${COMPONENT:Megl} =3D=3D "" +CONFIGURE_ARGS+=3D --disable-egl +.else +CONFIGURE_ARGS+=3D --enable-egl +.endif + .if ${COMPONENT:Mdri} =3D=3D "" -CONFIGURE_ARGS+=3D --with-dri-drivers=3Dno +CONFIGURE_ARGS+=3D--with-dri-drivers=3Dno +CONFIGURE_ARGS+=3D--enable-gallium-llvm=3Dno --without-gallium-drivers .else -CONFIGURE_ARGS+=3D --with-dri-drivers=3D"i915,i965,r200,radeon,swrast" +# done in the dri port .endif =20 .if !defined(WITH_NEW_XORG) @@ -106,8 +118,35 @@ post-patch: @${REINPLACE_CMD} -e 's|-ffast-math|${FAST_MATH}|' -e 's|x86_64|amd64|'= \ ${WRKSRC}/configure + @${REINPLACE_CMD} -e 's|/etc/|${PREFIX}/etc/|g' \ + ${WRKSRC}/src/mesa/drivers/dri/common/xmlconfig.c +.if !defined(WITH_NEW_XORG) @${REINPLACE_CMD} -e 's|[$$](INSTALL_LIB_DIR)/pkgconfig|${PREFIX}/libda= ta/pkgconfig|' \ ${WRKSRC}/src/glu/Makefile \ ${WRKSRC}/src/mesa/Makefile \ ${WRKSRC}/src/mesa/drivers/dri/Makefile +.else + @${REINPLACE_CMD} -e 's|#!/use/bin/python|#!${LOCALBASE}/bin/python2|g'= \ + ${WRKSRC}/src/mesa/drivers/dri/common/xmlpool/gen_xmlpool.py \ + ${WRKSRC}/src/glsl/builtins/tools/*.py + @${REINPLACE_CMD} -e 's|!/use/bin/python2|!${LOCALBASE}/bin/python2|g' = \ + ${WRKSRC}/src/mesa/main/get_hash_generator.py \ + ${WRKSRC}/src/mapi/glapi/gen/gl_enums.py \ + ${WRKSRC}/src/mapi/glapi/gen/gl_table.py \ =20 +.endif + +pre-configure: +# workaround for stupid rerunning configure in do-build step +# xxx +.if defined(WITH_NEW_XORG) + cd ${WRKSRC} && env NOCONFIGURE=3D1 sh autogen.sh +. for file in ${REAPPLY_PATCHES} + @cd ${WRKSRC} && ${PATCH} -p0 --quiet < ${file} +. endfor +# make sure the pkg-config files are installed in the correct place. +# this was reverted by running autogen.sh + @${FIND} ${WRKSRC} -name Makefile.in -type f | ${XARGS} ${REINPLACE_CMD= } -e \ + 's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g' ; +.endif + Index: graphics/libGL/distinfo =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/distinfo (revision 326808) +++ graphics/libGL/distinfo (working copy) @@ -1,4 +1,4 @@ SHA256 (MesaLib-7.6.1.tar.bz2) =3D 701f0e4cb85d6298181651b780d1c0a439fad= d02aad29ee6623fc05588bb8d44 SIZE (MesaLib-7.6.1.tar.bz2) =3D 4886995 -SHA256 (MesaLib-8.0.5.tar.bz2) =3D 511b8da34f8e69ed24caf422964fb7ae747f3= b1d8093f6b8aa2602164a475a5e -SIZE (MesaLib-8.0.5.tar.bz2) =3D 5734571 +SHA256 (MesaLib-9.1.6.tar.bz2) =3D e632dff0acafad0a59dc208d16dedb37f7bd5= 8f94c5d58c4b51912e41d005e3d +SIZE (MesaLib-9.1.6.tar.bz2) =3D 6134267 Index: graphics/libGL/files/extra-configure =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files/extra-configure (revision 326808) +++ graphics/libGL/files/extra-configure (working copy) @@ -1,40 +0,0 @@ ---- configure.orig 2012-07-10 17:30:46.000000000 +0200 -+++ configure 2012-09-01 13:27:22.000000000 +0200 -@@ -9017,9 +9017,34 @@ - DEFINES=3D"$DEFINES -DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=3D1" - DEFINES=3D"$DEFINES -DIN_DRI_DRIVER -DHAVE_ALIAS" -=20 -- if test "x$DRI_DIRS" =3D "xyes"; then -- DRI_DIRS=3D"i915 i965 nouveau r200 radeon swrast" -- fi -+ case "$host_cpu" in -+ x86_64) -+ # i810 is missing because there is no x86-64 system where i= t -+ # could *ever* be used. -+ if test "x$DRI_DIRS" =3D "xyes"; then -+ DRI_DIRS=3D"i915 i965 nouveau r200 radeon swrast" -+ fi -+ ;; -+ i*86) -+ if test "x$DRI_DIRS" =3D "xyes"; then -+ DRI_DIRS=3D"i915 i965 nouveau r200 radeon swrast" -+ fi -+ ;; -+ powerpc*) -+ # Build only the drivers for cards that exist on PowerPC. -+ # At some point MGA will be added, but not yet. -+ if test "x$DRI_DIRS" =3D "xyes"; then -+ DRI_DIRS=3D"r200 radeon swrast" -+ fi -+ ;; -+ sparc*) -+ # Build only the drivers for cards that exist on SPARC. -+ if test "x$DRI_DIRS" =3D "xyes"; then -+ DRI_DIRS=3D"r200 radeon swrast" -+ fi -+ ;; -+ esac -+ - ;; - gnu*) - DEFINES=3D"$DEFINES -DUSE_EXTERNAL_DXTN_LIB=3D1 -DIN_DRI_DRIVER= " Index: graphics/libGL/files/extra-configure-old =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files/extra-configure-old (revision 326808) +++ graphics/libGL/files/extra-configure-old (working copy) @@ -1,43 +0,0 @@ ---- configure.orig 2009-12-22 03:31:30.000000000 +0100 -+++ configure 2012-06-27 19:49:26.000000000 +0200 -@@ -6946,12 +6946,35 @@ - CXXFLAGS=3D"$CXXFLAGS -ansi -pedantic" - fi -=20 -- # ffb and gamma are missing because they have not been converte= d -- # to use the new interface. -- if test "x$DRI_DIRS" =3D "xyes"; then -- DRI_DIRS=3D"i810 i915 i965 mach64 mga r128 r200 r300 r600 r= adeon tdfx \ -+ case "$host_cpu" in -+ x86_64) -+ # i810 is missing because there is no x86-64 system where i= t -+ # could *ever* be used. -+ if test "x$DRI_DIRS" =3D "xyes"; then -+ DRI_DIRS=3D"i915 i965 mach64 mga r128 r200 r300 r600 ra= deon tdfx \ - unichrome savage sis swrast" -- fi -+ fi -+ ;; -+ i*86) -+ if test "x$DRI_DIRS" =3D "xyes"; then -+ DRI_DIRS=3D"i810 i915 i965 mach64 mga r128 r200 r300 r6= 00 radeon tdfx \ -+ unichrome savage sis swrast" -+ fi -+ ;; -+ powerpc*) -+ # Build only the drivers for cards that exist on PowerPC. -+ # At some point MGA will be added, but not yet. -+ if test "x$DRI_DIRS" =3D "xyes"; then -+ DRI_DIRS=3D"mach64 r128 r200 r300 r600 radeon tdfx swra= st" -+ fi -+ ;; -+ sparc*) -+ # Build only the drivers for cards that exist on SPARC. -+ if test "x$DRI_DIRS" =3D "xyes"; then -+ DRI_DIRS=3D"mach64 r128 r200 r300 r600 radeon swrast" -+ fi -+ ;; -+ esac - ;; - gnu*) - DEFINES=3D"$DEFINES -DUSE_EXTERNAL_DXTN_LIB=3D1 -DIN_DRI_DRIVER= " Index: graphics/libGL/files/extra-mach64_context.h-old =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files/extra-mach64_context.h-old (revision 326808) +++ graphics/libGL/files/extra-mach64_context.h-old (working copy) @@ -1,20 +0,0 @@ ---- src/mesa/drivers/dri/mach64/mach64_context.h.orig 2012-06-27 19:59:3= 2.000000000 +0200 -+++ src/mesa/drivers/dri/mach64/mach64_context.h 2012-06-27 20:08:30.000= 000000 +0200 -@@ -294,11 +294,14 @@ - #define LE32_OUT( x, y ) do { *(GLuint *)(x) =3D (y); } while (0) - #define LE32_OUT_FLOAT( x, y ) do { *(GLfloat *)(x) =3D (y); } while (0= ) - #else --#ifndef __OpenBSD__ --#include --#else -+#if defined(__OpenBSD__) - #include - #define bswap_32 bswap32 -+#elif defined(__FreeBSD__) -+#include -+#define bswap_32 bswap32 -+#else -+#include - #endif -=20 - #define LE32_IN( x ) bswap_32( *(GLuint *)(x) ) Index: graphics/libGL/files/extra-src-glsl_ir_constant_expression.cpp =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files/extra-src-glsl_ir_constant_expression.cpp (revis= ion 326808) +++ graphics/libGL/files/extra-src-glsl_ir_constant_expression.cpp (worki= ng copy) @@ -1,14 +0,0 @@ ---- src/glsl/ir_constant_expression.cpp.orig 2011-07-23 15:08:44.0000000= 00 +0200 -+++ src/glsl/ir_constant_expression.cpp 2011-07-23 15:09:03.000000000 +0= 200 -@@ -39,6 +39,11 @@ - #include "ir_visitor.h" - #include "glsl_types.h" -=20 -+#include -+#if __FreeBSD_version <=3D 704100 || (__FreeBSD_version >=3D 800000 && = __FreeBSD_version < 802502) || (__FreeBSD_version >=3D 900000 && __FreeBS= D_version < 900027) -+#define log2(x) (log(x) / log(2)) -+#endif -+ - static float - dot(ir_constant *op0, ir_constant *op1) - { Index: graphics/libGL/files/extra-src__gallium__include__pipe__p_config.h= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files/extra-src__gallium__include__pipe__p_config.h (r= evision 326808) +++ graphics/libGL/files/extra-src__gallium__include__pipe__p_config.h (w= orking copy) @@ -1,25 +0,0 @@ ---- src/gallium/include/pipe/p_config.h.orig 2011-10-15 02:43:58.0000000= 00 +0200 -+++ src/gallium/include/pipe/p_config.h 2012-06-28 21:27:06.000000000 +0= 200 -@@ -106,6 +106,13 @@ - #endif - #endif -=20 -+#if defined(__sparc__) || defined(__sparc64__) -+#define PIPE_ARCH_SPARC -+#if defined(__sparc64__) -+#define PIPE_ARCH_SPARC_64 -+#endif -+#endif -+ -=20 - /* - * Endian detection. -@@ -133,7 +140,7 @@ -=20 - #if defined(PIPE_ARCH_X86) || defined(PIPE_ARCH_X86_64) - #define PIPE_ARCH_LITTLE_ENDIAN --#elif defined(PIPE_ARCH_PPC) || defined(PIPE_ARCH_PPC_64) -+#elif defined(PIPE_ARCH_PPC) || defined(PIPE_ARCH_PPC_64) || defined(PI= PE_ARCH_SPARC) || defined(PIPE_ARCH_SPARC_64) - #define PIPE_ARCH_BIG_ENDIAN - #endif -=20 Index: graphics/libGL/files/extra-src__mesa__drivers__dri__nouveau__nouve= au_array.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files/extra-src__mesa__drivers__dri__nouveau__nouveau_= array.c (revision 326808) +++ graphics/libGL/files/extra-src__mesa__drivers__dri__nouveau__nouveau_= array.c (working copy) @@ -1,99 +0,0 @@ ---- src/mesa/drivers/dri/nouveau/nouveau_array.c.orig 2011-01-06 01:19:1= 5.000000000 +0100 -+++ src/mesa/drivers/dri/nouveau/nouveau_array.c 2012-04-28 18:27:06.000= 000000 +0200 -@@ -29,54 +29,71 @@ - #include "nouveau_array.h" - #include "nouveau_bufferobj.h" -=20 -+#define EXTRACT(in_t, out_t) extract_func_##in_t##_to_##out_t -+ -+#define EXTRACT_FUNC(in_t, out_t, k) \ -+static out_t EXTRACT(in_t, out_t) \ -+(struct nouveau_array *a, int i, int j) { \ -+ in_t x =3D ((in_t *)(a->buf + i * a->stride))[j]; \ -+ \ -+ return (out_t)x / (k); \ -+} -+ -+EXTRACT_FUNC(GLchar, unsigned, 1); -+EXTRACT_FUNC(GLchar, float, SCHAR_MAX); -+EXTRACT_FUNC(GLubyte, unsigned, 1); -+EXTRACT_FUNC(GLubyte, float, UCHAR_MAX); -+EXTRACT_FUNC(GLshort, unsigned, 1); -+EXTRACT_FUNC(GLshort, float, SHRT_MAX); -+EXTRACT_FUNC(GLushort, unsigned, 1); -+EXTRACT_FUNC(GLushort, float, USHRT_MAX); -+EXTRACT_FUNC(GLint, unsigned, 1); -+EXTRACT_FUNC(GLint, float, INT_MAX); -+EXTRACT_FUNC(GLuint, unsigned, 1); -+EXTRACT_FUNC(GLuint, float, UINT_MAX); -+EXTRACT_FUNC(GLfloat, unsigned, 1.0 / UINT_MAX); -+EXTRACT_FUNC(GLfloat, float, 1); -+ -+#undef EXTRACT_FUNC -+ - static void - get_array_extract(struct nouveau_array *a, extract_u_t *extract_u, - extract_f_t *extract_f) - { --#define EXTRACT(in_t, out_t, k) \ -- ({ \ -- auto out_t f(struct nouveau_array *, int, int); \ -- out_t f(struct nouveau_array *a, int i, int j) { \ -- in_t x =3D ((in_t *)(a->buf + i * a->stride))[j]; \ -- \ -- return (out_t)x / (k); \ -- }; \ -- f; \ -- }); -- - switch (a->type) { - case GL_BYTE: -- *extract_u =3D EXTRACT(char, unsigned, 1); -- *extract_f =3D EXTRACT(char, float, SCHAR_MAX); -+ *extract_u =3D EXTRACT(GLchar, unsigned); -+ *extract_f =3D EXTRACT(GLchar, float); - break; - case GL_UNSIGNED_BYTE: -- *extract_u =3D EXTRACT(unsigned char, unsigned, 1); -- *extract_f =3D EXTRACT(unsigned char, float, UCHAR_MAX); -+ *extract_u =3D EXTRACT(GLubyte, unsigned); -+ *extract_f =3D EXTRACT(GLubyte, float); - break; - case GL_SHORT: -- *extract_u =3D EXTRACT(short, unsigned, 1); -- *extract_f =3D EXTRACT(short, float, SHRT_MAX); -+ *extract_u =3D EXTRACT(GLshort, unsigned); -+ *extract_f =3D EXTRACT(GLshort, float); - break; - case GL_UNSIGNED_SHORT: -- *extract_u =3D EXTRACT(unsigned short, unsigned, 1); -- *extract_f =3D EXTRACT(unsigned short, float, USHRT_MAX); -+ *extract_u =3D EXTRACT(GLushort, unsigned); -+ *extract_f =3D EXTRACT(GLushort, float); - break; - case GL_INT: -- *extract_u =3D EXTRACT(int, unsigned, 1); -- *extract_f =3D EXTRACT(int, float, INT_MAX); -+ *extract_u =3D EXTRACT(GLint, unsigned); -+ *extract_f =3D EXTRACT(GLint, float); - break; - case GL_UNSIGNED_INT: -- *extract_u =3D EXTRACT(unsigned int, unsigned, 1); -- *extract_f =3D EXTRACT(unsigned int, float, UINT_MAX); -+ *extract_u =3D EXTRACT(GLuint, unsigned); -+ *extract_f =3D EXTRACT(GLuint, float); - break; - case GL_FLOAT: -- *extract_u =3D EXTRACT(float, unsigned, 1.0 / UINT_MAX); -- *extract_f =3D EXTRACT(float, float, 1); -+ *extract_u =3D EXTRACT(GLfloat, unsigned); -+ *extract_f =3D EXTRACT(GLfloat, float); - break; - default: - assert(0); - } - } -+#undef EXTRACT -=20 - void - nouveau_init_array(struct nouveau_array *a, int attr, int stride, Index: graphics/libGL/files/extra-src__mesa__drivers__dri__nouveau__nouve= au_render_t.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files/extra-src__mesa__drivers__dri__nouveau__nouveau_= render_t.c (revision 326808) +++ graphics/libGL/files/extra-src__mesa__drivers__dri__nouveau__nouveau_= render_t.c (working copy) @@ -1,91 +0,0 @@ ---- src/mesa/drivers/dri/nouveau/nouveau_render_t.c.orig 2011-01-06 01:1= 9:34.000000000 +0100 -+++ src/mesa/drivers/dri/nouveau/nouveau_render_t.c 2012-04-28 18:27:06.= 000000000 +0200 -@@ -97,52 +97,49 @@ - } \ - } while (0) -=20 --/* -- * Select an appropriate dispatch function for the given index buffer. -- */ --static dispatch_t --get_array_dispatch(struct nouveau_array *a) -+static void -+dispatch_l(struct gl_context *ctx, unsigned int start, int delta, -+ unsigned int n) - { -- if (!a->fields) { -- auto void f(struct gl_context *, unsigned int, int, unsigned int); -- -- void f(struct gl_context *ctx, unsigned int start, int delta, -- unsigned int n) { -- struct nouveau_channel *chan =3D context_chan(ctx); -- RENDER_LOCALS(ctx); -+ struct nouveau_channel *chan =3D context_chan(ctx); -+ RENDER_LOCALS(ctx); -=20 -- EMIT_VBO(L, ctx, start, delta, n); -- }; -- -- return f; -- -- } else if (a->type =3D=3D GL_UNSIGNED_INT) { -- auto void f(struct gl_context *, unsigned int, int, unsigned int); -- -- void f(struct gl_context *ctx, unsigned int start, int delta, -- unsigned int n) { -- struct nouveau_channel *chan =3D context_chan(ctx); -- RENDER_LOCALS(ctx); -+ EMIT_VBO(L, ctx, start, delta, n); -+} -=20 -- EMIT_VBO(I32, ctx, start, delta, n); -- }; -+static void -+dispatch_i32(struct gl_context *ctx, unsigned int start, int delta, -+ unsigned int n) -+{ -+ struct nouveau_channel *chan =3D context_chan(ctx); -+ RENDER_LOCALS(ctx); -=20 -- return f; -+ EMIT_VBO(I32, ctx, start, delta, n); -+} -=20 -- } else { -- auto void f(struct gl_context *, unsigned int, int, unsigned int); -+static void -+dispatch_i16(struct gl_context *ctx, unsigned int start, int delta, -+ unsigned int n) -+{ -+ struct nouveau_channel *chan =3D context_chan(ctx); -+ RENDER_LOCALS(ctx); -=20 -- void f(struct gl_context *ctx, unsigned int start, int delta, -- unsigned int n) { -- struct nouveau_channel *chan =3D context_chan(ctx); -- RENDER_LOCALS(ctx); -- -- EMIT_VBO(I32, ctx, start, delta, n & 1); -- EMIT_VBO(I16, ctx, start, delta, n & ~1); -- }; -+ EMIT_VBO(I32, ctx, start, delta, n & 1); -+ EMIT_VBO(I16, ctx, start, delta, n & ~1); -+} -=20 -- return f; -- } -+/* -+ * Select an appropriate dispatch function for the given index buffer. -+ */ -+static dispatch_t -+get_array_dispatch(struct nouveau_array *a) -+{ -+ if (!a->fields) -+ return dispatch_l; -+ else if (a->type =3D=3D GL_UNSIGNED_INT) -+ return dispatch_i32; -+ else -+ return dispatch_i16; - } -=20 - /* Index: graphics/libGL/files/extra-src__mesa__x86-64__glapi_x86-64.S =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files/extra-src__mesa__x86-64__glapi_x86-64.S (revisio= n 326808) +++ graphics/libGL/files/extra-src__mesa__x86-64__glapi_x86-64.S (working= copy) @@ -1,12 +0,0 @@ ---- ./src/mesa/x86-64/glapi_x86-64.S.orig 2009-03-13 04:28:49.000000000 = +0100 -+++ ./src/mesa/x86-64/glapi_x86-64.S 2011-01-28 18:12:18.000000000 +0100= -@@ -73,7 +73,8 @@ _x86_64_get_dispatch: -=20 - .p2align 4,,15 - _x86_64_get_dispatch: -- movq _gl_DispatchTSD(%rip), %rdi -+ movq _gl_DispatchTSD@GOTPCREL(%rip), %rax -+ movl (%rax), %edi - jmp pthread_getspecific@PLT -=20 - #elif defined(THREADS) Index: graphics/libGL/files/extra-src__mesa__x86-64__xform4.S =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files/extra-src__mesa__x86-64__xform4.S (revision 3268= 08) +++ graphics/libGL/files/extra-src__mesa__x86-64__xform4.S (working copy)= @@ -1,74 +0,0 @@ ---- src/mesa/x86-64/xform4.S.orig 2009-01-22 18:38:35.000000000 +0100 -+++ src/mesa/x86-64/xform4.S 2011-05-09 21:26:00.000000000 +0200 -@@ -53,7 +53,7 @@ _mesa_x86_64_transform_points4_general: - * rdx =3D source - */ - movl V4F_COUNT(%rdx), %ecx /* count */ -- movzx V4F_STRIDE(%rdx), %eax /* stride */ -+ movzbl V4F_STRIDE(%rdx), %eax /* stride */ -=20 - movl %ecx, V4F_COUNT(%rdi) /* set dest count */ - movl $4, V4F_SIZE(%rdi) /* set dest size */ -@@ -116,7 +116,7 @@ p4_constants: - .byte 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00 --.float 0f+1.0 -+.float 1.0 -=20 - .text - .align 16 -@@ -135,7 +135,7 @@ _mesa_x86_64_transform_points4_3d: - movaps 16(%rax), %xmm10 -=20 - movl V4F_COUNT(%rdx), %ecx /* count */ -- movzx V4F_STRIDE(%rdx), %eax /* stride */ -+ movzbl V4F_STRIDE(%rdx), %eax /* stride */ -=20 - movl %ecx, V4F_COUNT(%rdi) /* set dest count */ - movl $4, V4F_SIZE(%rdi) /* set dest size */ -@@ -195,7 +195,7 @@ p4_3d_done: - _mesa_x86_64_transform_points4_identity: -=20 - movl V4F_COUNT(%rdx), %ecx /* count */ -- movzx V4F_STRIDE(%rdx), %eax /* stride */ -+ movzbl V4F_STRIDE(%rdx), %eax /* stride */ -=20 - movl %ecx, V4F_COUNT(%rdi) /* set dest count */ - movl $4, V4F_SIZE(%rdi) /* set dest size */ -@@ -223,7 +223,7 @@ p4_identity_done: - _mesa_3dnow_transform_points4_3d_no_rot: -=20 - movl V4F_COUNT(%rdx), %ecx /* count */ -- movzx V4F_STRIDE(%rdx), %eax /* stride */ -+ movzbl V4F_STRIDE(%rdx), %eax /* stride */ -=20 - movl %ecx, V4F_COUNT(%rdi) /* set dest count */ - movl $4, V4F_SIZE(%rdi) /* set dest size */ -@@ -287,7 +287,7 @@ p4_3d_no_rot_done: - _mesa_3dnow_transform_points4_perspective: -=20 - movl V4F_COUNT(%rdx), %ecx /* count */ -- movzx V4F_STRIDE(%rdx), %eax /* stride */ -+ movzbl V4F_STRIDE(%rdx), %eax /* stride */ -=20 - movl %ecx, V4F_COUNT(%rdi) /* set dest count */ - movl $4, V4F_SIZE(%rdi) /* set dest size */ -@@ -353,7 +353,7 @@ p4_perspective_done: - _mesa_3dnow_transform_points4_2d_no_rot: -=20 - movl V4F_COUNT(%rdx), %ecx /* count */ -- movzx V4F_STRIDE(%rdx), %eax /* stride */ -+ movzbl V4F_STRIDE(%rdx), %eax /* stride */ -=20 - movl %ecx, V4F_COUNT(%rdi) /* set dest count */ - movl $4, V4F_SIZE(%rdi) /* set dest size */ -@@ -408,7 +408,7 @@ p4_2d_no_rot_done: - _mesa_3dnow_transform_points4_2d: -=20 - movl V4F_COUNT(%rdx), %ecx /* count */ -- movzx V4F_STRIDE(%rdx), %eax /* stride */ -+ movzbl V4F_STRIDE(%rdx), %eax /* stride */ -=20 - movl %ecx, V4F_COUNT(%rdi) /* set dest count */ - movl $4, V4F_SIZE(%rdi) /* set dest size */ Index: graphics/libGL/files/extra-src__mesa__x86__glapi_x86.S =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files/extra-src__mesa__x86__glapi_x86.S (revision 3268= 08) +++ graphics/libGL/files/extra-src__mesa__x86__glapi_x86.S (working copy)= @@ -1,11 +0,0 @@ ---- ./src/mesa/x86/glapi_x86.S.orig 2009-03-13 04:28:49.000000000 +0100 -+++ ./src/mesa/x86/glapi_x86.S 2011-01-28 18:11:56.000000000 +0100 -@@ -47,7 +47,7 @@ - #define GL_OFFSET(x) CODEPTR(REGOFF(4 * x, EAX)) -=20 - #if defined(GNU_ASSEMBLER) && !defined(__DJGPP__) && !defined(__MINGW32= __) --#define GLOBL_FN(x) GLOBL x ; .type x, function -+#define GLOBL_FN(x) GLOBL x ; .type x, @function - #else - #define GLOBL_FN(x) GLOBL x - #endif Index: graphics/libGL/files/extra-src__mesa__x86__read_rgba_span_x86.S =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files/extra-src__mesa__x86__read_rgba_span_x86.S (revi= sion 326808) +++ graphics/libGL/files/extra-src__mesa__x86__read_rgba_span_x86.S (work= ing copy) @@ -1,11 +0,0 @@ ---- ./src/mesa/x86/read_rgba_span_x86.S.orig 2008-08-25 16:46:47.0000000= 00 +0200 -+++ ./src/mesa/x86/read_rgba_span_x86.S 2011-01-28 18:10:06.000000000 +0= 100 -@@ -648,7 +648,7 @@ _generic_read_RGBA_span_RGB565_MMX: - testl $0x01, %ecx - je .L01 -=20 -- movzxw (%eax), %ecx -+ movzwl (%eax), %ecx - movd %ecx, %mm4 -=20 - pshufw $0x00, %mm4, %mm0 Index: graphics/libGL/files/extra-src_glx_XF86dri.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files/extra-src_glx_XF86dri.c (revision 326808) +++ graphics/libGL/files/extra-src_glx_XF86dri.c (working copy) @@ -1,38 +0,0 @@ ---- src/glx/XF86dri.c.orig 2012-10-24 19:03:59.000000000 +0000 -+++ src/glx/XF86dri.c 2013-05-29 10:07:33.000000000 +0000 -@@ -43,6 +43,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN - #include - #include - #include "xf86dristr.h" -+#include -=20 - static XExtensionInfo _xf86dri_info_data; - static XExtensionInfo *xf86dri_info =3D &_xf86dri_info_data; -@@ -201,7 +202,11 @@ XF86DRIOpenConnection(Display * dpy, int - } -=20 - if (rep.length) { -- if (!(*busIdString =3D (char *) Xcalloc(rep.busIdStringLength + 1= , 1))) { -+ if (rep.busIdStringLength < INT_MAX) -+ *busIdString =3D Xcalloc(rep.busIdStringLength + 1, 1); -+ else -+ *busIdString =3D NULL; -+ if (*busIdString =3D=3D NULL) { - _XEatData(dpy, ((rep.busIdStringLength + 3) & ~3)); - UnlockDisplay(dpy); - SyncHandle(); -@@ -300,9 +305,11 @@ XF86DRIGetClientDriverName(Display * dpy - *ddxDriverPatchVersion =3D rep.ddxDriverPatchVersion; -=20 - if (rep.length) { -- if (! -- (*clientDriverName =3D -- (char *) Xcalloc(rep.clientDriverNameLength + 1, 1))) { -+ if (rep.clientDriverNameLength < INT_MAX) -+ *clientDriverName =3D Xcalloc(rep.clientDriverNameLength + 1, 1); -+ else -+ *clientDriverName =3D NULL; -+ if (*clientDriverName =3D=3D NULL) { - _XEatData(dpy, ((rep.clientDriverNameLength + 3) & ~3)); - UnlockDisplay(dpy); - SyncHandle(); Index: graphics/libGL/files/extra-src_glx_x11_XF86dri.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files/extra-src_glx_x11_XF86dri.c (revision 326808) +++ graphics/libGL/files/extra-src_glx_x11_XF86dri.c (working copy) @@ -1,38 +0,0 @@ ---- src/glx/x11/XF86dri.c.orig 2009-06-17 18:35:16.000000000 +0000 -+++ src/glx/x11/XF86dri.c 2013-05-29 10:09:37.000000000 +0000 -@@ -43,6 +43,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN - #include - #include - #include "xf86dristr.h" -+#include -=20 -=20 - #if defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__) >=3D 303 -@@ -212,7 +213,11 @@ XF86DRIOpenConnection(Display * dpy, int - } -=20 - if (rep.length) { -- if (!(*busIdString =3D (char *) Xcalloc(rep.busIdStringLength + 1= , 1))) { -+ if (rep.busIdStringLength < INT_MAX) -+ *busIdString =3D Xcalloc(rep.busIdStringLength + 1, 1); -+ else -+ *busIdString =3D NULL; -+ if (*busIdString =3D=3D NULL) { - _XEatData(dpy, ((rep.busIdStringLength + 3) & ~3)); - UnlockDisplay(dpy); - SyncHandle(); -@@ -311,9 +316,11 @@ XF86DRIGetClientDriverName(Display * dpy - *ddxDriverPatchVersion =3D rep.ddxDriverPatchVersion; -=20 - if (rep.length) { -- if (! -- (*clientDriverName =3D -- (char *) Xcalloc(rep.clientDriverNameLength + 1, 1))) { -+ if (rep.clientDriverNameLength < INT_MAX) -+ *clientDriverName =3D Xcalloc(rep.clientDriverNameLength + 1, 1); -+ else -+ *clientDriverName =3D NULL; -+ if (*clientDriverName =3D=3D NULL) { - _XEatData(dpy, ((rep.clientDriverNameLength + 3) & ~3)); - UnlockDisplay(dpy); - SyncHandle(); Index: graphics/libGL/files/patch-configure =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files/patch-configure (revision 0) +++ graphics/libGL/files/patch-configure (working copy) @@ -0,0 +1,49 @@ +--- configure.orig 2013-08-01 23:22:15.000000000 +0200 ++++ configure 2013-08-19 20:05:02.000000000 +0200 +@@ -21046,9 +21046,34 @@ + DEFINES=3D"$DEFINES -DHAVE_PTHREAD -DUSE_EXTERNAL_DXTN_LIB=3D1"= + DEFINES=3D"$DEFINES -DIN_DRI_DRIVER -DHAVE_ALIAS" +=20 +- if test "x$DRI_DIRS" =3D "xyes"; then +- DRI_DIRS=3D"i915 i965 nouveau r200 radeon swrast" +- fi ++ case "$host_cpu" in ++ x86_64) ++ # i810 is missing because there is no x86-64 system where i= t ++ # could *ever* be used. ++ if test "x$DRI_DIRS" =3D "xyes"; then ++ DRI_DIRS=3D"i915 i965 nouveau r200 radeon swrast" ++ fi ++ ;; ++ i*86) ++ if test "x$DRI_DIRS" =3D "xyes"; then ++ DRI_DIRS=3D"i915 i965 nouveau r200 radeon swrast" ++ fi ++ ;; ++ powerpc*) ++ # Build only the drivers for cards that exist on PowerPC. ++ # At some point MGA will be added, but not yet. ++ if test "x$DRI_DIRS" =3D "xyes"; then ++ DRI_DIRS=3D"r200 radeon swrast" ++ fi ++ ;; ++ sparc*) ++ # Build only the drivers for cards that exist on SPARC. ++ if test "x$DRI_DIRS" =3D "xyes"; then ++ DRI_DIRS=3D"r200 radeon swrast" ++ fi ++ ;; ++ esac ++ + ;; + gnu*) + DEFINES=3D"$DEFINES -DUSE_EXTERNAL_DXTN_LIB=3D1 -DIN_DRI_DRIVER= " +@@ -23396,7 +23421,7 @@ + radeon_llvm_check() { + LLVM_REQUIRED_VERSION_MAJOR=3D"3" + LLVM_REQUIRED_VERSION_MINOR=3D"2" +- if test "$LLVM_VERSION_INT" -ne "${LLVM_REQUIRED_VERSION_MAJOR}0${L= LVM_REQUIRED_VERSION_MINOR}"; then ++ if test "$LLVM_VERSION_INT" -lt "${LLVM_REQUIRED_VERSION_MAJOR}0${L= LVM_REQUIRED_VERSION_MINOR}"; then + as_fn_error $? "LLVM $LLVM_REQUIRED_VERSION_MAJOR.$LLVM_REQUIRE= D_VERSION_MINOR with R600 target enabled is required. + To use the r600/radeonsi LLVM backend, you need to= fetch the LLVM source from: + git://people.freedesktop.org/~tstellar/llvm master= Property changes on: graphics/libGL/files/patch-configure ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Index: graphics/libGL/files/patch-src-glsl_ir_constant_expression.cpp =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files/patch-src-glsl_ir_constant_expression.cpp (revis= ion 0) +++ graphics/libGL/files/patch-src-glsl_ir_constant_expression.cpp (worki= ng copy) @@ -0,0 +1,14 @@ +--- src/glsl/ir_constant_expression.cpp.orig 2011-07-23 15:08:44.0000000= 00 +0200 ++++ src/glsl/ir_constant_expression.cpp 2011-07-23 15:09:03.000000000 +0= 200 +@@ -39,6 +39,11 @@ + #include "ir_visitor.h" + #include "glsl_types.h" +=20 ++#include ++#if __FreeBSD_version <=3D 704100 || (__FreeBSD_version >=3D 800000 && = __FreeBSD_version < 802502) || (__FreeBSD_version >=3D 900000 && __FreeBS= D_version < 900027) ++#define log2(x) (log(x) / log(2)) ++#endif ++ + static float + dot(ir_constant *op0, ir_constant *op1) + { Property changes on: graphics/libGL/files/patch-src-glsl_ir_constant_expr= ession.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: graphics/libGL/files/patch-src__gallium__include__pipe__p_config.h= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files/patch-src__gallium__include__pipe__p_config.h (r= evision 0) +++ graphics/libGL/files/patch-src__gallium__include__pipe__p_config.h (w= orking copy) @@ -0,0 +1,25 @@ +--- src/gallium/include/pipe/p_config.h.orig 2011-10-15 02:43:58.0000000= 00 +0200 ++++ src/gallium/include/pipe/p_config.h 2012-06-28 21:27:06.000000000 +0= 200 +@@ -106,6 +106,13 @@ + #endif + #endif +=20 ++#if defined(__sparc__) || defined(__sparc64__) ++#define PIPE_ARCH_SPARC ++#if defined(__sparc64__) ++#define PIPE_ARCH_SPARC_64 ++#endif ++#endif ++ +=20 + /* + * Endian detection. +@@ -133,7 +140,7 @@ +=20 + #if defined(PIPE_ARCH_X86) || defined(PIPE_ARCH_X86_64) + #define PIPE_ARCH_LITTLE_ENDIAN +-#elif defined(PIPE_ARCH_PPC) || defined(PIPE_ARCH_PPC_64) ++#elif defined(PIPE_ARCH_PPC) || defined(PIPE_ARCH_PPC_64) || defined(PI= PE_ARCH_SPARC) || defined(PIPE_ARCH_SPARC_64) + #define PIPE_ARCH_BIG_ENDIAN + #endif +=20 Property changes on: graphics/libGL/files/patch-src__gallium__include__pi= pe__p_config.h ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Index: graphics/libGL/files/patch-src_egl_main_Makefile.in =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files/patch-src_egl_main_Makefile.in (revision 0) +++ graphics/libGL/files/patch-src_egl_main_Makefile.in (working copy) @@ -0,0 +1,19 @@ +--- src/egl/main/Makefile.in.orig 2013-08-01 23:22:16.000000000 +0200 ++++ src/egl/main/Makefile.in 2013-09-01 11:33:47.000000000 +0200 +@@ -990,8 +990,14 @@ + # a while by putting a link to the driver into /lib of the build tree. + all-local: libEGL.la + $(MKDIR_P) $(top_builddir)/$(LIB_DIR); +- ln -f .libs/libEGL.so.1.0.0 $(top_builddir)/$(LIB_DIR)/libEGL.so.1 +- ln -sf libEGL.so.1 $(top_builddir)/$(LIB_DIR)/libEGL.so ++ base=3D$(basename $<); \ ++ dlname=3D$$(grep dlname=3D .libs/$< | cut -d "'" -f 2); \ ++ ver=3D$$(grep current=3D .libs/$< | cut -d "=3D" -f 2); \ ++ ln -f .libs/$$dlname $(top_builddir)/$(LIB_DIR)/$$dlname; \ ++ if [ ! -f $(top_builddir)/$(LIB_DIR)/$$base.so.$$ver ]; then \ ++ ln -sf $$dlname $(top_builddir)/$(LIB_DIR)/$$base.so.$$ver; \ ++ fi; \ ++ ln -sf $$base.so.$$ver $(top_builddir)/$(LIB_DIR)/$$base.so +=20 + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. Property changes on: graphics/libGL/files/patch-src_egl_main_Makefile.in ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Index: graphics/libGL/files/patch-src_gallium_drivers_r300_r300-chipset.c= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files/patch-src_gallium_drivers_r300_r300-chipset.c (r= evision 0) +++ graphics/libGL/files/patch-src_gallium_drivers_r300_r300-chipset.c (w= orking copy) @@ -0,0 +1,26 @@ +diff --git a/src/gallium/drivers/r300/r300_chipset.c b/src/gallium/drive= rs/r300/r300_chipset.c +index 11061ed..daf990e 100644 +--- src/gallium/drivers/r300/r300_chipset.c ++++ src/gallium/drivers/r300/r300_chipset.c +@@ -48,6 +48,21 @@ static void r300_apply_hyperz_blacklist(struct r300_c= apabilities* caps) + }; + int i; +=20 ++#if defined(__DragonFly__) || \ ++ defined(__FreeBSD__) || \ ++ defined(__NetBSD__) || \ ++ defined(__OpenBSD__) ++ const char *progname, *program_invocation_short_name; ++ ++ progname =3D getprogname(); ++ program_invocation_short_name =3D strrchr(progname, '/'); ++ if (program_invocation_short_name) { ++ program_invocation_short_name++; ++ } else { ++ program_invocation_short_name =3D progname; ++ } ++#endif ++ + for (i =3D 0; i < Elements(list); i++) { + if (strcmp(list[i], program_invocation_short_name) =3D=3D 0) { + caps->zmask_ram =3D 0; Property changes on: graphics/libGL/files/patch-src_gallium_drivers_r300_= r300-chipset.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: graphics/libGL/files/patch-src_gallium_drivers_r600_r600-asm.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files/patch-src_gallium_drivers_r600_r600-asm.c (revis= ion 0) +++ graphics/libGL/files/patch-src_gallium_drivers_r600_r600-asm.c (worki= ng copy) @@ -0,0 +1,15 @@ +--- src/gallium/drivers/r600/r600_asm.c.orig 2013-03-20 00:28:25.0000000= 00 +0100 ++++ src/gallium/drivers/r600/r600_asm.c 2013-06-26 23:29:14.000000000 +0= 200 +@@ -27,7 +27,12 @@ + #include "r600d.h" +=20 + #include ++#if defined(__linux__) + #include ++#elif defined(__FreeBSD__) ++#include ++#define bswap_32(x) bswap32((x)) ++#endif + #include "util/u_memory.h" + #include "pipe/p_shader_tokens.h" +=20 Property changes on: graphics/libGL/files/patch-src_gallium_drivers_r600_= r600-asm.c ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Index: graphics/libGL/files/patch-src_gallium_drivers_r600_r600-shader.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files/patch-src_gallium_drivers_r600_r600-shader.c (re= vision 0) +++ graphics/libGL/files/patch-src_gallium_drivers_r600_r600-shader.c (wo= rking copy) @@ -0,0 +1,15 @@ +--- src/gallium/drivers/r600/r600_shader.c.orig 2013-05-16 19:38:54.0000= 00000 +0200 ++++ src/gallium/drivers/r600/r600_shader.c 2013-06-26 23:26:02.000000000= +0200 +@@ -35,7 +35,12 @@ + #include "util/u_memory.h" + #include + #include ++#if defined(__linux__) + #include ++#elif defined(__FreeBSD__) ++#include ++#define bswap_32(x) bswap32((x)) ++#endif +=20 + /* CAYMAN notes=20 + Why CAYMAN got loops for lots of instructions is explained here. Property changes on: graphics/libGL/files/patch-src_gallium_drivers_r600_= r600-shader.c ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Index: graphics/libGL/files/patch-src_gallium_drivers_r600_r600_state_com= mon.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files/patch-src_gallium_drivers_r600_r600_state_common= =2Ec (revision 0) +++ graphics/libGL/files/patch-src_gallium_drivers_r600_r600_state_common= =2Ec (working copy) @@ -0,0 +1,15 @@ +--- src/gallium/drivers/r600/r600_state_common.c.orig 2013-03-06 00:25:3= 9.000000000 +0100 ++++ src/gallium/drivers/r600/r600_state_common.c 2013-06-26 23:26:02.000= 000000 +0200 +@@ -33,7 +33,12 @@ + #include "util/u_memory.h" + #include "util/u_upload_mgr.h" + #include "tgsi/tgsi_parse.h" ++#if defined(__linux__) + #include ++#elif defined(__FreeBSD__) ++#include ++#define bswap_32(x) bswap32((x)) ++#endif +=20 + #define R600_PRIM_RECTANGLE_LIST PIPE_PRIM_MAX +=20 Property changes on: graphics/libGL/files/patch-src_gallium_drivers_r600_= r600_state_common.c ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Index: graphics/libGL/files/patch-src_gallium_drivers_radeon_radeon-llvm-= emit.cpp =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files/patch-src_gallium_drivers_radeon_radeon-llvm-emi= t.cpp (revision 0) +++ graphics/libGL/files/patch-src_gallium_drivers_radeon_radeon-llvm-emi= t.cpp (working copy) @@ -0,0 +1,28 @@ +--- src/gallium/drivers/radeon/radeon_llvm_emit.cpp.orig 2013-08-19 21:2= 3:06.000000000 +0200 ++++ src/gallium/drivers/radeon/radeon_llvm_emit.cpp 2013-08-19 21:30:58.= 000000000 +0200 +@@ -25,13 +25,13 @@ + */ + #include "radeon_llvm_emit.h" +=20 +-#include +-#include ++#include ++#include + #include + #include + #include + #include +-#include ++#include + #include + #include + #include +@@ -39,7 +39,7 @@ + #include + #include + #include +-#include ++#include +=20 + #include + #include Property changes on: graphics/libGL/files/patch-src_gallium_drivers_radeo= n_radeon-llvm-emit.cpp ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Index: graphics/libGL/files/patch-src_gallium_drivers_radeonsi_r600-buffe= r.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files/patch-src_gallium_drivers_radeonsi_r600-buffer.c= (revision 0) +++ graphics/libGL/files/patch-src_gallium_drivers_radeonsi_r600-buffer.c= (working copy) @@ -0,0 +1,16 @@ +--- src/gallium/drivers/radeonsi/r600_buffer.c.orig 2013-08-01 00:56:45.= 000000000 +0200 ++++ src/gallium/drivers/radeonsi/r600_buffer.c 2013-08-19 21:36:02.00000= 0000 +0200 +@@ -24,7 +24,13 @@ + * Jerome Glisse + * Corbin Simpson + */ ++ ++#if defined(__linux__) + #include ++#elif defined(__FreeBSD__) ++#include ++#define bswap_32(x) bswap32((x)) ++#endif +=20 + #include "pipe/p_screen.h" + #include "util/u_format.h" Property changes on: graphics/libGL/files/patch-src_gallium_drivers_radeo= nsi_r600-buffer.c ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Index: graphics/libGL/files/patch-src_gallium_winsys_svga_drm_vmw-screen-= ioctl.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files/patch-src_gallium_winsys_svga_drm_vmw-screen-ioc= tl.c (revision 0) +++ graphics/libGL/files/patch-src_gallium_winsys_svga_drm_vmw-screen-ioc= tl.c (working copy) @@ -0,0 +1,18 @@ +diff --git a/src/gallium/winsys/svga/drm/vmw_screen_ioctl.c b/src/galliu= m/winsys/svga/drm/vmw_screen_ioctl.c +index 36888dc..62a6e6a 100644 +--- src/gallium/winsys/svga/drm/vmw_screen_ioctl.c ++++ src/gallium/winsys/svga/drm/vmw_screen_ioctl.c +@@ -66,6 +66,13 @@ struct vmw_region + */ + #define SVGA3D_SURFACE_HINT_SCANOUT (1 << 9) +=20 ++#if defined(__DragonFly__) || \ ++ defined(__FreeBSD__) || \ ++ defined(__NetBSD__) || \ ++ defined(__OpenBSD__) ++#define ERESTART EINTR ++#endif ++ + uint32 + vmw_ioctl_context_create(struct vmw_winsys_screen *vws) + { Property changes on: graphics/libGL/files/patch-src_gallium_winsys_svga_d= rm_vmw-screen-ioctl.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: graphics/libGL/files/patch-src_glx_Makefile.in =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files/patch-src_glx_Makefile.in (revision 0) +++ graphics/libGL/files/patch-src_glx_Makefile.in (working copy) @@ -0,0 +1,59 @@ +--- src/glx/Makefile.in.orig 2013-07-03 15:13:37.000000000 +0200 ++++ src/glx/Makefile.in 2013-07-03 15:19:44.000000000 +0200 +@@ -162,12 +162,12 @@ + depcomp =3D $(SHELL) $(top_srcdir)/bin/depcomp + am__depfiles_maybe =3D depfiles + am__mv =3D mv -f +-COMPILE =3D $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS= ) \ +- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++COMPILE =3D $(CC) $(DEFS) $(AM_CFLAGS) $(DEFAULT_INCLUDES) $(INCLUDES) = \ ++ $(AM_CPPFLAGS) $(CPPFLAGS) $(CFLAGS) + LTCOMPILE =3D $(LIBTOOL) $(AM_V_lt) --tag=3DCC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=3Dcompile $(CC) $(DEFS) \ +- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ +- $(AM_CFLAGS) $(CFLAGS) ++ $(AM_CFLAGS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ ++ $(CPPFLAGS) $(CFLAGS) + AM_V_CC =3D $(am__v_CC_@AM_V@) + am__v_CC_ =3D $(am__v_CC_@AM_DEFAULT_V@) + am__v_CC_0 =3D @echo " CC " $@; +@@ -632,17 +632,17 @@ + $(am__aclocal_m4_deps): + install-libLTLIBRARIES: $(lib_LTLIBRARIES) + @$(NORMAL_INSTALL) +- @list=3D'$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=3D; \ ++ @list=3D'$(lib_LTLIBRARIES)'; test -n "$(libdir)/.libGL" || list=3D; \= + list2=3D; for p in $$list; do \ + if test -f $$p; then \ + list2=3D"$$list2 $$p"; \ + else :; fi; \ + done; \ + test -z "$$list2" || { \ +- echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \ +- $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \ +- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=3Dinstal= l $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \ +- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=3Dinstall $(INS= TALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \ ++ echo " $(MKDIR_P) '$(DESTDIR)$(libdir)/.libGL'"; \ ++ $(MKDIR_P) "$(DESTDIR)$(libdir)/.libGL" || exit 1; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=3Dinstal= l $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)/.libGL'";= \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=3Dinstall $(INS= TALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)/.libGL"; \ + } +=20 + uninstall-libLTLIBRARIES: +@@ -1068,8 +1068,14 @@ + # a while by putting a link to the driver into /lib of the build tree. + all-local: lib@GL_LIB@.la + $(MKDIR_P) $(top_builddir)/$(LIB_DIR); +- ln -f .libs/lib@GL_LIB@.so.1.2.0 $(top_builddir)/$(LIB_DIR)/lib@GL_LIB= @.so.1 +- ln -sf lib@GL_LIB@.so.1 $(top_builddir)/$(LIB_DIR)/lib@GL_LIB@.so ++ base=3D$(basename $<); \ ++ dlname=3D$$(grep dlname=3D .libs/$< | cut -d "'" -f 2); \ ++ ver=3D$$(grep current=3D .libs/$< | cut -d "=3D" -f 2); \ ++ ln -f .libs/$$dlname $(top_builddir)/$(LIB_DIR)/$$dlname; \ ++ if [ ! -f $(top_builddir)/$(LIB_DIR)/$$base.so.$$ver ]; then \ ++ ln -sf $$dlname $(top_builddir)/$(LIB_DIR)/$$base.so.$$ver; \ ++ fi; \ ++ ln -sf $$base.so.$$ver $(top_builddir)/$(LIB_DIR)/$$base.so +=20 + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. Property changes on: graphics/libGL/files/patch-src_glx_Makefile.in ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Index: graphics/libGL/files/patch-src_mapi_es2api_Makefile.in =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files/patch-src_mapi_es2api_Makefile.in (revision 0) +++ graphics/libGL/files/patch-src_mapi_es2api_Makefile.in (working copy)= @@ -0,0 +1,20 @@ +--- src/mapi/es2api/Makefile.in.orig 2013-08-01 23:22:21.000000000 +0200= ++++ src/mapi/es2api/Makefile.in 2013-09-01 11:38:01.000000000 +0200 +@@ -958,9 +958,14 @@ + # a while by putting a link to the driver into /lib of the build tree. + all-local: libGLESv2.la + $(MKDIR_P) $(top_builddir)/$(LIB_DIR); +- ln -f .libs/libGLESv2.so $(top_builddir)/$(LIB_DIR)/libGLESv2.so +- ln -f .libs/libGLESv2.so.2 $(top_builddir)/$(LIB_DIR)/libGLESv2.so.2 +- ln -f .libs/libGLESv2.so.2.0.0 $(top_builddir)/$(LIB_DIR)/libGLESv2.so= =2E2.0.0 ++ base=3D$(basename $<); \ ++ dlname=3D$$(grep dlname=3D .libs/$< | cut -d "'" -f 2); \ ++ ver=3D$$(grep current=3D .libs/$< | cut -d "=3D" -f 2); \ ++ ln -f .libs/$$dlname $(top_builddir)/$(LIB_DIR)/$$dlname; \ ++ if [ ! -f $(top_builddir)/$(LIB_DIR)/$$base.so.$$ver ]; then \ ++ ln -sf $$dlname $(top_builddir)/$(LIB_DIR)/$$base.so.$$ver; \ ++ fi; \ ++ ln -sf $$base.so.$$ver $(top_builddir)/$(LIB_DIR)/$$base.so +=20 + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. Property changes on: graphics/libGL/files/patch-src_mapi_es2api_Makefile.= in ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Index: graphics/libGL/files/patch-src_mapi_glapi_gen_gl-gentable.py =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files/patch-src_mapi_glapi_gen_gl-gentable.py (revisio= n 0) +++ graphics/libGL/files/patch-src_mapi_glapi_gen_gl-gentable.py (working= copy) @@ -0,0 +1,11 @@ +--- src/mapi/glapi/gen/gl_gentable.py.orig 2013-07-17 15:41:13.000000000= +0200 ++++ src/mapi/glapi/gen/gl_gentable.py 2013-07-17 15:41:55.000000000 +020= 0 +@@ -42,7 +42,7 @@ + #endif +=20 + #if (defined(GLXEXT) && defined(HAVE_BACKTRACE)) \\ +- || (!defined(GLXEXT) && defined(DEBUG) && !defined(_WIN32_WCE) && !def= ined(__CYGWIN__)) ++ || (!defined(GLXEXT) && defined(DEBUG) && !defined(_WIN32_WCE) && !def= ined(__CYGWIN__) && !defined(__OpenBSD__) && !defined(__FreeBSD__)) + #define USE_BACKTRACE + #endif +=20 Property changes on: graphics/libGL/files/patch-src_mapi_glapi_gen_gl-gen= table.py ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Index: graphics/libGL/files/patch-src_mapi_shared-glapi_Makefile.in =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files/patch-src_mapi_shared-glapi_Makefile.in (revisio= n 0) +++ graphics/libGL/files/patch-src_mapi_shared-glapi_Makefile.in (working= copy) @@ -0,0 +1,20 @@ +--- src/mapi/shared-glapi/Makefile.in.orig 2013-06-27 00:42:45.000000000= +0200 ++++ src/mapi/shared-glapi/Makefile.in 2013-06-27 00:43:25.000000000 +020= 0 +@@ -889,9 +889,14 @@ +=20 + all-local: libglapi.la + $(MKDIR_P) $(top_builddir)/$(LIB_DIR) +- ln -f .libs/libglapi.so.0.0.0 $(top_builddir)/$(LIB_DIR)/libglapi.so.0= =2E0.0 +- ln -sf libglapi.so.0.0.0 $(top_builddir)/$(LIB_DIR)/libglapi.so.0 +- ln -sf libglapi.so.0 $(top_builddir)/$(LIB_DIR)/libglapi.so ++ base=3D$(basename $<); \ ++ dlname=3D$$(grep dlname=3D .libs/$< | cut -d "'" -f 2); \ ++ ver=3D$$(grep current=3D .libs/$< | cut -d "=3D" -f 2); \ ++ ln -f .libs/$$dlname $(top_builddir)/$(LIB_DIR)/$$dlname; \ ++ if [ ! -f $(top_builddir)/$(LIB_DIR)/$$base.so.$$ver ]; then \ ++ ln -sf $$dlname $(top_builddir)/$(LIB_DIR)/$$base.so.$$ver; \ ++ fi; \ ++ ln -sf $$base.so.$$ver $(top_builddir)/$(LIB_DIR)/$$base.so +=20 + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. Property changes on: graphics/libGL/files/patch-src_mapi_shared-glapi_Mak= efile.in ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Index: graphics/libGL/files/patch-src_mesa_Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files/patch-src_mesa_Makefile (revision 326808) +++ graphics/libGL/files/patch-src_mesa_Makefile (working copy) @@ -1,15 +0,0 @@ ---- src/mesa/Makefile.orig 2012-04-22 18:34:50.000000000 +0200 -+++ src/mesa/Makefile 2012-04-22 18:35:00.000000000 +0200 -@@ -183,10 +183,10 @@ - $(DESTDIR)$(INSTALL_INC_DIR)/GL -=20 - install-libgl: default gl.pc install-headers -- $(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR) -+ $(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)/.libGL - $(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig - $(MINSTALL) $(TOP)/$(LIB_DIR)/$(GL_LIB_GLOB) \ -- $(DESTDIR)$(INSTALL_LIB_DIR) -+ $(DESTDIR)$(INSTALL_LIB_DIR)/.libGL - $(INSTALL) -m 644 gl.pc $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig -=20 - install-osmesa: default osmesa.pc Index: graphics/libGL/files/patch-src_mesa_drivers_dri_common_Makefile.in= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files/patch-src_mesa_drivers_dri_common_Makefile.in (r= evision 0) +++ graphics/libGL/files/patch-src_mesa_drivers_dri_common_Makefile.in (w= orking copy) @@ -0,0 +1,17 @@ +--- src/mesa/drivers/dri/common/Makefile.in.orig 2013-04-20 14:50:15.000= 000000 +0000 ++++ src/mesa/drivers/dri/common/Makefile.in 2013-04-20 15:02:05.00000000= 0 +0000 +@@ -123,11 +123,11 @@ + am__depfiles_maybe =3D depfiles + am__mv =3D mv -f + COMPILE =3D $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS= ) \ +- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++ $(AM_CFLAGS) $(CPPFLAGS) $(CFLAGS) + LTCOMPILE =3D $(LIBTOOL) $(AM_V_lt) --tag=3DCC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=3Dcompile $(CC) $(DEFS) \ +- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ +- $(AM_CFLAGS) $(CFLAGS) ++ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(AM_CFLAGS) $(CPPFLAGS= ) \ ++ $(CFLAGS) + AM_V_CC =3D $(am__v_CC_@AM_V@) + am__v_CC_ =3D $(am__v_CC_@AM_DEFAULT_V@) + am__v_CC_0 =3D @echo " CC " $@; Property changes on: graphics/libGL/files/patch-src_mesa_drivers_dri_comm= on_Makefile.in ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: graphics/libGL/files/patch-src_mesa_drivers_dri_common_xmlpool_Mak= efile.in =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files/patch-src_mesa_drivers_dri_common_xmlpool_Makefi= le.in (revision 0) +++ graphics/libGL/files/patch-src_mesa_drivers_dri_common_xmlpool_Makefi= le.in (working copy) @@ -0,0 +1,11 @@ +--- src/mesa/drivers/dri/common/xmlpool/Makefile.in.orig 2013-07-02 22:4= 2:09.000000000 +0200 ++++ src/mesa/drivers/dri/common/xmlpool/Makefile.in 2013-07-02 22:53:30.= 000000000 +0200 +@@ -639,7 +639,7 @@ + # Update .mo files from the corresponding .po files. + %/LC_MESSAGES/options.mo: %.po + @mo=3D"$@"; \ +- lang=3D$${mo%%/*}; \ ++ lang=3D$*; \ + echo "Updating ($$lang) $@ from $?."; \ + mkdir -p $$lang/LC_MESSAGES; \ + msgfmt -o $@ $? Property changes on: graphics/libGL/files/patch-src_mesa_drivers_dri_comm= on_xmlpool_Makefile.in ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Index: graphics/libGL/files/patch-src_mesa_libdricore_Makefile.in =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files/patch-src_mesa_libdricore_Makefile.in (revision = 0) +++ graphics/libGL/files/patch-src_mesa_libdricore_Makefile.in (working c= opy) @@ -0,0 +1,19 @@ +--- src/mesa/libdricore/Makefile.in.orig 2013-06-27 00:21:26.000000000 += 0200 ++++ src/mesa/libdricore/Makefile.in 2013-06-27 00:28:29.000000000 +0200 +@@ -3950,8 +4000,14 @@ + # a while by putting a link to the driver into /lib of the build tree. + @HAVE_DRI_TRUE@all-local: libdricore@VERSION@.la + @HAVE_DRI_TRUE@ $(MKDIR_P) $(top_builddir)/$(LIB_DIR); +-@HAVE_DRI_TRUE@ ln -f .libs/libdricore@VERSION@.so.1.0.0 $(top_builddir= )/$(LIB_DIR)/libdricore@VERSION@.so.1; +-@HAVE_DRI_TRUE@ ln -sf libdricore@VERSION@.so.1 $(top_builddir)/$(LIB_D= IR)/libdricore@VERSION@.so ++@HAVE_DRI_TRUE@ base=3D$(basename $<); \ ++@HAVE_DRI_TRUE@ dlname=3D$$(grep dlname=3D .libs/$< | cut -d "'" -f 2);= \ ++@HAVE_DRI_TRUE@ ver=3D$$(grep current=3D .libs/$< | cut -d "=3D" -f 2);= \ ++@HAVE_DRI_TRUE@ ln -f .libs/$$dlname $(top_builddir)/$(LIB_DIR)/$$dlnam= e; \ ++@HAVE_DRI_TRUE@ if [ ! -f $(top_builddir)/$(LIB_DIR)/$$base.so.$$ver ];= then \ ++@HAVE_DRI_TRUE@ ln -sf $$dlname $(top_builddir)/$(LIB_DIR)/$$base.so.= $$ver; \ ++@HAVE_DRI_TRUE@ fi; \ ++@HAVE_DRI_TRUE@ ln -sf $$base.so.$$ver $(top_builddir)/$(LIB_DIR)/$$bas= e.so +=20 + -include $(DEPENDS) +=20 Property changes on: graphics/libGL/files/patch-src_mesa_libdricore_Makef= ile.in ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Index: graphics/libGL/files/patch-src_mesa_main_compiler.h =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files/patch-src_mesa_main_compiler.h (revision 0) +++ graphics/libGL/files/patch-src_mesa_main_compiler.h (working copy) @@ -0,0 +1,12 @@ +--- src/mesa/main/compiler.h.orig 2013-04-06 04:01:09.000000000 +0200 ++++ src/mesa/main/compiler.h 2013-06-26 23:26:02.000000000 +0200 +@@ -171,6 +171,9 @@ + #if defined(__linux__) + #include + #define CPU_TO_LE32( x ) bswap_32( x ) ++#elif defined(__FreeBSD__) ++#include ++#define CPU_TO_LE32( x ) bswap32( x ) + #elif defined(__APPLE__) + #include + #define CPU_TO_LE32( x ) CFSwapInt32HostToLittle( x ) Property changes on: graphics/libGL/files/patch-src_mesa_main_compiler.h ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Index: graphics/libGL/files-old/patch-configure =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files-old/patch-configure (revision 0) +++ graphics/libGL/files-old/patch-configure (working copy) @@ -0,0 +1,43 @@ +--- configure.orig 2009-12-22 03:31:30.000000000 +0100 ++++ configure 2012-06-27 19:49:26.000000000 +0200 +@@ -6946,12 +6946,35 @@ + CXXFLAGS=3D"$CXXFLAGS -ansi -pedantic" + fi +=20 +- # ffb and gamma are missing because they have not been converte= d +- # to use the new interface. +- if test "x$DRI_DIRS" =3D "xyes"; then +- DRI_DIRS=3D"i810 i915 i965 mach64 mga r128 r200 r300 r600 r= adeon tdfx \ ++ case "$host_cpu" in ++ x86_64) ++ # i810 is missing because there is no x86-64 system where i= t ++ # could *ever* be used. ++ if test "x$DRI_DIRS" =3D "xyes"; then ++ DRI_DIRS=3D"i915 i965 mach64 mga r128 r200 r300 r600 ra= deon tdfx \ + unichrome savage sis swrast" +- fi ++ fi ++ ;; ++ i*86) ++ if test "x$DRI_DIRS" =3D "xyes"; then ++ DRI_DIRS=3D"i810 i915 i965 mach64 mga r128 r200 r300 r6= 00 radeon tdfx \ ++ unichrome savage sis swrast" ++ fi ++ ;; ++ powerpc*) ++ # Build only the drivers for cards that exist on PowerPC. ++ # At some point MGA will be added, but not yet. ++ if test "x$DRI_DIRS" =3D "xyes"; then ++ DRI_DIRS=3D"mach64 r128 r200 r300 r600 radeon tdfx swra= st" ++ fi ++ ;; ++ sparc*) ++ # Build only the drivers for cards that exist on SPARC. ++ if test "x$DRI_DIRS" =3D "xyes"; then ++ DRI_DIRS=3D"mach64 r128 r200 r300 r600 radeon swrast" ++ fi ++ ;; ++ esac + ;; + gnu*) + DEFINES=3D"$DEFINES -DUSE_EXTERNAL_DXTN_LIB=3D1 -DIN_DRI_DRIVER= " Property changes on: graphics/libGL/files-old/patch-configure ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Index: graphics/libGL/files-old/patch-mach64_context.h =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files-old/patch-mach64_context.h (revision 0) +++ graphics/libGL/files-old/patch-mach64_context.h (working copy) @@ -0,0 +1,20 @@ +--- src/mesa/drivers/dri/mach64/mach64_context.h.orig 2012-06-27 19:59:3= 2.000000000 +0200 ++++ src/mesa/drivers/dri/mach64/mach64_context.h 2012-06-27 20:08:30.000= 000000 +0200 +@@ -294,11 +294,14 @@ + #define LE32_OUT( x, y ) do { *(GLuint *)(x) =3D (y); } while (0) + #define LE32_OUT_FLOAT( x, y ) do { *(GLfloat *)(x) =3D (y); } while (0= ) + #else +-#ifndef __OpenBSD__ +-#include +-#else ++#if defined(__OpenBSD__) + #include + #define bswap_32 bswap32 ++#elif defined(__FreeBSD__) ++#include ++#define bswap_32 bswap32 ++#else ++#include + #endif +=20 + #define LE32_IN( x ) bswap_32( *(GLuint *)(x) ) Property changes on: graphics/libGL/files-old/patch-mach64_context.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: graphics/libGL/files-old/patch-src__mesa__x86-64__glapi_x86-64.S =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files-old/patch-src__mesa__x86-64__glapi_x86-64.S (rev= ision 0) +++ graphics/libGL/files-old/patch-src__mesa__x86-64__glapi_x86-64.S (wor= king copy) @@ -0,0 +1,12 @@ +--- ./src/mesa/x86-64/glapi_x86-64.S.orig 2009-03-13 04:28:49.000000000 = +0100 ++++ ./src/mesa/x86-64/glapi_x86-64.S 2011-01-28 18:12:18.000000000 +0100= +@@ -73,7 +73,8 @@ _x86_64_get_dispatch: +=20 + .p2align 4,,15 + _x86_64_get_dispatch: +- movq _gl_DispatchTSD(%rip), %rdi ++ movq _gl_DispatchTSD@GOTPCREL(%rip), %rax ++ movl (%rax), %edi + jmp pthread_getspecific@PLT +=20 + #elif defined(THREADS) Property changes on: graphics/libGL/files-old/patch-src__mesa__x86-64__gl= api_x86-64.S ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: graphics/libGL/files-old/patch-src__mesa__x86-64__xform4.S =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files-old/patch-src__mesa__x86-64__xform4.S (revision = 0) +++ graphics/libGL/files-old/patch-src__mesa__x86-64__xform4.S (working c= opy) @@ -0,0 +1,74 @@ +--- src/mesa/x86-64/xform4.S.orig 2009-01-22 18:38:35.000000000 +0100 ++++ src/mesa/x86-64/xform4.S 2011-05-09 21:26:00.000000000 +0200 +@@ -53,7 +53,7 @@ _mesa_x86_64_transform_points4_general: + * rdx =3D source + */ + movl V4F_COUNT(%rdx), %ecx /* count */ +- movzx V4F_STRIDE(%rdx), %eax /* stride */ ++ movzbl V4F_STRIDE(%rdx), %eax /* stride */ +=20 + movl %ecx, V4F_COUNT(%rdi) /* set dest count */ + movl $4, V4F_SIZE(%rdi) /* set dest size */ +@@ -116,7 +116,7 @@ p4_constants: + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 +-.float 0f+1.0 ++.float 1.0 +=20 + .text + .align 16 +@@ -135,7 +135,7 @@ _mesa_x86_64_transform_points4_3d: + movaps 16(%rax), %xmm10 +=20 + movl V4F_COUNT(%rdx), %ecx /* count */ +- movzx V4F_STRIDE(%rdx), %eax /* stride */ ++ movzbl V4F_STRIDE(%rdx), %eax /* stride */ +=20 + movl %ecx, V4F_COUNT(%rdi) /* set dest count */ + movl $4, V4F_SIZE(%rdi) /* set dest size */ +@@ -195,7 +195,7 @@ p4_3d_done: + _mesa_x86_64_transform_points4_identity: +=20 + movl V4F_COUNT(%rdx), %ecx /* count */ +- movzx V4F_STRIDE(%rdx), %eax /* stride */ ++ movzbl V4F_STRIDE(%rdx), %eax /* stride */ +=20 + movl %ecx, V4F_COUNT(%rdi) /* set dest count */ + movl $4, V4F_SIZE(%rdi) /* set dest size */ +@@ -223,7 +223,7 @@ p4_identity_done: + _mesa_3dnow_transform_points4_3d_no_rot: +=20 + movl V4F_COUNT(%rdx), %ecx /* count */ +- movzx V4F_STRIDE(%rdx), %eax /* stride */ ++ movzbl V4F_STRIDE(%rdx), %eax /* stride */ +=20 + movl %ecx, V4F_COUNT(%rdi) /* set dest count */ + movl $4, V4F_SIZE(%rdi) /* set dest size */ +@@ -287,7 +287,7 @@ p4_3d_no_rot_done: + _mesa_3dnow_transform_points4_perspective: +=20 + movl V4F_COUNT(%rdx), %ecx /* count */ +- movzx V4F_STRIDE(%rdx), %eax /* stride */ ++ movzbl V4F_STRIDE(%rdx), %eax /* stride */ +=20 + movl %ecx, V4F_COUNT(%rdi) /* set dest count */ + movl $4, V4F_SIZE(%rdi) /* set dest size */ +@@ -353,7 +353,7 @@ p4_perspective_done: + _mesa_3dnow_transform_points4_2d_no_rot: +=20 + movl V4F_COUNT(%rdx), %ecx /* count */ +- movzx V4F_STRIDE(%rdx), %eax /* stride */ ++ movzbl V4F_STRIDE(%rdx), %eax /* stride */ +=20 + movl %ecx, V4F_COUNT(%rdi) /* set dest count */ + movl $4, V4F_SIZE(%rdi) /* set dest size */ +@@ -408,7 +408,7 @@ p4_2d_no_rot_done: + _mesa_3dnow_transform_points4_2d: +=20 + movl V4F_COUNT(%rdx), %ecx /* count */ +- movzx V4F_STRIDE(%rdx), %eax /* stride */ ++ movzbl V4F_STRIDE(%rdx), %eax /* stride */ +=20 + movl %ecx, V4F_COUNT(%rdi) /* set dest count */ + movl $4, V4F_SIZE(%rdi) /* set dest size */ Property changes on: graphics/libGL/files-old/patch-src__mesa__x86-64__xf= orm4.S ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: graphics/libGL/files-old/patch-src__mesa__x86__glapi_x86.S =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files-old/patch-src__mesa__x86__glapi_x86.S (revision = 0) +++ graphics/libGL/files-old/patch-src__mesa__x86__glapi_x86.S (working c= opy) @@ -0,0 +1,11 @@ +--- ./src/mesa/x86/glapi_x86.S.orig 2009-03-13 04:28:49.000000000 +0100 ++++ ./src/mesa/x86/glapi_x86.S 2011-01-28 18:11:56.000000000 +0100 +@@ -47,7 +47,7 @@ + #define GL_OFFSET(x) CODEPTR(REGOFF(4 * x, EAX)) +=20 + #if defined(GNU_ASSEMBLER) && !defined(__DJGPP__) && !defined(__MINGW32= __) +-#define GLOBL_FN(x) GLOBL x ; .type x, function ++#define GLOBL_FN(x) GLOBL x ; .type x, @function + #else + #define GLOBL_FN(x) GLOBL x + #endif Property changes on: graphics/libGL/files-old/patch-src__mesa__x86__glapi= _x86.S ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: graphics/libGL/files-old/patch-src__mesa__x86__read_rgba_span_x86.= S =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files-old/patch-src__mesa__x86__read_rgba_span_x86.S (= revision 0) +++ graphics/libGL/files-old/patch-src__mesa__x86__read_rgba_span_x86.S (= working copy) @@ -0,0 +1,11 @@ +--- ./src/mesa/x86/read_rgba_span_x86.S.orig 2008-08-25 16:46:47.0000000= 00 +0200 ++++ ./src/mesa/x86/read_rgba_span_x86.S 2011-01-28 18:10:06.000000000 +0= 100 +@@ -648,7 +648,7 @@ _generic_read_RGBA_span_RGB565_MMX: + testl $0x01, %ecx + je .L01 +=20 +- movzxw (%eax), %ecx ++ movzwl (%eax), %ecx + movd %ecx, %mm4 +=20 + pshufw $0x00, %mm4, %mm0 Property changes on: graphics/libGL/files-old/patch-src__mesa__x86__read_= rgba_span_x86.S ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: graphics/libGL/files-old/patch-src_glx_x11_XF86dri.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files-old/patch-src_glx_x11_XF86dri.c (revision 0) +++ graphics/libGL/files-old/patch-src_glx_x11_XF86dri.c (working copy) @@ -0,0 +1,38 @@ +--- src/glx/x11/XF86dri.c.orig 2009-06-17 18:35:16.000000000 +0000 ++++ src/glx/x11/XF86dri.c 2013-05-29 10:09:37.000000000 +0000 +@@ -43,6 +43,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN + #include + #include + #include "xf86dristr.h" ++#include +=20 +=20 + #if defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__) >=3D 303 +@@ -212,7 +213,11 @@ XF86DRIOpenConnection(Display * dpy, int + } +=20 + if (rep.length) { +- if (!(*busIdString =3D (char *) Xcalloc(rep.busIdStringLength + 1= , 1))) { ++ if (rep.busIdStringLength < INT_MAX) ++ *busIdString =3D Xcalloc(rep.busIdStringLength + 1, 1); ++ else ++ *busIdString =3D NULL; ++ if (*busIdString =3D=3D NULL) { + _XEatData(dpy, ((rep.busIdStringLength + 3) & ~3)); + UnlockDisplay(dpy); + SyncHandle(); +@@ -311,9 +316,11 @@ XF86DRIGetClientDriverName(Display * dpy + *ddxDriverPatchVersion =3D rep.ddxDriverPatchVersion; +=20 + if (rep.length) { +- if (! +- (*clientDriverName =3D +- (char *) Xcalloc(rep.clientDriverNameLength + 1, 1))) { ++ if (rep.clientDriverNameLength < INT_MAX) ++ *clientDriverName =3D Xcalloc(rep.clientDriverNameLength + 1, 1); ++ else ++ *clientDriverName =3D NULL; ++ if (*clientDriverName =3D=3D NULL) { + _XEatData(dpy, ((rep.clientDriverNameLength + 3) & ~3)); + UnlockDisplay(dpy); + SyncHandle(); Property changes on: graphics/libGL/files-old/patch-src_glx_x11_XF86dri.c= ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +on \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Index: graphics/libGL/files-old/patch-src_mesa_Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files-old/patch-src_mesa_Makefile (revision 0) +++ graphics/libGL/files-old/patch-src_mesa_Makefile (working copy) @@ -0,0 +1,15 @@ +--- src/mesa/Makefile.orig 2009-12-22 03:31:19.000000000 +0100 ++++ src/mesa/Makefile 2013-08-19 23:19:42.000000000 +0200 +@@ -127,10 +127,10 @@ + $(DESTDIR)$(INSTALL_INC_DIR)/GL +=20 + install-libgl: default gl.pc install-headers +- $(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR) ++ $(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)/.libGL + $(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig + $(MINSTALL) $(TOP)/$(LIB_DIR)/$(GL_LIB_GLOB) \ +- $(DESTDIR)$(INSTALL_LIB_DIR) ++ $(DESTDIR)$(INSTALL_LIB_DIR)/.libGL + $(INSTALL) -m 644 gl.pc $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig +=20 + install-osmesa: default osmesa.pc Property changes on: graphics/libGL/files-old/patch-src_mesa_Makefile ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Index: graphics/libGL/pkg-plist =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/pkg-plist (revision 326808) +++ graphics/libGL/pkg-plist (working copy) @@ -11,9 +11,10 @@ %%OLD%%include/GL/mglmesa.h include/GL/osmesa.h %%OLD%%include/GL/svgamesa.h -include/GL/vms_x_fix.h +%%OLD%%include/GL/vms_x_fix.h include/GL/wglext.h include/GL/wmesa.h +%%NEW%%lib/.libGL/libGL.la lib/.libGL/libGL.so lib/.libGL/libGL.so.1 libdata/pkgconfig/gl.pc Index: graphics/libGLw/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGLw/Makefile (revision 326808) +++ graphics/libGLw/Makefile (working copy) @@ -12,9 +12,10 @@ COMMENT=3D OpenGL widgets library =20 USE_BZIP2=3D yes -USES=3D pathfix pkgconfig motif +USES=3D pathfix pkgconfig USE_LDCONFIG=3D yes USE_GL=3D gl +USE_MOTIF=3D yes USE_XORG=3D x11 xt xext GNU_CONFIGURE=3D yes CONFIGURE_ARGS=3D --disable-static --enable-motif Index: graphics/libdrm/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libdrm/Makefile (revision 326808) +++ graphics/libdrm/Makefile (working copy) @@ -10,8 +10,8 @@ MAINTAINER=3D x11@FreeBSD.org COMMENT=3D Userspace interface to kernel Direct Rendering Module service= s =20 -LIB_DEPENDS=3D pciaccess:${PORTSDIR}/devel/libpciaccess \ - pthread-stubs:${PORTSDIR}/devel/libpthread-stubs +LIB_DEPENDS=3D libpciaccess.so:${PORTSDIR}/devel/libpciaccess \ + libpthread-stubs.so:${PORTSDIR}/devel/libpthread-stubs =20 USES=3D pkgconfig USE_BZIP2=3D yes @@ -18,15 +18,8 @@ GNU_CONFIGURE=3D yes USE_LDCONFIG=3D yes =20 +OPTIONS_DEFINE=3D MANPAGES =20 -.if defined(WITH_NEW_XORG) - -USES+=3D gmake - -OPTIONS_DEFINE=3D KMS MANPAGES -OPTIONS_DEFAULT=3DKMS -KMS_DESC=3D Enable KMS support - .if defined(PACKAGE_BUILDING) OPTIONS_DEFAULT+=3D MANPAGES .endif @@ -33,12 +26,18 @@ =20 .include =20 -.if ${PORT_OPTIONS:MKMS} +.if defined(WITH_NEW_XORG) + +USES+=3D gmake + +# KMS support in the kernel is only build on these archs, disable others= +.if ${ARCH} =3D=3D "amd64" || ${ARCH} =3D=3D "i386" CONFIGURE_ARGS+=3D--enable-libkms EXTRA_PATCHES+=3D ${FILESDIR}/extra-xf86drmMode.c -PLIST_SUB+=3D KMS=3D"" +PLIST_SUB+=3D KMS=3D"" NOUVEAU=3D"" .else -PLIST_SUB+=3D KMS=3D"@comment " +CONFIGURE_ARGS+=3D--disable-libkms +PLIST_SUB+=3D KMS=3D"@comment " NOUVEAU=3D"@comment " .endif =20 .if ${PORT_OPTIONS:MMANPAGES} @@ -69,11 +68,9 @@ CONFIGURE_ARGS=3D --enable-nouveau-experimental-api LIBDRM_VERSION=3D 2.4.17 LIBDRM_REVISION=3D1 -PLIST_SUB+=3D OLD=3D"" NEW=3D"@comment " +PLIST_SUB+=3D OLD=3D"" NEW=3D"@comment " NOUVEAU=3D"" .endif =20 -.include - .if ${ARCH} =3D=3D "amd64" || ${ARCH} =3D=3D "i386" || ${ARCH} =3D=3D "i= a64" || ${ARCH} =3D=3D "powerpc" PLIST_SUB+=3D INTEL_DRIVER=3D"" PLIST_SUB+=3D RADEON_DRIVERS=3D"" @@ -87,4 +84,4 @@ s,i?86|x86_64),i?86|amd64|x86_64),g' \ ${WRKSRC}/configure =20 -.include +.include Index: graphics/libdrm/pkg-plist =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libdrm/pkg-plist (revision 326808) +++ graphics/libdrm/pkg-plist (working copy) @@ -22,8 +22,9 @@ %%NEW%%%%INTEL_DRIVER%%include/libdrm/intel_debug.h %%NEW%%include/libdrm/mach64_drm.h %%NEW%%include/libdrm/mga_drm.h -%%NEW%%include/libdrm/nouveau.h +%%NEW%%%%NOUVEAU%%include/libdrm/nouveau.h %%NEW%%include/libdrm/nouveau_drm.h +%%NEW%%include/libdrm/qxl_drm.h %%NEW%%include/libdrm/r128_drm.h %%NEW%%%%RADEON_DRIVERS%%include/libdrm/r600_pci_ids.h %%NEW%%%%RADEON_DRIVERS%%include/libdrm/radeon_bo.h @@ -54,10 +55,10 @@ %%INTEL_DRIVER%%lib/libdrm_intel.la %%INTEL_DRIVER%%lib/libdrm_intel.so %%INTEL_DRIVER%%lib/libdrm_intel.so.1 -lib/libdrm_nouveau.la -lib/libdrm_nouveau.so -%%OLD%%lib/libdrm_nouveau.so.1 -%%NEW%%lib/libdrm_nouveau.so.2 +%%NOUVEAU%%lib/libdrm_nouveau.la +%%NOUVEAU%%lib/libdrm_nouveau.so +%%OLD%%%%NOUVEAU%%lib/libdrm_nouveau.so.1 +%%NEW%%%%NOUVEAU%%lib/libdrm_nouveau.so.2 %%NEW%%%%RADEON_DRIVERS%%lib/libdrm_radeon.la %%NEW%%%%RADEON_DRIVERS%%lib/libdrm_radeon.so %%NEW%%%%RADEON_DRIVERS%%lib/libdrm_radeon.so.1 @@ -66,7 +67,7 @@ %%NEW%%%%KMS%%lib/libkms.so.1 libdata/pkgconfig/libdrm.pc %%INTEL_DRIVER%%libdata/pkgconfig/libdrm_intel.pc -libdata/pkgconfig/libdrm_nouveau.pc +%%NOUVEAU%%libdata/pkgconfig/libdrm_nouveau.pc %%NEW%%%%RADEON_DRIVERS%%libdata/pkgconfig/libdrm_radeon.pc %%NEW%%%%KMS%%libdata/pkgconfig/libkms.pc %%OLD%%@dirrm include/nouveau Index: graphics/libglesv2/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libglesv2/Makefile (revision 0) +++ graphics/libglesv2/Makefile (working copy) @@ -0,0 +1,29 @@ +# Created by: kwm@FreeBSD.org +# $FreeBSD$ + +PORTNAME=3D libglesv2 +PORTVERSION=3D ${MESAVERSION} +CATEGORIES=3D graphics + +COMMENT=3D OpenGL ES v2 library + +LIB_DEPENDS+=3D libdrm.so:${PORTSDIR}/graphics/libdrm \ + libexpat.so:${PORTSDIR}/textproc/expat2 + +.if ! defined(WITH_NEW_XORG) +IGNORE=3D Please enable WITH_NEW_XORG, libglesv2 needs libdrm higher th= en 2.4.24 +.endif + +# stuff not needed by libEGL but configure wants it +USE_XORG+=3D glproto dri2proto xext xdamage xfixes + + +BUILD_WKRSRC=3D ${WRKSRC}/src/mapi/es2api +INSTALL_WRKSRC=3D ${WRKSRC}/src/mapi/es2api + +# this library doesn't exist in Mesa 7.6 so use newer +WITH_NEW_XORG=3Dyes + +.include +.include "${.CURDIR}/../../graphics/libGL/bsd.mesalib.mk" +.include Property changes on: graphics/libglesv2/Makefile ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +FreeBSD=3D%H \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Index: graphics/libglesv2/pkg-descr =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libglesv2/pkg-descr (revision 0) +++ graphics/libglesv2/pkg-descr (working copy) @@ -0,0 +1,3 @@ +This package contains the GL ES v2 utility library. + +WWW: http://www.freedesktop.org/Software/xorg Property changes on: graphics/libglesv2/pkg-descr ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Index: graphics/libglesv2/pkg-plist =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libglesv2/pkg-plist (revision 0) +++ graphics/libglesv2/pkg-plist (working copy) @@ -0,0 +1,12 @@ +include/GLES2/gl2.h +include/GLES2/gl2ext.h +include/GLES2/gl2platform.h +include/GLES3/gl3.h +include/GLES3/gl3ext.h +include/GLES3/gl3platform.h +lib/libGLESv2.la +lib/libGLESv2.so +lib/libGLESv2.so.2 +libdata/pkgconfig/glesv2.pc +@dirrmtry include/GLES3 +@dirrmtry include/GLES2 Property changes on: graphics/libglesv2/pkg-plist ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: graphics/libreatlas/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libreatlas/Makefile (revision 326808) +++ graphics/libreatlas/Makefile (working copy) @@ -3,7 +3,7 @@ =20 PORTNAME=3D libreatlas PORTVERSION=3D 1.0.0a -PORTREVISION=3D 3 +PORTREVISION=3D 4 CATEGORIES=3D graphics geography MASTER_SITES=3D http://www.gaia-gis.it/gaia-sins/ =20 @@ -30,8 +30,7 @@ fontconfig:${PORTSDIR}/x11-fonts/fontconfig =20 GNU_CONFIGURE=3D yes -USES=3D pkgconfig gettext iconv -USE_GMAKE=3D yes +USES=3D pkgconfig gettext gmake iconv USE_XORG=3D ice pixman sm x11 xau xcb xcomposite xcursor xdamage xdmcp x= ext \ xfixes xi xinerama xrandr xrender xxf86vm USE_GNOME=3D atk gdkpixbuf2 glib20 gtk20 pango Index: multimedia/freetuxtv/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- multimedia/freetuxtv/Makefile (revision 326808) +++ multimedia/freetuxtv/Makefile (working copy) @@ -3,7 +3,7 @@ =20 PORTNAME=3D freetuxtv PORTVERSION=3D 0.6.5 -PORTREVISION=3D 4 +PORTREVISION=3D 5 CATEGORIES=3D multimedia MASTER_SITES=3D GOOGLE_CODE =20 @@ -26,13 +26,12 @@ expat:${PORTSDIR}/textproc/expat2 \ fontconfig:${PORTSDIR}/x11-fonts/fontconfig =20 -USES=3D iconv pathfix pkgconfig +USES=3D gmake iconv pathfix pkgconfig USE_GNOME=3D glib20 gtk20 USE_XORG=3D pixman x11 xau xcb xcomposite xcursor xdamage xdmcp xext xfi= xes \ xi xinerama xrandr xrender GNU_CONFIGURE=3D yes CONFIGURE_ARGS+=3D--with-gtk=3D2.0 -USE_GMAKE=3D yes CFLAGS=3D -Wno-return-type INSTALLS_ICONS=3D yes =20 Index: net/cvsup/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- net/cvsup/Makefile (revision 326808) +++ net/cvsup/Makefile (working copy) @@ -3,7 +3,7 @@ =20 PORTNAME=3D cvsup PORTVERSION=3D 16.1h -PORTREVISION=3D 4 +PORTREVISION=3D 5 CATEGORIES=3D net devel MASTER_SITES=3D ${MASTER_SITE_FREEBSD_ORG} MASTER_SITE_SUBDIR=3Ddevelopment/CVSup/snapshots Index: net/tigervnc/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- net/tigervnc/Makefile (revision 326808) +++ net/tigervnc/Makefile (working copy) @@ -3,7 +3,7 @@ =20 PORTNAME=3D tigervnc PORTVERSION=3D 1.2.0 -PORTREVISION=3D 3 +PORTREVISION=3D 4 CATEGORIES=3D net x11-servers MASTER_SITES=3D SF:tigervnc MASTER_SITE_SUBDIR=3D ${PORTNAME}/${PORTNAME}/${PORTVERSION}/:tigervnc @@ -28,8 +28,7 @@ =20 MAKE_JOBS_UNSAFE=3D yes =20 -USES=3D cmake pkgconfig -USE_GMAKE=3D yes +USES=3D cmake gmake pkgconfig USE_GL=3D gl USE_AUTOTOOLS+=3D autoconf:env automake:env libtool:env USE_PYTHON=3D yes Index: print/photoprint/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- print/photoprint/Makefile (revision 326808) +++ print/photoprint/Makefile (working copy) @@ -2,6 +2,7 @@ =20 PORTNAME=3D photoprint DISTVERSION=3D 0.4.2-pre2 +PORTREVISION=3D 1 CATEGORIES=3D print graphics MASTER_SITES=3D http://www.blackfiveimaging.co.uk/photoprint/ =20 @@ -17,7 +18,6 @@ lcms:${PORTSDIR}/graphics/lcms \ netpbm:${PORTSDIR}/graphics/netpbm \ pcre:${PORTSDIR}/devel/pcre \ - pixman:${PORTSDIR}/x11/pixman \ png15:${PORTSDIR}/graphics/png \ pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \ tiff:${PORTSDIR}/graphics/tiff @@ -25,7 +25,7 @@ GNU_CONFIGURE=3D yes USES=3D desktop-file-utils gettext pkgconfig USE_GNOME=3D pango -USE_XORG=3D x11 xau xcb xcomposite xcursor xdamage xdmcp xext \ +USE_XORG=3D pixman x11 xau xcb xcomposite xcursor xdamage xdmcp xext \ xfixes xi xinerama xrandr xrender INSTALLS_ICONS=3D yes =20 Index: sysutils/gtk-imonc/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- sysutils/gtk-imonc/Makefile (revision 326808) +++ sysutils/gtk-imonc/Makefile (working copy) @@ -3,7 +3,7 @@ =20 PORTNAME=3D gtk-imonc PORTVERSION=3D 0.6.4.1 -PORTREVISION=3D 12 +PORTREVISION=3D 13 CATEGORIES=3D sysutils MASTER_SITES=3D http://stefan-strigler.de/download/ =20 Index: sysutils/nitrogen/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- sysutils/nitrogen/Makefile (revision 326808) +++ sysutils/nitrogen/Makefile (working copy) @@ -3,7 +3,7 @@ =20 PORTNAME=3D nitrogen PORTVERSION=3D 1.5.2 -PORTREVISION=3D 2 +PORTREVISION=3D 3 CATEGORIES=3D sysutils MASTER_SITES=3D http://projects.l3ib.org/nitrogen/files/ =20 Index: x11/libSM/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11/libSM/Makefile (revision 326808) +++ x11/libSM/Makefile (working copy) @@ -2,7 +2,7 @@ # $FreeBSD$ =20 PORTNAME=3D libSM -PORTVERSION=3D 1.2.1 +PORTVERSION=3D 1.2.2 PORTEPOCH=3D 1 CATEGORIES=3D x11 =20 Index: x11/libSM/distinfo =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11/libSM/distinfo (revision 326808) +++ x11/libSM/distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (xorg/lib/libSM-1.2.1.tar.bz2) =3D 93c11d569c64f40723b93b44af1efb= 474a0cfe92573b0c8c330343cabb897f1d -SIZE (xorg/lib/libSM-1.2.1.tar.bz2) =3D 334696 +SHA256 (xorg/lib/libSM-1.2.2.tar.bz2) =3D 0baca8c9f5d934450a70896c4ad38d= 06475521255ca63b717a6510fdb6e287bd +SIZE (xorg/lib/libSM-1.2.2.tar.bz2) =3D 348908 Index: x11/libX11/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11/libX11/Makefile (revision 326808) +++ x11/libX11/Makefile (working copy) @@ -2,7 +2,7 @@ # $FreeBSD$ =20 PORTNAME=3D libX11 -PORTVERSION=3D 1.6.1 +PORTVERSION=3D 1.6.2 PORTEPOCH=3D 1 CATEGORIES=3D x11 =20 Index: x11/libX11/distinfo =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11/libX11/distinfo (revision 326808) +++ x11/libX11/distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (xorg/lib/libX11-1.6.1.tar.bz2) =3D 10a54fc16b58b4f5a5eed4d080c35= 7a82fd2f42d09af625c1f5df50650701892 -SIZE (xorg/lib/libX11-1.6.1.tar.bz2) =3D 2356196 +SHA256 (xorg/lib/libX11-1.6.2.tar.bz2) =3D 2aa027e837231d2eeea90f3a4afe1= 9948a6eb4c8b2bec0241eba7dbc8106bd16 +SIZE (xorg/lib/libX11-1.6.2.tar.bz2) =3D 2339981 Index: x11/libX11/pkg-plist =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11/libX11/pkg-plist (revision 326808) +++ x11/libX11/pkg-plist (working copy) @@ -103,6 +103,9 @@ lib/X11/locale/ja_JP.UTF-8/Compose lib/X11/locale/ja_JP.UTF-8/XI18N_OBJS lib/X11/locale/ja_JP.UTF-8/XLC_LOCALE +lib/X11/locale/km_KH.UTF-8/Compose +lib/X11/locale/km_KH.UTF-8/XI18N_OBJS +lib/X11/locale/km_KH.UTF-8/XLC_LOCALE lib/X11/locale/ko/Compose lib/X11/locale/ko/XI18N_OBJS lib/X11/locale/ko/XLC_LOCALE @@ -141,6 +144,9 @@ lib/X11/locale/ru_RU.UTF-8/Compose lib/X11/locale/ru_RU.UTF-8/XI18N_OBJS lib/X11/locale/ru_RU.UTF-8/XLC_LOCALE +lib/X11/locale/sr_CS.UTF-8/Compose +lib/X11/locale/sr_CS.UTF-8/XI18N_OBJS +lib/X11/locale/sr_CS.UTF-8/XLC_LOCALE lib/X11/locale/tatar-cyr/Compose lib/X11/locale/tatar-cyr/XI18N_OBJS lib/X11/locale/tatar-cyr/XLC_LOCALE @@ -215,6 +221,7 @@ @dirrm lib/X11/locale/th_TH.UTF-8 @dirrm lib/X11/locale/th_TH @dirrm lib/X11/locale/tatar-cyr +@dirrm lib/X11/locale/sr_CS.UTF-8 @dirrm lib/X11/locale/ru_RU.UTF-8 @dirrm lib/X11/locale/pt_BR.UTF-8 @dirrm lib/X11/locale/nokhchi-1 @@ -227,6 +234,7 @@ @dirrm lib/X11/locale/koi8-c @dirrm lib/X11/locale/ko_KR.UTF-8 @dirrm lib/X11/locale/ko +@dirrm lib/X11/locale/km_KH.UTF-8 @dirrm lib/X11/locale/ja_JP.UTF-8 @dirrm lib/X11/locale/ja.SJIS @dirrm lib/X11/locale/ja.JIS Index: x11/libXpm/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11/libXpm/Makefile (revision 326808) +++ x11/libXpm/Makefile (working copy) @@ -2,7 +2,7 @@ # $FreeBSD$ =20 PORTNAME=3D libXpm -PORTVERSION=3D 3.5.10 +PORTVERSION=3D 3.5.11 CATEGORIES=3D x11 =20 MAINTAINER=3D x11@FreeBSD.org Index: x11/libXpm/distinfo =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11/libXpm/distinfo (revision 326808) +++ x11/libXpm/distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (xorg/lib/libXpm-3.5.10.tar.bz2) =3D a6db7e234750e7d60330017972e3= 1d8e1f29f0a8c1391e4ac82f6102d919a735 -SIZE (xorg/lib/libXpm-3.5.10.tar.bz2) =3D 431310 +SHA256 (xorg/lib/libXpm-3.5.11.tar.bz2) =3D c5bdafa51d1ae30086fac01ab83b= e8d47fe117b238d3437f8e965434090e041c +SIZE (xorg/lib/libXpm-3.5.11.tar.bz2) =3D 443496 Index: x11/libXrandr/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11/libXrandr/Makefile (revision 326808) +++ x11/libXrandr/Makefile (working copy) @@ -2,7 +2,7 @@ # $FreeBSD$ =20 PORTNAME=3D libXrandr -PORTVERSION=3D 1.4.1 +PORTVERSION=3D 1.4.2 CATEGORIES=3D x11 =20 MAINTAINER=3D x11@FreeBSD.org Index: x11/libXrandr/distinfo =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11/libXrandr/distinfo (revision 326808) +++ x11/libXrandr/distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (xorg/lib/libXrandr-1.4.1.tar.bz2) =3D d914a0490fd0a2ea6c3194505b= 5b28c56e2a277d8f4648b0275ee0ee370fb905 -SIZE (xorg/lib/libXrandr-1.4.1.tar.bz2) =3D 312857 +SHA256 (xorg/lib/libXrandr-1.4.2.tar.bz2) =3D caa7b31ac769be51a532343c65= 376f1d4df3f307afaed58e34fb5e82e8b825ad +SIZE (xorg/lib/libXrandr-1.4.2.tar.bz2) =3D 315165 Index: x11/libXv/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11/libXv/Makefile (revision 326808) +++ x11/libXv/Makefile (working copy) @@ -2,7 +2,7 @@ # $FreeBSD$ =20 PORTNAME=3D libXv -PORTVERSION=3D 1.0.9 +PORTVERSION=3D 1.0.10 PORTEPOCH=3D 1 CATEGORIES=3D x11 =20 Index: x11/libXv/distinfo =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11/libXv/distinfo (revision 326808) +++ x11/libXv/distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (xorg/lib/libXv-1.0.9.tar.bz2) =3D a874dbf864d0271bbe795af67ef5b3= f20096c92fc11eacbf0d2af00e32bc5b4b -SIZE (xorg/lib/libXv-1.0.9.tar.bz2) =3D 309744 +SHA256 (xorg/lib/libXv-1.0.10.tar.bz2) =3D 55fe92f8686ce8612e2c1bfaf58c0= 57715534419da700bda8d517b1d97914525 +SIZE (xorg/lib/libXv-1.0.10.tar.bz2) =3D 300633 Index: x11/libxcb/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11/libxcb/Makefile (revision 326808) +++ x11/libxcb/Makefile (working copy) @@ -20,9 +20,8 @@ CONFIGURE_ARGS+=3D --disable-build-docs --without-doxygen --enable-xinpu= t =20 USE_BZIP2=3D yes -USES=3D pathfix pkgconfig +USES=3D gmake pathfix pkgconfig USE_GNOME=3D libxslt:build -USE_GMAKE=3D yes USE_LDCONFIG=3D yes USE_XORG=3D xau xdmcp USE_PYTHON_BUILD=3D 2.5+ Index: x11/pixman/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11/pixman/Makefile (revision 326808) +++ x11/pixman/Makefile (working copy) @@ -1,7 +1,7 @@ # $FreeBSD$ =20 PORTNAME=3D pixman -PORTVERSION=3D 0.30.0 +PORTVERSION=3D 0.30.2 CATEGORIES=3D x11 =20 MAINTAINER=3D x11@FreeBSD.org @@ -8,10 +8,9 @@ COMMENT=3D Low-level pixel manipulation library =20 USES=3D perl5 +USE_PERL5=3D build XORG_CAT=3D lib USE_AUTOTOOLS=3D libtool -USE_PERL5=3D build -USE_GNOME=3D ltverhack:9 CONFIGURE_ARGS=3D --disable-gtk =20 OPTIONS_DEFINE=3D SIMD Index: x11/pixman/distinfo =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11/pixman/distinfo (revision 326808) +++ x11/pixman/distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (xorg/lib/pixman-0.30.0.tar.bz2) =3D 77e756dc7fafdf17f39a4f23bdc8= be59f9f6a65c08704f5cac1d8aa87cfaf517 -SIZE (xorg/lib/pixman-0.30.0.tar.bz2) =3D 681343 +SHA256 (xorg/lib/pixman-0.30.2.tar.bz2) =3D 4fbb51788fe7cbd8abb5f80aed95= ec878704e57a06328f7bebe0306e3822c96c +SIZE (xorg/lib/pixman-0.30.2.tar.bz2) =3D 666281 Index: x11/xkeyboard-config/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11/xkeyboard-config/Makefile (revision 326808) +++ x11/xkeyboard-config/Makefile (working copy) @@ -14,9 +14,8 @@ XORG_CAT=3D data =20 USE_BZIP2=3D yes -USE_GMAKE=3D yes USE_GNOME=3D intlhack libxslt:build -USES=3D pathfix perl5 +USES=3D gmake pathfix perl5 USE_PERL5=3D build GNU_CONFIGURE=3D yes MAKE_JOBS_UNSAFE=3Dyes Index: x11/xorg-cf-files/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11/xorg-cf-files/Makefile (revision 326808) +++ x11/xorg-cf-files/Makefile (working copy) @@ -3,6 +3,7 @@ =20 PORTNAME=3D xorg-cf-files PORTVERSION=3D 1.0.5 +PORTREVISION=3D 1 CATEGORIES=3D x11 =20 MAINTAINER=3D x11@FreeBSD.org Index: x11/xtrans/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11/xtrans/Makefile (revision 326808) +++ x11/xtrans/Makefile (working copy) @@ -8,8 +8,6 @@ MAINTAINER=3D x11@FreeBSD.org COMMENT=3D Abstract network code for X =20 -CONFLICTS=3D libXtrans - LICENSE=3D MIT =20 XORG_CAT=3D lib Index: x11-drivers/xf86-input-mouse/files/patch-src-bsd_mouse.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11-drivers/xf86-input-mouse/files/patch-src-bsd_mouse.c (revision 32= 6808) +++ x11-drivers/xf86-input-mouse/files/patch-src-bsd_mouse.c (working cop= y) @@ -1,13 +1,65 @@ ---- src/bsd_mouse.c.orig 2012-07-27 08:10:56.000000000 +0200 -+++ src/bsd_mouse.c 2012-07-30 00:49:09.000000000 +0200 -@@ -71,15 +71,20 @@ - static const char *FindDevice(InputInfoPtr, const char *, int); +--- src/bsd_mouse.c.orig 2012-10-08 03:40:07.000000000 +0200 ++++ src/bsd_mouse.c 2013-07-03 01:00:50.897361950 +0200 +@@ -26,6 +26,24 @@ + * authorization from the copyright holder(s) and author(s). + */ =20 - #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__Dr= agonFly__) ++ ++/* ++ * XXX - Should this be autoconf'd instead? ++ */ ++#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__Dr= agonFly__) ++ ++#if !defined(USBMOUSE_SUPPORT) ++#define USBMOUSE_SUPPORT ++#endif ++#if !defined(HAS_LIB_USB_HID) ++#define HAS_LIB_USB_HID ++#endif +#if !defined(XPS2_SUPPORT) +#define XPS2_SUPPORT +#endif - /* These are for FreeBSD and DragonFly */ ++ ++#endif /* defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || define= d(__DragonFly__) */ ++ + #include +=20 + #include +@@ -33,9 +51,23 @@ + #include "xf86Priv.h" + #include "xf86_OSlib.h" + #include "xf86Xinput.h" ++#include + #include "mouse.h" + #include "xisb.h" + #include "mipointer.h" ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >=3D 3 ++#define HAVE_PROPERTIES 1 ++#endif ++#ifdef HAVE_PROPERTIES ++#include ++#include ++/* 1.6 has properties, but no labels */ ++#ifdef AXIS_LABEL_PROP ++#define HAVE_LABELS ++#else ++#undef HAVE_LABELS ++#endif ++#endif + #ifdef WSCONS_SUPPORT + #include + #endif +@@ -47,9 +79,6 @@ + #endif +=20 + #include +-#ifdef USB_GET_REPORT_ID +-#define USB_NEW_HID +-#endif +=20 + #define HUP_GENERIC_DESKTOP 0x0001 + #define HUP_BUTTON 0x0009 +@@ -75,11 +104,13 @@ #define DEFAULT_MOUSE_DEV "/dev/mouse" #define DEFAULT_SYSMOUSE_DEV "/dev/sysmouse" #define DEFAULT_PS2_DEV "/dev/psm0" @@ -21,7 +73,7 @@ NULL }; #elif (defined(__OpenBSD__) || defined(__NetBSD__)) && defined(WSCONS_S= UPPORT) -@@ -100,7 +105,11 @@ +@@ -100,7 +131,11 @@ #if defined(__NetBSD__) return MSE_SERIAL | MSE_BUS | MSE_PS2 | MSE_AUTO; #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__= DragonFly__) @@ -34,7 +86,7 @@ #else return MSE_SERIAL | MSE_BUS | MSE_PS2 | MSE_XPS2 | MSE_AUTO | MSE_M= ISC; #endif -@@ -180,9 +189,30 @@ +@@ -180,9 +215,30 @@ { MOUSE_PROTO_SYSMOUSE, "SysMouse" } }; =20 @@ -41,7 +93,7 @@ +#ifdef XPS2_SUPPORT +static struct { + int dmodel; -+ char *name; ++ const char *name; +} ps2proto[] =3D { + { MOUSE_MODEL_NETSCROLL, "NetScrollPS/2" }, + { MOUSE_MODEL_NET, "NetMousePS/2" }, @@ -59,13 +111,13 @@ SetupAuto(InputInfoPtr pInfo, int *protoPara) { +#ifdef XPS2_SUPPORT -+ char *dev; ++ const char *dev; +#endif + const char *proto; int i; mousehw_t hw; mousemode_t mode; -@@ -190,7 +220,13 @@ +@@ -190,7 +246,13 @@ if (pInfo->fd =3D=3D -1) return NULL; =20 @@ -79,7 +131,7 @@ i =3D 1; ioctl(pInfo->fd, MOUSE_SETLEVEL, &i); =20 -@@ -209,9 +245,18 @@ +@@ -209,9 +271,18 @@ protoPara[0] =3D mode.syncmask[0]; protoPara[1] =3D mode.syncmask[1]; } @@ -100,7 +152,7 @@ } } } -@@ -234,41 +279,41 @@ +@@ -234,41 +305,41 @@ (protocol && xf86NameCmp(protocol, "SysMouse") =3D=3D 0)) { /* * As the FreeBSD sysmouse driver defaults to protocol level 0 @@ -159,7 +211,7 @@ } return FALSE; } -@@ -276,17 +321,17 @@ +@@ -276,17 +347,17 @@ static const char * FindDevice(InputInfoPtr pInfo, const char *protocol, int flags) { @@ -181,7 +233,7 @@ #endif } else { /* -@@ -295,28 +340,32 @@ +@@ -295,28 +366,32 @@ * the test for whether /dev/sysmouse is usable can be made= =2E */ if (!strcmp(*pdev, DEFAULT_MOUSE_DEV)) { @@ -227,7 +279,749 @@ break; } } -@@ -764,7 +813,9 @@ +@@ -468,30 +543,78 @@ +=20 + #if defined(USBMOUSE_SUPPORT) +=20 ++#define MAXRIDS 64 ++#define MAXACOLS 8 ++#define MAXLCOLS 16 + typedef struct _UsbMseRec { + int packetSize; +- int iid; +- hid_item_t loc_x; /* x locator item */ +- hid_item_t loc_y; /* y locator item */ +- hid_item_t loc_z; /* z (wheel) locator item */ +- hid_item_t loc_w; /* z (wheel) locator item */ +- hid_item_t loc_btn[MSE_MAXBUTTONS]; /* buttons locator items */ +- unsigned char *buffer; ++ int iid, nrids, nacols, opened; ++ struct { ++ int32_t rid; ++ int size; ++ } rids[MAXRIDS]; ++ struct UsbMseAcol { ++ InputInfoPtr pInfo; ++ int nlcols, nbuttons, hasZ, hasW; ++ int xmin, xmax, ymin, ymax, pmin, pmax, px, py; ++ int cxmin, cxmax, cymin, cymax, cpmin, cpmax; ++ struct UsbMseLcol { ++ hid_item_t loc_x; /* x locator item */ ++ hid_item_t loc_y; /* y locator item */ ++ hid_item_t loc_z; /* z (wheel) locator item */ ++ hid_item_t loc_w; /* w (hwheel) locator item */ ++ hid_item_t loc_p; /* Tip Pressure */ ++ hid_item_t loc_valid; /* Touch Valid */ ++ hid_item_t loc_in_range; /* In Range */ ++ hid_item_t loc_btn[MSE_MAXBUTTONS]; /* buttons locator items */ ++ } lcols[MAXLCOLS]; ++ hid_item_t loc_cc; /* contact count */ ++ } acols[MAXACOLS]; ++ unsigned char *buffer; + } UsbMseRec, *UsbMsePtr; +=20 ++static int * ++usbGetReportSizePtr(UsbMsePtr pUsbMse, int32_t rid) ++{ ++ int i; ++ ++ for (i =3D 0; i < pUsbMse->nrids; i++) { ++ if (pUsbMse->rids[i].rid =3D=3D rid) ++ return (&pUsbMse->rids[i].size); ++ } ++ for (i =3D 0; i < MAXRIDS; i++) { ++ if (pUsbMse->rids[i].size =3D=3D 0) { ++ pUsbMse->rids[i].rid =3D rid; ++ pUsbMse->nrids =3D max(pUsbMse->nrids, i + 1); ++ return (&pUsbMse->rids[i].size); ++ } ++ } ++ return (NULL); ++} ++ + static int + usbMouseProc(DeviceIntPtr pPointer, int what) + { + InputInfoPtr pInfo; + MouseDevPtr pMse; + UsbMsePtr pUsbMse; ++ struct UsbMseAcol *acol; + unsigned char map[MSE_MAXBUTTONS + 1]; +- int nbuttons; ++ int nacol, nbuttons; ++#ifdef HAVE_LABELS ++ Atom btn_labels[MSE_MAXBUTTONS] =3D {0}; ++ Atom axes_labels[3] =3D { 0, 0, 0 }; ++#endif +=20 + pInfo =3D pPointer->public.devicePrivate; + pMse =3D pInfo->private; + pMse->device =3D pPointer; + pUsbMse =3D pMse->mousePriv; ++ for (nacol =3D 0; nacol < (pUsbMse->nacols - 1); nacol++) { ++ if (pUsbMse->acols[nacol].pInfo =3D=3D pInfo) ++ break; ++ } ++ acol =3D &pUsbMse->acols[nacol]; +=20 + switch (what) { + case DEVICE_INIT: +@@ -500,38 +623,96 @@ + for (nbuttons =3D 0; nbuttons < MSE_MAXBUTTONS; ++nbuttons) + map[nbuttons + 1] =3D nbuttons + 1; +=20 +- InitPointerDeviceStruct((DevicePtr)pPointer, +- map, +- min(pMse->buttons, MSE_MAXBUTTONS), +- miPointerGetMotionEvents, +- pMse->Ctrl, +- miPointerGetMotionBufferSize()); ++#ifdef HAVE_LABELS ++ btn_labels[0] =3D XIGetKnownProperty(BTN_LABEL_PROP_BTN_LEFT); ++ btn_labels[1] =3D XIGetKnownProperty(BTN_LABEL_PROP_BTN_MIDDLE); ++ btn_labels[2] =3D XIGetKnownProperty(BTN_LABEL_PROP_BTN_RIGHT); ++ axes_labels[0] =3D XIGetKnownProperty((acol->xmin !=3D acol->xmax) ++ ? AXIS_LABEL_PROP_ABS_X : AXIS_LABEL_PROP_REL_X); ++ axes_labels[1] =3D XIGetKnownProperty((acol->xmin !=3D acol->xmax) ++ ? AXIS_LABEL_PROP_ABS_Y : AXIS_LABEL_PROP_REL_Y); ++ axes_labels[2] =3D XIGetKnownProperty(AXIS_LABEL_PROP_ABS_PRESSURE); ++#endif ++ ++ InitButtonClassDeviceStruct(pPointer, min(pMse->buttons, MSE_MAXBUTTON= S), ++#ifdef HAVE_LABELS ++ btn_labels, ++#endif ++ map); ++ InitValuatorClassDeviceStruct(pPointer, (acol->pmin !=3D acol->pmax) ?= 3 : 2, ++#ifdef HAVE_LABELS ++ axes_labels, ++#endif ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) =3D=3D 0 ++ miPointerGetMotionEvents, ++#elif GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3 ++ GetMotionHistory, ++#endif ++ GetMotionHistorySize(), ++ (acol->xmin !=3D acol->xmax || acol->ymin !=3D acol->ymax) ? ++ Absolute : Relative); ++ InitPtrFeedbackClassDeviceStruct(pPointer, pMse->Ctrl); +=20 + /* X valuator */ +- xf86InitValuatorAxisStruct(pPointer, 0, 0, -1, 1, 0, 1); ++ xf86InitValuatorAxisStruct(pPointer, 0, ++#ifdef HAVE_LABELS ++ axes_labels[0], ++#endif ++ (acol->xmin !=3D acol->xmax) ? acol->xmin : -1, ++ (acol->xmin !=3D acol->xmax) ? acol->xmax : -1, ++ 1, 0, 1 ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >=3D 12 ++ , (acol->xmin !=3D acol->xmax) ? Absolute : Relative ++#endif ++ ); + xf86InitValuatorDefaults(pPointer, 0); + /* Y valuator */ +- xf86InitValuatorAxisStruct(pPointer, 1, 0, -1, 1, 0, 1); ++ xf86InitValuatorAxisStruct(pPointer, 1, ++#ifdef HAVE_LABELS ++ axes_labels[1], ++#endif ++ (acol->ymin !=3D acol->ymax) ? acol->ymin : -1, ++ (acol->ymin !=3D acol->ymax) ? acol->ymax : -1, ++ 1, 0, 1 ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >=3D 12 ++ , (acol->ymin !=3D acol->ymax) ? Absolute : Relative ++#endif ++ ); + xf86InitValuatorDefaults(pPointer, 1); ++ /* Pressure valuator */ ++ if (acol->pmin !=3D acol->pmax) { ++ xf86InitValuatorAxisStruct(pPointer, 2, ++#ifdef HAVE_LABELS ++ axes_labels[2], ++#endif ++ acol->pmin, acol->pmax, 1, 0, 1 ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >=3D 12 ++ , Absolute ++#endif ++ ); ++ xf86InitValuatorDefaults(pPointer, 2); ++ } + xf86MotionHistoryAllocate(pInfo); + break; +=20 + case DEVICE_ON: +- pInfo->fd =3D xf86OpenSerial(pInfo->options); +- if (pInfo->fd =3D=3D -1) +- xf86Msg(X_WARNING, "%s: cannot open input device\n", pInfo-= >name); +- else { +- pMse->buffer =3D XisbNew(pInfo->fd, pUsbMse->packetSize); +- if (!pMse->buffer) { +- free(pMse); +- xf86CloseSerial(pInfo->fd); +- pInfo->fd =3D -1; +- } else { +- xf86FlushInput(pInfo->fd); +- if (!xf86InstallSIGIOHandler (pInfo->fd, usbSigioReadIn= put, +- pInfo)) +- AddEnabledDevice(pInfo->fd); +- } ++ if (pUsbMse->opened++ =3D=3D 0) { ++ pInfo->fd =3D xf86OpenSerial(pInfo->options); ++ if (pInfo->fd =3D=3D -1) ++ xf86Msg(X_WARNING, "%s: cannot open input device\n", pInfo->name)= ; ++ else { ++ pMse->buffer =3D XisbNew(pInfo->fd, pUsbMse->packetSize); ++ if (!pMse->buffer) { ++ free(pMse); ++ xf86CloseSerial(pInfo->fd); ++ pInfo->fd =3D -1; ++ } else { ++ xf86FlushInput(pInfo->fd); ++ if (!xf86InstallSIGIOHandler (pInfo->fd, usbSigioReadInput,=20 ++ pInfo)) ++ AddEnabledDevice(pInfo->fd); ++ } ++ } + } + pMse->lastButtons =3D 0; + pMse->lastMappedButtons =3D 0; +@@ -553,6 +734,7 @@ + xf86CloseSerial(pInfo->fd); + pInfo->fd =3D -1; + } ++ pUsbMse->opened--; + pPointer->public.on =3D FALSE; + usleep(300000); + break; +@@ -568,45 +750,154 @@ + { + MouseDevPtr pMse; + UsbMsePtr pUsbMse; +- int buttons =3D pMse->lastButtons; +- int dx =3D 0, dy =3D 0, dz =3D 0, dw =3D 0; +- int n, c; ++ int buttons, cc; ++ int dx, dy, dz, dw, dp, upd, v, nx, ny, np, in_range; ++ int n, c, rid, *sizep, nacol, nlcol; + unsigned char *pBuf; ++ struct UsbMseAcol *acol; ++ struct UsbMseLcol *lcol; +=20 + pMse =3D pInfo->private; + pUsbMse =3D pMse->mousePriv; +=20 + XisbBlockDuration(pMse->buffer, -1); ++next: + pBuf =3D pUsbMse->buffer; + n =3D 0; +- while ((c =3D XisbRead(pMse->buffer)) >=3D 0 && n < pUsbMse->packet= Size) { ++ if (pUsbMse->iid) { ++ rid =3D XisbRead(pMse->buffer); ++ if (rid < 0) ++ return; ++ pBuf[n++] =3D (unsigned char)rid; ++ } else ++ rid =3D 0; ++ sizep =3D usbGetReportSizePtr(pUsbMse, rid); ++ if (sizep =3D=3D NULL || *sizep =3D=3D 0) { ++ xf86Msg(X_WARNING, "%s: unknown report ID %d\n", pInfo->name, rid); ++ goto next; ++ } ++ while (n < *sizep && (c =3D XisbRead(pMse->buffer)) >=3D 0) { + pBuf[n++] =3D (unsigned char)c; + } + if (n =3D=3D 0) + return; +- if (n !=3D pUsbMse->packetSize) { ++// xf86MsgVerb(X_INFO, 3, "pkt: %d %02x %02x %02x %02x %02x %02x %02= x %02x %02x %02x\n", ++// n, pBuf[0], pBuf[1], pBuf[2], pBuf[3], pBuf[4], pBuf[5], pBuf[6], pB= uf[7], pBuf[8], pBuf[9]); ++ if (n !=3D *sizep) { + LogMessageVerbSigSafe(X_WARNING, -1, + "%s: incomplete packet, size %d\n", + pInfo->name, n); + } +- /* discard packets with an id that don't match the mouse */ +- /* XXX this is probably not the right thing */ +- if (pUsbMse->iid !=3D 0) { +- if (*pBuf++ !=3D pUsbMse->iid) +- return; +- } +- dx =3D hid_get_data(pBuf, &pUsbMse->loc_x); +- dy =3D hid_get_data(pBuf, &pUsbMse->loc_y); +- dz =3D hid_get_data(pBuf, &pUsbMse->loc_z); +- dw =3D hid_get_data(pBuf, &pUsbMse->loc_w); +- +- buttons =3D 0; +- for (n =3D 0; n < pMse->buttons; n++) { +- if (hid_get_data(pBuf, &pUsbMse->loc_btn[n])) +- buttons |=3D (1 << UMS_BUT(n)); ++ for (nacol =3D 0; nacol < pUsbMse->nacols; nacol++) { ++ acol =3D &pUsbMse->acols[nacol]; ++ if (acol->pInfo =3D=3D NULL) ++ continue; ++ nx =3D ny =3D np =3D upd =3D 0; ++ buttons =3D cc =3D 0; ++ dx =3D dy =3D dz =3D dw =3D dp =3D 0; ++ for (nlcol =3D 0; nlcol < pUsbMse->acols[nacol].nlcols; nlcol++) { ++ lcol =3D &acol->lcols[nlcol]; ++ ++ if (lcol->loc_valid.usage !=3D 0 && rid =3D=3D lcol->loc_valid.rep= ort_ID && ++ hid_get_data(pBuf, &lcol->loc_valid) =3D=3D 0) ++ continue; ++ if (lcol->loc_in_range.usage !=3D 0 && rid =3D=3D lcol->loc_in_ran= ge.report_ID) ++ in_range =3D hid_get_data(pBuf, &lcol->loc_in_range); ++ else ++ in_range =3D 1; ++ if (in_range && lcol->loc_x.usage !=3D 0 && rid =3D=3D lcol->loc_x= =2Ereport_ID && nx =3D=3D 0) { ++ v =3D hid_get_data(pBuf, &lcol->loc_x); ++ if (acol->xmin !=3D acol->xmax) { ++ v =3D xf86ScaleAxis(v, acol->xmax, acol->xmin, ++ lcol->loc_x.logical_maximum, lcol->loc_x.logical_minimum); ++ if (acol->cxmin !=3D acol->cxmax) ++ v =3D xf86ScaleAxis(v, acol->xmax, acol->xmin, ++ acol->cxmax, acol->cxmin); ++ } ++ dx +=3D v; ++ nx++; ++ } ++ if (in_range && lcol->loc_y.usage !=3D 0 && rid =3D=3D lcol->loc_y= =2Ereport_ID && ny =3D=3D 0) { ++ v =3D hid_get_data(pBuf, &lcol->loc_y); ++ if (acol->xmin !=3D acol->xmax) { ++ v =3D xf86ScaleAxis(v, acol->ymax, acol->ymin, ++ lcol->loc_y.logical_maximum, lcol->loc_y.logical_minimum); ++ if (acol->cymin !=3D acol->cymax) ++ v =3D xf86ScaleAxis(v, acol->ymax, acol->ymin, ++ acol->cymax, acol->cymin); ++ } ++ dy +=3D v; ++ ny++; ++ } ++ if (lcol->loc_z.usage !=3D 0 && rid =3D=3D lcol->loc_z.report_ID) = { ++ dz -=3D hid_get_data(pBuf, &lcol->loc_z); ++ upd =3D 1; ++ } ++ if (lcol->loc_w.usage !=3D 0 && rid =3D=3D lcol->loc_w.report_ID) = { ++ dw +=3D hid_get_data(pBuf, &lcol->loc_w); ++ upd =3D 1; ++ } ++ if (lcol->loc_p.usage !=3D 0 && rid =3D=3D lcol->loc_p.report_ID &= & np =3D=3D 0) { ++ v =3D hid_get_data(pBuf, &lcol->loc_p); ++ v =3D xf86ScaleAxis(v, acol->pmax, acol->pmin, ++ lcol->loc_p.logical_maximum, lcol->loc_p.logical_minimum); ++ if (acol->cpmin !=3D acol->cpmax) ++ v =3D xf86ScaleAxis(v, acol->pmax, acol->pmin, ++ acol->cpmax, acol->cpmin); ++ dp +=3D v; ++ np++; ++ } ++ ++ for (n =3D 0; n < acol->nbuttons; n++) { ++ if (lcol->loc_btn[n].usage !=3D 0 && rid =3D=3D lcol->loc_btn[n].repo= rt_ID) { ++ if (hid_get_data(pBuf, &lcol->loc_btn[n])) ++ buttons |=3D (1 << UMS_BUT(n)); ++ upd =3D 1; ++ } ++ } ++ } ++ if (acol->loc_cc.usage !=3D 0 && rid =3D=3D acol->loc_cc.report_ID) ++ cc =3D hid_get_data(pBuf, &acol->loc_cc); ++ else ++ cc =3D (nx || ny) ? 1 : 0; ++ if (cc > 1) ++ buttons =3D (1 << UMS_BUT(1)); ++ if (nx !=3D 0 && acol->xmin !=3D acol->xmax) ++ dx /=3D nx; ++ if (ny !=3D 0 && acol->ymin !=3D acol->ymax) ++ dy /=3D ny; ++ if (np !=3D 0 && acol->pmin !=3D acol->pmax) ++ dp /=3D np; ++// if (upd || nx || ny || np) ++// xf86MsgVerb(X_INFO, 3, "%d cc %d dx %d dy %d dz %d dw %d press %= d buttons %02x\n", ++// nacol, cc, dx, dy, dz, dw, dp, buttons); ++ if (nx !=3D 0 || ny !=3D 0) { ++ if (acol->pmin !=3D acol->pmax) { ++ xf86PostMotionEvent(acol->pInfo->dev, ++ /* is_absolute: */ TRUE, ++ /* first_valuator: */ 0, ++ /* num_valuators: */ 3, ++ dx, dy, dp); ++ } else if (acol->xmin !=3D acol->xmax || acol->ymin !=3D acol->yma= x) { ++ xf86PostMotionEvent(acol->pInfo->dev, ++ /* is_absolute: */ TRUE, ++ /* first_valuator: */ 0, ++ /* num_valuators: */ 2, ++ dx, dy); ++ } ++ } ++ if (upd || (nx !=3D 0) || (ny !=3D 0)) { ++ ((MouseDevPtr)acol->pInfo->private)->PostEvent(acol->pInfo, button= s, ++ ((acol->xmin !=3D acol->xmax) ? dx - acol->px : dx), ++ ((acol->ymin !=3D acol->ymax) ? dy - acol->py : dy), ++ dz, dw); ++ } ++ if (nx > 0) ++ acol->px =3D dx; ++ if (ny > 0) ++ acol->py =3D dy; + } +- pMse->PostEvent(pInfo, buttons, dx, dy, dz, dw); +- return; ++ goto next; + } +=20 + static void +@@ -615,14 +906,17 @@ + usbReadInput ((InputInfoPtr) closure); + } +=20 +-/* This function is called when the protocol is "usb". */ + static Bool +-usbPreInit(InputInfoPtr pInfo, const char *protocol, int flags) ++usbInitFirst(InputInfoPtr pInfo) + { + MouseDevPtr pMse =3D pInfo->private; + UsbMsePtr pUsbMse; + report_desc_t reportDesc; +- int i; ++ hid_data_t d; ++ hid_item_t h; ++ struct UsbMseAcol *acol; ++ struct UsbMseLcol *lcol; ++ int mdepth, rsize, *rsizep, acolused, lcolused, used; +=20 + pUsbMse =3D malloc(sizeof(UsbMseRec)); + if (pUsbMse =3D=3D NULL) { +@@ -631,12 +925,7 @@ + return FALSE; + } +=20 +- pMse->protocol =3D protocol; +- xf86Msg(X_CONFIG, "%s: Protocol: %s\n", pInfo->name, protocol); +- +- /* Collect the options, and process the common options. */ +- COLLECT_INPUT_OPTIONS(pInfo, NULL); +- xf86ProcessCommonOptions(pInfo, pInfo->options); ++ bzero(pUsbMse, sizeof(UsbMseRec)); +=20 + /* Check if the device can be opened. */ + pInfo->fd =3D xf86OpenSerial(pInfo->options); +@@ -652,19 +941,134 @@ + } + /* Get USB informations */ + reportDesc =3D hid_get_report_desc(pInfo->fd); +- /* Get packet size & iid */ +-#ifdef USB_NEW_HID +- if (ioctl(pInfo->fd, USB_GET_REPORT_ID, &pUsbMse->iid) =3D=3D -1) {= +- xf86Msg(X_ERROR, "Error ioctl USB_GET_REPORT_ID on %s : %s\= n", +- pInfo->name, strerror(errno)); +- return FALSE; +- } +- pUsbMse->packetSize =3D hid_report_size(reportDesc, hid_input, +- pUsbMse->iid); +-#else +- pUsbMse->packetSize =3D hid_report_size(reportDesc, hid_input, +- &pUsbMse->iid); +-#endif ++ mdepth =3D 0; ++ pUsbMse->nacols =3D 0; ++ acol =3D &pUsbMse->acols[pUsbMse->nacols]; ++ lcol =3D &acol->lcols[acol->nlcols]; ++ acolused =3D 0; ++ lcolused =3D 0; ++ d =3D hid_start_parse(reportDesc, (1 << hid_input) | ++ (1 << hid_collection) | (1 << hid_endcollection), -1); ++ while (hid_get_item(d, &h)) { ++ switch (h.kind) { ++ case hid_collection: ++ if (mdepth !=3D 0) ++ mdepth++; ++ else if (h.collection =3D=3D 1 && ++ (h.usage =3D=3D 0x00010001 || h.usage =3D=3D 0x00010002 || ++ (h.usage >=3D 0x000d0001 && h.usage <=3D 0x000d000d))) { ++ mdepth++; ++ if (acolused) { ++ if (lcolused) { ++ acol->nlcols++; ++ lcolused =3D 0; ++ } ++ pUsbMse->nacols++; ++ acolused =3D 0; ++ acol =3D &pUsbMse->acols[pUsbMse->nacols]; ++ lcol =3D &acol->lcols[acol->nlcols]; ++ } ++ } ++ if (lcolused && (h.collection =3D=3D 0 || ++ h.collection =3D=3D 2 || h.collection =3D=3D 3)) { ++ acol->nlcols++; ++ lcolused =3D 0; ++ lcol =3D &acol->lcols[acol->nlcols]; ++ } ++ break; ++ case hid_endcollection: ++ if (mdepth !=3D 0) ++ mdepth--; ++ break; ++ case hid_input: ++ if (h.report_ID !=3D 0) ++ pUsbMse->iid =3D 1; ++ rsize =3D pUsbMse->iid + ++ (h.pos + (h.report_size * h.report_count) + 7) / 8; ++ if ((rsizep =3D usbGetReportSizePtr(pUsbMse, h.report_ID)) !=3D NU= LL) ++ *rsizep =3D max(*rsizep, rsize); ++ pUsbMse->packetSize =3D max(pUsbMse->packetSize, rsize); ++ if (mdepth =3D=3D 0) ++ break; ++ used =3D 1; ++ if (h.usage =3D=3D 0x00010030) { /* X */ ++ lcol->loc_x =3D h; ++ if ((h.flags & 0x04) =3D=3D 0) { ++ if (acol->xmin =3D=3D acol->xmax) { ++ acol->xmin =3D h.logical_minimum; ++ acol->xmax =3D h.logical_maximum; ++ } else { ++ acol->xmin =3D min(acol->xmin, h.logical_minimum); ++ acol->xmax =3D max(acol->xmax, h.logical_maximum); ++ } ++ } ++ } else if (h.usage =3D=3D 0x00010031) { /* Y */ ++ lcol->loc_y =3D h; ++ if ((h.flags & 0x04) =3D=3D 0) { ++ if (acol->ymin =3D=3D acol->ymax) { ++ acol->ymin =3D h.logical_minimum; ++ acol->ymax =3D h.logical_maximum; ++ } else { ++ acol->ymin =3D min(acol->ymin, h.logical_minimum); ++ acol->ymax =3D max(acol->ymax, h.logical_maximum); ++ } ++ } ++ } else if (h.usage =3D=3D 0x00010038) { /* Z */ ++ lcol->loc_z =3D h; ++ acol->hasZ =3D 1; ++ } else if (h.usage =3D=3D 0x000c0238) { /* W */ ++ lcol->loc_w =3D h; ++ acol->hasW =3D 1; ++ } else if (h.usage =3D=3D 0x000d0030) { /* Press */ ++ lcol->loc_p =3D h; ++ if ((h.flags & 0x04) =3D=3D 0) { ++ if (acol->pmin =3D=3D acol->pmax) { ++ acol->pmin =3D h.logical_minimum; ++ acol->pmax =3D h.logical_maximum; ++ } else { ++ acol->pmin =3D min(acol->pmin, h.logical_minimum); ++ acol->pmax =3D max(acol->pmax, h.logical_maximum); ++ } ++ } ++ } else if (h.usage =3D=3D 0x000d0032) /* In Range */ ++ lcol->loc_in_range =3D h; ++ else if (h.usage =3D=3D 0x000d0047) /* Valid */ ++ lcol->loc_valid =3D h; ++ else if (h.usage > 0x00090000 && ++ h.usage <=3D 0x00090000 + MSE_MAXBUTTONS) { /* Buttons */ ++ lcol->loc_btn[(h.usage & 0xffff) - 1] =3D h; ++ acol->nbuttons =3D max(acol->nbuttons, h.usage & 0xffff); ++ } else if (h.usage =3D=3D 0x000d0042) { /* Tip Switch */ ++ lcol->loc_btn[0] =3D h; ++ acol->nbuttons =3D max(acol->nbuttons, 1); ++ } else if (h.usage =3D=3D 0x000d0044) { /* Barrel Switch */ ++ lcol->loc_btn[1] =3D h; ++ acol->nbuttons =3D max(acol->nbuttons, 2); ++ } else if (h.usage =3D=3D 0x000d0045) { /* Eraser */ ++ lcol->loc_btn[3] =3D h; ++ acol->nbuttons =3D max(acol->nbuttons, 4); ++ } else if (h.usage =3D=3D 0x000d0046) { /* Tablet Pick */ ++ lcol->loc_btn[2] =3D h; ++ acol->nbuttons =3D max(acol->nbuttons, 3); ++ } else if (h.usage =3D=3D 0x000d0054) /* Contact Count */ ++ acol->loc_cc =3D h; ++ else ++ used =3D 0; ++ lcolused +=3D used; ++ acolused +=3D used; ++ break; ++ default: ++ break; ++ } ++ } ++ if (lcolused) ++ acol->nlcols++; ++ if (acolused) ++ pUsbMse->nacols++; ++ hid_end_parse(d); ++ xf86Msg(X_DEFAULT, "%s: Found %d usable logical collections\n", ++ pInfo->name, pUsbMse->nacols); ++ + /* Allocate buffer */ + if (pUsbMse->packetSize <=3D 8) { + pUsbMse->buffer =3D pMse->protoBuf; +@@ -674,56 +1078,129 @@ + if (pUsbMse->buffer =3D=3D NULL) { + xf86Msg(X_ERROR, "%s: cannot allocate buffer\n", pInfo->name); + free(pUsbMse); +- free(pMse); + xf86CloseSerial(pInfo->fd); + return FALSE; + } +-#ifdef USB_NEW_HID +- if (hid_locate(reportDesc, HID_USAGE2(HUP_GENERIC_DESKTOP, HUG_X), +- hid_input, &pUsbMse->loc_x, pUsbMse->iid) < 0) { +- xf86Msg(X_WARNING, "%s: no x locator\n", pInfo->name); +- } +- if (hid_locate(reportDesc, HID_USAGE2(HUP_GENERIC_DESKTOP, HUG_Y), +- hid_input, &pUsbMse->loc_y, pUsbMse->iid) < 0) { +- xf86Msg(X_WARNING, "%s: no y locator\n", pInfo->name); +- } +- if (hid_locate(reportDesc, HID_USAGE2(HUP_GENERIC_DESKTOP, HUG_WHEE= L), +- hid_input, &pUsbMse->loc_z, pUsbMse->iid) < 0) { +- } +-#else +- if (hid_locate(reportDesc, HID_USAGE2(HUP_GENERIC_DESKTOP, HUG_X), +- hid_input, &pUsbMse->loc_x) < 0) { +- xf86Msg(X_WARNING, "%s: no x locator\n", pInfo->name); +- } +- if (hid_locate(reportDesc, HID_USAGE2(HUP_GENERIC_DESKTOP, HUG_Y), +- hid_input, &pUsbMse->loc_y) < 0) { +- xf86Msg(X_WARNING, "%s: no y locator\n", pInfo->name); +- } +- if (hid_locate(reportDesc, HID_USAGE2(HUP_GENERIC_DESKTOP, HUG_WHEE= L), +- hid_input, &pUsbMse->loc_z) < 0) { +- } +-#endif +- /* Probe for number of buttons */ +- for (i =3D 1; i <=3D MSE_MAXBUTTONS; i++) { +- if (!hid_locate(reportDesc, HID_USAGE2(HUP_BUTTON, i), +- hid_input, &pUsbMse->loc_btn[i-1] +-#ifdef USB_NEW_HID +- , pUsbMse->iid +-#endif +- )) +- break; +- } +- pMse->buttons =3D i-1; +=20 + xf86CloseSerial(pInfo->fd); + pInfo->fd =3D -1; +=20 + /* Private structure */ + pMse->mousePriv =3D pUsbMse; ++ return TRUE; ++} ++ ++/* This function is called when the protocol is "usb". */ ++static Bool ++usbPreInit(InputInfoPtr pInfo, const char *protocol, int flags) ++{ ++ InputInfoPtr pMatch; ++ MouseDevPtr pMse =3D pInfo->private; ++ UsbMsePtr pUsbMse; ++ struct UsbMseAcol *acol; ++ char *str; ++ int i, colopt; ++ ++ pMse->protocol =3D protocol; ++ xf86Msg(X_CONFIG, "%s: Protocol: %s\n", pInfo->name, protocol); ++ ++ /* Collect the options, and process the common options. */ ++ COLLECT_INPUT_OPTIONS(pInfo, NULL); ++ xf86ProcessCommonOptions(pInfo, pInfo->options); ++ ++ /* Check if this HID device is already opened. */ ++ for (pMatch =3D xf86FirstLocalDevice(); pMatch !=3D NULL; pMatch =3D= pMatch->next) { ++ if ((pInfo !=3D pMatch) && strstr(pMatch->drv->driverName, "mouse")) {= ++ char *dev1, *dev2; ++ ++ dev1 =3D xf86SetStrOption(pInfo->options, "Device", NULL); ++ dev2 =3D xf86SetStrOption(pMatch->options, "Device", NULL); ++ if (strcmp(dev1, dev2) =3D=3D 0) { ++ free(dev1); ++ free(dev2); ++ break; ++ } ++ free(dev1); ++ free(dev2); ++ } ++ } ++ if (pMatch =3D=3D NULL) { ++ xf86Msg(X_DEFAULT, "%s: Opening new HID device\n", pInfo->name); ++ if (!usbInitFirst(pInfo)) { ++ free(pMse); ++ return FALSE; ++ } ++ } else { ++ pMse->mousePriv =3D ((MouseDevPtr)pMatch->private)->mousePriv; ++ xf86Msg(X_DEFAULT, "%s: Attaching to already opened HID device\n", ++ pInfo->name); ++ } ++ pUsbMse =3D pMse->mousePriv; ++ ++ /* Attach to collection, respecting "Collection" option. */ ++ colopt =3D xf86SetIntOption(pInfo->options, "Collection", 0); ++ for (i =3D 0; i < pUsbMse->nacols; i++) { ++ if (pUsbMse->acols[i].pInfo =3D=3D NULL && ++ (colopt =3D=3D 0 || i =3D=3D colopt - 1)) { ++ pUsbMse->acols[i].pInfo =3D pInfo; ++ break; ++ } ++ } ++ xf86Msg(colopt =3D=3D 0 ? X_DEFAULT : X_CONFIG, ++ "%s: Collection: %d\n", pInfo->name, ++ i =3D=3D pUsbMse->nacols ? colopt : i + 1); ++ if (i =3D=3D pUsbMse->nacols) { ++ xf86Msg(X_ERROR, ++ "%s: Application collection not found or already handled\n", ++ pInfo->name); ++ free(pMse); ++ return FALSE; ++ } ++ ++ acol =3D &pUsbMse->acols[i]; ++ pMse->buttons =3D acol->nbuttons; ++ if (pMse->buttons =3D=3D 2) ++ pMse->buttons =3D 3; ++ if (acol->xmin !=3D acol->xmax || acol->ymin !=3D acol->ymax) ++ pMse->disableXY =3D TRUE; ++ pMse->hasZ =3D acol->hasZ; ++ pMse->hasW =3D acol->hasW; +=20 + /* Process common mouse options (like Emulate3Buttons, etc). */ + pMse->CommonOptions(pInfo); +=20 ++ /* Process "Calibration" option. */ ++ str =3D xf86CheckStrOption(pInfo->options, "Calibration", NULL); ++ if (str !=3D NULL && (acol->xmin !=3D acol->xmax || acol->ymin !=3D= acol->ymax)) { ++ int j, xmin, xmax, ymin, ymax, pmin, pmax; ++ ++ j =3D sscanf(str, "%d %d %d %d %d %d", &xmin, &xmax, &ymin, &ymax, &pm= in, &pmax); ++ if (j =3D=3D 4) { ++ xf86Msg(X_CONFIG, "%s: Calibration: %d %d %d %d\n", ++ pInfo->name, xmin, xmax, ymin, ymax); ++ acol->cxmin =3D xmin; ++ acol->cxmax =3D xmax; ++ acol->cymin =3D ymin; ++ acol->cymax =3D ymax; ++ } else if (j =3D=3D 6) { ++ xf86Msg(X_CONFIG, "%s: Calibration: %d %d %d %d %d %d\n", ++ pInfo->name, xmin, xmax, ymin, ymax, pmin, pmax); ++ acol->cxmin =3D xmin; ++ acol->cxmax =3D xmax; ++ acol->cymin =3D ymin; ++ acol->cymax =3D ymax; ++ acol->cpmin =3D pmin; ++ acol->cpmax =3D pmax; ++ } else ++ xf86Msg(X_WARNING, "%s: Calibration: Invalid arguments\n", ++ pInfo->name); ++ free(str); ++ } else if (acol->xmin !=3D acol->xmax || acol->ymin !=3D acol->ymax= ) { ++ xf86Msg(X_DEFAULT, "%s: Calibration: %d %d %d %d %d %d\n", ++ pInfo->name, acol->xmin, acol->xmax, acol->ymin, acol->ymax, ++ acol->pmin, acol->pmax); ++ } ++ + /* Setup the local procs. */ + pInfo->device_control =3D usbMouseProc; + pInfo->read_input =3D usbReadInput; +@@ -766,7 +1243,9 @@ p->CheckProtocol =3D CheckProtocol; #if (defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__D= ragonFly__)) && defined(MOUSE_PROTO_SYSMOUSE) p->SetupAuto =3D SetupAuto; Index: x11-drivers/xf86-input-mouse/files/patch-src_mouse.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11-drivers/xf86-input-mouse/files/patch-src_mouse.c (revision 326808= ) +++ x11-drivers/xf86-input-mouse/files/patch-src_mouse.c (working copy) @@ -1,5 +1,5 @@ ---- src/mouse.c.orig 2012-07-27 08:10:56.000000000 +0200 -+++ src/mouse.c 2012-07-30 00:31:48.000000000 +0200 +--- src/mouse.c.orig 2012-10-08 03:40:07.000000000 +0200 ++++ src/mouse.c 2013-07-03 01:04:45.398343993 +0200 @@ -280,13 +280,39 @@ =20 pMse =3D pInfo->private; @@ -135,7 +135,7 @@ =20 protocol =3D MousePickProtocol(pInfo, device, protocol, &protocolID= ); =20 -@@ -2137,7 +2148,7 @@ +@@ -2136,7 +2147,7 @@ =20 if (pMse->emulateWheel) { /* Emulate wheel button handling */ @@ -144,7 +144,7 @@ wheelButtonMask =3D 0; else wheelButtonMask =3D 1 << (pMse->wheelButton - 1); -@@ -2221,6 +2232,9 @@ +@@ -2220,6 +2231,9 @@ } } } @@ -154,7 +154,7 @@ } =20 /* Absorb the mouse movement while the wheel button is pres= sed. */ -@@ -2238,7 +2252,7 @@ +@@ -2237,7 +2251,7 @@ if (pMse->emulate3ButtonsSoft && pMse->emulate3Pending && (dx || dy= )) buttonTimer(pInfo); =20 @@ -163,8 +163,21 @@ xf86PostMotionEvent(pInfo->dev, 0, 0, 2, dx, dy); =20 if (change) { -@@ -2448,11 +2462,11 @@ +@@ -2349,12 +2363,10 @@ + int dx, int dy, int dz, int dw) + { + MouseDevPtr pMse; +- mousePrivPtr mousepriv; + int zbutton =3D 0, wbutton =3D 0, zbuttoncount =3D 0, wbuttoncount = =3D 0; + int i, b, buttons =3D 0; =20 + pMse =3D pInfo->private; +- mousepriv =3D (mousePrivPtr)pMse->mousePriv; +=20 + if (pMse->protocolID =3D=3D PROT_MMHIT) + b =3D reverseBits(hitachMap, truebuttons); +@@ -2447,11 +2459,11 @@ +=20 /* Accumulate the scaled dx, dy in the private variables fracdx,fracdy and return the integer number part */ - if (mousepriv) { Index: x11-drivers/xf86-input-synaptics/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11-drivers/xf86-input-synaptics/Makefile (revision 326808) +++ x11-drivers/xf86-input-synaptics/Makefile (working copy) @@ -10,22 +10,10 @@ =20 CONFLICTS=3D synaptics-[0-9]* =20 -OPTIONS_DEFINE=3D HAL -OPTIONS_DEFAULT=3DHAL - -.include - USES=3D pathfix -USE_XORG=3D x11 +USE_XORG=3D x11 xtst XORG_CAT=3D driver =20 -.if ${PORT_OPTIONS:MHAL} -PLIST_SUB+=3D HAL=3D"" -LIB_DEPENDS+=3D hal.1:${PORTSDIR}/sysutils/hal -.else -PLIST_SUB+=3D HAL=3D"@comment " -.endif - MAN1=3D syndaemon.1 \ synclient.1 MAN4=3D synaptics.4x @@ -41,16 +29,4 @@ EXTRA_PATCHES+=3D ${PATCHDIR}/extra-Makefile.in .endif =20 -post-install: -.if ${PORT_OPTIONS:MHAL} - ${MKDIR} ${PREFIX}/share/hal/fdi/policy/10osvendor - ${INSTALL_DATA} ${WRKSRC}/conf/11-x11-synaptics.fdi \ - ${PREFIX}/share/hal/fdi/policy/10osvendor/ -.if !defined(WITH_NEW_XORG) - ${MKDIR} ${PREFIX}/share/hal/fdi/policy/20thirdparty - ${INSTALL_DATA} ${WRKSRC}/conf/11-x11-synaptics.fdi \ - ${PREFIX}/share/hal/fdi/policy/20thirdparty/ -.endif -.endif - .include Index: x11-drivers/xf86-input-synaptics/pkg-plist =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11-drivers/xf86-input-synaptics/pkg-plist (revision 326808) +++ x11-drivers/xf86-input-synaptics/pkg-plist (working copy) @@ -6,13 +6,7 @@ lib/xorg/modules/input/synaptics_drv.so libdata/pkgconfig/xorg-synaptics.pc %%NEW%%share/X11/xorg.conf.d/50-synaptics.conf -%%HAL%%share/hal/fdi/policy/10osvendor/11-x11-synaptics.fdi -%%HAL%%%%OLD%%share/hal/fdi/policy/20thirdparty/11-x11-synaptics.fdi @dirrmtry lib/xorg/modules/input @dirrmtry lib/xorg/modules @dirrmtry lib/xorg @dirrmtry include/xorg -%%HAL%%@dirrmtry share/hal/fdi/policy/10osvendor -%%HAL%%@dirrmtry share/hal/fdi/policy -%%HAL%%@dirrmtry share/hal/fdi -%%HAL%%@dirrmtry share/hal Index: x11-drivers/xf86-video-ati/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11-drivers/xf86-video-ati/Makefile (revision 326808) +++ x11-drivers/xf86-video-ati/Makefile (working copy) @@ -1,7 +1,7 @@ # $FreeBSD$ =20 PORTNAME=3D xf86-video-ati -PORTVERSION=3D 6.14.6 +PORTVERSION=3D ${ATI_VERSION} CATEGORIES=3D x11-drivers =20 MAINTAINER=3D x11@FreeBSD.org @@ -12,6 +12,17 @@ USE_XORG=3D xf86driproto xineramaproto xf86miscproto glproto MAN4=3D ati.4x radeon.4x =20 +.include + +.if ${OSVERSION} < 1000051 +ATI_VERSION=3D 6.14.6 CONFIGURE_ARGS+=3D--disable-kms +PLIST_SUB+=3D OLD=3D"" +.else +ATI_VERSION=3D 7.2.0 +CONFIGURE_ARGS+=3D--disable-udev +EXTRA_PATCHES+=3D ${FILESDIR}/extra-src__radeon_kms.c +PLIST_SUB+=3D OLD=3D"@comment " +.endif =20 -.include +.include Index: x11-drivers/xf86-video-ati/distinfo =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11-drivers/xf86-video-ati/distinfo (revision 326808) +++ x11-drivers/xf86-video-ati/distinfo (working copy) @@ -1,2 +1,4 @@ SHA256 (xorg/driver/xf86-video-ati-6.14.6.tar.bz2) =3D aa5286b3e4f0187d7= df14785c06dd800255d9405205dbf061da5d77df86bec36 SIZE (xorg/driver/xf86-video-ati-6.14.6.tar.bz2) =3D 1139495 +SHA256 (xorg/driver/xf86-video-ati-7.2.0.tar.bz2) =3D f30f5efdc8d7d18d06= eda7ef2f91a8b7290f1cfbf6ff26362cd47ab8969daec4 +SIZE (xorg/driver/xf86-video-ati-7.2.0.tar.bz2) =3D 824613 Index: x11-drivers/xf86-video-ati/files/extra-src__radeon_kms.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11-drivers/xf86-video-ati/files/extra-src__radeon_kms.c (revision 0)= +++ x11-drivers/xf86-video-ati/files/extra-src__radeon_kms.c (working cop= y) @@ -0,0 +1,20 @@ +--- src/radeon_kms.c.orig 2013-08-07 10:44:09.000000000 +0200 ++++ src/radeon_kms.c 2013-08-31 01:20:44.370468797 +0200 +@@ -270,7 +270,7 @@ + radeon_dirty_update(ScreenPtr screen) + { + RegionPtr region; +- PixmapDirtyUpdatePtr ent; ++ PixmapDirtyUpdatePtr ent =3D NULL; +=20 + if (xorg_list_is_empty(&screen->pixmap_dirty_list)) + return; +@@ -606,7 +606,7 @@ + dev->domain, dev->bus, dev->dev, dev->func); + #endif +=20 +- info->dri2.drm_fd =3D drmOpen("radeon", busid); ++ info->dri2.drm_fd =3D drmOpen("radeonkms", busid); + if (info->dri2.drm_fd =3D=3D -1) { +=20 + xf86DrvMsg(pScrn->scrnIndex, X_ERROR, Property changes on: x11-drivers/xf86-video-ati/files/extra-src__radeon_k= ms.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: x11-drivers/xf86-video-ati/files/patch-src__radeon_dri2.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11-drivers/xf86-video-ati/files/patch-src__radeon_dri2.c (revision 0= ) +++ x11-drivers/xf86-video-ati/files/patch-src__radeon_dri2.c (working co= py) @@ -0,0 +1,11 @@ +--- src/radeon_dri2.c.orig 2013-02-22 19:31:34.000000000 +0000 ++++ src/radeon_dri2.c 2013-02-22 19:31:47.000000000 +0000 +@@ -578,7 +578,7 @@ + radeon_dri2_client_state_changed(CallbackListPtr *ClientStateCallback, = pointer data, pointer calldata) + { + DRI2ClientEventsPtr pClientEventsPriv; +- DRI2FrameEventPtr ref; ++ DRI2FrameEventPtr ref =3D NULL; + NewClientInfoRec *clientinfo =3D calldata; + ClientPtr pClient =3D clientinfo->client; + pClientEventsPriv =3D GetDRI2ClientEvents(pClient); Property changes on: x11-drivers/xf86-video-ati/files/patch-src__radeon_d= ri2.c ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Index: x11-drivers/xf86-video-ati/pkg-plist =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11-drivers/xf86-video-ati/pkg-plist (revision 326808) +++ x11-drivers/xf86-video-ati/pkg-plist (working copy) @@ -2,13 +2,13 @@ lib/xorg/modules/drivers/ati_drv.so lib/xorg/modules/drivers/radeon_drv.la lib/xorg/modules/drivers/radeon_drv.so -lib/xorg/modules/multimedia/theatre200_drv.la -lib/xorg/modules/multimedia/theatre200_drv.so -lib/xorg/modules/multimedia/theatre_detect_drv.la -lib/xorg/modules/multimedia/theatre_detect_drv.so -lib/xorg/modules/multimedia/theatre_drv.la -lib/xorg/modules/multimedia/theatre_drv.so +%%OLD%%lib/xorg/modules/multimedia/theatre200_drv.la +%%OLD%%lib/xorg/modules/multimedia/theatre200_drv.so +%%OLD%%lib/xorg/modules/multimedia/theatre_detect_drv.la +%%OLD%%lib/xorg/modules/multimedia/theatre_detect_drv.so +%%OLD%%lib/xorg/modules/multimedia/theatre_drv.la +%%OLD%%lib/xorg/modules/multimedia/theatre_drv.so @dirrmtry lib/xorg/modules/drivers -@dirrmtry lib/xorg/modules/multimedia +%%OLD%%@dirrmtry lib/xorg/modules/multimedia @dirrmtry lib/xorg/modules @dirrmtry lib/xorg Index: x11-drivers/xf86-video-intel/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11-drivers/xf86-video-intel/Makefile (revision 326808) +++ x11-drivers/xf86-video-intel/Makefile (working copy) @@ -28,20 +28,20 @@ .include =20 .if defined(WITH_NEW_XORG) -INTEL_VERSION=3D 2.21.9 +INTEL_VERSION=3D 2.21.15 INTEL_REVISION=3D 0 +CONFIGURE_ENV+=3D xorg_cv_cc_flag__Wno_maybe_uninitialized=3Dno CONFIGURE_ARGS+=3D --enable-sna MAKE_JOBS_UNSAFE=3Dyes PLIST_SUB+=3D OLD=3D"@comment " -EXTRA_PATCHES+=3D ${PATCHDIR}/extra-clang \ - ${PATCHDIR}/extra-src_sna_compiler.h \ +EXTRA_PATCHES+=3D ${PATCHDIR}/extra-src__sna__sna_threads.c \ ${PATCHDIR}/extra-src_sna_kgem.c \ - ${PATCHDIR}/extra-src__sna__sna_threads.c \ + ${PATCHDIR}/extra-clang \ ${PATCHDIR}/extra-i915kms LIB_DEPENDS+=3D xcb-util:${PORTSDIR}/x11/xcb-util .else INTEL_VERSION=3D 2.7.1 -INTEL_REVISION=3D 4 +INTEL_REVISION=3D 5 PLIST_SUB+=3D OLD=3D"" =20 EXTRA_PATCHES+=3D ${PATCHDIR}/extra-src_ch7017_ch7017.c \ Index: x11-drivers/xf86-video-intel/distinfo =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11-drivers/xf86-video-intel/distinfo (revision 326808) +++ x11-drivers/xf86-video-intel/distinfo (working copy) @@ -1,4 +1,4 @@ SHA256 (xorg/driver/xf86-video-intel-2.7.1.tar.bz2) =3D 255c0d54249cc013= 2f743254a43c21fac695fab2139c8ed96a07cf3c628e5f42 SIZE (xorg/driver/xf86-video-intel-2.7.1.tar.bz2) =3D 780625 -SHA256 (xorg/driver/xf86-video-intel-2.21.9.tar.bz2) =3D 1359cbc9e494a28= 4faa52d1db83e7388cb8ab590b660e29e78e6e7f5ee7ff189 -SIZE (xorg/driver/xf86-video-intel-2.21.9.tar.bz2) =3D 1735037 +SHA256 (xorg/driver/xf86-video-intel-2.21.15.tar.bz2) =3D 7d5a140f82a72f= d1cbc8a664d66c3d4eca47ee240ca4927b8a98d7af6f65d6fc +SIZE (xorg/driver/xf86-video-intel-2.21.15.tar.bz2) =3D 1977431 Index: x11-drivers/xf86-video-intel/files/extra-clang =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11-drivers/xf86-video-intel/files/extra-clang (revision 326808) +++ x11-drivers/xf86-video-intel/files/extra-clang (working copy) @@ -1,27 +1,15 @@ ---- src/intel_display.c.orig 2012-12-11 20:33:06.000000000 +0100 -+++ src/intel_display.c 2012-12-11 20:33:45.000000000 +0100 -@@ -1691,7 +1691,7 @@ - static drmModeEncoderPtr - intel_get_kencoder(struct intel_mode *mode, int num) +--- src/sna/sna_cpu.c.orig 2013-08-14 12:04:40.231041285 +0200 ++++ src/sna/sna_cpu.c 2013-08-14 12:05:51.237030719 +0200 +@@ -41,6 +41,7 @@ { -- struct intel_output *iterator; -+ struct intel_output *iterator =3D NULL; - int id =3D mode->mode_res->encoders[num]; + unsigned max =3D __get_cpuid_max(BASIC_CPUID, NULL); + unsigned int eax, ebx, ecx, edx; ++ eax =3D ebx =3D ecx =3D edx =3D 0; + unsigned features =3D 0; + unsigned extra =3D 0; =20 - list_for_each_entry(iterator, &mode->outputs, link) ---- src/intel_batchbuffer.c.orig 2012-12-11 20:34:55.000000000 +0100 -+++ src/intel_batchbuffer.c 2012-12-11 20:35:19.000000000 +0100 -@@ -119,7 +119,7 @@ - static void intel_batch_do_flush(ScrnInfoPtr scrn) - { - intel_screen_private *intel =3D intel_get_screen_private(scrn); -- struct intel_pixmap *priv; -+ struct intel_pixmap *priv =3D NULL; -=20 - list_for_each_entry(priv, &intel->batch_pixmaps, batch) - priv->dirty =3D 0; ---- src/sna/sna_damage.c.orig 2012-12-11 20:41:38.000000000 +0100 -+++ src/sna/sna_damage.c 2012-12-11 20:42:23.000000000 +0100 +--- src/sna/sna_damage.c.orig 2013-08-14 12:06:26.381036854 +0200 ++++ src/sna/sna_damage.c 2013-08-14 12:07:23.684023065 +0200 @@ -410,7 +410,7 @@ int n, nboxes; BoxPtr boxes, free_boxes =3D NULL; @@ -31,7 +19,7 @@ =20 assert(damage->mode !=3D DAMAGE_ALL); assert(damage->dirty); -@@ -1671,7 +1671,7 @@ +@@ -1709,7 +1709,7 @@ { int n, nboxes; BoxPtr boxes; @@ -40,8 +28,30 @@ =20 RegionCopy(r, &damage->region); if (!damage->dirty) ---- uxa/uxa-accel.c.orig 2012-12-11 20:50:56.000000000 +0100 -+++ uxa/uxa-accel.c 2012-12-11 20:51:14.000000000 +0100 +--- src/uxa/intel_batchbuffer.c.orig 2013-08-14 12:08:14.323028320 +0200= ++++ src/uxa/intel_batchbuffer.c 2013-08-14 12:08:37.202016923 +0200 +@@ -141,7 +141,7 @@ + static void intel_batch_do_flush(ScrnInfoPtr scrn) + { + intel_screen_private *intel =3D intel_get_screen_private(scrn); +- struct intel_pixmap *priv; ++ struct intel_pixmap *priv =3D NULL; +=20 + list_for_each_entry(priv, &intel->batch_pixmaps, batch) + priv->dirty =3D 0; +--- src/uxa/intel_display.c.orig 2013-08-14 12:09:25.802015629 +0200 ++++ src/uxa/intel_display.c 2013-08-14 12:09:51.034009844 +0200 +@@ -1753,7 +1753,7 @@ + static drmModeEncoderPtr + intel_get_kencoder(struct intel_mode *mode, int num) + { +- struct intel_output *iterator; ++ struct intel_output *iterator =3D NULL; + int id =3D mode->mode_res->encoders[num]; +=20 + list_for_each_entry(iterator, &mode->outputs, link) +--- src/uxa/uxa-accel.c.orig 2013-08-14 12:02:11.898048975 +0200 ++++ src/uxa/uxa-accel.c 2013-08-14 12:03:39.336042139 +0200 @@ -944,7 +944,7 @@ =20 if (uxa_screen->info->flags & UXA_USE_GLAMOR) { Index: x11-drivers/xf86-video-intel/files/extra-i915kms =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11-drivers/xf86-video-intel/files/extra-i915kms (revision 326808) +++ x11-drivers/xf86-video-intel/files/extra-i915kms (working copy) @@ -1,13 +1,13 @@ ---- src/intel_module.c.orig 2012-09-27 23:31:20.000000000 +0300 -+++ src/intel_module.c 2012-11-02 17:32:00.819723398 +0200 -@@ -393,8 +393,8 @@ - dev->domain, dev->bus, dev->dev, dev->func); +--- src/intel_device.c.orig 2013-06-30 16:03:51.000000000 +0200 ++++ src/intel_device.c 2013-07-02 14:08:34.903060688 +0200 +@@ -94,8 +94,8 @@ + pci->domain, pci->bus, pci->dev, pci->func); =20 - ret =3D drmCheckModesettingSupported(id); -- if (ret) { -- if (xf86LoadKernelModule("i915")) -+ if (ret || 1) { -+ if (xf86LoadKernelModule("i915kms")) - ret =3D drmCheckModesettingSupported(id); - if (ret) - return FALSE; + ret =3D drmCheckModesettingSupported(id); +- if (ret) { +- if (xf86LoadKernelModule("i915")) ++ if (ret || 1) { ++ if (xf86LoadKernelModule("i915kms")) + ret =3D drmCheckModesettingSupported(id); + if (ret) + return -1; Index: x11-drivers/xf86-video-intel/files/extra-src_sna_compiler.h =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11-drivers/xf86-video-intel/files/extra-src_sna_compiler.h (revision= 326808) +++ x11-drivers/xf86-video-intel/files/extra-src_sna_compiler.h (working = copy) @@ -1,18 +0,0 @@ ---- src/sna/compiler.h.orig 2013-03-12 12:48:29.745101779 +0100 -+++ src/sna/compiler.h 2013-03-12 12:48:52.857102997 +0100 -@@ -37,7 +37,6 @@ - #define must_check __attribute__((warn_unused_result)) - #define constant __attribute__((const)) - #define pure __attribute__((pure)) --#define __packed__ __attribute__((__packed__)) - #define flatten __attribute__((flatten)) - #else - #define likely(expr) (expr) -@@ -48,7 +47,6 @@ - #define must_check - #define constant - #define pure --#define __packed__ - #define flatten - #endif -=20 Index: x11-drivers/xf86-video-intel/files/extra-src_sna_kgem.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11-drivers/xf86-video-intel/files/extra-src_sna_kgem.c (revision 326= 808) +++ x11-drivers/xf86-video-intel/files/extra-src_sna_kgem.c (working copy= ) @@ -1,18 +1,14 @@ ---- src/sna/kgem.c.orig 2013-03-11 11:19:02.000000000 +0100 -+++ src/sna/kgem.c 2013-03-12 12:56:49.452065668 +0100 -@@ -658,7 +658,11 @@ - if (file) { - size_t len =3D 0; - char *line =3D NULL; -+#ifdef __GLIBC__ - while (getline(&line, &len, file) !=3D -1) { -+#else -+ while ((line =3D fgetln(file, &len)) !=3D (char *) NULL) { -+#endif - int mb; - if (sscanf(line, "cache size : %d KB", &mb) =3D=3D 1) { - /* Paranoid check against gargantuan caches */ -@@ -1666,7 +1670,8 @@ +--- src/sna/kgem.c.orig 2013-08-04 11:10:59.000000000 +0200 ++++ src/sna/kgem.c 2013-08-14 11:59:14.787060294 +0200 +@@ -25,6 +25,7 @@ + * + */ +=20 ++#define _WITH_GETLINE + #ifdef HAVE_CONFIG_H + #include "config.h" + #endif +@@ -1890,7 +1891,8 @@ static struct kgem_bo * search_snoop_cache(struct kgem *kgem, unsigned int num_pages, unsigned = flags) { @@ -22,7 +18,7 @@ =20 DBG(("%s: num_pages=3D%d, flags=3D%x\n", __FUNCTION__, num_pages, flag= s)); =20 -@@ -1868,7 +1873,8 @@ +@@ -2104,7 +2106,8 @@ =20 static bool kgem_retire__flushing(struct kgem *kgem) { @@ -32,7 +28,7 @@ bool retired =3D false; =20 list_for_each_entry_safe(bo, next, &kgem->flushing, request) { -@@ -2073,7 +2079,8 @@ +@@ -2309,7 +2312,8 @@ static void kgem_commit(struct kgem *kgem) { struct kgem_request *rq =3D kgem->next_request; @@ -42,7 +38,7 @@ =20 list_for_each_entry_safe(bo, next, &rq->buffers, request) { assert(next->request.prev =3D=3D &bo->request); -@@ -2154,7 +2161,8 @@ +@@ -2390,7 +2394,8 @@ =20 static void kgem_finish_buffers(struct kgem *kgem) { @@ -51,8 +47,8 @@ + struct kgem_buffer *next; =20 list_for_each_entry_safe(bo, next, &kgem->batch_buffers, base.list) { - DBG(("%s: buffer handle=3D%d, used=3D%d, exec?=3D%d, write=3D%d, mmap= ped=3D%d\n", -@@ -2963,7 +2971,8 @@ + DBG(("%s: buffer handle=3D%d, used=3D%d, exec?=3D%d, write=3D%d, mmap= ped=3D%s\n", +@@ -3252,7 +3257,8 @@ static struct kgem_bo * search_linear_cache(struct kgem *kgem, unsigned int num_pages, unsigned= flags) { @@ -62,7 +58,7 @@ bool use_active =3D (flags & CREATE_INACTIVE) =3D=3D 0; struct list *cache; =20 -@@ -3521,7 +3530,7 @@ +@@ -3855,7 +3861,7 @@ uint32_t flags) { struct list *cache; @@ -71,7 +67,7 @@ uint32_t pitch, tiled_height, size; uint32_t handle; int i, bucket, retry; -@@ -4834,7 +4843,7 @@ +@@ -5302,7 +5308,7 @@ void kgem_clear_dirty(struct kgem *kgem) { struct list * const buffers =3D &kgem->next_request->buffers; @@ -79,8 +75,8 @@ + struct kgem_bo *bo =3D NULL; =20 list_for_each_entry(bo, buffers, request) { - if (!bo->dirty) -@@ -5072,7 +5081,7 @@ + if (!bo->gpu_dirty) +@@ -5578,7 +5584,7 @@ uint32_t size, uint32_t flags, void **ret) { Index: x11-drivers/xorg-drivers/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11-drivers/xorg-drivers/Makefile (revision 326808) +++ x11-drivers/xorg-drivers/Makefile (working copy) @@ -10,7 +10,7 @@ MAINTAINER=3D x11@FreeBSD.org COMMENT=3D X.org drivers meta-port =20 -.MAKE.FreeBSD_UL=3D yes +.MAKE.FreeBSD_UL=3D yes =20 VIDEODIR=3D ${PREFIX}/lib/xorg/modules/drivers INPUTDIR=3D ${PREFIX}/lib/xorg/modules/input Index: x11-fonts/xfs/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11-fonts/xfs/Makefile (revision 326808) +++ x11-fonts/xfs/Makefile (working copy) @@ -9,7 +9,7 @@ COMMENT=3D X.Org font server =20 XORG_CAT=3D app -USE_GMAKE=3D yes +USES=3D gmake USE_XORG=3D libfs xfont xtrans USE_RC_SUBR=3D xfs CONFIGURE_ARGS=3D --without-xmlto --without-fop Index: x11-servers/xephyr/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11-servers/xephyr/Makefile (revision 326808) +++ x11-servers/xephyr/Makefile (working copy) @@ -1,7 +1,6 @@ # $FreeBSD$ =20 PORTNAME=3D xephyr -PORTREVISION=3D 0 =20 COMMENT=3D X server from X.Org based on kdrive =20 Index: x11-servers/xorg-dmx/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11-servers/xorg-dmx/Makefile (revision 326808) +++ x11-servers/xorg-dmx/Makefile (working copy) @@ -2,7 +2,6 @@ # $FreeBSD$ =20 PORTNAME=3D xorg-dmx -PORTREVISION=3D 0 =20 COMMENT=3D Distributed Multihead X from X.Org =20 Index: x11-servers/xorg-nestserver/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11-servers/xorg-nestserver/Makefile (revision 326808) +++ x11-servers/xorg-nestserver/Makefile (working copy) @@ -23,6 +23,8 @@ PLIST_FILES=3D bin/Xnest MAN1=3D Xnest.1 =20 +.include + do-install: ${INSTALL_PROGRAM} ${WRKSRC}/hw/xnest/Xnest ${PREFIX}/bin/ .if defined(WITH_NEW_XORG) Index: x11-servers/xorg-server/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11-servers/xorg-server/Makefile (revision 326808) +++ x11-servers/xorg-server/Makefile (working copy) @@ -20,14 +20,28 @@ XORG_CAT=3D xserver SLAVE_PORT?=3D no =20 +OPTIONS_DEFINE=3D AIGLX SUID +OPTIONS_RADIO=3D CONF +OPTIONS_RADIO_CONF=3D HAL DEVD +AIGLX_DESC=3D Compile with Accelerated Indirect GLX support +SUID_DESC=3D Install the Xorg server with setuid bit set +HAL_DESC=3D Compile with HAL config support +DEVD_DESC=3D Use devd for autoconfiguration of input devices +OPTIONS_DEFAULT=3DAIGLX SUID DEVD + +OPTIONS_EXCLUDE_sparc64=3D HAL + +.include + .if defined(WITH_NEW_XORG) XORG_VERSION=3D 1.12.4 -XORG_REVISION=3D 1 +XORG_REVISION=3D 2 PLIST_SUB+=3D OLD=3D"@comment " NEW=3D"" -EXTRA_PATCHES+=3D ${FILESDIR}/extra-clang +EXTRA_PATCHES+=3D ${FILESDIR}/extra-clang \ + ${FILESDIR}/extra-configure .else XORG_VERSION=3D 1.7.7 -XORG_REVISION=3D 8 +XORG_REVISION=3D 9 PLIST_SUB+=3D OLD=3D"" NEW=3D"@comment " EXTRA_PATCHES+=3D ${FILESDIR}/extra-Xext-xace.c \ ${FILESDIR}/extra-Xserver-hw-xfree86-os-support-bsd-sparc64_video.c \ @@ -39,10 +53,8 @@ ${FILESDIR}/extra-Xserver-hw-xfree86-common-xf86Config.c .endif =20 -USES=3D perl5 -USE_PERL5=3D build USE_BZIP2=3D yes -USE_GMAKE=3D yes +USES=3D gmake USE_GL=3D gl USE_XORG?=3D xf86driproto glproto xdmcp x11 xkbfile xxf86misc xxf86vm xa= w7 \ xmu xt xpm xext randrproto renderproto fixesproto damageproto \ @@ -54,6 +66,7 @@ =20 MAKE_JOBS_UNSAFE=3D yes USE_OPENSSL=3D yes +USE_PERL5_BUILD=3Dyes CONFIGURE_ARGS?=3D--disable-dmx --disable-xvfb --disable-xnest \ --without-xmlto --disable-docs --disable-devel-docs \ --localstatedir=3D/var --without-dtrace --disable-xephyr \ @@ -78,14 +91,6 @@ PLIST=3D ${.CURDIR}/pkg-plist .endif =20 -OPTIONS_DEFINE=3D AIGLX SUID HAL -AIGLX_DESC=3D Compile with Accelerated Indirect GLX support -SUID_DESC=3D Install the Xorg server with setuid bit set -HAL_DESC=3D Compile with HAL config support -OPTIONS_DEFAULT=3D AIGLX SUID HAL - -OPTIONS_EXCLUDE_sparc64=3D HAL - .include =20 .if defined(WITH_OPENSSL_BASE) @@ -102,6 +107,10 @@ CONFIGURE_ARGS+=3D --enable-config-hal=3Dno .endif =20 +.if ${PORT_OPTIONS:MDEVD} +EXTRA_PATCHES+=3D extra-config_devd.c +.endif + .if ${PORT_OPTIONS:MAIGLX} CONFIGURE_ARGS+=3D --enable-aiglx=3Dyes .else @@ -171,6 +180,17 @@ @${REINPLACE_CMD} -e 's|@GLX_TRUE@GLXMODS =3D|@GLX_BOGUS@GLXMODS =3D|g'= \ -e 's|^LTLIBRARIES =3D |LTLIBRARIES =3D libglx.la |g' \ ${WRKSRC}/hw/xfree86/dixmods/Makefile.in +.if ${PORT_OPTIONS:MDEVD} + @${ECHO_CMD} -e "\nint config_devd_init(void);\nvoid config_devd_fini(v= oid);" \ + >> ${WRKSRC}/config/config-backends.h +.endif +=20 +post-configure: +.if ${PORT_OPTIONS:MDEVD} + @${REINPLACE_CMD} -e 's|config\.c|config.c devd.c|g' \ + -e 's|config\.lo|config.lo devd.lo|g' \ + ${WRKSRC}/config/Makefile +.endif =20 .if ${SLAVE_PORT} =3D=3D "no" pre-su-install: Index: x11-servers/xorg-server/files/extra-config_devd.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11-servers/xorg-server/files/extra-config_devd.c (revision 0) +++ x11-servers/xorg-server/files/extra-config_devd.c (working copy) @@ -0,0 +1,481 @@ +--- /dev/null 2013-08-03 00:44:23.000000000 +0200 ++++ config/devd.c 2013-08-03 00:45:15.162836806 +0200 +@@ -0,0 +1,478 @@ ++/* ++ * Copyright =C2=A9 2012 Baptiste Daroussin ++ * ++ * Permission is hereby granted, free of charge, to any person obtainin= g a ++ * copy of this software and associated documentation files (the "Softw= are"), ++ * to deal in the Software without restriction, including without limit= ation ++ * the rights to use, copy, modify, merge, publish, distribute, sublice= nse, ++ * and/or sell copies of the Software, and to permit persons to whom th= e ++ * Software is furnished to do so, subject to the following conditions:= ++ * ++ * The above copyright notice and this permission notice (including the= next ++ * paragraph) shall be included in all copies or substantial portions o= f the ++ * Software. ++ * ++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPR= ESS OR ++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABIL= ITY, ++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT S= HALL ++ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR= OTHER ++ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARIS= ING ++ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER ++ * DEALINGS IN THE SOFTWARE. ++ * ++ * Author: Baptiste Daroussin ++ */ ++ ++#ifdef HAVE_DIX_CONFIG_H ++#include ++#endif ++ ++#include ++#include ++#include ++#include ++ ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include "input.h" ++#include "inputstr.h" ++#include "hotplug.h" ++#include "config-backends.h" ++#include "os.h" ++ ++#define DEVD_SOCK_PATH "/var/run/devd.pipe" ++ ++#define DEVD_EVENT_ADD '+' ++#define DEVD_EVENT_REMOVE '-' ++ ++static int sock_devd =3D -1; ++ ++#if XORG_VERSION_CURRENT < 10800000 ++enum { ++ ATTR_KEYBOARD, ++ ATTR_POINTER, ++ ATTR_JOYSTICK, ++ ATTR_TOUCHPAD, ++ ATTR_TOUCHSCREEN, ++}; ++#endif ++ ++struct hw_type { ++ const char *driver; ++ int flag; ++ const char *xdriver; ++}; ++ ++static struct hw_type hw_types[] =3D { ++ { "ukbd", ATTR_KEYBOARD, "kdb" }, ++ { "atkbd", ATTR_KEYBOARD, "kdb" }, ++ { "ums", ATTR_POINTER, "mouse" }, ++ { "psm", ATTR_POINTER, "mouse" }, ++ { "uhid", ATTR_POINTER, "mouse" }, ++ { "joy", ATTR_JOYSTICK, NULL }, ++ { "atp", ATTR_TOUCHPAD, NULL }, ++ { "uep", ATTR_TOUCHSCREEN, NULL }, ++ { NULL, -1, NULL }, ++}; ++ ++#if XORG_VERSION_CURRENT < 10800000 ++static void ++add_option(InputOption **options, const char *key, const char *value) ++{ ++ if (!value || *value =3D=3D '\0') ++ return; ++ ++ for (; *options; options =3D &(*options)->next) ++ ; ++ *options =3D calloc(sizeof(**options), 1); ++ if (!*options) /* Yeesh. */ ++ return; ++ (*options)->key =3D xstrdup(key); ++ (*options)->value =3D xstrdup(value); ++ (*options)->next =3D NULL; ++} ++ ++static void ++remove_device(DeviceIntPtr dev) ++{ ++ /* this only gets called for devices that have already been added *= / ++ LogMessage(X_INFO, "config/devd: removing device %s\n", dev->name);= ++ ++ /* Call PIE here so we don't try to dereference a device that's ++ * already been removed. */ ++ OsBlockSignals(); ++ ProcessInputEvents(); ++ DeleteInputDeviceRequest(dev); ++ OsReleaseSignals(); ++} ++ ++static bool ++device_is_duplicate(char *config_info) ++{ ++ DeviceIntPtr dev; ++ ++ for (dev =3D inputInfo.devices; dev; dev =3D dev->next) ++ if (dev->config_info && (strcmp(dev->config_info, config_info) = =3D=3D 0)) ++ return true; ++ ++ for (dev =3D inputInfo.off_devices; dev; dev =3D dev->next) ++ if (dev->config_info && (strcmp(dev->config_info, config_info) = =3D=3D 0)) ++ return true; ++ ++ return false; ++} ++ ++#endif ++ ++static bool ++sysctl_exists(const char *format, ...) ++{ ++ va_list args; ++ char *name =3D NULL; ++ size_t len; ++ int ret; ++ ++ if (format =3D=3D NULL) ++ return false; ++ ++ va_start(args, format); ++ vasprintf(&name, format, args); ++ va_end(args); ++ ++ ret =3D sysctlbyname(name, NULL, &len, NULL, 0); ++ ++ if (ret =3D=3D -1) ++ len =3D 0; ++ ++ free(name); ++ return (len > 0); ++} ++ ++static char * ++sysctl_get_str(const char *format, ...) ++{ ++ va_list args; ++ char *name =3D NULL; ++ char *dest =3D NULL; ++ size_t len; ++ ++ if (format =3D=3D NULL) ++ return NULL; ++ ++ va_start(args, format); ++ vasprintf(&name, format, args); ++ va_end(args); ++ ++ if (sysctlbyname(name, NULL, &len, NULL, 0) =3D=3D 0) { ++ dest =3D malloc(len + 1); ++ if (sysctlbyname(name, dest, &len, NULL, 0) =3D=3D 0) ++ dest[len] =3D '\0'; ++ else { ++ free(dest); ++ dest =3D NULL; ++ } ++ } ++ ++ free(name); ++ return dest; ++} ++ ++static void ++device_added(char *line) ++{ ++ char *walk; ++ char *path; ++ char *vendor; ++ char *product =3D NULL; ++ char *config_info =3D NULL; ++ InputOption *options =3D NULL; ++#if XORG_VERSION_CURRENT > 10800000 ++ InputAttributes attrs =3D {}; ++#else ++ InputOption *tmpo; ++#endif ++ DeviceIntPtr dev =3D NULL; ++ int i, rc; ++ ++ walk =3D strchr(line, ' '); ++ if (walk !=3D NULL) ++ walk[0] =3D '\0'; ++ ++ for (i =3D 0; hw_types[i].driver !=3D NULL; i++) { ++ if (strncmp(line, hw_types[i].driver, ++ strlen(hw_types[i].driver)) =3D=3D 0 && ++ isnumber(*(line + strlen(hw_types[i].driver)))) { ++#if XORG_VERSION_CURRENT > 10800000 ++ attrs.flags |=3D hw_types[i].flag; ++#endif ++ break; ++ } ++ } ++ if (hw_types[i].driver =3D=3D NULL) { ++ LogMessageVerb(X_INFO, 10, "config/devd: ignoring device %s\n",= line); ++ return; ++ } ++ ++#if XORG_VERSION_CURRENT < 10800000 ++ if (hw_types[i].xdriver =3D=3D NULL) { ++ LogMessageVerb(X_INFO, 10, "config/devd: ignoring device %s\n",= line); ++ return; ++ } ++#endif ++ if (asprintf(&path, "/dev/%s", line) =3D=3D -1) ++ return; ++ ++#if XORG_VERSION_CURRENT < 10800000 ++ options =3D calloc(sizeof(*options), 1); ++ if (!options) ++ return; ++ ++ add_option(&options, "_source", "server/devd"); ++#else ++ options =3D input_option_new(NULL, "_source", "server/devd"); ++ if (!options) ++ return; ++#endif ++ ++ vendor =3D sysctl_get_str("dev.%s.%s.%%desc", hw_types[i].driver, l= ine + strlen(hw_types[i].driver)); ++ if (vendor =3D=3D NULL) { ++#if XORG_VERSION_CURRENT > 10800000 ++ attrs.vendor =3D strdup("(unnamed)"); ++#endif ++ } else { ++ if ((product =3D strchr(vendor, ' ')) !=3D NULL) { ++ product[0] =3D '\0'; ++ product++; ++ } ++#if XORG_VERSION_CURRENT > 10800000 ++ attrs.vendor =3D strdup(vendor); ++#endif ++ if (product !=3D NULL && (walk =3D strchr(product, ',')) !=3D N= ULL) ++ walk[0] =3D '\0'; ++#if XORG_VERSION_CURRENT > 10800000 ++ attrs.product =3D strdup(product !=3D NULL ? product : "(unname= d)"); ++ options =3D input_option_new(options, "name", product !=3D NULL ? prod= uct : "(unnamed)"); ++#else ++ add_option(&options, "name", product !=3D NULL ? product : "(un= named)"); ++#endif ++ } ++#if XORG_VERSION_CURRENT > 10800000 ++ attrs.usb_id =3D NULL; ++ options =3D input_option_new(options, "path", path); ++ options =3D input_option_new(options, "device", path); ++#else ++ add_option(&options, "path", path); ++ add_option(&options, "device", path); ++#endif ++ ++#if XORG_VERSION_CURRENT < 10800000 ++ add_option(&options, "driver", hw_types[i].xdriver); ++#endif ++ ++ if (asprintf(&config_info, "devd:%s", line) =3D=3D -1) { ++ config_info =3D NULL; ++ goto unwind; ++ } ++ ++ if (device_is_duplicate(config_info)) { ++ LogMessage(X_WARNING, "config/devd: device %s already added. " ++ "Ignoring.\n", product !=3D NULL ? produc= t : "(unnamed)"); ++ goto unwind; ++ } ++ ++#if XORG_VERSION_CURRENT < 10800000 ++ add_option(&options, "config_info", config_info); ++#else ++ options =3D input_option_new(options, "config_info", config_info); ++#endif ++ LogMessage(X_INFO, "config/devd: Adding input device %s (%s)\n", ++ product !=3D NULL ? product : "(unnamed)", path); ++ ++#if XORG_VERSION_CURRENT > 10800000 ++ rc =3D NewInputDeviceRequest(options, &attrs, &dev); ++#else ++ rc =3D NewInputDeviceRequest(options, &dev); ++#endif ++ ++ if (rc !=3D Success) ++ goto unwind; ++ ++ unwind: ++ free(config_info); ++#if XORG_VERSION_CURRENT < 10800000 ++ while ((tmpo =3D options)) { ++ options =3D tmpo->next; ++ free(tmpo->key); /* NULL if dev !=3D NULL */ ++ free(tmpo->value); /* NULL if dev !=3D NULL */ ++ free(tmpo); ++ } ++#else ++ input_option_free_list(&options); ++#endif ++ ++#if XORG_VERSION_CURRENT > 10800000 ++ free(attrs.usb_id); ++ free(attrs.product); ++ free(attrs.device); ++ free(attrs.vendor); ++#endif ++ ++ return; ++} ++ ++static void ++device_removed(char *line) ++{ ++ char *walk; ++ char *value; ++#if XORG_VERSION_CURRENT < 10800000 ++ DeviceIntPtr dev, next; ++#endif ++ ++ walk =3D strchr(line, ' '); ++ if (walk !=3D NULL) ++ walk[0] =3D '\0'; ++ ++ if (asprintf(&value, "devd:%s", line) =3D=3D -1) ++ return; ++ ++#if XORG_VERSION_CURRENT > 10800000 ++ remove_devices("dev", value); ++#else ++ for (dev =3D inputInfo.devices; dev; dev =3D next) { ++ next =3D dev->next; ++ if (dev->config_info && strcmp(dev->config_info, value) =3D=3D = 0) ++ remove_device(dev); ++ } ++ for (dev =3D inputInfo.off_devices; dev; dev =3D next) { ++ next =3D dev->next; ++ if (dev->config_info && strcmp(dev->config_info, value) =3D=3D = 0) ++ remove_device(dev); ++ } ++#endif ++ ++ free(value); ++} ++ ++static ssize_t ++socket_getline(int fd, char **out) ++{ ++ char *buf; ++ ssize_t ret, cap, sz =3D 0; ++ char c; ++ ++ cap =3D 1024; ++ buf =3D malloc(cap * sizeof(char)); ++ if (!buf) ++ return -1; ++ ++ for (;;) { ++ ret =3D read(sock_devd, &c, 1); ++ if (ret < 1) { ++ free(buf); ++ return -1; ++ } ++ ++ if (c =3D=3D '\n') ++ break; ++ ++ if (sz + 1 >=3D cap) { ++ cap *=3D 2; ++ buf =3D realloc(buf, cap *sizeof(char)); ++ } ++ buf[sz] =3D c; ++ sz++; ++ } ++ ++ buf[sz] =3D '\0'; ++ if (sz > 0) ++ *out =3D buf; ++ else ++ free(buf); ++ ++ return sz; /* number of bytes in the line, not counting the line break= */ ++} ++ ++static void ++wakeup_handler(pointer data, int err, pointer read_mask) ++{ ++ char *line =3D NULL; ++ ++ if (err < 0) ++ return; ++ ++ if (FD_ISSET(sock_devd, (fd_set *)read_mask)) { ++ if (socket_getline(sock_devd, &line) < 0) ++ return; ++ ++ switch(*line) { ++ case DEVD_EVENT_ADD: ++ device_added(line++); ++ break; ++ case DEVD_EVENT_REMOVE: ++ device_removed(line++); ++ break; ++ default: ++ break; ++ } ++ free(line); ++ } ++} ++ ++static void ++block_handler(pointer data, struct timeval **tv, pointer read_mask) ++{ ++} ++ ++int ++config_devd_init(void) ++{ ++ struct sockaddr_un devd; ++ char devicename[1024]; ++ int i, j; ++ ++ /* first scan the sysctl to determine the hardware if needed */ ++ ++ for (i =3D 0; hw_types[i].driver !=3D NULL; i++) { ++ for (j =3D 0; sysctl_exists("dev.%s.%i.%%desc", hw_types[i].dri= ver, j); j++) { ++ snprintf(devicename, 1024, "%s%i", hw_types[i].driver, j); ++ device_added(devicename); ++ } ++ ++ } ++ sock_devd =3D socket(AF_UNIX, SOCK_STREAM, 0); ++ if (sock_devd < 0) { ++ ErrorF("config/devd: Fail opening stream socket"); ++ return 0; ++ } ++ ++ devd.sun_family =3D AF_UNIX; ++ strlcpy(devd.sun_path, DEVD_SOCK_PATH, sizeof(devd.sun_path)); ++ ++ if (connect(sock_devd, (struct sockaddr *) &devd, sizeof(struct soc= kaddr_un)) < 0) { ++ close(sock_devd); ++ ErrorF("config/devd: Fail to connect to devd"); ++ return 0; ++ } ++ ++ RegisterBlockAndWakeupHandlers(block_handler, wakeup_handler, NULL)= ; ++ AddGeneralSocket(sock_devd); ++ ++ return 1; ++} ++ ++void ++config_devd_fini(void) ++{ ++ if (sock_devd < 0) ++ return; ++ ++ RemoveGeneralSocket(sock_devd); ++ RemoveBlockAndWakeupHandlers(block_handler, wakeup_handler, NULL); ++ close(sock_devd); ++} Property changes on: x11-servers/xorg-server/files/extra-config_devd.c ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +FreeBSD=3D%H \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Index: x11-servers/xorg-server/files/extra-configure =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11-servers/xorg-server/files/extra-configure (revision 0) +++ x11-servers/xorg-server/files/extra-configure (working copy) @@ -0,0 +1,11 @@ +--- configure.orig 2013-09-07 22:11:27.210621324 +0200 ++++ configure 2013-09-07 22:11:52.912624338 +0200 +@@ -22839,7 +22839,7 @@ + } + _ACEOF + if ac_fn_c_try_compile "$LINENO"; then : +- ac_cv_tls=3D$kw ++ ac_cv_tls=3D$kw; break ; + fi + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + done Property changes on: x11-servers/xorg-server/files/extra-configure ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Index: x11-themes/gtk-murrine-engine/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11-themes/gtk-murrine-engine/Makefile (revision 326808) +++ x11-themes/gtk-murrine-engine/Makefile (working copy) @@ -3,6 +3,7 @@ =20 PORTNAME=3D murrine PORTVERSION=3D 0.98.2 +PORTREVISION=3D 1 CATEGORIES=3D x11-themes MASTER_SITES=3D GNOME PKGNAMEPREFIX=3D gtk- @@ -11,14 +12,12 @@ MAINTAINER=3D pneumann@gmail.com COMMENT=3D Murrine GTK+ 2.x cairo based engine =20 -LIB_DEPENDS=3D pixman-1:${PORTSDIR}/x11/pixman - USE_XZ=3D yes -USE_GMAKE=3D yes +USE_XORG=3D pixman USE_GNOME=3D gtk20 intltool intlhack USE_LDCONFIG=3D yes GNU_CONFIGURE=3D yes -USES=3D pkgconfig +USES=3D gmake pkgconfig =20 OPTIONS_DEFINE=3D ANIMATION ANIMATION_DESC=3D Animation support Index: x11-toolkits/gtkglext/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11-toolkits/gtkglext/Makefile (revision 326808) +++ x11-toolkits/gtkglext/Makefile (working copy) @@ -3,7 +3,7 @@ =20 PORTNAME=3D gtkglext PORTVERSION=3D 1.2.0 -PORTREVISION=3D 11 +PORTREVISION=3D 12 CATEGORIES=3D x11-toolkits MASTER_SITES=3D SF DIST_SUBDIR=3D gnome2 @@ -25,12 +25,11 @@ OPTIONS_DEFINE=3D DOCS =20 USE_BZIP2=3D yes -USE_GMAKE=3D yes USE_AUTOTOOLS=3D libtool USE_XORG=3D ice pixman sm x11 xau xcb xcomposite xcursor xdamage xdmcp \= xext xfixes xi xinerama xmu xrandr xrender xt xxf86vm USE_GL=3D glu -USES=3D gettext iconv pathfix pkgconfig +USES=3D gettext gmake iconv pathfix pkgconfig USE_GNOME=3D gdkpixbuf2 gtk20 pangox-compat USE_LDCONFIG=3D yes =20 Index: x11-toolkits/libXaw/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11-toolkits/libXaw/Makefile (revision 326808) +++ x11-toolkits/libXaw/Makefile (working copy) @@ -2,7 +2,7 @@ # $FreeBSD$ =20 PORTNAME=3D libXaw -PORTVERSION=3D 1.0.11 +PORTVERSION=3D 1.0.12 PORTEPOCH=3D 2 CATEGORIES=3D x11-toolkits =20 @@ -11,7 +11,7 @@ =20 XORG_CAT=3D lib USE_XORG=3D printproto:both x11 xau xext xextproto xmu xp xpm xproto:bot= h xt -USE_GMAKE=3D yes +USES=3D gmake CONFIGURE_ARGS+=3D--without-xmlto =20 MAN3=3D Xaw.3 Index: x11-toolkits/libXaw/distinfo =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11-toolkits/libXaw/distinfo (revision 326808) +++ x11-toolkits/libXaw/distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (xorg/lib/libXaw-1.0.11.tar.bz2) =3D 87a874acbb71d1ee59b8047312fc= 91d89dcb373e2970f121184cdae29a3d9492 -SIZE (xorg/lib/libXaw-1.0.11.tar.bz2) =3D 649633 +SHA256 (xorg/lib/libXaw-1.0.12.tar.bz2) =3D 96fc314874fce9979556321d1d6e= e00b5baf32fb333b7278853b4983bc3cdbf6 +SIZE (xorg/lib/libXaw-1.0.12.tar.bz2) =3D 677147 Index: x11-toolkits/libXmu/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11-toolkits/libXmu/Makefile (revision 326808) +++ x11-toolkits/libXmu/Makefile (working copy) @@ -2,7 +2,7 @@ # $FreeBSD$ =20 PORTNAME=3D libXmu -PORTVERSION=3D 1.1.1 +PORTVERSION=3D 1.1.2 PORTEPOCH=3D 1 CATEGORIES=3D x11-toolkits =20 Index: x11-toolkits/libXmu/distinfo =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11-toolkits/libXmu/distinfo (revision 326808) +++ x11-toolkits/libXmu/distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (xorg/lib/libXmu-1.1.1.tar.bz2) =3D 709081c550cc3a866d7c760a3f973= 84a1fe16e27fc38fe8169b8db9f33aa7edd -SIZE (xorg/lib/libXmu-1.1.1.tar.bz2) =3D 383473 +SHA256 (xorg/lib/libXmu-1.1.2.tar.bz2) =3D 756edc7c383254eef8b4e1b733c3b= f1dc061b523c9f9833ac7058378b8349d0b +SIZE (xorg/lib/libXmu-1.1.2.tar.bz2) =3D 396230 Index: x11-wm/awesome/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11-wm/awesome/Makefile (revision 326808) +++ x11-wm/awesome/Makefile (working copy) @@ -3,7 +3,7 @@ =20 PORTNAME=3D awesome PORTVERSION=3D 3.5.1 -PORTREVISION=3D 2 +PORTREVISION=3D 3 PORTEPOCH=3D 1 CATEGORIES=3D x11-wm MASTER_SITES=3D http://awesome.naquadah.org/download/ --------------010302050208010508050208-- ------enig2BRQOLGEICLWVXUDNLJOL Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.20 (FreeBSD) iQIcBAEBCgAGBQJSLcQEAAoJELuNS1e7i1VRbQAP/0DuPhjf0MQlcZGe7yGV2VZF MAOkQE+ASxevjWh8/rVPrGpmAt5TJOttzIgjsRUcOQzo/noqbDt/LYmSNXvvtZnt oisGQqbp9EXle0NsWphRBSeqKg1uQ4C2NX4SC2K38uaeJr3DG9jlVp+tFvJ5X8b2 /KlDtkHDc6v+ODNmDSczFQyRNpVatSkxf8YyvI2ICTnuR+MNHExhTapdY906PwkT ZeYjTZ6BTj43HBT5THh/L4ArsbkIqlhpAcUORjYPis1gZTeRCEMc6pzZ4j/rU76v ra6BmKMF7C8FF014yp1okig8v2pifwb0KwdKdNyb5uvRykwqkBRMKdHoAOqcW3WI eyqfXSYvNgzckMGL83eSCw9+1D1gPrsY+QYnkwNvhS9UVJUxvoOMOsoEvSnYZ0lC elYutSmPjxfatu8ZbCZwmYDj2ixyE640IYeFuSyyAZmfj8eHEA9mjozYj1/Nx17U CtTb72L7f1mCNR2eE1Gv9ZCS6DJu1AZAW1E3KJZCm/0DtHZV2Vf/F/Yw6wdFO5mI QyCaN6XmWB2DYQ8CskndJJkZF2V1M/pfUGX/i2EJrgnCpf+VSCIGC4gsJpr1vKHi l5DeMsFTXB8r+lcFNd9BgT6HxbA+JspeK5Zl+RJApDhP37tRZ7z8FCkGb5sd99F7 tOis8fNnPpmzdsivP6DY =rIiy -----END PGP SIGNATURE----- ------enig2BRQOLGEICLWVXUDNLJOL-- From owner-freebsd-x11@FreeBSD.ORG Mon Sep 9 13:53:02 2013 Return-Path: Delivered-To: freebsd-x11@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id E892CB14 for ; Mon, 9 Sep 2013 13:53:02 +0000 (UTC) (envelope-from jean-sebastien.pedron@dumbbell.fr) Received: from mail.made4.biz (unknown [IPv6:2001:41d0:1:7018::1:3]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id AC9C327E2 for ; Mon, 9 Sep 2013 13:53:02 +0000 (UTC) Received: from 141.7.19.93.rev.sfr.net ([93.19.7.141] helo=[192.168.1.179]) by mail.made4.biz with esmtpsa (TLSv1:DHE-RSA-CAMELLIA256-SHA:256) (Exim 4.80.1 (FreeBSD)) (envelope-from ) id 1VJ1tj-0006rX-K0; Mon, 09 Sep 2013 15:53:00 +0200 Message-ID: <522DD2BA.1080705@dumbbell.fr> Date: Mon, 09 Sep 2013 15:52:58 +0200 From: =?ISO-8859-1?Q?Jean-S=E9bastien_P=E9dron?= User-Agent: Mozilla/5.0 (Windows NT 6.1; rv:17.0) Gecko/20130801 Thunderbird/17.0.8 MIME-Version: 1.0 To: Ke Sun Subject: Re: unsupported synaptics touchpad References: <20130822155651.GA32146@probe.unige.ch> <52171DE6.7030909@FreeBSD.org> <20130823091753.GA21594@probe.unige.ch> <52175C5E.2080007@FreeBSD.org> <20130823150007.GA31164@probe.unige.ch> <521E3828.9000605@FreeBSD.org> <20130829143122.GA757@probe.unige.ch> <5220A94F.6030800@FreeBSD.org> <5227A575.90805@dumbbell.fr> <20130909120645.GA5517@probe.unige.ch> In-Reply-To: <20130909120645.GA5517@probe.unige.ch> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 8bit Cc: freebsd-x11@freebsd.org X-BeenThere: freebsd-x11@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: X11 on FreeBSD -- maintaining and support List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Sep 2013 13:53:03 -0000 Le 09/09/2013 14:06, Ke Sun a écrit : > Does that mean that I tap on the touchpad, and that I click the touchpad left > button, is exactly the same button to X? Yes, when synaptics_support is disabled, we can't distinguish a physical button from a tap. The only information received from the hardware is an event saying "the user clicked using button #1" (ie. left button). > It is possible to disable this button and use the right button for > left clicking by tunning xorg.conf? I don't think so, because the hardware is not configurable in this mode. From X.Org PoV, you could remap button #1 (left button) or button #3 (right button), but no matter what, the physical left button and the tap share the same number, #1. -- Jean-Sébastien Pédron From owner-freebsd-x11@FreeBSD.ORG Mon Sep 9 13:59:50 2013 Return-Path: Delivered-To: x11@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id BB675DC7; Mon, 9 Sep 2013 13:59:50 +0000 (UTC) (envelope-from c.kworr@gmail.com) Received: from mail-lb0-x22b.google.com (mail-lb0-x22b.google.com [IPv6:2a00:1450:4010:c04::22b]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id E13772845; Mon, 9 Sep 2013 13:59:49 +0000 (UTC) Received: by mail-lb0-f171.google.com with SMTP id u14so5024314lbd.16 for ; Mon, 09 Sep 2013 06:59:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=message-id:date:from:user-agent:mime-version:to:cc:subject :references:in-reply-to:content-type:content-transfer-encoding; bh=wq/+zoXyE9pBll164Lb2Fiw5UHxYFoz1Gj9I1DIVC/U=; b=v1hWKL8qLl2X6r5GDgqTmRneYUjbzb8RTJz+G1NyXZ1r8buZAWtH034380BrEhl7h6 XyGmUBIk/+P/eR7eaIUSU0fFNv2M/w1u3HXp+M/uePqsFYcdrJgPDLpSCqeLH1tTxtN1 Paugk07xF0g2rVvM5YAIrW8qcNj7K4YE8sbiti2VjBqaUnMZTZe0O0oPDGd+1SWS1kgQ hn2QLfmZ20+7ZH8/pcLvqjsF3JS6Nulh0LGxSQB+owCT4Fa2KT0IPwjyVH/qhyDbTo3U neAWRtuoYrcTwnpPvih5lDgAg9s1UW+X2NokpJ9TBMxVoMovtCv+X2BNHybVALiPMb0X RRsA== X-Received: by 10.112.156.103 with SMTP id wd7mr514844lbb.48.1378735187933; Mon, 09 Sep 2013 06:59:47 -0700 (PDT) Received: from [192.168.1.128] (mau.donbass.com. [92.242.127.250]) by mx.google.com with ESMTPSA id w10sm6029537lbv.6.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 09 Sep 2013 06:59:47 -0700 (PDT) Message-ID: <522DD451.9000100@gmail.com> Date: Mon, 09 Sep 2013 16:59:45 +0300 From: Volodymyr Kostyrko User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:17.0) Gecko/20130809 Thunderbird/17.0.8 MIME-Version: 1.0 To: x11@FreeBSD.org Subject: Re: [CFT] Update of xorg libraries and MESA References: <522DC3EB.4060607__24877.3824460388$1378732295$gmane$org@freebsd.org> In-Reply-To: <522DC3EB.4060607__24877.3824460388$1378732295$gmane$org@freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Cc: ports@FreeBSD.org, Niclas Zeising X-BeenThere: freebsd-x11@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: X11 on FreeBSD -- maintaining and support List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Sep 2013 13:59:50 -0000 09.09.2013 15:49, Niclas Zeising wrote: > [Cross-posted between x11@ and ports@, please respect reply-to] ^/releng/9, WITH_CLANG_IS_CC, CCACHE, WITH_NEW_XORG CC intel_fbo.lo cc: warning: argument unused during compilation: '-fno-builtin-memcmp' cc: warning: argument unused during compilation: '-fno-builtin-memcmp' intel_screen.c:199:6: error: use of undeclared identifier '__DRI_IMAGE_FOURCC_ARGB8888' { __DRI_IMAGE_FOURCC_ARGB8888, __DRI_IMAGE_COMPONENTS_RGBA, 1, ^ intel_screen.c:199:35: error: use of undeclared identifier '__DRI_IMAGE_COMPONENTS_RGBA' { __DRI_IMAGE_FOURCC_ARGB8888, __DRI_IMAGE_COMPONENTS_RGBA, 1, ^ intel_screen.c:202:6: error: use of undeclared identifier '__DRI_IMAGE_FOURCC_XRGB8888' { __DRI_IMAGE_FOURCC_XRGB8888, __DRI_IMAGE_COMPONENTS_RGB, 1, ^ intel_screen.c:202:35: error: use of undeclared identifier '__DRI_IMAGE_COMPONENTS_RGB' { __DRI_IMAGE_FOURCC_XRGB8888, __DRI_IMAGE_COMPONENTS_RGB, 1, ^ Is this intended to work on 9? -- Sphinx of black quartz, judge my vow. From owner-freebsd-x11@FreeBSD.ORG Mon Sep 9 14:02:30 2013 Return-Path: Delivered-To: x11@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id B59B0F85; Mon, 9 Sep 2013 14:02:30 +0000 (UTC) (envelope-from kwm@rainbow-runner.nl) Received: from fep20.mx.upcmail.net (fep20.mx.upcmail.net [62.179.121.40]) by mx1.freebsd.org (Postfix) with ESMTP id 9BC7128A2; Mon, 9 Sep 2013 14:02:29 +0000 (UTC) Received: from edge03.upcmail.net ([192.168.13.238]) by viefep20-int.chello.at (InterMail vM.8.01.05.05 201-2260-151-110-20120111) with ESMTP id <20130909140228.RHXC22126.viefep20-int.chello.at@edge03.upcmail.net>; Mon, 9 Sep 2013 16:02:28 +0200 Received: from [127.0.0.1] ([178.84.132.32]) by edge03.upcmail.net with edge id P22T1m02o0i5fp60322Uvl; Mon, 09 Sep 2013 16:02:28 +0200 X-SourceIP: 178.84.132.32 Message-ID: <522DD4E5.5030206@rainbow-runner.nl> Date: Mon, 09 Sep 2013 16:02:13 +0200 From: Koop Mast User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:17.0) Gecko/20130801 Thunderbird/17.0.8 MIME-Version: 1.0 To: Volodymyr Kostyrko Subject: Re: [CFT] Update of xorg libraries and MESA References: <522DC3EB.4060607__24877.3824460388$1378732295$gmane$org@freebsd.org> <522DD451.9000100@gmail.com> In-Reply-To: <522DD451.9000100@gmail.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-Antivirus: avast! (VPS 130909-0, 09-09-2013), Outbound message X-Antivirus-Status: Clean Cc: ports@FreeBSD.org, x11@FreeBSD.org, Niclas Zeising X-BeenThere: freebsd-x11@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: X11 on FreeBSD -- maintaining and support List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Sep 2013 14:02:30 -0000 On 9-9-2013 15:59, Volodymyr Kostyrko wrote: > 09.09.2013 15:49, Niclas Zeising wrote: >> [Cross-posted between x11@ and ports@, please respect reply-to] > > ^/releng/9, WITH_CLANG_IS_CC, CCACHE, WITH_NEW_XORG > > CC intel_fbo.lo > cc: warning: argument unused during compilation: '-fno-builtin-memcmp' > cc: warning: argument unused during compilation: '-fno-builtin-memcmp' > intel_screen.c:199:6: error: use of undeclared identifier > '__DRI_IMAGE_FOURCC_ARGB8888' > { __DRI_IMAGE_FOURCC_ARGB8888, __DRI_IMAGE_COMPONENTS_RGBA, 1, > ^ > intel_screen.c:199:35: error: use of undeclared identifier > '__DRI_IMAGE_COMPONENTS_RGBA' > { __DRI_IMAGE_FOURCC_ARGB8888, __DRI_IMAGE_COMPONENTS_RGBA, 1, > ^ > intel_screen.c:202:6: error: use of undeclared identifier > '__DRI_IMAGE_FOURCC_XRGB8888' > { __DRI_IMAGE_FOURCC_XRGB8888, __DRI_IMAGE_COMPONENTS_RGB, 1, > ^ > intel_screen.c:202:35: error: use of undeclared identifier > '__DRI_IMAGE_COMPONENTS_RGB' > { __DRI_IMAGE_FOURCC_XRGB8888, __DRI_IMAGE_COMPONENTS_RGB, 1, > ^ > Is this intended to work on 9? > You need to manual remove your old libGL and dri before updating to the new version, as mentioned in the UPDATING file. From owner-freebsd-x11@FreeBSD.ORG Mon Sep 9 14:43:27 2013 Return-Path: Delivered-To: x11@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id ACE4CAB8; Mon, 9 Sep 2013 14:43:27 +0000 (UTC) (envelope-from c.kworr@gmail.com) Received: from mail-la0-x22b.google.com (mail-la0-x22b.google.com [IPv6:2a00:1450:4010:c03::22b]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id D3A352B00; Mon, 9 Sep 2013 14:43:26 +0000 (UTC) Received: by mail-la0-f43.google.com with SMTP id ep20so5026391lab.16 for ; Mon, 09 Sep 2013 07:43:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=message-id:date:from:user-agent:mime-version:to:cc:subject :references:in-reply-to:content-type:content-transfer-encoding; bh=DhD8Mom1zH/8oLtOJYIGVcAgC51/4q6yRPkzMtqL8aA=; b=zH8SDM/j/cRns4a5H8aGRFgCAacMUhzvdDlTxVpPrDT8F2/gMQAXqIc4f0EYMsRuOm p/YW8o9AwM9OiFOO7qgJ2nHeER+lvQWm3u10ky78LOzHCQrk6s32tKeDF0LoW/jFA0Lz c1B6sVrIn+DrR/cGz1NGHuDmdjFfSOFocncjIhnAUMqykAcBCZ7cU2XEW37VbhorvVQU 2hxMCbMIkyaV9tqCzs5GpRUDzmd5+vut3mJWvAciEhA5By6w/6cvQ/uPvcdfYMZ7MVL8 x7HsKKSoaNjVmLArRRDvZ+rSzJYS/LP5NDOYRVPrdCmFqWee+g0OIkzfBRKeVpZ5zY7c PC/g== X-Received: by 10.112.167.66 with SMTP id zm2mr1138496lbb.46.1378737804742; Mon, 09 Sep 2013 07:43:24 -0700 (PDT) Received: from [192.168.1.128] (mau.donbass.com. [92.242.127.250]) by mx.google.com with ESMTPSA id w10sm6127137lbv.6.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 09 Sep 2013 07:43:24 -0700 (PDT) Message-ID: <522DDE8A.4030301@gmail.com> Date: Mon, 09 Sep 2013 17:43:22 +0300 From: Volodymyr Kostyrko User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:17.0) Gecko/20130809 Thunderbird/17.0.8 MIME-Version: 1.0 To: Koop Mast Subject: Re: [CFT] Update of xorg libraries and MESA References: <522DC3EB.4060607__24877.3824460388$1378732295$gmane$org@freebsd.org> <522DD451.9000100@gmail.com> <522DD4E5.5030206@rainbow-runner.nl> In-Reply-To: <522DD4E5.5030206@rainbow-runner.nl> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Cc: ports@FreeBSD.org, x11@FreeBSD.org, Niclas Zeising X-BeenThere: freebsd-x11@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: X11 on FreeBSD -- maintaining and support List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Sep 2013 14:43:27 -0000 09.09.2013 17:02, Koop Mast wrote: >> ^/releng/9, WITH_CLANG_IS_CC, CCACHE, WITH_NEW_XORG > > You need to manual remove your old libGL and dri before updating to the > new version, as mentioned in the UPDATING file. Oh, sorry.. I always mess the order of things. Thanks for a quick reply! And how about this one: ===> Applying extra patch extra-config_devd.c cat: extra-config_devd.c: No such file or directory I can't seem to find a patch in there anywhere. gmake[1]: Entering directory `/tmp/ports/usr/ports/x11-servers/xorg-server/work/xorg-server-1.12.4/config' gmake[1]: *** No rule to make target `devd.c', needed by `devd.lo'. Stop. gmake[1]: Leaving directory `/tmp/ports/usr/ports/x11-servers/xorg-server/work/xorg-server-1.12.4/config' gmake: *** [all-recursive] Error 1 *** [do-build] Error code 1 --- x11-ervers/xorg-server/Makefile 2013-09-09 17:42:06.005017508 +0300 +++ x11-ervers/xorg-server/Makefile 2013-09-09 17:40:08.468020532 +0300 @@ -108,7 +108,7 @@ .endif .if ${PORT_OPTIONS:MDEVD} -EXTRA_PATCHES+= extra-config_devd.c +EXTRA_PATCHES+= ${FILESDIR}/extra-config_devd.c .endif .if ${PORT_OPTIONS:MAIGLX} -- Sphinx of black quartz, judge my vow. From owner-freebsd-x11@FreeBSD.ORG Mon Sep 9 14:48:58 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 ESMTP id 856C4D99 for ; Mon, 9 Sep 2013 14:48:58 +0000 (UTC) (envelope-from zeising@freebsd.org) Received: from mail.lysator.liu.se (mail.lysator.liu.se [IPv6:2001:6b0:17:f0a0::3]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 36ACC2B42 for ; Mon, 9 Sep 2013 14:48:58 +0000 (UTC) Received: from mail.lysator.liu.se (localhost [127.0.0.1]) by mail.lysator.liu.se (Postfix) with ESMTP id 9B84B40036 for ; Mon, 9 Sep 2013 16:48:55 +0200 (CEST) Received: by mail.lysator.liu.se (Postfix, from userid 1004) id 90B3E40033; Mon, 9 Sep 2013 16:48:55 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on bernadotte.lysator.liu.se X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=AWL autolearn=disabled version=3.3.1 X-Spam-Score: 0.0 Received: from mx.daemonic.se (unknown [94.254.45.105]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.lysator.liu.se (Postfix) with ESMTPSA id 10D2040030; Mon, 9 Sep 2013 16:48:54 +0200 (CEST) Received: from mailscanner.daemonic.se (mailscanner.daemonic.se [IPv6:2001:470:dca9:0:1::6]) by mx.daemonic.se (Postfix) with ESMTPS id 3cYXLt5XBWz8hVm; Mon, 9 Sep 2013 16:48:54 +0200 (CEST) X-Virus-Scanned: amavisd-new at daemonic.se Received: from mx.daemonic.se ([10.1.0.3]) (using TLS with cipher CAMELLIA256-SHA) by mailscanner.daemonic.se (mailscanner.daemonic.se [10.1.0.6]) (amavisd-new, port 10025) with ESMTPS id ka84L5wkRzna; Mon, 9 Sep 2013 16:48:52 +0200 (CEST) Received: from mail.daemonic.se (mail.daemonic.se [IPv6:2001:470:dca9:0:1::4]) by mx.daemonic.se (Postfix) with ESMTPS id 3cYXLr4sG1z8hVt; Mon, 9 Sep 2013 16:48:52 +0200 (CEST) Received: from vivi.daemonic.se (vivi.daemonic.se [10.32.0.4]) by mail.daemonic.se (Postfix) with ESMTPSA id 3cYXLr4JVcz9Ctq; Mon, 9 Sep 2013 16:48:52 +0200 (CEST) Message-ID: <522DDFD4.6030607@freebsd.org> Date: Mon, 09 Sep 2013 16:48:52 +0200 From: Niclas Zeising User-Agent: Mutt/1.5.21 MIME-Version: 1.0 To: Volodymyr Kostyrko Subject: Re: [CFT] Update of xorg libraries and MESA References: <522DC3EB.4060607__24877.3824460388$1378732295$gmane$org@freebsd.org> <522DD451.9000100@gmail.com> <522DD4E5.5030206@rainbow-runner.nl> <522DDE8A.4030301@gmail.com> In-Reply-To: <522DDE8A.4030301@gmail.com> X-Enigmail-Version: 1.5.1 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Virus-Scanned: ClamAV using ClamSMTP Cc: x11@FreeBSD.org X-BeenThere: freebsd-x11@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: X11 on FreeBSD -- maintaining and support List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Sep 2013 14:48:58 -0000 On 09/09/13 16:43, Volodymyr Kostyrko wrote: > 09.09.2013 17:02, Koop Mast wrote: >>> ^/releng/9, WITH_CLANG_IS_CC, CCACHE, WITH_NEW_XORG >> >> You need to manual remove your old libGL and dri before updating to the >> new version, as mentioned in the UPDATING file. > > Oh, sorry.. I always mess the order of things. Thanks for a quick reply! > > And how about this one: > > ===> Applying extra patch extra-config_devd.c > cat: extra-config_devd.c: No such file or directory > I can't seem to find a patch in there anywhere. > > gmake[1]: Entering directory > `/tmp/ports/usr/ports/x11-servers/xorg-server/work/xorg-server-1.12.4/config' > > gmake[1]: *** No rule to make target `devd.c', needed by `devd.lo'. Stop. > gmake[1]: Leaving directory > `/tmp/ports/usr/ports/x11-servers/xorg-server/work/xorg-server-1.12.4/config' > > gmake: *** [all-recursive] Error 1 > *** [do-build] Error code 1 > > --- x11-ervers/xorg-server/Makefile 2013-09-09 17:42:06.005017508 +0300 > +++ x11-ervers/xorg-server/Makefile 2013-09-09 17:40:08.468020532 +0300 > @@ -108,7 +108,7 @@ > .endif > > .if ${PORT_OPTIONS:MDEVD} > -EXTRA_PATCHES+= extra-config_devd.c > +EXTRA_PATCHES+= ${FILESDIR}/extra-config_devd.c > .endif > > .if ${PORT_OPTIONS:MAIGLX} > You are right, sorry about that. Patch will be updated shortly! Regards! -- Niclas Zeising From owner-freebsd-x11@FreeBSD.ORG Mon Sep 9 14:53:01 2013 Return-Path: Delivered-To: x11@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 213B8EC1; Mon, 9 Sep 2013 14:53:01 +0000 (UTC) (envelope-from zeising@freebsd.org) Received: from mail.lysator.liu.se (mail.lysator.liu.se [IPv6:2001:6b0:17:f0a0::3]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 6F18D2B9B; Mon, 9 Sep 2013 14:52:59 +0000 (UTC) Received: from mail.lysator.liu.se (localhost [127.0.0.1]) by mail.lysator.liu.se (Postfix) with ESMTP id B5DF940029; Mon, 9 Sep 2013 16:52:57 +0200 (CEST) Received: by mail.lysator.liu.se (Postfix, from userid 1004) id A767440030; Mon, 9 Sep 2013 16:52:57 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on bernadotte.lysator.liu.se X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=AWL,T_FRT_LOLITA1 autolearn=disabled version=3.3.1 X-Spam-Score: 0.0 Received: from mx.daemonic.se (mx.daemonic.se [IPv6:2001:470:dca9:0:1::3]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.lysator.liu.se (Postfix) with ESMTPSA id 9DF7940029; Mon, 9 Sep 2013 16:52:46 +0200 (CEST) Received: from mailscanner.daemonic.se (mailscanner.daemonic.se [IPv6:2001:470:dca9:0:1::6]) by mx.daemonic.se (Postfix) with ESMTPS id 3cYXRL1hpNz8hVn; Mon, 9 Sep 2013 16:52:46 +0200 (CEST) X-Virus-Scanned: amavisd-new at daemonic.se Received: from mx.daemonic.se ([10.1.0.3]) (using TLS with cipher CAMELLIA256-SHA) by mailscanner.daemonic.se (mailscanner.daemonic.se [10.1.0.6]) (amavisd-new, port 10025) with ESMTPS id b8jE5m7X2Xt8; Mon, 9 Sep 2013 16:52:21 +0200 (CEST) Received: from mail.daemonic.se (mail.daemonic.se [IPv6:2001:470:dca9:0:1::4]) by mx.daemonic.se (Postfix) with ESMTPS id 3cYXQr75Jzz8hVm; Mon, 9 Sep 2013 16:52:20 +0200 (CEST) Received: from vivi.daemonic.se (vivi.daemonic.se [10.32.0.4]) by mail.daemonic.se (Postfix) with ESMTPSA id 3cYXQr6H0Nz9Ctj; Mon, 9 Sep 2013 16:52:20 +0200 (CEST) Message-ID: <522DE093.9080504@freebsd.org> Date: Mon, 09 Sep 2013 16:52:03 +0200 From: Niclas Zeising User-Agent: Mutt/1.5.21 MIME-Version: 1.0 To: x11@FreeBSD.org Subject: Re: [CFT] Update of xorg libraries and MESA References: <522DC3EB.4060607@freebsd.org> In-Reply-To: <522DC3EB.4060607@freebsd.org> X-Enigmail-Version: 1.5.1 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="----enig2QIVQNBKKMGPHGEVFEPQF" X-Virus-Scanned: ClamAV using ClamSMTP X-Mailman-Approved-At: Mon, 09 Sep 2013 15:37:30 +0000 Cc: ports@FreeBSD.org X-BeenThere: freebsd-x11@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: X11 on FreeBSD -- maintaining and support List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Sep 2013 14:53:01 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) ------enig2QIVQNBKKMGPHGEVFEPQF Content-Type: multipart/mixed; boundary="------------000902030408090803050609" This is a multi-part message in MIME format. --------------000902030408090803050609 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable On 09/09/13 14:49, Niclas Zeising wrote: > [Cross-posted between x11@ and ports@, please respect reply-to] >=20 > Hi! > It is time once again to update parts of the FreeBSD xorg stack, and th= e > x11@ team needs YOUR help in testing! >=20 > The attached patch, also available in the latest updated version at > http://people.freebsd.org/~zeising/xorg-mesaupdate.diff > updates various xorg related libraries and drivers, most of this is > visible for all users of xorg. > xorg-server now has the possibility to use devd instead of hal for > autoconfiguration. > It also updates the MESA stack (libGL, dri) and libdrm for users of the= > new xorg stack (WITH_NEW_XORG=3D). > Last, but definitely not least, it enables KMS for ati graphics cards, > if you have the latest current, and compile with WITH_NEW_XORG=3D. >=20 > It also contains a shlib version bumb of pixman, and ports depending on= > pixman. Be aware of this when updating pixman. >=20 > Please test this on as many platforms and versions of FreeBSD as > possible, both the old and new stack, so that we can try to avoid any > regressions or other issues. The plan is to have this in the ports tre= e > in a few weeks, at the most. >=20 > To use the patch, check out the ports tree, preferably using svn and > apply the patch using svn patch /path/to/patch. It should be possible > to apply the patch using patch as well, but this is not tested. > After the patch is applied, recompile the updated ports. See UPDATING > for further instructions regarding libGL, dri and pixman. This is > important! >=20 > Please let us know of any issues, or if everything is working without a= > hitch. >=20 > For more information, see https://wiki.freebsd.org/Graphics and > https://wiki.freebsd.org/Xorg , or come talk to us in > #freebsd-xorg@EFNet on IRC. >=20 > Regards! >=20 Hi! There was a mistake in the previous patch, which made the build of xorg-server fail. The patch has been updated, and the updated version is attached. As always, it is possible to find the latest version of the patch at http://people.freebsd.org/~zeising/xorg-mesaupdate.diff Sorry for the inconvenience! Regards! --=20 Niclas Zeising FreeBSD x11@ team --------------000902030408090803050609 Content-Type: text/x-patch; name="xorg-mesaupdate.diff" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="xorg-mesaupdate.diff" Index: Mk/bsd.port.mk =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- Mk/bsd.port.mk (revision 326808) +++ Mk/bsd.port.mk (working copy) @@ -350,7 +350,7 @@ # MAKE_ENV are extended with a DISPLAY variable. # # USE_GL - A list of Mesa or GL related dependencies needed by the port= =2E -# Supported components are: glut, glu, glw, and gl. +# Supported components are: egl, glesv2, glut, glu, glw, and gl. # If set to "yes", this is equivalent to "glu". Note that # glew and glut depend on glu, glw and glu depend on gl. ## @@ -1882,13 +1882,15 @@ =20 PKG_IGNORE_DEPENDS?=3D 'this_port_does_not_exist' =20 -_GL_gl_LIB_DEPENDS=3D GL.1:${PORTSDIR}/graphics/libGL +_GL_glesv2_LIB_DEPENDS=3D libGLESv2.so:${PORTSDIR}/grahpics/libglesv2 +_GL_egl_LIB_DEPENDS=3D libEGL.so:${PORTSDIR}/graphics/libEGL +_GL_gl_LIB_DEPENDS=3D libGL.so:${PORTSDIR}/graphics/libGL _GL_gl_USE_XORG=3D glproto dri2proto -_GL_glew_LIB_DEPENDS=3D GLEW.1:${PORTSDIR}/graphics/glew -_GL_glu_LIB_DEPENDS=3D GLU.1:${PORTSDIR}/graphics/libGLU +_GL_glew_LIB_DEPENDS=3D libGLEW.so:${PORTSDIR}/graphics/glew +_GL_glu_LIB_DEPENDS=3D libGLU.so:${PORTSDIR}/graphics/libGLU _GL_glu_USE_XORG=3D glproto dri2proto -_GL_glw_LIB_DEPENDS=3D GLw.1:${PORTSDIR}/graphics/libGLw -_GL_glut_LIB_DEPENDS=3D glut.12:${PORTSDIR}/graphics/freeglut +_GL_glw_LIB_DEPENDS=3D libGLw.so:${PORTSDIR}/graphics/libGLw +_GL_glut_LIB_DEPENDS=3D libglut.so:${PORTSDIR}/graphics/freeglut =20 .if defined(USE_GL) . if ${USE_GL:L} =3D=3D "yes" Index: UPDATING =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- UPDATING (revision 326808) +++ UPDATING (working copy) @@ -5,6 +5,33 @@ You should get into the habit of checking this file for changes each tim= e you update your ports collection, before attempting any port upgrades. =20 +201309xx: + AFFECTS: users of x11/pixman + AUTHOR: zeising@FreeBSD.org + + The library version of x11/pixman has changed, and portrevision has + been bumped in all dependent ports. If you have external software tha= t + depends on pixman, this software needs to be recompiled. + To recompile all software dependent on pixman, run: + =20 + # portmaster -r pixman + or + # portupgrade -rf pixman + +201309xx: + AFFECTS: users of graphics/libGL, graphics/dri and other MESA ports + AUTHOR: zeising@FreeBSD.org + + The graphics/libGL, graphics/dri and related MESA ports have been + updated to 9.1 when compiled with WITH_NEW_XORG=3D set. It is necessa= ry + to remove the old versions of both ports before updating. + + # pkg_delete -f libGl-\* dri-\* + or + # pkg delete -f libGL dri + followed by + # portmaster -a + 20130904: AFFECTS: 10-CURRENT users with any port depending on converters/libico= nv AUTHOR: madpilot@FreeBSD.org @@ -553,7 +580,7 @@ settings in rc.conf prior to restarting postgrey. =20 20130525: - AFFECTS: users of x11/xorg and all X.Org ports + AFFECTS: users of x11/xorg and all xorg ports AUTHOR: zeising@FreeBSD.org =20 X.Org, including libraries and some drivers, was updated. If you are Index: astro/viking/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- astro/viking/Makefile (revision 326808) +++ astro/viking/Makefile (working copy) @@ -3,6 +3,7 @@ =20 PORTNAME=3D viking PORTVERSION=3D 1.4.2 +PORTREVISION=3D 1 CATEGORIES=3D astro MASTER_SITES=3D SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}/ =20 Index: cad/pdnmesh/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- cad/pdnmesh/Makefile (revision 326808) +++ cad/pdnmesh/Makefile (working copy) @@ -3,7 +3,7 @@ =20 PORTNAME=3D pdnmesh PORTVERSION=3D 0.2.2 -PORTREVISION=3D 2 +PORTREVISION=3D 3 CATEGORIES=3D cad MASTER_SITES=3D SF/${PORTNAME}/${PORTNAME}-source/${PORTVERSION} =20 Index: cad/repsnapper/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- cad/repsnapper/Makefile (revision 326808) +++ cad/repsnapper/Makefile (working copy) @@ -3,6 +3,7 @@ =20 PORTNAME=3D repsnapper PORTVERSION=3D 2.2.0b3 +PORTREVISION=3D 1 CATEGORIES=3D cad MASTER_SITES=3D https://codeload.github.com/timschmidt/repsnapper/tar.gz= / DISTNAME=3D ${PORTVERSION} Index: deskutils/pinot/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- deskutils/pinot/Makefile (revision 326808) +++ deskutils/pinot/Makefile (working copy) @@ -3,7 +3,7 @@ =20 PORTNAME=3D pinot PORTVERSION=3D 1.06 -PORTREVISION=3D 1 +PORTREVISION=3D 2 CATEGORIES=3D deskutils MASTER_SITES=3D ${MASTER_SITE_GOOGLE_CODE} #MASTER_SITES=3D http://colinf.chez.com/pinot/ Index: devel/xorg-macros/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- devel/xorg-macros/Makefile (revision 326808) +++ devel/xorg-macros/Makefile (working copy) @@ -2,7 +2,7 @@ # $FreeBSD$ =20 PORTNAME=3D xorg-macros -PORTVERSION=3D 1.17 +PORTVERSION=3D 1.17.1 CATEGORIES=3D devel x11 DISTNAME=3D util-macros-$(PORTVERSION) =20 Index: devel/xorg-macros/distinfo =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- devel/xorg-macros/distinfo (revision 326808) +++ devel/xorg-macros/distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (xorg/util/util-macros-1.17.tar.bz2) =3D 7d79edde72fc17dcdc56cfbe= 2f8ff384d1bffd1d8c58c0fd25970f5b2ccb75ed -SIZE (xorg/util/util-macros-1.17.tar.bz2) =3D 77029 +SHA256 (xorg/util/util-macros-1.17.1.tar.bz2) =3D 5e52654f2a0b04223cf28a= 9d7fd62cf288852e639ac13a75172fd47d0d6ac625 +SIZE (xorg/util/util-macros-1.17.1.tar.bz2) =3D 79105 Index: emulators/catapult/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- emulators/catapult/Makefile (revision 326808) +++ emulators/catapult/Makefile (working copy) @@ -3,7 +3,7 @@ =20 PORTNAME=3D catapult PORTVERSION=3D 0.9.1 -PORTREVISION=3D 1 +PORTREVISION=3D 2 CATEGORIES=3D emulators MASTER_SITES=3D SF/openmsx/openmsx/${PORTVERSION} DISTNAME=3D openmsx-${PORTNAME}-${PORTVERSION} @@ -32,8 +32,7 @@ USE_GNOME=3D gdkpixbuf2 glib20 gtk20 libxml2 USE_WX=3D 2.6+ USE_PYTHON_BUILD=3Dyes -USE_GMAKE=3D yes -USES=3D gettext iconv +USES=3D gettext gmake iconv USE_XORG=3D ice pixman sm x11 xau xcb xcomposite xcursor xdamage xdmcp \= xext xfixes xi xinerama xrandr xrender xxf86vm MAKEFILE=3D GNUmakefile Index: emulators/qemu-devel/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- emulators/qemu-devel/Makefile (revision 326808) +++ emulators/qemu-devel/Makefile (working copy) @@ -3,7 +3,7 @@ =20 PORTNAME=3D qemu PORTVERSION=3D 1.6.0 -PORTREVISION=3D 1 +PORTREVISION=3D 2 CATEGORIES=3D emulators MASTER_SITES=3D http://wiki.qemu.org/download/:release \ LOCAL/nox:snapshot @@ -14,13 +14,12 @@ MAINTAINER=3D nox@FreeBSD.org COMMENT=3D QEMU CPU Emulator - development version =20 -LIB_DEPENDS=3D pixman-1:${PORTSDIR}/x11/pixman - HAS_CONFIGURE=3D yes USE_BZIP2=3D yes USES=3D gmake pkgconfig bison USE_PERL5_BUILD=3D yes USE_PYTHON_BUILD=3D -2.7 +USE_XORG=3D pixman USE_GNOME+=3D glib20 PATCH_STRIP=3D -p1 MAKE_ENV+=3D BSD_MAKE=3D"${MAKE}" Index: emulators/tme/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- emulators/tme/Makefile (revision 326808) +++ emulators/tme/Makefile (working copy) @@ -3,7 +3,7 @@ =20 PORTNAME=3D tme PORTVERSION=3D 0.8 -PORTREVISION=3D 1 +PORTREVISION=3D 2 CATEGORIES=3D emulators MASTER_SITES=3D http://people.csail.mit.edu/fredette/tme/ =20 @@ -21,9 +21,8 @@ expat:${PORTSDIR}/textproc/expat2 \ fontconfig:${PORTSDIR}/x11-fonts/fontconfig =20 -USES=3D pkgconfig gettext iconv perl5 +USES=3D pkgconfig gettext gmake iconv perl5 USE_GNOME=3D gdkpixbuf2 gtk20 -USE_GMAKE=3D yes USE_AUTOTOOLS=3D libtool libltdl CONFIGURE_ENV=3D ac_cv_have_isinff=3Dno CONFIGURE_ARGS=3D --datadir=3D${WRKDIR}/tmproot --disable-warnings Index: games/klavaro/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- games/klavaro/Makefile (revision 326808) +++ games/klavaro/Makefile (working copy) @@ -3,7 +3,7 @@ =20 PORTNAME=3D klavaro PORTVERSION=3D 1.9.6 -PORTREVISION=3D 1 +PORTREVISION=3D 2 CATEGORIES=3D games MASTER_SITES=3D SF/${PORTNAME}/ =20 @@ -22,9 +22,8 @@ fontconfig:${PORTSDIR}/x11-fonts/fontconfig \ gtkdatabox:${PORTSDIR}/x11-toolkits/gtkdatabox =20 -USES=3D pkgconfig gettext iconv +USES=3D pkgconfig gettext gmake iconv USE_BZIP2=3D yes -USE_GMAKE=3D yes USE_XORG=3D pixman x11 xau xcb xcomposite xcursor xdamage xdmcp xext \ xfixes xi xinerama xrandr xrender USE_GNOME=3D gtk20 Index: graphics/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/Makefile (revision 326808) +++ graphics/Makefile (working copy) @@ -484,6 +484,7 @@ SUBDIR +=3D leptonica SUBDIR +=3D lfview SUBDIR +=3D lib3ds + SUBDIR +=3D libEGL SUBDIR +=3D libGL SUBDIR +=3D libGLU SUBDIR +=3D libGLw @@ -505,6 +506,7 @@ SUBDIR +=3D libgeotiff SUBDIR +=3D libgfx SUBDIR +=3D libggi + SUBDIR +=3D libglesv2 SUBDIR +=3D libgltext SUBDIR +=3D libgnomecanvas SUBDIR +=3D libgnomecanvas-reference Index: graphics/cairo/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/cairo/Makefile (revision 326808) +++ graphics/cairo/Makefile (working copy) @@ -4,7 +4,7 @@ =20 PORTNAME=3D cairo PORTVERSION=3D 1.10.2 -PORTREVISION=3D 5 +PORTREVISION=3D 6 PORTEPOCH?=3D 2 CATEGORIES=3D graphics MASTER_SITES=3D http://cairographics.org/releases/ Index: graphics/dri/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/dri/Makefile (revision 326808) +++ graphics/dri/Makefile (working copy) @@ -9,55 +9,76 @@ =20 COMMENT=3D OpenGL hardware acceleration drivers for the DRI =20 -LIB_DEPENDS=3D drm:${PORTSDIR}/graphics/libdrm \ - expat:${PORTSDIR}/textproc/expat2 +LIB_DEPENDS=3D libdrm.so:${PORTSDIR}/graphics/libdrm \ + libexpat.so:${PORTSDIR}/textproc/expat2 =20 USES=3D pkgconfig USE_XORG=3D glproto x11 xext xxf86vm xdamage xfixes dri2proto =20 +.include + +# gcc from base can't handle some code in mesa 9.1+ +# We only care for 9.x and 8.x, not for old pre-clang default current. +# This is for 0b0000 binary which gcc 4.3+ understands and is in the i96= 5 driver. +.if defined(WITH_NEW_XORG) +. if ${OSVERSION} >=3D 901000 && ${OSVERSION} < 902502 \ + && (${ARCH} =3D=3D i386 || ${ARCH} =3D=3D amd64) +CC=3Dclang +CXX=3Dclang++ +CPP=3Dclang-cpp +. elif ${OSVERSION} < 901500 +USE_GCC=3Dyes +. endif +.endif + +.if ${ARCH} =3D=3D ia64 +#BROKEN=3D does not install on ia64 +.endif + ALL_DRI_DRIVERS=3DI915 I965 R200 RADEON SWRAST =20 -.if ! defined(WITH_NEW_XORG) +.if !defined(WITH_NEW_XORG) ALL_DRI_DRIVERS+=3DI810 MACH64 MGA R128 R300 R600 SAVAGE SIS TDFX UNICHR= OME .endif =20 .include "${.CURDIR}/../../graphics/libGL/bsd.mesalib.mk" =20 -OPTIONS_DEFINE_i386=3D ${ALL_DRI_DRIVERS} -OPTIONS_DEFINE_amd64=3D ${OPTIONS_DEFINE_i386} +PLIST_SUB+=3D VERSION=3D${MESADISTVERSION} =20 -.if defined(WITH_NEW_XORG) -OPTIONS_DEFINE_powerpc=3D RADEON SWRAST -OPTIONS_DEFINE_sparc64=3D RADEON SWRAST -.else -OPTIONS_DEFINE_powerpc=3D MACH64 RADEON SWRAST TDFX -OPTIONS_DEFINE_sparc64=3D MACH64 RADEON SWRAST +.if ${ARCH} =3D=3D amd64 || ${ARCH} =3D=3D i386 +DRI_DRIVERS=3D ${ALL_DRI_DRIVERS} .endif =20 -OPTIONS_DEFAULT=3D${OPTIONS_DEFINE} +.if defined(WITH_NEW_XORG) +. if defined(WITH_GALLIUM) && (${ARCH} =3D=3D i386 || ${ARCH} =3D=3D amd= 64) +BUILD_DEPENDS+=3D llvm-config33:${PORTSDIR}/devel/llvm33 +RUN_DEPENDS+=3D llvm-config33:${PORTSDIR}/devel/llvm33 +CONFIGURE_ENV+=3D LLVM_CONFIG=3D${LOCALBASE}/bin/llvm-config33 =20 -I810_DESC=3D Include DRI support for Intel i810 -I915_DESC=3D Include DRI support for Intel i915 -I965_DESC=3D Include DRI support for Intel i965 -MACH64_DESC=3D Include DRI support for AMD/ATI Mach64 -MGA_DESC=3D Include DRI support for Matrox -R128_DESC=3D Include DRI support for AMD/ATI R128 -R200_DESC=3D Include DRI support for AMD/ATI R200 -R300_DESC=3D Include DRI support for AMD/ATI R300 -R600_DESC=3D Include DRI support for AMD/ATI R600 -RADEON_DESC=3D Include DRI support for AMD/ATI RADEON -SAVAGE_DESC=3D Include DRI support for S3/Via Savage -SIS_DESC=3D Include DRI support for SiS 300 and 6326 -SWRAST_DESC=3D Include generic software DRI support -TDFX_DESC=3D Include DRI support for 3dfx Voodoo -UNICHROME_DESC=3D Include DRI support for S3/Via Unichrome +CONFIGURE_ARGS+=3D--enable-gallium-llvm --disable-gallium-egl =20 -.include +CONFIGURE_ARGS+=3D--with-gallium-drivers=3Dr300,r600,radeonsi,svga,swras= t +PLIST_SUB+=3D GALLIUM=3D"" +. else +CONFIGURE_ARGS+=3D--enable-gallium-llvm=3Dno --without-gallium-drivers +PLIST_SUB+=3D GALLIUM=3D"@comment " +. endif +. if ${ARCH} =3D=3D powerpc || ${ARCH} =3D=3D ia64 +DRI_DRIVERS=3D RADEON SWRAST +. endif +. if ${ARCH} =3D=3D sparc64 +DRI_DRIVERS=3D SWRAST +. endif +.else # !defined(WITH_NEW_XORG) +. if ${ARCH} =3D=3D powerpc +DRI_DRIVERS=3D MACH64 RADEON SWRAST TDFX +. elif ${ARCH} =3D=3D sparc64 +DRI_DRIVERS=3D MACH64 RADEON SWRAST +. endif +.endif # defined(WITH_NEW_XORG) =20 -DRI_DRIVERS=3D .for _d in ${ALL_DRI_DRIVERS} -.if ${PORT_OPTIONS:M${_d}} -DRI_DRIVERS+=3D ${_d} +.if ${DRI_DRIVERS:M${_d}} PLIST_SUB+=3D ${_d}_DRIVER=3D"" .else PLIST_SUB+=3D ${_d}_DRIVER=3D"@comment " @@ -64,16 +85,31 @@ .endif .endfor =20 -.if ${ARCH} =3D=3D "ia64" -BROKEN=3D does not install on ia64 -.endif - -.if !(${ARCH} =3D=3D "amd64" || ${ARCH} =3D=3D "i386") +.if !(${ARCH} =3D=3D amd64 || ${ARCH} =3D=3D i386) CONFIGURE_ARGS+=3D--disable-gallium-intel .endif CONFIGURE_ARGS+=3D--with-dri-drivers=3D"${DRI_DRIVERS:L}" =20 +.if defined(WITH_NEW_XORG) && !defined(WITH_GALLIUM) \ + && (${ARCH} =3D=3D i386 || ${ARCH} =3D=3D amd64) +pre-everything:: + @${ECHO_MSG} "" + @${ECHO_MSG} "For r300, r600, radeonsi and swrast gallium based drivers= =2E" + @${ECHO_MSG} "Please define WITH_GALLIUM in /etc/make.conf" + @${ECHO_MSG} "Note that gallium support is highly experimental." + @${ECHO_MSG} "" +.endif + do-install: +.if !defined(WITH_NEW_XORG) cd ${WRKSRC}/src/mesa; ${GMAKE} install-dri +.else + cd ${WRKSRC}/src/mesa/libdricore; ${GMAKE} install + cd ${WRKSRC}/src/mesa/drivers/dri; ${GMAKE} install +. if defined(WITH_GALLIUM) && (${ARCH} =3D=3D i386 || ${ARCH} =3D=3D amd= 64) + cd ${WRKSRC}/src/gallium/drivers/radeon; ${GMAKE} install + cd ${WRKSRC}/src/gallium/targets; ${GMAKE} install +. endif +.endif =20 .include Index: graphics/dri/pkg-plist =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/dri/pkg-plist (revision 326808) +++ graphics/dri/pkg-plist (working copy) @@ -1,19 +1,38 @@ +%%NEW%%%%I965_DRIVER%%etc/drirc include/GL/internal/dri_interface.h %%OLD%%%%I810_DRIVER%%lib/dri/i810_dri.so +%%NEW%%%%I915_DRIVER%%lib/dri/i915_dri.la %%I915_DRIVER%%lib/dri/i915_dri.so +%%NEW%%%%I965_DRIVER%%lib/dri/i965_dri.la %%I965_DRIVER%%lib/dri/i965_dri.so %%OLD%%%%MACH64_DRIVER%%lib/dri/mach64_dri.so %%OLD%%%%MGA_DRIVER%%lib/dri/mga_dri.so %%OLD%%%%R128_DRIVER%%lib/dri/r128_dri.so +%%NEW%%%%R200_DRIVER%%lib/dri/r200_dri.la %%R200_DRIVER%%lib/dri/r200_dri.so %%OLD%%%%R300_DRIVER%%lib/dri/r300_dri.so +%%NEW%%%%GALLIUM%%lib/dri/r300_dri.la +%%NEW%%%%GALLIUM%%lib/dri/r300_dri.so %%OLD%%%%R600_DRIVER%%lib/dri/r600_dri.so +%%NEW%%%%GALLIUM%%lib/dri/r600_dri.la +%%NEW%%%%GALLIUM%%lib/dri/r600_dri.so +%%NEW%%%%RADEON_DRIVER%%lib/dri/radeon_dri.la %%RADEON_DRIVER%%lib/dri/radeon_dri.so +%%NEW%%%%GALLIUM%%lib/dri/radeonsi_dri.la +%%NEW%%%%GALLIUM%%lib/dri/radeonsi_dri.so %%OLD%%%%SAVAGE_DRIVER%%lib/dri/savage_dri.so %%OLD%%%%SIS_DRIVER%%lib/dri/sis_dri.so +%%NEW%%%%SWRAST_DRIVER%%lib/dri/swrast_dri.la %%SWRAST_DRIVER%%lib/dri/swrast_dri.so %%OLD%%%%TDFX_DRIVER%%lib/dri/tdfx_dri.so %%OLD%%%%UNICHROME_DRIVER%%lib/dri/unichrome_dri.so +%%NEW%%%%GALLIUM%%lib/dri/vmwgfx_dri.la +%%NEW%%%%GALLIUM%%lib/dri/vmwgfx_dri.so +%%NEW%%lib/libdricore%%VERSION%%.la +%%NEW%%lib/libdricore%%VERSION%%.so +%%NEW%%lib/libdricore%%VERSION%%.so.1 +%%NEW%%%%GALLIUM%%lib/libllvmradeon%%VERSION%%.la +%%NEW%%%%GALLIUM%%lib/libllvmradeon%%VERSION%%.so libdata/pkgconfig/dri.pc @dirrm lib/dri @dirrmtry include/GL/internal Index: graphics/libEGL/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libEGL/Makefile (revision 0) +++ graphics/libEGL/Makefile (working copy) @@ -0,0 +1,30 @@ +# Created by: kwm@FreeBSD.org +# $FreeBSD$ + +PORTNAME=3D libEGL +PORTVERSION=3D ${MESAVERSION} +CATEGORIES=3D graphics + +COMMENT=3D OpenEGL library + +LIB_DEPENDS+=3D libpthread-stubs.so:${PORTSDIR}/devel/libpthread-stubs + +.if ! defined(WITH_NEW_XORG) +IGNORE=3D Please enable WITH_NEW_XORG, libEGL needs libdrm higher then = 2.4.24 +.endif + +USE_XORG=3D x11 xau xcb xdmcp + +# stuff not needed by libEGL but configure wants it +USE_XORG+=3D glproto dri2proto xext xdamage xfixes +LIB_DEPENDS+=3D libexpat.so:${PORTSDIR}/textproc/expat2 \ + libdrm.so:${PORTSDIR}/graphics/libdrm + +BUILD_WKRSRC=3D ${WRKSRC}/src/egl +INSTALL_WRKSRC=3D ${WRKSRC}/src/egl + +WITH_NEW_XORG=3D yes + +.include +.include "${.CURDIR}/../../graphics/libGL/bsd.mesalib.mk" +.include Property changes on: graphics/libEGL/Makefile ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +FreeBSD=3D%H \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: graphics/libEGL/pkg-descr =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libEGL/pkg-descr (revision 0) +++ graphics/libEGL/pkg-descr (working copy) @@ -0,0 +1,3 @@ +This package contains the EGL utility library. + +WWW: http://www.freedesktop.org/Software/xorg Property changes on: graphics/libEGL/pkg-descr ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Index: graphics/libEGL/pkg-plist =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libEGL/pkg-plist (revision 0) +++ graphics/libEGL/pkg-plist (working copy) @@ -0,0 +1,11 @@ +include/EGL/egl.h +include/EGL/eglext.h +include/EGL/eglmesaext.h +include/EGL/eglplatform.h +include/KHR/khrplatform.h +lib/libEGL.la +lib/libEGL.so +lib/libEGL.so.1 +libdata/pkgconfig/egl.pc +@dirrmtry include/KHR +@dirrmtry include/EGL Property changes on: graphics/libEGL/pkg-plist ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: graphics/libGL/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/Makefile (revision 326808) +++ graphics/libGL/Makefile (working copy) @@ -3,14 +3,13 @@ =20 PORTNAME=3D libGL PORTVERSION=3D ${MESAVERSION} -PORTREVISION=3D 4 +PORTREVISION=3D ${LIBGLREVISION} CATEGORIES=3D graphics =20 -MAINTAINER=3D x11@FreeBSD.org COMMENT=3D OpenGL library that renders using GLX or DRI =20 -LIB_DEPENDS+=3D drm:${PORTSDIR}/graphics/libdrm \ - expat:${PORTSDIR}/textproc/expat2 +LIB_DEPENDS+=3D libdrm.so:${PORTSDIR}/graphics/libdrm \ + libexpat.so:${PORTSDIR}/textproc/expat2 =20 USES=3D pkgconfig USE_XORG=3D glproto x11 xext xxf86vm xdamage xfixes dri2proto:both @@ -17,9 +16,28 @@ =20 SUB_FILES=3D pkg-install pkg-deinstall =20 +.include + +.if defined(WITH_NEW_XORG) +LIBGLREVISION=3D 0 +.else +LIBGLREVISION=3D 4 +.endif + do-install: +.if ! defined(WITH_NEW_XORG) ${RM} -f ${WRKSRC}/include/GL/glu*.h + @${MKDIR} ${PREFIX}/lib/.libGL cd ${WRKSRC}/src/mesa; ${GMAKE} install-libgl +.else + cd ${WRKSRC}/src/mesa; ${GMAKE} install-pkgconfigDATA + cd ${WRKSRC}/src/glx; ${GMAKE} install + ${MKDIR} ${PREFIX}/include/GL + cd ${WRKSRC}/include/GL && ${COPYTREE_SHARE} \*.h ${PREFIX}/include/GL/= + @${MKDIR} ${PREFIX}/lib/.libGL + ${INSTALL_LIB} ${WRKSRC}/src/glx/.libs/libGL.so ${PREFIX}/lib/.libGL/ + ${INSTALL_LIB} ${WRKSRC}/src/glx/.libs/libGL.so.1 ${PREFIX}/lib/.libGL/= +.endif =20 post-install: @PKG_PREFIX=3D${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL @@ -26,10 +44,8 @@ =20 .include "${.CURDIR}/bsd.mesalib.mk" =20 -.include - .if !(${ARCH} =3D=3D "amd64" || ${ARCH} =3D=3D "i386") CONFIGURE_ARGS+=3D--disable-gallium-intel .endif =20 -.include +.include Index: graphics/libGL/bsd.mesalib.mk =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/bsd.mesalib.mk (revision 326808) +++ graphics/libGL/bsd.mesalib.mk (working copy) @@ -1,16 +1,12 @@ -#-*- mode: Fundamental; tab-width: 4; -*- -# ex:ts=3D4 +# bsd.mesalib.mk - shared code between MesaLib ports. # -# bsd.mesa.mk - an attempt to refactor MesaLib ports. -# -# Created by: Florent Thoumie -# # !!! Here be dragons !!! (they seem to be everywhere these days) # # Remember to upgrade the following ports everytime you bump MESAVERSION= : # +# - graphics/libEGL # - graphics/libGL -# - graphics/libGLU +# - grahpics/libglesv2 # - graphics/dri # # $FreeBSD$ @@ -21,7 +17,7 @@ MESADISTVERSION=3D${MESABASEVERSION}${MESASUBVERSION:C/^(.)/-\1/} =20 .if defined(WITH_NEW_XORG) -MESABASEVERSION=3D 8.0.5 +MESABASEVERSION=3D 9.1.6 # if there is a subversion, include the '-' between 7.11-rc2 for example= =2E MESASUBVERSION=3D =09 PLIST_SUB+=3D OLD=3D"@comment " NEW=3D"" @@ -35,64 +31,80 @@ DISTFILES=3D MesaLib-${MESADISTVERSION}${EXTRACT_SUFX} MAINTAINER?=3D x11@FreeBSD.org =20 -# HACK: added lang/python as build dependency - we need to check, which = -# python versions are cleanly supported by Mesa BUILD_DEPENDS+=3D makedepend:${PORTSDIR}/devel/makedepend \ - python:${PORTSDIR}/lang/python \ + python2:${PORTSDIR}/lang/python2 \ ${PYTHON_SITELIBDIR}/libxml2.py:${PORTSDIR}/textproc/py-libxml2 =20 -USES+=3D bison -USE_PYTHON_BUILD=3Dyes +USES=3D bison gmake pathfix pkgconfig shebangfix +USE_PYTHON_BUILD=3D-2.7 USE_BZIP2=3D yes -USE_GMAKE=3D yes USE_LDCONFIG=3D yes GNU_CONFIGURE=3D yes =20 CPPFLAGS+=3D -I${LOCALBASE}/include LDFLAGS+=3D -L${LOCALBASE}/lib -CONFIGURE_ARGS+=3D--enable-gallium-llvm=3Dno --without-gallium-drivers \= - --disable-egl =20 +.if ${OSVERSION} < 1000033 +BUILD_DEPENDS+=3D ${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex +CONFIGURE_ENV+=3Dac_cv_prog_LEX=3D${LOCALBASE}/bin/flex +.endif + .if defined(WITH_NEW_XORG) -EXTRA_PATCHES+=3D ${PATCHDIR}/extra-configure \ - ${PATCHDIR}/extra-src-glsl_ir_constant_expression.cpp \ - ${PATCHDIR}/extra-src__gallium__include__pipe__p_config.h \ - ${PATCHDIR}/extra-src__mesa__drivers__dri__nouveau__nouveau_array.c \ - ${PATCHDIR}/extra-src__mesa__drivers__dri__nouveau__nouveau_render_t.c= \ - ${PATCHDIR}/extra-src_glx_XF86dri.c +USE_AUTOTOOLS=3D autoconf:env automake:env libtool:env +# probably be shared lib, and in it own port. +CONFIGURE_ARGS+=3D --enable-shared-glapi=3Dno +# we need to reapply these patches because we doing wierd stuff with aut= ogen +REAPPLY_PATCHES=3D \ + ${PATCHDIR}/patch-configure \ + ${PATCHDIR}/patch-src_egl_main_Makefile.in \ + ${PATCHDIR}/patch-src_glx_Makefile.in \ + ${PATCHDIR}/patch-src_mapi_es2api_Makefile.in \ + ${PATCHDIR}/patch-src_mapi_shared-glapi_Makefile.in \ + ${PATCHDIR}/patch-src_mesa_drivers_dri_common_Makefile.in \ + ${PATCHDIR}/patch-src_mesa_drivers_dri_common_xmlpool_Makefile.in \ + ${PATCHDIR}/patch-src_mesa_libdricore_Makefile.in + +python_OLD_CMD=3D "/usr/bin/env[[:space:]]python" +python_CMD=3D ${LOCALBASE}/bin/python2 +SHEBANG_FILES=3D src/gallium/*/*/*.py src/gallium/tools/trace/*.py \ + src/gallium/drivers/svga/svgadump/svga_dump.py \ + src/glsl/tests/compare_ir src/mapi/glapi/gen/*.py \ + src/mapi/mapi/mapi_abi.py .else -EXTRA_PATCHES+=3D ${PATCHDIR}/extra-configure-old \ - ${PATCHDIR}/extra-mach64_context.h-old \ - ${PATCHDIR}/extra-src__mesa__x86-64__glapi_x86-64.S \ - ${PATCHDIR}/extra-src__mesa__x86-64__xform4.S \ - ${PATCHDIR}/extra-src__mesa__x86__glapi_x86.S \ - ${PATCHDIR}/extra-src__mesa__x86__read_rgba_span_x86.S \ - ${PATCHDIR}/extra-src_glx_x11_XF86dri.c -CONFIGURE_ARGS+=3D--disable-glut --disable-glw -.endif +CONFIGURE_ARGS+=3D--disable-glut --disable-glw --disable-glu =20 ALL_TARGET=3D default +.endif =20 MASTERDIR=3D ${.CURDIR}/../../graphics/libGL +.if defined(WITH_NEW_XORG) PATCHDIR=3D ${MASTERDIR}/files +.else +PATCHDIR=3D ${MASTERDIR}/files-old +.endif DESCR=3D ${.CURDIR}/pkg-descr PLIST=3D ${.CURDIR}/pkg-plist WRKSRC=3D ${WRKDIR}/Mesa-${MESADISTVERSION} =20 -.if !defined(ARCH) -ARCH!=3D uname -p -.endif - COMPONENT=3D ${PORTNAME:L:C/^lib//:C/mesa-//} =20 -.if ${COMPONENT:Mglu} =3D=3D "" -CONFIGURE_ARGS+=3D --disable-glu +.if ${COMPONENT:Mglesv2} =3D=3D "" +CONFIGURE_ARGS+=3D --disable-gles2 +.else +CONFIGURE_ARGS+=3D --enable-gles2 .endif =20 +.if ${COMPONENT:Megl} =3D=3D "" +CONFIGURE_ARGS+=3D --disable-egl +.else +CONFIGURE_ARGS+=3D --enable-egl +.endif + .if ${COMPONENT:Mdri} =3D=3D "" -CONFIGURE_ARGS+=3D --with-dri-drivers=3Dno +CONFIGURE_ARGS+=3D--with-dri-drivers=3Dno +CONFIGURE_ARGS+=3D--enable-gallium-llvm=3Dno --without-gallium-drivers .else -CONFIGURE_ARGS+=3D --with-dri-drivers=3D"i915,i965,r200,radeon,swrast" +# done in the dri port .endif =20 .if !defined(WITH_NEW_XORG) @@ -106,8 +118,35 @@ post-patch: @${REINPLACE_CMD} -e 's|-ffast-math|${FAST_MATH}|' -e 's|x86_64|amd64|'= \ ${WRKSRC}/configure + @${REINPLACE_CMD} -e 's|/etc/|${PREFIX}/etc/|g' \ + ${WRKSRC}/src/mesa/drivers/dri/common/xmlconfig.c +.if !defined(WITH_NEW_XORG) @${REINPLACE_CMD} -e 's|[$$](INSTALL_LIB_DIR)/pkgconfig|${PREFIX}/libda= ta/pkgconfig|' \ ${WRKSRC}/src/glu/Makefile \ ${WRKSRC}/src/mesa/Makefile \ ${WRKSRC}/src/mesa/drivers/dri/Makefile +.else + @${REINPLACE_CMD} -e 's|#!/use/bin/python|#!${LOCALBASE}/bin/python2|g'= \ + ${WRKSRC}/src/mesa/drivers/dri/common/xmlpool/gen_xmlpool.py \ + ${WRKSRC}/src/glsl/builtins/tools/*.py + @${REINPLACE_CMD} -e 's|!/use/bin/python2|!${LOCALBASE}/bin/python2|g' = \ + ${WRKSRC}/src/mesa/main/get_hash_generator.py \ + ${WRKSRC}/src/mapi/glapi/gen/gl_enums.py \ + ${WRKSRC}/src/mapi/glapi/gen/gl_table.py \ =20 +.endif + +pre-configure: +# workaround for stupid rerunning configure in do-build step +# xxx +.if defined(WITH_NEW_XORG) + cd ${WRKSRC} && env NOCONFIGURE=3D1 sh autogen.sh +. for file in ${REAPPLY_PATCHES} + @cd ${WRKSRC} && ${PATCH} -p0 --quiet < ${file} +. endfor +# make sure the pkg-config files are installed in the correct place. +# this was reverted by running autogen.sh + @${FIND} ${WRKSRC} -name Makefile.in -type f | ${XARGS} ${REINPLACE_CMD= } -e \ + 's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g' ; +.endif + Index: graphics/libGL/distinfo =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/distinfo (revision 326808) +++ graphics/libGL/distinfo (working copy) @@ -1,4 +1,4 @@ SHA256 (MesaLib-7.6.1.tar.bz2) =3D 701f0e4cb85d6298181651b780d1c0a439fad= d02aad29ee6623fc05588bb8d44 SIZE (MesaLib-7.6.1.tar.bz2) =3D 4886995 -SHA256 (MesaLib-8.0.5.tar.bz2) =3D 511b8da34f8e69ed24caf422964fb7ae747f3= b1d8093f6b8aa2602164a475a5e -SIZE (MesaLib-8.0.5.tar.bz2) =3D 5734571 +SHA256 (MesaLib-9.1.6.tar.bz2) =3D e632dff0acafad0a59dc208d16dedb37f7bd5= 8f94c5d58c4b51912e41d005e3d +SIZE (MesaLib-9.1.6.tar.bz2) =3D 6134267 Index: graphics/libGL/files/extra-configure =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files/extra-configure (revision 326808) +++ graphics/libGL/files/extra-configure (working copy) @@ -1,40 +0,0 @@ ---- configure.orig 2012-07-10 17:30:46.000000000 +0200 -+++ configure 2012-09-01 13:27:22.000000000 +0200 -@@ -9017,9 +9017,34 @@ - DEFINES=3D"$DEFINES -DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=3D1" - DEFINES=3D"$DEFINES -DIN_DRI_DRIVER -DHAVE_ALIAS" -=20 -- if test "x$DRI_DIRS" =3D "xyes"; then -- DRI_DIRS=3D"i915 i965 nouveau r200 radeon swrast" -- fi -+ case "$host_cpu" in -+ x86_64) -+ # i810 is missing because there is no x86-64 system where i= t -+ # could *ever* be used. -+ if test "x$DRI_DIRS" =3D "xyes"; then -+ DRI_DIRS=3D"i915 i965 nouveau r200 radeon swrast" -+ fi -+ ;; -+ i*86) -+ if test "x$DRI_DIRS" =3D "xyes"; then -+ DRI_DIRS=3D"i915 i965 nouveau r200 radeon swrast" -+ fi -+ ;; -+ powerpc*) -+ # Build only the drivers for cards that exist on PowerPC. -+ # At some point MGA will be added, but not yet. -+ if test "x$DRI_DIRS" =3D "xyes"; then -+ DRI_DIRS=3D"r200 radeon swrast" -+ fi -+ ;; -+ sparc*) -+ # Build only the drivers for cards that exist on SPARC. -+ if test "x$DRI_DIRS" =3D "xyes"; then -+ DRI_DIRS=3D"r200 radeon swrast" -+ fi -+ ;; -+ esac -+ - ;; - gnu*) - DEFINES=3D"$DEFINES -DUSE_EXTERNAL_DXTN_LIB=3D1 -DIN_DRI_DRIVER= " Index: graphics/libGL/files/extra-configure-old =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files/extra-configure-old (revision 326808) +++ graphics/libGL/files/extra-configure-old (working copy) @@ -1,43 +0,0 @@ ---- configure.orig 2009-12-22 03:31:30.000000000 +0100 -+++ configure 2012-06-27 19:49:26.000000000 +0200 -@@ -6946,12 +6946,35 @@ - CXXFLAGS=3D"$CXXFLAGS -ansi -pedantic" - fi -=20 -- # ffb and gamma are missing because they have not been converte= d -- # to use the new interface. -- if test "x$DRI_DIRS" =3D "xyes"; then -- DRI_DIRS=3D"i810 i915 i965 mach64 mga r128 r200 r300 r600 r= adeon tdfx \ -+ case "$host_cpu" in -+ x86_64) -+ # i810 is missing because there is no x86-64 system where i= t -+ # could *ever* be used. -+ if test "x$DRI_DIRS" =3D "xyes"; then -+ DRI_DIRS=3D"i915 i965 mach64 mga r128 r200 r300 r600 ra= deon tdfx \ - unichrome savage sis swrast" -- fi -+ fi -+ ;; -+ i*86) -+ if test "x$DRI_DIRS" =3D "xyes"; then -+ DRI_DIRS=3D"i810 i915 i965 mach64 mga r128 r200 r300 r6= 00 radeon tdfx \ -+ unichrome savage sis swrast" -+ fi -+ ;; -+ powerpc*) -+ # Build only the drivers for cards that exist on PowerPC. -+ # At some point MGA will be added, but not yet. -+ if test "x$DRI_DIRS" =3D "xyes"; then -+ DRI_DIRS=3D"mach64 r128 r200 r300 r600 radeon tdfx swra= st" -+ fi -+ ;; -+ sparc*) -+ # Build only the drivers for cards that exist on SPARC. -+ if test "x$DRI_DIRS" =3D "xyes"; then -+ DRI_DIRS=3D"mach64 r128 r200 r300 r600 radeon swrast" -+ fi -+ ;; -+ esac - ;; - gnu*) - DEFINES=3D"$DEFINES -DUSE_EXTERNAL_DXTN_LIB=3D1 -DIN_DRI_DRIVER= " Index: graphics/libGL/files/extra-mach64_context.h-old =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files/extra-mach64_context.h-old (revision 326808) +++ graphics/libGL/files/extra-mach64_context.h-old (working copy) @@ -1,20 +0,0 @@ ---- src/mesa/drivers/dri/mach64/mach64_context.h.orig 2012-06-27 19:59:3= 2.000000000 +0200 -+++ src/mesa/drivers/dri/mach64/mach64_context.h 2012-06-27 20:08:30.000= 000000 +0200 -@@ -294,11 +294,14 @@ - #define LE32_OUT( x, y ) do { *(GLuint *)(x) =3D (y); } while (0) - #define LE32_OUT_FLOAT( x, y ) do { *(GLfloat *)(x) =3D (y); } while (0= ) - #else --#ifndef __OpenBSD__ --#include --#else -+#if defined(__OpenBSD__) - #include - #define bswap_32 bswap32 -+#elif defined(__FreeBSD__) -+#include -+#define bswap_32 bswap32 -+#else -+#include - #endif -=20 - #define LE32_IN( x ) bswap_32( *(GLuint *)(x) ) Index: graphics/libGL/files/extra-src-glsl_ir_constant_expression.cpp =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files/extra-src-glsl_ir_constant_expression.cpp (revis= ion 326808) +++ graphics/libGL/files/extra-src-glsl_ir_constant_expression.cpp (worki= ng copy) @@ -1,14 +0,0 @@ ---- src/glsl/ir_constant_expression.cpp.orig 2011-07-23 15:08:44.0000000= 00 +0200 -+++ src/glsl/ir_constant_expression.cpp 2011-07-23 15:09:03.000000000 +0= 200 -@@ -39,6 +39,11 @@ - #include "ir_visitor.h" - #include "glsl_types.h" -=20 -+#include -+#if __FreeBSD_version <=3D 704100 || (__FreeBSD_version >=3D 800000 && = __FreeBSD_version < 802502) || (__FreeBSD_version >=3D 900000 && __FreeBS= D_version < 900027) -+#define log2(x) (log(x) / log(2)) -+#endif -+ - static float - dot(ir_constant *op0, ir_constant *op1) - { Index: graphics/libGL/files/extra-src__gallium__include__pipe__p_config.h= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files/extra-src__gallium__include__pipe__p_config.h (r= evision 326808) +++ graphics/libGL/files/extra-src__gallium__include__pipe__p_config.h (w= orking copy) @@ -1,25 +0,0 @@ ---- src/gallium/include/pipe/p_config.h.orig 2011-10-15 02:43:58.0000000= 00 +0200 -+++ src/gallium/include/pipe/p_config.h 2012-06-28 21:27:06.000000000 +0= 200 -@@ -106,6 +106,13 @@ - #endif - #endif -=20 -+#if defined(__sparc__) || defined(__sparc64__) -+#define PIPE_ARCH_SPARC -+#if defined(__sparc64__) -+#define PIPE_ARCH_SPARC_64 -+#endif -+#endif -+ -=20 - /* - * Endian detection. -@@ -133,7 +140,7 @@ -=20 - #if defined(PIPE_ARCH_X86) || defined(PIPE_ARCH_X86_64) - #define PIPE_ARCH_LITTLE_ENDIAN --#elif defined(PIPE_ARCH_PPC) || defined(PIPE_ARCH_PPC_64) -+#elif defined(PIPE_ARCH_PPC) || defined(PIPE_ARCH_PPC_64) || defined(PI= PE_ARCH_SPARC) || defined(PIPE_ARCH_SPARC_64) - #define PIPE_ARCH_BIG_ENDIAN - #endif -=20 Index: graphics/libGL/files/extra-src__mesa__drivers__dri__nouveau__nouve= au_array.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files/extra-src__mesa__drivers__dri__nouveau__nouveau_= array.c (revision 326808) +++ graphics/libGL/files/extra-src__mesa__drivers__dri__nouveau__nouveau_= array.c (working copy) @@ -1,99 +0,0 @@ ---- src/mesa/drivers/dri/nouveau/nouveau_array.c.orig 2011-01-06 01:19:1= 5.000000000 +0100 -+++ src/mesa/drivers/dri/nouveau/nouveau_array.c 2012-04-28 18:27:06.000= 000000 +0200 -@@ -29,54 +29,71 @@ - #include "nouveau_array.h" - #include "nouveau_bufferobj.h" -=20 -+#define EXTRACT(in_t, out_t) extract_func_##in_t##_to_##out_t -+ -+#define EXTRACT_FUNC(in_t, out_t, k) \ -+static out_t EXTRACT(in_t, out_t) \ -+(struct nouveau_array *a, int i, int j) { \ -+ in_t x =3D ((in_t *)(a->buf + i * a->stride))[j]; \ -+ \ -+ return (out_t)x / (k); \ -+} -+ -+EXTRACT_FUNC(GLchar, unsigned, 1); -+EXTRACT_FUNC(GLchar, float, SCHAR_MAX); -+EXTRACT_FUNC(GLubyte, unsigned, 1); -+EXTRACT_FUNC(GLubyte, float, UCHAR_MAX); -+EXTRACT_FUNC(GLshort, unsigned, 1); -+EXTRACT_FUNC(GLshort, float, SHRT_MAX); -+EXTRACT_FUNC(GLushort, unsigned, 1); -+EXTRACT_FUNC(GLushort, float, USHRT_MAX); -+EXTRACT_FUNC(GLint, unsigned, 1); -+EXTRACT_FUNC(GLint, float, INT_MAX); -+EXTRACT_FUNC(GLuint, unsigned, 1); -+EXTRACT_FUNC(GLuint, float, UINT_MAX); -+EXTRACT_FUNC(GLfloat, unsigned, 1.0 / UINT_MAX); -+EXTRACT_FUNC(GLfloat, float, 1); -+ -+#undef EXTRACT_FUNC -+ - static void - get_array_extract(struct nouveau_array *a, extract_u_t *extract_u, - extract_f_t *extract_f) - { --#define EXTRACT(in_t, out_t, k) \ -- ({ \ -- auto out_t f(struct nouveau_array *, int, int); \ -- out_t f(struct nouveau_array *a, int i, int j) { \ -- in_t x =3D ((in_t *)(a->buf + i * a->stride))[j]; \ -- \ -- return (out_t)x / (k); \ -- }; \ -- f; \ -- }); -- - switch (a->type) { - case GL_BYTE: -- *extract_u =3D EXTRACT(char, unsigned, 1); -- *extract_f =3D EXTRACT(char, float, SCHAR_MAX); -+ *extract_u =3D EXTRACT(GLchar, unsigned); -+ *extract_f =3D EXTRACT(GLchar, float); - break; - case GL_UNSIGNED_BYTE: -- *extract_u =3D EXTRACT(unsigned char, unsigned, 1); -- *extract_f =3D EXTRACT(unsigned char, float, UCHAR_MAX); -+ *extract_u =3D EXTRACT(GLubyte, unsigned); -+ *extract_f =3D EXTRACT(GLubyte, float); - break; - case GL_SHORT: -- *extract_u =3D EXTRACT(short, unsigned, 1); -- *extract_f =3D EXTRACT(short, float, SHRT_MAX); -+ *extract_u =3D EXTRACT(GLshort, unsigned); -+ *extract_f =3D EXTRACT(GLshort, float); - break; - case GL_UNSIGNED_SHORT: -- *extract_u =3D EXTRACT(unsigned short, unsigned, 1); -- *extract_f =3D EXTRACT(unsigned short, float, USHRT_MAX); -+ *extract_u =3D EXTRACT(GLushort, unsigned); -+ *extract_f =3D EXTRACT(GLushort, float); - break; - case GL_INT: -- *extract_u =3D EXTRACT(int, unsigned, 1); -- *extract_f =3D EXTRACT(int, float, INT_MAX); -+ *extract_u =3D EXTRACT(GLint, unsigned); -+ *extract_f =3D EXTRACT(GLint, float); - break; - case GL_UNSIGNED_INT: -- *extract_u =3D EXTRACT(unsigned int, unsigned, 1); -- *extract_f =3D EXTRACT(unsigned int, float, UINT_MAX); -+ *extract_u =3D EXTRACT(GLuint, unsigned); -+ *extract_f =3D EXTRACT(GLuint, float); - break; - case GL_FLOAT: -- *extract_u =3D EXTRACT(float, unsigned, 1.0 / UINT_MAX); -- *extract_f =3D EXTRACT(float, float, 1); -+ *extract_u =3D EXTRACT(GLfloat, unsigned); -+ *extract_f =3D EXTRACT(GLfloat, float); - break; - default: - assert(0); - } - } -+#undef EXTRACT -=20 - void - nouveau_init_array(struct nouveau_array *a, int attr, int stride, Index: graphics/libGL/files/extra-src__mesa__drivers__dri__nouveau__nouve= au_render_t.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files/extra-src__mesa__drivers__dri__nouveau__nouveau_= render_t.c (revision 326808) +++ graphics/libGL/files/extra-src__mesa__drivers__dri__nouveau__nouveau_= render_t.c (working copy) @@ -1,91 +0,0 @@ ---- src/mesa/drivers/dri/nouveau/nouveau_render_t.c.orig 2011-01-06 01:1= 9:34.000000000 +0100 -+++ src/mesa/drivers/dri/nouveau/nouveau_render_t.c 2012-04-28 18:27:06.= 000000000 +0200 -@@ -97,52 +97,49 @@ - } \ - } while (0) -=20 --/* -- * Select an appropriate dispatch function for the given index buffer. -- */ --static dispatch_t --get_array_dispatch(struct nouveau_array *a) -+static void -+dispatch_l(struct gl_context *ctx, unsigned int start, int delta, -+ unsigned int n) - { -- if (!a->fields) { -- auto void f(struct gl_context *, unsigned int, int, unsigned int); -- -- void f(struct gl_context *ctx, unsigned int start, int delta, -- unsigned int n) { -- struct nouveau_channel *chan =3D context_chan(ctx); -- RENDER_LOCALS(ctx); -+ struct nouveau_channel *chan =3D context_chan(ctx); -+ RENDER_LOCALS(ctx); -=20 -- EMIT_VBO(L, ctx, start, delta, n); -- }; -- -- return f; -- -- } else if (a->type =3D=3D GL_UNSIGNED_INT) { -- auto void f(struct gl_context *, unsigned int, int, unsigned int); -- -- void f(struct gl_context *ctx, unsigned int start, int delta, -- unsigned int n) { -- struct nouveau_channel *chan =3D context_chan(ctx); -- RENDER_LOCALS(ctx); -+ EMIT_VBO(L, ctx, start, delta, n); -+} -=20 -- EMIT_VBO(I32, ctx, start, delta, n); -- }; -+static void -+dispatch_i32(struct gl_context *ctx, unsigned int start, int delta, -+ unsigned int n) -+{ -+ struct nouveau_channel *chan =3D context_chan(ctx); -+ RENDER_LOCALS(ctx); -=20 -- return f; -+ EMIT_VBO(I32, ctx, start, delta, n); -+} -=20 -- } else { -- auto void f(struct gl_context *, unsigned int, int, unsigned int); -+static void -+dispatch_i16(struct gl_context *ctx, unsigned int start, int delta, -+ unsigned int n) -+{ -+ struct nouveau_channel *chan =3D context_chan(ctx); -+ RENDER_LOCALS(ctx); -=20 -- void f(struct gl_context *ctx, unsigned int start, int delta, -- unsigned int n) { -- struct nouveau_channel *chan =3D context_chan(ctx); -- RENDER_LOCALS(ctx); -- -- EMIT_VBO(I32, ctx, start, delta, n & 1); -- EMIT_VBO(I16, ctx, start, delta, n & ~1); -- }; -+ EMIT_VBO(I32, ctx, start, delta, n & 1); -+ EMIT_VBO(I16, ctx, start, delta, n & ~1); -+} -=20 -- return f; -- } -+/* -+ * Select an appropriate dispatch function for the given index buffer. -+ */ -+static dispatch_t -+get_array_dispatch(struct nouveau_array *a) -+{ -+ if (!a->fields) -+ return dispatch_l; -+ else if (a->type =3D=3D GL_UNSIGNED_INT) -+ return dispatch_i32; -+ else -+ return dispatch_i16; - } -=20 - /* Index: graphics/libGL/files/extra-src__mesa__x86-64__glapi_x86-64.S =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files/extra-src__mesa__x86-64__glapi_x86-64.S (revisio= n 326808) +++ graphics/libGL/files/extra-src__mesa__x86-64__glapi_x86-64.S (working= copy) @@ -1,12 +0,0 @@ ---- ./src/mesa/x86-64/glapi_x86-64.S.orig 2009-03-13 04:28:49.000000000 = +0100 -+++ ./src/mesa/x86-64/glapi_x86-64.S 2011-01-28 18:12:18.000000000 +0100= -@@ -73,7 +73,8 @@ _x86_64_get_dispatch: -=20 - .p2align 4,,15 - _x86_64_get_dispatch: -- movq _gl_DispatchTSD(%rip), %rdi -+ movq _gl_DispatchTSD@GOTPCREL(%rip), %rax -+ movl (%rax), %edi - jmp pthread_getspecific@PLT -=20 - #elif defined(THREADS) Index: graphics/libGL/files/extra-src__mesa__x86-64__xform4.S =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files/extra-src__mesa__x86-64__xform4.S (revision 3268= 08) +++ graphics/libGL/files/extra-src__mesa__x86-64__xform4.S (working copy)= @@ -1,74 +0,0 @@ ---- src/mesa/x86-64/xform4.S.orig 2009-01-22 18:38:35.000000000 +0100 -+++ src/mesa/x86-64/xform4.S 2011-05-09 21:26:00.000000000 +0200 -@@ -53,7 +53,7 @@ _mesa_x86_64_transform_points4_general: - * rdx =3D source - */ - movl V4F_COUNT(%rdx), %ecx /* count */ -- movzx V4F_STRIDE(%rdx), %eax /* stride */ -+ movzbl V4F_STRIDE(%rdx), %eax /* stride */ -=20 - movl %ecx, V4F_COUNT(%rdi) /* set dest count */ - movl $4, V4F_SIZE(%rdi) /* set dest size */ -@@ -116,7 +116,7 @@ p4_constants: - .byte 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00 --.float 0f+1.0 -+.float 1.0 -=20 - .text - .align 16 -@@ -135,7 +135,7 @@ _mesa_x86_64_transform_points4_3d: - movaps 16(%rax), %xmm10 -=20 - movl V4F_COUNT(%rdx), %ecx /* count */ -- movzx V4F_STRIDE(%rdx), %eax /* stride */ -+ movzbl V4F_STRIDE(%rdx), %eax /* stride */ -=20 - movl %ecx, V4F_COUNT(%rdi) /* set dest count */ - movl $4, V4F_SIZE(%rdi) /* set dest size */ -@@ -195,7 +195,7 @@ p4_3d_done: - _mesa_x86_64_transform_points4_identity: -=20 - movl V4F_COUNT(%rdx), %ecx /* count */ -- movzx V4F_STRIDE(%rdx), %eax /* stride */ -+ movzbl V4F_STRIDE(%rdx), %eax /* stride */ -=20 - movl %ecx, V4F_COUNT(%rdi) /* set dest count */ - movl $4, V4F_SIZE(%rdi) /* set dest size */ -@@ -223,7 +223,7 @@ p4_identity_done: - _mesa_3dnow_transform_points4_3d_no_rot: -=20 - movl V4F_COUNT(%rdx), %ecx /* count */ -- movzx V4F_STRIDE(%rdx), %eax /* stride */ -+ movzbl V4F_STRIDE(%rdx), %eax /* stride */ -=20 - movl %ecx, V4F_COUNT(%rdi) /* set dest count */ - movl $4, V4F_SIZE(%rdi) /* set dest size */ -@@ -287,7 +287,7 @@ p4_3d_no_rot_done: - _mesa_3dnow_transform_points4_perspective: -=20 - movl V4F_COUNT(%rdx), %ecx /* count */ -- movzx V4F_STRIDE(%rdx), %eax /* stride */ -+ movzbl V4F_STRIDE(%rdx), %eax /* stride */ -=20 - movl %ecx, V4F_COUNT(%rdi) /* set dest count */ - movl $4, V4F_SIZE(%rdi) /* set dest size */ -@@ -353,7 +353,7 @@ p4_perspective_done: - _mesa_3dnow_transform_points4_2d_no_rot: -=20 - movl V4F_COUNT(%rdx), %ecx /* count */ -- movzx V4F_STRIDE(%rdx), %eax /* stride */ -+ movzbl V4F_STRIDE(%rdx), %eax /* stride */ -=20 - movl %ecx, V4F_COUNT(%rdi) /* set dest count */ - movl $4, V4F_SIZE(%rdi) /* set dest size */ -@@ -408,7 +408,7 @@ p4_2d_no_rot_done: - _mesa_3dnow_transform_points4_2d: -=20 - movl V4F_COUNT(%rdx), %ecx /* count */ -- movzx V4F_STRIDE(%rdx), %eax /* stride */ -+ movzbl V4F_STRIDE(%rdx), %eax /* stride */ -=20 - movl %ecx, V4F_COUNT(%rdi) /* set dest count */ - movl $4, V4F_SIZE(%rdi) /* set dest size */ Index: graphics/libGL/files/extra-src__mesa__x86__glapi_x86.S =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files/extra-src__mesa__x86__glapi_x86.S (revision 3268= 08) +++ graphics/libGL/files/extra-src__mesa__x86__glapi_x86.S (working copy)= @@ -1,11 +0,0 @@ ---- ./src/mesa/x86/glapi_x86.S.orig 2009-03-13 04:28:49.000000000 +0100 -+++ ./src/mesa/x86/glapi_x86.S 2011-01-28 18:11:56.000000000 +0100 -@@ -47,7 +47,7 @@ - #define GL_OFFSET(x) CODEPTR(REGOFF(4 * x, EAX)) -=20 - #if defined(GNU_ASSEMBLER) && !defined(__DJGPP__) && !defined(__MINGW32= __) --#define GLOBL_FN(x) GLOBL x ; .type x, function -+#define GLOBL_FN(x) GLOBL x ; .type x, @function - #else - #define GLOBL_FN(x) GLOBL x - #endif Index: graphics/libGL/files/extra-src__mesa__x86__read_rgba_span_x86.S =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files/extra-src__mesa__x86__read_rgba_span_x86.S (revi= sion 326808) +++ graphics/libGL/files/extra-src__mesa__x86__read_rgba_span_x86.S (work= ing copy) @@ -1,11 +0,0 @@ ---- ./src/mesa/x86/read_rgba_span_x86.S.orig 2008-08-25 16:46:47.0000000= 00 +0200 -+++ ./src/mesa/x86/read_rgba_span_x86.S 2011-01-28 18:10:06.000000000 +0= 100 -@@ -648,7 +648,7 @@ _generic_read_RGBA_span_RGB565_MMX: - testl $0x01, %ecx - je .L01 -=20 -- movzxw (%eax), %ecx -+ movzwl (%eax), %ecx - movd %ecx, %mm4 -=20 - pshufw $0x00, %mm4, %mm0 Index: graphics/libGL/files/extra-src_glx_XF86dri.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files/extra-src_glx_XF86dri.c (revision 326808) +++ graphics/libGL/files/extra-src_glx_XF86dri.c (working copy) @@ -1,38 +0,0 @@ ---- src/glx/XF86dri.c.orig 2012-10-24 19:03:59.000000000 +0000 -+++ src/glx/XF86dri.c 2013-05-29 10:07:33.000000000 +0000 -@@ -43,6 +43,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN - #include - #include - #include "xf86dristr.h" -+#include -=20 - static XExtensionInfo _xf86dri_info_data; - static XExtensionInfo *xf86dri_info =3D &_xf86dri_info_data; -@@ -201,7 +202,11 @@ XF86DRIOpenConnection(Display * dpy, int - } -=20 - if (rep.length) { -- if (!(*busIdString =3D (char *) Xcalloc(rep.busIdStringLength + 1= , 1))) { -+ if (rep.busIdStringLength < INT_MAX) -+ *busIdString =3D Xcalloc(rep.busIdStringLength + 1, 1); -+ else -+ *busIdString =3D NULL; -+ if (*busIdString =3D=3D NULL) { - _XEatData(dpy, ((rep.busIdStringLength + 3) & ~3)); - UnlockDisplay(dpy); - SyncHandle(); -@@ -300,9 +305,11 @@ XF86DRIGetClientDriverName(Display * dpy - *ddxDriverPatchVersion =3D rep.ddxDriverPatchVersion; -=20 - if (rep.length) { -- if (! -- (*clientDriverName =3D -- (char *) Xcalloc(rep.clientDriverNameLength + 1, 1))) { -+ if (rep.clientDriverNameLength < INT_MAX) -+ *clientDriverName =3D Xcalloc(rep.clientDriverNameLength + 1, 1); -+ else -+ *clientDriverName =3D NULL; -+ if (*clientDriverName =3D=3D NULL) { - _XEatData(dpy, ((rep.clientDriverNameLength + 3) & ~3)); - UnlockDisplay(dpy); - SyncHandle(); Index: graphics/libGL/files/extra-src_glx_x11_XF86dri.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files/extra-src_glx_x11_XF86dri.c (revision 326808) +++ graphics/libGL/files/extra-src_glx_x11_XF86dri.c (working copy) @@ -1,38 +0,0 @@ ---- src/glx/x11/XF86dri.c.orig 2009-06-17 18:35:16.000000000 +0000 -+++ src/glx/x11/XF86dri.c 2013-05-29 10:09:37.000000000 +0000 -@@ -43,6 +43,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN - #include - #include - #include "xf86dristr.h" -+#include -=20 -=20 - #if defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__) >=3D 303 -@@ -212,7 +213,11 @@ XF86DRIOpenConnection(Display * dpy, int - } -=20 - if (rep.length) { -- if (!(*busIdString =3D (char *) Xcalloc(rep.busIdStringLength + 1= , 1))) { -+ if (rep.busIdStringLength < INT_MAX) -+ *busIdString =3D Xcalloc(rep.busIdStringLength + 1, 1); -+ else -+ *busIdString =3D NULL; -+ if (*busIdString =3D=3D NULL) { - _XEatData(dpy, ((rep.busIdStringLength + 3) & ~3)); - UnlockDisplay(dpy); - SyncHandle(); -@@ -311,9 +316,11 @@ XF86DRIGetClientDriverName(Display * dpy - *ddxDriverPatchVersion =3D rep.ddxDriverPatchVersion; -=20 - if (rep.length) { -- if (! -- (*clientDriverName =3D -- (char *) Xcalloc(rep.clientDriverNameLength + 1, 1))) { -+ if (rep.clientDriverNameLength < INT_MAX) -+ *clientDriverName =3D Xcalloc(rep.clientDriverNameLength + 1, 1); -+ else -+ *clientDriverName =3D NULL; -+ if (*clientDriverName =3D=3D NULL) { - _XEatData(dpy, ((rep.clientDriverNameLength + 3) & ~3)); - UnlockDisplay(dpy); - SyncHandle(); Index: graphics/libGL/files/patch-configure =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files/patch-configure (revision 0) +++ graphics/libGL/files/patch-configure (working copy) @@ -0,0 +1,49 @@ +--- configure.orig 2013-08-01 23:22:15.000000000 +0200 ++++ configure 2013-08-19 20:05:02.000000000 +0200 +@@ -21046,9 +21046,34 @@ + DEFINES=3D"$DEFINES -DHAVE_PTHREAD -DUSE_EXTERNAL_DXTN_LIB=3D1"= + DEFINES=3D"$DEFINES -DIN_DRI_DRIVER -DHAVE_ALIAS" +=20 +- if test "x$DRI_DIRS" =3D "xyes"; then +- DRI_DIRS=3D"i915 i965 nouveau r200 radeon swrast" +- fi ++ case "$host_cpu" in ++ x86_64) ++ # i810 is missing because there is no x86-64 system where i= t ++ # could *ever* be used. ++ if test "x$DRI_DIRS" =3D "xyes"; then ++ DRI_DIRS=3D"i915 i965 nouveau r200 radeon swrast" ++ fi ++ ;; ++ i*86) ++ if test "x$DRI_DIRS" =3D "xyes"; then ++ DRI_DIRS=3D"i915 i965 nouveau r200 radeon swrast" ++ fi ++ ;; ++ powerpc*) ++ # Build only the drivers for cards that exist on PowerPC. ++ # At some point MGA will be added, but not yet. ++ if test "x$DRI_DIRS" =3D "xyes"; then ++ DRI_DIRS=3D"r200 radeon swrast" ++ fi ++ ;; ++ sparc*) ++ # Build only the drivers for cards that exist on SPARC. ++ if test "x$DRI_DIRS" =3D "xyes"; then ++ DRI_DIRS=3D"r200 radeon swrast" ++ fi ++ ;; ++ esac ++ + ;; + gnu*) + DEFINES=3D"$DEFINES -DUSE_EXTERNAL_DXTN_LIB=3D1 -DIN_DRI_DRIVER= " +@@ -23396,7 +23421,7 @@ + radeon_llvm_check() { + LLVM_REQUIRED_VERSION_MAJOR=3D"3" + LLVM_REQUIRED_VERSION_MINOR=3D"2" +- if test "$LLVM_VERSION_INT" -ne "${LLVM_REQUIRED_VERSION_MAJOR}0${L= LVM_REQUIRED_VERSION_MINOR}"; then ++ if test "$LLVM_VERSION_INT" -lt "${LLVM_REQUIRED_VERSION_MAJOR}0${L= LVM_REQUIRED_VERSION_MINOR}"; then + as_fn_error $? "LLVM $LLVM_REQUIRED_VERSION_MAJOR.$LLVM_REQUIRE= D_VERSION_MINOR with R600 target enabled is required. + To use the r600/radeonsi LLVM backend, you need to= fetch the LLVM source from: + git://people.freedesktop.org/~tstellar/llvm master= Property changes on: graphics/libGL/files/patch-configure ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Index: graphics/libGL/files/patch-src-glsl_ir_constant_expression.cpp =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files/patch-src-glsl_ir_constant_expression.cpp (revis= ion 0) +++ graphics/libGL/files/patch-src-glsl_ir_constant_expression.cpp (worki= ng copy) @@ -0,0 +1,14 @@ +--- src/glsl/ir_constant_expression.cpp.orig 2011-07-23 15:08:44.0000000= 00 +0200 ++++ src/glsl/ir_constant_expression.cpp 2011-07-23 15:09:03.000000000 +0= 200 +@@ -39,6 +39,11 @@ + #include "ir_visitor.h" + #include "glsl_types.h" +=20 ++#include ++#if __FreeBSD_version <=3D 704100 || (__FreeBSD_version >=3D 800000 && = __FreeBSD_version < 802502) || (__FreeBSD_version >=3D 900000 && __FreeBS= D_version < 900027) ++#define log2(x) (log(x) / log(2)) ++#endif ++ + static float + dot(ir_constant *op0, ir_constant *op1) + { Property changes on: graphics/libGL/files/patch-src-glsl_ir_constant_expr= ession.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: graphics/libGL/files/patch-src__gallium__include__pipe__p_config.h= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files/patch-src__gallium__include__pipe__p_config.h (r= evision 0) +++ graphics/libGL/files/patch-src__gallium__include__pipe__p_config.h (w= orking copy) @@ -0,0 +1,25 @@ +--- src/gallium/include/pipe/p_config.h.orig 2011-10-15 02:43:58.0000000= 00 +0200 ++++ src/gallium/include/pipe/p_config.h 2012-06-28 21:27:06.000000000 +0= 200 +@@ -106,6 +106,13 @@ + #endif + #endif +=20 ++#if defined(__sparc__) || defined(__sparc64__) ++#define PIPE_ARCH_SPARC ++#if defined(__sparc64__) ++#define PIPE_ARCH_SPARC_64 ++#endif ++#endif ++ +=20 + /* + * Endian detection. +@@ -133,7 +140,7 @@ +=20 + #if defined(PIPE_ARCH_X86) || defined(PIPE_ARCH_X86_64) + #define PIPE_ARCH_LITTLE_ENDIAN +-#elif defined(PIPE_ARCH_PPC) || defined(PIPE_ARCH_PPC_64) ++#elif defined(PIPE_ARCH_PPC) || defined(PIPE_ARCH_PPC_64) || defined(PI= PE_ARCH_SPARC) || defined(PIPE_ARCH_SPARC_64) + #define PIPE_ARCH_BIG_ENDIAN + #endif +=20 Property changes on: graphics/libGL/files/patch-src__gallium__include__pi= pe__p_config.h ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Index: graphics/libGL/files/patch-src_egl_main_Makefile.in =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files/patch-src_egl_main_Makefile.in (revision 0) +++ graphics/libGL/files/patch-src_egl_main_Makefile.in (working copy) @@ -0,0 +1,19 @@ +--- src/egl/main/Makefile.in.orig 2013-08-01 23:22:16.000000000 +0200 ++++ src/egl/main/Makefile.in 2013-09-01 11:33:47.000000000 +0200 +@@ -990,8 +990,14 @@ + # a while by putting a link to the driver into /lib of the build tree. + all-local: libEGL.la + $(MKDIR_P) $(top_builddir)/$(LIB_DIR); +- ln -f .libs/libEGL.so.1.0.0 $(top_builddir)/$(LIB_DIR)/libEGL.so.1 +- ln -sf libEGL.so.1 $(top_builddir)/$(LIB_DIR)/libEGL.so ++ base=3D$(basename $<); \ ++ dlname=3D$$(grep dlname=3D .libs/$< | cut -d "'" -f 2); \ ++ ver=3D$$(grep current=3D .libs/$< | cut -d "=3D" -f 2); \ ++ ln -f .libs/$$dlname $(top_builddir)/$(LIB_DIR)/$$dlname; \ ++ if [ ! -f $(top_builddir)/$(LIB_DIR)/$$base.so.$$ver ]; then \ ++ ln -sf $$dlname $(top_builddir)/$(LIB_DIR)/$$base.so.$$ver; \ ++ fi; \ ++ ln -sf $$base.so.$$ver $(top_builddir)/$(LIB_DIR)/$$base.so +=20 + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. Property changes on: graphics/libGL/files/patch-src_egl_main_Makefile.in ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: graphics/libGL/files/patch-src_gallium_drivers_r300_r300-chipset.c= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files/patch-src_gallium_drivers_r300_r300-chipset.c (r= evision 0) +++ graphics/libGL/files/patch-src_gallium_drivers_r300_r300-chipset.c (w= orking copy) @@ -0,0 +1,26 @@ +diff --git a/src/gallium/drivers/r300/r300_chipset.c b/src/gallium/drive= rs/r300/r300_chipset.c +index 11061ed..daf990e 100644 +--- src/gallium/drivers/r300/r300_chipset.c ++++ src/gallium/drivers/r300/r300_chipset.c +@@ -48,6 +48,21 @@ static void r300_apply_hyperz_blacklist(struct r300_c= apabilities* caps) + }; + int i; +=20 ++#if defined(__DragonFly__) || \ ++ defined(__FreeBSD__) || \ ++ defined(__NetBSD__) || \ ++ defined(__OpenBSD__) ++ const char *progname, *program_invocation_short_name; ++ ++ progname =3D getprogname(); ++ program_invocation_short_name =3D strrchr(progname, '/'); ++ if (program_invocation_short_name) { ++ program_invocation_short_name++; ++ } else { ++ program_invocation_short_name =3D progname; ++ } ++#endif ++ + for (i =3D 0; i < Elements(list); i++) { + if (strcmp(list[i], program_invocation_short_name) =3D=3D 0) { + caps->zmask_ram =3D 0; Property changes on: graphics/libGL/files/patch-src_gallium_drivers_r300_= r300-chipset.c ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Index: graphics/libGL/files/patch-src_gallium_drivers_r600_r600-asm.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files/patch-src_gallium_drivers_r600_r600-asm.c (revis= ion 0) +++ graphics/libGL/files/patch-src_gallium_drivers_r600_r600-asm.c (worki= ng copy) @@ -0,0 +1,15 @@ +--- src/gallium/drivers/r600/r600_asm.c.orig 2013-03-20 00:28:25.0000000= 00 +0100 ++++ src/gallium/drivers/r600/r600_asm.c 2013-06-26 23:29:14.000000000 +0= 200 +@@ -27,7 +27,12 @@ + #include "r600d.h" +=20 + #include ++#if defined(__linux__) + #include ++#elif defined(__FreeBSD__) ++#include ++#define bswap_32(x) bswap32((x)) ++#endif + #include "util/u_memory.h" + #include "pipe/p_shader_tokens.h" +=20 Property changes on: graphics/libGL/files/patch-src_gallium_drivers_r600_= r600-asm.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: graphics/libGL/files/patch-src_gallium_drivers_r600_r600-shader.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files/patch-src_gallium_drivers_r600_r600-shader.c (re= vision 0) +++ graphics/libGL/files/patch-src_gallium_drivers_r600_r600-shader.c (wo= rking copy) @@ -0,0 +1,15 @@ +--- src/gallium/drivers/r600/r600_shader.c.orig 2013-05-16 19:38:54.0000= 00000 +0200 ++++ src/gallium/drivers/r600/r600_shader.c 2013-06-26 23:26:02.000000000= +0200 +@@ -35,7 +35,12 @@ + #include "util/u_memory.h" + #include + #include ++#if defined(__linux__) + #include ++#elif defined(__FreeBSD__) ++#include ++#define bswap_32(x) bswap32((x)) ++#endif +=20 + /* CAYMAN notes=20 + Why CAYMAN got loops for lots of instructions is explained here. Property changes on: graphics/libGL/files/patch-src_gallium_drivers_r600_= r600-shader.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: graphics/libGL/files/patch-src_gallium_drivers_r600_r600_state_com= mon.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files/patch-src_gallium_drivers_r600_r600_state_common= =2Ec (revision 0) +++ graphics/libGL/files/patch-src_gallium_drivers_r600_r600_state_common= =2Ec (working copy) @@ -0,0 +1,15 @@ +--- src/gallium/drivers/r600/r600_state_common.c.orig 2013-03-06 00:25:3= 9.000000000 +0100 ++++ src/gallium/drivers/r600/r600_state_common.c 2013-06-26 23:26:02.000= 000000 +0200 +@@ -33,7 +33,12 @@ + #include "util/u_memory.h" + #include "util/u_upload_mgr.h" + #include "tgsi/tgsi_parse.h" ++#if defined(__linux__) + #include ++#elif defined(__FreeBSD__) ++#include ++#define bswap_32(x) bswap32((x)) ++#endif +=20 + #define R600_PRIM_RECTANGLE_LIST PIPE_PRIM_MAX +=20 Property changes on: graphics/libGL/files/patch-src_gallium_drivers_r600_= r600_state_common.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: graphics/libGL/files/patch-src_gallium_drivers_radeon_radeon-llvm-= emit.cpp =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files/patch-src_gallium_drivers_radeon_radeon-llvm-emi= t.cpp (revision 0) +++ graphics/libGL/files/patch-src_gallium_drivers_radeon_radeon-llvm-emi= t.cpp (working copy) @@ -0,0 +1,28 @@ +--- src/gallium/drivers/radeon/radeon_llvm_emit.cpp.orig 2013-08-19 21:2= 3:06.000000000 +0200 ++++ src/gallium/drivers/radeon/radeon_llvm_emit.cpp 2013-08-19 21:30:58.= 000000000 +0200 +@@ -25,13 +25,13 @@ + */ + #include "radeon_llvm_emit.h" +=20 +-#include +-#include ++#include ++#include + #include + #include + #include + #include +-#include ++#include + #include + #include + #include +@@ -39,7 +39,7 @@ + #include + #include + #include +-#include ++#include +=20 + #include + #include Property changes on: graphics/libGL/files/patch-src_gallium_drivers_radeo= n_radeon-llvm-emit.cpp ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Index: graphics/libGL/files/patch-src_gallium_drivers_radeonsi_r600-buffe= r.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files/patch-src_gallium_drivers_radeonsi_r600-buffer.c= (revision 0) +++ graphics/libGL/files/patch-src_gallium_drivers_radeonsi_r600-buffer.c= (working copy) @@ -0,0 +1,16 @@ +--- src/gallium/drivers/radeonsi/r600_buffer.c.orig 2013-08-01 00:56:45.= 000000000 +0200 ++++ src/gallium/drivers/radeonsi/r600_buffer.c 2013-08-19 21:36:02.00000= 0000 +0200 +@@ -24,7 +24,13 @@ + * Jerome Glisse + * Corbin Simpson + */ ++ ++#if defined(__linux__) + #include ++#elif defined(__FreeBSD__) ++#include ++#define bswap_32(x) bswap32((x)) ++#endif +=20 + #include "pipe/p_screen.h" + #include "util/u_format.h" Property changes on: graphics/libGL/files/patch-src_gallium_drivers_radeo= nsi_r600-buffer.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: graphics/libGL/files/patch-src_gallium_winsys_svga_drm_vmw-screen-= ioctl.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files/patch-src_gallium_winsys_svga_drm_vmw-screen-ioc= tl.c (revision 0) +++ graphics/libGL/files/patch-src_gallium_winsys_svga_drm_vmw-screen-ioc= tl.c (working copy) @@ -0,0 +1,18 @@ +diff --git a/src/gallium/winsys/svga/drm/vmw_screen_ioctl.c b/src/galliu= m/winsys/svga/drm/vmw_screen_ioctl.c +index 36888dc..62a6e6a 100644 +--- src/gallium/winsys/svga/drm/vmw_screen_ioctl.c ++++ src/gallium/winsys/svga/drm/vmw_screen_ioctl.c +@@ -66,6 +66,13 @@ struct vmw_region + */ + #define SVGA3D_SURFACE_HINT_SCANOUT (1 << 9) +=20 ++#if defined(__DragonFly__) || \ ++ defined(__FreeBSD__) || \ ++ defined(__NetBSD__) || \ ++ defined(__OpenBSD__) ++#define ERESTART EINTR ++#endif ++ + uint32 + vmw_ioctl_context_create(struct vmw_winsys_screen *vws) + { Property changes on: graphics/libGL/files/patch-src_gallium_winsys_svga_d= rm_vmw-screen-ioctl.c ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Index: graphics/libGL/files/patch-src_glx_Makefile.in =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files/patch-src_glx_Makefile.in (revision 0) +++ graphics/libGL/files/patch-src_glx_Makefile.in (working copy) @@ -0,0 +1,59 @@ +--- src/glx/Makefile.in.orig 2013-07-03 15:13:37.000000000 +0200 ++++ src/glx/Makefile.in 2013-07-03 15:19:44.000000000 +0200 +@@ -162,12 +162,12 @@ + depcomp =3D $(SHELL) $(top_srcdir)/bin/depcomp + am__depfiles_maybe =3D depfiles + am__mv =3D mv -f +-COMPILE =3D $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS= ) \ +- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++COMPILE =3D $(CC) $(DEFS) $(AM_CFLAGS) $(DEFAULT_INCLUDES) $(INCLUDES) = \ ++ $(AM_CPPFLAGS) $(CPPFLAGS) $(CFLAGS) + LTCOMPILE =3D $(LIBTOOL) $(AM_V_lt) --tag=3DCC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=3Dcompile $(CC) $(DEFS) \ +- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ +- $(AM_CFLAGS) $(CFLAGS) ++ $(AM_CFLAGS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ ++ $(CPPFLAGS) $(CFLAGS) + AM_V_CC =3D $(am__v_CC_@AM_V@) + am__v_CC_ =3D $(am__v_CC_@AM_DEFAULT_V@) + am__v_CC_0 =3D @echo " CC " $@; +@@ -632,17 +632,17 @@ + $(am__aclocal_m4_deps): + install-libLTLIBRARIES: $(lib_LTLIBRARIES) + @$(NORMAL_INSTALL) +- @list=3D'$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=3D; \ ++ @list=3D'$(lib_LTLIBRARIES)'; test -n "$(libdir)/.libGL" || list=3D; \= + list2=3D; for p in $$list; do \ + if test -f $$p; then \ + list2=3D"$$list2 $$p"; \ + else :; fi; \ + done; \ + test -z "$$list2" || { \ +- echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \ +- $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \ +- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=3Dinstal= l $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \ +- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=3Dinstall $(INS= TALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \ ++ echo " $(MKDIR_P) '$(DESTDIR)$(libdir)/.libGL'"; \ ++ $(MKDIR_P) "$(DESTDIR)$(libdir)/.libGL" || exit 1; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=3Dinstal= l $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)/.libGL'";= \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=3Dinstall $(INS= TALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)/.libGL"; \ + } +=20 + uninstall-libLTLIBRARIES: +@@ -1068,8 +1068,14 @@ + # a while by putting a link to the driver into /lib of the build tree. + all-local: lib@GL_LIB@.la + $(MKDIR_P) $(top_builddir)/$(LIB_DIR); +- ln -f .libs/lib@GL_LIB@.so.1.2.0 $(top_builddir)/$(LIB_DIR)/lib@GL_LIB= @.so.1 +- ln -sf lib@GL_LIB@.so.1 $(top_builddir)/$(LIB_DIR)/lib@GL_LIB@.so ++ base=3D$(basename $<); \ ++ dlname=3D$$(grep dlname=3D .libs/$< | cut -d "'" -f 2); \ ++ ver=3D$$(grep current=3D .libs/$< | cut -d "=3D" -f 2); \ ++ ln -f .libs/$$dlname $(top_builddir)/$(LIB_DIR)/$$dlname; \ ++ if [ ! -f $(top_builddir)/$(LIB_DIR)/$$base.so.$$ver ]; then \ ++ ln -sf $$dlname $(top_builddir)/$(LIB_DIR)/$$base.so.$$ver; \ ++ fi; \ ++ ln -sf $$base.so.$$ver $(top_builddir)/$(LIB_DIR)/$$base.so +=20 + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. Property changes on: graphics/libGL/files/patch-src_glx_Makefile.in ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Index: graphics/libGL/files/patch-src_mapi_es2api_Makefile.in =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files/patch-src_mapi_es2api_Makefile.in (revision 0) +++ graphics/libGL/files/patch-src_mapi_es2api_Makefile.in (working copy)= @@ -0,0 +1,20 @@ +--- src/mapi/es2api/Makefile.in.orig 2013-08-01 23:22:21.000000000 +0200= ++++ src/mapi/es2api/Makefile.in 2013-09-01 11:38:01.000000000 +0200 +@@ -958,9 +958,14 @@ + # a while by putting a link to the driver into /lib of the build tree. + all-local: libGLESv2.la + $(MKDIR_P) $(top_builddir)/$(LIB_DIR); +- ln -f .libs/libGLESv2.so $(top_builddir)/$(LIB_DIR)/libGLESv2.so +- ln -f .libs/libGLESv2.so.2 $(top_builddir)/$(LIB_DIR)/libGLESv2.so.2 +- ln -f .libs/libGLESv2.so.2.0.0 $(top_builddir)/$(LIB_DIR)/libGLESv2.so= =2E2.0.0 ++ base=3D$(basename $<); \ ++ dlname=3D$$(grep dlname=3D .libs/$< | cut -d "'" -f 2); \ ++ ver=3D$$(grep current=3D .libs/$< | cut -d "=3D" -f 2); \ ++ ln -f .libs/$$dlname $(top_builddir)/$(LIB_DIR)/$$dlname; \ ++ if [ ! -f $(top_builddir)/$(LIB_DIR)/$$base.so.$$ver ]; then \ ++ ln -sf $$dlname $(top_builddir)/$(LIB_DIR)/$$base.so.$$ver; \ ++ fi; \ ++ ln -sf $$base.so.$$ver $(top_builddir)/$(LIB_DIR)/$$base.so +=20 + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. Property changes on: graphics/libGL/files/patch-src_mapi_es2api_Makefile.= in ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: graphics/libGL/files/patch-src_mapi_glapi_gen_gl-gentable.py =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files/patch-src_mapi_glapi_gen_gl-gentable.py (revisio= n 0) +++ graphics/libGL/files/patch-src_mapi_glapi_gen_gl-gentable.py (working= copy) @@ -0,0 +1,11 @@ +--- src/mapi/glapi/gen/gl_gentable.py.orig 2013-07-17 15:41:13.000000000= +0200 ++++ src/mapi/glapi/gen/gl_gentable.py 2013-07-17 15:41:55.000000000 +020= 0 +@@ -42,7 +42,7 @@ + #endif +=20 + #if (defined(GLXEXT) && defined(HAVE_BACKTRACE)) \\ +- || (!defined(GLXEXT) && defined(DEBUG) && !defined(_WIN32_WCE) && !def= ined(__CYGWIN__)) ++ || (!defined(GLXEXT) && defined(DEBUG) && !defined(_WIN32_WCE) && !def= ined(__CYGWIN__) && !defined(__OpenBSD__) && !defined(__FreeBSD__)) + #define USE_BACKTRACE + #endif +=20 Property changes on: graphics/libGL/files/patch-src_mapi_glapi_gen_gl-gen= table.py ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: graphics/libGL/files/patch-src_mapi_shared-glapi_Makefile.in =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files/patch-src_mapi_shared-glapi_Makefile.in (revisio= n 0) +++ graphics/libGL/files/patch-src_mapi_shared-glapi_Makefile.in (working= copy) @@ -0,0 +1,20 @@ +--- src/mapi/shared-glapi/Makefile.in.orig 2013-06-27 00:42:45.000000000= +0200 ++++ src/mapi/shared-glapi/Makefile.in 2013-06-27 00:43:25.000000000 +020= 0 +@@ -889,9 +889,14 @@ +=20 + all-local: libglapi.la + $(MKDIR_P) $(top_builddir)/$(LIB_DIR) +- ln -f .libs/libglapi.so.0.0.0 $(top_builddir)/$(LIB_DIR)/libglapi.so.0= =2E0.0 +- ln -sf libglapi.so.0.0.0 $(top_builddir)/$(LIB_DIR)/libglapi.so.0 +- ln -sf libglapi.so.0 $(top_builddir)/$(LIB_DIR)/libglapi.so ++ base=3D$(basename $<); \ ++ dlname=3D$$(grep dlname=3D .libs/$< | cut -d "'" -f 2); \ ++ ver=3D$$(grep current=3D .libs/$< | cut -d "=3D" -f 2); \ ++ ln -f .libs/$$dlname $(top_builddir)/$(LIB_DIR)/$$dlname; \ ++ if [ ! -f $(top_builddir)/$(LIB_DIR)/$$base.so.$$ver ]; then \ ++ ln -sf $$dlname $(top_builddir)/$(LIB_DIR)/$$base.so.$$ver; \ ++ fi; \ ++ ln -sf $$base.so.$$ver $(top_builddir)/$(LIB_DIR)/$$base.so +=20 + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. Property changes on: graphics/libGL/files/patch-src_mapi_shared-glapi_Mak= efile.in ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: graphics/libGL/files/patch-src_mesa_Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files/patch-src_mesa_Makefile (revision 326808) +++ graphics/libGL/files/patch-src_mesa_Makefile (working copy) @@ -1,15 +0,0 @@ ---- src/mesa/Makefile.orig 2012-04-22 18:34:50.000000000 +0200 -+++ src/mesa/Makefile 2012-04-22 18:35:00.000000000 +0200 -@@ -183,10 +183,10 @@ - $(DESTDIR)$(INSTALL_INC_DIR)/GL -=20 - install-libgl: default gl.pc install-headers -- $(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR) -+ $(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)/.libGL - $(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig - $(MINSTALL) $(TOP)/$(LIB_DIR)/$(GL_LIB_GLOB) \ -- $(DESTDIR)$(INSTALL_LIB_DIR) -+ $(DESTDIR)$(INSTALL_LIB_DIR)/.libGL - $(INSTALL) -m 644 gl.pc $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig -=20 - install-osmesa: default osmesa.pc Index: graphics/libGL/files/patch-src_mesa_drivers_dri_common_Makefile.in= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files/patch-src_mesa_drivers_dri_common_Makefile.in (r= evision 0) +++ graphics/libGL/files/patch-src_mesa_drivers_dri_common_Makefile.in (w= orking copy) @@ -0,0 +1,17 @@ +--- src/mesa/drivers/dri/common/Makefile.in.orig 2013-04-20 14:50:15.000= 000000 +0000 ++++ src/mesa/drivers/dri/common/Makefile.in 2013-04-20 15:02:05.00000000= 0 +0000 +@@ -123,11 +123,11 @@ + am__depfiles_maybe =3D depfiles + am__mv =3D mv -f + COMPILE =3D $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS= ) \ +- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++ $(AM_CFLAGS) $(CPPFLAGS) $(CFLAGS) + LTCOMPILE =3D $(LIBTOOL) $(AM_V_lt) --tag=3DCC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=3Dcompile $(CC) $(DEFS) \ +- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ +- $(AM_CFLAGS) $(CFLAGS) ++ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(AM_CFLAGS) $(CPPFLAGS= ) \ ++ $(CFLAGS) + AM_V_CC =3D $(am__v_CC_@AM_V@) + am__v_CC_ =3D $(am__v_CC_@AM_DEFAULT_V@) + am__v_CC_0 =3D @echo " CC " $@; Property changes on: graphics/libGL/files/patch-src_mesa_drivers_dri_comm= on_Makefile.in ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Index: graphics/libGL/files/patch-src_mesa_drivers_dri_common_xmlpool_Mak= efile.in =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files/patch-src_mesa_drivers_dri_common_xmlpool_Makefi= le.in (revision 0) +++ graphics/libGL/files/patch-src_mesa_drivers_dri_common_xmlpool_Makefi= le.in (working copy) @@ -0,0 +1,11 @@ +--- src/mesa/drivers/dri/common/xmlpool/Makefile.in.orig 2013-07-02 22:4= 2:09.000000000 +0200 ++++ src/mesa/drivers/dri/common/xmlpool/Makefile.in 2013-07-02 22:53:30.= 000000000 +0200 +@@ -639,7 +639,7 @@ + # Update .mo files from the corresponding .po files. + %/LC_MESSAGES/options.mo: %.po + @mo=3D"$@"; \ +- lang=3D$${mo%%/*}; \ ++ lang=3D$*; \ + echo "Updating ($$lang) $@ from $?."; \ + mkdir -p $$lang/LC_MESSAGES; \ + msgfmt -o $@ $? Property changes on: graphics/libGL/files/patch-src_mesa_drivers_dri_comm= on_xmlpool_Makefile.in ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Index: graphics/libGL/files/patch-src_mesa_libdricore_Makefile.in =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files/patch-src_mesa_libdricore_Makefile.in (revision = 0) +++ graphics/libGL/files/patch-src_mesa_libdricore_Makefile.in (working c= opy) @@ -0,0 +1,19 @@ +--- src/mesa/libdricore/Makefile.in.orig 2013-06-27 00:21:26.000000000 += 0200 ++++ src/mesa/libdricore/Makefile.in 2013-06-27 00:28:29.000000000 +0200 +@@ -3950,8 +4000,14 @@ + # a while by putting a link to the driver into /lib of the build tree. + @HAVE_DRI_TRUE@all-local: libdricore@VERSION@.la + @HAVE_DRI_TRUE@ $(MKDIR_P) $(top_builddir)/$(LIB_DIR); +-@HAVE_DRI_TRUE@ ln -f .libs/libdricore@VERSION@.so.1.0.0 $(top_builddir= )/$(LIB_DIR)/libdricore@VERSION@.so.1; +-@HAVE_DRI_TRUE@ ln -sf libdricore@VERSION@.so.1 $(top_builddir)/$(LIB_D= IR)/libdricore@VERSION@.so ++@HAVE_DRI_TRUE@ base=3D$(basename $<); \ ++@HAVE_DRI_TRUE@ dlname=3D$$(grep dlname=3D .libs/$< | cut -d "'" -f 2);= \ ++@HAVE_DRI_TRUE@ ver=3D$$(grep current=3D .libs/$< | cut -d "=3D" -f 2);= \ ++@HAVE_DRI_TRUE@ ln -f .libs/$$dlname $(top_builddir)/$(LIB_DIR)/$$dlnam= e; \ ++@HAVE_DRI_TRUE@ if [ ! -f $(top_builddir)/$(LIB_DIR)/$$base.so.$$ver ];= then \ ++@HAVE_DRI_TRUE@ ln -sf $$dlname $(top_builddir)/$(LIB_DIR)/$$base.so.= $$ver; \ ++@HAVE_DRI_TRUE@ fi; \ ++@HAVE_DRI_TRUE@ ln -sf $$base.so.$$ver $(top_builddir)/$(LIB_DIR)/$$bas= e.so +=20 + -include $(DEPENDS) +=20 Property changes on: graphics/libGL/files/patch-src_mesa_libdricore_Makef= ile.in ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Index: graphics/libGL/files/patch-src_mesa_main_compiler.h =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files/patch-src_mesa_main_compiler.h (revision 0) +++ graphics/libGL/files/patch-src_mesa_main_compiler.h (working copy) @@ -0,0 +1,12 @@ +--- src/mesa/main/compiler.h.orig 2013-04-06 04:01:09.000000000 +0200 ++++ src/mesa/main/compiler.h 2013-06-26 23:26:02.000000000 +0200 +@@ -171,6 +171,9 @@ + #if defined(__linux__) + #include + #define CPU_TO_LE32( x ) bswap_32( x ) ++#elif defined(__FreeBSD__) ++#include ++#define CPU_TO_LE32( x ) bswap32( x ) + #elif defined(__APPLE__) + #include + #define CPU_TO_LE32( x ) CFSwapInt32HostToLittle( x ) Property changes on: graphics/libGL/files/patch-src_mesa_main_compiler.h ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Index: graphics/libGL/files-old/patch-configure =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files-old/patch-configure (revision 0) +++ graphics/libGL/files-old/patch-configure (working copy) @@ -0,0 +1,43 @@ +--- configure.orig 2009-12-22 03:31:30.000000000 +0100 ++++ configure 2012-06-27 19:49:26.000000000 +0200 +@@ -6946,12 +6946,35 @@ + CXXFLAGS=3D"$CXXFLAGS -ansi -pedantic" + fi +=20 +- # ffb and gamma are missing because they have not been converte= d +- # to use the new interface. +- if test "x$DRI_DIRS" =3D "xyes"; then +- DRI_DIRS=3D"i810 i915 i965 mach64 mga r128 r200 r300 r600 r= adeon tdfx \ ++ case "$host_cpu" in ++ x86_64) ++ # i810 is missing because there is no x86-64 system where i= t ++ # could *ever* be used. ++ if test "x$DRI_DIRS" =3D "xyes"; then ++ DRI_DIRS=3D"i915 i965 mach64 mga r128 r200 r300 r600 ra= deon tdfx \ + unichrome savage sis swrast" +- fi ++ fi ++ ;; ++ i*86) ++ if test "x$DRI_DIRS" =3D "xyes"; then ++ DRI_DIRS=3D"i810 i915 i965 mach64 mga r128 r200 r300 r6= 00 radeon tdfx \ ++ unichrome savage sis swrast" ++ fi ++ ;; ++ powerpc*) ++ # Build only the drivers for cards that exist on PowerPC. ++ # At some point MGA will be added, but not yet. ++ if test "x$DRI_DIRS" =3D "xyes"; then ++ DRI_DIRS=3D"mach64 r128 r200 r300 r600 radeon tdfx swra= st" ++ fi ++ ;; ++ sparc*) ++ # Build only the drivers for cards that exist on SPARC. ++ if test "x$DRI_DIRS" =3D "xyes"; then ++ DRI_DIRS=3D"mach64 r128 r200 r300 r600 radeon swrast" ++ fi ++ ;; ++ esac + ;; + gnu*) + DEFINES=3D"$DEFINES -DUSE_EXTERNAL_DXTN_LIB=3D1 -DIN_DRI_DRIVER= " Property changes on: graphics/libGL/files-old/patch-configure ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Index: graphics/libGL/files-old/patch-mach64_context.h =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files-old/patch-mach64_context.h (revision 0) +++ graphics/libGL/files-old/patch-mach64_context.h (working copy) @@ -0,0 +1,20 @@ +--- src/mesa/drivers/dri/mach64/mach64_context.h.orig 2012-06-27 19:59:3= 2.000000000 +0200 ++++ src/mesa/drivers/dri/mach64/mach64_context.h 2012-06-27 20:08:30.000= 000000 +0200 +@@ -294,11 +294,14 @@ + #define LE32_OUT( x, y ) do { *(GLuint *)(x) =3D (y); } while (0) + #define LE32_OUT_FLOAT( x, y ) do { *(GLfloat *)(x) =3D (y); } while (0= ) + #else +-#ifndef __OpenBSD__ +-#include +-#else ++#if defined(__OpenBSD__) + #include + #define bswap_32 bswap32 ++#elif defined(__FreeBSD__) ++#include ++#define bswap_32 bswap32 ++#else ++#include + #endif +=20 + #define LE32_IN( x ) bswap_32( *(GLuint *)(x) ) Property changes on: graphics/libGL/files-old/patch-mach64_context.h ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Index: graphics/libGL/files-old/patch-src__mesa__x86-64__glapi_x86-64.S =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files-old/patch-src__mesa__x86-64__glapi_x86-64.S (rev= ision 0) +++ graphics/libGL/files-old/patch-src__mesa__x86-64__glapi_x86-64.S (wor= king copy) @@ -0,0 +1,12 @@ +--- ./src/mesa/x86-64/glapi_x86-64.S.orig 2009-03-13 04:28:49.000000000 = +0100 ++++ ./src/mesa/x86-64/glapi_x86-64.S 2011-01-28 18:12:18.000000000 +0100= +@@ -73,7 +73,8 @@ _x86_64_get_dispatch: +=20 + .p2align 4,,15 + _x86_64_get_dispatch: +- movq _gl_DispatchTSD(%rip), %rdi ++ movq _gl_DispatchTSD@GOTPCREL(%rip), %rax ++ movl (%rax), %edi + jmp pthread_getspecific@PLT +=20 + #elif defined(THREADS) Property changes on: graphics/libGL/files-old/patch-src__mesa__x86-64__gl= api_x86-64.S ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: graphics/libGL/files-old/patch-src__mesa__x86-64__xform4.S =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files-old/patch-src__mesa__x86-64__xform4.S (revision = 0) +++ graphics/libGL/files-old/patch-src__mesa__x86-64__xform4.S (working c= opy) @@ -0,0 +1,74 @@ +--- src/mesa/x86-64/xform4.S.orig 2009-01-22 18:38:35.000000000 +0100 ++++ src/mesa/x86-64/xform4.S 2011-05-09 21:26:00.000000000 +0200 +@@ -53,7 +53,7 @@ _mesa_x86_64_transform_points4_general: + * rdx =3D source + */ + movl V4F_COUNT(%rdx), %ecx /* count */ +- movzx V4F_STRIDE(%rdx), %eax /* stride */ ++ movzbl V4F_STRIDE(%rdx), %eax /* stride */ +=20 + movl %ecx, V4F_COUNT(%rdi) /* set dest count */ + movl $4, V4F_SIZE(%rdi) /* set dest size */ +@@ -116,7 +116,7 @@ p4_constants: + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 +-.float 0f+1.0 ++.float 1.0 +=20 + .text + .align 16 +@@ -135,7 +135,7 @@ _mesa_x86_64_transform_points4_3d: + movaps 16(%rax), %xmm10 +=20 + movl V4F_COUNT(%rdx), %ecx /* count */ +- movzx V4F_STRIDE(%rdx), %eax /* stride */ ++ movzbl V4F_STRIDE(%rdx), %eax /* stride */ +=20 + movl %ecx, V4F_COUNT(%rdi) /* set dest count */ + movl $4, V4F_SIZE(%rdi) /* set dest size */ +@@ -195,7 +195,7 @@ p4_3d_done: + _mesa_x86_64_transform_points4_identity: +=20 + movl V4F_COUNT(%rdx), %ecx /* count */ +- movzx V4F_STRIDE(%rdx), %eax /* stride */ ++ movzbl V4F_STRIDE(%rdx), %eax /* stride */ +=20 + movl %ecx, V4F_COUNT(%rdi) /* set dest count */ + movl $4, V4F_SIZE(%rdi) /* set dest size */ +@@ -223,7 +223,7 @@ p4_identity_done: + _mesa_3dnow_transform_points4_3d_no_rot: +=20 + movl V4F_COUNT(%rdx), %ecx /* count */ +- movzx V4F_STRIDE(%rdx), %eax /* stride */ ++ movzbl V4F_STRIDE(%rdx), %eax /* stride */ +=20 + movl %ecx, V4F_COUNT(%rdi) /* set dest count */ + movl $4, V4F_SIZE(%rdi) /* set dest size */ +@@ -287,7 +287,7 @@ p4_3d_no_rot_done: + _mesa_3dnow_transform_points4_perspective: +=20 + movl V4F_COUNT(%rdx), %ecx /* count */ +- movzx V4F_STRIDE(%rdx), %eax /* stride */ ++ movzbl V4F_STRIDE(%rdx), %eax /* stride */ +=20 + movl %ecx, V4F_COUNT(%rdi) /* set dest count */ + movl $4, V4F_SIZE(%rdi) /* set dest size */ +@@ -353,7 +353,7 @@ p4_perspective_done: + _mesa_3dnow_transform_points4_2d_no_rot: +=20 + movl V4F_COUNT(%rdx), %ecx /* count */ +- movzx V4F_STRIDE(%rdx), %eax /* stride */ ++ movzbl V4F_STRIDE(%rdx), %eax /* stride */ +=20 + movl %ecx, V4F_COUNT(%rdi) /* set dest count */ + movl $4, V4F_SIZE(%rdi) /* set dest size */ +@@ -408,7 +408,7 @@ p4_2d_no_rot_done: + _mesa_3dnow_transform_points4_2d: +=20 + movl V4F_COUNT(%rdx), %ecx /* count */ +- movzx V4F_STRIDE(%rdx), %eax /* stride */ ++ movzbl V4F_STRIDE(%rdx), %eax /* stride */ +=20 + movl %ecx, V4F_COUNT(%rdi) /* set dest count */ + movl $4, V4F_SIZE(%rdi) /* set dest size */ Property changes on: graphics/libGL/files-old/patch-src__mesa__x86-64__xf= orm4.S ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: graphics/libGL/files-old/patch-src__mesa__x86__glapi_x86.S =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files-old/patch-src__mesa__x86__glapi_x86.S (revision = 0) +++ graphics/libGL/files-old/patch-src__mesa__x86__glapi_x86.S (working c= opy) @@ -0,0 +1,11 @@ +--- ./src/mesa/x86/glapi_x86.S.orig 2009-03-13 04:28:49.000000000 +0100 ++++ ./src/mesa/x86/glapi_x86.S 2011-01-28 18:11:56.000000000 +0100 +@@ -47,7 +47,7 @@ + #define GL_OFFSET(x) CODEPTR(REGOFF(4 * x, EAX)) +=20 + #if defined(GNU_ASSEMBLER) && !defined(__DJGPP__) && !defined(__MINGW32= __) +-#define GLOBL_FN(x) GLOBL x ; .type x, function ++#define GLOBL_FN(x) GLOBL x ; .type x, @function + #else + #define GLOBL_FN(x) GLOBL x + #endif Property changes on: graphics/libGL/files-old/patch-src__mesa__x86__glapi= _x86.S ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: graphics/libGL/files-old/patch-src__mesa__x86__read_rgba_span_x86.= S =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files-old/patch-src__mesa__x86__read_rgba_span_x86.S (= revision 0) +++ graphics/libGL/files-old/patch-src__mesa__x86__read_rgba_span_x86.S (= working copy) @@ -0,0 +1,11 @@ +--- ./src/mesa/x86/read_rgba_span_x86.S.orig 2008-08-25 16:46:47.0000000= 00 +0200 ++++ ./src/mesa/x86/read_rgba_span_x86.S 2011-01-28 18:10:06.000000000 +0= 100 +@@ -648,7 +648,7 @@ _generic_read_RGBA_span_RGB565_MMX: + testl $0x01, %ecx + je .L01 +=20 +- movzxw (%eax), %ecx ++ movzwl (%eax), %ecx + movd %ecx, %mm4 +=20 + pshufw $0x00, %mm4, %mm0 Property changes on: graphics/libGL/files-old/patch-src__mesa__x86__read_= rgba_span_x86.S ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: graphics/libGL/files-old/patch-src_glx_x11_XF86dri.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files-old/patch-src_glx_x11_XF86dri.c (revision 0) +++ graphics/libGL/files-old/patch-src_glx_x11_XF86dri.c (working copy) @@ -0,0 +1,38 @@ +--- src/glx/x11/XF86dri.c.orig 2009-06-17 18:35:16.000000000 +0000 ++++ src/glx/x11/XF86dri.c 2013-05-29 10:09:37.000000000 +0000 +@@ -43,6 +43,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN + #include + #include + #include "xf86dristr.h" ++#include +=20 +=20 + #if defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__) >=3D 303 +@@ -212,7 +213,11 @@ XF86DRIOpenConnection(Display * dpy, int + } +=20 + if (rep.length) { +- if (!(*busIdString =3D (char *) Xcalloc(rep.busIdStringLength + 1= , 1))) { ++ if (rep.busIdStringLength < INT_MAX) ++ *busIdString =3D Xcalloc(rep.busIdStringLength + 1, 1); ++ else ++ *busIdString =3D NULL; ++ if (*busIdString =3D=3D NULL) { + _XEatData(dpy, ((rep.busIdStringLength + 3) & ~3)); + UnlockDisplay(dpy); + SyncHandle(); +@@ -311,9 +316,11 @@ XF86DRIGetClientDriverName(Display * dpy + *ddxDriverPatchVersion =3D rep.ddxDriverPatchVersion; +=20 + if (rep.length) { +- if (! +- (*clientDriverName =3D +- (char *) Xcalloc(rep.clientDriverNameLength + 1, 1))) { ++ if (rep.clientDriverNameLength < INT_MAX) ++ *clientDriverName =3D Xcalloc(rep.clientDriverNameLength + 1, 1); ++ else ++ *clientDriverName =3D NULL; ++ if (*clientDriverName =3D=3D NULL) { + _XEatData(dpy, ((rep.clientDriverNameLength + 3) & ~3)); + UnlockDisplay(dpy); + SyncHandle(); Property changes on: graphics/libGL/files-old/patch-src_glx_x11_XF86dri.c= ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +on \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: graphics/libGL/files-old/patch-src_mesa_Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files-old/patch-src_mesa_Makefile (revision 0) +++ graphics/libGL/files-old/patch-src_mesa_Makefile (working copy) @@ -0,0 +1,15 @@ +--- src/mesa/Makefile.orig 2009-12-22 03:31:19.000000000 +0100 ++++ src/mesa/Makefile 2013-08-19 23:19:42.000000000 +0200 +@@ -127,10 +127,10 @@ + $(DESTDIR)$(INSTALL_INC_DIR)/GL +=20 + install-libgl: default gl.pc install-headers +- $(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR) ++ $(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)/.libGL + $(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig + $(MINSTALL) $(TOP)/$(LIB_DIR)/$(GL_LIB_GLOB) \ +- $(DESTDIR)$(INSTALL_LIB_DIR) ++ $(DESTDIR)$(INSTALL_LIB_DIR)/.libGL + $(INSTALL) -m 644 gl.pc $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig +=20 + install-osmesa: default osmesa.pc Property changes on: graphics/libGL/files-old/patch-src_mesa_Makefile ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: graphics/libGL/pkg-plist =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/pkg-plist (revision 326808) +++ graphics/libGL/pkg-plist (working copy) @@ -11,9 +11,10 @@ %%OLD%%include/GL/mglmesa.h include/GL/osmesa.h %%OLD%%include/GL/svgamesa.h -include/GL/vms_x_fix.h +%%OLD%%include/GL/vms_x_fix.h include/GL/wglext.h include/GL/wmesa.h +%%NEW%%lib/.libGL/libGL.la lib/.libGL/libGL.so lib/.libGL/libGL.so.1 libdata/pkgconfig/gl.pc Index: graphics/libGLw/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGLw/Makefile (revision 326808) +++ graphics/libGLw/Makefile (working copy) @@ -12,9 +12,10 @@ COMMENT=3D OpenGL widgets library =20 USE_BZIP2=3D yes -USES=3D pathfix pkgconfig motif +USES=3D pathfix pkgconfig USE_LDCONFIG=3D yes USE_GL=3D gl +USE_MOTIF=3D yes USE_XORG=3D x11 xt xext GNU_CONFIGURE=3D yes CONFIGURE_ARGS=3D --disable-static --enable-motif Index: graphics/libdrm/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libdrm/Makefile (revision 326808) +++ graphics/libdrm/Makefile (working copy) @@ -10,8 +10,8 @@ MAINTAINER=3D x11@FreeBSD.org COMMENT=3D Userspace interface to kernel Direct Rendering Module service= s =20 -LIB_DEPENDS=3D pciaccess:${PORTSDIR}/devel/libpciaccess \ - pthread-stubs:${PORTSDIR}/devel/libpthread-stubs +LIB_DEPENDS=3D libpciaccess.so:${PORTSDIR}/devel/libpciaccess \ + libpthread-stubs.so:${PORTSDIR}/devel/libpthread-stubs =20 USES=3D pkgconfig USE_BZIP2=3D yes @@ -18,15 +18,8 @@ GNU_CONFIGURE=3D yes USE_LDCONFIG=3D yes =20 +OPTIONS_DEFINE=3D MANPAGES =20 -.if defined(WITH_NEW_XORG) - -USES+=3D gmake - -OPTIONS_DEFINE=3D KMS MANPAGES -OPTIONS_DEFAULT=3DKMS -KMS_DESC=3D Enable KMS support - .if defined(PACKAGE_BUILDING) OPTIONS_DEFAULT+=3D MANPAGES .endif @@ -33,12 +26,18 @@ =20 .include =20 -.if ${PORT_OPTIONS:MKMS} +.if defined(WITH_NEW_XORG) + +USES+=3D gmake + +# KMS support in the kernel is only build on these archs, disable others= +.if ${ARCH} =3D=3D "amd64" || ${ARCH} =3D=3D "i386" CONFIGURE_ARGS+=3D--enable-libkms EXTRA_PATCHES+=3D ${FILESDIR}/extra-xf86drmMode.c -PLIST_SUB+=3D KMS=3D"" +PLIST_SUB+=3D KMS=3D"" NOUVEAU=3D"" .else -PLIST_SUB+=3D KMS=3D"@comment " +CONFIGURE_ARGS+=3D--disable-libkms +PLIST_SUB+=3D KMS=3D"@comment " NOUVEAU=3D"@comment " .endif =20 .if ${PORT_OPTIONS:MMANPAGES} @@ -69,11 +68,9 @@ CONFIGURE_ARGS=3D --enable-nouveau-experimental-api LIBDRM_VERSION=3D 2.4.17 LIBDRM_REVISION=3D1 -PLIST_SUB+=3D OLD=3D"" NEW=3D"@comment " +PLIST_SUB+=3D OLD=3D"" NEW=3D"@comment " NOUVEAU=3D"" .endif =20 -.include - .if ${ARCH} =3D=3D "amd64" || ${ARCH} =3D=3D "i386" || ${ARCH} =3D=3D "i= a64" || ${ARCH} =3D=3D "powerpc" PLIST_SUB+=3D INTEL_DRIVER=3D"" PLIST_SUB+=3D RADEON_DRIVERS=3D"" @@ -87,4 +84,4 @@ s,i?86|x86_64),i?86|amd64|x86_64),g' \ ${WRKSRC}/configure =20 -.include +.include Index: graphics/libdrm/pkg-plist =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libdrm/pkg-plist (revision 326808) +++ graphics/libdrm/pkg-plist (working copy) @@ -22,8 +22,9 @@ %%NEW%%%%INTEL_DRIVER%%include/libdrm/intel_debug.h %%NEW%%include/libdrm/mach64_drm.h %%NEW%%include/libdrm/mga_drm.h -%%NEW%%include/libdrm/nouveau.h +%%NEW%%%%NOUVEAU%%include/libdrm/nouveau.h %%NEW%%include/libdrm/nouveau_drm.h +%%NEW%%include/libdrm/qxl_drm.h %%NEW%%include/libdrm/r128_drm.h %%NEW%%%%RADEON_DRIVERS%%include/libdrm/r600_pci_ids.h %%NEW%%%%RADEON_DRIVERS%%include/libdrm/radeon_bo.h @@ -54,10 +55,10 @@ %%INTEL_DRIVER%%lib/libdrm_intel.la %%INTEL_DRIVER%%lib/libdrm_intel.so %%INTEL_DRIVER%%lib/libdrm_intel.so.1 -lib/libdrm_nouveau.la -lib/libdrm_nouveau.so -%%OLD%%lib/libdrm_nouveau.so.1 -%%NEW%%lib/libdrm_nouveau.so.2 +%%NOUVEAU%%lib/libdrm_nouveau.la +%%NOUVEAU%%lib/libdrm_nouveau.so +%%OLD%%%%NOUVEAU%%lib/libdrm_nouveau.so.1 +%%NEW%%%%NOUVEAU%%lib/libdrm_nouveau.so.2 %%NEW%%%%RADEON_DRIVERS%%lib/libdrm_radeon.la %%NEW%%%%RADEON_DRIVERS%%lib/libdrm_radeon.so %%NEW%%%%RADEON_DRIVERS%%lib/libdrm_radeon.so.1 @@ -66,7 +67,7 @@ %%NEW%%%%KMS%%lib/libkms.so.1 libdata/pkgconfig/libdrm.pc %%INTEL_DRIVER%%libdata/pkgconfig/libdrm_intel.pc -libdata/pkgconfig/libdrm_nouveau.pc +%%NOUVEAU%%libdata/pkgconfig/libdrm_nouveau.pc %%NEW%%%%RADEON_DRIVERS%%libdata/pkgconfig/libdrm_radeon.pc %%NEW%%%%KMS%%libdata/pkgconfig/libkms.pc %%OLD%%@dirrm include/nouveau Index: graphics/libglesv2/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libglesv2/Makefile (revision 0) +++ graphics/libglesv2/Makefile (working copy) @@ -0,0 +1,29 @@ +# Created by: kwm@FreeBSD.org +# $FreeBSD$ + +PORTNAME=3D libglesv2 +PORTVERSION=3D ${MESAVERSION} +CATEGORIES=3D graphics + +COMMENT=3D OpenGL ES v2 library + +LIB_DEPENDS+=3D libdrm.so:${PORTSDIR}/graphics/libdrm \ + libexpat.so:${PORTSDIR}/textproc/expat2 + +.if ! defined(WITH_NEW_XORG) +IGNORE=3D Please enable WITH_NEW_XORG, libglesv2 needs libdrm higher th= en 2.4.24 +.endif + +# stuff not needed by libEGL but configure wants it +USE_XORG+=3D glproto dri2proto xext xdamage xfixes + + +BUILD_WKRSRC=3D ${WRKSRC}/src/mapi/es2api +INSTALL_WRKSRC=3D ${WRKSRC}/src/mapi/es2api + +# this library doesn't exist in Mesa 7.6 so use newer +WITH_NEW_XORG=3Dyes + +.include +.include "${.CURDIR}/../../graphics/libGL/bsd.mesalib.mk" +.include Property changes on: graphics/libglesv2/Makefile ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +FreeBSD=3D%H \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Index: graphics/libglesv2/pkg-descr =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libglesv2/pkg-descr (revision 0) +++ graphics/libglesv2/pkg-descr (working copy) @@ -0,0 +1,3 @@ +This package contains the GL ES v2 utility library. + +WWW: http://www.freedesktop.org/Software/xorg Property changes on: graphics/libglesv2/pkg-descr ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: graphics/libglesv2/pkg-plist =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libglesv2/pkg-plist (revision 0) +++ graphics/libglesv2/pkg-plist (working copy) @@ -0,0 +1,12 @@ +include/GLES2/gl2.h +include/GLES2/gl2ext.h +include/GLES2/gl2platform.h +include/GLES3/gl3.h +include/GLES3/gl3ext.h +include/GLES3/gl3platform.h +lib/libGLESv2.la +lib/libGLESv2.so +lib/libGLESv2.so.2 +libdata/pkgconfig/glesv2.pc +@dirrmtry include/GLES3 +@dirrmtry include/GLES2 Property changes on: graphics/libglesv2/pkg-plist ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: graphics/libreatlas/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libreatlas/Makefile (revision 326808) +++ graphics/libreatlas/Makefile (working copy) @@ -3,7 +3,7 @@ =20 PORTNAME=3D libreatlas PORTVERSION=3D 1.0.0a -PORTREVISION=3D 3 +PORTREVISION=3D 4 CATEGORIES=3D graphics geography MASTER_SITES=3D http://www.gaia-gis.it/gaia-sins/ =20 @@ -30,8 +30,7 @@ fontconfig:${PORTSDIR}/x11-fonts/fontconfig =20 GNU_CONFIGURE=3D yes -USES=3D pkgconfig gettext iconv -USE_GMAKE=3D yes +USES=3D pkgconfig gettext gmake iconv USE_XORG=3D ice pixman sm x11 xau xcb xcomposite xcursor xdamage xdmcp x= ext \ xfixes xi xinerama xrandr xrender xxf86vm USE_GNOME=3D atk gdkpixbuf2 glib20 gtk20 pango Index: multimedia/freetuxtv/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- multimedia/freetuxtv/Makefile (revision 326808) +++ multimedia/freetuxtv/Makefile (working copy) @@ -3,7 +3,7 @@ =20 PORTNAME=3D freetuxtv PORTVERSION=3D 0.6.5 -PORTREVISION=3D 4 +PORTREVISION=3D 5 CATEGORIES=3D multimedia MASTER_SITES=3D GOOGLE_CODE =20 @@ -26,13 +26,12 @@ expat:${PORTSDIR}/textproc/expat2 \ fontconfig:${PORTSDIR}/x11-fonts/fontconfig =20 -USES=3D iconv pathfix pkgconfig +USES=3D gmake iconv pathfix pkgconfig USE_GNOME=3D glib20 gtk20 USE_XORG=3D pixman x11 xau xcb xcomposite xcursor xdamage xdmcp xext xfi= xes \ xi xinerama xrandr xrender GNU_CONFIGURE=3D yes CONFIGURE_ARGS+=3D--with-gtk=3D2.0 -USE_GMAKE=3D yes CFLAGS=3D -Wno-return-type INSTALLS_ICONS=3D yes =20 Index: net/cvsup/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- net/cvsup/Makefile (revision 326808) +++ net/cvsup/Makefile (working copy) @@ -3,7 +3,7 @@ =20 PORTNAME=3D cvsup PORTVERSION=3D 16.1h -PORTREVISION=3D 4 +PORTREVISION=3D 5 CATEGORIES=3D net devel MASTER_SITES=3D ${MASTER_SITE_FREEBSD_ORG} MASTER_SITE_SUBDIR=3Ddevelopment/CVSup/snapshots Index: net/tigervnc/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- net/tigervnc/Makefile (revision 326808) +++ net/tigervnc/Makefile (working copy) @@ -3,7 +3,7 @@ =20 PORTNAME=3D tigervnc PORTVERSION=3D 1.2.0 -PORTREVISION=3D 3 +PORTREVISION=3D 4 CATEGORIES=3D net x11-servers MASTER_SITES=3D SF:tigervnc MASTER_SITE_SUBDIR=3D ${PORTNAME}/${PORTNAME}/${PORTVERSION}/:tigervnc @@ -28,8 +28,7 @@ =20 MAKE_JOBS_UNSAFE=3D yes =20 -USES=3D cmake pkgconfig -USE_GMAKE=3D yes +USES=3D cmake gmake pkgconfig USE_GL=3D gl USE_AUTOTOOLS+=3D autoconf:env automake:env libtool:env USE_PYTHON=3D yes Index: print/photoprint/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- print/photoprint/Makefile (revision 326808) +++ print/photoprint/Makefile (working copy) @@ -2,6 +2,7 @@ =20 PORTNAME=3D photoprint DISTVERSION=3D 0.4.2-pre2 +PORTREVISION=3D 1 CATEGORIES=3D print graphics MASTER_SITES=3D http://www.blackfiveimaging.co.uk/photoprint/ =20 @@ -17,7 +18,6 @@ lcms:${PORTSDIR}/graphics/lcms \ netpbm:${PORTSDIR}/graphics/netpbm \ pcre:${PORTSDIR}/devel/pcre \ - pixman:${PORTSDIR}/x11/pixman \ png15:${PORTSDIR}/graphics/png \ pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \ tiff:${PORTSDIR}/graphics/tiff @@ -25,7 +25,7 @@ GNU_CONFIGURE=3D yes USES=3D desktop-file-utils gettext pkgconfig USE_GNOME=3D pango -USE_XORG=3D x11 xau xcb xcomposite xcursor xdamage xdmcp xext \ +USE_XORG=3D pixman x11 xau xcb xcomposite xcursor xdamage xdmcp xext \ xfixes xi xinerama xrandr xrender INSTALLS_ICONS=3D yes =20 Index: sysutils/gtk-imonc/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- sysutils/gtk-imonc/Makefile (revision 326808) +++ sysutils/gtk-imonc/Makefile (working copy) @@ -3,7 +3,7 @@ =20 PORTNAME=3D gtk-imonc PORTVERSION=3D 0.6.4.1 -PORTREVISION=3D 12 +PORTREVISION=3D 13 CATEGORIES=3D sysutils MASTER_SITES=3D http://stefan-strigler.de/download/ =20 Index: sysutils/nitrogen/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- sysutils/nitrogen/Makefile (revision 326808) +++ sysutils/nitrogen/Makefile (working copy) @@ -3,7 +3,7 @@ =20 PORTNAME=3D nitrogen PORTVERSION=3D 1.5.2 -PORTREVISION=3D 2 +PORTREVISION=3D 3 CATEGORIES=3D sysutils MASTER_SITES=3D http://projects.l3ib.org/nitrogen/files/ =20 Index: x11/libSM/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11/libSM/Makefile (revision 326808) +++ x11/libSM/Makefile (working copy) @@ -2,7 +2,7 @@ # $FreeBSD$ =20 PORTNAME=3D libSM -PORTVERSION=3D 1.2.1 +PORTVERSION=3D 1.2.2 PORTEPOCH=3D 1 CATEGORIES=3D x11 =20 Index: x11/libSM/distinfo =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11/libSM/distinfo (revision 326808) +++ x11/libSM/distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (xorg/lib/libSM-1.2.1.tar.bz2) =3D 93c11d569c64f40723b93b44af1efb= 474a0cfe92573b0c8c330343cabb897f1d -SIZE (xorg/lib/libSM-1.2.1.tar.bz2) =3D 334696 +SHA256 (xorg/lib/libSM-1.2.2.tar.bz2) =3D 0baca8c9f5d934450a70896c4ad38d= 06475521255ca63b717a6510fdb6e287bd +SIZE (xorg/lib/libSM-1.2.2.tar.bz2) =3D 348908 Index: x11/libX11/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11/libX11/Makefile (revision 326808) +++ x11/libX11/Makefile (working copy) @@ -2,7 +2,7 @@ # $FreeBSD$ =20 PORTNAME=3D libX11 -PORTVERSION=3D 1.6.1 +PORTVERSION=3D 1.6.2 PORTEPOCH=3D 1 CATEGORIES=3D x11 =20 Index: x11/libX11/distinfo =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11/libX11/distinfo (revision 326808) +++ x11/libX11/distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (xorg/lib/libX11-1.6.1.tar.bz2) =3D 10a54fc16b58b4f5a5eed4d080c35= 7a82fd2f42d09af625c1f5df50650701892 -SIZE (xorg/lib/libX11-1.6.1.tar.bz2) =3D 2356196 +SHA256 (xorg/lib/libX11-1.6.2.tar.bz2) =3D 2aa027e837231d2eeea90f3a4afe1= 9948a6eb4c8b2bec0241eba7dbc8106bd16 +SIZE (xorg/lib/libX11-1.6.2.tar.bz2) =3D 2339981 Index: x11/libX11/pkg-plist =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11/libX11/pkg-plist (revision 326808) +++ x11/libX11/pkg-plist (working copy) @@ -103,6 +103,9 @@ lib/X11/locale/ja_JP.UTF-8/Compose lib/X11/locale/ja_JP.UTF-8/XI18N_OBJS lib/X11/locale/ja_JP.UTF-8/XLC_LOCALE +lib/X11/locale/km_KH.UTF-8/Compose +lib/X11/locale/km_KH.UTF-8/XI18N_OBJS +lib/X11/locale/km_KH.UTF-8/XLC_LOCALE lib/X11/locale/ko/Compose lib/X11/locale/ko/XI18N_OBJS lib/X11/locale/ko/XLC_LOCALE @@ -141,6 +144,9 @@ lib/X11/locale/ru_RU.UTF-8/Compose lib/X11/locale/ru_RU.UTF-8/XI18N_OBJS lib/X11/locale/ru_RU.UTF-8/XLC_LOCALE +lib/X11/locale/sr_CS.UTF-8/Compose +lib/X11/locale/sr_CS.UTF-8/XI18N_OBJS +lib/X11/locale/sr_CS.UTF-8/XLC_LOCALE lib/X11/locale/tatar-cyr/Compose lib/X11/locale/tatar-cyr/XI18N_OBJS lib/X11/locale/tatar-cyr/XLC_LOCALE @@ -215,6 +221,7 @@ @dirrm lib/X11/locale/th_TH.UTF-8 @dirrm lib/X11/locale/th_TH @dirrm lib/X11/locale/tatar-cyr +@dirrm lib/X11/locale/sr_CS.UTF-8 @dirrm lib/X11/locale/ru_RU.UTF-8 @dirrm lib/X11/locale/pt_BR.UTF-8 @dirrm lib/X11/locale/nokhchi-1 @@ -227,6 +234,7 @@ @dirrm lib/X11/locale/koi8-c @dirrm lib/X11/locale/ko_KR.UTF-8 @dirrm lib/X11/locale/ko +@dirrm lib/X11/locale/km_KH.UTF-8 @dirrm lib/X11/locale/ja_JP.UTF-8 @dirrm lib/X11/locale/ja.SJIS @dirrm lib/X11/locale/ja.JIS Index: x11/libXpm/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11/libXpm/Makefile (revision 326808) +++ x11/libXpm/Makefile (working copy) @@ -2,7 +2,7 @@ # $FreeBSD$ =20 PORTNAME=3D libXpm -PORTVERSION=3D 3.5.10 +PORTVERSION=3D 3.5.11 CATEGORIES=3D x11 =20 MAINTAINER=3D x11@FreeBSD.org Index: x11/libXpm/distinfo =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11/libXpm/distinfo (revision 326808) +++ x11/libXpm/distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (xorg/lib/libXpm-3.5.10.tar.bz2) =3D a6db7e234750e7d60330017972e3= 1d8e1f29f0a8c1391e4ac82f6102d919a735 -SIZE (xorg/lib/libXpm-3.5.10.tar.bz2) =3D 431310 +SHA256 (xorg/lib/libXpm-3.5.11.tar.bz2) =3D c5bdafa51d1ae30086fac01ab83b= e8d47fe117b238d3437f8e965434090e041c +SIZE (xorg/lib/libXpm-3.5.11.tar.bz2) =3D 443496 Index: x11/libXrandr/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11/libXrandr/Makefile (revision 326808) +++ x11/libXrandr/Makefile (working copy) @@ -2,7 +2,7 @@ # $FreeBSD$ =20 PORTNAME=3D libXrandr -PORTVERSION=3D 1.4.1 +PORTVERSION=3D 1.4.2 CATEGORIES=3D x11 =20 MAINTAINER=3D x11@FreeBSD.org Index: x11/libXrandr/distinfo =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11/libXrandr/distinfo (revision 326808) +++ x11/libXrandr/distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (xorg/lib/libXrandr-1.4.1.tar.bz2) =3D d914a0490fd0a2ea6c3194505b= 5b28c56e2a277d8f4648b0275ee0ee370fb905 -SIZE (xorg/lib/libXrandr-1.4.1.tar.bz2) =3D 312857 +SHA256 (xorg/lib/libXrandr-1.4.2.tar.bz2) =3D caa7b31ac769be51a532343c65= 376f1d4df3f307afaed58e34fb5e82e8b825ad +SIZE (xorg/lib/libXrandr-1.4.2.tar.bz2) =3D 315165 Index: x11/libXv/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11/libXv/Makefile (revision 326808) +++ x11/libXv/Makefile (working copy) @@ -2,7 +2,7 @@ # $FreeBSD$ =20 PORTNAME=3D libXv -PORTVERSION=3D 1.0.9 +PORTVERSION=3D 1.0.10 PORTEPOCH=3D 1 CATEGORIES=3D x11 =20 Index: x11/libXv/distinfo =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11/libXv/distinfo (revision 326808) +++ x11/libXv/distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (xorg/lib/libXv-1.0.9.tar.bz2) =3D a874dbf864d0271bbe795af67ef5b3= f20096c92fc11eacbf0d2af00e32bc5b4b -SIZE (xorg/lib/libXv-1.0.9.tar.bz2) =3D 309744 +SHA256 (xorg/lib/libXv-1.0.10.tar.bz2) =3D 55fe92f8686ce8612e2c1bfaf58c0= 57715534419da700bda8d517b1d97914525 +SIZE (xorg/lib/libXv-1.0.10.tar.bz2) =3D 300633 Index: x11/libxcb/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11/libxcb/Makefile (revision 326808) +++ x11/libxcb/Makefile (working copy) @@ -20,9 +20,8 @@ CONFIGURE_ARGS+=3D --disable-build-docs --without-doxygen --enable-xinpu= t =20 USE_BZIP2=3D yes -USES=3D pathfix pkgconfig +USES=3D gmake pathfix pkgconfig USE_GNOME=3D libxslt:build -USE_GMAKE=3D yes USE_LDCONFIG=3D yes USE_XORG=3D xau xdmcp USE_PYTHON_BUILD=3D 2.5+ Index: x11/pixman/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11/pixman/Makefile (revision 326808) +++ x11/pixman/Makefile (working copy) @@ -1,7 +1,7 @@ # $FreeBSD$ =20 PORTNAME=3D pixman -PORTVERSION=3D 0.30.0 +PORTVERSION=3D 0.30.2 CATEGORIES=3D x11 =20 MAINTAINER=3D x11@FreeBSD.org @@ -8,10 +8,9 @@ COMMENT=3D Low-level pixel manipulation library =20 USES=3D perl5 +USE_PERL5=3D build XORG_CAT=3D lib USE_AUTOTOOLS=3D libtool -USE_PERL5=3D build -USE_GNOME=3D ltverhack:9 CONFIGURE_ARGS=3D --disable-gtk =20 OPTIONS_DEFINE=3D SIMD Index: x11/pixman/distinfo =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11/pixman/distinfo (revision 326808) +++ x11/pixman/distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (xorg/lib/pixman-0.30.0.tar.bz2) =3D 77e756dc7fafdf17f39a4f23bdc8= be59f9f6a65c08704f5cac1d8aa87cfaf517 -SIZE (xorg/lib/pixman-0.30.0.tar.bz2) =3D 681343 +SHA256 (xorg/lib/pixman-0.30.2.tar.bz2) =3D 4fbb51788fe7cbd8abb5f80aed95= ec878704e57a06328f7bebe0306e3822c96c +SIZE (xorg/lib/pixman-0.30.2.tar.bz2) =3D 666281 Index: x11/xkeyboard-config/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11/xkeyboard-config/Makefile (revision 326808) +++ x11/xkeyboard-config/Makefile (working copy) @@ -14,9 +14,8 @@ XORG_CAT=3D data =20 USE_BZIP2=3D yes -USE_GMAKE=3D yes USE_GNOME=3D intlhack libxslt:build -USES=3D pathfix perl5 +USES=3D gmake pathfix perl5 USE_PERL5=3D build GNU_CONFIGURE=3D yes MAKE_JOBS_UNSAFE=3Dyes Index: x11/xorg-cf-files/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11/xorg-cf-files/Makefile (revision 326808) +++ x11/xorg-cf-files/Makefile (working copy) @@ -3,6 +3,7 @@ =20 PORTNAME=3D xorg-cf-files PORTVERSION=3D 1.0.5 +PORTREVISION=3D 1 CATEGORIES=3D x11 =20 MAINTAINER=3D x11@FreeBSD.org Index: x11/xtrans/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11/xtrans/Makefile (revision 326808) +++ x11/xtrans/Makefile (working copy) @@ -8,8 +8,6 @@ MAINTAINER=3D x11@FreeBSD.org COMMENT=3D Abstract network code for X =20 -CONFLICTS=3D libXtrans - LICENSE=3D MIT =20 XORG_CAT=3D lib Index: x11-drivers/xf86-input-mouse/files/patch-src-bsd_mouse.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11-drivers/xf86-input-mouse/files/patch-src-bsd_mouse.c (revision 32= 6808) +++ x11-drivers/xf86-input-mouse/files/patch-src-bsd_mouse.c (working cop= y) @@ -1,13 +1,65 @@ ---- src/bsd_mouse.c.orig 2012-07-27 08:10:56.000000000 +0200 -+++ src/bsd_mouse.c 2012-07-30 00:49:09.000000000 +0200 -@@ -71,15 +71,20 @@ - static const char *FindDevice(InputInfoPtr, const char *, int); +--- src/bsd_mouse.c.orig 2012-10-08 03:40:07.000000000 +0200 ++++ src/bsd_mouse.c 2013-07-03 01:00:50.897361950 +0200 +@@ -26,6 +26,24 @@ + * authorization from the copyright holder(s) and author(s). + */ =20 - #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__Dr= agonFly__) ++ ++/* ++ * XXX - Should this be autoconf'd instead? ++ */ ++#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__Dr= agonFly__) ++ ++#if !defined(USBMOUSE_SUPPORT) ++#define USBMOUSE_SUPPORT ++#endif ++#if !defined(HAS_LIB_USB_HID) ++#define HAS_LIB_USB_HID ++#endif +#if !defined(XPS2_SUPPORT) +#define XPS2_SUPPORT +#endif - /* These are for FreeBSD and DragonFly */ ++ ++#endif /* defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || define= d(__DragonFly__) */ ++ + #include +=20 + #include +@@ -33,9 +51,23 @@ + #include "xf86Priv.h" + #include "xf86_OSlib.h" + #include "xf86Xinput.h" ++#include + #include "mouse.h" + #include "xisb.h" + #include "mipointer.h" ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >=3D 3 ++#define HAVE_PROPERTIES 1 ++#endif ++#ifdef HAVE_PROPERTIES ++#include ++#include ++/* 1.6 has properties, but no labels */ ++#ifdef AXIS_LABEL_PROP ++#define HAVE_LABELS ++#else ++#undef HAVE_LABELS ++#endif ++#endif + #ifdef WSCONS_SUPPORT + #include + #endif +@@ -47,9 +79,6 @@ + #endif +=20 + #include +-#ifdef USB_GET_REPORT_ID +-#define USB_NEW_HID +-#endif +=20 + #define HUP_GENERIC_DESKTOP 0x0001 + #define HUP_BUTTON 0x0009 +@@ -75,11 +104,13 @@ #define DEFAULT_MOUSE_DEV "/dev/mouse" #define DEFAULT_SYSMOUSE_DEV "/dev/sysmouse" #define DEFAULT_PS2_DEV "/dev/psm0" @@ -21,7 +73,7 @@ NULL }; #elif (defined(__OpenBSD__) || defined(__NetBSD__)) && defined(WSCONS_S= UPPORT) -@@ -100,7 +105,11 @@ +@@ -100,7 +131,11 @@ #if defined(__NetBSD__) return MSE_SERIAL | MSE_BUS | MSE_PS2 | MSE_AUTO; #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__= DragonFly__) @@ -34,7 +86,7 @@ #else return MSE_SERIAL | MSE_BUS | MSE_PS2 | MSE_XPS2 | MSE_AUTO | MSE_M= ISC; #endif -@@ -180,9 +189,30 @@ +@@ -180,9 +215,30 @@ { MOUSE_PROTO_SYSMOUSE, "SysMouse" } }; =20 @@ -41,7 +93,7 @@ +#ifdef XPS2_SUPPORT +static struct { + int dmodel; -+ char *name; ++ const char *name; +} ps2proto[] =3D { + { MOUSE_MODEL_NETSCROLL, "NetScrollPS/2" }, + { MOUSE_MODEL_NET, "NetMousePS/2" }, @@ -59,13 +111,13 @@ SetupAuto(InputInfoPtr pInfo, int *protoPara) { +#ifdef XPS2_SUPPORT -+ char *dev; ++ const char *dev; +#endif + const char *proto; int i; mousehw_t hw; mousemode_t mode; -@@ -190,7 +220,13 @@ +@@ -190,7 +246,13 @@ if (pInfo->fd =3D=3D -1) return NULL; =20 @@ -79,7 +131,7 @@ i =3D 1; ioctl(pInfo->fd, MOUSE_SETLEVEL, &i); =20 -@@ -209,9 +245,18 @@ +@@ -209,9 +271,18 @@ protoPara[0] =3D mode.syncmask[0]; protoPara[1] =3D mode.syncmask[1]; } @@ -100,7 +152,7 @@ } } } -@@ -234,41 +279,41 @@ +@@ -234,41 +305,41 @@ (protocol && xf86NameCmp(protocol, "SysMouse") =3D=3D 0)) { /* * As the FreeBSD sysmouse driver defaults to protocol level 0 @@ -159,7 +211,7 @@ } return FALSE; } -@@ -276,17 +321,17 @@ +@@ -276,17 +347,17 @@ static const char * FindDevice(InputInfoPtr pInfo, const char *protocol, int flags) { @@ -181,7 +233,7 @@ #endif } else { /* -@@ -295,28 +340,32 @@ +@@ -295,28 +366,32 @@ * the test for whether /dev/sysmouse is usable can be made= =2E */ if (!strcmp(*pdev, DEFAULT_MOUSE_DEV)) { @@ -227,7 +279,749 @@ break; } } -@@ -764,7 +813,9 @@ +@@ -468,30 +543,78 @@ +=20 + #if defined(USBMOUSE_SUPPORT) +=20 ++#define MAXRIDS 64 ++#define MAXACOLS 8 ++#define MAXLCOLS 16 + typedef struct _UsbMseRec { + int packetSize; +- int iid; +- hid_item_t loc_x; /* x locator item */ +- hid_item_t loc_y; /* y locator item */ +- hid_item_t loc_z; /* z (wheel) locator item */ +- hid_item_t loc_w; /* z (wheel) locator item */ +- hid_item_t loc_btn[MSE_MAXBUTTONS]; /* buttons locator items */ +- unsigned char *buffer; ++ int iid, nrids, nacols, opened; ++ struct { ++ int32_t rid; ++ int size; ++ } rids[MAXRIDS]; ++ struct UsbMseAcol { ++ InputInfoPtr pInfo; ++ int nlcols, nbuttons, hasZ, hasW; ++ int xmin, xmax, ymin, ymax, pmin, pmax, px, py; ++ int cxmin, cxmax, cymin, cymax, cpmin, cpmax; ++ struct UsbMseLcol { ++ hid_item_t loc_x; /* x locator item */ ++ hid_item_t loc_y; /* y locator item */ ++ hid_item_t loc_z; /* z (wheel) locator item */ ++ hid_item_t loc_w; /* w (hwheel) locator item */ ++ hid_item_t loc_p; /* Tip Pressure */ ++ hid_item_t loc_valid; /* Touch Valid */ ++ hid_item_t loc_in_range; /* In Range */ ++ hid_item_t loc_btn[MSE_MAXBUTTONS]; /* buttons locator items */ ++ } lcols[MAXLCOLS]; ++ hid_item_t loc_cc; /* contact count */ ++ } acols[MAXACOLS]; ++ unsigned char *buffer; + } UsbMseRec, *UsbMsePtr; +=20 ++static int * ++usbGetReportSizePtr(UsbMsePtr pUsbMse, int32_t rid) ++{ ++ int i; ++ ++ for (i =3D 0; i < pUsbMse->nrids; i++) { ++ if (pUsbMse->rids[i].rid =3D=3D rid) ++ return (&pUsbMse->rids[i].size); ++ } ++ for (i =3D 0; i < MAXRIDS; i++) { ++ if (pUsbMse->rids[i].size =3D=3D 0) { ++ pUsbMse->rids[i].rid =3D rid; ++ pUsbMse->nrids =3D max(pUsbMse->nrids, i + 1); ++ return (&pUsbMse->rids[i].size); ++ } ++ } ++ return (NULL); ++} ++ + static int + usbMouseProc(DeviceIntPtr pPointer, int what) + { + InputInfoPtr pInfo; + MouseDevPtr pMse; + UsbMsePtr pUsbMse; ++ struct UsbMseAcol *acol; + unsigned char map[MSE_MAXBUTTONS + 1]; +- int nbuttons; ++ int nacol, nbuttons; ++#ifdef HAVE_LABELS ++ Atom btn_labels[MSE_MAXBUTTONS] =3D {0}; ++ Atom axes_labels[3] =3D { 0, 0, 0 }; ++#endif +=20 + pInfo =3D pPointer->public.devicePrivate; + pMse =3D pInfo->private; + pMse->device =3D pPointer; + pUsbMse =3D pMse->mousePriv; ++ for (nacol =3D 0; nacol < (pUsbMse->nacols - 1); nacol++) { ++ if (pUsbMse->acols[nacol].pInfo =3D=3D pInfo) ++ break; ++ } ++ acol =3D &pUsbMse->acols[nacol]; +=20 + switch (what) { + case DEVICE_INIT: +@@ -500,38 +623,96 @@ + for (nbuttons =3D 0; nbuttons < MSE_MAXBUTTONS; ++nbuttons) + map[nbuttons + 1] =3D nbuttons + 1; +=20 +- InitPointerDeviceStruct((DevicePtr)pPointer, +- map, +- min(pMse->buttons, MSE_MAXBUTTONS), +- miPointerGetMotionEvents, +- pMse->Ctrl, +- miPointerGetMotionBufferSize()); ++#ifdef HAVE_LABELS ++ btn_labels[0] =3D XIGetKnownProperty(BTN_LABEL_PROP_BTN_LEFT); ++ btn_labels[1] =3D XIGetKnownProperty(BTN_LABEL_PROP_BTN_MIDDLE); ++ btn_labels[2] =3D XIGetKnownProperty(BTN_LABEL_PROP_BTN_RIGHT); ++ axes_labels[0] =3D XIGetKnownProperty((acol->xmin !=3D acol->xmax) ++ ? AXIS_LABEL_PROP_ABS_X : AXIS_LABEL_PROP_REL_X); ++ axes_labels[1] =3D XIGetKnownProperty((acol->xmin !=3D acol->xmax) ++ ? AXIS_LABEL_PROP_ABS_Y : AXIS_LABEL_PROP_REL_Y); ++ axes_labels[2] =3D XIGetKnownProperty(AXIS_LABEL_PROP_ABS_PRESSURE); ++#endif ++ ++ InitButtonClassDeviceStruct(pPointer, min(pMse->buttons, MSE_MAXBUTTON= S), ++#ifdef HAVE_LABELS ++ btn_labels, ++#endif ++ map); ++ InitValuatorClassDeviceStruct(pPointer, (acol->pmin !=3D acol->pmax) ?= 3 : 2, ++#ifdef HAVE_LABELS ++ axes_labels, ++#endif ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) =3D=3D 0 ++ miPointerGetMotionEvents, ++#elif GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3 ++ GetMotionHistory, ++#endif ++ GetMotionHistorySize(), ++ (acol->xmin !=3D acol->xmax || acol->ymin !=3D acol->ymax) ? ++ Absolute : Relative); ++ InitPtrFeedbackClassDeviceStruct(pPointer, pMse->Ctrl); +=20 + /* X valuator */ +- xf86InitValuatorAxisStruct(pPointer, 0, 0, -1, 1, 0, 1); ++ xf86InitValuatorAxisStruct(pPointer, 0, ++#ifdef HAVE_LABELS ++ axes_labels[0], ++#endif ++ (acol->xmin !=3D acol->xmax) ? acol->xmin : -1, ++ (acol->xmin !=3D acol->xmax) ? acol->xmax : -1, ++ 1, 0, 1 ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >=3D 12 ++ , (acol->xmin !=3D acol->xmax) ? Absolute : Relative ++#endif ++ ); + xf86InitValuatorDefaults(pPointer, 0); + /* Y valuator */ +- xf86InitValuatorAxisStruct(pPointer, 1, 0, -1, 1, 0, 1); ++ xf86InitValuatorAxisStruct(pPointer, 1, ++#ifdef HAVE_LABELS ++ axes_labels[1], ++#endif ++ (acol->ymin !=3D acol->ymax) ? acol->ymin : -1, ++ (acol->ymin !=3D acol->ymax) ? acol->ymax : -1, ++ 1, 0, 1 ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >=3D 12 ++ , (acol->ymin !=3D acol->ymax) ? Absolute : Relative ++#endif ++ ); + xf86InitValuatorDefaults(pPointer, 1); ++ /* Pressure valuator */ ++ if (acol->pmin !=3D acol->pmax) { ++ xf86InitValuatorAxisStruct(pPointer, 2, ++#ifdef HAVE_LABELS ++ axes_labels[2], ++#endif ++ acol->pmin, acol->pmax, 1, 0, 1 ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >=3D 12 ++ , Absolute ++#endif ++ ); ++ xf86InitValuatorDefaults(pPointer, 2); ++ } + xf86MotionHistoryAllocate(pInfo); + break; +=20 + case DEVICE_ON: +- pInfo->fd =3D xf86OpenSerial(pInfo->options); +- if (pInfo->fd =3D=3D -1) +- xf86Msg(X_WARNING, "%s: cannot open input device\n", pInfo-= >name); +- else { +- pMse->buffer =3D XisbNew(pInfo->fd, pUsbMse->packetSize); +- if (!pMse->buffer) { +- free(pMse); +- xf86CloseSerial(pInfo->fd); +- pInfo->fd =3D -1; +- } else { +- xf86FlushInput(pInfo->fd); +- if (!xf86InstallSIGIOHandler (pInfo->fd, usbSigioReadIn= put, +- pInfo)) +- AddEnabledDevice(pInfo->fd); +- } ++ if (pUsbMse->opened++ =3D=3D 0) { ++ pInfo->fd =3D xf86OpenSerial(pInfo->options); ++ if (pInfo->fd =3D=3D -1) ++ xf86Msg(X_WARNING, "%s: cannot open input device\n", pInfo->name)= ; ++ else { ++ pMse->buffer =3D XisbNew(pInfo->fd, pUsbMse->packetSize); ++ if (!pMse->buffer) { ++ free(pMse); ++ xf86CloseSerial(pInfo->fd); ++ pInfo->fd =3D -1; ++ } else { ++ xf86FlushInput(pInfo->fd); ++ if (!xf86InstallSIGIOHandler (pInfo->fd, usbSigioReadInput,=20 ++ pInfo)) ++ AddEnabledDevice(pInfo->fd); ++ } ++ } + } + pMse->lastButtons =3D 0; + pMse->lastMappedButtons =3D 0; +@@ -553,6 +734,7 @@ + xf86CloseSerial(pInfo->fd); + pInfo->fd =3D -1; + } ++ pUsbMse->opened--; + pPointer->public.on =3D FALSE; + usleep(300000); + break; +@@ -568,45 +750,154 @@ + { + MouseDevPtr pMse; + UsbMsePtr pUsbMse; +- int buttons =3D pMse->lastButtons; +- int dx =3D 0, dy =3D 0, dz =3D 0, dw =3D 0; +- int n, c; ++ int buttons, cc; ++ int dx, dy, dz, dw, dp, upd, v, nx, ny, np, in_range; ++ int n, c, rid, *sizep, nacol, nlcol; + unsigned char *pBuf; ++ struct UsbMseAcol *acol; ++ struct UsbMseLcol *lcol; +=20 + pMse =3D pInfo->private; + pUsbMse =3D pMse->mousePriv; +=20 + XisbBlockDuration(pMse->buffer, -1); ++next: + pBuf =3D pUsbMse->buffer; + n =3D 0; +- while ((c =3D XisbRead(pMse->buffer)) >=3D 0 && n < pUsbMse->packet= Size) { ++ if (pUsbMse->iid) { ++ rid =3D XisbRead(pMse->buffer); ++ if (rid < 0) ++ return; ++ pBuf[n++] =3D (unsigned char)rid; ++ } else ++ rid =3D 0; ++ sizep =3D usbGetReportSizePtr(pUsbMse, rid); ++ if (sizep =3D=3D NULL || *sizep =3D=3D 0) { ++ xf86Msg(X_WARNING, "%s: unknown report ID %d\n", pInfo->name, rid); ++ goto next; ++ } ++ while (n < *sizep && (c =3D XisbRead(pMse->buffer)) >=3D 0) { + pBuf[n++] =3D (unsigned char)c; + } + if (n =3D=3D 0) + return; +- if (n !=3D pUsbMse->packetSize) { ++// xf86MsgVerb(X_INFO, 3, "pkt: %d %02x %02x %02x %02x %02x %02x %02= x %02x %02x %02x\n", ++// n, pBuf[0], pBuf[1], pBuf[2], pBuf[3], pBuf[4], pBuf[5], pBuf[6], pB= uf[7], pBuf[8], pBuf[9]); ++ if (n !=3D *sizep) { + LogMessageVerbSigSafe(X_WARNING, -1, + "%s: incomplete packet, size %d\n", + pInfo->name, n); + } +- /* discard packets with an id that don't match the mouse */ +- /* XXX this is probably not the right thing */ +- if (pUsbMse->iid !=3D 0) { +- if (*pBuf++ !=3D pUsbMse->iid) +- return; +- } +- dx =3D hid_get_data(pBuf, &pUsbMse->loc_x); +- dy =3D hid_get_data(pBuf, &pUsbMse->loc_y); +- dz =3D hid_get_data(pBuf, &pUsbMse->loc_z); +- dw =3D hid_get_data(pBuf, &pUsbMse->loc_w); +- +- buttons =3D 0; +- for (n =3D 0; n < pMse->buttons; n++) { +- if (hid_get_data(pBuf, &pUsbMse->loc_btn[n])) +- buttons |=3D (1 << UMS_BUT(n)); ++ for (nacol =3D 0; nacol < pUsbMse->nacols; nacol++) { ++ acol =3D &pUsbMse->acols[nacol]; ++ if (acol->pInfo =3D=3D NULL) ++ continue; ++ nx =3D ny =3D np =3D upd =3D 0; ++ buttons =3D cc =3D 0; ++ dx =3D dy =3D dz =3D dw =3D dp =3D 0; ++ for (nlcol =3D 0; nlcol < pUsbMse->acols[nacol].nlcols; nlcol++) { ++ lcol =3D &acol->lcols[nlcol]; ++ ++ if (lcol->loc_valid.usage !=3D 0 && rid =3D=3D lcol->loc_valid.rep= ort_ID && ++ hid_get_data(pBuf, &lcol->loc_valid) =3D=3D 0) ++ continue; ++ if (lcol->loc_in_range.usage !=3D 0 && rid =3D=3D lcol->loc_in_ran= ge.report_ID) ++ in_range =3D hid_get_data(pBuf, &lcol->loc_in_range); ++ else ++ in_range =3D 1; ++ if (in_range && lcol->loc_x.usage !=3D 0 && rid =3D=3D lcol->loc_x= =2Ereport_ID && nx =3D=3D 0) { ++ v =3D hid_get_data(pBuf, &lcol->loc_x); ++ if (acol->xmin !=3D acol->xmax) { ++ v =3D xf86ScaleAxis(v, acol->xmax, acol->xmin, ++ lcol->loc_x.logical_maximum, lcol->loc_x.logical_minimum); ++ if (acol->cxmin !=3D acol->cxmax) ++ v =3D xf86ScaleAxis(v, acol->xmax, acol->xmin, ++ acol->cxmax, acol->cxmin); ++ } ++ dx +=3D v; ++ nx++; ++ } ++ if (in_range && lcol->loc_y.usage !=3D 0 && rid =3D=3D lcol->loc_y= =2Ereport_ID && ny =3D=3D 0) { ++ v =3D hid_get_data(pBuf, &lcol->loc_y); ++ if (acol->xmin !=3D acol->xmax) { ++ v =3D xf86ScaleAxis(v, acol->ymax, acol->ymin, ++ lcol->loc_y.logical_maximum, lcol->loc_y.logical_minimum); ++ if (acol->cymin !=3D acol->cymax) ++ v =3D xf86ScaleAxis(v, acol->ymax, acol->ymin, ++ acol->cymax, acol->cymin); ++ } ++ dy +=3D v; ++ ny++; ++ } ++ if (lcol->loc_z.usage !=3D 0 && rid =3D=3D lcol->loc_z.report_ID) = { ++ dz -=3D hid_get_data(pBuf, &lcol->loc_z); ++ upd =3D 1; ++ } ++ if (lcol->loc_w.usage !=3D 0 && rid =3D=3D lcol->loc_w.report_ID) = { ++ dw +=3D hid_get_data(pBuf, &lcol->loc_w); ++ upd =3D 1; ++ } ++ if (lcol->loc_p.usage !=3D 0 && rid =3D=3D lcol->loc_p.report_ID &= & np =3D=3D 0) { ++ v =3D hid_get_data(pBuf, &lcol->loc_p); ++ v =3D xf86ScaleAxis(v, acol->pmax, acol->pmin, ++ lcol->loc_p.logical_maximum, lcol->loc_p.logical_minimum); ++ if (acol->cpmin !=3D acol->cpmax) ++ v =3D xf86ScaleAxis(v, acol->pmax, acol->pmin, ++ acol->cpmax, acol->cpmin); ++ dp +=3D v; ++ np++; ++ } ++ ++ for (n =3D 0; n < acol->nbuttons; n++) { ++ if (lcol->loc_btn[n].usage !=3D 0 && rid =3D=3D lcol->loc_btn[n].repo= rt_ID) { ++ if (hid_get_data(pBuf, &lcol->loc_btn[n])) ++ buttons |=3D (1 << UMS_BUT(n)); ++ upd =3D 1; ++ } ++ } ++ } ++ if (acol->loc_cc.usage !=3D 0 && rid =3D=3D acol->loc_cc.report_ID) ++ cc =3D hid_get_data(pBuf, &acol->loc_cc); ++ else ++ cc =3D (nx || ny) ? 1 : 0; ++ if (cc > 1) ++ buttons =3D (1 << UMS_BUT(1)); ++ if (nx !=3D 0 && acol->xmin !=3D acol->xmax) ++ dx /=3D nx; ++ if (ny !=3D 0 && acol->ymin !=3D acol->ymax) ++ dy /=3D ny; ++ if (np !=3D 0 && acol->pmin !=3D acol->pmax) ++ dp /=3D np; ++// if (upd || nx || ny || np) ++// xf86MsgVerb(X_INFO, 3, "%d cc %d dx %d dy %d dz %d dw %d press %= d buttons %02x\n", ++// nacol, cc, dx, dy, dz, dw, dp, buttons); ++ if (nx !=3D 0 || ny !=3D 0) { ++ if (acol->pmin !=3D acol->pmax) { ++ xf86PostMotionEvent(acol->pInfo->dev, ++ /* is_absolute: */ TRUE, ++ /* first_valuator: */ 0, ++ /* num_valuators: */ 3, ++ dx, dy, dp); ++ } else if (acol->xmin !=3D acol->xmax || acol->ymin !=3D acol->yma= x) { ++ xf86PostMotionEvent(acol->pInfo->dev, ++ /* is_absolute: */ TRUE, ++ /* first_valuator: */ 0, ++ /* num_valuators: */ 2, ++ dx, dy); ++ } ++ } ++ if (upd || (nx !=3D 0) || (ny !=3D 0)) { ++ ((MouseDevPtr)acol->pInfo->private)->PostEvent(acol->pInfo, button= s, ++ ((acol->xmin !=3D acol->xmax) ? dx - acol->px : dx), ++ ((acol->ymin !=3D acol->ymax) ? dy - acol->py : dy), ++ dz, dw); ++ } ++ if (nx > 0) ++ acol->px =3D dx; ++ if (ny > 0) ++ acol->py =3D dy; + } +- pMse->PostEvent(pInfo, buttons, dx, dy, dz, dw); +- return; ++ goto next; + } +=20 + static void +@@ -615,14 +906,17 @@ + usbReadInput ((InputInfoPtr) closure); + } +=20 +-/* This function is called when the protocol is "usb". */ + static Bool +-usbPreInit(InputInfoPtr pInfo, const char *protocol, int flags) ++usbInitFirst(InputInfoPtr pInfo) + { + MouseDevPtr pMse =3D pInfo->private; + UsbMsePtr pUsbMse; + report_desc_t reportDesc; +- int i; ++ hid_data_t d; ++ hid_item_t h; ++ struct UsbMseAcol *acol; ++ struct UsbMseLcol *lcol; ++ int mdepth, rsize, *rsizep, acolused, lcolused, used; +=20 + pUsbMse =3D malloc(sizeof(UsbMseRec)); + if (pUsbMse =3D=3D NULL) { +@@ -631,12 +925,7 @@ + return FALSE; + } +=20 +- pMse->protocol =3D protocol; +- xf86Msg(X_CONFIG, "%s: Protocol: %s\n", pInfo->name, protocol); +- +- /* Collect the options, and process the common options. */ +- COLLECT_INPUT_OPTIONS(pInfo, NULL); +- xf86ProcessCommonOptions(pInfo, pInfo->options); ++ bzero(pUsbMse, sizeof(UsbMseRec)); +=20 + /* Check if the device can be opened. */ + pInfo->fd =3D xf86OpenSerial(pInfo->options); +@@ -652,19 +941,134 @@ + } + /* Get USB informations */ + reportDesc =3D hid_get_report_desc(pInfo->fd); +- /* Get packet size & iid */ +-#ifdef USB_NEW_HID +- if (ioctl(pInfo->fd, USB_GET_REPORT_ID, &pUsbMse->iid) =3D=3D -1) {= +- xf86Msg(X_ERROR, "Error ioctl USB_GET_REPORT_ID on %s : %s\= n", +- pInfo->name, strerror(errno)); +- return FALSE; +- } +- pUsbMse->packetSize =3D hid_report_size(reportDesc, hid_input, +- pUsbMse->iid); +-#else +- pUsbMse->packetSize =3D hid_report_size(reportDesc, hid_input, +- &pUsbMse->iid); +-#endif ++ mdepth =3D 0; ++ pUsbMse->nacols =3D 0; ++ acol =3D &pUsbMse->acols[pUsbMse->nacols]; ++ lcol =3D &acol->lcols[acol->nlcols]; ++ acolused =3D 0; ++ lcolused =3D 0; ++ d =3D hid_start_parse(reportDesc, (1 << hid_input) | ++ (1 << hid_collection) | (1 << hid_endcollection), -1); ++ while (hid_get_item(d, &h)) { ++ switch (h.kind) { ++ case hid_collection: ++ if (mdepth !=3D 0) ++ mdepth++; ++ else if (h.collection =3D=3D 1 && ++ (h.usage =3D=3D 0x00010001 || h.usage =3D=3D 0x00010002 || ++ (h.usage >=3D 0x000d0001 && h.usage <=3D 0x000d000d))) { ++ mdepth++; ++ if (acolused) { ++ if (lcolused) { ++ acol->nlcols++; ++ lcolused =3D 0; ++ } ++ pUsbMse->nacols++; ++ acolused =3D 0; ++ acol =3D &pUsbMse->acols[pUsbMse->nacols]; ++ lcol =3D &acol->lcols[acol->nlcols]; ++ } ++ } ++ if (lcolused && (h.collection =3D=3D 0 || ++ h.collection =3D=3D 2 || h.collection =3D=3D 3)) { ++ acol->nlcols++; ++ lcolused =3D 0; ++ lcol =3D &acol->lcols[acol->nlcols]; ++ } ++ break; ++ case hid_endcollection: ++ if (mdepth !=3D 0) ++ mdepth--; ++ break; ++ case hid_input: ++ if (h.report_ID !=3D 0) ++ pUsbMse->iid =3D 1; ++ rsize =3D pUsbMse->iid + ++ (h.pos + (h.report_size * h.report_count) + 7) / 8; ++ if ((rsizep =3D usbGetReportSizePtr(pUsbMse, h.report_ID)) !=3D NU= LL) ++ *rsizep =3D max(*rsizep, rsize); ++ pUsbMse->packetSize =3D max(pUsbMse->packetSize, rsize); ++ if (mdepth =3D=3D 0) ++ break; ++ used =3D 1; ++ if (h.usage =3D=3D 0x00010030) { /* X */ ++ lcol->loc_x =3D h; ++ if ((h.flags & 0x04) =3D=3D 0) { ++ if (acol->xmin =3D=3D acol->xmax) { ++ acol->xmin =3D h.logical_minimum; ++ acol->xmax =3D h.logical_maximum; ++ } else { ++ acol->xmin =3D min(acol->xmin, h.logical_minimum); ++ acol->xmax =3D max(acol->xmax, h.logical_maximum); ++ } ++ } ++ } else if (h.usage =3D=3D 0x00010031) { /* Y */ ++ lcol->loc_y =3D h; ++ if ((h.flags & 0x04) =3D=3D 0) { ++ if (acol->ymin =3D=3D acol->ymax) { ++ acol->ymin =3D h.logical_minimum; ++ acol->ymax =3D h.logical_maximum; ++ } else { ++ acol->ymin =3D min(acol->ymin, h.logical_minimum); ++ acol->ymax =3D max(acol->ymax, h.logical_maximum); ++ } ++ } ++ } else if (h.usage =3D=3D 0x00010038) { /* Z */ ++ lcol->loc_z =3D h; ++ acol->hasZ =3D 1; ++ } else if (h.usage =3D=3D 0x000c0238) { /* W */ ++ lcol->loc_w =3D h; ++ acol->hasW =3D 1; ++ } else if (h.usage =3D=3D 0x000d0030) { /* Press */ ++ lcol->loc_p =3D h; ++ if ((h.flags & 0x04) =3D=3D 0) { ++ if (acol->pmin =3D=3D acol->pmax) { ++ acol->pmin =3D h.logical_minimum; ++ acol->pmax =3D h.logical_maximum; ++ } else { ++ acol->pmin =3D min(acol->pmin, h.logical_minimum); ++ acol->pmax =3D max(acol->pmax, h.logical_maximum); ++ } ++ } ++ } else if (h.usage =3D=3D 0x000d0032) /* In Range */ ++ lcol->loc_in_range =3D h; ++ else if (h.usage =3D=3D 0x000d0047) /* Valid */ ++ lcol->loc_valid =3D h; ++ else if (h.usage > 0x00090000 && ++ h.usage <=3D 0x00090000 + MSE_MAXBUTTONS) { /* Buttons */ ++ lcol->loc_btn[(h.usage & 0xffff) - 1] =3D h; ++ acol->nbuttons =3D max(acol->nbuttons, h.usage & 0xffff); ++ } else if (h.usage =3D=3D 0x000d0042) { /* Tip Switch */ ++ lcol->loc_btn[0] =3D h; ++ acol->nbuttons =3D max(acol->nbuttons, 1); ++ } else if (h.usage =3D=3D 0x000d0044) { /* Barrel Switch */ ++ lcol->loc_btn[1] =3D h; ++ acol->nbuttons =3D max(acol->nbuttons, 2); ++ } else if (h.usage =3D=3D 0x000d0045) { /* Eraser */ ++ lcol->loc_btn[3] =3D h; ++ acol->nbuttons =3D max(acol->nbuttons, 4); ++ } else if (h.usage =3D=3D 0x000d0046) { /* Tablet Pick */ ++ lcol->loc_btn[2] =3D h; ++ acol->nbuttons =3D max(acol->nbuttons, 3); ++ } else if (h.usage =3D=3D 0x000d0054) /* Contact Count */ ++ acol->loc_cc =3D h; ++ else ++ used =3D 0; ++ lcolused +=3D used; ++ acolused +=3D used; ++ break; ++ default: ++ break; ++ } ++ } ++ if (lcolused) ++ acol->nlcols++; ++ if (acolused) ++ pUsbMse->nacols++; ++ hid_end_parse(d); ++ xf86Msg(X_DEFAULT, "%s: Found %d usable logical collections\n", ++ pInfo->name, pUsbMse->nacols); ++ + /* Allocate buffer */ + if (pUsbMse->packetSize <=3D 8) { + pUsbMse->buffer =3D pMse->protoBuf; +@@ -674,56 +1078,129 @@ + if (pUsbMse->buffer =3D=3D NULL) { + xf86Msg(X_ERROR, "%s: cannot allocate buffer\n", pInfo->name); + free(pUsbMse); +- free(pMse); + xf86CloseSerial(pInfo->fd); + return FALSE; + } +-#ifdef USB_NEW_HID +- if (hid_locate(reportDesc, HID_USAGE2(HUP_GENERIC_DESKTOP, HUG_X), +- hid_input, &pUsbMse->loc_x, pUsbMse->iid) < 0) { +- xf86Msg(X_WARNING, "%s: no x locator\n", pInfo->name); +- } +- if (hid_locate(reportDesc, HID_USAGE2(HUP_GENERIC_DESKTOP, HUG_Y), +- hid_input, &pUsbMse->loc_y, pUsbMse->iid) < 0) { +- xf86Msg(X_WARNING, "%s: no y locator\n", pInfo->name); +- } +- if (hid_locate(reportDesc, HID_USAGE2(HUP_GENERIC_DESKTOP, HUG_WHEE= L), +- hid_input, &pUsbMse->loc_z, pUsbMse->iid) < 0) { +- } +-#else +- if (hid_locate(reportDesc, HID_USAGE2(HUP_GENERIC_DESKTOP, HUG_X), +- hid_input, &pUsbMse->loc_x) < 0) { +- xf86Msg(X_WARNING, "%s: no x locator\n", pInfo->name); +- } +- if (hid_locate(reportDesc, HID_USAGE2(HUP_GENERIC_DESKTOP, HUG_Y), +- hid_input, &pUsbMse->loc_y) < 0) { +- xf86Msg(X_WARNING, "%s: no y locator\n", pInfo->name); +- } +- if (hid_locate(reportDesc, HID_USAGE2(HUP_GENERIC_DESKTOP, HUG_WHEE= L), +- hid_input, &pUsbMse->loc_z) < 0) { +- } +-#endif +- /* Probe for number of buttons */ +- for (i =3D 1; i <=3D MSE_MAXBUTTONS; i++) { +- if (!hid_locate(reportDesc, HID_USAGE2(HUP_BUTTON, i), +- hid_input, &pUsbMse->loc_btn[i-1] +-#ifdef USB_NEW_HID +- , pUsbMse->iid +-#endif +- )) +- break; +- } +- pMse->buttons =3D i-1; +=20 + xf86CloseSerial(pInfo->fd); + pInfo->fd =3D -1; +=20 + /* Private structure */ + pMse->mousePriv =3D pUsbMse; ++ return TRUE; ++} ++ ++/* This function is called when the protocol is "usb". */ ++static Bool ++usbPreInit(InputInfoPtr pInfo, const char *protocol, int flags) ++{ ++ InputInfoPtr pMatch; ++ MouseDevPtr pMse =3D pInfo->private; ++ UsbMsePtr pUsbMse; ++ struct UsbMseAcol *acol; ++ char *str; ++ int i, colopt; ++ ++ pMse->protocol =3D protocol; ++ xf86Msg(X_CONFIG, "%s: Protocol: %s\n", pInfo->name, protocol); ++ ++ /* Collect the options, and process the common options. */ ++ COLLECT_INPUT_OPTIONS(pInfo, NULL); ++ xf86ProcessCommonOptions(pInfo, pInfo->options); ++ ++ /* Check if this HID device is already opened. */ ++ for (pMatch =3D xf86FirstLocalDevice(); pMatch !=3D NULL; pMatch =3D= pMatch->next) { ++ if ((pInfo !=3D pMatch) && strstr(pMatch->drv->driverName, "mouse")) {= ++ char *dev1, *dev2; ++ ++ dev1 =3D xf86SetStrOption(pInfo->options, "Device", NULL); ++ dev2 =3D xf86SetStrOption(pMatch->options, "Device", NULL); ++ if (strcmp(dev1, dev2) =3D=3D 0) { ++ free(dev1); ++ free(dev2); ++ break; ++ } ++ free(dev1); ++ free(dev2); ++ } ++ } ++ if (pMatch =3D=3D NULL) { ++ xf86Msg(X_DEFAULT, "%s: Opening new HID device\n", pInfo->name); ++ if (!usbInitFirst(pInfo)) { ++ free(pMse); ++ return FALSE; ++ } ++ } else { ++ pMse->mousePriv =3D ((MouseDevPtr)pMatch->private)->mousePriv; ++ xf86Msg(X_DEFAULT, "%s: Attaching to already opened HID device\n", ++ pInfo->name); ++ } ++ pUsbMse =3D pMse->mousePriv; ++ ++ /* Attach to collection, respecting "Collection" option. */ ++ colopt =3D xf86SetIntOption(pInfo->options, "Collection", 0); ++ for (i =3D 0; i < pUsbMse->nacols; i++) { ++ if (pUsbMse->acols[i].pInfo =3D=3D NULL && ++ (colopt =3D=3D 0 || i =3D=3D colopt - 1)) { ++ pUsbMse->acols[i].pInfo =3D pInfo; ++ break; ++ } ++ } ++ xf86Msg(colopt =3D=3D 0 ? X_DEFAULT : X_CONFIG, ++ "%s: Collection: %d\n", pInfo->name, ++ i =3D=3D pUsbMse->nacols ? colopt : i + 1); ++ if (i =3D=3D pUsbMse->nacols) { ++ xf86Msg(X_ERROR, ++ "%s: Application collection not found or already handled\n", ++ pInfo->name); ++ free(pMse); ++ return FALSE; ++ } ++ ++ acol =3D &pUsbMse->acols[i]; ++ pMse->buttons =3D acol->nbuttons; ++ if (pMse->buttons =3D=3D 2) ++ pMse->buttons =3D 3; ++ if (acol->xmin !=3D acol->xmax || acol->ymin !=3D acol->ymax) ++ pMse->disableXY =3D TRUE; ++ pMse->hasZ =3D acol->hasZ; ++ pMse->hasW =3D acol->hasW; +=20 + /* Process common mouse options (like Emulate3Buttons, etc). */ + pMse->CommonOptions(pInfo); +=20 ++ /* Process "Calibration" option. */ ++ str =3D xf86CheckStrOption(pInfo->options, "Calibration", NULL); ++ if (str !=3D NULL && (acol->xmin !=3D acol->xmax || acol->ymin !=3D= acol->ymax)) { ++ int j, xmin, xmax, ymin, ymax, pmin, pmax; ++ ++ j =3D sscanf(str, "%d %d %d %d %d %d", &xmin, &xmax, &ymin, &ymax, &pm= in, &pmax); ++ if (j =3D=3D 4) { ++ xf86Msg(X_CONFIG, "%s: Calibration: %d %d %d %d\n", ++ pInfo->name, xmin, xmax, ymin, ymax); ++ acol->cxmin =3D xmin; ++ acol->cxmax =3D xmax; ++ acol->cymin =3D ymin; ++ acol->cymax =3D ymax; ++ } else if (j =3D=3D 6) { ++ xf86Msg(X_CONFIG, "%s: Calibration: %d %d %d %d %d %d\n", ++ pInfo->name, xmin, xmax, ymin, ymax, pmin, pmax); ++ acol->cxmin =3D xmin; ++ acol->cxmax =3D xmax; ++ acol->cymin =3D ymin; ++ acol->cymax =3D ymax; ++ acol->cpmin =3D pmin; ++ acol->cpmax =3D pmax; ++ } else ++ xf86Msg(X_WARNING, "%s: Calibration: Invalid arguments\n", ++ pInfo->name); ++ free(str); ++ } else if (acol->xmin !=3D acol->xmax || acol->ymin !=3D acol->ymax= ) { ++ xf86Msg(X_DEFAULT, "%s: Calibration: %d %d %d %d %d %d\n", ++ pInfo->name, acol->xmin, acol->xmax, acol->ymin, acol->ymax, ++ acol->pmin, acol->pmax); ++ } ++ + /* Setup the local procs. */ + pInfo->device_control =3D usbMouseProc; + pInfo->read_input =3D usbReadInput; +@@ -766,7 +1243,9 @@ p->CheckProtocol =3D CheckProtocol; #if (defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__D= ragonFly__)) && defined(MOUSE_PROTO_SYSMOUSE) p->SetupAuto =3D SetupAuto; Index: x11-drivers/xf86-input-mouse/files/patch-src_mouse.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11-drivers/xf86-input-mouse/files/patch-src_mouse.c (revision 326808= ) +++ x11-drivers/xf86-input-mouse/files/patch-src_mouse.c (working copy) @@ -1,5 +1,5 @@ ---- src/mouse.c.orig 2012-07-27 08:10:56.000000000 +0200 -+++ src/mouse.c 2012-07-30 00:31:48.000000000 +0200 +--- src/mouse.c.orig 2012-10-08 03:40:07.000000000 +0200 ++++ src/mouse.c 2013-07-03 01:04:45.398343993 +0200 @@ -280,13 +280,39 @@ =20 pMse =3D pInfo->private; @@ -135,7 +135,7 @@ =20 protocol =3D MousePickProtocol(pInfo, device, protocol, &protocolID= ); =20 -@@ -2137,7 +2148,7 @@ +@@ -2136,7 +2147,7 @@ =20 if (pMse->emulateWheel) { /* Emulate wheel button handling */ @@ -144,7 +144,7 @@ wheelButtonMask =3D 0; else wheelButtonMask =3D 1 << (pMse->wheelButton - 1); -@@ -2221,6 +2232,9 @@ +@@ -2220,6 +2231,9 @@ } } } @@ -154,7 +154,7 @@ } =20 /* Absorb the mouse movement while the wheel button is pres= sed. */ -@@ -2238,7 +2252,7 @@ +@@ -2237,7 +2251,7 @@ if (pMse->emulate3ButtonsSoft && pMse->emulate3Pending && (dx || dy= )) buttonTimer(pInfo); =20 @@ -163,8 +163,21 @@ xf86PostMotionEvent(pInfo->dev, 0, 0, 2, dx, dy); =20 if (change) { -@@ -2448,11 +2462,11 @@ +@@ -2349,12 +2363,10 @@ + int dx, int dy, int dz, int dw) + { + MouseDevPtr pMse; +- mousePrivPtr mousepriv; + int zbutton =3D 0, wbutton =3D 0, zbuttoncount =3D 0, wbuttoncount = =3D 0; + int i, b, buttons =3D 0; =20 + pMse =3D pInfo->private; +- mousepriv =3D (mousePrivPtr)pMse->mousePriv; +=20 + if (pMse->protocolID =3D=3D PROT_MMHIT) + b =3D reverseBits(hitachMap, truebuttons); +@@ -2447,11 +2459,11 @@ +=20 /* Accumulate the scaled dx, dy in the private variables fracdx,fracdy and return the integer number part */ - if (mousepriv) { Index: x11-drivers/xf86-input-synaptics/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11-drivers/xf86-input-synaptics/Makefile (revision 326808) +++ x11-drivers/xf86-input-synaptics/Makefile (working copy) @@ -10,22 +10,10 @@ =20 CONFLICTS=3D synaptics-[0-9]* =20 -OPTIONS_DEFINE=3D HAL -OPTIONS_DEFAULT=3DHAL - -.include - USES=3D pathfix -USE_XORG=3D x11 +USE_XORG=3D x11 xtst XORG_CAT=3D driver =20 -.if ${PORT_OPTIONS:MHAL} -PLIST_SUB+=3D HAL=3D"" -LIB_DEPENDS+=3D hal.1:${PORTSDIR}/sysutils/hal -.else -PLIST_SUB+=3D HAL=3D"@comment " -.endif - MAN1=3D syndaemon.1 \ synclient.1 MAN4=3D synaptics.4x @@ -41,16 +29,4 @@ EXTRA_PATCHES+=3D ${PATCHDIR}/extra-Makefile.in .endif =20 -post-install: -.if ${PORT_OPTIONS:MHAL} - ${MKDIR} ${PREFIX}/share/hal/fdi/policy/10osvendor - ${INSTALL_DATA} ${WRKSRC}/conf/11-x11-synaptics.fdi \ - ${PREFIX}/share/hal/fdi/policy/10osvendor/ -.if !defined(WITH_NEW_XORG) - ${MKDIR} ${PREFIX}/share/hal/fdi/policy/20thirdparty - ${INSTALL_DATA} ${WRKSRC}/conf/11-x11-synaptics.fdi \ - ${PREFIX}/share/hal/fdi/policy/20thirdparty/ -.endif -.endif - .include Index: x11-drivers/xf86-input-synaptics/pkg-plist =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11-drivers/xf86-input-synaptics/pkg-plist (revision 326808) +++ x11-drivers/xf86-input-synaptics/pkg-plist (working copy) @@ -6,13 +6,7 @@ lib/xorg/modules/input/synaptics_drv.so libdata/pkgconfig/xorg-synaptics.pc %%NEW%%share/X11/xorg.conf.d/50-synaptics.conf -%%HAL%%share/hal/fdi/policy/10osvendor/11-x11-synaptics.fdi -%%HAL%%%%OLD%%share/hal/fdi/policy/20thirdparty/11-x11-synaptics.fdi @dirrmtry lib/xorg/modules/input @dirrmtry lib/xorg/modules @dirrmtry lib/xorg @dirrmtry include/xorg -%%HAL%%@dirrmtry share/hal/fdi/policy/10osvendor -%%HAL%%@dirrmtry share/hal/fdi/policy -%%HAL%%@dirrmtry share/hal/fdi -%%HAL%%@dirrmtry share/hal Index: x11-drivers/xf86-video-ati/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11-drivers/xf86-video-ati/Makefile (revision 326808) +++ x11-drivers/xf86-video-ati/Makefile (working copy) @@ -1,7 +1,7 @@ # $FreeBSD$ =20 PORTNAME=3D xf86-video-ati -PORTVERSION=3D 6.14.6 +PORTVERSION=3D ${ATI_VERSION} CATEGORIES=3D x11-drivers =20 MAINTAINER=3D x11@FreeBSD.org @@ -12,6 +12,17 @@ USE_XORG=3D xf86driproto xineramaproto xf86miscproto glproto MAN4=3D ati.4x radeon.4x =20 +.include + +.if ${OSVERSION} < 1000051 +ATI_VERSION=3D 6.14.6 CONFIGURE_ARGS+=3D--disable-kms +PLIST_SUB+=3D OLD=3D"" +.else +ATI_VERSION=3D 7.2.0 +CONFIGURE_ARGS+=3D--disable-udev +EXTRA_PATCHES+=3D ${FILESDIR}/extra-src__radeon_kms.c +PLIST_SUB+=3D OLD=3D"@comment " +.endif =20 -.include +.include Index: x11-drivers/xf86-video-ati/distinfo =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11-drivers/xf86-video-ati/distinfo (revision 326808) +++ x11-drivers/xf86-video-ati/distinfo (working copy) @@ -1,2 +1,4 @@ SHA256 (xorg/driver/xf86-video-ati-6.14.6.tar.bz2) =3D aa5286b3e4f0187d7= df14785c06dd800255d9405205dbf061da5d77df86bec36 SIZE (xorg/driver/xf86-video-ati-6.14.6.tar.bz2) =3D 1139495 +SHA256 (xorg/driver/xf86-video-ati-7.2.0.tar.bz2) =3D f30f5efdc8d7d18d06= eda7ef2f91a8b7290f1cfbf6ff26362cd47ab8969daec4 +SIZE (xorg/driver/xf86-video-ati-7.2.0.tar.bz2) =3D 824613 Index: x11-drivers/xf86-video-ati/files/extra-src__radeon_kms.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11-drivers/xf86-video-ati/files/extra-src__radeon_kms.c (revision 0)= +++ x11-drivers/xf86-video-ati/files/extra-src__radeon_kms.c (working cop= y) @@ -0,0 +1,20 @@ +--- src/radeon_kms.c.orig 2013-08-07 10:44:09.000000000 +0200 ++++ src/radeon_kms.c 2013-08-31 01:20:44.370468797 +0200 +@@ -270,7 +270,7 @@ + radeon_dirty_update(ScreenPtr screen) + { + RegionPtr region; +- PixmapDirtyUpdatePtr ent; ++ PixmapDirtyUpdatePtr ent =3D NULL; +=20 + if (xorg_list_is_empty(&screen->pixmap_dirty_list)) + return; +@@ -606,7 +606,7 @@ + dev->domain, dev->bus, dev->dev, dev->func); + #endif +=20 +- info->dri2.drm_fd =3D drmOpen("radeon", busid); ++ info->dri2.drm_fd =3D drmOpen("radeonkms", busid); + if (info->dri2.drm_fd =3D=3D -1) { +=20 + xf86DrvMsg(pScrn->scrnIndex, X_ERROR, Property changes on: x11-drivers/xf86-video-ati/files/extra-src__radeon_k= ms.c ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Index: x11-drivers/xf86-video-ati/files/patch-src__radeon_dri2.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11-drivers/xf86-video-ati/files/patch-src__radeon_dri2.c (revision 0= ) +++ x11-drivers/xf86-video-ati/files/patch-src__radeon_dri2.c (working co= py) @@ -0,0 +1,11 @@ +--- src/radeon_dri2.c.orig 2013-02-22 19:31:34.000000000 +0000 ++++ src/radeon_dri2.c 2013-02-22 19:31:47.000000000 +0000 +@@ -578,7 +578,7 @@ + radeon_dri2_client_state_changed(CallbackListPtr *ClientStateCallback, = pointer data, pointer calldata) + { + DRI2ClientEventsPtr pClientEventsPriv; +- DRI2FrameEventPtr ref; ++ DRI2FrameEventPtr ref =3D NULL; + NewClientInfoRec *clientinfo =3D calldata; + ClientPtr pClient =3D clientinfo->client; + pClientEventsPriv =3D GetDRI2ClientEvents(pClient); Property changes on: x11-drivers/xf86-video-ati/files/patch-src__radeon_d= ri2.c ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Index: x11-drivers/xf86-video-ati/pkg-plist =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11-drivers/xf86-video-ati/pkg-plist (revision 326808) +++ x11-drivers/xf86-video-ati/pkg-plist (working copy) @@ -2,13 +2,13 @@ lib/xorg/modules/drivers/ati_drv.so lib/xorg/modules/drivers/radeon_drv.la lib/xorg/modules/drivers/radeon_drv.so -lib/xorg/modules/multimedia/theatre200_drv.la -lib/xorg/modules/multimedia/theatre200_drv.so -lib/xorg/modules/multimedia/theatre_detect_drv.la -lib/xorg/modules/multimedia/theatre_detect_drv.so -lib/xorg/modules/multimedia/theatre_drv.la -lib/xorg/modules/multimedia/theatre_drv.so +%%OLD%%lib/xorg/modules/multimedia/theatre200_drv.la +%%OLD%%lib/xorg/modules/multimedia/theatre200_drv.so +%%OLD%%lib/xorg/modules/multimedia/theatre_detect_drv.la +%%OLD%%lib/xorg/modules/multimedia/theatre_detect_drv.so +%%OLD%%lib/xorg/modules/multimedia/theatre_drv.la +%%OLD%%lib/xorg/modules/multimedia/theatre_drv.so @dirrmtry lib/xorg/modules/drivers -@dirrmtry lib/xorg/modules/multimedia +%%OLD%%@dirrmtry lib/xorg/modules/multimedia @dirrmtry lib/xorg/modules @dirrmtry lib/xorg Index: x11-drivers/xf86-video-intel/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11-drivers/xf86-video-intel/Makefile (revision 326808) +++ x11-drivers/xf86-video-intel/Makefile (working copy) @@ -28,20 +28,20 @@ .include =20 .if defined(WITH_NEW_XORG) -INTEL_VERSION=3D 2.21.9 +INTEL_VERSION=3D 2.21.15 INTEL_REVISION=3D 0 +CONFIGURE_ENV+=3D xorg_cv_cc_flag__Wno_maybe_uninitialized=3Dno CONFIGURE_ARGS+=3D --enable-sna MAKE_JOBS_UNSAFE=3Dyes PLIST_SUB+=3D OLD=3D"@comment " -EXTRA_PATCHES+=3D ${PATCHDIR}/extra-clang \ - ${PATCHDIR}/extra-src_sna_compiler.h \ +EXTRA_PATCHES+=3D ${PATCHDIR}/extra-src__sna__sna_threads.c \ ${PATCHDIR}/extra-src_sna_kgem.c \ - ${PATCHDIR}/extra-src__sna__sna_threads.c \ + ${PATCHDIR}/extra-clang \ ${PATCHDIR}/extra-i915kms LIB_DEPENDS+=3D xcb-util:${PORTSDIR}/x11/xcb-util .else INTEL_VERSION=3D 2.7.1 -INTEL_REVISION=3D 4 +INTEL_REVISION=3D 5 PLIST_SUB+=3D OLD=3D"" =20 EXTRA_PATCHES+=3D ${PATCHDIR}/extra-src_ch7017_ch7017.c \ Index: x11-drivers/xf86-video-intel/distinfo =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11-drivers/xf86-video-intel/distinfo (revision 326808) +++ x11-drivers/xf86-video-intel/distinfo (working copy) @@ -1,4 +1,4 @@ SHA256 (xorg/driver/xf86-video-intel-2.7.1.tar.bz2) =3D 255c0d54249cc013= 2f743254a43c21fac695fab2139c8ed96a07cf3c628e5f42 SIZE (xorg/driver/xf86-video-intel-2.7.1.tar.bz2) =3D 780625 -SHA256 (xorg/driver/xf86-video-intel-2.21.9.tar.bz2) =3D 1359cbc9e494a28= 4faa52d1db83e7388cb8ab590b660e29e78e6e7f5ee7ff189 -SIZE (xorg/driver/xf86-video-intel-2.21.9.tar.bz2) =3D 1735037 +SHA256 (xorg/driver/xf86-video-intel-2.21.15.tar.bz2) =3D 7d5a140f82a72f= d1cbc8a664d66c3d4eca47ee240ca4927b8a98d7af6f65d6fc +SIZE (xorg/driver/xf86-video-intel-2.21.15.tar.bz2) =3D 1977431 Index: x11-drivers/xf86-video-intel/files/extra-clang =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11-drivers/xf86-video-intel/files/extra-clang (revision 326808) +++ x11-drivers/xf86-video-intel/files/extra-clang (working copy) @@ -1,27 +1,15 @@ ---- src/intel_display.c.orig 2012-12-11 20:33:06.000000000 +0100 -+++ src/intel_display.c 2012-12-11 20:33:45.000000000 +0100 -@@ -1691,7 +1691,7 @@ - static drmModeEncoderPtr - intel_get_kencoder(struct intel_mode *mode, int num) +--- src/sna/sna_cpu.c.orig 2013-08-14 12:04:40.231041285 +0200 ++++ src/sna/sna_cpu.c 2013-08-14 12:05:51.237030719 +0200 +@@ -41,6 +41,7 @@ { -- struct intel_output *iterator; -+ struct intel_output *iterator =3D NULL; - int id =3D mode->mode_res->encoders[num]; + unsigned max =3D __get_cpuid_max(BASIC_CPUID, NULL); + unsigned int eax, ebx, ecx, edx; ++ eax =3D ebx =3D ecx =3D edx =3D 0; + unsigned features =3D 0; + unsigned extra =3D 0; =20 - list_for_each_entry(iterator, &mode->outputs, link) ---- src/intel_batchbuffer.c.orig 2012-12-11 20:34:55.000000000 +0100 -+++ src/intel_batchbuffer.c 2012-12-11 20:35:19.000000000 +0100 -@@ -119,7 +119,7 @@ - static void intel_batch_do_flush(ScrnInfoPtr scrn) - { - intel_screen_private *intel =3D intel_get_screen_private(scrn); -- struct intel_pixmap *priv; -+ struct intel_pixmap *priv =3D NULL; -=20 - list_for_each_entry(priv, &intel->batch_pixmaps, batch) - priv->dirty =3D 0; ---- src/sna/sna_damage.c.orig 2012-12-11 20:41:38.000000000 +0100 -+++ src/sna/sna_damage.c 2012-12-11 20:42:23.000000000 +0100 +--- src/sna/sna_damage.c.orig 2013-08-14 12:06:26.381036854 +0200 ++++ src/sna/sna_damage.c 2013-08-14 12:07:23.684023065 +0200 @@ -410,7 +410,7 @@ int n, nboxes; BoxPtr boxes, free_boxes =3D NULL; @@ -31,7 +19,7 @@ =20 assert(damage->mode !=3D DAMAGE_ALL); assert(damage->dirty); -@@ -1671,7 +1671,7 @@ +@@ -1709,7 +1709,7 @@ { int n, nboxes; BoxPtr boxes; @@ -40,8 +28,30 @@ =20 RegionCopy(r, &damage->region); if (!damage->dirty) ---- uxa/uxa-accel.c.orig 2012-12-11 20:50:56.000000000 +0100 -+++ uxa/uxa-accel.c 2012-12-11 20:51:14.000000000 +0100 +--- src/uxa/intel_batchbuffer.c.orig 2013-08-14 12:08:14.323028320 +0200= ++++ src/uxa/intel_batchbuffer.c 2013-08-14 12:08:37.202016923 +0200 +@@ -141,7 +141,7 @@ + static void intel_batch_do_flush(ScrnInfoPtr scrn) + { + intel_screen_private *intel =3D intel_get_screen_private(scrn); +- struct intel_pixmap *priv; ++ struct intel_pixmap *priv =3D NULL; +=20 + list_for_each_entry(priv, &intel->batch_pixmaps, batch) + priv->dirty =3D 0; +--- src/uxa/intel_display.c.orig 2013-08-14 12:09:25.802015629 +0200 ++++ src/uxa/intel_display.c 2013-08-14 12:09:51.034009844 +0200 +@@ -1753,7 +1753,7 @@ + static drmModeEncoderPtr + intel_get_kencoder(struct intel_mode *mode, int num) + { +- struct intel_output *iterator; ++ struct intel_output *iterator =3D NULL; + int id =3D mode->mode_res->encoders[num]; +=20 + list_for_each_entry(iterator, &mode->outputs, link) +--- src/uxa/uxa-accel.c.orig 2013-08-14 12:02:11.898048975 +0200 ++++ src/uxa/uxa-accel.c 2013-08-14 12:03:39.336042139 +0200 @@ -944,7 +944,7 @@ =20 if (uxa_screen->info->flags & UXA_USE_GLAMOR) { Index: x11-drivers/xf86-video-intel/files/extra-i915kms =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11-drivers/xf86-video-intel/files/extra-i915kms (revision 326808) +++ x11-drivers/xf86-video-intel/files/extra-i915kms (working copy) @@ -1,13 +1,13 @@ ---- src/intel_module.c.orig 2012-09-27 23:31:20.000000000 +0300 -+++ src/intel_module.c 2012-11-02 17:32:00.819723398 +0200 -@@ -393,8 +393,8 @@ - dev->domain, dev->bus, dev->dev, dev->func); +--- src/intel_device.c.orig 2013-06-30 16:03:51.000000000 +0200 ++++ src/intel_device.c 2013-07-02 14:08:34.903060688 +0200 +@@ -94,8 +94,8 @@ + pci->domain, pci->bus, pci->dev, pci->func); =20 - ret =3D drmCheckModesettingSupported(id); -- if (ret) { -- if (xf86LoadKernelModule("i915")) -+ if (ret || 1) { -+ if (xf86LoadKernelModule("i915kms")) - ret =3D drmCheckModesettingSupported(id); - if (ret) - return FALSE; + ret =3D drmCheckModesettingSupported(id); +- if (ret) { +- if (xf86LoadKernelModule("i915")) ++ if (ret || 1) { ++ if (xf86LoadKernelModule("i915kms")) + ret =3D drmCheckModesettingSupported(id); + if (ret) + return -1; Index: x11-drivers/xf86-video-intel/files/extra-src_sna_compiler.h =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11-drivers/xf86-video-intel/files/extra-src_sna_compiler.h (revision= 326808) +++ x11-drivers/xf86-video-intel/files/extra-src_sna_compiler.h (working = copy) @@ -1,18 +0,0 @@ ---- src/sna/compiler.h.orig 2013-03-12 12:48:29.745101779 +0100 -+++ src/sna/compiler.h 2013-03-12 12:48:52.857102997 +0100 -@@ -37,7 +37,6 @@ - #define must_check __attribute__((warn_unused_result)) - #define constant __attribute__((const)) - #define pure __attribute__((pure)) --#define __packed__ __attribute__((__packed__)) - #define flatten __attribute__((flatten)) - #else - #define likely(expr) (expr) -@@ -48,7 +47,6 @@ - #define must_check - #define constant - #define pure --#define __packed__ - #define flatten - #endif -=20 Index: x11-drivers/xf86-video-intel/files/extra-src_sna_kgem.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11-drivers/xf86-video-intel/files/extra-src_sna_kgem.c (revision 326= 808) +++ x11-drivers/xf86-video-intel/files/extra-src_sna_kgem.c (working copy= ) @@ -1,18 +1,14 @@ ---- src/sna/kgem.c.orig 2013-03-11 11:19:02.000000000 +0100 -+++ src/sna/kgem.c 2013-03-12 12:56:49.452065668 +0100 -@@ -658,7 +658,11 @@ - if (file) { - size_t len =3D 0; - char *line =3D NULL; -+#ifdef __GLIBC__ - while (getline(&line, &len, file) !=3D -1) { -+#else -+ while ((line =3D fgetln(file, &len)) !=3D (char *) NULL) { -+#endif - int mb; - if (sscanf(line, "cache size : %d KB", &mb) =3D=3D 1) { - /* Paranoid check against gargantuan caches */ -@@ -1666,7 +1670,8 @@ +--- src/sna/kgem.c.orig 2013-08-04 11:10:59.000000000 +0200 ++++ src/sna/kgem.c 2013-08-14 11:59:14.787060294 +0200 +@@ -25,6 +25,7 @@ + * + */ +=20 ++#define _WITH_GETLINE + #ifdef HAVE_CONFIG_H + #include "config.h" + #endif +@@ -1890,7 +1891,8 @@ static struct kgem_bo * search_snoop_cache(struct kgem *kgem, unsigned int num_pages, unsigned = flags) { @@ -22,7 +18,7 @@ =20 DBG(("%s: num_pages=3D%d, flags=3D%x\n", __FUNCTION__, num_pages, flag= s)); =20 -@@ -1868,7 +1873,8 @@ +@@ -2104,7 +2106,8 @@ =20 static bool kgem_retire__flushing(struct kgem *kgem) { @@ -32,7 +28,7 @@ bool retired =3D false; =20 list_for_each_entry_safe(bo, next, &kgem->flushing, request) { -@@ -2073,7 +2079,8 @@ +@@ -2309,7 +2312,8 @@ static void kgem_commit(struct kgem *kgem) { struct kgem_request *rq =3D kgem->next_request; @@ -42,7 +38,7 @@ =20 list_for_each_entry_safe(bo, next, &rq->buffers, request) { assert(next->request.prev =3D=3D &bo->request); -@@ -2154,7 +2161,8 @@ +@@ -2390,7 +2394,8 @@ =20 static void kgem_finish_buffers(struct kgem *kgem) { @@ -51,8 +47,8 @@ + struct kgem_buffer *next; =20 list_for_each_entry_safe(bo, next, &kgem->batch_buffers, base.list) { - DBG(("%s: buffer handle=3D%d, used=3D%d, exec?=3D%d, write=3D%d, mmap= ped=3D%d\n", -@@ -2963,7 +2971,8 @@ + DBG(("%s: buffer handle=3D%d, used=3D%d, exec?=3D%d, write=3D%d, mmap= ped=3D%s\n", +@@ -3252,7 +3257,8 @@ static struct kgem_bo * search_linear_cache(struct kgem *kgem, unsigned int num_pages, unsigned= flags) { @@ -62,7 +58,7 @@ bool use_active =3D (flags & CREATE_INACTIVE) =3D=3D 0; struct list *cache; =20 -@@ -3521,7 +3530,7 @@ +@@ -3855,7 +3861,7 @@ uint32_t flags) { struct list *cache; @@ -71,7 +67,7 @@ uint32_t pitch, tiled_height, size; uint32_t handle; int i, bucket, retry; -@@ -4834,7 +4843,7 @@ +@@ -5302,7 +5308,7 @@ void kgem_clear_dirty(struct kgem *kgem) { struct list * const buffers =3D &kgem->next_request->buffers; @@ -79,8 +75,8 @@ + struct kgem_bo *bo =3D NULL; =20 list_for_each_entry(bo, buffers, request) { - if (!bo->dirty) -@@ -5072,7 +5081,7 @@ + if (!bo->gpu_dirty) +@@ -5578,7 +5584,7 @@ uint32_t size, uint32_t flags, void **ret) { Index: x11-drivers/xorg-drivers/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11-drivers/xorg-drivers/Makefile (revision 326808) +++ x11-drivers/xorg-drivers/Makefile (working copy) @@ -10,7 +10,7 @@ MAINTAINER=3D x11@FreeBSD.org COMMENT=3D X.org drivers meta-port =20 -.MAKE.FreeBSD_UL=3D yes +.MAKE.FreeBSD_UL=3D yes =20 VIDEODIR=3D ${PREFIX}/lib/xorg/modules/drivers INPUTDIR=3D ${PREFIX}/lib/xorg/modules/input Index: x11-fonts/xfs/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11-fonts/xfs/Makefile (revision 326808) +++ x11-fonts/xfs/Makefile (working copy) @@ -9,7 +9,7 @@ COMMENT=3D X.Org font server =20 XORG_CAT=3D app -USE_GMAKE=3D yes +USES=3D gmake USE_XORG=3D libfs xfont xtrans USE_RC_SUBR=3D xfs CONFIGURE_ARGS=3D --without-xmlto --without-fop Index: x11-servers/xephyr/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11-servers/xephyr/Makefile (revision 326808) +++ x11-servers/xephyr/Makefile (working copy) @@ -1,7 +1,6 @@ # $FreeBSD$ =20 PORTNAME=3D xephyr -PORTREVISION=3D 0 =20 COMMENT=3D X server from X.Org based on kdrive =20 Index: x11-servers/xorg-dmx/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11-servers/xorg-dmx/Makefile (revision 326808) +++ x11-servers/xorg-dmx/Makefile (working copy) @@ -2,7 +2,6 @@ # $FreeBSD$ =20 PORTNAME=3D xorg-dmx -PORTREVISION=3D 0 =20 COMMENT=3D Distributed Multihead X from X.Org =20 Index: x11-servers/xorg-nestserver/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11-servers/xorg-nestserver/Makefile (revision 326808) +++ x11-servers/xorg-nestserver/Makefile (working copy) @@ -23,6 +23,8 @@ PLIST_FILES=3D bin/Xnest MAN1=3D Xnest.1 =20 +.include + do-install: ${INSTALL_PROGRAM} ${WRKSRC}/hw/xnest/Xnest ${PREFIX}/bin/ .if defined(WITH_NEW_XORG) Index: x11-servers/xorg-server/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11-servers/xorg-server/Makefile (revision 326808) +++ x11-servers/xorg-server/Makefile (working copy) @@ -20,14 +20,28 @@ XORG_CAT=3D xserver SLAVE_PORT?=3D no =20 +OPTIONS_DEFINE=3D AIGLX SUID +OPTIONS_RADIO=3D CONF +OPTIONS_RADIO_CONF=3D HAL DEVD +AIGLX_DESC=3D Compile with Accelerated Indirect GLX support +SUID_DESC=3D Install the Xorg server with setuid bit set +HAL_DESC=3D Compile with HAL config support +DEVD_DESC=3D Use devd for autoconfiguration of input devices +OPTIONS_DEFAULT=3DAIGLX SUID DEVD + +OPTIONS_EXCLUDE_sparc64=3D HAL + +.include + .if defined(WITH_NEW_XORG) XORG_VERSION=3D 1.12.4 -XORG_REVISION=3D 1 +XORG_REVISION=3D 2 PLIST_SUB+=3D OLD=3D"@comment " NEW=3D"" -EXTRA_PATCHES+=3D ${FILESDIR}/extra-clang +EXTRA_PATCHES+=3D ${FILESDIR}/extra-clang \ + ${FILESDIR}/extra-configure .else XORG_VERSION=3D 1.7.7 -XORG_REVISION=3D 8 +XORG_REVISION=3D 9 PLIST_SUB+=3D OLD=3D"" NEW=3D"@comment " EXTRA_PATCHES+=3D ${FILESDIR}/extra-Xext-xace.c \ ${FILESDIR}/extra-Xserver-hw-xfree86-os-support-bsd-sparc64_video.c \ @@ -39,10 +53,8 @@ ${FILESDIR}/extra-Xserver-hw-xfree86-common-xf86Config.c .endif =20 -USES=3D perl5 -USE_PERL5=3D build USE_BZIP2=3D yes -USE_GMAKE=3D yes +USES=3D gmake USE_GL=3D gl USE_XORG?=3D xf86driproto glproto xdmcp x11 xkbfile xxf86misc xxf86vm xa= w7 \ xmu xt xpm xext randrproto renderproto fixesproto damageproto \ @@ -54,6 +66,7 @@ =20 MAKE_JOBS_UNSAFE=3D yes USE_OPENSSL=3D yes +USE_PERL5_BUILD=3Dyes CONFIGURE_ARGS?=3D--disable-dmx --disable-xvfb --disable-xnest \ --without-xmlto --disable-docs --disable-devel-docs \ --localstatedir=3D/var --without-dtrace --disable-xephyr \ @@ -78,14 +91,6 @@ PLIST=3D ${.CURDIR}/pkg-plist .endif =20 -OPTIONS_DEFINE=3D AIGLX SUID HAL -AIGLX_DESC=3D Compile with Accelerated Indirect GLX support -SUID_DESC=3D Install the Xorg server with setuid bit set -HAL_DESC=3D Compile with HAL config support -OPTIONS_DEFAULT=3D AIGLX SUID HAL - -OPTIONS_EXCLUDE_sparc64=3D HAL - .include =20 .if defined(WITH_OPENSSL_BASE) @@ -102,6 +107,10 @@ CONFIGURE_ARGS+=3D --enable-config-hal=3Dno .endif =20 +.if ${PORT_OPTIONS:MDEVD} +EXTRA_PATCHES+=3D ${FILESDIR}/extra-config_devd.c +.endif + .if ${PORT_OPTIONS:MAIGLX} CONFIGURE_ARGS+=3D --enable-aiglx=3Dyes .else @@ -171,6 +180,17 @@ @${REINPLACE_CMD} -e 's|@GLX_TRUE@GLXMODS =3D|@GLX_BOGUS@GLXMODS =3D|g'= \ -e 's|^LTLIBRARIES =3D |LTLIBRARIES =3D libglx.la |g' \ ${WRKSRC}/hw/xfree86/dixmods/Makefile.in +.if ${PORT_OPTIONS:MDEVD} + @${ECHO_CMD} -e "\nint config_devd_init(void);\nvoid config_devd_fini(v= oid);" \ + >> ${WRKSRC}/config/config-backends.h +.endif +=20 +post-configure: +.if ${PORT_OPTIONS:MDEVD} + @${REINPLACE_CMD} -e 's|config\.c|config.c devd.c|g' \ + -e 's|config\.lo|config.lo devd.lo|g' \ + ${WRKSRC}/config/Makefile +.endif =20 .if ${SLAVE_PORT} =3D=3D "no" pre-su-install: Index: x11-servers/xorg-server/files/extra-config_devd.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11-servers/xorg-server/files/extra-config_devd.c (revision 0) +++ x11-servers/xorg-server/files/extra-config_devd.c (working copy) @@ -0,0 +1,481 @@ +--- /dev/null 2013-08-03 00:44:23.000000000 +0200 ++++ config/devd.c 2013-08-03 00:45:15.162836806 +0200 +@@ -0,0 +1,478 @@ ++/* ++ * Copyright =C2=A9 2012 Baptiste Daroussin ++ * ++ * Permission is hereby granted, free of charge, to any person obtainin= g a ++ * copy of this software and associated documentation files (the "Softw= are"), ++ * to deal in the Software without restriction, including without limit= ation ++ * the rights to use, copy, modify, merge, publish, distribute, sublice= nse, ++ * and/or sell copies of the Software, and to permit persons to whom th= e ++ * Software is furnished to do so, subject to the following conditions:= ++ * ++ * The above copyright notice and this permission notice (including the= next ++ * paragraph) shall be included in all copies or substantial portions o= f the ++ * Software. ++ * ++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPR= ESS OR ++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABIL= ITY, ++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT S= HALL ++ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR= OTHER ++ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARIS= ING ++ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER ++ * DEALINGS IN THE SOFTWARE. ++ * ++ * Author: Baptiste Daroussin ++ */ ++ ++#ifdef HAVE_DIX_CONFIG_H ++#include ++#endif ++ ++#include ++#include ++#include ++#include ++ ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include "input.h" ++#include "inputstr.h" ++#include "hotplug.h" ++#include "config-backends.h" ++#include "os.h" ++ ++#define DEVD_SOCK_PATH "/var/run/devd.pipe" ++ ++#define DEVD_EVENT_ADD '+' ++#define DEVD_EVENT_REMOVE '-' ++ ++static int sock_devd =3D -1; ++ ++#if XORG_VERSION_CURRENT < 10800000 ++enum { ++ ATTR_KEYBOARD, ++ ATTR_POINTER, ++ ATTR_JOYSTICK, ++ ATTR_TOUCHPAD, ++ ATTR_TOUCHSCREEN, ++}; ++#endif ++ ++struct hw_type { ++ const char *driver; ++ int flag; ++ const char *xdriver; ++}; ++ ++static struct hw_type hw_types[] =3D { ++ { "ukbd", ATTR_KEYBOARD, "kdb" }, ++ { "atkbd", ATTR_KEYBOARD, "kdb" }, ++ { "ums", ATTR_POINTER, "mouse" }, ++ { "psm", ATTR_POINTER, "mouse" }, ++ { "uhid", ATTR_POINTER, "mouse" }, ++ { "joy", ATTR_JOYSTICK, NULL }, ++ { "atp", ATTR_TOUCHPAD, NULL }, ++ { "uep", ATTR_TOUCHSCREEN, NULL }, ++ { NULL, -1, NULL }, ++}; ++ ++#if XORG_VERSION_CURRENT < 10800000 ++static void ++add_option(InputOption **options, const char *key, const char *value) ++{ ++ if (!value || *value =3D=3D '\0') ++ return; ++ ++ for (; *options; options =3D &(*options)->next) ++ ; ++ *options =3D calloc(sizeof(**options), 1); ++ if (!*options) /* Yeesh. */ ++ return; ++ (*options)->key =3D xstrdup(key); ++ (*options)->value =3D xstrdup(value); ++ (*options)->next =3D NULL; ++} ++ ++static void ++remove_device(DeviceIntPtr dev) ++{ ++ /* this only gets called for devices that have already been added *= / ++ LogMessage(X_INFO, "config/devd: removing device %s\n", dev->name);= ++ ++ /* Call PIE here so we don't try to dereference a device that's ++ * already been removed. */ ++ OsBlockSignals(); ++ ProcessInputEvents(); ++ DeleteInputDeviceRequest(dev); ++ OsReleaseSignals(); ++} ++ ++static bool ++device_is_duplicate(char *config_info) ++{ ++ DeviceIntPtr dev; ++ ++ for (dev =3D inputInfo.devices; dev; dev =3D dev->next) ++ if (dev->config_info && (strcmp(dev->config_info, config_info) = =3D=3D 0)) ++ return true; ++ ++ for (dev =3D inputInfo.off_devices; dev; dev =3D dev->next) ++ if (dev->config_info && (strcmp(dev->config_info, config_info) = =3D=3D 0)) ++ return true; ++ ++ return false; ++} ++ ++#endif ++ ++static bool ++sysctl_exists(const char *format, ...) ++{ ++ va_list args; ++ char *name =3D NULL; ++ size_t len; ++ int ret; ++ ++ if (format =3D=3D NULL) ++ return false; ++ ++ va_start(args, format); ++ vasprintf(&name, format, args); ++ va_end(args); ++ ++ ret =3D sysctlbyname(name, NULL, &len, NULL, 0); ++ ++ if (ret =3D=3D -1) ++ len =3D 0; ++ ++ free(name); ++ return (len > 0); ++} ++ ++static char * ++sysctl_get_str(const char *format, ...) ++{ ++ va_list args; ++ char *name =3D NULL; ++ char *dest =3D NULL; ++ size_t len; ++ ++ if (format =3D=3D NULL) ++ return NULL; ++ ++ va_start(args, format); ++ vasprintf(&name, format, args); ++ va_end(args); ++ ++ if (sysctlbyname(name, NULL, &len, NULL, 0) =3D=3D 0) { ++ dest =3D malloc(len + 1); ++ if (sysctlbyname(name, dest, &len, NULL, 0) =3D=3D 0) ++ dest[len] =3D '\0'; ++ else { ++ free(dest); ++ dest =3D NULL; ++ } ++ } ++ ++ free(name); ++ return dest; ++} ++ ++static void ++device_added(char *line) ++{ ++ char *walk; ++ char *path; ++ char *vendor; ++ char *product =3D NULL; ++ char *config_info =3D NULL; ++ InputOption *options =3D NULL; ++#if XORG_VERSION_CURRENT > 10800000 ++ InputAttributes attrs =3D {}; ++#else ++ InputOption *tmpo; ++#endif ++ DeviceIntPtr dev =3D NULL; ++ int i, rc; ++ ++ walk =3D strchr(line, ' '); ++ if (walk !=3D NULL) ++ walk[0] =3D '\0'; ++ ++ for (i =3D 0; hw_types[i].driver !=3D NULL; i++) { ++ if (strncmp(line, hw_types[i].driver, ++ strlen(hw_types[i].driver)) =3D=3D 0 && ++ isnumber(*(line + strlen(hw_types[i].driver)))) { ++#if XORG_VERSION_CURRENT > 10800000 ++ attrs.flags |=3D hw_types[i].flag; ++#endif ++ break; ++ } ++ } ++ if (hw_types[i].driver =3D=3D NULL) { ++ LogMessageVerb(X_INFO, 10, "config/devd: ignoring device %s\n",= line); ++ return; ++ } ++ ++#if XORG_VERSION_CURRENT < 10800000 ++ if (hw_types[i].xdriver =3D=3D NULL) { ++ LogMessageVerb(X_INFO, 10, "config/devd: ignoring device %s\n",= line); ++ return; ++ } ++#endif ++ if (asprintf(&path, "/dev/%s", line) =3D=3D -1) ++ return; ++ ++#if XORG_VERSION_CURRENT < 10800000 ++ options =3D calloc(sizeof(*options), 1); ++ if (!options) ++ return; ++ ++ add_option(&options, "_source", "server/devd"); ++#else ++ options =3D input_option_new(NULL, "_source", "server/devd"); ++ if (!options) ++ return; ++#endif ++ ++ vendor =3D sysctl_get_str("dev.%s.%s.%%desc", hw_types[i].driver, l= ine + strlen(hw_types[i].driver)); ++ if (vendor =3D=3D NULL) { ++#if XORG_VERSION_CURRENT > 10800000 ++ attrs.vendor =3D strdup("(unnamed)"); ++#endif ++ } else { ++ if ((product =3D strchr(vendor, ' ')) !=3D NULL) { ++ product[0] =3D '\0'; ++ product++; ++ } ++#if XORG_VERSION_CURRENT > 10800000 ++ attrs.vendor =3D strdup(vendor); ++#endif ++ if (product !=3D NULL && (walk =3D strchr(product, ',')) !=3D N= ULL) ++ walk[0] =3D '\0'; ++#if XORG_VERSION_CURRENT > 10800000 ++ attrs.product =3D strdup(product !=3D NULL ? product : "(unname= d)"); ++ options =3D input_option_new(options, "name", product !=3D NULL ? prod= uct : "(unnamed)"); ++#else ++ add_option(&options, "name", product !=3D NULL ? product : "(un= named)"); ++#endif ++ } ++#if XORG_VERSION_CURRENT > 10800000 ++ attrs.usb_id =3D NULL; ++ options =3D input_option_new(options, "path", path); ++ options =3D input_option_new(options, "device", path); ++#else ++ add_option(&options, "path", path); ++ add_option(&options, "device", path); ++#endif ++ ++#if XORG_VERSION_CURRENT < 10800000 ++ add_option(&options, "driver", hw_types[i].xdriver); ++#endif ++ ++ if (asprintf(&config_info, "devd:%s", line) =3D=3D -1) { ++ config_info =3D NULL; ++ goto unwind; ++ } ++ ++ if (device_is_duplicate(config_info)) { ++ LogMessage(X_WARNING, "config/devd: device %s already added. " ++ "Ignoring.\n", product !=3D NULL ? produc= t : "(unnamed)"); ++ goto unwind; ++ } ++ ++#if XORG_VERSION_CURRENT < 10800000 ++ add_option(&options, "config_info", config_info); ++#else ++ options =3D input_option_new(options, "config_info", config_info); ++#endif ++ LogMessage(X_INFO, "config/devd: Adding input device %s (%s)\n", ++ product !=3D NULL ? product : "(unnamed)", path); ++ ++#if XORG_VERSION_CURRENT > 10800000 ++ rc =3D NewInputDeviceRequest(options, &attrs, &dev); ++#else ++ rc =3D NewInputDeviceRequest(options, &dev); ++#endif ++ ++ if (rc !=3D Success) ++ goto unwind; ++ ++ unwind: ++ free(config_info); ++#if XORG_VERSION_CURRENT < 10800000 ++ while ((tmpo =3D options)) { ++ options =3D tmpo->next; ++ free(tmpo->key); /* NULL if dev !=3D NULL */ ++ free(tmpo->value); /* NULL if dev !=3D NULL */ ++ free(tmpo); ++ } ++#else ++ input_option_free_list(&options); ++#endif ++ ++#if XORG_VERSION_CURRENT > 10800000 ++ free(attrs.usb_id); ++ free(attrs.product); ++ free(attrs.device); ++ free(attrs.vendor); ++#endif ++ ++ return; ++} ++ ++static void ++device_removed(char *line) ++{ ++ char *walk; ++ char *value; ++#if XORG_VERSION_CURRENT < 10800000 ++ DeviceIntPtr dev, next; ++#endif ++ ++ walk =3D strchr(line, ' '); ++ if (walk !=3D NULL) ++ walk[0] =3D '\0'; ++ ++ if (asprintf(&value, "devd:%s", line) =3D=3D -1) ++ return; ++ ++#if XORG_VERSION_CURRENT > 10800000 ++ remove_devices("dev", value); ++#else ++ for (dev =3D inputInfo.devices; dev; dev =3D next) { ++ next =3D dev->next; ++ if (dev->config_info && strcmp(dev->config_info, value) =3D=3D = 0) ++ remove_device(dev); ++ } ++ for (dev =3D inputInfo.off_devices; dev; dev =3D next) { ++ next =3D dev->next; ++ if (dev->config_info && strcmp(dev->config_info, value) =3D=3D = 0) ++ remove_device(dev); ++ } ++#endif ++ ++ free(value); ++} ++ ++static ssize_t ++socket_getline(int fd, char **out) ++{ ++ char *buf; ++ ssize_t ret, cap, sz =3D 0; ++ char c; ++ ++ cap =3D 1024; ++ buf =3D malloc(cap * sizeof(char)); ++ if (!buf) ++ return -1; ++ ++ for (;;) { ++ ret =3D read(sock_devd, &c, 1); ++ if (ret < 1) { ++ free(buf); ++ return -1; ++ } ++ ++ if (c =3D=3D '\n') ++ break; ++ ++ if (sz + 1 >=3D cap) { ++ cap *=3D 2; ++ buf =3D realloc(buf, cap *sizeof(char)); ++ } ++ buf[sz] =3D c; ++ sz++; ++ } ++ ++ buf[sz] =3D '\0'; ++ if (sz > 0) ++ *out =3D buf; ++ else ++ free(buf); ++ ++ return sz; /* number of bytes in the line, not counting the line break= */ ++} ++ ++static void ++wakeup_handler(pointer data, int err, pointer read_mask) ++{ ++ char *line =3D NULL; ++ ++ if (err < 0) ++ return; ++ ++ if (FD_ISSET(sock_devd, (fd_set *)read_mask)) { ++ if (socket_getline(sock_devd, &line) < 0) ++ return; ++ ++ switch(*line) { ++ case DEVD_EVENT_ADD: ++ device_added(line++); ++ break; ++ case DEVD_EVENT_REMOVE: ++ device_removed(line++); ++ break; ++ default: ++ break; ++ } ++ free(line); ++ } ++} ++ ++static void ++block_handler(pointer data, struct timeval **tv, pointer read_mask) ++{ ++} ++ ++int ++config_devd_init(void) ++{ ++ struct sockaddr_un devd; ++ char devicename[1024]; ++ int i, j; ++ ++ /* first scan the sysctl to determine the hardware if needed */ ++ ++ for (i =3D 0; hw_types[i].driver !=3D NULL; i++) { ++ for (j =3D 0; sysctl_exists("dev.%s.%i.%%desc", hw_types[i].dri= ver, j); j++) { ++ snprintf(devicename, 1024, "%s%i", hw_types[i].driver, j); ++ device_added(devicename); ++ } ++ ++ } ++ sock_devd =3D socket(AF_UNIX, SOCK_STREAM, 0); ++ if (sock_devd < 0) { ++ ErrorF("config/devd: Fail opening stream socket"); ++ return 0; ++ } ++ ++ devd.sun_family =3D AF_UNIX; ++ strlcpy(devd.sun_path, DEVD_SOCK_PATH, sizeof(devd.sun_path)); ++ ++ if (connect(sock_devd, (struct sockaddr *) &devd, sizeof(struct soc= kaddr_un)) < 0) { ++ close(sock_devd); ++ ErrorF("config/devd: Fail to connect to devd"); ++ return 0; ++ } ++ ++ RegisterBlockAndWakeupHandlers(block_handler, wakeup_handler, NULL)= ; ++ AddGeneralSocket(sock_devd); ++ ++ return 1; ++} ++ ++void ++config_devd_fini(void) ++{ ++ if (sock_devd < 0) ++ return; ++ ++ RemoveGeneralSocket(sock_devd); ++ RemoveBlockAndWakeupHandlers(block_handler, wakeup_handler, NULL); ++ close(sock_devd); ++} Property changes on: x11-servers/xorg-server/files/extra-config_devd.c ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +FreeBSD=3D%H \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Index: x11-servers/xorg-server/files/extra-configure =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11-servers/xorg-server/files/extra-configure (revision 0) +++ x11-servers/xorg-server/files/extra-configure (working copy) @@ -0,0 +1,11 @@ +--- configure.orig 2013-09-07 22:11:27.210621324 +0200 ++++ configure 2013-09-07 22:11:52.912624338 +0200 +@@ -22839,7 +22839,7 @@ + } + _ACEOF + if ac_fn_c_try_compile "$LINENO"; then : +- ac_cv_tls=3D$kw ++ ac_cv_tls=3D$kw; break ; + fi + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + done Property changes on: x11-servers/xorg-server/files/extra-configure ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Index: x11-themes/gtk-murrine-engine/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11-themes/gtk-murrine-engine/Makefile (revision 326808) +++ x11-themes/gtk-murrine-engine/Makefile (working copy) @@ -3,6 +3,7 @@ =20 PORTNAME=3D murrine PORTVERSION=3D 0.98.2 +PORTREVISION=3D 1 CATEGORIES=3D x11-themes MASTER_SITES=3D GNOME PKGNAMEPREFIX=3D gtk- @@ -11,14 +12,12 @@ MAINTAINER=3D pneumann@gmail.com COMMENT=3D Murrine GTK+ 2.x cairo based engine =20 -LIB_DEPENDS=3D pixman-1:${PORTSDIR}/x11/pixman - USE_XZ=3D yes -USE_GMAKE=3D yes +USE_XORG=3D pixman USE_GNOME=3D gtk20 intltool intlhack USE_LDCONFIG=3D yes GNU_CONFIGURE=3D yes -USES=3D pkgconfig +USES=3D gmake pkgconfig =20 OPTIONS_DEFINE=3D ANIMATION ANIMATION_DESC=3D Animation support Index: x11-toolkits/gtkglext/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11-toolkits/gtkglext/Makefile (revision 326808) +++ x11-toolkits/gtkglext/Makefile (working copy) @@ -3,7 +3,7 @@ =20 PORTNAME=3D gtkglext PORTVERSION=3D 1.2.0 -PORTREVISION=3D 11 +PORTREVISION=3D 12 CATEGORIES=3D x11-toolkits MASTER_SITES=3D SF DIST_SUBDIR=3D gnome2 @@ -25,12 +25,11 @@ OPTIONS_DEFINE=3D DOCS =20 USE_BZIP2=3D yes -USE_GMAKE=3D yes USE_AUTOTOOLS=3D libtool USE_XORG=3D ice pixman sm x11 xau xcb xcomposite xcursor xdamage xdmcp \= xext xfixes xi xinerama xmu xrandr xrender xt xxf86vm USE_GL=3D glu -USES=3D gettext iconv pathfix pkgconfig +USES=3D gettext gmake iconv pathfix pkgconfig USE_GNOME=3D gdkpixbuf2 gtk20 pangox-compat USE_LDCONFIG=3D yes =20 Index: x11-toolkits/libXaw/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11-toolkits/libXaw/Makefile (revision 326808) +++ x11-toolkits/libXaw/Makefile (working copy) @@ -2,7 +2,7 @@ # $FreeBSD$ =20 PORTNAME=3D libXaw -PORTVERSION=3D 1.0.11 +PORTVERSION=3D 1.0.12 PORTEPOCH=3D 2 CATEGORIES=3D x11-toolkits =20 @@ -11,7 +11,7 @@ =20 XORG_CAT=3D lib USE_XORG=3D printproto:both x11 xau xext xextproto xmu xp xpm xproto:bot= h xt -USE_GMAKE=3D yes +USES=3D gmake CONFIGURE_ARGS+=3D--without-xmlto =20 MAN3=3D Xaw.3 Index: x11-toolkits/libXaw/distinfo =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11-toolkits/libXaw/distinfo (revision 326808) +++ x11-toolkits/libXaw/distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (xorg/lib/libXaw-1.0.11.tar.bz2) =3D 87a874acbb71d1ee59b8047312fc= 91d89dcb373e2970f121184cdae29a3d9492 -SIZE (xorg/lib/libXaw-1.0.11.tar.bz2) =3D 649633 +SHA256 (xorg/lib/libXaw-1.0.12.tar.bz2) =3D 96fc314874fce9979556321d1d6e= e00b5baf32fb333b7278853b4983bc3cdbf6 +SIZE (xorg/lib/libXaw-1.0.12.tar.bz2) =3D 677147 Index: x11-toolkits/libXmu/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11-toolkits/libXmu/Makefile (revision 326808) +++ x11-toolkits/libXmu/Makefile (working copy) @@ -2,7 +2,7 @@ # $FreeBSD$ =20 PORTNAME=3D libXmu -PORTVERSION=3D 1.1.1 +PORTVERSION=3D 1.1.2 PORTEPOCH=3D 1 CATEGORIES=3D x11-toolkits =20 Index: x11-toolkits/libXmu/distinfo =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11-toolkits/libXmu/distinfo (revision 326808) +++ x11-toolkits/libXmu/distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (xorg/lib/libXmu-1.1.1.tar.bz2) =3D 709081c550cc3a866d7c760a3f973= 84a1fe16e27fc38fe8169b8db9f33aa7edd -SIZE (xorg/lib/libXmu-1.1.1.tar.bz2) =3D 383473 +SHA256 (xorg/lib/libXmu-1.1.2.tar.bz2) =3D 756edc7c383254eef8b4e1b733c3b= f1dc061b523c9f9833ac7058378b8349d0b +SIZE (xorg/lib/libXmu-1.1.2.tar.bz2) =3D 396230 Index: x11-wm/awesome/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11-wm/awesome/Makefile (revision 326808) +++ x11-wm/awesome/Makefile (working copy) @@ -3,7 +3,7 @@ =20 PORTNAME=3D awesome PORTVERSION=3D 3.5.1 -PORTREVISION=3D 2 +PORTREVISION=3D 3 PORTEPOCH=3D 1 CATEGORIES=3D x11-wm MASTER_SITES=3D http://awesome.naquadah.org/download/ --------------000902030408090803050609-- ------enig2QIVQNBKKMGPHGEVFEPQF Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.20 (FreeBSD) iQIcBAEBCgAGBQJSLeCkAAoJELuNS1e7i1VRYnYP/1T6iYejWHNRggGlaIjNSKhd NLX6/Hc/EzdC0VSjYodZENaZyVGksJwZKVfnHCjJorcX56MQZpBOk+JaXZOwgnQm 4ugTpQK/T/UyJSA1D/KDvuivnEzSvYt764CDedfmMqn9Okk3olfIEIlW75u15vnG NUL9L4huF5mAnza/3JkvxV8rIOngzjqrYxIFOzK0zXUg2BaJLZ7Fnnb6fGZzneVR KUpYVfOMDdCI5yLLWmNZtzK/ZR+64A4Z5QkKtu/7h4HnjdDmULKqiwWmFfifGUBl vHWUOrFX0hp1m1nXz7OG9W8C4Dyq5djtDc8B5NKEZeF4w5EfRXWgPiWlPp2Vu1+e 66bfS0UrFsB8WcL1dmZOHFSf7otS0DCjvUrWy4MaIDRYvuNM9q4L3kBYjkiiHHbx jPcfqPSPai2u+fVGqM2NfZ3wzIgSChRxo0AhwULy87Ac6jINlXnmm/Dgb9ojk3rR hqzvlyr11LzHVmb1To6fFS6G6Tc4rZwUSSMnJ+m3Jo/XGQuiudMRSBJiQRy3CH5U f+YcXJtff0GXzVW4WCjCMKM3RPrIM5u3VOF5YA9JAutfWz9SyG79qkJeKtDfrLpe 4WYewe6L1zWDIggvX1PBWFCApFn0k4HJCtuv1sL6zAszZC8075Cfu6fNJNOuBfyQ q5g+gvKBJQ+XX6+w7c68 =winD -----END PGP SIGNATURE----- ------enig2QIVQNBKKMGPHGEVFEPQF-- From owner-freebsd-x11@FreeBSD.ORG Mon Sep 9 16:12:56 2013 Return-Path: Delivered-To: freebsd-x11@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id AC3387EB for ; Mon, 9 Sep 2013 16:12:56 +0000 (UTC) (envelope-from kob6558@gmail.com) Received: from mail-pd0-x230.google.com (mail-pd0-x230.google.com [IPv6:2607:f8b0:400e:c02::230]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 8174621B9 for ; Mon, 9 Sep 2013 16:12:56 +0000 (UTC) Received: by mail-pd0-f176.google.com with SMTP id q10so6322687pdj.7 for ; Mon, 09 Sep 2013 09:12:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:in-reply-to:references:date:message-id:subject :from:to:cc:content-type; bh=mEnBdyjWC4ZbpUrkOO6T6FfQDJa/6x+3T6FvZelgsTI=; b=AmgeonY9rCZXGetWVNcB3DXzfpsCqVQgWsASq8U9GXcDRZc5ZKk6kOkWLgPYcJZ2ga hRS2smCcToIAReC3a7NHW47ly6RZFjXvq+v8lVhsER28q8bNX/kNT7+x2nZUhsPQEBjZ aK7ib8Os5+lXOi22f7n9hDoEFQMUkPyQLVAmBKbumw3IqbKkSifSKvdSZ+Frb6gwof10 x2br2WCH6dsb3DY78XnYLi9zF2uZ4EwmdWaNP929GYS+wzk0yKlX+MO9YYQFEtWxa/wu WMAe1svzjkbTUnocyIBkpE3QXyis9JDQ9IobjJFLWsLmLimfKchEmjJC4enlAK/i6vlI gctA== MIME-Version: 1.0 X-Received: by 10.68.194.198 with SMTP id hy6mr3202622pbc.177.1378743176105; Mon, 09 Sep 2013 09:12:56 -0700 (PDT) Sender: kob6558@gmail.com Received: by 10.66.219.74 with HTTP; Mon, 9 Sep 2013 09:12:56 -0700 (PDT) In-Reply-To: <522DD2BA.1080705@dumbbell.fr> References: <20130822155651.GA32146@probe.unige.ch> <52171DE6.7030909@FreeBSD.org> <20130823091753.GA21594@probe.unige.ch> <52175C5E.2080007@FreeBSD.org> <20130823150007.GA31164@probe.unige.ch> <521E3828.9000605@FreeBSD.org> <20130829143122.GA757@probe.unige.ch> <5220A94F.6030800@FreeBSD.org> <5227A575.90805@dumbbell.fr> <20130909120645.GA5517@probe.unige.ch> <522DD2BA.1080705@dumbbell.fr> Date: Mon, 9 Sep 2013 09:12:56 -0700 X-Google-Sender-Auth: TIiDrtZ4h-aX7WR_jv4NGUBsvS0 Message-ID: Subject: Re: unsupported synaptics touchpad From: Kevin Oberman To: =?UTF-8?B?SmVhbi1Tw6liYXN0aWVuIFDDqWRyb24=?= Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-Content-Filtered-By: Mailman/MimeDel 2.1.14 Cc: "freebsd-x11@freebsd.org" X-BeenThere: freebsd-x11@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: X11 on FreeBSD -- maintaining and support List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Sep 2013 16:12:56 -0000 On Mon, Sep 9, 2013 at 6:52 AM, Jean-S=C3=A9bastien P=C3=A9dron < jean-sebastien.pedron@dumbbell.fr> wrote: > Le 09/09/2013 14:06, Ke Sun a =C3=A9crit : > > Does that mean that I tap on the touchpad, and that I click the touchpad >> left >> button, is exactly the same button to X? >> > > Yes, when synaptics_support is disabled, we can't distinguish a physical > button from a tap. The only information received from the hardware is an > event saying "the user clicked using button #1" (ie. left button). > > > It is possible to disable this button and use the right button for >> left clicking by tunning xorg.conf? >> > > I don't think so, because the hardware is not configurable in this mode. > From X.Org PoV, you could remap button #1 (left button) or button #3 (rig= ht > button), but no matter what, the physical left button and the tap share t= he > same number, #1. > When looking at this sort of issue, xev(1) is your very good friend. It reports all mouse events including raw information into X as well as how X interprets it. (Also mouse moves, keyboard events, meta-key actions, etc. --=20 R. Kevin Oberman, Network Engineer E-mail: rkoberman@gmail.com From owner-freebsd-x11@FreeBSD.ORG Mon Sep 9 19:13:43 2013 Return-Path: Delivered-To: freebsd-x11@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id B2547110 for ; Mon, 9 Sep 2013 19:13:43 +0000 (UTC) (envelope-from lumiwa@gmail.com) Received: from mail-qa0-x229.google.com (mail-qa0-x229.google.com [IPv6:2607:f8b0:400d:c00::229]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 759D42DD1 for ; Mon, 9 Sep 2013 19:13:43 +0000 (UTC) Received: by mail-qa0-f41.google.com with SMTP id cr7so441438qab.0 for ; Mon, 09 Sep 2013 12:13:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:content-type:content-transfer-encoding:subject:message-id:date :to:mime-version; bh=1I7+JPx+Y9U/O4kdaqIeWaIBqP06ErK2L64TDJAyTyA=; b=VDiX0jlGiXTUlTsW7PK2b/0KCWYZTA2+KIOieeQcbEkMfULdGGc/BMwvjWfvJfw9J1 4jgp1NfnXrcYcmAOJdSgz4on8u2Rbv8g0tc8qafGiKRG66wMJvd45M8XYHhTfnHEz4lp aFnzPX2qyL3V1wraAgI4z87HA5lLR8NADAwwND9yLwSCuyfwc8Qt6xdNdApPxKytMMhI ZrRK3/KDYmPbe04hNBFQF184gzQ0w75uOl4jB4CkIfI5Hj+e0GLoLEQj0lDC9k32LCoU atYtvgk8RZdlJaUDBMlNdX8b5oiinq0iTENnfMHp5v/gUeFrwi1AmXTzikbXs/ly7wI9 BBug== X-Received: by 10.229.47.71 with SMTP id m7mr13193454qcf.25.1378754022551; Mon, 09 Sep 2013 12:13:42 -0700 (PDT) Received: from [192.168.2.254] (d-ptld-bng1-70-20-36-96.ngn.east.myfairpoint.net. [70.20.36.96]) by mx.google.com with ESMTPSA id f14sm21887279qej.6.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 09 Sep 2013 12:13:41 -0700 (PDT) From: ajtiM Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: quoted-printable Subject: xorg on FreeBSD 9.2 Message-Id: <4962D0E7-B1D2-4952-81D0-56071B57EDD0@gmail.com> Date: Mon, 9 Sep 2013 15:13:40 -0400 To: freebsd-x11@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 6.5 \(1508\)) X-Mailer: Apple Mail (2.1508) X-BeenThere: freebsd-x11@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: X11 on FreeBSD -- maintaining and support List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Sep 2013 19:13:43 -0000 Hi! Today I installed FreeBSD 9.2 RC3 (amd64) on iMac: Model Name: iMac Model Identifier: iMac11,1 Processor Name: Intel Core i7 Processor Speed: 2.8 GHz Number of Processors: 1 Total Number of Cores: 4 L2 Cache (per Core): 256 KB L3 Cache: 8 MB Memory: 8 GB ATI Radeon HD 4850: Chipset Model: ATI Radeon HD 4850 Type: GPU Bus: PCIe PCIe Lane Width: x16 VRAM (Total): 512 MB Vendor: ATI (0x1002) Device ID: 0x944a Revision ID: 0x0000 ROM Revision: 113-B9110C-425 EFI Driver Version: 01.00.383 Displays: iMac: Display Type: LCD Resolution: 2560 x 1440 Pixel Depth: 32-Bit Color (ARGB8888) Main Display: Yes Mirror: Off Online: Yes Built-In: Yes Connection Type: DisplayPort I like to install Xorg and KDE4. I read about new radeon drivers, KMS. = but I don't know how to install Xorg. Do I need to put in make.conf = WITH_NEW_XORG or not, please. Do I need to rebuilt kernel with KMS = support? Thank you very much. Mitja ---- http://www.redbubble.com/people/lumiwa From owner-freebsd-x11@FreeBSD.ORG Mon Sep 9 21:52:16 2013 Return-Path: Delivered-To: freebsd-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 ESMTP id 62994982 for ; Mon, 9 Sep 2013 21:52:16 +0000 (UTC) (envelope-from zeising@freebsd.org) Received: from mail.lysator.liu.se (mail.lysator.liu.se [IPv6:2001:6b0:17:f0a0::3]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 160B626DE for ; Mon, 9 Sep 2013 21:52:16 +0000 (UTC) Received: from mail.lysator.liu.se (localhost [127.0.0.1]) by mail.lysator.liu.se (Postfix) with ESMTP id 74C7B40039 for ; Mon, 9 Sep 2013 23:52:13 +0200 (CEST) Received: by mail.lysator.liu.se (Postfix, from userid 1004) id 6A76F40038; Mon, 9 Sep 2013 23:52:13 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on bernadotte.lysator.liu.se X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=AWL autolearn=disabled version=3.3.1 X-Spam-Score: 0.0 Received: from mx.daemonic.se (mx.daemonic.se [IPv6:2001:470:dca9:0:1::3]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.lysator.liu.se (Postfix) with ESMTPSA id 2AD4640030; Mon, 9 Sep 2013 23:52:13 +0200 (CEST) Received: from mailscanner.daemonic.se (mailscanner.daemonic.se [IPv6:2001:470:dca9:0:1::6]) by mx.daemonic.se (Postfix) with ESMTPS id 3cYjlJ4cz9z8hVv; Mon, 9 Sep 2013 23:52:12 +0200 (CEST) X-Virus-Scanned: amavisd-new at daemonic.se Received: from mx.daemonic.se ([10.1.0.3]) (using TLS with cipher CAMELLIA256-SHA) by mailscanner.daemonic.se (mailscanner.daemonic.se [10.1.0.6]) (amavisd-new, port 10025) with ESMTPS id 4EkompdviZSY; Mon, 9 Sep 2013 23:52:10 +0200 (CEST) Received: from mail.daemonic.se (mail.daemonic.se [10.1.0.4]) by mx.daemonic.se (Postfix) with ESMTPS id 3cYjlD4VZNz8hVn; Mon, 9 Sep 2013 23:52:08 +0200 (CEST) Received: from vivi.daemonic.se (vivi.daemonic.se [10.32.0.4]) by mail.daemonic.se (Postfix) with ESMTPSA id 3cYjlD3sbHz9Ctj; Mon, 9 Sep 2013 23:52:08 +0200 (CEST) Message-ID: <522E4308.3020304@freebsd.org> Date: Mon, 09 Sep 2013 23:52:08 +0200 From: Niclas Zeising User-Agent: Mutt/1.5.21 MIME-Version: 1.0 To: ajtiM Subject: Re: xorg on FreeBSD 9.2 References: <4962D0E7-B1D2-4952-81D0-56071B57EDD0@gmail.com> In-Reply-To: <4962D0E7-B1D2-4952-81D0-56071B57EDD0@gmail.com> X-Enigmail-Version: 1.5.1 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit X-Virus-Scanned: ClamAV using ClamSMTP Cc: freebsd-x11@freebsd.org X-BeenThere: freebsd-x11@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: X11 on FreeBSD -- maintaining and support List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Sep 2013 21:52:16 -0000 On 09/09/13 21:13, ajtiM wrote: > Hi! > > Today I installed FreeBSD 9.2 RC3 (amd64) on iMac: > > I like to install Xorg and KDE4. I read about new radeon drivers, KMS. but I don't know how to install Xorg. Do I need to put in make.conf WITH_NEW_XORG or not, please. Do I need to rebuilt kernel with KMS support? > If you want ATI kms you need the very latest FreeBSD CURRENT. Start by looking at the handbook for information on how to do this. See for instance http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/current-stable.html . Secondly, you need the patch to update xorg and mesa ports. It was sent as a CFT on the mailing list earlier today, and is also avalable at http://people.freebsd.org/~zeising/xorg-mesaupdate.diff . Lastly, add WITH_NEW_XORG= and possibly also WITH_GALLIUM= to /etc/make.conf to compile the new xorg stack, and then compile xorg. Hope this works for you! Regards! -- Niclas Zeising From owner-freebsd-x11@FreeBSD.ORG Mon Sep 9 23:31:00 2013 Return-Path: Delivered-To: freebsd-x11@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id D88575FF for ; Mon, 9 Sep 2013 23:31:00 +0000 (UTC) (envelope-from lumiwa@gmail.com) Received: from mail-qa0-x234.google.com (mail-qa0-x234.google.com [IPv6:2607:f8b0:400d:c00::234]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 9D7D92B98 for ; Mon, 9 Sep 2013 23:31:00 +0000 (UTC) Received: by mail-qa0-f52.google.com with SMTP id j15so5476qaq.4 for ; Mon, 09 Sep 2013 16:30:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:content-type:content-transfer-encoding:subject:message-id:date :to:mime-version; bh=eIQYXRsbt6oKd/+ooVHUzDFomS1bj5MTBZw6XclfhfA=; b=bH8i1sgNSysPJR4SLZd+zns1PUVEfcCqJNvtkEYuMqWnCPC/P2RkttJnXUaYPEQqA8 FY6qQaPCGk93UeqTginTwpe/DEA/9XBc/llNl1TAr9H1b6OswEwwMu40oybp9dg/Q7U/ bfjCFk+6p7VThMy+j5VIX3pfeff0e1vJdd+LddPPueDw9W73Dx5fOK749Ki2/Xfw1ypH Mx+DW7670mHj4XTTZr596Mb1vRYBmizQt+bptoXnP8J9EyntGW24mdI9PxUyg1cKCjKT Y1pImphROIOxyNCtsoKWOnrxiz4sXUNrn+d5Fl0nnmO+spKFu08IR3wGSgrJ3PGvFpP8 Nigw== X-Received: by 10.49.76.6 with SMTP id g6mr20119466qew.41.1378769459891; Mon, 09 Sep 2013 16:30:59 -0700 (PDT) Received: from [192.168.2.254] (d-ptld-bng1-70-20-36-96.ngn.east.myfairpoint.net. [70.20.36.96]) by mx.google.com with ESMTPSA id nc16sm8515768qeb.8.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 09 Sep 2013 16:30:59 -0700 (PDT) From: ajtiM Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: quoted-printable Subject: gobject-introspection Message-Id: Date: Mon, 9 Sep 2013 19:30:57 -0400 To: "freebsd-x11@freebsd.org" Mime-Version: 1.0 (Mac OS X Mail 6.5 \(1508\)) X-Mailer: Apple Mail (2.1508) X-BeenThere: freebsd-x11@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: X11 on FreeBSD -- maintaining and support List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Sep 2013 23:31:00 -0000 Again me=85 I start compiling Xorg and it stopped at=20 gobject-introspection fails to commpile with python2.7 configure:13363: error: Python headers not found I have FreeBSD 9.2 RC3 installed on iMac 11,11 Thanks in advance. Mitja ---- http://www.redbubble.com/people/lumiwa From owner-freebsd-x11@FreeBSD.ORG Tue Sep 10 06:23:04 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 ESMTP id DF60CA80; Tue, 10 Sep 2013 06:23:04 +0000 (UTC) (envelope-from martymac@FreeBSD.org) Received: from lmtp.galacsys.net (webmail.galacsys.net [IPv6:2001:1b78:0:1:d918:51d7:0:1]) by mx1.freebsd.org (Postfix) with ESMTP id AA8A42D69; Tue, 10 Sep 2013 06:23:04 +0000 (UTC) Received: from martymac.org (webmail.galacsys.net [217.24.81.215]) by lmtp.galacsys.net (Postfix) with ESMTP id 73BB11FA5D4E; Tue, 10 Sep 2013 08:23:02 +0200 (CEST) From: "Ganael LAPLANCHE" To: Niclas Zeising ,x11@FreeBSD.org Subject: Re: [CFT] Update of xorg libraries and MESA X-Openwebmail-Date: Tue, 10 Sep 2013 09:23:02 +0200 Message-Id: <20130910062045.M54984@martymac.org> In-Reply-To: <522DE093.9080504@freebsd.org> References: <522DC3EB.4060607@freebsd.org> <522DE093.9080504@freebsd.org> X-Mailer: Open WebMail 2.01 20030425 X-OriginatingIP: 157.99.64.43 (ganael.laplanche@martymac.org) MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-15 Date: Tue, 10 Sep 2013 06:23:04 +0000 (UTC) Cc: ports@FreeBSD.org X-BeenThere: freebsd-x11@freebsd.org X-Mailman-Version: 2.1.14 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, 10 Sep 2013 06:23:05 -0000 On Mon, 09 Sep 2013 16:52:03 +0200, Niclas Zeising wrote Hi Nicolas, > The patch has been updated, and the updated version is attached. As > always, it is possible to find the latest version of the patch at > http://people.freebsd.org/~zeising/xorg-mesaupdate.diff Works like a charm on my Lenovo X220 (-CURRENT). Thanks ! -- Ganael LAPLANCHE http://www.martymac.org | http://contribs.martymac.org FreeBSD: martymac , http://www.FreeBSD.org From owner-freebsd-x11@FreeBSD.ORG Tue Sep 10 09:13:59 2013 Return-Path: Delivered-To: x11@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 23E5433C for ; Tue, 10 Sep 2013 09:13:59 +0000 (UTC) (envelope-from portscout@FreeBSD.org) Received: from portscout.freebsd.org (unknown [IPv6:2001:1900:2254:206a::50:123]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 12D242638 for ; Tue, 10 Sep 2013 09:13:59 +0000 (UTC) Received: from portscout.freebsd.org ([127.0.1.123]) by portscout.freebsd.org (8.14.7/8.14.7) with ESMTP id r8A9DwxF024082 for ; Tue, 10 Sep 2013 09:13:58 GMT (envelope-from portscout@portscout.freebsd.org) Received: (from portscout@localhost) by portscout.freebsd.org (8.14.7/8.14.6/Submit) id r8A9DwXN024077; Tue, 10 Sep 2013 09:13:58 GMT (envelope-from portscout) Message-Id: <201309100913.r8A9DwXN024077@portscout.freebsd.org> Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain MIME-Version: 1.0 Date: Tue, 10 Sep 2013 09:13:58 +0000 From: portscout@FreeBSD.org To: x11@freebsd.org Subject: FreeBSD ports you maintain which are out of date X-Mailer: portscout/0.8.1 X-BeenThere: freebsd-x11@freebsd.org X-Mailman-Version: 2.1.14 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, 10 Sep 2013 09:13:59 -0000 Dear port maintainer, The portscout new distfile checker has detected that one or more of your ports appears to be out of date. Please take the opportunity to check each of the ports listed below, and if possible and appropriate, submit/commit an update. If any ports have already been updated, you can safely ignore the entry. You will not be e-mailed again for any of the port/version combinations below. Full details can be found at the following URL: http://portscout.freebsd.org/x11@freebsd.org.html Port | Current version | New version ------------------------------------------------+-----------------+------------ x11-drivers/xf86-video-intel29 | 2.9.1 | 2.99.902 ------------------------------------------------+-----------------+------------ If any of the above results are invalid, please check the following page for details on how to improve portscout's detection and selection of distfiles on a per-port basis: http://portscout.freebsd.org/info/portscout-portconfig.txt If wish to stop receiving portscout reminders, please contact portscout@FreeBSD.org Thanks. From owner-freebsd-x11@FreeBSD.ORG Tue Sep 10 16:30:28 2013 Return-Path: Delivered-To: x11@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id AC73620E; Tue, 10 Sep 2013 16:30:28 +0000 (UTC) (envelope-from mikael.urankar@gmail.com) Received: from mail-oa0-x236.google.com (mail-oa0-x236.google.com [IPv6:2607:f8b0:4003:c02::236]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 5EA322870; Tue, 10 Sep 2013 16:30:28 +0000 (UTC) Received: by mail-oa0-f54.google.com with SMTP id j10so8153548oah.13 for ; Tue, 10 Sep 2013 09:30:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=5xF5Ndd+fd38TQVRTUDdd3Hqci8imUSI1r5W28xCD24=; b=reGyggNpOnku3Pc+pCbi0AUrLs38oG5vbp/K2fPurF6tbd/x3APvwVnQYrWHBViDIp 7L7XTfDoih17nkhY7yKVQXNZGFHTzsF30de85Zk8yOCEX3Zk3HyaIs2ysRkl1xGQVnMp tTDI+0ZbjRCfPPJK+Hoi0nHVEeaygBYwz8EFSM5rNb7oPzrpx6jfDBfaDdbIff3AOFuG cMY4dRbqEDxtINBLNVJPRPa69sIvd8rtQIDHuvvAnNcIPM0ErtBLB9GNbKUXCbJZe5Dc W5WWv9oUuwDFr9IfARUp8dw/TpT+BfjTUAKvSLcwiadl5a+3ZriF+OAEmwhP4Exs2ig3 kbPQ== MIME-Version: 1.0 X-Received: by 10.182.39.161 with SMTP id q1mr3703462obk.54.1378830627637; Tue, 10 Sep 2013 09:30:27 -0700 (PDT) Received: by 10.182.42.193 with HTTP; Tue, 10 Sep 2013 09:30:27 -0700 (PDT) In-Reply-To: <522DE093.9080504@freebsd.org> References: <522DC3EB.4060607@freebsd.org> <522DE093.9080504@freebsd.org> Date: Tue, 10 Sep 2013 18:30:27 +0200 Message-ID: Subject: Re: [CFT] Update of xorg libraries and MESA From: =?UTF-8?Q?Mika=C3=ABl_Urankar?= To: Niclas Zeising Content-Type: text/plain; charset=UTF-8 X-Content-Filtered-By: Mailman/MimeDel 2.1.14 Cc: ports@freebsd.org, x11@freebsd.org X-BeenThere: freebsd-x11@freebsd.org X-Mailman-Version: 2.1.14 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, 10 Sep 2013 16:30:28 -0000 Hi, 2013/9/9 Niclas Zeising > The patch has been updated, and the updated version > is attached. > As always, it is possible to find the latest version of the patch at > http://people.freebsd.org/~zeising/xorg-mesaupdate.diff > It works fine for me with the following ATI cards : RV380, RV535 and RV610, all with CURRENT amd64 (r254955M) and radeonkms. Thanks ! From owner-freebsd-x11@FreeBSD.ORG Tue Sep 10 16:31:35 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 ESMTP id 08C42305; Tue, 10 Sep 2013 16:31:35 +0000 (UTC) (envelope-from osidorkin@gmail.com) Received: from mail-ie0-x236.google.com (mail-ie0-x236.google.com [IPv6:2607:f8b0:4001:c03::236]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id BCA0D28B5; Tue, 10 Sep 2013 16:31:34 +0000 (UTC) Received: by mail-ie0-f182.google.com with SMTP id aq17so16780419iec.13 for ; Tue, 10 Sep 2013 09:31:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc:content-type; bh=9KiSWFhPcMYScQO7GFUVF6Ne+T0+nVKwGQxTkBoClQw=; b=Ab9RTWXLoG/Kr1ei0LXQofstc1KI3fjROqFph3fjoH8An2Jq73BpXq2i8bqqIn0zGg vodkPS83S4IZ9qWTIxN79AnyChNTgGWIkR452W1t+gsCZ10KgoxgZmYf3lduswcDM4NO 7US4b4dk61dB1P62DpjMhWhbCn+RfJzVi9gFLToQ5oX2PLpCFKIk+PBEit04TeQ5trJO P0+rNJyeNQ051Zm/9J9lcqkMP1HBKbdh6A2alb5wZ33wNpxSYp5Bqv4cMRthCECpY7l9 WqnHa2IYQ2hPKFTgdpxNMtt4Vko3iOgKZ/HZhvHomB2CcZh4CPTJ42O7d6paqrTY34Lj TyAQ== X-Received: by 10.50.126.1 with SMTP id mu1mr10779433igb.57.1378830694086; Tue, 10 Sep 2013 09:31:34 -0700 (PDT) MIME-Version: 1.0 Received: by 10.64.250.9 with HTTP; Tue, 10 Sep 2013 09:31:13 -0700 (PDT) In-Reply-To: <522DE093.9080504@freebsd.org> References: <522DC3EB.4060607@freebsd.org> <522DE093.9080504@freebsd.org> From: Oleg Sidorkin Date: Tue, 10 Sep 2013 20:31:13 +0400 Message-ID: Subject: Re: [CFT] Update of xorg libraries and MESA To: Niclas Zeising Content-Type: text/plain; charset=ISO-8859-1 Cc: ports@freebsd.org, x11@freebsd.org X-BeenThere: freebsd-x11@freebsd.org X-Mailman-Version: 2.1.14 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, 10 Sep 2013 16:31:35 -0000 On Mon, Sep 9, 2013 at 6:52 PM, Niclas Zeising wrote: > There was a mistake in the previous patch, which made the build of > xorg-server fail. The patch has been updated, and the updated version > is attached. > As always, it is possible to find the latest version of the patch at > http://people.freebsd.org/~zeising/xorg-mesaupdate.diff > Sorry for the inconvenience! > Regards! > -- > Niclas Zeising > FreeBSD x11@ team Works fine on Intel G33 on recent stable/9 with KMS. Thanks. -- Oleg Sidorkin From owner-freebsd-x11@FreeBSD.ORG Tue Sep 10 22:10:09 2013 Return-Path: Delivered-To: freebsd-x11@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 0E3A3AA4; Tue, 10 Sep 2013 22:10:09 +0000 (UTC) (envelope-from edwin@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (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 D8CAE20AE; Tue, 10 Sep 2013 22:10:08 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.7/8.14.7) with ESMTP id r8AMA8mN043303; Tue, 10 Sep 2013 22:10:08 GMT (envelope-from edwin@freefall.freebsd.org) Received: (from edwin@localhost) by freefall.freebsd.org (8.14.7/8.14.7/Submit) id r8AMA8c0043302; Tue, 10 Sep 2013 22:10:08 GMT (envelope-from edwin) Date: Tue, 10 Sep 2013 22:10:08 GMT Message-Id: <201309102210.r8AMA8c0043302@freefall.freebsd.org> To: edwin@FreeBSD.org, freebsd-ports-bugs@FreeBSD.org, freebsd-x11@FreeBSD.org From: edwin@FreeBSD.org Subject: Re: ports/181999: graphics/dri build error X-BeenThere: freebsd-x11@freebsd.org X-Mailman-Version: 2.1.14 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, 10 Sep 2013 22:10:09 -0000 Synopsis: graphics/dri build error Responsible-Changed-From-To: freebsd-ports-bugs->freebsd-x11 Responsible-Changed-By: edwin Responsible-Changed-When: Tue Sep 10 22:10:08 UTC 2013 Responsible-Changed-Why: Over to maintainer (via the GNATS Auto Assign Tool) http://www.freebsd.org/cgi/query-pr.cgi?pr=181999 From owner-freebsd-x11@FreeBSD.ORG Tue Sep 10 22:20:01 2013 Return-Path: Delivered-To: freebsd-x11@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id E5F99D11 for ; Tue, 10 Sep 2013 22:20:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (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 B9BBE21AA for ; Tue, 10 Sep 2013 22:20:01 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.7/8.14.7) with ESMTP id r8AMK1Li045965 for ; Tue, 10 Sep 2013 22:20:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.7/8.14.7/Submit) id r8AMK1rD045964; Tue, 10 Sep 2013 22:20:01 GMT (envelope-from gnats) Date: Tue, 10 Sep 2013 22:20:01 GMT Message-Id: <201309102220.r8AMK1rD045964@freefall.freebsd.org> To: freebsd-x11@FreeBSD.org Cc: From: Niclas Zeising Subject: Re: ports/181999: graphics/dri build error X-BeenThere: freebsd-x11@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: Niclas Zeising List-Id: X11 on FreeBSD -- maintaining and support List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Sep 2013 22:20:02 -0000 The following reply was made to PR ports/181999; it has been noted by GNATS. From: Niclas Zeising To: bug-followup@FreeBSD.org, wolfgang@lyxys.ka.sub.org Cc: Subject: Re: ports/181999: graphics/dri build error Date: Wed, 11 Sep 2013 00:18:21 +0200 Which version of graphics/dri are you trying to build? Have you tried building with the default set of options? Do you have any special flags in /etc/make.conf or similar? Regards! -- Niclas Zeising From owner-freebsd-x11@FreeBSD.ORG Tue Sep 10 23:58:16 2013 Return-Path: Delivered-To: freebsd-x11@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id A1D0794A; Tue, 10 Sep 2013 23:58:16 +0000 (UTC) (envelope-from edwin@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (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 775C827AC; Tue, 10 Sep 2013 23:58:16 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.7/8.14.7) with ESMTP id r8ANwGnt064930; Tue, 10 Sep 2013 23:58:16 GMT (envelope-from edwin@freefall.freebsd.org) Received: (from edwin@localhost) by freefall.freebsd.org (8.14.7/8.14.7/Submit) id r8ANwGPB064929; Tue, 10 Sep 2013 23:58:16 GMT (envelope-from edwin) Date: Tue, 10 Sep 2013 23:58:16 GMT Message-Id: <201309102358.r8ANwGPB064929@freefall.freebsd.org> To: edwin@FreeBSD.org, freebsd-ports-bugs@FreeBSD.org, freebsd-x11@FreeBSD.org From: edwin@FreeBSD.org Subject: Re: ports/182002: x11-wm/xcompmgr shadow rendering patch X-BeenThere: freebsd-x11@freebsd.org X-Mailman-Version: 2.1.14 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, 10 Sep 2013 23:58:16 -0000 Synopsis: x11-wm/xcompmgr shadow rendering patch Responsible-Changed-From-To: freebsd-ports-bugs->freebsd-x11 Responsible-Changed-By: edwin Responsible-Changed-When: Tue Sep 10 23:58:16 UTC 2013 Responsible-Changed-Why: Over to maintainer (via the GNATS Auto Assign Tool) http://www.freebsd.org/cgi/query-pr.cgi?pr=182002 From owner-freebsd-x11@FreeBSD.ORG Wed Sep 11 07:10:01 2013 Return-Path: Delivered-To: freebsd-x11@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id C2EF56DB for ; Wed, 11 Sep 2013 07:10:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (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 B0C20297E for ; Wed, 11 Sep 2013 07:10:01 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.7/8.14.7) with ESMTP id r8B7A1AZ026626 for ; Wed, 11 Sep 2013 07:10:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.7/8.14.7/Submit) id r8B7A1sq026625; Wed, 11 Sep 2013 07:10:01 GMT (envelope-from gnats) Date: Wed, 11 Sep 2013 07:10:01 GMT Message-Id: <201309110710.r8B7A1sq026625@freefall.freebsd.org> To: freebsd-x11@FreeBSD.org Cc: From: Wolfgang Zenker Subject: Re: ports/181999: graphics/dri build error X-BeenThere: freebsd-x11@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: Wolfgang Zenker List-Id: X11 on FreeBSD -- maintaining and support List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Sep 2013 07:10:01 -0000 The following reply was made to PR ports/181999; it has been noted by GNATS. From: Wolfgang Zenker To: Niclas Zeising Cc: bug-followup@FreeBSD.org Subject: Re: ports/181999: graphics/dri build error Date: Wed, 11 Sep 2013 09:08:54 +0200 Hi, * Niclas Zeising [130911 00:18]: > Which version of graphics/dri are you trying to build? Have you tried > building with the default set of options? > Do you have any special flags in /etc/make.conf or similar? Makefile says # $FreeBSD: head/graphics/dri/Makefile 319055 2013-05-25 14:37:02Z zeising $ Same build error with default option set, however the port built ok with the same set of options about three weeks ago on current before the libiconv changes and gcc removal. make.conf has these flags: WRKDIRPREFIX=/var/ports/build DISTDIR=/var/ports/dist PACKAGES=/var/ports/packages WITH_PKGNG=yes PERL_VERSION=5.14.4 Wolfgang From owner-freebsd-x11@FreeBSD.ORG Wed Sep 11 22:23:02 2013 Return-Path: Delivered-To: freebsd-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 ESMTP id 9D934E9D for ; Wed, 11 Sep 2013 22:23:02 +0000 (UTC) (envelope-from jan.kokemueller@gmail.com) Received: from mail-oa0-x229.google.com (mail-oa0-x229.google.com [IPv6:2607:f8b0:4003:c02::229]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 6C05D2CD3 for ; Wed, 11 Sep 2013 22:23:02 +0000 (UTC) Received: by mail-oa0-f41.google.com with SMTP id j6so10089293oag.14 for ; Wed, 11 Sep 2013 15:23:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:date:message-id:subject:from:to:content-type; bh=9fXA6rLrx051ekd9kLcf0MUOOmHkjqmxvs3z1wEb8Ao=; b=N6nQoGNMUAB3bgF6lD4ungAuCNIw51XfWMZBXZ2MxgpmHfhaoS+opoBiqlwo0fzCp/ Jravm8QjPdZDsUjarUFk7o9eAyUXaBgtKzgAwYvvTHGYTlILwapmOgbt3uF8RvxLpgEf UCn+1IYUwSTLboKGVHmTxU1OTPugtUz6SbBNGs7X0LJhORJVrYxOV9xtSsJqkPPKCNcH 0Ps3PuDvdOHvKjVK5/8jdXTHkCZMJ1jyCq3i8HM+/7c0coVhBGr1K8Ve/g0GUszMbYF2 6dM8HCJF8cfQKYuf5n4RRVhkQ2gtvfYD4kATdL8UG7XvMH3eBqqi2PD9WIZZb19CxdH6 21xg== MIME-Version: 1.0 X-Received: by 10.182.233.198 with SMTP id ty6mr3637364obc.31.1378938181608; Wed, 11 Sep 2013 15:23:01 -0700 (PDT) Received: by 10.182.29.106 with HTTP; Wed, 11 Sep 2013 15:23:01 -0700 (PDT) Date: Thu, 12 Sep 2013 00:23:01 +0200 Message-ID: Subject: Re: [CFT] Update of xorg libraries and MESA From: =?ISO-8859-1?Q?Jan_Kokem=FCller?= To: freebsd-x11@freebsd.org Content-Type: text/plain; charset=ISO-8859-1 X-Content-Filtered-By: Mailman/MimeDel 2.1.14 X-BeenThere: freebsd-x11@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: X11 on FreeBSD -- maintaining and support List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Sep 2013 22:23:02 -0000 Hi, this update works great on my Intel G45 laptop with -current so far. The pkg-plist file of x11/pixman still says lib/libpixman-1.so.9 though, where it should be lib/libpixman-1.so.30. After that it installs fine. Thanks! From owner-freebsd-x11@FreeBSD.ORG Thu Sep 12 06:00:29 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 ESMTP id D9E149CB; Thu, 12 Sep 2013 06:00:29 +0000 (UTC) (envelope-from martymac@FreeBSD.org) Received: from lmtp.galacsys.net (webmail.galacsys.net [IPv6:2001:1b78:0:1:d918:51d7:0:1]) by mx1.freebsd.org (Postfix) with ESMTP id A14AD2251; Thu, 12 Sep 2013 06:00:29 +0000 (UTC) Received: from martymac.org (webmail.galacsys.net [217.24.81.215]) by lmtp.galacsys.net (Postfix) with ESMTP id C68C61FA5DDB; Thu, 12 Sep 2013 08:00:27 +0200 (CEST) From: "Ganael LAPLANCHE" To: Niclas Zeising ,x11@FreeBSD.org Subject: Re: Dolphin-emu now has OpenGL rendering (was: [CFT] Update of xorg libraries and MESA) X-Openwebmail-Date: Thu, 12 Sep 2013 09:00:27 +0200 Message-Id: <20130912055540.M78591@martymac.org> In-Reply-To: <20130910062045.M54984@martymac.org> References: <522DC3EB.4060607@freebsd.org> <522DE093.9080504@freebsd.org> <20130910062045.M54984@martymac.org> X-Mailer: Open WebMail 2.01 20030425 X-OriginatingIP: 157.99.64.43 (ganael.laplanche@martymac.org) MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-15 Date: Thu, 12 Sep 2013 06:00:29 +0000 (UTC) Cc: ports@FreeBSD.org X-BeenThere: freebsd-x11@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: X11 on FreeBSD -- maintaining and support List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Sep 2013 06:00:29 -0000 Ganael LAPLANCHE wrote: > Works like a charm on my Lenovo X220 (-CURRENT). ... and more than that : with the update of Mesa, dolphin-emu (Wii/GC emulator, see emulators/dolphin-emu-devel) now has a working OpenGL rendering ! It has been successfully tested on my laptop :) Best regards and thanks for your work on this update :) -- Ganael LAPLANCHE http://www.martymac.org | http://contribs.martymac.org FreeBSD: martymac , http://www.FreeBSD.org From owner-freebsd-x11@FreeBSD.ORG Thu Sep 12 08:56:49 2013 Return-Path: Delivered-To: freebsd-x11@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 29623C1D for ; Thu, 12 Sep 2013 08:56:49 +0000 (UTC) (envelope-from zeising@freebsd.org) Received: from mail.lysator.liu.se (mail.lysator.liu.se [IPv6:2001:6b0:17:f0a0::3]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id CFC302F4C for ; Thu, 12 Sep 2013 08:56:48 +0000 (UTC) Received: from mail.lysator.liu.se (localhost [127.0.0.1]) by mail.lysator.liu.se (Postfix) with ESMTP id 2829C40061 for ; Thu, 12 Sep 2013 10:56:45 +0200 (CEST) Received: by mail.lysator.liu.se (Postfix, from userid 1004) id 1ABB54005B; Thu, 12 Sep 2013 10:56:45 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on bernadotte.lysator.liu.se X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=AWL autolearn=disabled version=3.3.1 X-Spam-Score: 0.0 Received: from mx.daemonic.se (mx.daemonic.se [IPv6:2001:470:dca9:0:1::3]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.lysator.liu.se (Postfix) with ESMTPSA id D47CF4000C; Thu, 12 Sep 2013 10:56:44 +0200 (CEST) Received: from mailscanner.daemonic.se (mailscanner.daemonic.se [IPv6:2001:470:dca9:0:1::6]) by mx.daemonic.se (Postfix) with ESMTPS id 3cbDP80RR7z8jLC; Thu, 12 Sep 2013 10:56:44 +0200 (CEST) X-Virus-Scanned: amavisd-new at daemonic.se Received: from mx.daemonic.se ([IPv6:2001:470:dca9:0:1::3]) (using TLS with cipher CAMELLIA256-SHA) by mailscanner.daemonic.se (mailscanner.daemonic.se [IPv6:2001:470:dca9:0:1::6]) (amavisd-new, port 10025) with ESMTPS id kKoOffKpQs1R; Thu, 12 Sep 2013 10:56:42 +0200 (CEST) Received: from mail.daemonic.se (mail.daemonic.se [IPv6:2001:470:dca9:0:1::4]) by mx.daemonic.se (Postfix) with ESMTPS id 3cbDP56xFWz8jLB; Thu, 12 Sep 2013 10:56:41 +0200 (CEST) Received: from vivi.daemonic.se (vivi.daemonic.se [10.32.0.4]) by mail.daemonic.se (Postfix) with ESMTPSA id 3cbDP55ZF1z9D6P; Thu, 12 Sep 2013 10:56:41 +0200 (CEST) Message-ID: <523181C9.1080809@freebsd.org> Date: Thu, 12 Sep 2013 10:56:41 +0200 From: Niclas Zeising User-Agent: Mutt/1.5.21 MIME-Version: 1.0 To: =?UTF-8?B?SmFuIEtva2Vtw7xsbGVy?= Subject: Re: [CFT] Update of xorg libraries and MESA References: In-Reply-To: X-Enigmail-Version: 1.5.1 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Virus-Scanned: ClamAV using ClamSMTP Cc: freebsd-x11@freebsd.org X-BeenThere: freebsd-x11@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: X11 on FreeBSD -- maintaining and support List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Sep 2013 08:56:49 -0000 On 09/12/13 00:23, Jan Kokemüller wrote: > Hi, > this update works great on my Intel G45 laptop with -current so far. > The pkg-plist file of x11/pixman still says lib/libpixman-1.so.9 though, > where it should be lib/libpixman-1.so.30. After that it installs fine. I thought I fixed that one. I might've overwritten that change though, thanks for notcing! I'll fix it and update the patch later today! Thanks for testing! Regards! -- Niclas Zeising From owner-freebsd-x11@FreeBSD.ORG Fri Sep 13 18:32:03 2013 Return-Path: Delivered-To: freebsd-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 ESMTP id 43A68CE3 for ; Fri, 13 Sep 2013 18:32:03 +0000 (UTC) (envelope-from negativo17@gmail.com) Received: from mail-ve0-x233.google.com (mail-ve0-x233.google.com [IPv6:2607:f8b0:400c:c01::233]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id ECBB428DE for ; Fri, 13 Sep 2013 18:32:02 +0000 (UTC) Received: by mail-ve0-f179.google.com with SMTP id c14so1277007vea.38 for ; Fri, 13 Sep 2013 11:32:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :content-type; bh=LRmeyNTyXRLRQASnBSB0AdchV9JkkJyHmcq54Sq6ujA=; b=WF50N/mQCPO08hCj0Nzx7AUhiJ4mXAqwBqcs3y4I6OSDpaRydX9wSSQD3/TNh2ZuKo YxMptWzj/YmPfaGfJ+NTwBPlBqQVrRyFlLMNYcwSgiJu0ELuM6Pk1S93AD2zWD6SWFTf eUU15GjXoo35Y8FqNXtbPtJBEUWo6Ec3N7L+xFy9bY9q0tcazpzhy4GmQPcK6tkjavlM VdcTY7wZawutzK/N7PLBmf83/uLoWTLGZt77jEdFrd4gKAPfWiG8xkZf2zLjEl0yd50Q JgeYxvwOhkKJflsdxzOVN2qsZNrwx8akErYf6ZDP+46mrhp39p9kPmFvyIwkBmoksaw4 nKvA== MIME-Version: 1.0 X-Received: by 10.58.133.66 with SMTP id pa2mr13062696veb.18.1379097121971; Fri, 13 Sep 2013 11:32:01 -0700 (PDT) Received: by 10.52.172.208 with HTTP; Fri, 13 Sep 2013 11:32:01 -0700 (PDT) Received: by 10.52.172.208 with HTTP; Fri, 13 Sep 2013 11:32:01 -0700 (PDT) In-Reply-To: References: Date: Fri, 13 Sep 2013 20:32:01 +0200 Message-ID: Subject: FreeBSD 10.0 PKGNG repository for xorg (was: [CFT] Update of xorg libraries and MESA) From: Simone Caronni To: freebsd-x11@freebsd.org Content-Type: text/plain; charset=UTF-8 X-Content-Filtered-By: Mailman/MimeDel 2.1.14 X-BeenThere: freebsd-x11@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: X11 on FreeBSD -- maintaining and support List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Sep 2013 18:32:03 -0000 Hello, first post here! I've just come back to FreeBSD as a desktop after the new additions of PKGNG/poudriere, new KMS/X.org, bhyve etc... I've always used Linux but I love FreeBSD; and use it quite often at work. Thanks very much for the updated xorg stack, on my systems with Nvidia video cards X starts in a snap without any xorg.conf configuration file. It also works perfectly with proprietary Nvidia drivers. To help this into reaching the official ports tree and to avoid people in waiting for long compile sessions I've built a PKGNG repository that contains the following ports for FreeBSD 10/amd64: x11/xorg x11/xorg-minimal x11/nvidia-driver x11/nvidia-settings x11/nvidia-xconfig multimedia/libvdpau multimedia/vdpauinfo All the packages have been built from today's portsnap checkout with the xorg-mesaupdate.diff patch (2013-Sep-12). Nvidia packages have been updated to 325.15; and nvidia-settings now has a dependency on libvdpau. Linux support is disabled as I'm not interested in it. You can add the repository here: http://negativo17.org/freebsd/xorg/ If you have any issue/feedback please let me know; I will try to address them as soon as I can. I will write an entry in my blog about this in the next days after some initial feedback. One question: Is there any interest in such a bleeding edge repository also for FreeBSD 9.x or for the i386 platform? Thanks & regards, --Simone -- You cannot discover new oceans unless you have the courage to lose sight of the shore (R. W. Emerson). http://xkcd.com/229/ http://negativo17.org/ From owner-freebsd-x11@FreeBSD.ORG Fri Sep 13 18:32:10 2013 Return-Path: Delivered-To: freebsd-x11@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id E925FD1D for ; Fri, 13 Sep 2013 18:32:10 +0000 (UTC) (envelope-from negativo17@gmail.com) Received: from mail-vb0-x233.google.com (mail-vb0-x233.google.com [IPv6:2607:f8b0:400c:c02::233]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id A993528E5 for ; Fri, 13 Sep 2013 18:32:10 +0000 (UTC) Received: by mail-vb0-f51.google.com with SMTP id x16so1208794vbf.24 for ; Fri, 13 Sep 2013 11:32:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :content-type; bh=Xnzp9WKCUpEyKuagOk31ZQ9jGQxTqfNLZgX1NDoxU2Q=; b=CCKQVIoIQfIm+NVq2/s9BjXYscu3eQQP73O1MrCL21oOsXGDtn5MRQ/PD+93thvJbX cCYIVAXAoMjLW9jkKnCXjHzhB6JX+39/hOmLop15m/D3v5tWgMECa4gqfBt/BW/fa8G2 Jdsm6Op4Sqw+A4wIs6NsOOnD+cfx1VYfV5GKEh77pBBUtJXwhutq+TWx8iJgzSvReOlb tgGQBpPCFdW9/4JoQjB5QCTmG1s+CUeSY6FQ1RprxR3kXDxb9fDiSp2gf9zbQwV0spGW KAvToNKLTg5uf8kk170PdTJO/bJCrpv/rXQP5KxIrrkDzBBaOlEoDxhjzX3bFydpqvJ8 cmFA== MIME-Version: 1.0 X-Received: by 10.220.74.69 with SMTP id t5mr13271534vcj.18.1379097129745; Fri, 13 Sep 2013 11:32:09 -0700 (PDT) Received: by 10.52.172.208 with HTTP; Fri, 13 Sep 2013 11:32:09 -0700 (PDT) Received: by 10.52.172.208 with HTTP; Fri, 13 Sep 2013 11:32:09 -0700 (PDT) In-Reply-To: References: Date: Fri, 13 Sep 2013 20:32:09 +0200 Message-ID: Subject: FreeBSD 10.0 PKGNG repository for xorg (was: [CFT] Update of xorg libraries and MESA) From: Simone Caronni To: freebsd-x11@freebsd.org Content-Type: text/plain; charset=UTF-8 X-Content-Filtered-By: Mailman/MimeDel 2.1.14 X-BeenThere: freebsd-x11@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: X11 on FreeBSD -- maintaining and support List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Sep 2013 18:32:11 -0000 Hello, first post here! I've just come back to FreeBSD as a desktop after the new additions of PKGNG/poudriere, new KMS/X.org, bhyve etc... I've always used Linux but I love FreeBSD; and use it quite often at work. Thanks very much for the updated xorg stack, on my systems with Nvidia video cards X starts in a snap without any xorg.conf configuration file. It also works perfectly with proprietary Nvidia drivers. To help this into reaching the official ports tree and to avoid people in waiting for long compile sessions I've built a PKGNG repository that contains the following ports for FreeBSD 10/amd64: x11/xorg x11/xorg-minimal x11/nvidia-driver x11/nvidia-settings x11/nvidia-xconfig multimedia/libvdpau multimedia/vdpauinfo All the packages have been built from today's portsnap checkout with the xorg-mesaupdate.diff patch (2013-Sep-12). Nvidia packages have been updated to 325.15; and nvidia-settings now has a dependency on libvdpau. Linux support is disabled as I'm not interested in it. You can add the repository here: http://negativo17.org/freebsd/xorg/ If you have any issue/feedback please let me know; I will try to address them as soon as I can. I will write an entry in my blog about this in the next days after some initial feedback. One question: Is there any interest in such a bleeding edge repository also for FreeBSD 9.x or for the i386 platform? Thanks & regards, --Simone -- You cannot discover new oceans unless you have the courage to lose sight of the shore (R. W. Emerson). http://xkcd.com/229/ http://negativo17.org/ From owner-freebsd-x11@FreeBSD.ORG Sat Sep 14 05:31:50 2013 Return-Path: Delivered-To: freebsd-x11@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 567175AA for ; Sat, 14 Sep 2013 05:31:50 +0000 (UTC) (envelope-from aryeh.friedman@gmail.com) Received: from mail-pb0-x22c.google.com (mail-pb0-x22c.google.com [IPv6:2607:f8b0:400e:c01::22c]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 3095922BF for ; Sat, 14 Sep 2013 05:31:50 +0000 (UTC) Received: by mail-pb0-f44.google.com with SMTP id xa7so2045181pbc.31 for ; Fri, 13 Sep 2013 22:31:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :content-type; bh=lfwV+bqjBq8YIiE9GnWer53Ontt6YO0rO2Kjgx+al4s=; b=sQP5gCM3ge44Qm4rpMuKLGgrRFdUZMj4npHDDZl6b8fpIIMyOODepap3xyPyAIBZ6h OUJm+EvrKRhVUSSWxQmNM5AcKAJQs6cW498bXGXpo1MZnmPetHKMry6njjMJ1qeJFiUF Wr8wPENT7dUmpn8gw8J+OlwCgD1fBk07mvwZO0Gbc1YZS2ZgB1vphyY3Y35pn6d99sTW rPjojo/5bUTocBx4cLwn5AWNBgPBFSGjD/qtj+pxk1vt2p2mBDtAbLGcapGB6F8Mh2vK 7ThEdbWcfyNBRji2iiQoNTIDZ2JhWP6dNWDB49tdC8MveopD19Rm9wtTb5DRoPB/aHbG FDww== MIME-Version: 1.0 X-Received: by 10.66.233.37 with SMTP id tt5mr18885387pac.95.1379136709643; Fri, 13 Sep 2013 22:31:49 -0700 (PDT) Received: by 10.68.203.193 with HTTP; Fri, 13 Sep 2013 22:31:49 -0700 (PDT) In-Reply-To: References: Date: Sat, 14 Sep 2013 01:31:49 -0400 Message-ID: Subject: Re: FreeBSD 10.0 PKGNG repository for xorg (was: [CFT] Update of xorg libraries and MESA) From: Aryeh Friedman To: Simone Caronni , freebsd-x11@freebsd.org Content-Type: text/plain; charset=ISO-8859-1 X-Content-Filtered-By: Mailman/MimeDel 2.1.14 X-BeenThere: freebsd-x11@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: X11 on FreeBSD -- maintaining and support List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 14 Sep 2013 05:31:50 -0000 Just so you know there is a front end for bhyve (emuators/petitecloud) that is waiting for a committer to commit it if you want to try it and give some feedback on how to make it better see the announcement in freebsd-virtualization... or download it from ftp://ftp.petitecloud.org/petitecloud/aryeh/0.1/port-0.1.tar.gz On Fri, Sep 13, 2013 at 2:32 PM, Simone Caronni wrote: > Hello, > > first post here! > > I've just come back to FreeBSD as a desktop after the new additions of > PKGNG/poudriere, new KMS/X.org, bhyve etc... I've always used Linux but I > love FreeBSD; and use it quite often at work. > > Thanks very much for the updated xorg stack, on my systems with Nvidia > video cards X starts in a snap without any xorg.conf configuration file. > > It also works perfectly with proprietary Nvidia drivers. > > To help this into reaching the official ports tree and to avoid people in > waiting for long compile sessions I've built a PKGNG repository that > contains the following ports for FreeBSD 10/amd64: > > x11/xorg > x11/xorg-minimal > x11/nvidia-driver > x11/nvidia-settings > x11/nvidia-xconfig > multimedia/libvdpau > multimedia/vdpauinfo > > All the packages have been built from today's portsnap checkout with the > xorg-mesaupdate.diff patch (2013-Sep-12). > > Nvidia packages have been updated to 325.15; and nvidia-settings now has a > dependency on libvdpau. Linux support is disabled as I'm not interested in > it. > > You can add the repository here: > > http://negativo17.org/freebsd/xorg/ > > If you have any issue/feedback please let me know; I will try to address > them as soon as I can. > > I will write an entry in my blog about this in the next days after some > initial feedback. > > One question: Is there any interest in such a bleeding edge repository also > for FreeBSD 9.x or for the i386 platform? > > Thanks & regards, > --Simone > > -- > You cannot discover new oceans unless you have the courage to lose sight of > the shore (R. W. Emerson). > > http://xkcd.com/229/ > http://negativo17.org/ > _______________________________________________ > freebsd-x11@freebsd.org mailing list > http://lists.freebsd.org/mailman/listinfo/freebsd-x11 > To unsubscribe, send any mail to "freebsd-x11-unsubscribe@freebsd.org" >