Consolidate the Mesa ports, update to 17.0.4, and add Wayland option

* libGL, libEGL, libglesv2, libglapi, and gbm have been moved into mesa-libs,
  graphics/dri has been renamed to mesa-dri, and USE_GL has been adjusted
* mesa-libs has a new WAYLAND option that enables platform support in libEGL
* mesa-dri now depends on graphics/s2tc for compressed texture support [1]
* re-remove obsolete dependency on makedepends [2]
* correct sed fix backported from 17.1 [3]

PR:		218799 (exp-run), 212762 [1], 218552 [2], 218562 [3]
Submitted by:	dbn [1], jbeich [2,3]
Reported by:	afiskon@devzen.ru [1]
Reviewed by:	kwm, johalun0@gmail.com
Approved by:	portmgr, swills (mentor)
Differential Revision:  https://reviews.freebsd.org/D10448

Update Mesa to 17.0.3

* OpenGL 4.5 support for RadeonSI and recent Intel
* Use LLVM 4.0 by default, building with 3.9 is possible via MESA_LLVM_VER
* DRI3 remains enabled at compile time, but is now disabled at runtime for
  stock FreeBSD.  Set LIBGL_DRI3_ENABLE in the environment to enable DRI3.
  This extra check is added when compiling on stock FreeBSD, not DRM-next.
  This change was made to work around a problem in libEGL, which fails to
  fall back to using DRI2 when run on a system without DRI3 support.

Reviewed by:	jmd, mat
Approved by:	swills (mentor)
Differential Revision:	https://reviews.freebsd.org/D10250

Update Mesa to 13.0.4

* Use LLVM 3.9
* OpenGL 4.4 support for recent Intel and ReadeonSI

PR:	214581
Approved by:	swills (mentor)
Differential Revision:	https://reviews.freebsd.org/D9438

${RM} already has -f.

PR:		213570
Submitted by:	mat
Exp-run by:	antoine
Sponsored by:	Absolight

Add USES+=ssl to 3 of 8 graphics/libGL/Makefile.common consumers

Despite having a configure argument of --with-sha1=libcrypto, only three
of the eight users of graphics/libGL/Makefile.common actually link to
SSL libraries.  Individually add USES=ssl to these three ports rather
than have all 8 having this requirement.

Approved by:	SSL blanket

Remove ${PORTSDIR}/ from dependencies, categories d, e, f, and g.

With hat:	portmgr
Sponsored by:	Absolight

Update mesa to 11.0.8.

 * Depend on libelf on DragonFly
 * Rework the vdpau support code and enable vdpau for DragonFly, FreeBSD
   doesn't support it just yet.
 * Revert commit that removed support for non-render nodes. Neither
   FreeBSD nor DragonFly supports render nodes at this time.
 * Fix LDFLAGS to work with GCC5, which DragonFly uses by default.
 * Update Makefile.targets: ffast-math isn't used since 8.0.3, don't
   replace x86_64 with amd64 on Dragonfly. Drop obsolete python disable
   replace.

Add patch to use drm.h instead of redefining the types.

This unbreaks the build of xorg-server on 9.3.

* Don't hardcode the Gallium drivers instead set the wanted drivers per
  arch, like is done for the dri drivers. This fixes Mesa build on arm. [1]
* Explicitly disable libva support. This resolves a build issue if libva
  is installed. [2]
* remove the gallium-intel configure flag, it is gone.

PR:		197548 [2]
Reported by:	sbruno@ [1]
Reported by:	rozhuk.im@gmail.com [2]
Tested by:	sbruno@ on arm [1]

Update Mesa to 10.6.9.

* Unbreak build on powerpc and other !x86 archs by moving the
  --with-dri-drivers logic from dri/Makefile to the
  libGL/Makefile.common file. So the settings are applied to all mesa ports,
  this was missed in the 10.6.6 update. [1]
* Don't try to enable OpenCL support on anything other then i386 and amd64. [1]
* Move the texture-float and vdpau logic to Makefile.common even if the latter
  isn't supported yet. Keep OPTIONS_DEFINE/DEFAULT in dri/Makefile since they
  need to defined before bsd.port.options.mk is included, and they only affect
  the dri modules.
* Sed on 11 and 10 supports \< and \> however sed on 9.x and dragonfly do not,
  replace the sed keywords with some magic to get the intended results. [2]

Submitted by:		marino@ [2]
Reported and tested by:	arved@ (on ppc32)[1]

Update Mesa port to 10.6.6 and add Clover.
Add beignet 1.1.0.
Add clinfo, clblas, clfft and clrng.

The major change is that all Mesa ports are now configured the same way.
This fixes several problems and enables new features.  The details
are described in this blog post:
http://blogs.freebsdish.org/graphics/2015/03/18/unifying-mesa-ports-configure/

The second important change is the OpenCL support.  Mesa's
implementation, Clover, is enabled as well as Beignet.  Clover
targets all Gallium drivers, only Radeon GPUs in our case.  Beignet
is for Intel GPUs starting with Ivy Bridge.  Thanks to Johannes
Dieterich, O. Hartman, and Koop Mast for their work on OpenCL!  As a
bonus, there are several OpenCL-based math ports added (clblas,

Update Mesa to 10.4.3.

Move LLVM version selection to bsd.mesalib.mk so the clover port can use it.
Clover isn't included yet because it is a work in progress and doesn't work
yet.

Update mesa based ports to 10.4.0.

Update to 10.3.4.

Enable TEXTURE option in dri by default [1]. This allows for OpenGL higher
  then 2.1 to be supported.
Make sure we depend on llvm at run time when gallium is enabled.
  The gallium based modules link to the llvm shared libraries. [2]

PR:		followup on 194655 [2]
Approved by:	core@ [1]
Obtained from:	xorg-dev repo

Correct categorie of the llvm port

Update mesa to 10.3.3.

graphics/dri:
Move gettext:build to bsd.mesalib.mk so it present for all mesa ports. [1]
VDPAU needs GALLIUM so check for that, since it a Gallium state tracker. [1][2]
Rework llvm33/llvm34 selection so we can use the llvm version later on.
VDPAU links against the llvm libraries so we need to depend on the llvm port
as a run dependency .[1]
After discussion remove the VDPAU option for now. Radeon kernel drivers
currently
don't support hardware-assisted video decoding. And Gallium/VDPAU doesn't
support
the intel driver.

PR:		194655 [1]
PR:		194580 [2]

Fix the build when NLS is unset.

Submitted by:	mat@

Update Mesa ports to new default of 9.1.7 and more recent version to 10.3.0.

The port will switch to the newer version if hw context is available in the
i915kms driver.

- Get ride of WITH_NEW_XORG.
- Use @comment in plist to ignore unwanted files in the stagedir, instead of
  trying to remove them in post-install.
- Bump portrevision of 9.1.7 due to dependency changes.
- Drop :keepla from USES=libtool.
- Drop @dirrm[try] from plists
- Give dri propper options, with pkg-help for additional information.
- Make separate plist for dri for the different versions, the combined plist
  was headache inducing.
- Add "workaround" patches to allow clang to build the dri port on i386 [1].
  USE_GCC is now only needed for 8.x.
- Add gbm port and USE_GL switch for it.

PR:		192286 [1]
Submitted by:	Carlos Jacobo Puga Medina [1]
Approved by:	portmgr (bapt@)
In collaberation with:	dumbbell@
Obtained from:	xorg-dev

Update the default version of GCC in the Ports Collection from GCC 4.7.4
to GCC 4.8.3.

Part II, Bump PORTREVISIONs.

PR:		192025
Tested by:	antoine (-exp runs)
Approved by:	portmgr (implicit)

Enable SWRAST for armv6 architectures to allow building of dricore libs

PR:		191767
Reviewed by:	kwm

Move the ARCH = i386 check to bsd.mesalib.mk so it applies to all
Mesa ports. This will unbreak libglapi/libGL/libglesv2 on i386.

This was probably exposed by when the libglapi port was added.

Fix Malformed conditional

Submitted by:	portsnap index builder

Tweak OSVERSION check to also include newer 9.x versions, since gcc from
base is not good enough.
For i386 depend on gcc form ports. This is due to a clang assertion [1],
which has been reported in the clang bugtracker.

Reported by:	many [1]

Enable shared libglapi library and make a port for it. It is used by libGL
 and libglesv2. This fixes undefined symbol issues in libglesv2.
Clean up stagedir of unwanted files/directories, so check-plist passes.
Switch logic and always build gallium support in graphics/dri on i386 and
 amd64. Gallium is used for Radeon HD 5000+ support.

Use USES=tar:bzip2
Under WITH_NEW_XORG:
Add patch to remove some dependencies for aclocal.m4 which are absent.
 This allows the removal of USE_AUTOTOOLS, REAPPLY_PATCHES and pre-configure
 target.
Add INSTALL_TARGET=install-strip to strip libraries.
USES=libtool:keepla
Fix a /use typo with /usr in post-patch.

Bump PORTREVISION for the libtool and libglapi changes.

Submitted by:	tijl@ (libtool and autotools changes)
Obtained from:	xorg-dev repo (libglapi and gallium changes)

Convert all :U to :tu and :L to :tl

Since FreeBSD 8.4 and FreeBSD 9.1 make(1) do support :tu and :tl as a
replacement for :U and :L (which has been marked as deprecated)

bmake which is the default on FreeBSD 10+ only support by default
:tu/:tl a hack has been added at the time to support :U and :L to ease
migration. This hack is now not necessary anymore

Note that this makes the ports tree incompatible with make(1) from
FreeBSD 8.3 or earlier

With hat:	portmgr

The FreeBSD x11@ and graphics team proudly presents
a zeising, kwm production, with help from dumbbell, bdrewery:

NEW XORG ON FREEBSD 9-STABLE AND 10-STABLE

This update switches over to use the new xorg stack by default on FreeBSD 9
and 10 stable, on osversions where vt(9) is available.
It is still possible to use the old stack by specifying WITHOUT_NEW_XORG in
/etc/make.conf .
FreeBSD 8-STABLE and released versions of FreeBSD still use
the old version.
A package repository with binary packages for new xorg will
be available soon.

This patch also contains updates of libxcb and related ports, pixman, as well

Fix typo

Submitted by:	John Hein <jhein@symmetricom.com>

Add powerpc64 to the checks for powerpc.

PR:		ports/184957
Submitted by:	Andreas Tobler <andreast@FreeBSD.org>

Make sure DIR_DRIVERS is always defined. This is needed because arm/mips
don't have any drivers defined which results in make errors.

PR:		ports/182875 [1]
Submitted by:	Anton Shterenlikht <mexas@bris.ac.uk> [1], mat@

Fix graphics/dri on ia64.

Please note that WITH_NEW_XORG isn't tested due to other issues.

Submitted by:	marcel@

Unbreak build with global unset NLS.

Update to 9.1.7.

Stagify, abuse stage dir and plist to only install files we want to install.
So we don't have to do complex do-install anymore, yay.

For the WITH_GALLIUM option we don't need llvm at run-time.

Obtained from:	xorg-dev repo

- Wrap up cd && foo in parenthesis, it'd break with bmake -j
- Replace some FIND ... CPIO with COPYTREE_SHARE.

The FreeBSD graphics/x11 team proudly presents
a kwm, zeising production:

MESA 9.1.6

Starring:
Mesa 9.1.6, including libGL, libGLU and dri (new xorg only)
Addition of libEGL and libglesv2
KMS support for ATI graphics cards in 10-current (new xorg only)
Improved sparc64 support for new xorg. [1]
pixman 0.30.2, including shlib bump and portrevision bumps
libX11 1.6.2
Make absolute pointing devices work with x11-drivers/xf86-input-mouse
x11-drivers/xf86-video-ati 7.2.0 for 10-current (KMS aware ati driver)

Add NO_STAGE all over the place in preparation for the staging support (cat:
graphics)

The FreeBSD x11 team proudly presents
an zeising, kwm, miwi, bapt, eadler production:

Xorg 7.7

Starring:
xserver 1.12.4 (new xorg only)
Mesa 8.0.4, including libGL, libGLU and dri (new xorg only)
libX11 1.5.0
libxcb 1.9
libdrm 2.4.42 (new xorg only)
freeglut 2.8.1
Also starring:
Updates to drivers and other libraries and utilities

Convert g* to USES=pkgconfig

Fix packaging and simplify.

- Remove reference to nouveau driver which isn't built

- Fix plist on amd64

- Fix logic error which caused the gallium-intel driver to be always disabled
[1]
- Make it possible to choose which DRI drivers will be built [2]

PR:		ports/174725 [1]
PR:		ports/154651 [2]
Submitted by:	John Marino <draco@marino.st> [1]
Submitted by:	bf [2]
Reviewed by:	kwm [2]

- Use PTHREAD_LIBS instead of -lpthread

PR:		ports/170506
Submitted by:	Jason E. Hale <bsdkaffee@gmail.com>

Add USE_PKGCONFIG= build, otherwise configure fails

Attempt to fix build of dri, libGL, and libdrm on tier-2 archs.

PR:		ports/169874
Submitted by:	marius, linimon
Tested on:	amd64, arm, i386, powerpc, sparc
Thanks to:	bz, andyt

- Please welcome Xorg 7.5.2

       The Xorg Team is pleased to announce the next round of Xorg updates.
       The team created a new flag called WITH_NEW_XORG that users can include
       in /etc/make.conf. This was created for the intel KMS work being done
       althouthough It probably works for other chips. Unfortunately, the intel
       KMS driver will only work on FreeBSD 9(RELENG|STABLE) or 10/HEAD users.
       Older version of FreeBSD will not be supported. Intel users will need
       to patch their source manually with Konstantin?s KMS kernel patch to get
       the newer chips to work. Please carefully read UPDATING entry.

Changes:

        - libdrm 2.4.31 (including KMS support)
        - mesa 7.11.2
        - xorg-server 1.10.6
        - a lot of new Graphic Drivers.

    I would like to thank:

         Koop Mast
         Eitan Adler
         Niclas Zeising
         and all helpers and testers from x11@.

- Please welcome Xorg 7.5.1

The X-Server has been patched to the latest 1.7.X series, drivers
and fonts have been updated to the latest versions. This update includes
some components from Xorg 7.6 with a lot of improvements, and it seems
that the performance is much better than the old version. Also this
Update fix build issues with clang and binutils 2.17.50 in current,
remove 6.X gruft and de-author pkg-descr.

I would like to thank:

        Beat Gaetzi
        Dima Panov
        Koop Mast
        Eitan Adler
        and all Testers.

PR:             ports/147646
                ports/148035
                ports/148744
                ports/150223
                ports/152889
                ports/154457

Unbreak the Mesa3D 7.4.4 build for powerpc and sparc64 after the 7.6.1
integration.

Approved by:    rnoland

Mark as broken on ia64 and sparc64: fails to install.

Hat:            portmgr

Limited Update to Mesa3D 7.6.1 and libdrm 2.4.17.

[MEMO]
In this commit, no version changed.  But if you put
'WITHOUT_NOUVEAU' on /etc/make.conf, you can use
new version of Mesa3D and libdrm.

Discussed with: rnoland on freebsd-ports/freebsd-x11.

Update to 7.4.4

Update to 7.4.3

This is a bug fix release.

Update to Mesa release 7.4.2

Update to 7.4.1

- Mark MAKE_JOBS_UNSAFE

Approved by:    portmgr (implicit)

Re-enable DRI on powerpc and sparc64, mainly in order to fix
packaging.

Approved by:    rnoland

Update the Mesa ports to 7.4

PR:             133167
Submitted by:   Anonymous <swell.k@gmail.com>

Add dependency on dri2proto

Reported by: Herbert J. Skuhra

Approved by:    garga (mentor, implicit)

Update mesa related ports to 7.3

Approved by:    garga (mentor, implicit)

- Update X.org ports to 7.4+ (few ports are more recent than the katamari).
- Bump PORTREVISION for all ports depending on libglut since the shlib
version number went from 4 to 3.
- Bump PORTREVISION for all ports depending on libXaw as libXaw.so.8 isn't
installed anymore.
- Couple of ports fixes (mostly missing xorg components added to USE_XORG).

- Add amd64 support for intel 965 chips

- Add amd64 support for intel 965 chips
- Remove unneeded USE_GCC line
- Remove Xfree from the CONFLICT linie
- Bump PORTREVISION

PR:             123292
Submitted by:   Dominic Fandrey <kamikaze@bsdforen.de>
Reviewed by:    flz
Approved by:    flz (x11 maintainer)

Update Mesa libraries (GL, GLU and GLw) and dri to 7.0.3.

Remove support for XFree8-4.

From now on, X_WINDOW_SYSTEM != "xorg" is not supported anymore.

PR:             ports/119418
Submitted by:   flz
Approved by:    portmgr (pav)

Remove always-false/true conditions based on OSVERSION 500000

- Refactor MesaLib ports.
- Update graphics/libGLw to 7.0.1.

Update to 7.0.1.

Approved by:    anholt (maintainer)

Fix accidental removal of PORTEPOCH in the previous commit.

Pointed out by: kib

- Update to 7.0 (to sync with other Mesa libraries).
- Do not remove HAVE_POSIX_MEMALIGN from configuration files
where posix_memalign(3) is actually available.
- Use amd64-specific configuration file for amd64 build.  It gives
slightly better performance because it uses amd64 assembly code
in some places.

Approved by:    anholt (maintainer time out)

Depend explicitely on textproc/expat2.

Reported by:    des
Approved by:    portmgr (blanket)

- Welcome X.org 7.2 \o/.
- Set X11BASE to ${LOCALBASE} for recent ${OSVERSION}.
- Bump PORTREVISION for ports intalling files in ${X11BASE}.

- Add Intel 945 GM support
- portlint(1)

PR:             111333
Submitted by:   mnag
Approved by:    anholt (maintainer timeout, 23 days)

Fix build on 4.x.  This is slightly different from the submitted patch, but
I think it should still work.

PR:             Mark Andrews <Mark_Andrews@isc.org>
Submitted by:   ports/92704

Mark new CONFLICTS for dri-devel.

Replace ugly "@unexec rmdir %D... 2>/dev/null || true" with @dirrmtry

Approved by:    krion@
PR:             ports/88711 (related)

Upgrade to X.Org 6.9.0 release.
Remove separate mtree file for X_WINDOW_SYSTEM=XOrg case. Both X11
distributions now use the one from /etc/mtree again.

Mark these ports IGNORE on XFree86, due to libGL incompatibility and the
presence of xfree86-dri.  Also, fix up the wording and the website in pkg-descr.

[1] Fix the build on alpha by removing -ffast-math from the build cflags.
[2] Remove an unnecessary configure script from when this was built from
    monolithic sources.
[3] Register conflicts for dri-devel in dri.

Submitted by:   [1] krismail

Update to a newer snapshot of stable Mesa.  Includes a fix for hangs with
RV200 Radeons (thanks Dave Airlie!) [1], fixes for software fallbacks, the usual
pile of little conformance and other bugfixes, and fixing the hang on first lock
grab on AMD64 (that was a really lame bug).  Host the distfile on freefall as
well until public_distfiles propagates.

PR:             [1] ports/75731
Submitted by:   [1] pb

Update dri port to use a more recent Mesa (and drm) snapshot.  Includes
many conformance/bug fixes in the core, fixes for two hangs in the radeon
driver, bugfixes in the r200 driver, adds more chip IDs, and adds fixes to
drivers whose DRM will hopefully be ported soon.  Also install i915 driver on
AMD64, as EM64T machines may have that chipset.

[1] Try to respect PTHREAD_LIBS, to unbreak the build on 4.x.
[2] Respect CXXFLAGS a little more thoroughly.

PR:             [1] ports/75473
Submitted by:   [1] KIMURA Yasuhiro, yasu at utahime dot org, among many others
Based on:       [1] patch by thierry

Bump PORTREVISION for previous commit.

[1] Link against libexpat so that the drivers actually work.
[2] Respect CC/CFLAGS/etc.

Submitted by:   [1] Vladimir Novoseltsev, blacknova at tut dot by

Fix packaging on non-i386

Submitted by:   ade

Update X.Org ports to 6.8.1, and the DRI port to use Mesa 6.2.  Because Mesa 6.2
DRI drivers are incompatible with the old libGL in XFree86, they have been
repocopied to graphics/xfree86-dri.  Also note that with this commit the html
manpages are going away, and with it the runtime dependency on perl for the
imake port.

Release notes at: http://www.x.org/X11R6.8.1/RELNOTES.txt

Props to:       kris (multiple cluster runs and sorting through logs)
                lesi (fixing all the issues in those logs, and more)

[1] Don't try to package the missing tdfx_dri.so on amd64.
[2] Package sis_dri.so on i386.

PR:             [2] ports/71312
Submitted by:   [2] oliver
Approved by:    portmgr (linimon)

Add missing dependency on libX11, to fix package build.

This works on AMD64 as well.  Fixes build of xorg metaport on AMD64.

Update the stable DRI port to X.Org 6.7.0-release's DRI modules.  Note that
the version number has changed to track the Mesa version instead of the X
release, which is not really related to DRI development.  This is because it is
very likely that we will be building the DRI drivers from Mesa soon.

Tested on:      XFree86 4.3 + R100, X.Org 6.7.0 + R200

Mark ONLY_FOR_ARCHS=i386 alpha.

Add new port "dri".  This port contains the split-out DRI client drivers from
XFree86-4-Server.  I decided the history from XFree86-4-Server wasn't
significant enough, and will hopefully be obsolete soon when Mesa starts
providing the DRI drivers.