Attachment #136696 for bug #181962




#				  MAKE_ENV are extended with a DISPLAY variable.
#
# USE_GL		- A list of Mesa or GL related dependencies needed by the port.
#				  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.
##


PKG_IGNORE_DEPENDS?=		'this_port_does_not_exist'

_GL_glesv2_LIB_DEPENDS=		libGLESv2.so:${PORTSDIR}/grahpics/libglesv2
_GL_egl_LIB_DEPENDS=		libEGL.so:${PORTSDIR}/graphics/libEGL
_GL_gl_LIB_DEPENDS=		libGL.so:${PORTSDIR}/graphics/libGL
_GL_gl_USE_XORG=		glproto dri2proto
_GL_glew_LIB_DEPENDS=		libGLEW.so:${PORTSDIR}/graphics/glew
_GL_glu_LIB_DEPENDS=		libGLU.so:${PORTSDIR}/graphics/libGLU
_GL_glu_USE_XORG=		glproto dri2proto
_GL_glw_LIB_DEPENDS=		libGLw.so:${PORTSDIR}/graphics/libGLw
_GL_glut_LIB_DEPENDS=		libglut.so:${PORTSDIR}/graphics/freeglut

.if defined(USE_GL)
. if ${USE_GL:L} == "yes"




You should get into the habit of checking this file for changes each time
you update your ports collection, before attempting any port upgrades.

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 that
  depends on pixman, this software needs to be recompiled.
  To recompile all software dependent on pixman, run:
  
  # 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= set.  It is necessary
  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/libiconv
  AUTHOR: madpilot@FreeBSD.org

  settings in rc.conf prior to restarting postgrey.

20130525:
  AFFECTS: users of x11/xorg and all xorg ports
  AUTHOR: zeising@FreeBSD.org

  X.Org, including libraries and some drivers, was updated.  If you are

Lines 3-8 Link Here

(-)astro/viking/Makefile (+1 lines)
3		3
4	PORTNAME= viking	4	PORTNAME= viking
5	PORTVERSION= 1.4.2	5	PORTVERSION= 1.4.2
		6	PORTREVISION= 1
6	CATEGORIES= astro	7	CATEGORIES= astro
7	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}/	8	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}/
8		9

Lines 3-9 Link Here

(-)cad/pdnmesh/Makefile (-1 / +1 lines)
3		3
4	PORTNAME= pdnmesh	4	PORTNAME= pdnmesh
5	PORTVERSION= 0.2.2	5	PORTVERSION= 0.2.2
6	PORTREVISION= 2	6	PORTREVISION= 3
7	CATEGORIES= cad	7	CATEGORIES= cad
8	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-source/${PORTVERSION}	8	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-source/${PORTVERSION}
9		9

Lines 3-8 Link Here

(-)cad/repsnapper/Makefile (+1 lines)
3		3
4	PORTNAME= repsnapper	4	PORTNAME= repsnapper
5	PORTVERSION= 2.2.0b3	5	PORTVERSION= 2.2.0b3
		6	PORTREVISION= 1
6	CATEGORIES= cad	7	CATEGORIES= cad
7	MASTER_SITES= https://codeload.github.com/timschmidt/repsnapper/tar.gz/	8	MASTER_SITES= https://codeload.github.com/timschmidt/repsnapper/tar.gz/
8	DISTNAME= ${PORTVERSION}	9	DISTNAME= ${PORTVERSION}

Lines 3-9 Link Here

(-)deskutils/pinot/Makefile (-1 / +1 lines)
3		3
4	PORTNAME= pinot	4	PORTNAME= pinot
5	PORTVERSION= 1.06	5	PORTVERSION= 1.06
6	PORTREVISION= 1	6	PORTREVISION= 2
7	CATEGORIES= deskutils	7	CATEGORIES= deskutils
8	MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}	8	MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
9	#MASTER_SITES= http://colinf.chez.com/pinot/	9	#MASTER_SITES= http://colinf.chez.com/pinot/

Lines 2-8 Link Here

(-)devel/xorg-macros/Makefile (-1 / +1 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= xorg-macros	4	PORTNAME= xorg-macros
5	PORTVERSION= 1.17	5	PORTVERSION= 1.17.1
6	CATEGORIES= devel x11	6	CATEGORIES= devel x11
7	DISTNAME= util-macros-$(PORTVERSION)	7	DISTNAME= util-macros-$(PORTVERSION)
8		8

Lines 1-2 Link Here

(-)devel/xorg-macros/distinfo (-2 / +2 lines)
1	SHA256 (xorg/util/util-macros-1.17.tar.bz2) = 7d79edde72fc17dcdc56cfbe2f8ff384d1bffd1d8c58c0fd25970f5b2ccb75ed	1	SHA256 (xorg/util/util-macros-1.17.1.tar.bz2) = 5e52654f2a0b04223cf28a9d7fd62cf288852e639ac13a75172fd47d0d6ac625
2	SIZE (xorg/util/util-macros-1.17.tar.bz2) = 77029	2	SIZE (xorg/util/util-macros-1.17.1.tar.bz2) = 79105

Lines 3-9 Link Here

(-)emulators/catapult/Makefile (-3 / +2 lines)
3		3
4	PORTNAME= catapult	4	PORTNAME= catapult
5	PORTVERSION= 0.9.1	5	PORTVERSION= 0.9.1
6	PORTREVISION= 1	6	PORTREVISION= 2
7	CATEGORIES= emulators	7	CATEGORIES= emulators
8	MASTER_SITES= SF/openmsx/openmsx/${PORTVERSION}	8	MASTER_SITES= SF/openmsx/openmsx/${PORTVERSION}
9	DISTNAME= openmsx-${PORTNAME}-${PORTVERSION}	9	DISTNAME= openmsx-${PORTNAME}-${PORTVERSION}
Lines 32-39 Link Here
32	USE_GNOME= gdkpixbuf2 glib20 gtk20 libxml2	32	USE_GNOME= gdkpixbuf2 glib20 gtk20 libxml2
33	USE_WX= 2.6+	33	USE_WX= 2.6+
34	USE_PYTHON_BUILD=yes	34	USE_PYTHON_BUILD=yes
35	USE_GMAKE= yes	35	USES= gettext gmake iconv
36	USES= gettext iconv
37	USE_XORG= ice pixman sm x11 xau xcb xcomposite xcursor xdamage xdmcp \	36	USE_XORG= ice pixman sm x11 xau xcb xcomposite xcursor xdamage xdmcp \
38	xext xfixes xi xinerama xrandr xrender xxf86vm	37	xext xfixes xi xinerama xrandr xrender xxf86vm
39	MAKEFILE= GNUmakefile	38	MAKEFILE= GNUmakefile





PORTNAME=	qemu
PORTVERSION=	1.6.0
PORTREVISION=	2
CATEGORIES=	emulators
MASTER_SITES=	http://wiki.qemu.org/download/:release \
		LOCAL/nox:snapshot

MAINTAINER=	nox@FreeBSD.org
COMMENT=	QEMU CPU Emulator - development version

LIB_DEPENDS=	pixman-1:${PORTSDIR}/x11/pixman

HAS_CONFIGURE=	yes
USE_BZIP2=	yes
USES=		gmake pkgconfig bison
USE_PERL5_BUILD=	yes
USE_PYTHON_BUILD=	-2.7
USE_XORG=	pixman
USE_GNOME+=	glib20
PATCH_STRIP=	-p1
MAKE_ENV+=	BSD_MAKE="${MAKE}"





PORTNAME=	tme
PORTVERSION=	0.8
PORTREVISION=	2
CATEGORIES=	emulators
MASTER_SITES=	http://people.csail.mit.edu/fredette/tme/


		expat:${PORTSDIR}/textproc/expat2 \
		fontconfig:${PORTSDIR}/x11-fonts/fontconfig

USES=		pkgconfig gettext gmake iconv perl5
USE_GNOME=	gdkpixbuf2 gtk20
USE_GMAKE=	yes
USE_AUTOTOOLS=	libtool libltdl
CONFIGURE_ENV=	ac_cv_have_isinff=no
CONFIGURE_ARGS=	--datadir=${WRKDIR}/tmproot --disable-warnings





PORTNAME=	klavaro
PORTVERSION=	1.9.6
PORTREVISION=	2
CATEGORIES=	games
MASTER_SITES=	SF/${PORTNAME}/


		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
		gtkdatabox:${PORTSDIR}/x11-toolkits/gtkdatabox

USES=		pkgconfig gettext gmake iconv
USE_BZIP2=	yes
USE_GMAKE=	yes
USE_XORG=	pixman x11 xau xcb xcomposite xcursor xdamage xdmcp xext \
		xfixes xi xinerama xrandr xrender
USE_GNOME=	gtk20

Lines 484-489 Link Here

(-)graphics/Makefile (+2 lines)
484	SUBDIR += leptonica	484	SUBDIR += leptonica
485	SUBDIR += lfview	485	SUBDIR += lfview
486	SUBDIR += lib3ds	486	SUBDIR += lib3ds
		487	SUBDIR += libEGL
487	SUBDIR += libGL	488	SUBDIR += libGL
488	SUBDIR += libGLU	489	SUBDIR += libGLU
489	SUBDIR += libGLw	490	SUBDIR += libGLw
Lines 505-510 Link Here
505	SUBDIR += libgeotiff	506	SUBDIR += libgeotiff
506	SUBDIR += libgfx	507	SUBDIR += libgfx
507	SUBDIR += libggi	508	SUBDIR += libggi
		509	SUBDIR += libglesv2
508	SUBDIR += libgltext	510	SUBDIR += libgltext
509	SUBDIR += libgnomecanvas	511	SUBDIR += libgnomecanvas
510	SUBDIR += libgnomecanvas-reference	512	SUBDIR += libgnomecanvas-reference

Lines 4-10 Link Here

(-)graphics/cairo/Makefile (-1 / +1 lines)
4		4
5	PORTNAME= cairo	5	PORTNAME= cairo
6	PORTVERSION= 1.10.2	6	PORTVERSION= 1.10.2
7	PORTREVISION= 5	7	PORTREVISION= 6
8	PORTEPOCH?= 2	8	PORTEPOCH?= 2
9	CATEGORIES= graphics	9	CATEGORIES= graphics
10	MASTER_SITES= http://cairographics.org/releases/	10	MASTER_SITES= http://cairographics.org/releases/





COMMENT=	OpenGL hardware acceleration drivers for the DRI

LIB_DEPENDS=	libdrm.so:${PORTSDIR}/graphics/libdrm \
		libexpat.so:${PORTSDIR}/textproc/expat2

USES=		pkgconfig
USE_XORG=	glproto x11 xext xxf86vm xdamage xfixes dri2proto

.include <bsd.port.options.mk>

# 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 i965 driver.
.if defined(WITH_NEW_XORG)
. if ${OSVERSION} >= 901000 && ${OSVERSION} < 902502 \
		&& (${ARCH} == i386 || ${ARCH} == amd64)
CC=clang
CXX=clang++
CPP=clang-cpp
. elif ${OSVERSION} < 901500
USE_GCC=yes
. endif
.endif

.if ${ARCH} == ia64
#BROKEN=		does not install on ia64
.endif

ALL_DRI_DRIVERS=I915 I965 R200 RADEON SWRAST

.if !defined(WITH_NEW_XORG)
ALL_DRI_DRIVERS+=I810 MACH64 MGA R128 R300 R600 SAVAGE SIS TDFX UNICHROME
.endif

.include "${.CURDIR}/../../graphics/libGL/bsd.mesalib.mk"

PLIST_SUB+=	VERSION=${MESADISTVERSION}
OPTIONS_DEFINE_amd64=	${OPTIONS_DEFINE_i386}

.if ${ARCH} == amd64 || ${ARCH} == i386
DRI_DRIVERS=	${ALL_DRI_DRIVERS}
OPTIONS_DEFINE_sparc64=	RADEON SWRAST
.else
OPTIONS_DEFINE_powerpc=	MACH64 RADEON SWRAST TDFX
OPTIONS_DEFINE_sparc64=	MACH64 RADEON SWRAST
.endif

.if defined(WITH_NEW_XORG)
. if defined(WITH_GALLIUM) && (${ARCH} == i386 || ${ARCH} == amd64)
BUILD_DEPENDS+=	llvm-config33:${PORTSDIR}/devel/llvm33
RUN_DEPENDS+=	llvm-config33:${PORTSDIR}/devel/llvm33
CONFIGURE_ENV+=	LLVM_CONFIG=${LOCALBASE}/bin/llvm-config33

CONFIGURE_ARGS+=--enable-gallium-llvm --disable-gallium-egl
I915_DESC=	Include DRI support for Intel i915
I965_DESC=	Include DRI support for Intel i965
MACH64_DESC=	Include DRI support for AMD/ATI Mach64
MGA_DESC=	Include DRI support for Matrox
R128_DESC=	Include DRI support for AMD/ATI R128
R200_DESC=	Include DRI support for AMD/ATI R200
R300_DESC=	Include DRI support for AMD/ATI R300
R600_DESC=	Include DRI support for AMD/ATI R600
RADEON_DESC=	Include DRI support for AMD/ATI RADEON
SAVAGE_DESC=	Include DRI support for S3/Via Savage
SIS_DESC=	Include DRI support for SiS 300 and 6326
SWRAST_DESC=	Include generic software DRI support
TDFX_DESC=	Include DRI support for 3dfx Voodoo
UNICHROME_DESC=	Include DRI support for S3/Via Unichrome

CONFIGURE_ARGS+=--with-gallium-drivers=r300,r600,radeonsi,svga,swrast
PLIST_SUB+=	GALLIUM=""
. else
CONFIGURE_ARGS+=--enable-gallium-llvm=no --without-gallium-drivers
PLIST_SUB+=	GALLIUM="@comment "
. endif
. if ${ARCH} == powerpc || ${ARCH} == ia64
DRI_DRIVERS=	RADEON SWRAST
. endif
. if ${ARCH} == sparc64
DRI_DRIVERS=	SWRAST
. endif
.else # !defined(WITH_NEW_XORG)
. if ${ARCH} == powerpc
DRI_DRIVERS=	MACH64 RADEON SWRAST TDFX
. elif ${ARCH} == sparc64
DRI_DRIVERS=	MACH64 RADEON SWRAST
. endif
.endif # defined(WITH_NEW_XORG)

DRI_DRIVERS=
.for _d in ${ALL_DRI_DRIVERS}
.if ${DRI_DRIVERS:M${_d}}
DRI_DRIVERS+=	${_d}
PLIST_SUB+=	${_d}_DRIVER=""
.else
PLIST_SUB+=	${_d}_DRIVER="@comment "

.endif
.endfor

.if !(${ARCH} == amd64 || ${ARCH} == i386)
BROKEN=		does not install on ia64
.endif

.if !(${ARCH} == "amd64" || ${ARCH} == "i386")
CONFIGURE_ARGS+=--disable-gallium-intel
.endif
CONFIGURE_ARGS+=--with-dri-drivers="${DRI_DRIVERS:L}"

.if defined(WITH_NEW_XORG) && !defined(WITH_GALLIUM) \
	&& (${ARCH} == i386 || ${ARCH} == amd64)
pre-everything::
	@${ECHO_MSG} ""
	@${ECHO_MSG} "For r300, r600, radeonsi and swrast gallium based drivers."
	@${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} == i386 || ${ARCH} == amd64)
	cd ${WRKSRC}/src/gallium/drivers/radeon; ${GMAKE} install
	cd ${WRKSRC}/src/gallium/targets; ${GMAKE} install
. endif
.endif

.include <bsd.port.mk>

Lines 1-19 Link Here

(-)graphics/dri/pkg-plist (+19 lines)
		1	%%NEW%%%%I965_DRIVER%%etc/drirc
1	include/GL/internal/dri_interface.h	2	include/GL/internal/dri_interface.h
2	%%OLD%%%%I810_DRIVER%%lib/dri/i810_dri.so	3	%%OLD%%%%I810_DRIVER%%lib/dri/i810_dri.so
		4	%%NEW%%%%I915_DRIVER%%lib/dri/i915_dri.la
3	%%I915_DRIVER%%lib/dri/i915_dri.so	5	%%I915_DRIVER%%lib/dri/i915_dri.so
		6	%%NEW%%%%I965_DRIVER%%lib/dri/i965_dri.la
4	%%I965_DRIVER%%lib/dri/i965_dri.so	7	%%I965_DRIVER%%lib/dri/i965_dri.so
5	%%OLD%%%%MACH64_DRIVER%%lib/dri/mach64_dri.so	8	%%OLD%%%%MACH64_DRIVER%%lib/dri/mach64_dri.so
6	%%OLD%%%%MGA_DRIVER%%lib/dri/mga_dri.so	9	%%OLD%%%%MGA_DRIVER%%lib/dri/mga_dri.so
7	%%OLD%%%%R128_DRIVER%%lib/dri/r128_dri.so	10	%%OLD%%%%R128_DRIVER%%lib/dri/r128_dri.so
		11	%%NEW%%%%R200_DRIVER%%lib/dri/r200_dri.la
8	%%R200_DRIVER%%lib/dri/r200_dri.so	12	%%R200_DRIVER%%lib/dri/r200_dri.so
9	%%OLD%%%%R300_DRIVER%%lib/dri/r300_dri.so	13	%%OLD%%%%R300_DRIVER%%lib/dri/r300_dri.so
		14	%%NEW%%%%GALLIUM%%lib/dri/r300_dri.la
		15	%%NEW%%%%GALLIUM%%lib/dri/r300_dri.so
10	%%OLD%%%%R600_DRIVER%%lib/dri/r600_dri.so	16	%%OLD%%%%R600_DRIVER%%lib/dri/r600_dri.so
		17	%%NEW%%%%GALLIUM%%lib/dri/r600_dri.la
		18	%%NEW%%%%GALLIUM%%lib/dri/r600_dri.so
		19	%%NEW%%%%RADEON_DRIVER%%lib/dri/radeon_dri.la
11	%%RADEON_DRIVER%%lib/dri/radeon_dri.so	20	%%RADEON_DRIVER%%lib/dri/radeon_dri.so
		21	%%NEW%%%%GALLIUM%%lib/dri/radeonsi_dri.la
		22	%%NEW%%%%GALLIUM%%lib/dri/radeonsi_dri.so
12	%%OLD%%%%SAVAGE_DRIVER%%lib/dri/savage_dri.so	23	%%OLD%%%%SAVAGE_DRIVER%%lib/dri/savage_dri.so
13	%%OLD%%%%SIS_DRIVER%%lib/dri/sis_dri.so	24	%%OLD%%%%SIS_DRIVER%%lib/dri/sis_dri.so
		25	%%NEW%%%%SWRAST_DRIVER%%lib/dri/swrast_dri.la
14	%%SWRAST_DRIVER%%lib/dri/swrast_dri.so	26	%%SWRAST_DRIVER%%lib/dri/swrast_dri.so
15	%%OLD%%%%TDFX_DRIVER%%lib/dri/tdfx_dri.so	27	%%OLD%%%%TDFX_DRIVER%%lib/dri/tdfx_dri.so
16	%%OLD%%%%UNICHROME_DRIVER%%lib/dri/unichrome_dri.so	28	%%OLD%%%%UNICHROME_DRIVER%%lib/dri/unichrome_dri.so
		29	%%NEW%%%%GALLIUM%%lib/dri/vmwgfx_dri.la
		30	%%NEW%%%%GALLIUM%%lib/dri/vmwgfx_dri.so
		31	%%NEW%%lib/libdricore%%VERSION%%.la
		32	%%NEW%%lib/libdricore%%VERSION%%.so
		33	%%NEW%%lib/libdricore%%VERSION%%.so.1
		34	%%NEW%%%%GALLIUM%%lib/libllvmradeon%%VERSION%%.la
		35	%%NEW%%%%GALLIUM%%lib/libllvmradeon%%VERSION%%.so
17	libdata/pkgconfig/dri.pc	36	libdata/pkgconfig/dri.pc
18	@dirrm lib/dri	37	@dirrm lib/dri
19	@dirrmtry include/GL/internal	38	@dirrmtry include/GL/internal




# Created by: kwm@FreeBSD.org
# $FreeBSD$

PORTNAME=	libEGL
PORTVERSION=	${MESAVERSION}
CATEGORIES=	graphics

COMMENT=	OpenEGL library

LIB_DEPENDS+=	libpthread-stubs.so:${PORTSDIR}/devel/libpthread-stubs

.if ! defined(WITH_NEW_XORG)
IGNORE=		Please enable WITH_NEW_XORG, libEGL needs libdrm higher then 2.4.24
.endif

USE_XORG=	x11 xau xcb xdmcp

# stuff not needed by libEGL but configure wants it
USE_XORG+=	glproto dri2proto xext xdamage xfixes
LIB_DEPENDS+=	libexpat.so:${PORTSDIR}/textproc/expat2 \
		libdrm.so:${PORTSDIR}/graphics/libdrm

BUILD_WKRSRC=	${WRKSRC}/src/egl
INSTALL_WRKSRC=	${WRKSRC}/src/egl

WITH_NEW_XORG=	yes

.include <bsd.port.options.mk>
.include "${.CURDIR}/../../graphics/libGL/bsd.mesalib.mk"
.include <bsd.port.mk>

Line 0 Link Here

(-)graphics/libEGL/pkg-descr (+3 lines)
	1	This package contains the EGL utility library.
	2
	3	WWW: http://www.freedesktop.org/Software/xorg

Line 0 Link Here

(-)graphics/libEGL/pkg-plist (+11 lines)
	1	include/EGL/egl.h
	2	include/EGL/eglext.h
	3	include/EGL/eglmesaext.h
	4	include/EGL/eglplatform.h
	5	include/KHR/khrplatform.h
	6	lib/libEGL.la
	7	lib/libEGL.so
	8	lib/libEGL.so.1
	9	libdata/pkgconfig/egl.pc
	10	@dirrmtry include/KHR
	11	@dirrmtry include/EGL





PORTNAME=	libGL
PORTVERSION=	${MESAVERSION}
PORTREVISION=	${LIBGLREVISION}
CATEGORIES=	graphics

MAINTAINER=	x11@FreeBSD.org
COMMENT=	OpenGL library that renders using GLX or DRI

LIB_DEPENDS+=	libdrm.so:${PORTSDIR}/graphics/libdrm \
		libexpat.so:${PORTSDIR}/textproc/expat2

USES=		pkgconfig
USE_XORG=	glproto x11 xext xxf86vm xdamage xfixes dri2proto:both


SUB_FILES=	pkg-install pkg-deinstall

.include <bsd.port.options.mk>

.if defined(WITH_NEW_XORG)
LIBGLREVISION=	0
.else
LIBGLREVISION=	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

post-install:
	@PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL


.include "${.CURDIR}/bsd.mesalib.mk"

.include <bsd.port.pre.mk>

.if !(${ARCH} == "amd64" || ${ARCH} == "i386")
CONFIGURE_ARGS+=--disable-gallium-intel
.endif

.include <bsd.port.mk>




# bsd.mesalib.mk - shared code between MesaLib ports.
# ex:ts=4
#
# bsd.mesa.mk - an attempt to refactor MesaLib ports.
#
# Created by: Florent Thoumie <flz@FreeBSD.org>
#
# !!! Here be dragons !!! (they seem to be everywhere these days)
#
# Remember to upgrade the following ports everytime you bump MESAVERSION:
#
#    - graphics/libEGL
#    - graphics/libGL
#    - grahpics/libglesv2
#    - graphics/dri
#
# $FreeBSD$

MESADISTVERSION=${MESABASEVERSION}${MESASUBVERSION:C/^(.)/-\1/}

.if defined(WITH_NEW_XORG)
MESABASEVERSION=	9.1.6
# if there is a subversion, include the '-' between 7.11-rc2 for example.
MESASUBVERSION=		
PLIST_SUB+=	OLD="@comment " NEW=""

DISTFILES=	MesaLib-${MESADISTVERSION}${EXTRACT_SUFX}
MAINTAINER?=	x11@FreeBSD.org

# HACK: added lang/python as build dependency - we need to check, which 
# python versions are cleanly supported by Mesa
BUILD_DEPENDS+=	makedepend:${PORTSDIR}/devel/makedepend \
		python2:${PORTSDIR}/lang/python2 \
		${PYTHON_SITELIBDIR}/libxml2.py:${PORTSDIR}/textproc/py-libxml2

USES=		bison gmake pathfix pkgconfig shebangfix
USE_PYTHON_BUILD=-2.7
USE_BZIP2=	yes
USE_GMAKE=	yes
USE_LDCONFIG=	yes
GNU_CONFIGURE=	yes

CPPFLAGS+=	-I${LOCALBASE}/include
LDFLAGS+=	-L${LOCALBASE}/lib
CONFIGURE_ARGS+=--enable-gallium-llvm=no --without-gallium-drivers \
		--disable-egl

.if ${OSVERSION} < 1000033
BUILD_DEPENDS+=	${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex
CONFIGURE_ENV+=ac_cv_prog_LEX=${LOCALBASE}/bin/flex
.endif

.if defined(WITH_NEW_XORG)
USE_AUTOTOOLS=	autoconf:env automake:env libtool:env
# probably be shared lib, and in it own port.
CONFIGURE_ARGS+=        --enable-shared-glapi=no
# we need to reapply these patches because we doing wierd stuff with autogen
REAPPLY_PATCHES= \
		${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=	"/usr/bin/env[[:space:]]python"
python_CMD=	${LOCALBASE}/bin/python2
SHEBANG_FILES=	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
CONFIGURE_ARGS+=--disable-glut --disable-glw --disable-glu
		${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+=--disable-glut --disable-glw
.endif

ALL_TARGET=		default
.endif

MASTERDIR=		${.CURDIR}/../../graphics/libGL
.if defined(WITH_NEW_XORG)
PATCHDIR=		${MASTERDIR}/files
.else
PATCHDIR=		${MASTERDIR}/files-old
.endif
DESCR=			${.CURDIR}/pkg-descr
PLIST=			${.CURDIR}/pkg-plist
WRKSRC=			${WRKDIR}/Mesa-${MESADISTVERSION}

.if !defined(ARCH)
ARCH!=			uname -p
.endif

COMPONENT=		${PORTNAME:L:C/^lib//:C/mesa-//}

.if ${COMPONENT:Mglesv2} == ""
CONFIGURE_ARGS+=	--disable-gles2
.else
CONFIGURE_ARGS+=	--enable-gles2
.endif

.if ${COMPONENT:Megl} == ""
CONFIGURE_ARGS+=	--disable-egl
.else
CONFIGURE_ARGS+=	--enable-egl
.endif

.if ${COMPONENT:Mdri} == ""
CONFIGURE_ARGS+=--with-dri-drivers=no
CONFIGURE_ARGS+=--enable-gallium-llvm=no --without-gallium-drivers
.else
# done in the dri port
.endif

.if !defined(WITH_NEW_XORG)

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}/libdata/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 \

.endif

pre-configure:
# workaround for stupid rerunning configure in do-build step
# xxx
.if defined(WITH_NEW_XORG)
	cd ${WRKSRC} && env NOCONFIGURE=1 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


Lines 1-4 Link Here

(-)graphics/libGL/distinfo (-2 / +2 lines)
1	SHA256 (MesaLib-7.6.1.tar.bz2) = 701f0e4cb85d6298181651b780d1c0a439fadd02aad29ee6623fc05588bb8d44	1	SHA256 (MesaLib-7.6.1.tar.bz2) = 701f0e4cb85d6298181651b780d1c0a439fadd02aad29ee6623fc05588bb8d44
2	SIZE (MesaLib-7.6.1.tar.bz2) = 4886995	2	SIZE (MesaLib-7.6.1.tar.bz2) = 4886995
3	SHA256 (MesaLib-8.0.5.tar.bz2) = 511b8da34f8e69ed24caf422964fb7ae747f3b1d8093f6b8aa2602164a475a5e	3	SHA256 (MesaLib-9.1.6.tar.bz2) = e632dff0acafad0a59dc208d16dedb37f7bd58f94c5d58c4b51912e41d005e3d
4	SIZE (MesaLib-8.0.5.tar.bz2) = 5734571	4	SIZE (MesaLib-9.1.6.tar.bz2) = 6134267




--- configure.orig	2012-07-10 17:30:46.000000000 +0200
+++ configure	2012-09-01 13:27:22.000000000 +0200
@@ -9017,9 +9017,34 @@
         DEFINES="$DEFINES -DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1"
         DEFINES="$DEFINES -DIN_DRI_DRIVER -DHAVE_ALIAS"
 
-        if test "x$DRI_DIRS" = "xyes"; then
-            DRI_DIRS="i915 i965 nouveau r200 radeon swrast"
-        fi
+        case "$host_cpu" in
+        x86_64)
+            # i810 is missing because there is no x86-64 system where it
+            # could *ever* be used.
+            if test "x$DRI_DIRS" = "xyes"; then
+                DRI_DIRS="i915 i965 nouveau r200 radeon swrast"
+            fi
+            ;;
+        i*86)
+            if test "x$DRI_DIRS" = "xyes"; then
+                DRI_DIRS="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" = "xyes"; then
+                DRI_DIRS="r200 radeon swrast"
+            fi
+            ;;
+        sparc*)
+            # Build only the drivers for cards that exist on SPARC.
+            if test "x$DRI_DIRS" = "xyes"; then
+                DRI_DIRS="r200 radeon swrast"
+            fi
+            ;;
+        esac
+
         ;;
     gnu*)
         DEFINES="$DEFINES -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER"




--- configure.orig	2009-12-22 03:31:30.000000000 +0100
+++ configure	2012-06-27 19:49:26.000000000 +0200
@@ -6946,12 +6946,35 @@
             CXXFLAGS="$CXXFLAGS -ansi -pedantic"
         fi
 
-        # ffb and gamma are missing because they have not been converted
-        # to use the new interface.
-        if test "x$DRI_DIRS" = "xyes"; then
-            DRI_DIRS="i810 i915 i965 mach64 mga r128 r200 r300 r600 radeon tdfx \
+        case "$host_cpu" in
+        x86_64)
+            # i810 is missing because there is no x86-64 system where it
+            # could *ever* be used.
+            if test "x$DRI_DIRS" = "xyes"; then
+                DRI_DIRS="i915 i965 mach64 mga r128 r200 r300 r600 radeon tdfx \
                 unichrome savage sis swrast"
-        fi
+            fi
+            ;;
+        i*86)
+            if test "x$DRI_DIRS" = "xyes"; then
+                DRI_DIRS="i810 i915 i965 mach64 mga r128 r200 r300 r600 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" = "xyes"; then
+                DRI_DIRS="mach64 r128 r200 r300 r600 radeon tdfx swrast"
+            fi
+            ;;
+        sparc*)
+            # Build only the drivers for cards that exist on SPARC.
+            if test "x$DRI_DIRS" = "xyes"; then
+                DRI_DIRS="mach64 r128 r200 r300 r600 radeon swrast"
+            fi
+            ;;
+        esac
         ;;
     gnu*)
         DEFINES="$DEFINES -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER"




--- src/mesa/drivers/dri/mach64/mach64_context.h.orig	2012-06-27 19:59:32.000000000 +0200
+++ src/mesa/drivers/dri/mach64/mach64_context.h	2012-06-27 20:08:30.000000000 +0200
@@ -294,11 +294,14 @@
 #define LE32_OUT( x, y )	do { *(GLuint *)(x) = (y); } while (0)
 #define LE32_OUT_FLOAT( x, y )	do { *(GLfloat *)(x) = (y); } while (0)
 #else
-#ifndef __OpenBSD__
-#include <byteswap.h>
-#else
+#if defined(__OpenBSD__)
 #include <machine/endian.h>
 #define bswap_32 bswap32
+#elif defined(__FreeBSD__)
+#include <sys/endian.h>
+#define bswap_32 bswap32
+#else
+#include <byteswap.h>
 #endif
 
 #define LE32_IN( x )		bswap_32( *(GLuint *)(x) )




--- src/glsl/ir_constant_expression.cpp.orig	2011-07-23 15:08:44.000000000 +0200
+++ src/glsl/ir_constant_expression.cpp	2011-07-23 15:09:03.000000000 +0200
@@ -39,6 +39,11 @@
 #include "ir_visitor.h"
 #include "glsl_types.h"
 
+#include <sys/param.h>
+#if __FreeBSD_version <= 704100 || (__FreeBSD_version >= 800000 && __FreeBSD_version < 802502) || (__FreeBSD_version >= 900000 && __FreeBSD_version < 900027)
+#define log2(x) (log(x) / log(2))
+#endif
+
 static float
 dot(ir_constant *op0, ir_constant *op1)
 {




--- src/gallium/include/pipe/p_config.h.orig	2011-10-15 02:43:58.000000000 +0200
+++ src/gallium/include/pipe/p_config.h	2012-06-28 21:27:06.000000000 +0200
@@ -106,6 +106,13 @@
 #endif
 #endif
 
+#if defined(__sparc__) || defined(__sparc64__)
+#define PIPE_ARCH_SPARC
+#if defined(__sparc64__)
+#define PIPE_ARCH_SPARC_64
+#endif
+#endif
+
 
 /*
  * Endian detection.
@@ -133,7 +140,7 @@
 
 #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(PIPE_ARCH_SPARC) || defined(PIPE_ARCH_SPARC_64)
 #define PIPE_ARCH_BIG_ENDIAN
 #endif
 




--- src/mesa/drivers/dri/nouveau/nouveau_array.c.orig	2011-01-06 01:19:15.000000000 +0100
+++ src/mesa/drivers/dri/nouveau/nouveau_array.c	2012-04-28 18:27:06.000000000 +0200
@@ -29,54 +29,71 @@
 #include "nouveau_array.h"
 #include "nouveau_bufferobj.h"
 
+#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 = ((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 = ((in_t *)(a->buf + i * a->stride))[j];	\
-									\
-			return (out_t)x / (k);				\
-		};							\
-		f;							\
-	});
-
 	switch (a->type) {
 	case GL_BYTE:
-		*extract_u = EXTRACT(char, unsigned, 1);
-		*extract_f = EXTRACT(char, float, SCHAR_MAX);
+		*extract_u = EXTRACT(GLchar, unsigned);
+		*extract_f = EXTRACT(GLchar, float);
 		break;
 	case GL_UNSIGNED_BYTE:
-		*extract_u = EXTRACT(unsigned char, unsigned, 1);
-		*extract_f = EXTRACT(unsigned char, float, UCHAR_MAX);
+		*extract_u = EXTRACT(GLubyte, unsigned);
+		*extract_f = EXTRACT(GLubyte, float);
 		break;
 	case GL_SHORT:
-		*extract_u = EXTRACT(short, unsigned, 1);
-		*extract_f = EXTRACT(short, float, SHRT_MAX);
+		*extract_u = EXTRACT(GLshort, unsigned);
+		*extract_f = EXTRACT(GLshort, float);
 		break;
 	case GL_UNSIGNED_SHORT:
-		*extract_u = EXTRACT(unsigned short, unsigned, 1);
-		*extract_f = EXTRACT(unsigned short, float, USHRT_MAX);
+		*extract_u = EXTRACT(GLushort, unsigned);
+		*extract_f = EXTRACT(GLushort, float);
 		break;
 	case GL_INT:
-		*extract_u = EXTRACT(int, unsigned, 1);
-		*extract_f = EXTRACT(int, float, INT_MAX);
+		*extract_u = EXTRACT(GLint, unsigned);
+		*extract_f = EXTRACT(GLint, float);
 		break;
 	case GL_UNSIGNED_INT:
-		*extract_u = EXTRACT(unsigned int, unsigned, 1);
-		*extract_f = EXTRACT(unsigned int, float, UINT_MAX);
+		*extract_u = EXTRACT(GLuint, unsigned);
+		*extract_f = EXTRACT(GLuint, float);
 		break;
 	case GL_FLOAT:
-		*extract_u = EXTRACT(float, unsigned, 1.0 / UINT_MAX);
-		*extract_f = EXTRACT(float, float, 1);
+		*extract_u = EXTRACT(GLfloat, unsigned);
+		*extract_f = EXTRACT(GLfloat, float);
 		break;
 	default:
 		assert(0);
 	}
 }
+#undef EXTRACT
 
 void
 nouveau_init_array(struct nouveau_array *a, int attr, int stride,




--- src/mesa/drivers/dri/nouveau/nouveau_render_t.c.orig	2011-01-06 01:19: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)
 
-/*
- * 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 = context_chan(ctx);
-			RENDER_LOCALS(ctx);
+	struct nouveau_channel *chan = context_chan(ctx);
+	RENDER_LOCALS(ctx);
 
-			EMIT_VBO(L, ctx, start, delta, n);
-		};
-
-		return f;
-
-	} else if (a->type == 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 = context_chan(ctx);
-			RENDER_LOCALS(ctx);
+	EMIT_VBO(L, ctx, start, delta, n);
+}
 
-			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 = context_chan(ctx);
+	RENDER_LOCALS(ctx);
 
-		return f;
+	EMIT_VBO(I32, ctx, start, delta, n);
+}
 
-	} 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 = context_chan(ctx);
+	RENDER_LOCALS(ctx);
 
-		void f(struct gl_context *ctx, unsigned int start, int delta,
-		       unsigned int n) {
-			struct nouveau_channel *chan = 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);
+}
 
-		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 == GL_UNSIGNED_INT)
+		return dispatch_i32;
+	else
+		return dispatch_i16;
 }
 
 /*




--- ./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:
 
 	.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
 
 #elif defined(THREADS)




--- 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 = source
  */
 	movl V4F_COUNT(%rdx), %ecx	/* count */
-	movzx V4F_STRIDE(%rdx), %eax	/* stride */
+	movzbl V4F_STRIDE(%rdx), %eax	/* stride */
 
 	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
 
 .text
 .align 16
@@ -135,7 +135,7 @@ _mesa_x86_64_transform_points4_3d:
 	movaps 16(%rax), %xmm10
 
 	movl V4F_COUNT(%rdx), %ecx	/* count */
-	movzx V4F_STRIDE(%rdx), %eax	/* stride */
+	movzbl V4F_STRIDE(%rdx), %eax	/* stride */
 
 	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:
 
 	movl V4F_COUNT(%rdx), %ecx	/* count */
-	movzx V4F_STRIDE(%rdx), %eax	/* stride */
+	movzbl V4F_STRIDE(%rdx), %eax	/* stride */
 
 	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:
 
 	movl V4F_COUNT(%rdx), %ecx	/* count */
-	movzx V4F_STRIDE(%rdx), %eax	/* stride */
+	movzbl V4F_STRIDE(%rdx), %eax	/* stride */
 
 	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:
 
 	movl V4F_COUNT(%rdx), %ecx	/* count */
-	movzx V4F_STRIDE(%rdx), %eax	/* stride */
+	movzbl V4F_STRIDE(%rdx), %eax	/* stride */
 
 	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:
 
 	movl V4F_COUNT(%rdx), %ecx	/* count */
-	movzx V4F_STRIDE(%rdx), %eax	/* stride */
+	movzbl V4F_STRIDE(%rdx), %eax	/* stride */
 
 	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:
 
 	movl V4F_COUNT(%rdx), %ecx	/* count */
-	movzx V4F_STRIDE(%rdx), %eax	/* stride */
+	movzbl V4F_STRIDE(%rdx), %eax	/* stride */
 
 	movl %ecx, V4F_COUNT(%rdi)	/* set dest count */
 	movl $4, V4F_SIZE(%rdi)		/* set dest size */

Lines 1-11 Link Here

(-)graphics/libGL/files/extra-src__mesa__x86__glapi_x86.S (-11 lines)
1	--- ./src/mesa/x86/glapi_x86.S.orig 2009-03-13 04:28:49.000000000 +0100
2	+++ ./src/mesa/x86/glapi_x86.S 2011-01-28 18:11:56.000000000 +0100
3	@@ -47,7 +47,7 @@
4	#define GL_OFFSET(x) CODEPTR(REGOFF(4 * x, EAX))
5
6	#if defined(GNU_ASSEMBLER) && !defined(__DJGPP__) && !defined(__MINGW32__)
7	-#define GLOBL_FN(x) GLOBL x ; .type x, function
8	+#define GLOBL_FN(x) GLOBL x ; .type x, @function
9	#else
10	#define GLOBL_FN(x) GLOBL x
11	#endif

Lines 1-11 Link Here

(-)graphics/libGL/files/extra-src__mesa__x86__read_rgba_span_x86.S (-11 lines)
1	--- ./src/mesa/x86/read_rgba_span_x86.S.orig 2008-08-25 16:46:47.000000000 +0200
2	+++ ./src/mesa/x86/read_rgba_span_x86.S 2011-01-28 18:10:06.000000000 +0100
3	@@ -648,7 +648,7 @@ _generic_read_RGBA_span_RGB565_MMX:
4	testl $0x01, %ecx
5	je .L01
6
7	- movzxw (%eax), %ecx
8	+ movzwl (%eax), %ecx
9	movd %ecx, %mm4
10
11	pshufw $0x00, %mm4, %mm0




--- 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 <X11/extensions/Xext.h>
 #include <X11/extensions/extutil.h>
 #include "xf86dristr.h"
+#include <limits.h>
 
 static XExtensionInfo _xf86dri_info_data;
 static XExtensionInfo *xf86dri_info = &_xf86dri_info_data;
@@ -201,7 +202,11 @@ XF86DRIOpenConnection(Display * dpy, int
    }
 
    if (rep.length) {
-      if (!(*busIdString = (char *) Xcalloc(rep.busIdStringLength + 1, 1))) {
+      if (rep.busIdStringLength < INT_MAX)
+	 *busIdString = Xcalloc(rep.busIdStringLength + 1, 1);
+      else
+	 *busIdString = NULL;
+      if (*busIdString == NULL) {
          _XEatData(dpy, ((rep.busIdStringLength + 3) & ~3));
          UnlockDisplay(dpy);
          SyncHandle();
@@ -300,9 +305,11 @@ XF86DRIGetClientDriverName(Display * dpy
    *ddxDriverPatchVersion = rep.ddxDriverPatchVersion;
 
    if (rep.length) {
-      if (!
-          (*clientDriverName =
-           (char *) Xcalloc(rep.clientDriverNameLength + 1, 1))) {
+      if (rep.clientDriverNameLength < INT_MAX)
+	 *clientDriverName = Xcalloc(rep.clientDriverNameLength + 1, 1);
+      else
+	 *clientDriverName = NULL;
+      if (*clientDriverName == NULL) {
          _XEatData(dpy, ((rep.clientDriverNameLength + 3) & ~3));
          UnlockDisplay(dpy);
          SyncHandle();




--- 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 <X11/extensions/Xext.h>
 #include <X11/extensions/extutil.h>
 #include "xf86dristr.h"
+#include <limits.h>
 
 
 #if defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__) >= 303
@@ -212,7 +213,11 @@ XF86DRIOpenConnection(Display * dpy, int
    }
 
    if (rep.length) {
-      if (!(*busIdString = (char *) Xcalloc(rep.busIdStringLength + 1, 1))) {
+      if (rep.busIdStringLength < INT_MAX)
+	 *busIdString = Xcalloc(rep.busIdStringLength + 1, 1);
+      else
+	 *busIdString = NULL;
+      if (*busIdString == NULL) {
          _XEatData(dpy, ((rep.busIdStringLength + 3) & ~3));
          UnlockDisplay(dpy);
          SyncHandle();
@@ -311,9 +316,11 @@ XF86DRIGetClientDriverName(Display * dpy
    *ddxDriverPatchVersion = rep.ddxDriverPatchVersion;
 
    if (rep.length) {
-      if (!
-          (*clientDriverName =
-           (char *) Xcalloc(rep.clientDriverNameLength + 1, 1))) {
+      if (rep.clientDriverNameLength < INT_MAX)
+	 *clientDriverName = Xcalloc(rep.clientDriverNameLength + 1, 1);
+      else
+	 *clientDriverName = NULL;
+      if (*clientDriverName == NULL) {
          _XEatData(dpy, ((rep.clientDriverNameLength + 3) & ~3));
          UnlockDisplay(dpy);
          SyncHandle();




--- configure.orig	2013-08-01 23:22:15.000000000 +0200
+++ configure	2013-08-19 20:05:02.000000000 +0200
@@ -21046,9 +21046,34 @@
         DEFINES="$DEFINES -DHAVE_PTHREAD -DUSE_EXTERNAL_DXTN_LIB=1"
         DEFINES="$DEFINES -DIN_DRI_DRIVER -DHAVE_ALIAS"
 
-        if test "x$DRI_DIRS" = "xyes"; then
-            DRI_DIRS="i915 i965 nouveau r200 radeon swrast"
-        fi
+        case "$host_cpu" in
+        x86_64)
+            # i810 is missing because there is no x86-64 system where it
+            # could *ever* be used.
+            if test "x$DRI_DIRS" = "xyes"; then
+                DRI_DIRS="i915 i965 nouveau r200 radeon swrast"
+            fi
+            ;;
+        i*86)
+            if test "x$DRI_DIRS" = "xyes"; then
+                DRI_DIRS="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" = "xyes"; then
+                DRI_DIRS="r200 radeon swrast"
+            fi
+            ;;
+        sparc*)
+            # Build only the drivers for cards that exist on SPARC.
+            if test "x$DRI_DIRS" = "xyes"; then
+                DRI_DIRS="r200 radeon swrast"
+            fi
+            ;;
+        esac
+
         ;;
     gnu*)
         DEFINES="$DEFINES -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER"
@@ -23396,7 +23421,7 @@
 radeon_llvm_check() {
     LLVM_REQUIRED_VERSION_MAJOR="3"
     LLVM_REQUIRED_VERSION_MINOR="2"
-    if test "$LLVM_VERSION_INT" -ne "${LLVM_REQUIRED_VERSION_MAJOR}0${LLVM_REQUIRED_VERSION_MINOR}"; then
+    if test "$LLVM_VERSION_INT" -lt "${LLVM_REQUIRED_VERSION_MAJOR}0${LLVM_REQUIRED_VERSION_MINOR}"; then
         as_fn_error $? "LLVM $LLVM_REQUIRED_VERSION_MAJOR.$LLVM_REQUIRED_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




--- src/glsl/ir_constant_expression.cpp.orig	2011-07-23 15:08:44.000000000 +0200
+++ src/glsl/ir_constant_expression.cpp	2011-07-23 15:09:03.000000000 +0200
@@ -39,6 +39,11 @@
 #include "ir_visitor.h"
 #include "glsl_types.h"
 
+#include <sys/param.h>
+#if __FreeBSD_version <= 704100 || (__FreeBSD_version >= 800000 && __FreeBSD_version < 802502) || (__FreeBSD_version >= 900000 && __FreeBSD_version < 900027)
+#define log2(x) (log(x) / log(2))
+#endif
+
 static float
 dot(ir_constant *op0, ir_constant *op1)
 {




--- src/gallium/include/pipe/p_config.h.orig	2011-10-15 02:43:58.000000000 +0200
+++ src/gallium/include/pipe/p_config.h	2012-06-28 21:27:06.000000000 +0200
@@ -106,6 +106,13 @@
 #endif
 #endif
 
+#if defined(__sparc__) || defined(__sparc64__)
+#define PIPE_ARCH_SPARC
+#if defined(__sparc64__)
+#define PIPE_ARCH_SPARC_64
+#endif
+#endif
+
 
 /*
  * Endian detection.
@@ -133,7 +140,7 @@
 
 #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(PIPE_ARCH_SPARC) || defined(PIPE_ARCH_SPARC_64)
 #define PIPE_ARCH_BIG_ENDIAN
 #endif
 




--- 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=$(basename $<);					\
+	dlname=$$(grep dlname= .libs/$< | cut -d "'" -f 2);	\
+	ver=$$(grep current= .libs/$< | cut -d "=" -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
 
 # 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.




diff --git a/src/gallium/drivers/r300/r300_chipset.c b/src/gallium/drivers/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_capabilities* caps)
     };
     int i;
 
+#if defined(__DragonFly__) || \
+    defined(__FreeBSD__) ||   \
+    defined(__NetBSD__) ||    \
+    defined(__OpenBSD__)
+    const char *progname, *program_invocation_short_name;
+
+    progname = getprogname();
+    program_invocation_short_name = strrchr(progname, '/');
+    if (program_invocation_short_name) {
+        program_invocation_short_name++;
+    } else {
+        program_invocation_short_name = progname;
+    }
+#endif
+
     for (i = 0; i < Elements(list); i++) {
         if (strcmp(list[i], program_invocation_short_name) == 0) {
             caps->zmask_ram = 0;




--- src/gallium/drivers/r600/r600_asm.c.orig	2013-03-20 00:28:25.000000000 +0100
+++ src/gallium/drivers/r600/r600_asm.c	2013-06-26 23:29:14.000000000 +0200
@@ -27,7 +27,12 @@
 #include "r600d.h"
 
 #include <errno.h>
+#if defined(__linux__)
 #include <byteswap.h>
+#elif defined(__FreeBSD__)
+#include <sys/endian.h>
+#define bswap_32(x)	bswap32((x))
+#endif
 #include "util/u_memory.h"
 #include "pipe/p_shader_tokens.h"
 




--- src/gallium/drivers/r600/r600_shader.c.orig	2013-05-16 19:38:54.000000000 +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 <stdio.h>
 #include <errno.h>
+#if defined(__linux__)
 #include <byteswap.h>
+#elif defined(__FreeBSD__)
+#include <sys/endian.h>
+#define bswap_32(x)	bswap32((x))
+#endif
 
 /* CAYMAN notes 
 Why CAYMAN got loops for lots of instructions is explained here.




--- src/gallium/drivers/r600/r600_state_common.c.orig	2013-03-06 00:25:39.000000000 +0100
+++ src/gallium/drivers/r600/r600_state_common.c	2013-06-26 23:26:02.000000000 +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 <byteswap.h>
+#elif defined(__FreeBSD__)
+#include <sys/endian.h>
+#define bswap_32(x)	bswap32((x))
+#endif
 
 #define R600_PRIM_RECTANGLE_LIST PIPE_PRIM_MAX
 




--- src/gallium/drivers/radeon/radeon_llvm_emit.cpp.orig	2013-08-19 21:23: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"
 
-#include <llvm/LLVMContext.h>
-#include <llvm/Module.h>
+#include <llvm/IR/LLVMContext.h>
+#include <llvm/IR/Module.h>
 #include <llvm/PassManager.h>
 #include <llvm/ADT/Triple.h>
 #include <llvm/Support/FormattedStream.h>
 #include <llvm/Support/Host.h>
-#include <llvm/Support/IRReader.h>
+#include <llvm/IRReader/IRReader.h>
 #include <llvm/Support/SourceMgr.h>
 #include <llvm/Support/TargetRegistry.h>
 #include <llvm/Support/TargetSelect.h>
@@ -39,7 +39,7 @@
 #include <llvm/Target/TargetMachine.h>
 #include <llvm/Transforms/Scalar.h>
 #include <llvm-c/Target.h>
-#include <llvm/DataLayout.h>
+#include <llvm/IR/DataLayout.h>
 
 #include <iostream>
 #include <stdlib.h>




--- 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.000000000 +0200
@@ -24,7 +24,13 @@
  *      Jerome Glisse
  *      Corbin Simpson <MostAwesomeDude@gmail.com>
  */
+
+#if defined(__linux__)
 #include <byteswap.h>
+#elif defined(__FreeBSD__)
+#include <sys/endian.h>
+#define bswap_32(x)	bswap32((x))
+#endif
 
 #include "pipe/p_screen.h"
 #include "util/u_format.h"




diff --git a/src/gallium/winsys/svga/drm/vmw_screen_ioctl.c b/src/gallium/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)
 
+#if defined(__DragonFly__) || \
+    defined(__FreeBSD__) ||   \
+    defined(__NetBSD__) ||    \
+    defined(__OpenBSD__)
+#define	ERESTART EINTR
+#endif
+
 uint32
 vmw_ioctl_context_create(struct vmw_winsys_screen *vws)
 {




--- 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 = $(SHELL) $(top_srcdir)/bin/depcomp
 am__depfiles_maybe = depfiles
 am__mv = mv -f
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+COMPILE = $(CC) $(DEFS) $(AM_CFLAGS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CFLAGS) $(CFLAGS)
+	$(AM_CFLAGS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(CFLAGS)
 AM_V_CC = $(am__v_CC_@AM_V@)
 am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
 am__v_CC_0 = @echo "  CC      " $@;
@@ -632,17 +632,17 @@
 $(am__aclocal_m4_deps):
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
+	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)/.libGL" || list=; \
 	list2=; for p in $$list; do \
 	  if test -f $$p; then \
 	    list2="$$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=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(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=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)/.libGL'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)/.libGL"; \
 	}
 
 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=$(basename $<);					\
+	dlname=$$(grep dlname= .libs/$< | cut -d "'" -f 2);	\
+	ver=$$(grep current= .libs/$< | cut -d "=" -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
 
 # 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.




--- 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.2.0.0
+	base=$(basename $<);                                    \
+	dlname=$$(grep dlname= .libs/$< | cut -d "'" -f 2);     \
+	ver=$$(grep current= .libs/$< | cut -d "=" -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
 
 # 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.

Line 0 Link Here

(-)graphics/libGL/files/patch-src_mapi_glapi_gen_gl-gentable.py (+11 lines)
	1	--- src/mapi/glapi/gen/gl_gentable.py.orig 2013-07-17 15:41:13.000000000 +0200
	2	+++ src/mapi/glapi/gen/gl_gentable.py 2013-07-17 15:41:55.000000000 +0200
	3	@@ -42,7 +42,7 @@
	4	#endif
	5
	6	#if (defined(GLXEXT) && defined(HAVE_BACKTRACE)) \\
	7	- \|\| (!defined(GLXEXT) && defined(DEBUG) && !defined(_WIN32_WCE) && !defined(__CYGWIN__))
	8	+ \|\| (!defined(GLXEXT) && defined(DEBUG) && !defined(_WIN32_WCE) && !defined(__CYGWIN__) && !defined(__OpenBSD__) && !defined(__FreeBSD__))
	9	#define USE_BACKTRACE
	10	#endif
	11




--- 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 +0200
@@ -889,9 +889,14 @@
 
 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.0.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=$(basename $<);					\
+	dlname=$$(grep dlname= .libs/$< | cut -d "'" -f 2);	\
+	ver=$$(grep current= .libs/$< | cut -d "=" -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
 
 # 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.




--- 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
 
 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
 
 install-osmesa: default osmesa.pc




--- src/mesa/drivers/dri/common/Makefile.in.orig	2013-04-20 14:50:15.000000000 +0000
+++ src/mesa/drivers/dri/common/Makefile.in	2013-04-20 15:02:05.000000000 +0000
@@ -123,11 +123,11 @@
 am__depfiles_maybe = depfiles
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+	$(AM_CFLAGS) $(CPPFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CFLAGS) $(CFLAGS)
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(AM_CFLAGS) $(CPPFLAGS) \
+	$(CFLAGS)
 AM_V_CC = $(am__v_CC_@AM_V@)
 am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
 am__v_CC_0 = @echo "  CC      " $@;

Line 0 Link Here

(-)graphics/libGL/files/patch-src_mesa_drivers_dri_common_xmlpool_Makefile.in (+11 lines)
	1	--- src/mesa/drivers/dri/common/xmlpool/Makefile.in.orig 2013-07-02 22:42:09.000000000 +0200
	2	+++ src/mesa/drivers/dri/common/xmlpool/Makefile.in 2013-07-02 22:53:30.000000000 +0200
	3	@@ -639,7 +639,7 @@
	4	# Update .mo files from the corresponding .po files.
	5	%/LC_MESSAGES/options.mo: %.po
	6	@mo="$@"; \
	7	- lang=$${mo%%/*}; \
	8	+ lang=$*; \
	9	echo "Updating ($$lang) $@ from $?."; \
	10	mkdir -p $$lang/LC_MESSAGES; \
	11	msgfmt -o $@ $?




--- 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_DIR)/libdricore@VERSION@.so
+@HAVE_DRI_TRUE@	base=$(basename $<);					\
+@HAVE_DRI_TRUE@	dlname=$$(grep dlname= .libs/$< | cut -d "'" -f 2);	\
+@HAVE_DRI_TRUE@	ver=$$(grep current= .libs/$< | cut -d "=" -f 2);	\
+@HAVE_DRI_TRUE@	ln -f .libs/$$dlname $(top_builddir)/$(LIB_DIR)/$$dlname; \
+@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)/$$base.so
 
 -include $(DEPENDS)
 




--- 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 <byteswap.h>
 #define CPU_TO_LE32( x )	bswap_32( x )
+#elif defined(__FreeBSD__)
+#include <sys/endian.h>
+#define CPU_TO_LE32( x )	bswap32( x )
 #elif defined(__APPLE__)
 #include <CoreFoundation/CFByteOrder.h>
 #define CPU_TO_LE32( x )	CFSwapInt32HostToLittle( x )




--- configure.orig	2009-12-22 03:31:30.000000000 +0100
+++ configure	2012-06-27 19:49:26.000000000 +0200
@@ -6946,12 +6946,35 @@
             CXXFLAGS="$CXXFLAGS -ansi -pedantic"
         fi
 
-        # ffb and gamma are missing because they have not been converted
-        # to use the new interface.
-        if test "x$DRI_DIRS" = "xyes"; then
-            DRI_DIRS="i810 i915 i965 mach64 mga r128 r200 r300 r600 radeon tdfx \
+        case "$host_cpu" in
+        x86_64)
+            # i810 is missing because there is no x86-64 system where it
+            # could *ever* be used.
+            if test "x$DRI_DIRS" = "xyes"; then
+                DRI_DIRS="i915 i965 mach64 mga r128 r200 r300 r600 radeon tdfx \
                 unichrome savage sis swrast"
-        fi
+            fi
+            ;;
+        i*86)
+            if test "x$DRI_DIRS" = "xyes"; then
+                DRI_DIRS="i810 i915 i965 mach64 mga r128 r200 r300 r600 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" = "xyes"; then
+                DRI_DIRS="mach64 r128 r200 r300 r600 radeon tdfx swrast"
+            fi
+            ;;
+        sparc*)
+            # Build only the drivers for cards that exist on SPARC.
+            if test "x$DRI_DIRS" = "xyes"; then
+                DRI_DIRS="mach64 r128 r200 r300 r600 radeon swrast"
+            fi
+            ;;
+        esac
         ;;
     gnu*)
         DEFINES="$DEFINES -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER"




--- src/mesa/drivers/dri/mach64/mach64_context.h.orig	2012-06-27 19:59:32.000000000 +0200
+++ src/mesa/drivers/dri/mach64/mach64_context.h	2012-06-27 20:08:30.000000000 +0200
@@ -294,11 +294,14 @@
 #define LE32_OUT( x, y )	do { *(GLuint *)(x) = (y); } while (0)
 #define LE32_OUT_FLOAT( x, y )	do { *(GLfloat *)(x) = (y); } while (0)
 #else
-#ifndef __OpenBSD__
-#include <byteswap.h>
-#else
+#if defined(__OpenBSD__)
 #include <machine/endian.h>
 #define bswap_32 bswap32
+#elif defined(__FreeBSD__)
+#include <sys/endian.h>
+#define bswap_32 bswap32
+#else
+#include <byteswap.h>
 #endif
 
 #define LE32_IN( x )		bswap_32( *(GLuint *)(x) )




--- ./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:
 
 	.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
 
 #elif defined(THREADS)




--- 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 = source
  */
 	movl V4F_COUNT(%rdx), %ecx	/* count */
-	movzx V4F_STRIDE(%rdx), %eax	/* stride */
+	movzbl V4F_STRIDE(%rdx), %eax	/* stride */
 
 	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
 
 .text
 .align 16
@@ -135,7 +135,7 @@ _mesa_x86_64_transform_points4_3d:
 	movaps 16(%rax), %xmm10
 
 	movl V4F_COUNT(%rdx), %ecx	/* count */
-	movzx V4F_STRIDE(%rdx), %eax	/* stride */
+	movzbl V4F_STRIDE(%rdx), %eax	/* stride */
 
 	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:
 
 	movl V4F_COUNT(%rdx), %ecx	/* count */
-	movzx V4F_STRIDE(%rdx), %eax	/* stride */
+	movzbl V4F_STRIDE(%rdx), %eax	/* stride */
 
 	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:
 
 	movl V4F_COUNT(%rdx), %ecx	/* count */
-	movzx V4F_STRIDE(%rdx), %eax	/* stride */
+	movzbl V4F_STRIDE(%rdx), %eax	/* stride */
 
 	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:
 
 	movl V4F_COUNT(%rdx), %ecx	/* count */
-	movzx V4F_STRIDE(%rdx), %eax	/* stride */
+	movzbl V4F_STRIDE(%rdx), %eax	/* stride */
 
 	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:
 
 	movl V4F_COUNT(%rdx), %ecx	/* count */
-	movzx V4F_STRIDE(%rdx), %eax	/* stride */
+	movzbl V4F_STRIDE(%rdx), %eax	/* stride */
 
 	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:
 
 	movl V4F_COUNT(%rdx), %ecx	/* count */
-	movzx V4F_STRIDE(%rdx), %eax	/* stride */
+	movzbl V4F_STRIDE(%rdx), %eax	/* stride */
 
 	movl %ecx, V4F_COUNT(%rdi)	/* set dest count */
 	movl $4, V4F_SIZE(%rdi)		/* set dest size */

Line 0 Link Here

(-)graphics/libGL/files-old/patch-src__mesa__x86__glapi_x86.S (+11 lines)
	1	--- ./src/mesa/x86/glapi_x86.S.orig 2009-03-13 04:28:49.000000000 +0100
	2	+++ ./src/mesa/x86/glapi_x86.S 2011-01-28 18:11:56.000000000 +0100
	3	@@ -47,7 +47,7 @@
	4	#define GL_OFFSET(x) CODEPTR(REGOFF(4 * x, EAX))
	5
	6	#if defined(GNU_ASSEMBLER) && !defined(__DJGPP__) && !defined(__MINGW32__)
	7	-#define GLOBL_FN(x) GLOBL x ; .type x, function
	8	+#define GLOBL_FN(x) GLOBL x ; .type x, @function
	9	#else
	10	#define GLOBL_FN(x) GLOBL x
	11	#endif

Line 0 Link Here

(-)graphics/libGL/files-old/patch-src__mesa__x86__read_rgba_span_x86.S (+11 lines)
	1	--- ./src/mesa/x86/read_rgba_span_x86.S.orig 2008-08-25 16:46:47.000000000 +0200
	2	+++ ./src/mesa/x86/read_rgba_span_x86.S 2011-01-28 18:10:06.000000000 +0100
	3	@@ -648,7 +648,7 @@ _generic_read_RGBA_span_RGB565_MMX:
	4	testl $0x01, %ecx
	5	je .L01
	6
	7	- movzxw (%eax), %ecx
	8	+ movzwl (%eax), %ecx
	9	movd %ecx, %mm4
	10
	11	pshufw $0x00, %mm4, %mm0




--- 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 <X11/extensions/Xext.h>
 #include <X11/extensions/extutil.h>
 #include "xf86dristr.h"
+#include <limits.h>
 
 
 #if defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__) >= 303
@@ -212,7 +213,11 @@ XF86DRIOpenConnection(Display * dpy, int
    }
 
    if (rep.length) {
-      if (!(*busIdString = (char *) Xcalloc(rep.busIdStringLength + 1, 1))) {
+      if (rep.busIdStringLength < INT_MAX)
+	 *busIdString = Xcalloc(rep.busIdStringLength + 1, 1);
+      else
+	 *busIdString = NULL;
+      if (*busIdString == NULL) {
          _XEatData(dpy, ((rep.busIdStringLength + 3) & ~3));
          UnlockDisplay(dpy);
          SyncHandle();
@@ -311,9 +316,11 @@ XF86DRIGetClientDriverName(Display * dpy
    *ddxDriverPatchVersion = rep.ddxDriverPatchVersion;
 
    if (rep.length) {
-      if (!
-          (*clientDriverName =
-           (char *) Xcalloc(rep.clientDriverNameLength + 1, 1))) {
+      if (rep.clientDriverNameLength < INT_MAX)
+	 *clientDriverName = Xcalloc(rep.clientDriverNameLength + 1, 1);
+      else
+	 *clientDriverName = NULL;
+      if (*clientDriverName == NULL) {
          _XEatData(dpy, ((rep.clientDriverNameLength + 3) & ~3));
          UnlockDisplay(dpy);
          SyncHandle();




--- 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
 
 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
 
 install-osmesa: default osmesa.pc

Lines 11-19 Link Here

(-)graphics/libGL/pkg-plist (-1 / +2 lines)
11	%%OLD%%include/GL/mglmesa.h	11	%%OLD%%include/GL/mglmesa.h
12	include/GL/osmesa.h	12	include/GL/osmesa.h
13	%%OLD%%include/GL/svgamesa.h	13	%%OLD%%include/GL/svgamesa.h
14	include/GL/vms_x_fix.h	14	%%OLD%%include/GL/vms_x_fix.h
15	include/GL/wglext.h	15	include/GL/wglext.h
16	include/GL/wmesa.h	16	include/GL/wmesa.h
		17	%%NEW%%lib/.libGL/libGL.la
17	lib/.libGL/libGL.so	18	lib/.libGL/libGL.so
18	lib/.libGL/libGL.so.1	19	lib/.libGL/libGL.so.1
19	libdata/pkgconfig/gl.pc	20	libdata/pkgconfig/gl.pc

Lines 12-20 Link Here

(-)graphics/libGLw/Makefile (-1 / +2 lines)
12	COMMENT= OpenGL widgets library	12	COMMENT= OpenGL widgets library
13		13
14	USE_BZIP2= yes	14	USE_BZIP2= yes
15	USES= pathfix pkgconfig motif	15	USES= pathfix pkgconfig
16	USE_LDCONFIG= yes	16	USE_LDCONFIG= yes
17	USE_GL= gl	17	USE_GL= gl
		18	USE_MOTIF= yes
18	USE_XORG= x11 xt xext	19	USE_XORG= x11 xt xext
19	GNU_CONFIGURE= yes	20	GNU_CONFIGURE= yes
20	CONFIGURE_ARGS= --disable-static --enable-motif	21	CONFIGURE_ARGS= --disable-static --enable-motif




MAINTAINER=	x11@FreeBSD.org
COMMENT=	Userspace interface to kernel Direct Rendering Module services

LIB_DEPENDS=	libpciaccess.so:${PORTSDIR}/devel/libpciaccess \
		libpthread-stubs.so:${PORTSDIR}/devel/libpthread-stubs

USES=		pkgconfig
USE_BZIP2=	yes

GNU_CONFIGURE=	yes
USE_LDCONFIG=	yes

OPTIONS_DEFINE=	MANPAGES

.if defined(WITH_NEW_XORG)

USES+=		gmake

OPTIONS_DEFINE=	KMS MANPAGES
OPTIONS_DEFAULT=KMS
KMS_DESC=	Enable KMS support

.if defined(PACKAGE_BUILDING)
OPTIONS_DEFAULT+=	MANPAGES
.endif


.include <bsd.port.options.mk>

.if defined(WITH_NEW_XORG)

USES+=		gmake

# KMS support in the kernel is only build on these archs, disable others
.if ${ARCH} == "amd64" || ${ARCH} == "i386"
CONFIGURE_ARGS+=--enable-libkms
EXTRA_PATCHES+=	${FILESDIR}/extra-xf86drmMode.c
PLIST_SUB+=	KMS="" NOUVEAU=""
.else
CONFIGURE_ARGS+=--disable-libkms
PLIST_SUB+=	KMS="@comment " NOUVEAU="@comment "
.endif

.if ${PORT_OPTIONS:MMANPAGES}

CONFIGURE_ARGS=	--enable-nouveau-experimental-api
LIBDRM_VERSION=	2.4.17
LIBDRM_REVISION=1
PLIST_SUB+=	OLD="" NEW="@comment " NOUVEAU=""
.endif

.include <bsd.port.pre.mk>

.if ${ARCH} == "amd64" || ${ARCH} == "i386" || ${ARCH} == "ia64" || ${ARCH} == "powerpc"
PLIST_SUB+=	INTEL_DRIVER=""
PLIST_SUB+=	RADEON_DRIVERS=""

			   s,i?86|x86_64),i?86|amd64|x86_64),g' \
		${WRKSRC}/configure

.include <bsd.port.mk>




%%NEW%%%%INTEL_DRIVER%%include/libdrm/intel_debug.h
%%NEW%%include/libdrm/mach64_drm.h
%%NEW%%include/libdrm/mga_drm.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

%%INTEL_DRIVER%%lib/libdrm_intel.la
%%INTEL_DRIVER%%lib/libdrm_intel.so
%%INTEL_DRIVER%%lib/libdrm_intel.so.1
%%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

%%NEW%%%%KMS%%lib/libkms.so.1
libdata/pkgconfig/libdrm.pc
%%INTEL_DRIVER%%libdata/pkgconfig/libdrm_intel.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




# Created by: kwm@FreeBSD.org
# $FreeBSD$

PORTNAME=	libglesv2
PORTVERSION=	${MESAVERSION}
CATEGORIES=	graphics

COMMENT=	OpenGL ES v2 library

LIB_DEPENDS+=	libdrm.so:${PORTSDIR}/graphics/libdrm \
		libexpat.so:${PORTSDIR}/textproc/expat2

.if ! defined(WITH_NEW_XORG)
IGNORE=		Please enable WITH_NEW_XORG, libglesv2 needs libdrm higher then 2.4.24
.endif

# stuff not needed by libEGL but configure wants it
USE_XORG+=	glproto dri2proto xext xdamage xfixes


BUILD_WKRSRC=	${WRKSRC}/src/mapi/es2api
INSTALL_WRKSRC=	${WRKSRC}/src/mapi/es2api

# this library doesn't exist in Mesa 7.6 so use newer
WITH_NEW_XORG=yes

.include <bsd.port.options.mk>
.include "${.CURDIR}/../../graphics/libGL/bsd.mesalib.mk"
.include <bsd.port.mk>

Line 0 Link Here

(-)graphics/libglesv2/pkg-descr (+3 lines)
	1	This package contains the GL ES v2 utility library.
	2
	3	WWW: http://www.freedesktop.org/Software/xorg




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

Lines 3-9 Link Here

(-)graphics/libreatlas/Makefile (-3 / +2 lines)
3		3
4	PORTNAME= libreatlas	4	PORTNAME= libreatlas
5	PORTVERSION= 1.0.0a	5	PORTVERSION= 1.0.0a
6	PORTREVISION= 3	6	PORTREVISION= 4
7	CATEGORIES= graphics geography	7	CATEGORIES= graphics geography
8	MASTER_SITES= http://www.gaia-gis.it/gaia-sins/	8	MASTER_SITES= http://www.gaia-gis.it/gaia-sins/
9		9
Lines 30-37 Link Here
30	fontconfig:${PORTSDIR}/x11-fonts/fontconfig	30	fontconfig:${PORTSDIR}/x11-fonts/fontconfig
31		31
32	GNU_CONFIGURE= yes	32	GNU_CONFIGURE= yes
33	USES= pkgconfig gettext iconv	33	USES= pkgconfig gettext gmake iconv
34	USE_GMAKE= yes
35	USE_XORG= ice pixman sm x11 xau xcb xcomposite xcursor xdamage xdmcp xext \	34	USE_XORG= ice pixman sm x11 xau xcb xcomposite xcursor xdamage xdmcp xext \
36	xfixes xi xinerama xrandr xrender xxf86vm	35	xfixes xi xinerama xrandr xrender xxf86vm
37	USE_GNOME= atk gdkpixbuf2 glib20 gtk20 pango	36	USE_GNOME= atk gdkpixbuf2 glib20 gtk20 pango





PORTNAME=	freetuxtv
PORTVERSION=	0.6.5
PORTREVISION=	5
CATEGORIES=	multimedia
MASTER_SITES=	GOOGLE_CODE


		expat:${PORTSDIR}/textproc/expat2 \
		fontconfig:${PORTSDIR}/x11-fonts/fontconfig

USES=		gmake iconv pathfix pkgconfig
USE_GNOME=	glib20 gtk20
USE_XORG=	pixman x11 xau xcb xcomposite xcursor xdamage xdmcp xext xfixes \
		xi xinerama xrandr xrender
GNU_CONFIGURE=	yes
CONFIGURE_ARGS+=--with-gtk=2.0
USE_GMAKE=	yes
CFLAGS=		-Wno-return-type
INSTALLS_ICONS=	yes


Lines 3-9 Link Here

(-)net/cvsup/Makefile (-1 / +1 lines)
3		3
4	PORTNAME= cvsup	4	PORTNAME= cvsup
5	PORTVERSION= 16.1h	5	PORTVERSION= 16.1h
6	PORTREVISION= 4	6	PORTREVISION= 5
7	CATEGORIES= net devel	7	CATEGORIES= net devel
8	MASTER_SITES= ${MASTER_SITE_FREEBSD_ORG}	8	MASTER_SITES= ${MASTER_SITE_FREEBSD_ORG}
9	MASTER_SITE_SUBDIR=development/CVSup/snapshots	9	MASTER_SITE_SUBDIR=development/CVSup/snapshots

Lines 3-9 Link Here

(-)net/tigervnc/Makefile (-3 / +2 lines)
3		3
4	PORTNAME= tigervnc	4	PORTNAME= tigervnc
5	PORTVERSION= 1.2.0	5	PORTVERSION= 1.2.0
6	PORTREVISION= 3	6	PORTREVISION= 4
7	CATEGORIES= net x11-servers	7	CATEGORIES= net x11-servers
8	MASTER_SITES= SF:tigervnc	8	MASTER_SITES= SF:tigervnc
9	MASTER_SITE_SUBDIR= ${PORTNAME}/${PORTNAME}/${PORTVERSION}/:tigervnc	9	MASTER_SITE_SUBDIR= ${PORTNAME}/${PORTNAME}/${PORTVERSION}/:tigervnc
Lines 28-35 Link Here
28		28
29	MAKE_JOBS_UNSAFE= yes	29	MAKE_JOBS_UNSAFE= yes
30		30
31	USES= cmake pkgconfig	31	USES= cmake gmake pkgconfig
32	USE_GMAKE= yes
33	USE_GL= gl	32	USE_GL= gl
34	USE_AUTOTOOLS+= autoconf:env automake:env libtool:env	33	USE_AUTOTOOLS+= autoconf:env automake:env libtool:env
35	USE_PYTHON= yes	34	USE_PYTHON= yes





PORTNAME=	photoprint
DISTVERSION=	0.4.2-pre2
PORTREVISION=	1
CATEGORIES=	print graphics
MASTER_SITES=	http://www.blackfiveimaging.co.uk/photoprint/


		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

GNU_CONFIGURE=	yes
USES=		desktop-file-utils gettext pkgconfig
USE_GNOME=	pango
USE_XORG=	pixman x11 xau xcb xcomposite xcursor xdamage xdmcp xext \
		xfixes xi xinerama xrandr xrender
INSTALLS_ICONS=	yes


Lines 3-9 Link Here

(-)sysutils/gtk-imonc/Makefile (-1 / +1 lines)
3		3
4	PORTNAME= gtk-imonc	4	PORTNAME= gtk-imonc
5	PORTVERSION= 0.6.4.1	5	PORTVERSION= 0.6.4.1
6	PORTREVISION= 12	6	PORTREVISION= 13
7	CATEGORIES= sysutils	7	CATEGORIES= sysutils
8	MASTER_SITES= http://stefan-strigler.de/download/	8	MASTER_SITES= http://stefan-strigler.de/download/
9		9

Lines 3-9 Link Here

(-)sysutils/nitrogen/Makefile (-1 / +1 lines)
3		3
4	PORTNAME= nitrogen	4	PORTNAME= nitrogen
5	PORTVERSION= 1.5.2	5	PORTVERSION= 1.5.2
6	PORTREVISION= 2	6	PORTREVISION= 3
7	CATEGORIES= sysutils	7	CATEGORIES= sysutils
8	MASTER_SITES= http://projects.l3ib.org/nitrogen/files/	8	MASTER_SITES= http://projects.l3ib.org/nitrogen/files/
9		9

Lines 2-8 Link Here

(-)x11/libSM/Makefile (-1 / +1 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= libSM	4	PORTNAME= libSM
5	PORTVERSION= 1.2.1	5	PORTVERSION= 1.2.2
6	PORTEPOCH= 1	6	PORTEPOCH= 1
7	CATEGORIES= x11	7	CATEGORIES= x11
8		8

Lines 1-2 Link Here

(-)x11/libSM/distinfo (-2 / +2 lines)
1	SHA256 (xorg/lib/libSM-1.2.1.tar.bz2) = 93c11d569c64f40723b93b44af1efb474a0cfe92573b0c8c330343cabb897f1d	1	SHA256 (xorg/lib/libSM-1.2.2.tar.bz2) = 0baca8c9f5d934450a70896c4ad38d06475521255ca63b717a6510fdb6e287bd
2	SIZE (xorg/lib/libSM-1.2.1.tar.bz2) = 334696	2	SIZE (xorg/lib/libSM-1.2.2.tar.bz2) = 348908

Lines 2-8 Link Here

(-)x11/libX11/Makefile (-1 / +1 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= libX11	4	PORTNAME= libX11
5	PORTVERSION= 1.6.1	5	PORTVERSION= 1.6.2
6	PORTEPOCH= 1	6	PORTEPOCH= 1
7	CATEGORIES= x11	7	CATEGORIES= x11
8		8

Lines 1-2 Link Here

(-)x11/libX11/distinfo (-2 / +2 lines)
1	SHA256 (xorg/lib/libX11-1.6.1.tar.bz2) = 10a54fc16b58b4f5a5eed4d080c357a82fd2f42d09af625c1f5df50650701892	1	SHA256 (xorg/lib/libX11-1.6.2.tar.bz2) = 2aa027e837231d2eeea90f3a4afe19948a6eb4c8b2bec0241eba7dbc8106bd16
2	SIZE (xorg/lib/libX11-1.6.1.tar.bz2) = 2356196	2	SIZE (xorg/lib/libX11-1.6.2.tar.bz2) = 2339981

Lines 103-108 Link Here

(-)x11/libX11/pkg-plist (+8 lines)
103	lib/X11/locale/ja_JP.UTF-8/Compose	103	lib/X11/locale/ja_JP.UTF-8/Compose
104	lib/X11/locale/ja_JP.UTF-8/XI18N_OBJS	104	lib/X11/locale/ja_JP.UTF-8/XI18N_OBJS
105	lib/X11/locale/ja_JP.UTF-8/XLC_LOCALE	105	lib/X11/locale/ja_JP.UTF-8/XLC_LOCALE
		106	lib/X11/locale/km_KH.UTF-8/Compose
		107	lib/X11/locale/km_KH.UTF-8/XI18N_OBJS
		108	lib/X11/locale/km_KH.UTF-8/XLC_LOCALE
106	lib/X11/locale/ko/Compose	109	lib/X11/locale/ko/Compose
107	lib/X11/locale/ko/XI18N_OBJS	110	lib/X11/locale/ko/XI18N_OBJS
108	lib/X11/locale/ko/XLC_LOCALE	111	lib/X11/locale/ko/XLC_LOCALE
Lines 141-146 Link Here
141	lib/X11/locale/ru_RU.UTF-8/Compose	144	lib/X11/locale/ru_RU.UTF-8/Compose
142	lib/X11/locale/ru_RU.UTF-8/XI18N_OBJS	145	lib/X11/locale/ru_RU.UTF-8/XI18N_OBJS
143	lib/X11/locale/ru_RU.UTF-8/XLC_LOCALE	146	lib/X11/locale/ru_RU.UTF-8/XLC_LOCALE
		147	lib/X11/locale/sr_CS.UTF-8/Compose
		148	lib/X11/locale/sr_CS.UTF-8/XI18N_OBJS
		149	lib/X11/locale/sr_CS.UTF-8/XLC_LOCALE
144	lib/X11/locale/tatar-cyr/Compose	150	lib/X11/locale/tatar-cyr/Compose
145	lib/X11/locale/tatar-cyr/XI18N_OBJS	151	lib/X11/locale/tatar-cyr/XI18N_OBJS
146	lib/X11/locale/tatar-cyr/XLC_LOCALE	152	lib/X11/locale/tatar-cyr/XLC_LOCALE
Lines 215-220 Link Here
215	@dirrm lib/X11/locale/th_TH.UTF-8	221	@dirrm lib/X11/locale/th_TH.UTF-8
216	@dirrm lib/X11/locale/th_TH	222	@dirrm lib/X11/locale/th_TH
217	@dirrm lib/X11/locale/tatar-cyr	223	@dirrm lib/X11/locale/tatar-cyr
		224	@dirrm lib/X11/locale/sr_CS.UTF-8
218	@dirrm lib/X11/locale/ru_RU.UTF-8	225	@dirrm lib/X11/locale/ru_RU.UTF-8
219	@dirrm lib/X11/locale/pt_BR.UTF-8	226	@dirrm lib/X11/locale/pt_BR.UTF-8
220	@dirrm lib/X11/locale/nokhchi-1	227	@dirrm lib/X11/locale/nokhchi-1
Lines 227-232 Link Here
227	@dirrm lib/X11/locale/koi8-c	234	@dirrm lib/X11/locale/koi8-c
228	@dirrm lib/X11/locale/ko_KR.UTF-8	235	@dirrm lib/X11/locale/ko_KR.UTF-8
229	@dirrm lib/X11/locale/ko	236	@dirrm lib/X11/locale/ko
		237	@dirrm lib/X11/locale/km_KH.UTF-8
230	@dirrm lib/X11/locale/ja_JP.UTF-8	238	@dirrm lib/X11/locale/ja_JP.UTF-8
231	@dirrm lib/X11/locale/ja.SJIS	239	@dirrm lib/X11/locale/ja.SJIS
232	@dirrm lib/X11/locale/ja.JIS	240	@dirrm lib/X11/locale/ja.JIS

Lines 2-8 Link Here

(-)x11/libXpm/Makefile (-1 / +1 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= libXpm	4	PORTNAME= libXpm
5	PORTVERSION= 3.5.10	5	PORTVERSION= 3.5.11
6	CATEGORIES= x11	6	CATEGORIES= x11
7		7
8	MAINTAINER= x11@FreeBSD.org	8	MAINTAINER= x11@FreeBSD.org

Lines 1-2 Link Here

(-)x11/libXpm/distinfo (-2 / +2 lines)
1	SHA256 (xorg/lib/libXpm-3.5.10.tar.bz2) = a6db7e234750e7d60330017972e31d8e1f29f0a8c1391e4ac82f6102d919a735	1	SHA256 (xorg/lib/libXpm-3.5.11.tar.bz2) = c5bdafa51d1ae30086fac01ab83be8d47fe117b238d3437f8e965434090e041c
2	SIZE (xorg/lib/libXpm-3.5.10.tar.bz2) = 431310	2	SIZE (xorg/lib/libXpm-3.5.11.tar.bz2) = 443496

Lines 2-8 Link Here

(-)x11/libXrandr/Makefile (-1 / +1 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= libXrandr	4	PORTNAME= libXrandr
5	PORTVERSION= 1.4.1	5	PORTVERSION= 1.4.2
6	CATEGORIES= x11	6	CATEGORIES= x11
7		7
8	MAINTAINER= x11@FreeBSD.org	8	MAINTAINER= x11@FreeBSD.org

Lines 1-2 Link Here

(-)x11/libXrandr/distinfo (-2 / +2 lines)
1	SHA256 (xorg/lib/libXrandr-1.4.1.tar.bz2) = d914a0490fd0a2ea6c3194505b5b28c56e2a277d8f4648b0275ee0ee370fb905	1	SHA256 (xorg/lib/libXrandr-1.4.2.tar.bz2) = caa7b31ac769be51a532343c65376f1d4df3f307afaed58e34fb5e82e8b825ad
2	SIZE (xorg/lib/libXrandr-1.4.1.tar.bz2) = 312857	2	SIZE (xorg/lib/libXrandr-1.4.2.tar.bz2) = 315165

Lines 2-8 Link Here

(-)x11/libXv/Makefile (-1 / +1 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= libXv	4	PORTNAME= libXv
5	PORTVERSION= 1.0.9	5	PORTVERSION= 1.0.10
6	PORTEPOCH= 1	6	PORTEPOCH= 1
7	CATEGORIES= x11	7	CATEGORIES= x11
8		8

Lines 1-2 Link Here

(-)x11/libXv/distinfo (-2 / +2 lines)
1	SHA256 (xorg/lib/libXv-1.0.9.tar.bz2) = a874dbf864d0271bbe795af67ef5b3f20096c92fc11eacbf0d2af00e32bc5b4b	1	SHA256 (xorg/lib/libXv-1.0.10.tar.bz2) = 55fe92f8686ce8612e2c1bfaf58c057715534419da700bda8d517b1d97914525
2	SIZE (xorg/lib/libXv-1.0.9.tar.bz2) = 309744	2	SIZE (xorg/lib/libXv-1.0.10.tar.bz2) = 300633

Lines 20-28 Link Here

(-)x11/libxcb/Makefile (-2 / +1 lines)
20	CONFIGURE_ARGS+= --disable-build-docs --without-doxygen --enable-xinput	20	CONFIGURE_ARGS+= --disable-build-docs --without-doxygen --enable-xinput
21		21
22	USE_BZIP2= yes	22	USE_BZIP2= yes
23	USES= pathfix pkgconfig	23	USES= gmake pathfix pkgconfig
24	USE_GNOME= libxslt:build	24	USE_GNOME= libxslt:build
25	USE_GMAKE= yes
26	USE_LDCONFIG= yes	25	USE_LDCONFIG= yes
27	USE_XORG= xau xdmcp	26	USE_XORG= xau xdmcp
28	USE_PYTHON_BUILD= 2.5+	27	USE_PYTHON_BUILD= 2.5+




# $FreeBSD$

PORTNAME=	pixman
PORTVERSION=	0.30.2
CATEGORIES=	x11

MAINTAINER=	x11@FreeBSD.org

COMMENT=	Low-level pixel manipulation library

USES=		perl5
USE_PERL5=	build
XORG_CAT=	lib
USE_AUTOTOOLS=	libtool
USE_PERL5=	build
USE_GNOME=	ltverhack:9
CONFIGURE_ARGS=	--disable-gtk

OPTIONS_DEFINE=	SIMD

Lines 1-2 Link Here

(-)x11/pixman/distinfo (-2 / +2 lines)
1	SHA256 (xorg/lib/pixman-0.30.0.tar.bz2) = 77e756dc7fafdf17f39a4f23bdc8be59f9f6a65c08704f5cac1d8aa87cfaf517	1	SHA256 (xorg/lib/pixman-0.30.2.tar.bz2) = 4fbb51788fe7cbd8abb5f80aed95ec878704e57a06328f7bebe0306e3822c96c
2	SIZE (xorg/lib/pixman-0.30.0.tar.bz2) = 681343	2	SIZE (xorg/lib/pixman-0.30.2.tar.bz2) = 666281

Lines 14-22 Link Here

(-)x11/xkeyboard-config/Makefile (-2 / +1 lines)
14	XORG_CAT= data	14	XORG_CAT= data
15		15
16	USE_BZIP2= yes	16	USE_BZIP2= yes
17	USE_GMAKE= yes
18	USE_GNOME= intlhack libxslt:build	17	USE_GNOME= intlhack libxslt:build
19	USES= pathfix perl5	18	USES= gmake pathfix perl5
20	USE_PERL5= build	19	USE_PERL5= build
21	GNU_CONFIGURE= yes	20	GNU_CONFIGURE= yes
22	MAKE_JOBS_UNSAFE=yes	21	MAKE_JOBS_UNSAFE=yes

Lines 3-8 Link Here

(-)x11/xorg-cf-files/Makefile (+1 lines)
3		3
4	PORTNAME= xorg-cf-files	4	PORTNAME= xorg-cf-files
5	PORTVERSION= 1.0.5	5	PORTVERSION= 1.0.5
		6	PORTREVISION= 1
6	CATEGORIES= x11	7	CATEGORIES= x11
7		8
8	MAINTAINER= x11@FreeBSD.org	9	MAINTAINER= x11@FreeBSD.org

Lines 8-15 Link Here

(-)x11/xtrans/Makefile (-2 lines)
8	MAINTAINER= x11@FreeBSD.org	8	MAINTAINER= x11@FreeBSD.org
9	COMMENT= Abstract network code for X	9	COMMENT= Abstract network code for X
10		10
11	CONFLICTS= libXtrans
12
13	LICENSE= MIT	11	LICENSE= MIT
14		12
15	XORG_CAT= lib	13	XORG_CAT= lib




--- 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).
  */
 
+
+/*
+ * XXX - Should this be autoconf'd instead?
+ */
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
+
+#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
+
+#endif /* defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) */
+
 #include <xorg-server.h>
 
 #include <X11/X.h>
@@ -33,9 +51,23 @@
 #include "xf86Priv.h"
 #include "xf86_OSlib.h"
 #include "xf86Xinput.h"
+#include <exevents.h>
 #include "mouse.h"
 #include "xisb.h"
 #include "mipointer.h"
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 3
+#define HAVE_PROPERTIES 1
+#endif
+#ifdef HAVE_PROPERTIES
+#include <X11/Xatom.h>
+#include <xserver-properties.h>
+/* 1.6 has properties, but no labels */
+#ifdef AXIS_LABEL_PROP
+#define HAVE_LABELS
+#else
+#undef HAVE_LABELS
+#endif
+#endif
 #ifdef WSCONS_SUPPORT
 #include <dev/wscons/wsconsio.h>
 #endif
@@ -47,9 +79,6 @@
 #endif
 
 #include <dev/usb/usb.h>
-#ifdef USB_GET_REPORT_ID
-#define USB_NEW_HID
-#endif
 
 #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"

         NULL
 };
 #elif (defined(__OpenBSD__) || defined(__NetBSD__)) && defined(WSCONS_SUPPORT)
@@ -100,7 +131,11 @@
 #if defined(__NetBSD__)
     return MSE_SERIAL | MSE_BUS | MSE_PS2 | MSE_AUTO;
 #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)

 #else
     return MSE_SERIAL | MSE_BUS | MSE_PS2 | MSE_XPS2 | MSE_AUTO | MSE_MISC;
 #endif
@@ -180,9 +215,30 @@
         { MOUSE_PROTO_SYSMOUSE,         "SysMouse" }
 };
 

+#ifdef XPS2_SUPPORT
+static struct {
+        int dmodel;
+        const char *name;
+} ps2proto[] = {
+        { MOUSE_MODEL_NETSCROLL,        "NetScrollPS/2" },
+        { MOUSE_MODEL_NET,              "NetMousePS/2" },

 SetupAuto(InputInfoPtr pInfo, int *protoPara)
 {
+#ifdef XPS2_SUPPORT
+    const char *dev;
+#endif
+    const char *proto;
     int i;
     mousehw_t hw;
     mousemode_t mode;
@@ -190,7 +246,13 @@
     if (pInfo->fd == -1)
         return NULL;
 

     i = 1;
     ioctl(pInfo->fd, MOUSE_SETLEVEL, &i);
 
@@ -209,9 +271,18 @@
                     protoPara[0] = mode.syncmask[0];
                     protoPara[1] = mode.syncmask[1];
                 }

             }
         }
     }
@@ -234,41 +305,41 @@
         (protocol && xf86NameCmp(protocol, "SysMouse") == 0)) {
         /*
          * As the FreeBSD sysmouse driver defaults to protocol level 0

     }
     return FALSE;
 }
@@ -276,17 +347,17 @@
 static const char *
 FindDevice(InputInfoPtr pInfo, const char *protocol, int flags)
 {

 #endif
         } else {
             /*
@@ -295,28 +366,32 @@
              * the test for whether /dev/sysmouse is usable can be made.
              */
             if (!strcmp(*pdev, DEFAULT_MOUSE_DEV)) {

                 break;
             }
         }
@@ -468,30 +543,78 @@
 
 #if defined(USBMOUSE_SUPPORT)
 
+#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;
 
+static int *
+usbGetReportSizePtr(UsbMsePtr pUsbMse, int32_t rid)
+{
+    int i;
+
+    for (i = 0; i < pUsbMse->nrids; i++) {
+	if (pUsbMse->rids[i].rid == rid)
+	    return (&pUsbMse->rids[i].size);
+    }
+    for (i = 0; i < MAXRIDS; i++) {
+	if (pUsbMse->rids[i].size == 0) {
+	    pUsbMse->rids[i].rid = rid;
+	    pUsbMse->nrids = 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] = {0};
+    Atom axes_labels[3] = { 0, 0, 0 };
+#endif
 
     pInfo = pPointer->public.devicePrivate;
     pMse = pInfo->private;
     pMse->device = pPointer;
     pUsbMse = pMse->mousePriv;
+    for (nacol = 0; nacol < (pUsbMse->nacols - 1); nacol++) {
+	if (pUsbMse->acols[nacol].pInfo == pInfo)
+	    break;
+    }
+    acol = &pUsbMse->acols[nacol];
 
     switch (what) {
     case DEVICE_INIT:
@@ -500,38 +623,96 @@
         for (nbuttons = 0; nbuttons < MSE_MAXBUTTONS; ++nbuttons)
             map[nbuttons + 1] = nbuttons + 1;
 
-        InitPointerDeviceStruct((DevicePtr)pPointer,
-                                map,
-                                min(pMse->buttons, MSE_MAXBUTTONS),
-                                miPointerGetMotionEvents,
-                                pMse->Ctrl,
-                                miPointerGetMotionBufferSize());
+#ifdef HAVE_LABELS
+	btn_labels[0] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_LEFT);
+	btn_labels[1] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_MIDDLE);
+	btn_labels[2] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_RIGHT);
+	axes_labels[0] = XIGetKnownProperty((acol->xmin != acol->xmax)
+	    ? AXIS_LABEL_PROP_ABS_X : AXIS_LABEL_PROP_REL_X);
+	axes_labels[1] = XIGetKnownProperty((acol->xmin != acol->xmax)
+	    ? AXIS_LABEL_PROP_ABS_Y : AXIS_LABEL_PROP_REL_Y);
+	axes_labels[2] = XIGetKnownProperty(AXIS_LABEL_PROP_ABS_PRESSURE);
+#endif
+
+	InitButtonClassDeviceStruct(pPointer, min(pMse->buttons, MSE_MAXBUTTONS),
+#ifdef HAVE_LABELS
+	    btn_labels,
+#endif
+	    map);
+	InitValuatorClassDeviceStruct(pPointer, (acol->pmin != acol->pmax) ? 3 : 2,
+#ifdef HAVE_LABELS
+	    axes_labels,
+#endif
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
+	    miPointerGetMotionEvents,
+#elif GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3
+	    GetMotionHistory,
+#endif
+	    GetMotionHistorySize(),
+	    (acol->xmin != acol->xmax || acol->ymin != acol->ymax) ?
+	     Absolute : Relative);
+	InitPtrFeedbackClassDeviceStruct(pPointer, pMse->Ctrl);
 
         /* X valuator */
-        xf86InitValuatorAxisStruct(pPointer, 0, 0, -1, 1, 0, 1);
+	xf86InitValuatorAxisStruct(pPointer, 0,
+#ifdef HAVE_LABELS
+	    axes_labels[0],
+#endif
+	    (acol->xmin != acol->xmax) ? acol->xmin : -1,
+	    (acol->xmin != acol->xmax) ? acol->xmax : -1,
+	    1, 0, 1
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 12
+	    , (acol->xmin != 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 != acol->ymax) ? acol->ymin : -1,
+	    (acol->ymin != acol->ymax) ? acol->ymax : -1,
+	    1, 0, 1
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 12
+	    , (acol->ymin != acol->ymax) ? Absolute : Relative
+#endif
+	    );
         xf86InitValuatorDefaults(pPointer, 1);
+	/* Pressure valuator */
+	if (acol->pmin != 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) >= 12
+		, Absolute
+#endif
+		);
+	    xf86InitValuatorDefaults(pPointer, 2);
+	}
         xf86MotionHistoryAllocate(pInfo);
         break;
 
     case DEVICE_ON:
-        pInfo->fd = xf86OpenSerial(pInfo->options);
-        if (pInfo->fd == -1)
-            xf86Msg(X_WARNING, "%s: cannot open input device\n", pInfo->name);
-        else {
-            pMse->buffer = XisbNew(pInfo->fd, pUsbMse->packetSize);
-            if (!pMse->buffer) {
-                free(pMse);
-                xf86CloseSerial(pInfo->fd);
-                pInfo->fd = -1;
-            } else {
-                xf86FlushInput(pInfo->fd);
-                if (!xf86InstallSIGIOHandler (pInfo->fd, usbSigioReadInput,
-                                              pInfo))
-                    AddEnabledDevice(pInfo->fd);
-            }
+	if (pUsbMse->opened++ == 0) {
+		pInfo->fd = xf86OpenSerial(pInfo->options);
+		if (pInfo->fd == -1)
+		    xf86Msg(X_WARNING, "%s: cannot open input device\n", pInfo->name);
+		else {
+		    pMse->buffer = XisbNew(pInfo->fd, pUsbMse->packetSize);
+		    if (!pMse->buffer) {
+			free(pMse);
+			xf86CloseSerial(pInfo->fd);
+			pInfo->fd = -1;
+		    } else {
+			xf86FlushInput(pInfo->fd);
+			if (!xf86InstallSIGIOHandler (pInfo->fd, usbSigioReadInput, 
+						      pInfo))
+			    AddEnabledDevice(pInfo->fd);
+		    }
+		}
         }
         pMse->lastButtons = 0;
         pMse->lastMappedButtons = 0;
@@ -553,6 +734,7 @@
             xf86CloseSerial(pInfo->fd);
             pInfo->fd = -1;
         }
+        pUsbMse->opened--;
         pPointer->public.on = FALSE;
         usleep(300000);
         break;
@@ -568,45 +750,154 @@
 {
     MouseDevPtr pMse;
     UsbMsePtr pUsbMse;
-    int buttons = pMse->lastButtons;
-    int dx = 0, dy = 0, dz = 0, dw = 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;
 
     pMse = pInfo->private;
     pUsbMse = pMse->mousePriv;
 
     XisbBlockDuration(pMse->buffer, -1);
+next:
     pBuf = pUsbMse->buffer;
     n = 0;
-    while ((c = XisbRead(pMse->buffer)) >= 0 && n < pUsbMse->packetSize) {
+    if (pUsbMse->iid) {
+	rid = XisbRead(pMse->buffer);
+	if (rid < 0)
+	    return;
+	pBuf[n++] = (unsigned char)rid;
+    } else
+	rid = 0;
+    sizep = usbGetReportSizePtr(pUsbMse, rid);
+    if (sizep == NULL || *sizep == 0) {
+	xf86Msg(X_WARNING, "%s: unknown report ID %d\n", pInfo->name, rid);
+	goto next;
+    }
+    while (n < *sizep && (c = XisbRead(pMse->buffer)) >= 0) {
         pBuf[n++] = (unsigned char)c;
     }
     if (n == 0)
         return;
-    if (n != pUsbMse->packetSize) {
+//    xf86MsgVerb(X_INFO, 3, "pkt: %d %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x\n",
+//	n, pBuf[0], pBuf[1], pBuf[2], pBuf[3], pBuf[4], pBuf[5], pBuf[6], pBuf[7], pBuf[8], pBuf[9]);
+    if (n != *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 != 0) {
-        if (*pBuf++ != pUsbMse->iid)
-            return;
-    }
-    dx = hid_get_data(pBuf, &pUsbMse->loc_x);
-    dy = hid_get_data(pBuf, &pUsbMse->loc_y);
-    dz = hid_get_data(pBuf, &pUsbMse->loc_z);
-    dw = hid_get_data(pBuf, &pUsbMse->loc_w);
-
-    buttons = 0;
-    for (n = 0; n < pMse->buttons; n++) {
-        if (hid_get_data(pBuf, &pUsbMse->loc_btn[n]))
-            buttons |= (1 << UMS_BUT(n));
+    for (nacol = 0; nacol < pUsbMse->nacols; nacol++) {
+	acol = &pUsbMse->acols[nacol];
+	if (acol->pInfo == NULL)
+	    continue;
+	nx = ny = np = upd = 0;
+	buttons = cc = 0;
+	dx = dy = dz = dw = dp = 0;
+	for (nlcol = 0; nlcol < pUsbMse->acols[nacol].nlcols; nlcol++) {
+	    lcol = &acol->lcols[nlcol];
+
+	    if (lcol->loc_valid.usage != 0 && rid == lcol->loc_valid.report_ID &&
+		    hid_get_data(pBuf, &lcol->loc_valid) == 0)
+		continue;
+	    if (lcol->loc_in_range.usage != 0 && rid == lcol->loc_in_range.report_ID)
+		in_range = hid_get_data(pBuf, &lcol->loc_in_range);
+	    else
+		in_range = 1;
+	    if (in_range && lcol->loc_x.usage != 0 && rid == lcol->loc_x.report_ID && nx == 0) {
+		v = hid_get_data(pBuf, &lcol->loc_x);
+		if (acol->xmin != acol->xmax) {
+		    v = xf86ScaleAxis(v, acol->xmax, acol->xmin,
+			lcol->loc_x.logical_maximum, lcol->loc_x.logical_minimum);
+		    if (acol->cxmin != acol->cxmax)
+		        v = xf86ScaleAxis(v, acol->xmax, acol->xmin,
+			    acol->cxmax, acol->cxmin);
+		}
+		dx += v;
+		nx++;
+	    }
+	    if (in_range && lcol->loc_y.usage != 0 && rid == lcol->loc_y.report_ID && ny == 0) {
+		v = hid_get_data(pBuf, &lcol->loc_y);
+		if (acol->xmin != acol->xmax) {
+		    v = xf86ScaleAxis(v, acol->ymax, acol->ymin,
+			lcol->loc_y.logical_maximum, lcol->loc_y.logical_minimum);
+		    if (acol->cymin != acol->cymax)
+		        v = xf86ScaleAxis(v, acol->ymax, acol->ymin,
+			    acol->cymax, acol->cymin);
+		}
+		dy += v;
+		ny++;
+	    }
+	    if (lcol->loc_z.usage != 0 && rid == lcol->loc_z.report_ID) {
+		dz -= hid_get_data(pBuf, &lcol->loc_z);
+		upd = 1;
+	    }
+	    if (lcol->loc_w.usage != 0 && rid == lcol->loc_w.report_ID) {
+		dw += hid_get_data(pBuf, &lcol->loc_w);
+		upd = 1;
+	    }
+	    if (lcol->loc_p.usage != 0 && rid == lcol->loc_p.report_ID && np == 0) {
+		v = hid_get_data(pBuf, &lcol->loc_p);
+		    v = xf86ScaleAxis(v, acol->pmax, acol->pmin,
+			lcol->loc_p.logical_maximum, lcol->loc_p.logical_minimum);
+		    if (acol->cpmin != acol->cpmax)
+		        v = xf86ScaleAxis(v, acol->pmax, acol->pmin,
+			    acol->cpmax, acol->cpmin);
+		dp += v;
+		np++;
+	    }
+
+	    for (n = 0; n < acol->nbuttons; n++) {
+		if (lcol->loc_btn[n].usage != 0 && rid == lcol->loc_btn[n].report_ID) {
+		    if (hid_get_data(pBuf, &lcol->loc_btn[n]))
+			buttons |= (1 << UMS_BUT(n));
+		    upd = 1;
+		}
+	    }
+	}
+	if (acol->loc_cc.usage != 0 && rid == acol->loc_cc.report_ID)
+	    cc = hid_get_data(pBuf, &acol->loc_cc);
+	else
+	    cc = (nx || ny) ? 1 : 0;
+	if (cc > 1)
+	    buttons = (1 << UMS_BUT(1));
+	if (nx != 0 && acol->xmin != acol->xmax)
+	    dx /= nx;
+	if (ny != 0 && acol->ymin != acol->ymax)
+	    dy /= ny;
+	if (np != 0 && acol->pmin != acol->pmax)
+	    dp /= 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 != 0 || ny != 0) {
+	    if (acol->pmin != acol->pmax) {
+		xf86PostMotionEvent(acol->pInfo->dev,
+			    /* is_absolute: */    TRUE,
+			    /* first_valuator: */ 0,
+			    /* num_valuators: */  3,
+			    dx, dy, dp);
+	    } else if (acol->xmin != acol->xmax || acol->ymin != acol->ymax) {
+		xf86PostMotionEvent(acol->pInfo->dev,
+			    /* is_absolute: */    TRUE,
+			    /* first_valuator: */ 0,
+			    /* num_valuators: */  2,
+			    dx, dy);
+	    }
+	}
+	if (upd || (nx != 0) || (ny != 0)) {
+	    ((MouseDevPtr)acol->pInfo->private)->PostEvent(acol->pInfo, buttons,
+		((acol->xmin != acol->xmax) ? dx - acol->px : dx),
+		((acol->ymin != acol->ymax) ? dy - acol->py : dy),
+		dz, dw);
+	}
+	if (nx > 0)
+	    acol->px = dx;
+	if (ny > 0)
+	    acol->py = dy;
     }
-    pMse->PostEvent(pInfo, buttons, dx, dy, dz, dw);
-    return;
+    goto next;
 }
 
 static void
@@ -615,14 +906,17 @@
     usbReadInput ((InputInfoPtr) closure);
 }
 
-/* This function is called when the protocol is "usb". */
 static Bool
-usbPreInit(InputInfoPtr pInfo, const char *protocol, int flags)
+usbInitFirst(InputInfoPtr pInfo)
 {
     MouseDevPtr pMse = 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;
 
     pUsbMse = malloc(sizeof(UsbMseRec));
     if (pUsbMse == NULL) {
@@ -631,12 +925,7 @@
         return FALSE;
     }
 
-    pMse->protocol = 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));
 
     /* Check if the device can be opened. */
     pInfo->fd = xf86OpenSerial(pInfo->options);
@@ -652,19 +941,134 @@
     }
     /* Get USB informations */
     reportDesc = hid_get_report_desc(pInfo->fd);
-    /* Get packet size & iid */
-#ifdef USB_NEW_HID
-    if (ioctl(pInfo->fd, USB_GET_REPORT_ID, &pUsbMse->iid) == -1) {
-            xf86Msg(X_ERROR, "Error ioctl USB_GET_REPORT_ID on %s : %s\n",
-                    pInfo->name, strerror(errno));
-            return FALSE;
-    }
-    pUsbMse->packetSize = hid_report_size(reportDesc, hid_input,
-                                              pUsbMse->iid);
-#else
-    pUsbMse->packetSize = hid_report_size(reportDesc, hid_input,
-                                              &pUsbMse->iid);
-#endif
+    mdepth = 0;
+    pUsbMse->nacols = 0;
+    acol = &pUsbMse->acols[pUsbMse->nacols];
+    lcol = &acol->lcols[acol->nlcols];
+    acolused = 0;
+    lcolused = 0;
+    d = 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 != 0)
+		mdepth++;
+	    else if (h.collection == 1 &&
+		    (h.usage == 0x00010001 || h.usage == 0x00010002 ||
+		     (h.usage >= 0x000d0001 && h.usage <= 0x000d000d))) {
+		mdepth++;
+		if (acolused) {
+		    if (lcolused) {
+			acol->nlcols++;
+			lcolused = 0;
+		    }
+		    pUsbMse->nacols++;
+		    acolused = 0;
+		    acol = &pUsbMse->acols[pUsbMse->nacols];
+		    lcol = &acol->lcols[acol->nlcols];
+		}
+	    }
+	    if (lcolused && (h.collection == 0 ||
+		    h.collection == 2 || h.collection == 3)) {
+		acol->nlcols++;
+		lcolused = 0;
+		lcol = &acol->lcols[acol->nlcols];
+	    }
+	    break;
+	case hid_endcollection:
+	    if (mdepth != 0)
+		mdepth--;
+	    break;
+	case hid_input:
+	    if (h.report_ID != 0)
+		pUsbMse->iid = 1;
+	    rsize = pUsbMse->iid +
+		(h.pos + (h.report_size * h.report_count) + 7) / 8;
+	    if ((rsizep = usbGetReportSizePtr(pUsbMse, h.report_ID)) != NULL)
+		*rsizep = max(*rsizep, rsize);
+	    pUsbMse->packetSize = max(pUsbMse->packetSize, rsize);
+	    if (mdepth == 0)
+		break;
+	    used = 1;
+	    if (h.usage == 0x00010030) { /* X */
+		lcol->loc_x = h;
+		if ((h.flags & 0x04) == 0) {
+		    if (acol->xmin == acol->xmax) {
+			acol->xmin = h.logical_minimum;
+			acol->xmax = h.logical_maximum;
+		    } else {
+			acol->xmin = min(acol->xmin, h.logical_minimum);
+			acol->xmax = max(acol->xmax, h.logical_maximum);
+		    }
+		}
+	    } else if (h.usage == 0x00010031) { /* Y */
+		lcol->loc_y = h;
+		if ((h.flags & 0x04) == 0) {
+		    if (acol->ymin == acol->ymax) {
+			acol->ymin = h.logical_minimum;
+			acol->ymax = h.logical_maximum;
+		    } else {
+			acol->ymin = min(acol->ymin, h.logical_minimum);
+			acol->ymax = max(acol->ymax, h.logical_maximum);
+		    }
+		}
+	    } else if (h.usage == 0x00010038) { /* Z */
+		lcol->loc_z = h;
+		acol->hasZ = 1;
+	    } else if (h.usage == 0x000c0238) { /* W */
+		lcol->loc_w = h;
+		acol->hasW = 1;
+	    } else if (h.usage == 0x000d0030) { /* Press */
+		lcol->loc_p = h;
+		if ((h.flags & 0x04) == 0) {
+		    if (acol->pmin == acol->pmax) {
+			acol->pmin = h.logical_minimum;
+			acol->pmax = h.logical_maximum;
+		    } else {
+			acol->pmin = min(acol->pmin, h.logical_minimum);
+			acol->pmax = max(acol->pmax, h.logical_maximum);
+		    }
+		}
+	    } else if (h.usage == 0x000d0032) /* In Range */
+		lcol->loc_in_range = h;
+	    else if (h.usage == 0x000d0047) /* Valid */
+		lcol->loc_valid = h;
+	    else if (h.usage > 0x00090000 &&
+		h.usage <= 0x00090000 + MSE_MAXBUTTONS) { /* Buttons */
+		    lcol->loc_btn[(h.usage & 0xffff) - 1] = h;
+		    acol->nbuttons = max(acol->nbuttons, h.usage & 0xffff);
+	    } else if (h.usage == 0x000d0042) { /* Tip Switch */
+		lcol->loc_btn[0] = h;
+		acol->nbuttons = max(acol->nbuttons, 1);
+	    } else if (h.usage == 0x000d0044) { /* Barrel Switch */
+		lcol->loc_btn[1] = h;
+		acol->nbuttons = max(acol->nbuttons, 2);
+	    } else if (h.usage == 0x000d0045) { /* Eraser */
+		lcol->loc_btn[3] = h;
+		acol->nbuttons = max(acol->nbuttons, 4);
+	    } else if (h.usage == 0x000d0046) { /* Tablet Pick */
+		lcol->loc_btn[2] = h;
+		acol->nbuttons = max(acol->nbuttons, 3);
+	    } else if (h.usage == 0x000d0054) /* Contact Count */
+		acol->loc_cc = h;
+	    else
+		used = 0;
+	    lcolused += used;
+	    acolused += 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 <= 8) {
         pUsbMse->buffer = pMse->protoBuf;
@@ -674,56 +1078,129 @@
     if (pUsbMse->buffer == 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_WHEEL),
-                   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_WHEEL),
-                   hid_input, &pUsbMse->loc_z) < 0) {
-    }
-#endif
-    /* Probe for number of buttons */
-    for (i = 1; i <= 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 = i-1;
 
     xf86CloseSerial(pInfo->fd);
     pInfo->fd = -1;
 
     /* Private structure */
     pMse->mousePriv = 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 = pInfo->private;
+    UsbMsePtr pUsbMse;
+    struct UsbMseAcol *acol;
+    char *str;
+    int i, colopt;
+
+    pMse->protocol = 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 = xf86FirstLocalDevice(); pMatch != NULL; pMatch = pMatch->next) {
+	if ((pInfo != pMatch) && strstr(pMatch->drv->driverName, "mouse")) {
+	    char *dev1, *dev2;
+
+	    dev1 = xf86SetStrOption(pInfo->options, "Device", NULL);
+	    dev2 = xf86SetStrOption(pMatch->options, "Device", NULL);
+	    if (strcmp(dev1, dev2) == 0) {
+		free(dev1);
+		free(dev2);
+		break;
+	    }
+	    free(dev1);
+	    free(dev2);
+	}
+    }
+    if (pMatch == NULL) {
+	xf86Msg(X_DEFAULT, "%s: Opening new HID device\n", pInfo->name);
+	if (!usbInitFirst(pInfo)) {
+	    free(pMse);
+	    return FALSE;
+	}
+    } else {
+	pMse->mousePriv = ((MouseDevPtr)pMatch->private)->mousePriv;
+	xf86Msg(X_DEFAULT, "%s: Attaching to already opened HID device\n",
+	    pInfo->name);
+    }
+    pUsbMse = pMse->mousePriv;
+
+    /* Attach to collection, respecting "Collection" option. */
+    colopt = xf86SetIntOption(pInfo->options, "Collection", 0);
+    for (i = 0; i < pUsbMse->nacols; i++) {
+	if (pUsbMse->acols[i].pInfo == NULL &&
+		(colopt == 0 || i == colopt - 1)) {
+	    pUsbMse->acols[i].pInfo = pInfo;
+	    break;
+	}
+    }
+    xf86Msg(colopt == 0 ? X_DEFAULT : X_CONFIG,
+	"%s: Collection: %d\n", pInfo->name,
+	i == pUsbMse->nacols ? colopt : i + 1);
+    if (i == pUsbMse->nacols) {
+	xf86Msg(X_ERROR,
+	    "%s: Application collection not found or already handled\n",
+	    pInfo->name);
+	free(pMse);
+	return FALSE;
+    }
+
+    acol = &pUsbMse->acols[i];
+    pMse->buttons = acol->nbuttons;
+    if (pMse->buttons == 2)
+	pMse->buttons = 3;
+    if (acol->xmin != acol->xmax || acol->ymin != acol->ymax)
+	pMse->disableXY = TRUE;
+    pMse->hasZ = acol->hasZ;
+    pMse->hasW = acol->hasW;
 
     /* Process common mouse options (like Emulate3Buttons, etc). */
     pMse->CommonOptions(pInfo);
 
+    /* Process "Calibration" option. */
+    str = xf86CheckStrOption(pInfo->options, "Calibration", NULL);
+    if (str != NULL && (acol->xmin != acol->xmax || acol->ymin != acol->ymax)) {
+	int j, xmin, xmax, ymin, ymax, pmin, pmax;
+
+	j = sscanf(str, "%d %d %d %d %d %d", &xmin, &xmax, &ymin, &ymax, &pmin, &pmax);
+	if (j == 4) {
+	    xf86Msg(X_CONFIG, "%s: Calibration: %d %d %d %d\n",
+		pInfo->name, xmin, xmax, ymin, ymax);
+	    acol->cxmin = xmin;
+	    acol->cxmax = xmax;
+	    acol->cymin = ymin;
+	    acol->cymax = ymax;
+	} else if (j == 6) {
+	    xf86Msg(X_CONFIG, "%s: Calibration: %d %d %d %d %d %d\n",
+		pInfo->name, xmin, xmax, ymin, ymax, pmin, pmax);
+	    acol->cxmin = xmin;
+	    acol->cxmax = xmax;
+	    acol->cymin = ymin;
+	    acol->cymax = ymax;
+	    acol->cpmin = pmin;
+	    acol->cpmax = pmax;
+	} else
+	    xf86Msg(X_WARNING, "%s: Calibration: Invalid arguments\n",
+		pInfo->name);
+	free(str);
+    } else if (acol->xmin != acol->xmax || acol->ymin != 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 = usbMouseProc;
     pInfo->read_input = usbReadInput;
@@ -766,7 +1243,9 @@
     p->CheckProtocol = CheckProtocol;
 #if (defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)) && defined(MOUSE_PROTO_SYSMOUSE)
     p->SetupAuto = SetupAuto;




--- 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 @@
 
     pMse = pInfo->private;

 
     protocol = MousePickProtocol(pInfo, device, protocol, &protocolID);
 
@@ -2136,7 +2147,7 @@
 
     if (pMse->emulateWheel) {
         /* Emulate wheel button handling */

             wheelButtonMask = 0;
         else
             wheelButtonMask = 1 << (pMse->wheelButton - 1);
@@ -2220,6 +2231,9 @@
                         }
                     }
                 }

             }
 
             /* Absorb the mouse movement while the wheel button is pressed. */
@@ -2237,7 +2251,7 @@
     if (pMse->emulate3ButtonsSoft && pMse->emulate3Pending && (dx || dy))
         buttonTimer(pInfo);
 

         xf86PostMotionEvent(pInfo->dev, 0, 0, 2, dx, dy);
 
     if (change) {
@@ -2349,12 +2363,10 @@
                int dx, int dy, int dz, int dw)
 {
     MouseDevPtr pMse;
-    mousePrivPtr mousepriv;
     int zbutton = 0, wbutton = 0, zbuttoncount = 0, wbuttoncount = 0;
     int i, b, buttons = 0;
 
     pMse = pInfo->private;
-    mousepriv = (mousePrivPtr)pMse->mousePriv;
 
     if (pMse->protocolID == PROT_MMHIT)
         b = reverseBits(hitachMap, truebuttons);
@@ -2447,11 +2459,11 @@
 
     /* Accumulate the scaled dx, dy in the private variables
        fracdx,fracdy and return the integer number part */
-    if (mousepriv) {





CONFLICTS=	synaptics-[0-9]*

OPTIONS_DEFINE=	HAL
OPTIONS_DEFAULT=HAL

.include <bsd.port.options.mk>

USES=		pathfix
USE_XORG=	x11 xtst
XORG_CAT=	driver

.if ${PORT_OPTIONS:MHAL}
PLIST_SUB+=	HAL=""
LIB_DEPENDS+=	hal.1:${PORTSDIR}/sysutils/hal
.else
PLIST_SUB+=	HAL="@comment "
.endif

MAN1=		syndaemon.1 \
		synclient.1
MAN4=		synaptics.4x

EXTRA_PATCHES+=	${PATCHDIR}/extra-Makefile.in
.endif

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 <bsd.port.mk>




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

Lines 1-7 Link Here

(-)x11-drivers/xf86-video-ati/Makefile (-2 / +13 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= xf86-video-ati	3	PORTNAME= xf86-video-ati
4	PORTVERSION= 6.14.6	4	PORTVERSION= ${ATI_VERSION}
5	CATEGORIES= x11-drivers	5	CATEGORIES= x11-drivers
6		6
7	MAINTAINER= x11@FreeBSD.org	7	MAINTAINER= x11@FreeBSD.org
Lines 12-17 Link Here
12	USE_XORG= xf86driproto xineramaproto xf86miscproto glproto	12	USE_XORG= xf86driproto xineramaproto xf86miscproto glproto
13	MAN4= ati.4x radeon.4x	13	MAN4= ati.4x radeon.4x
14		14
		15	.include <bsd.port.pre.mk>
		16
		17	.if ${OSVERSION} < 1000051
		18	ATI_VERSION= 6.14.6
15	CONFIGURE_ARGS+=--disable-kms	19	CONFIGURE_ARGS+=--disable-kms
		20	PLIST_SUB+= OLD=""
		21	.else
		22	ATI_VERSION= 7.2.0
		23	CONFIGURE_ARGS+=--disable-udev
		24	EXTRA_PATCHES+= ${FILESDIR}/extra-src__radeon_kms.c
		25	PLIST_SUB+= OLD="@comment "
		26	.endif
16		27
17	.include <bsd.port.mk>	28	.include <bsd.port.post.mk>

Lines 1-2 Link Here

(-)x11-drivers/xf86-video-ati/distinfo (+2 lines)
1	SHA256 (xorg/driver/xf86-video-ati-6.14.6.tar.bz2) = aa5286b3e4f0187d7df14785c06dd800255d9405205dbf061da5d77df86bec36	1	SHA256 (xorg/driver/xf86-video-ati-6.14.6.tar.bz2) = aa5286b3e4f0187d7df14785c06dd800255d9405205dbf061da5d77df86bec36
2	SIZE (xorg/driver/xf86-video-ati-6.14.6.tar.bz2) = 1139495	2	SIZE (xorg/driver/xf86-video-ati-6.14.6.tar.bz2) = 1139495
		3	SHA256 (xorg/driver/xf86-video-ati-7.2.0.tar.bz2) = f30f5efdc8d7d18d06eda7ef2f91a8b7290f1cfbf6ff26362cd47ab8969daec4
		4	SIZE (xorg/driver/xf86-video-ati-7.2.0.tar.bz2) = 824613




--- 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 = NULL;
 
 	if (xorg_list_is_empty(&screen->pixmap_dirty_list))
 		return;
@@ -606,7 +606,7 @@
 		      dev->domain, dev->bus, dev->dev, dev->func);
 #endif
 
-    info->dri2.drm_fd = drmOpen("radeon", busid);
+    info->dri2.drm_fd = drmOpen("radeonkms", busid);
     if (info->dri2.drm_fd == -1) {
 
 	xf86DrvMsg(pScrn->scrnIndex, X_ERROR,

Line 0 Link Here

(-)x11-drivers/xf86-video-ati/files/patch-src__radeon_dri2.c (+11 lines)
	1	--- src/radeon_dri2.c.orig 2013-02-22 19:31:34.000000000 +0000
	2	+++ src/radeon_dri2.c 2013-02-22 19:31:47.000000000 +0000
	3	@@ -578,7 +578,7 @@
	4	radeon_dri2_client_state_changed(CallbackListPtr *ClientStateCallback, pointer data, pointer calldata)
	5	{
	6	DRI2ClientEventsPtr pClientEventsPriv;
	7	- DRI2FrameEventPtr ref;
	8	+ DRI2FrameEventPtr ref = NULL;
	9	NewClientInfoRec *clientinfo = calldata;
	10	ClientPtr pClient = clientinfo->client;
	11	pClientEventsPriv = GetDRI2ClientEvents(pClient);




lib/xorg/modules/drivers/ati_drv.so
lib/xorg/modules/drivers/radeon_drv.la
lib/xorg/modules/drivers/radeon_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
%%OLD%%@dirrmtry lib/xorg/modules/multimedia
@dirrmtry lib/xorg/modules
@dirrmtry lib/xorg




.include <bsd.port.options.mk>

.if defined(WITH_NEW_XORG)
INTEL_VERSION=	2.21.15
INTEL_REVISION=	0
CONFIGURE_ENV+=	xorg_cv_cc_flag__Wno_maybe_uninitialized=no
CONFIGURE_ARGS+=	--enable-sna
MAKE_JOBS_UNSAFE=yes
PLIST_SUB+=	OLD="@comment "
EXTRA_PATCHES+=	${PATCHDIR}/extra-src__sna__sna_threads.c \
		${PATCHDIR}/extra-src_sna_compiler.h \
		${PATCHDIR}/extra-src_sna_kgem.c \
		${PATCHDIR}/extra-clang \
		${PATCHDIR}/extra-i915kms
LIB_DEPENDS+=	xcb-util:${PORTSDIR}/x11/xcb-util
.else
INTEL_VERSION=	2.7.1
INTEL_REVISION=	5
PLIST_SUB+=	OLD=""

EXTRA_PATCHES+=	${PATCHDIR}/extra-src_ch7017_ch7017.c \

Lines 1-4 Link Here

(-)x11-drivers/xf86-video-intel/distinfo (-2 / +2 lines)
1	SHA256 (xorg/driver/xf86-video-intel-2.7.1.tar.bz2) = 255c0d54249cc0132f743254a43c21fac695fab2139c8ed96a07cf3c628e5f42	1	SHA256 (xorg/driver/xf86-video-intel-2.7.1.tar.bz2) = 255c0d54249cc0132f743254a43c21fac695fab2139c8ed96a07cf3c628e5f42
2	SIZE (xorg/driver/xf86-video-intel-2.7.1.tar.bz2) = 780625	2	SIZE (xorg/driver/xf86-video-intel-2.7.1.tar.bz2) = 780625
3	SHA256 (xorg/driver/xf86-video-intel-2.21.9.tar.bz2) = 1359cbc9e494a284faa52d1db83e7388cb8ab590b660e29e78e6e7f5ee7ff189	3	SHA256 (xorg/driver/xf86-video-intel-2.21.15.tar.bz2) = 7d5a140f82a72fd1cbc8a664d66c3d4eca47ee240ca4927b8a98d7af6f65d6fc
4	SIZE (xorg/driver/xf86-video-intel-2.21.9.tar.bz2) = 1735037	4	SIZE (xorg/driver/xf86-video-intel-2.21.15.tar.bz2) = 1977431




--- 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 @@
 static drmModeEncoderPtr
 intel_get_kencoder(struct intel_mode *mode, int num)
 {
 	unsigned max = __get_cpuid_max(BASIC_CPUID, NULL);
 	unsigned int eax, ebx, ecx, edx;
+	eax = ebx = ecx = edx = 0;
 	unsigned features = 0;
 	unsigned extra = 0;
 
--- 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
+++ 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 = intel_get_screen_private(scrn);
-	struct intel_pixmap *priv;
+	struct intel_pixmap *priv = NULL;
 
 	list_for_each_entry(priv, &intel->batch_pixmaps, batch)
 		priv->dirty = 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
@@ -410,7 +410,7 @@
 	int n, nboxes;
 	BoxPtr boxes, free_boxes = NULL;

 
 	assert(damage->mode != DAMAGE_ALL);
 	assert(damage->dirty);
@@ -1709,7 +1709,7 @@
 {
 	int n, nboxes;
 	BoxPtr boxes;

 
 	RegionCopy(r, &damage->region);
 	if (!damage->dirty)
--- 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 = intel_get_screen_private(scrn);
-	struct intel_pixmap *priv;
+	struct intel_pixmap *priv = NULL;
 
 	list_for_each_entry(priv, &intel->batch_pixmaps, batch)
 		priv->dirty = 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 = NULL;
 	int id = mode->mode_res->encoders[num];
 
 	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 @@
 
 	if (uxa_screen->info->flags & UXA_USE_GLAMOR) {




--- 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);
 
 		ret = drmCheckModesettingSupported(id);
-		if (ret) {
-			if (xf86LoadKernelModule("i915"))
+		if (ret || 1) {
+			if (xf86LoadKernelModule("i915kms"))
 				ret = drmCheckModesettingSupported(id);
 			if (ret)
 				return -1;




--- 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
 




--- 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 @@
  *
  */
 
+#define _WITH_GETLINE
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -1890,7 +1891,8 @@
 			int mb;
 			if (sscanf(line, "cache size : %d KB", &mb) == 1) {
 				/* Paranoid check against gargantuan caches */
@@ -1666,7 +1670,8 @@
 static struct kgem_bo *
 search_snoop_cache(struct kgem *kgem, unsigned int num_pages, unsigned flags)
 {

 
 	DBG(("%s: num_pages=%d, flags=%x\n", __FUNCTION__, num_pages, flags));
 
@@ -2104,7 +2106,8 @@
 
 static bool kgem_retire__flushing(struct kgem *kgem)
 {

 	bool retired = false;
 
 	list_for_each_entry_safe(bo, next, &kgem->flushing, request) {
@@ -2309,7 +2312,8 @@
 static void kgem_commit(struct kgem *kgem)
 {
 	struct kgem_request *rq = kgem->next_request;

 
 	list_for_each_entry_safe(bo, next, &rq->buffers, request) {
 		assert(next->request.prev == &bo->request);
@@ -2390,7 +2394,8 @@
 
 static void kgem_finish_buffers(struct kgem *kgem)
 {

+	struct kgem_buffer *next;
 
 	list_for_each_entry_safe(bo, next, &kgem->batch_buffers, base.list) {
 		DBG(("%s: buffer handle=%d, used=%d, exec?=%d, write=%d, mmapped=%s\n",
@@ -3252,7 +3257,8 @@
 static struct kgem_bo *
 search_linear_cache(struct kgem *kgem, unsigned int num_pages, unsigned flags)
 {

 	bool use_active = (flags & CREATE_INACTIVE) == 0;
 	struct list *cache;
 
@@ -3855,7 +3861,7 @@
 			       uint32_t flags)
 {
 	struct list *cache;

 	uint32_t pitch, tiled_height, size;
 	uint32_t handle;
 	int i, bucket, retry;
@@ -5302,7 +5308,7 @@
 void kgem_clear_dirty(struct kgem *kgem)
 {
 	struct list * const buffers = &kgem->next_request->buffers;

+	struct kgem_bo *bo = NULL;
 
 	list_for_each_entry(bo, buffers, request) {
 		if (!bo->gpu_dirty)
@@ -5578,7 +5584,7 @@
 				   uint32_t size, uint32_t flags,
 				   void **ret)
 {

Lines 10-16 Link Here

(-)x11-drivers/xorg-drivers/Makefile (-1 / +1 lines)
10	MAINTAINER= x11@FreeBSD.org	10	MAINTAINER= x11@FreeBSD.org
11	COMMENT= X.org drivers meta-port	11	COMMENT= X.org drivers meta-port
12		12
13	.MAKE.FreeBSD_UL= yes	13	.MAKE.FreeBSD_UL= yes
14		14
15	VIDEODIR= ${PREFIX}/lib/xorg/modules/drivers	15	VIDEODIR= ${PREFIX}/lib/xorg/modules/drivers
16	INPUTDIR= ${PREFIX}/lib/xorg/modules/input	16	INPUTDIR= ${PREFIX}/lib/xorg/modules/input

Lines 9-15 Link Here

(-)x11-fonts/xfs/Makefile (-1 / +1 lines)
9	COMMENT= X.Org font server	9	COMMENT= X.Org font server
10		10
11	XORG_CAT= app	11	XORG_CAT= app
12	USE_GMAKE= yes	12	USES= gmake
13	USE_XORG= libfs xfont xtrans	13	USE_XORG= libfs xfont xtrans
14	USE_RC_SUBR= xfs	14	USE_RC_SUBR= xfs
15	CONFIGURE_ARGS= --without-xmlto --without-fop	15	CONFIGURE_ARGS= --without-xmlto --without-fop

Lines 1-7 Link Here

(-)x11-servers/xephyr/Makefile (-1 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= xephyr	3	PORTNAME= xephyr
4	PORTREVISION= 0
5		4
6	COMMENT= X server from X.Org based on kdrive	5	COMMENT= X server from X.Org based on kdrive
7		6

Lines 2-8 Link Here

(-)x11-servers/xorg-dmx/Makefile (-1 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= xorg-dmx	4	PORTNAME= xorg-dmx
5	PORTREVISION= 0
6		5
7	COMMENT= Distributed Multihead X from X.Org	6	COMMENT= Distributed Multihead X from X.Org
8		7

Lines 23-28 Link Here

(-)x11-servers/xorg-nestserver/Makefile (+2 lines)
23	PLIST_FILES= bin/Xnest	23	PLIST_FILES= bin/Xnest
24	MAN1= Xnest.1	24	MAN1= Xnest.1
25		25
		26	.include <bsd.port.options.mk>
		27
26	do-install:	28	do-install:
27	${INSTALL_PROGRAM} ${WRKSRC}/hw/xnest/Xnest ${PREFIX}/bin/	29	${INSTALL_PROGRAM} ${WRKSRC}/hw/xnest/Xnest ${PREFIX}/bin/
28	.if defined(WITH_NEW_XORG)	30	.if defined(WITH_NEW_XORG)




XORG_CAT=	xserver
SLAVE_PORT?=	no

OPTIONS_DEFINE=	AIGLX SUID
OPTIONS_RADIO=	CONF
OPTIONS_RADIO_CONF= HAL DEVD
AIGLX_DESC=	Compile with Accelerated Indirect GLX support
SUID_DESC=	Install the Xorg server with setuid bit set
HAL_DESC=	Compile with HAL config support
DEVD_DESC=	Use devd for autoconfiguration of input devices
OPTIONS_DEFAULT=AIGLX SUID DEVD

OPTIONS_EXCLUDE_sparc64=	HAL

.include <bsd.port.options.mk>

.if defined(WITH_NEW_XORG)
XORG_VERSION=	1.12.4
XORG_REVISION=	2
PLIST_SUB+=	OLD="@comment " NEW=""
EXTRA_PATCHES+=	${FILESDIR}/extra-clang \
		${FILESDIR}/extra-configure
.else
XORG_VERSION=	1.7.7
XORG_REVISION=	9
PLIST_SUB+=	OLD="" NEW="@comment "
EXTRA_PATCHES+=	${FILESDIR}/extra-Xext-xace.c \
		${FILESDIR}/extra-Xserver-hw-xfree86-os-support-bsd-sparc64_video.c \

		${FILESDIR}/extra-Xserver-hw-xfree86-common-xf86Config.c
.endif

USES=		perl5
USE_PERL5=	build
USE_BZIP2=	yes
USES=		gmake
USE_GL=		gl
USE_XORG?=	xf86driproto glproto xdmcp x11 xkbfile xxf86misc xxf86vm xaw7 \
		xmu xt xpm xext randrproto renderproto fixesproto damageproto \


MAKE_JOBS_UNSAFE=	yes
USE_OPENSSL=	yes
USE_PERL5_BUILD=yes
CONFIGURE_ARGS?=--disable-dmx --disable-xvfb --disable-xnest \
		--without-xmlto --disable-docs --disable-devel-docs \
		--localstatedir=/var --without-dtrace --disable-xephyr \

PLIST=		${.CURDIR}/pkg-plist
.endif

OPTIONS_DEFINE=	AIGLX SUID HAL
AIGLX_DESC=	Compile with Accelerated Indirect GLX support
SUID_DESC=	Install the Xorg server with setuid bit set
HAL_DESC=	Compile with HAL config support
OPTIONS_DEFAULT=	AIGLX SUID HAL

OPTIONS_EXCLUDE_sparc64=	HAL

.include <bsd.port.pre.mk>

.if defined(WITH_OPENSSL_BASE)

CONFIGURE_ARGS+=	--enable-config-hal=no
.endif

.if ${PORT_OPTIONS:MDEVD}
EXTRA_PATCHES+=		extra-config_devd.c
.endif

.if ${PORT_OPTIONS:MAIGLX}
CONFIGURE_ARGS+=	--enable-aiglx=yes
.else

	@${REINPLACE_CMD} -e 's|@GLX_TRUE@GLXMODS =|@GLX_BOGUS@GLXMODS =|g' \
		-e 's|^LTLIBRARIES = |LTLIBRARIES = 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(void);" \
		>> ${WRKSRC}/config/config-backends.h
.endif
 
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

.if ${SLAVE_PORT} == "no"
pre-su-install:




--- /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 © 2012 Baptiste Daroussin
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * 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 of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Author: Baptiste Daroussin <bapt@FreeBSD.org>
+ */
+
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/sysctl.h>
+#include <sys/un.h>
+
+#include <ctype.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <stdarg.h>
+#include <stdbool.h>
+#include <unistd.h>
+
+#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 = -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[] = {
+	{ "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 == '\0')
+        return;
+
+    for (; *options; options = &(*options)->next)
+        ;
+    *options = calloc(sizeof(**options), 1);
+    if (!*options) /* Yeesh. */
+        return;
+    (*options)->key = xstrdup(key);
+    (*options)->value = xstrdup(value);
+    (*options)->next = 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 = inputInfo.devices; dev; dev = dev->next)
+        if (dev->config_info && (strcmp(dev->config_info, config_info) == 0))
+            return true;
+
+    for (dev = inputInfo.off_devices; dev; dev = dev->next)
+        if (dev->config_info && (strcmp(dev->config_info, config_info) == 0))
+            return true;
+
+    return false;
+}
+
+#endif
+
+static bool
+sysctl_exists(const char *format, ...)
+{
+	va_list args;
+	char *name = NULL;
+	size_t len;
+	int ret;
+
+	if (format == NULL)
+		return false;
+
+	va_start(args, format);
+	vasprintf(&name, format, args);
+	va_end(args);
+
+	ret = sysctlbyname(name, NULL, &len, NULL, 0);
+
+	if (ret == -1)
+		len = 0;
+
+	free(name);
+	return (len > 0);
+}
+
+static char *
+sysctl_get_str(const char *format, ...)
+{
+	va_list args;
+	char *name = NULL;
+	char *dest = NULL;
+	size_t len;
+
+	if (format == NULL)
+		return NULL;
+
+	va_start(args, format);
+	vasprintf(&name, format, args);
+	va_end(args);
+
+	if (sysctlbyname(name, NULL, &len, NULL, 0) == 0) {
+		dest = malloc(len + 1);
+		if (sysctlbyname(name, dest, &len, NULL, 0) == 0)
+			dest[len] = '\0';
+		else {
+			free(dest);
+			dest = NULL;
+		}
+	}
+
+	free(name);
+	return dest;
+}
+
+static void
+device_added(char *line)
+{
+    char *walk;
+    char *path;
+    char *vendor;
+    char *product = NULL;
+    char *config_info = NULL;
+    InputOption *options = NULL;
+#if XORG_VERSION_CURRENT > 10800000
+    InputAttributes attrs = {};
+#else
+    InputOption *tmpo;
+#endif
+    DeviceIntPtr dev = NULL;
+    int i, rc;
+
+    walk = strchr(line, ' ');
+    if (walk != NULL)
+        walk[0] = '\0';
+
+    for (i = 0; hw_types[i].driver != NULL; i++) {
+        if (strncmp(line, hw_types[i].driver,
+                    strlen(hw_types[i].driver)) == 0 &&
+            isnumber(*(line + strlen(hw_types[i].driver)))) {
+#if XORG_VERSION_CURRENT > 10800000
+            attrs.flags |= hw_types[i].flag;
+#endif
+            break;
+        }
+    }
+    if (hw_types[i].driver == NULL) {
+        LogMessageVerb(X_INFO, 10, "config/devd: ignoring device %s\n", line);
+        return;
+    }
+
+#if XORG_VERSION_CURRENT < 10800000
+    if (hw_types[i].xdriver == NULL) {
+        LogMessageVerb(X_INFO, 10, "config/devd: ignoring device %s\n", line);
+        return;
+    }
+#endif
+    if (asprintf(&path, "/dev/%s", line) == -1)
+        return;
+
+#if XORG_VERSION_CURRENT < 10800000
+    options = calloc(sizeof(*options), 1);
+    if (!options)
+        return;
+
+    add_option(&options, "_source", "server/devd");
+#else
+    options =  input_option_new(NULL, "_source", "server/devd");
+    if (!options)
+        return;
+#endif
+
+    vendor = sysctl_get_str("dev.%s.%s.%%desc", hw_types[i].driver, line + strlen(hw_types[i].driver));
+    if (vendor == NULL) {
+#if XORG_VERSION_CURRENT > 10800000
+        attrs.vendor = strdup("(unnamed)");
+#endif
+    } else {
+        if ((product = strchr(vendor, ' ')) != NULL) {
+            product[0] = '\0';
+            product++;
+        }
+#if XORG_VERSION_CURRENT > 10800000
+        attrs.vendor = strdup(vendor);
+#endif
+        if (product != NULL && (walk = strchr(product, ',')) != NULL)
+            walk[0] = '\0';
+#if XORG_VERSION_CURRENT > 10800000
+        attrs.product = strdup(product != NULL ? product : "(unnamed)");
+	options = input_option_new(options, "name", product != NULL ? product : "(unnamed)");
+#else
+        add_option(&options, "name", product != NULL ? product : "(unnamed)");
+#endif
+    }
+#if XORG_VERSION_CURRENT > 10800000
+    attrs.usb_id = NULL;
+    options = input_option_new(options, "path", path);
+    options = 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) == -1) {
+        config_info = NULL;
+        goto unwind;
+    }
+
+    if (device_is_duplicate(config_info)) {
+        LogMessage(X_WARNING, "config/devd: device %s already added. "
+                              "Ignoring.\n", product != NULL ? product : "(unnamed)");
+        goto unwind;
+    }
+
+#if XORG_VERSION_CURRENT < 10800000
+    add_option(&options, "config_info", config_info);
+#else
+    options = input_option_new(options, "config_info", config_info);
+#endif
+    LogMessage(X_INFO, "config/devd: Adding input device %s (%s)\n",
+               product != NULL ? product : "(unnamed)", path);
+
+#if XORG_VERSION_CURRENT > 10800000
+    rc = NewInputDeviceRequest(options, &attrs, &dev);
+#else
+    rc = NewInputDeviceRequest(options, &dev);
+#endif
+
+    if (rc != Success)
+        goto unwind;
+
+ unwind:
+    free(config_info);
+#if XORG_VERSION_CURRENT < 10800000
+    while ((tmpo = options)) {
+        options = tmpo->next;
+        free(tmpo->key);        /* NULL if dev != NULL */
+        free(tmpo->value);      /* NULL if dev != 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 = strchr(line, ' ');
+    if (walk != NULL)
+        walk[0] = '\0';
+
+    if (asprintf(&value, "devd:%s", line) == -1)
+        return;
+
+#if XORG_VERSION_CURRENT > 10800000
+    remove_devices("dev", value);
+#else
+    for (dev = inputInfo.devices; dev; dev = next) {
+        next = dev->next;
+        if (dev->config_info && strcmp(dev->config_info, value) == 0)
+            remove_device(dev);
+    }
+    for (dev = inputInfo.off_devices; dev; dev = next) {
+	next = dev->next;
+        if (dev->config_info && strcmp(dev->config_info, value) == 0)
+            remove_device(dev);
+    }
+#endif
+
+    free(value);
+}
+
+static ssize_t
+socket_getline(int fd, char **out)
+{
+	char *buf;
+	ssize_t ret, cap, sz = 0;
+	char c;
+
+	cap = 1024;
+	buf = malloc(cap * sizeof(char));
+	if (!buf)
+		return -1;
+
+	for (;;) {
+		ret = read(sock_devd, &c, 1);
+		if (ret < 1) {
+			free(buf);
+			return -1;
+		}
+
+		if (c == '\n')
+			break;
+
+		if (sz + 1 >= cap) {
+			cap *= 2;
+			buf = realloc(buf, cap *sizeof(char));
+		}
+		buf[sz] = c;
+		sz++;
+	}
+
+	buf[sz] = '\0';
+	if (sz > 0)
+		*out = 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 = 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 = 0; hw_types[i].driver != NULL; i++) {
+        for (j = 0; sysctl_exists("dev.%s.%i.%%desc", hw_types[i].driver, j); j++) {
+            snprintf(devicename, 1024, "%s%i", hw_types[i].driver, j);
+            device_added(devicename);
+        }
+
+    }
+    sock_devd = socket(AF_UNIX, SOCK_STREAM, 0);
+    if (sock_devd < 0) {
+        ErrorF("config/devd: Fail opening stream socket");
+        return 0;
+    }
+
+    devd.sun_family = AF_UNIX;
+    strlcpy(devd.sun_path, DEVD_SOCK_PATH, sizeof(devd.sun_path));
+
+    if (connect(sock_devd, (struct sockaddr *) &devd, sizeof(struct sockaddr_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);
+}

Line 0 Link Here

(-)x11-servers/xorg-server/files/extra-configure (+11 lines)
	1	--- configure.orig 2013-09-07 22:11:27.210621324 +0200
	2	+++ configure 2013-09-07 22:11:52.912624338 +0200
	3	@@ -22839,7 +22839,7 @@
	4	}
	5	_ACEOF
	6	if ac_fn_c_try_compile "$LINENO"; then :
	7	- ac_cv_tls=$kw
	8	+ ac_cv_tls=$kw; break ;
	9	fi
	10	rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
	11	done





PORTNAME=	murrine
PORTVERSION=	0.98.2
PORTREVISION=	1
CATEGORIES=	x11-themes
MASTER_SITES=	GNOME
PKGNAMEPREFIX=	gtk-

MAINTAINER=	pneumann@gmail.com
COMMENT=	Murrine GTK+ 2.x cairo based engine

LIB_DEPENDS=	pixman-1:${PORTSDIR}/x11/pixman

USE_XZ=	yes
USE_XORG=	pixman
USE_GNOME=	gtk20 intltool intlhack
USE_LDCONFIG=	yes
GNU_CONFIGURE=	yes
USES=		gmake pkgconfig

OPTIONS_DEFINE=	ANIMATION
ANIMATION_DESC=	Animation support





PORTNAME=	gtkglext
PORTVERSION=	1.2.0
PORTREVISION=	12
CATEGORIES=	x11-toolkits
MASTER_SITES=	SF
DIST_SUBDIR=	gnome2

OPTIONS_DEFINE=	DOCS

USE_BZIP2=	yes
USE_GMAKE=	yes
USE_AUTOTOOLS=	libtool
USE_XORG=	ice pixman sm x11 xau xcb xcomposite xcursor xdamage xdmcp \
		xext xfixes xi xinerama xmu xrandr xrender xt xxf86vm
USE_GL=		glu
USES=		gettext gmake iconv pathfix pkgconfig
USE_GNOME=	gdkpixbuf2 gtk20 pangox-compat
USE_LDCONFIG=	yes


Lines 2-8 Link Here

(-)x11-toolkits/libXaw/Makefile (-2 / +2 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= libXaw	4	PORTNAME= libXaw
5	PORTVERSION= 1.0.11	5	PORTVERSION= 1.0.12
6	PORTEPOCH= 2	6	PORTEPOCH= 2
7	CATEGORIES= x11-toolkits	7	CATEGORIES= x11-toolkits
8		8
Lines 11-17 Link Here
11		11
12	XORG_CAT= lib	12	XORG_CAT= lib
13	USE_XORG= printproto:both x11 xau xext xextproto xmu xp xpm xproto:both xt	13	USE_XORG= printproto:both x11 xau xext xextproto xmu xp xpm xproto:both xt
14	USE_GMAKE= yes	14	USES= gmake
15	CONFIGURE_ARGS+=--without-xmlto	15	CONFIGURE_ARGS+=--without-xmlto
16		16
17	MAN3= Xaw.3	17	MAN3= Xaw.3

Lines 1-2 Link Here

(-)x11-toolkits/libXaw/distinfo (-2 / +2 lines)
1	SHA256 (xorg/lib/libXaw-1.0.11.tar.bz2) = 87a874acbb71d1ee59b8047312fc91d89dcb373e2970f121184cdae29a3d9492	1	SHA256 (xorg/lib/libXaw-1.0.12.tar.bz2) = 96fc314874fce9979556321d1d6ee00b5baf32fb333b7278853b4983bc3cdbf6
2	SIZE (xorg/lib/libXaw-1.0.11.tar.bz2) = 649633	2	SIZE (xorg/lib/libXaw-1.0.12.tar.bz2) = 677147

Lines 2-8 Link Here

(-)x11-toolkits/libXmu/Makefile (-1 / +1 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= libXmu	4	PORTNAME= libXmu
5	PORTVERSION= 1.1.1	5	PORTVERSION= 1.1.2
6	PORTEPOCH= 1	6	PORTEPOCH= 1
7	CATEGORIES= x11-toolkits	7	CATEGORIES= x11-toolkits
8		8

Lines 1-2 Link Here

(-)x11-toolkits/libXmu/distinfo (-2 / +2 lines)
1	SHA256 (xorg/lib/libXmu-1.1.1.tar.bz2) = 709081c550cc3a866d7c760a3f97384a1fe16e27fc38fe8169b8db9f33aa7edd	1	SHA256 (xorg/lib/libXmu-1.1.2.tar.bz2) = 756edc7c383254eef8b4e1b733c3bf1dc061b523c9f9833ac7058378b8349d0b
2	SIZE (xorg/lib/libXmu-1.1.1.tar.bz2) = 383473	2	SIZE (xorg/lib/libXmu-1.1.2.tar.bz2) = 396230

Lines 3-9 Link Here

(-)x11-wm/awesome/Makefile (-1 / +1 lines)
3		3
4	PORTNAME= awesome	4	PORTNAME= awesome
5	PORTVERSION= 3.5.1	5	PORTVERSION= 3.5.1
6	PORTREVISION= 2	6	PORTREVISION= 3
7	PORTEPOCH= 1	7	PORTEPOCH= 1
8	CATEGORIES= x11-wm	8	CATEGORIES= x11-wm
9	MASTER_SITES= http://awesome.naquadah.org/download/	9	MASTER_SITES= http://awesome.naquadah.org/download/

Return to bug 181962

Lines 350-356 Link Here

(-)Mk/bsd.port.mk (-6 / +8 lines)
350	# MAKE_ENV are extended with a DISPLAY variable.	350	# MAKE_ENV are extended with a DISPLAY variable.
351	#	351	#
352	# USE_GL - A list of Mesa or GL related dependencies needed by the port.	352	# USE_GL - A list of Mesa or GL related dependencies needed by the port.
353	# Supported components are: glut, glu, glw, and gl.	353	# Supported components are: egl, glesv2, glut, glu, glw, and gl.
354	# If set to "yes", this is equivalent to "glu". Note that	354	# If set to "yes", this is equivalent to "glu". Note that
355	# glew and glut depend on glu, glw and glu depend on gl.	355	# glew and glut depend on glu, glw and glu depend on gl.
356	##	356	##
Lines 1882-1894 Link Here
1882		1882
1883	PKG_IGNORE_DEPENDS?= 'this_port_does_not_exist'	1883	PKG_IGNORE_DEPENDS?= 'this_port_does_not_exist'
1884		1884
1885	_GL_gl_LIB_DEPENDS= GL.1:${PORTSDIR}/graphics/libGL	1885	_GL_glesv2_LIB_DEPENDS= libGLESv2.so:${PORTSDIR}/grahpics/libglesv2
		1886	_GL_egl_LIB_DEPENDS= libEGL.so:${PORTSDIR}/graphics/libEGL
		1887	_GL_gl_LIB_DEPENDS= libGL.so:${PORTSDIR}/graphics/libGL
1886	_GL_gl_USE_XORG= glproto dri2proto	1888	_GL_gl_USE_XORG= glproto dri2proto
1887	_GL_glew_LIB_DEPENDS= GLEW.1:${PORTSDIR}/graphics/glew	1889	_GL_glew_LIB_DEPENDS= libGLEW.so:${PORTSDIR}/graphics/glew
1888	_GL_glu_LIB_DEPENDS= GLU.1:${PORTSDIR}/graphics/libGLU	1890	_GL_glu_LIB_DEPENDS= libGLU.so:${PORTSDIR}/graphics/libGLU
1889	_GL_glu_USE_XORG= glproto dri2proto	1891	_GL_glu_USE_XORG= glproto dri2proto
1890	_GL_glw_LIB_DEPENDS= GLw.1:${PORTSDIR}/graphics/libGLw	1892	_GL_glw_LIB_DEPENDS= libGLw.so:${PORTSDIR}/graphics/libGLw
1891	_GL_glut_LIB_DEPENDS= glut.12:${PORTSDIR}/graphics/freeglut	1893	_GL_glut_LIB_DEPENDS= libglut.so:${PORTSDIR}/graphics/freeglut
1892		1894
1893	.if defined(USE_GL)	1895	.if defined(USE_GL)
1894	. if ${USE_GL:L} == "yes"	1896	. if ${USE_GL:L} == "yes"

Lines 5-10 Link Here

(-)UPDATING (-1 / +28 lines)
5	You should get into the habit of checking this file for changes each time	5	You should get into the habit of checking this file for changes each time
6	you update your ports collection, before attempting any port upgrades.	6	you update your ports collection, before attempting any port upgrades.
7		7
		8	201309xx:
		9	AFFECTS: users of x11/pixman
		10	AUTHOR: zeising@FreeBSD.org
		11
		12	The library version of x11/pixman has changed, and portrevision has
		13	been bumped in all dependent ports. If you have external software that
		14	depends on pixman, this software needs to be recompiled.
		15	To recompile all software dependent on pixman, run:
		16
		17	# portmaster -r pixman
		18	or
		19	# portupgrade -rf pixman
		20
		21	201309xx:
		22	AFFECTS: users of graphics/libGL, graphics/dri and other MESA ports
		23	AUTHOR: zeising@FreeBSD.org
		24
		25	The graphics/libGL, graphics/dri and related MESA ports have been
		26	updated to 9.1 when compiled with WITH_NEW_XORG= set. It is necessary
		27	to remove the old versions of both ports before updating.
		28
		29	# pkg_delete -f libGl-\* dri-\*
		30	or
		31	# pkg delete -f libGL dri
		32	followed by
		33	# portmaster -a
		34
8	20130904:	35	20130904:
9	AFFECTS: 10-CURRENT users with any port depending on converters/libiconv	36	AFFECTS: 10-CURRENT users with any port depending on converters/libiconv
10	AUTHOR: madpilot@FreeBSD.org	37	AUTHOR: madpilot@FreeBSD.org
Lines 553-559 Link Here
553	settings in rc.conf prior to restarting postgrey.	580	settings in rc.conf prior to restarting postgrey.
554		581
555	20130525:	582	20130525:
556	AFFECTS: users of x11/xorg and all X.Org ports	583	AFFECTS: users of x11/xorg and all xorg ports
557	AUTHOR: zeising@FreeBSD.org	584	AUTHOR: zeising@FreeBSD.org
558		585
559	X.Org, including libraries and some drivers, was updated. If you are	586	X.Org, including libraries and some drivers, was updated. If you are

Lines 3-9 Link Here

(-)emulators/qemu-devel/Makefile (-3 / +2 lines)
3		3
4	PORTNAME= qemu	4	PORTNAME= qemu
5	PORTVERSION= 1.6.0	5	PORTVERSION= 1.6.0
6	PORTREVISION= 1	6	PORTREVISION= 2
7	CATEGORIES= emulators	7	CATEGORIES= emulators
8	MASTER_SITES= http://wiki.qemu.org/download/:release \	8	MASTER_SITES= http://wiki.qemu.org/download/:release \
9	LOCAL/nox:snapshot	9	LOCAL/nox:snapshot
Lines 14-26 Link Here
14	MAINTAINER= nox@FreeBSD.org	14	MAINTAINER= nox@FreeBSD.org
15	COMMENT= QEMU CPU Emulator - development version	15	COMMENT= QEMU CPU Emulator - development version
16		16
17	LIB_DEPENDS= pixman-1:${PORTSDIR}/x11/pixman
18
19	HAS_CONFIGURE= yes	17	HAS_CONFIGURE= yes
20	USE_BZIP2= yes	18	USE_BZIP2= yes
21	USES= gmake pkgconfig bison	19	USES= gmake pkgconfig bison
22	USE_PERL5_BUILD= yes	20	USE_PERL5_BUILD= yes
23	USE_PYTHON_BUILD= -2.7	21	USE_PYTHON_BUILD= -2.7
		22	USE_XORG= pixman
24	USE_GNOME+= glib20	23	USE_GNOME+= glib20
25	PATCH_STRIP= -p1	24	PATCH_STRIP= -p1
26	MAKE_ENV+= BSD_MAKE="${MAKE}"	25	MAKE_ENV+= BSD_MAKE="${MAKE}"

Lines 3-9 Link Here

(-)emulators/tme/Makefile (-3 / +2 lines)
3		3
4	PORTNAME= tme	4	PORTNAME= tme
5	PORTVERSION= 0.8	5	PORTVERSION= 0.8
6	PORTREVISION= 1	6	PORTREVISION= 2
7	CATEGORIES= emulators	7	CATEGORIES= emulators
8	MASTER_SITES= http://people.csail.mit.edu/fredette/tme/	8	MASTER_SITES= http://people.csail.mit.edu/fredette/tme/
9		9
Lines 21-29 Link Here
21	expat:${PORTSDIR}/textproc/expat2 \	21	expat:${PORTSDIR}/textproc/expat2 \
22	fontconfig:${PORTSDIR}/x11-fonts/fontconfig	22	fontconfig:${PORTSDIR}/x11-fonts/fontconfig
23		23
24	USES= pkgconfig gettext iconv perl5	24	USES= pkgconfig gettext gmake iconv perl5
25	USE_GNOME= gdkpixbuf2 gtk20	25	USE_GNOME= gdkpixbuf2 gtk20
26	USE_GMAKE= yes
27	USE_AUTOTOOLS= libtool libltdl	26	USE_AUTOTOOLS= libtool libltdl
28	CONFIGURE_ENV= ac_cv_have_isinff=no	27	CONFIGURE_ENV= ac_cv_have_isinff=no
29	CONFIGURE_ARGS= --datadir=${WRKDIR}/tmproot --disable-warnings	28	CONFIGURE_ARGS= --datadir=${WRKDIR}/tmproot --disable-warnings

Lines 3-9 Link Here

(-)games/klavaro/Makefile (-3 / +2 lines)
3		3
4	PORTNAME= klavaro	4	PORTNAME= klavaro
5	PORTVERSION= 1.9.6	5	PORTVERSION= 1.9.6
6	PORTREVISION= 1	6	PORTREVISION= 2
7	CATEGORIES= games	7	CATEGORIES= games
8	MASTER_SITES= SF/${PORTNAME}/	8	MASTER_SITES= SF/${PORTNAME}/
9		9
Lines 22-30 Link Here
22	fontconfig:${PORTSDIR}/x11-fonts/fontconfig \	22	fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
23	gtkdatabox:${PORTSDIR}/x11-toolkits/gtkdatabox	23	gtkdatabox:${PORTSDIR}/x11-toolkits/gtkdatabox
24		24
25	USES= pkgconfig gettext iconv	25	USES= pkgconfig gettext gmake iconv
26	USE_BZIP2= yes	26	USE_BZIP2= yes
27	USE_GMAKE= yes
28	USE_XORG= pixman x11 xau xcb xcomposite xcursor xdamage xdmcp xext \	27	USE_XORG= pixman x11 xau xcb xcomposite xcursor xdamage xdmcp xext \
29	xfixes xi xinerama xrandr xrender	28	xfixes xi xinerama xrandr xrender
30	USE_GNOME= gtk20	29	USE_GNOME= gtk20

Lines 9-63 Link Here

(-)graphics/dri/Makefile (-36 / +72 lines)
9		9
10	COMMENT= OpenGL hardware acceleration drivers for the DRI	10	COMMENT= OpenGL hardware acceleration drivers for the DRI
11		11
12	LIB_DEPENDS= drm:${PORTSDIR}/graphics/libdrm \	12	LIB_DEPENDS= libdrm.so:${PORTSDIR}/graphics/libdrm \
13	expat:${PORTSDIR}/textproc/expat2	13	libexpat.so:${PORTSDIR}/textproc/expat2
14		14
15	USES= pkgconfig	15	USES= pkgconfig
16	USE_XORG= glproto x11 xext xxf86vm xdamage xfixes dri2proto	16	USE_XORG= glproto x11 xext xxf86vm xdamage xfixes dri2proto
17		17
		18	.include <bsd.port.options.mk>
		19
		20	# gcc from base can't handle some code in mesa 9.1+
		21	# We only care for 9.x and 8.x, not for old pre-clang default current.
		22	# This is for 0b0000 binary which gcc 4.3+ understands and is in the i965 driver.
		23	.if defined(WITH_NEW_XORG)
		24	. if ${OSVERSION} >= 901000 && ${OSVERSION} < 902502 \
		25	&& (${ARCH} == i386 \|\| ${ARCH} == amd64)
		26	CC=clang
		27	CXX=clang++
		28	CPP=clang-cpp
		29	. elif ${OSVERSION} < 901500
		30	USE_GCC=yes
		31	. endif
		32	.endif
		33
		34	.if ${ARCH} == ia64
		35	#BROKEN= does not install on ia64
		36	.endif
		37
18	ALL_DRI_DRIVERS=I915 I965 R200 RADEON SWRAST	38	ALL_DRI_DRIVERS=I915 I965 R200 RADEON SWRAST
19		39
20	.if ! defined(WITH_NEW_XORG)	40	.if !defined(WITH_NEW_XORG)
21	ALL_DRI_DRIVERS+=I810 MACH64 MGA R128 R300 R600 SAVAGE SIS TDFX UNICHROME	41	ALL_DRI_DRIVERS+=I810 MACH64 MGA R128 R300 R600 SAVAGE SIS TDFX UNICHROME
22	.endif	42	.endif
23		43
24	.include "${.CURDIR}/../../graphics/libGL/bsd.mesalib.mk"	44	.include "${.CURDIR}/../../graphics/libGL/bsd.mesalib.mk"
25		45
26	OPTIONS_DEFINE_i386= ${ALL_DRI_DRIVERS}	46	PLIST_SUB+= VERSION=${MESADISTVERSION}
27	OPTIONS_DEFINE_amd64= ${OPTIONS_DEFINE_i386}
28		47
29	.if defined(WITH_NEW_XORG)	48	.if ${ARCH} == amd64 \|\| ${ARCH} == i386
30	OPTIONS_DEFINE_powerpc= RADEON SWRAST	49	DRI_DRIVERS= ${ALL_DRI_DRIVERS}
31	OPTIONS_DEFINE_sparc64= RADEON SWRAST
32	.else
33	OPTIONS_DEFINE_powerpc= MACH64 RADEON SWRAST TDFX
34	OPTIONS_DEFINE_sparc64= MACH64 RADEON SWRAST
35	.endif	50	.endif
36		51
37	OPTIONS_DEFAULT=${OPTIONS_DEFINE}	52	.if defined(WITH_NEW_XORG)
		53	. if defined(WITH_GALLIUM) && (${ARCH} == i386 \|\| ${ARCH} == amd64)
		54	BUILD_DEPENDS+= llvm-config33:${PORTSDIR}/devel/llvm33
		55	RUN_DEPENDS+= llvm-config33:${PORTSDIR}/devel/llvm33
		56	CONFIGURE_ENV+= LLVM_CONFIG=${LOCALBASE}/bin/llvm-config33
38		57
39	I810_DESC= Include DRI support for Intel i810	58	CONFIGURE_ARGS+=--enable-gallium-llvm --disable-gallium-egl
40	I915_DESC= Include DRI support for Intel i915
41	I965_DESC= Include DRI support for Intel i965
42	MACH64_DESC= Include DRI support for AMD/ATI Mach64
43	MGA_DESC= Include DRI support for Matrox
44	R128_DESC= Include DRI support for AMD/ATI R128
45	R200_DESC= Include DRI support for AMD/ATI R200
46	R300_DESC= Include DRI support for AMD/ATI R300
47	R600_DESC= Include DRI support for AMD/ATI R600
48	RADEON_DESC= Include DRI support for AMD/ATI RADEON
49	SAVAGE_DESC= Include DRI support for S3/Via Savage
50	SIS_DESC= Include DRI support for SiS 300 and 6326
51	SWRAST_DESC= Include generic software DRI support
52	TDFX_DESC= Include DRI support for 3dfx Voodoo
53	UNICHROME_DESC= Include DRI support for S3/Via Unichrome
54		59
55	.include <bsd.port.options.mk>	60	CONFIGURE_ARGS+=--with-gallium-drivers=r300,r600,radeonsi,svga,swrast
		61	PLIST_SUB+= GALLIUM=""
		62	. else
		63	CONFIGURE_ARGS+=--enable-gallium-llvm=no --without-gallium-drivers
		64	PLIST_SUB+= GALLIUM="@comment "
		65	. endif
		66	. if ${ARCH} == powerpc \|\| ${ARCH} == ia64
		67	DRI_DRIVERS= RADEON SWRAST
		68	. endif
		69	. if ${ARCH} == sparc64
		70	DRI_DRIVERS= SWRAST
		71	. endif
		72	.else # !defined(WITH_NEW_XORG)
		73	. if ${ARCH} == powerpc
		74	DRI_DRIVERS= MACH64 RADEON SWRAST TDFX
		75	. elif ${ARCH} == sparc64
		76	DRI_DRIVERS= MACH64 RADEON SWRAST
		77	. endif
		78	.endif # defined(WITH_NEW_XORG)
56		79
57	DRI_DRIVERS=
58	.for _d in ${ALL_DRI_DRIVERS}	80	.for _d in ${ALL_DRI_DRIVERS}
59	.if ${PORT_OPTIONS:M${_d}}	81	.if ${DRI_DRIVERS:M${_d}}
60	DRI_DRIVERS+= ${_d}
61	PLIST_SUB+= ${_d}_DRIVER=""	82	PLIST_SUB+= ${_d}_DRIVER=""
62	.else	83	.else
63	PLIST_SUB+= ${_d}_DRIVER="@comment "	84	PLIST_SUB+= ${_d}_DRIVER="@comment "
Lines 64-79 Link Here
64	.endif	85	.endif
65	.endfor	86	.endfor
66		87
67	.if ${ARCH} == "ia64"	88	.if !(${ARCH} == amd64 \|\| ${ARCH} == i386)
68	BROKEN= does not install on ia64
69	.endif
70
71	.if !(${ARCH} == "amd64" \|\| ${ARCH} == "i386")
72	CONFIGURE_ARGS+=--disable-gallium-intel	89	CONFIGURE_ARGS+=--disable-gallium-intel
73	.endif	90	.endif
74	CONFIGURE_ARGS+=--with-dri-drivers="${DRI_DRIVERS:L}"	91	CONFIGURE_ARGS+=--with-dri-drivers="${DRI_DRIVERS:L}"
75		92
		93	.if defined(WITH_NEW_XORG) && !defined(WITH_GALLIUM) \
		94	&& (${ARCH} == i386 \|\| ${ARCH} == amd64)
		95	pre-everything::
		96	@${ECHO_MSG} ""
		97	@${ECHO_MSG} "For r300, r600, radeonsi and swrast gallium based drivers."
		98	@${ECHO_MSG} "Please define WITH_GALLIUM in /etc/make.conf"
		99	@${ECHO_MSG} "Note that gallium support is highly experimental."
		100	@${ECHO_MSG} ""
		101	.endif
		102
76	do-install:	103	do-install:
		104	.if !defined(WITH_NEW_XORG)
77	cd ${WRKSRC}/src/mesa; ${GMAKE} install-dri	105	cd ${WRKSRC}/src/mesa; ${GMAKE} install-dri
		106	.else
		107	cd ${WRKSRC}/src/mesa/libdricore; ${GMAKE} install
		108	cd ${WRKSRC}/src/mesa/drivers/dri; ${GMAKE} install
		109	. if defined(WITH_GALLIUM) && (${ARCH} == i386 \|\| ${ARCH} == amd64)
		110	cd ${WRKSRC}/src/gallium/drivers/radeon; ${GMAKE} install
		111	cd ${WRKSRC}/src/gallium/targets; ${GMAKE} install
		112	. endif
		113	.endif
78		114
79	.include <bsd.port.mk>	115	.include <bsd.port.mk>

Line 0 Link Here

(-)graphics/libEGL/Makefile (+30 lines)
	1	# Created by: kwm@FreeBSD.org
	2	# $FreeBSD$
	3
	4	PORTNAME= libEGL
	5	PORTVERSION= ${MESAVERSION}
	6	CATEGORIES= graphics
	7
	8	COMMENT= OpenEGL library
	9
	10	LIB_DEPENDS+= libpthread-stubs.so:${PORTSDIR}/devel/libpthread-stubs
	11
	12	.if ! defined(WITH_NEW_XORG)
	13	IGNORE= Please enable WITH_NEW_XORG, libEGL needs libdrm higher then 2.4.24
	14	.endif
	15
	16	USE_XORG= x11 xau xcb xdmcp
	17
	18	# stuff not needed by libEGL but configure wants it
	19	USE_XORG+= glproto dri2proto xext xdamage xfixes
	20	LIB_DEPENDS+= libexpat.so:${PORTSDIR}/textproc/expat2 \
	21	libdrm.so:${PORTSDIR}/graphics/libdrm
	22
	23	BUILD_WKRSRC= ${WRKSRC}/src/egl
	24	INSTALL_WRKSRC= ${WRKSRC}/src/egl
	25
	26	WITH_NEW_XORG= yes
	27
	28	.include <bsd.port.options.mk>
	29	.include "${.CURDIR}/../../graphics/libGL/bsd.mesalib.mk"
	30	.include <bsd.port.mk>

Lines 3-16 Link Here

(-)graphics/libGL/Makefile (-7 / +23 lines)
3		3
4	PORTNAME= libGL	4	PORTNAME= libGL
5	PORTVERSION= ${MESAVERSION}	5	PORTVERSION= ${MESAVERSION}
6	PORTREVISION= 4	6	PORTREVISION= ${LIBGLREVISION}
7	CATEGORIES= graphics	7	CATEGORIES= graphics
8		8
9	MAINTAINER= x11@FreeBSD.org
10	COMMENT= OpenGL library that renders using GLX or DRI	9	COMMENT= OpenGL library that renders using GLX or DRI
11		10
12	LIB_DEPENDS+= drm:${PORTSDIR}/graphics/libdrm \	11	LIB_DEPENDS+= libdrm.so:${PORTSDIR}/graphics/libdrm \
13	expat:${PORTSDIR}/textproc/expat2	12	libexpat.so:${PORTSDIR}/textproc/expat2
14		13
15	USES= pkgconfig	14	USES= pkgconfig
16	USE_XORG= glproto x11 xext xxf86vm xdamage xfixes dri2proto:both	15	USE_XORG= glproto x11 xext xxf86vm xdamage xfixes dri2proto:both
Lines 17-25 Link Here
17		16
18	SUB_FILES= pkg-install pkg-deinstall	17	SUB_FILES= pkg-install pkg-deinstall
19		18
		19	.include <bsd.port.options.mk>
		20
		21	.if defined(WITH_NEW_XORG)
		22	LIBGLREVISION= 0
		23	.else
		24	LIBGLREVISION= 4
		25	.endif
		26
20	do-install:	27	do-install:
		28	.if ! defined(WITH_NEW_XORG)
21	${RM} -f ${WRKSRC}/include/GL/glu*.h	29	${RM} -f ${WRKSRC}/include/GL/glu*.h
		30	@${MKDIR} ${PREFIX}/lib/.libGL
22	cd ${WRKSRC}/src/mesa; ${GMAKE} install-libgl	31	cd ${WRKSRC}/src/mesa; ${GMAKE} install-libgl
		32	.else
		33	cd ${WRKSRC}/src/mesa; ${GMAKE} install-pkgconfigDATA
		34	cd ${WRKSRC}/src/glx; ${GMAKE} install
		35	${MKDIR} ${PREFIX}/include/GL
		36	cd ${WRKSRC}/include/GL && ${COPYTREE_SHARE} \*.h ${PREFIX}/include/GL/
		37	@${MKDIR} ${PREFIX}/lib/.libGL
		38	${INSTALL_LIB} ${WRKSRC}/src/glx/.libs/libGL.so ${PREFIX}/lib/.libGL/
		39	${INSTALL_LIB} ${WRKSRC}/src/glx/.libs/libGL.so.1 ${PREFIX}/lib/.libGL/
		40	.endif
23		41
24	post-install:	42	post-install:
25	@PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL	43	@PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
Lines 26-35 Link Here
26		44
27	.include "${.CURDIR}/bsd.mesalib.mk"	45	.include "${.CURDIR}/bsd.mesalib.mk"
28		46
29	.include <bsd.port.pre.mk>
30
31	.if !(${ARCH} == "amd64" \|\| ${ARCH} == "i386")	47	.if !(${ARCH} == "amd64" \|\| ${ARCH} == "i386")
32	CONFIGURE_ARGS+=--disable-gallium-intel	48	CONFIGURE_ARGS+=--disable-gallium-intel
33	.endif	49	.endif
34		50
35	.include <bsd.port.post.mk>	51	.include <bsd.port.mk>

Lines 1-16 Link Here

(-)graphics/libGL/bsd.mesalib.mk (-39 / +78 lines)
1	#-- mode: Fundamental; tab-width: 4; --	1	# bsd.mesalib.mk - shared code between MesaLib ports.
2	# ex:ts=4
3	#	2	#
4	# bsd.mesa.mk - an attempt to refactor MesaLib ports.
5	#
6	# Created by: Florent Thoumie <flz@FreeBSD.org>
7	#
8	# !!! Here be dragons !!! (they seem to be everywhere these days)	3	# !!! Here be dragons !!! (they seem to be everywhere these days)
9	#	4	#
10	# Remember to upgrade the following ports everytime you bump MESAVERSION:	5	# Remember to upgrade the following ports everytime you bump MESAVERSION:
11	#	6	#
		7	# - graphics/libEGL
12	# - graphics/libGL	8	# - graphics/libGL
13	# - graphics/libGLU	9	# - grahpics/libglesv2
14	# - graphics/dri	10	# - graphics/dri
15	#	11	#
16	# $FreeBSD$	12	# $FreeBSD$
Lines 21-27 Link Here
21	MESADISTVERSION=${MESABASEVERSION}${MESASUBVERSION:C/^(.)/-\1/}	17	MESADISTVERSION=${MESABASEVERSION}${MESASUBVERSION:C/^(.)/-\1/}
22		18
23	.if defined(WITH_NEW_XORG)	19	.if defined(WITH_NEW_XORG)
24	MESABASEVERSION= 8.0.5	20	MESABASEVERSION= 9.1.6
25	# if there is a subversion, include the '-' between 7.11-rc2 for example.	21	# if there is a subversion, include the '-' between 7.11-rc2 for example.
26	MESASUBVERSION=	22	MESASUBVERSION=
27	PLIST_SUB+= OLD="@comment " NEW=""	23	PLIST_SUB+= OLD="@comment " NEW=""
Lines 35-98 Link Here
35	DISTFILES= MesaLib-${MESADISTVERSION}${EXTRACT_SUFX}	31	DISTFILES= MesaLib-${MESADISTVERSION}${EXTRACT_SUFX}
36	MAINTAINER?= x11@FreeBSD.org	32	MAINTAINER?= x11@FreeBSD.org
37		33
38	# HACK: added lang/python as build dependency - we need to check, which
39	# python versions are cleanly supported by Mesa
40	BUILD_DEPENDS+= makedepend:${PORTSDIR}/devel/makedepend \	34	BUILD_DEPENDS+= makedepend:${PORTSDIR}/devel/makedepend \
41	python:${PORTSDIR}/lang/python \	35	python2:${PORTSDIR}/lang/python2 \
42	${PYTHON_SITELIBDIR}/libxml2.py:${PORTSDIR}/textproc/py-libxml2	36	${PYTHON_SITELIBDIR}/libxml2.py:${PORTSDIR}/textproc/py-libxml2
43		37
44	USES+= bison	38	USES= bison gmake pathfix pkgconfig shebangfix
45	USE_PYTHON_BUILD=yes	39	USE_PYTHON_BUILD=-2.7
46	USE_BZIP2= yes	40	USE_BZIP2= yes
47	USE_GMAKE= yes
48	USE_LDCONFIG= yes	41	USE_LDCONFIG= yes
49	GNU_CONFIGURE= yes	42	GNU_CONFIGURE= yes
50		43
51	CPPFLAGS+= -I${LOCALBASE}/include	44	CPPFLAGS+= -I${LOCALBASE}/include
52	LDFLAGS+= -L${LOCALBASE}/lib	45	LDFLAGS+= -L${LOCALBASE}/lib
53	CONFIGURE_ARGS+=--enable-gallium-llvm=no --without-gallium-drivers \
54	--disable-egl
55		46
		47	.if ${OSVERSION} < 1000033
		48	BUILD_DEPENDS+= ${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex
		49	CONFIGURE_ENV+=ac_cv_prog_LEX=${LOCALBASE}/bin/flex
		50	.endif
		51
56	.if defined(WITH_NEW_XORG)	52	.if defined(WITH_NEW_XORG)
57	EXTRA_PATCHES+= ${PATCHDIR}/extra-configure \	53	USE_AUTOTOOLS= autoconf:env automake:env libtool:env
58	${PATCHDIR}/extra-src-glsl_ir_constant_expression.cpp \	54	# probably be shared lib, and in it own port.
59	${PATCHDIR}/extra-src__gallium__include__pipe__p_config.h \	55	CONFIGURE_ARGS+= --enable-shared-glapi=no
60	${PATCHDIR}/extra-src__mesa__drivers__dri__nouveau__nouveau_array.c \	56	# we need to reapply these patches because we doing wierd stuff with autogen
61	${PATCHDIR}/extra-src__mesa__drivers__dri__nouveau__nouveau_render_t.c \	57	REAPPLY_PATCHES= \
62	${PATCHDIR}/extra-src_glx_XF86dri.c	58	${PATCHDIR}/patch-configure \
		59	${PATCHDIR}/patch-src_egl_main_Makefile.in \
		60	${PATCHDIR}/patch-src_glx_Makefile.in \
		61	${PATCHDIR}/patch-src_mapi_es2api_Makefile.in \
		62	${PATCHDIR}/patch-src_mapi_shared-glapi_Makefile.in \
		63	${PATCHDIR}/patch-src_mesa_drivers_dri_common_Makefile.in \
		64	${PATCHDIR}/patch-src_mesa_drivers_dri_common_xmlpool_Makefile.in \
		65	${PATCHDIR}/patch-src_mesa_libdricore_Makefile.in
		66
		67	python_OLD_CMD= "/usr/bin/env[[:space:]]python"
		68	python_CMD= ${LOCALBASE}/bin/python2
		69	SHEBANG_FILES= src/gallium///.py src/gallium/tools/trace/.py \
		70	src/gallium/drivers/svga/svgadump/svga_dump.py \
		71	src/glsl/tests/compare_ir src/mapi/glapi/gen/*.py \
		72	src/mapi/mapi/mapi_abi.py
63	.else	73	.else
64	EXTRA_PATCHES+= ${PATCHDIR}/extra-configure-old \	74	CONFIGURE_ARGS+=--disable-glut --disable-glw --disable-glu
65	${PATCHDIR}/extra-mach64_context.h-old \
66	${PATCHDIR}/extra-src__mesa__x86-64__glapi_x86-64.S \
67	${PATCHDIR}/extra-src__mesa__x86-64__xform4.S \
68	${PATCHDIR}/extra-src__mesa__x86__glapi_x86.S \
69	${PATCHDIR}/extra-src__mesa__x86__read_rgba_span_x86.S \
70	${PATCHDIR}/extra-src_glx_x11_XF86dri.c
71	CONFIGURE_ARGS+=--disable-glut --disable-glw
72	.endif
73		75
74	ALL_TARGET= default	76	ALL_TARGET= default
		77	.endif
75		78
76	MASTERDIR= ${.CURDIR}/../../graphics/libGL	79	MASTERDIR= ${.CURDIR}/../../graphics/libGL
		80	.if defined(WITH_NEW_XORG)
77	PATCHDIR= ${MASTERDIR}/files	81	PATCHDIR= ${MASTERDIR}/files
		82	.else
		83	PATCHDIR= ${MASTERDIR}/files-old
		84	.endif
78	DESCR= ${.CURDIR}/pkg-descr	85	DESCR= ${.CURDIR}/pkg-descr
79	PLIST= ${.CURDIR}/pkg-plist	86	PLIST= ${.CURDIR}/pkg-plist
80	WRKSRC= ${WRKDIR}/Mesa-${MESADISTVERSION}	87	WRKSRC= ${WRKDIR}/Mesa-${MESADISTVERSION}
81		88
82	.if !defined(ARCH)
83	ARCH!= uname -p
84	.endif
85
86	COMPONENT= ${PORTNAME:L:C/^lib//:C/mesa-//}	89	COMPONENT= ${PORTNAME:L:C/^lib//:C/mesa-//}
87		90
88	.if ${COMPONENT:Mglu} == ""	91	.if ${COMPONENT:Mglesv2} == ""
89	CONFIGURE_ARGS+= --disable-glu	92	CONFIGURE_ARGS+= --disable-gles2
		93	.else
		94	CONFIGURE_ARGS+= --enable-gles2
90	.endif	95	.endif
91		96
		97	.if ${COMPONENT:Megl} == ""
		98	CONFIGURE_ARGS+= --disable-egl
		99	.else
		100	CONFIGURE_ARGS+= --enable-egl
		101	.endif
		102
92	.if ${COMPONENT:Mdri} == ""	103	.if ${COMPONENT:Mdri} == ""
93	CONFIGURE_ARGS+= --with-dri-drivers=no	104	CONFIGURE_ARGS+=--with-dri-drivers=no
		105	CONFIGURE_ARGS+=--enable-gallium-llvm=no --without-gallium-drivers
94	.else	106	.else
95	CONFIGURE_ARGS+= --with-dri-drivers="i915,i965,r200,radeon,swrast"	107	# done in the dri port
96	.endif	108	.endif
97		109
98	.if !defined(WITH_NEW_XORG)	110	.if !defined(WITH_NEW_XORG)
Lines 106-113 Link Here
106	post-patch:	118	post-patch:
107	@${REINPLACE_CMD} -e 's\|-ffast-math\|${FAST_MATH}\|' -e 's\|x86_64\|amd64\|' \	119	@${REINPLACE_CMD} -e 's\|-ffast-math\|${FAST_MATH}\|' -e 's\|x86_64\|amd64\|' \
108	${WRKSRC}/configure	120	${WRKSRC}/configure
		121	@${REINPLACE_CMD} -e 's\|/etc/\|${PREFIX}/etc/\|g' \
		122	${WRKSRC}/src/mesa/drivers/dri/common/xmlconfig.c
		123	.if !defined(WITH_NEW_XORG)
109	@${REINPLACE_CMD} -e 's\|[$$](INSTALL_LIB_DIR)/pkgconfig\|${PREFIX}/libdata/pkgconfig\|' \	124	@${REINPLACE_CMD} -e 's\|[$$](INSTALL_LIB_DIR)/pkgconfig\|${PREFIX}/libdata/pkgconfig\|' \
110	${WRKSRC}/src/glu/Makefile \	125	${WRKSRC}/src/glu/Makefile \
111	${WRKSRC}/src/mesa/Makefile \	126	${WRKSRC}/src/mesa/Makefile \
112	${WRKSRC}/src/mesa/drivers/dri/Makefile	127	${WRKSRC}/src/mesa/drivers/dri/Makefile
		128	.else
		129	@${REINPLACE_CMD} -e 's\|#!/use/bin/python\|#!${LOCALBASE}/bin/python2\|g' \
		130	${WRKSRC}/src/mesa/drivers/dri/common/xmlpool/gen_xmlpool.py \
		131	${WRKSRC}/src/glsl/builtins/tools/*.py
		132	@${REINPLACE_CMD} -e 's\|!/use/bin/python2\|!${LOCALBASE}/bin/python2\|g' \
		133	${WRKSRC}/src/mesa/main/get_hash_generator.py \
		134	${WRKSRC}/src/mapi/glapi/gen/gl_enums.py \
		135	${WRKSRC}/src/mapi/glapi/gen/gl_table.py \
113		136
		137	.endif
		138
		139	pre-configure:
		140	# workaround for stupid rerunning configure in do-build step
		141	# xxx
		142	.if defined(WITH_NEW_XORG)
		143	cd ${WRKSRC} && env NOCONFIGURE=1 sh autogen.sh
		144	. for file in ${REAPPLY_PATCHES}
		145	@cd ${WRKSRC} && ${PATCH} -p0 --quiet < ${file}
		146	. endfor
		147	# make sure the pkg-config files are installed in the correct place.
		148	# this was reverted by running autogen.sh
		149	@${FIND} ${WRKSRC} -name Makefile.in -type f \| ${XARGS} ${REINPLACE_CMD} -e \
		150	's\|[(]libdir[)]/pkgconfig\|(prefix)/libdata/pkgconfig\|g' ;
		151	.endif
		152

Lines 1-40 Link Here

(-)graphics/libGL/files/extra-configure (-40 lines)
1	--- configure.orig 2012-07-10 17:30:46.000000000 +0200
2	+++ configure 2012-09-01 13:27:22.000000000 +0200
3	@@ -9017,9 +9017,34 @@
4	DEFINES="$DEFINES -DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1"
5	DEFINES="$DEFINES -DIN_DRI_DRIVER -DHAVE_ALIAS"
6
7	- if test "x$DRI_DIRS" = "xyes"; then
8	- DRI_DIRS="i915 i965 nouveau r200 radeon swrast"
9	- fi
10	+ case "$host_cpu" in
11	+ x86_64)
12	+ # i810 is missing because there is no x86-64 system where it
13	+ # could ever be used.
14	+ if test "x$DRI_DIRS" = "xyes"; then
15	+ DRI_DIRS="i915 i965 nouveau r200 radeon swrast"
16	+ fi
17	+ ;;
18	+ i*86)
19	+ if test "x$DRI_DIRS" = "xyes"; then
20	+ DRI_DIRS="i915 i965 nouveau r200 radeon swrast"
21	+ fi
22	+ ;;
23	+ powerpc*)
24	+ # Build only the drivers for cards that exist on PowerPC.
25	+ # At some point MGA will be added, but not yet.
26	+ if test "x$DRI_DIRS" = "xyes"; then
27	+ DRI_DIRS="r200 radeon swrast"
28	+ fi
29	+ ;;
30	+ sparc*)
31	+ # Build only the drivers for cards that exist on SPARC.
32	+ if test "x$DRI_DIRS" = "xyes"; then
33	+ DRI_DIRS="r200 radeon swrast"
34	+ fi
35	+ ;;
36	+ esac
37	+
38	;;
39	gnu*)
40	DEFINES="$DEFINES -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER"

Lines 1-43 Link Here

(-)graphics/libGL/files/extra-configure-old (-43 lines)
1	--- configure.orig 2009-12-22 03:31:30.000000000 +0100
2	+++ configure 2012-06-27 19:49:26.000000000 +0200
3	@@ -6946,12 +6946,35 @@
4	CXXFLAGS="$CXXFLAGS -ansi -pedantic"
5	fi
6
7	- # ffb and gamma are missing because they have not been converted
8	- # to use the new interface.
9	- if test "x$DRI_DIRS" = "xyes"; then
10	- DRI_DIRS="i810 i915 i965 mach64 mga r128 r200 r300 r600 radeon tdfx \
11	+ case "$host_cpu" in
12	+ x86_64)
13	+ # i810 is missing because there is no x86-64 system where it
14	+ # could ever be used.
15	+ if test "x$DRI_DIRS" = "xyes"; then
16	+ DRI_DIRS="i915 i965 mach64 mga r128 r200 r300 r600 radeon tdfx \
17	unichrome savage sis swrast"
18	- fi
19	+ fi
20	+ ;;
21	+ i*86)
22	+ if test "x$DRI_DIRS" = "xyes"; then
23	+ DRI_DIRS="i810 i915 i965 mach64 mga r128 r200 r300 r600 radeon tdfx \
24	+ unichrome savage sis swrast"
25	+ fi
26	+ ;;
27	+ powerpc*)
28	+ # Build only the drivers for cards that exist on PowerPC.
29	+ # At some point MGA will be added, but not yet.
30	+ if test "x$DRI_DIRS" = "xyes"; then
31	+ DRI_DIRS="mach64 r128 r200 r300 r600 radeon tdfx swrast"
32	+ fi
33	+ ;;
34	+ sparc*)
35	+ # Build only the drivers for cards that exist on SPARC.
36	+ if test "x$DRI_DIRS" = "xyes"; then
37	+ DRI_DIRS="mach64 r128 r200 r300 r600 radeon swrast"
38	+ fi
39	+ ;;
40	+ esac
41	;;
42	gnu*)
43	DEFINES="$DEFINES -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER"

Lines 1-20 Link Here

(-)graphics/libGL/files/extra-mach64_context.h-old (-20 lines)
1	--- src/mesa/drivers/dri/mach64/mach64_context.h.orig 2012-06-27 19:59:32.000000000 +0200
2	+++ src/mesa/drivers/dri/mach64/mach64_context.h 2012-06-27 20:08:30.000000000 +0200
3	@@ -294,11 +294,14 @@
4	#define LE32_OUT( x, y ) do { (GLuint )(x) = (y); } while (0)
5	#define LE32_OUT_FLOAT( x, y ) do { (GLfloat )(x) = (y); } while (0)
6	#else
7	-#ifndef __OpenBSD__
8	-#include <byteswap.h>
9	-#else
10	+#if defined(__OpenBSD__)
11	#include <machine/endian.h>
12	#define bswap_32 bswap32
13	+#elif defined(__FreeBSD__)
14	+#include <sys/endian.h>
15	+#define bswap_32 bswap32
16	+#else
17	+#include <byteswap.h>
18	#endif
19
20	#define LE32_IN( x ) bswap_32( (GLuint )(x) )

Lines 1-14 Link Here

(-)graphics/libGL/files/extra-src-glsl_ir_constant_expression.cpp (-14 lines)
1	--- src/glsl/ir_constant_expression.cpp.orig 2011-07-23 15:08:44.000000000 +0200
2	+++ src/glsl/ir_constant_expression.cpp 2011-07-23 15:09:03.000000000 +0200
3	@@ -39,6 +39,11 @@
4	#include "ir_visitor.h"
5	#include "glsl_types.h"
6
7	+#include <sys/param.h>
8	+#if __FreeBSD_version <= 704100 \|\| (__FreeBSD_version >= 800000 && __FreeBSD_version < 802502) \|\| (__FreeBSD_version >= 900000 && __FreeBSD_version < 900027)
9	+#define log2(x) (log(x) / log(2))
10	+#endif
11	+
12	static float
13	dot(ir_constant op0, ir_constant op1)
14	{

Lines 1-25 Link Here

(-)graphics/libGL/files/extra-src__gallium__include__pipe__p_config.h (-25 lines)
1	--- src/gallium/include/pipe/p_config.h.orig 2011-10-15 02:43:58.000000000 +0200
2	+++ src/gallium/include/pipe/p_config.h 2012-06-28 21:27:06.000000000 +0200
3	@@ -106,6 +106,13 @@
4	#endif
5	#endif
6
7	+#if defined(__sparc__) \|\| defined(__sparc64__)
8	+#define PIPE_ARCH_SPARC
9	+#if defined(__sparc64__)
10	+#define PIPE_ARCH_SPARC_64
11	+#endif
12	+#endif
13	+
14
15	/*
16	* Endian detection.
17	@@ -133,7 +140,7 @@
18
19	#if defined(PIPE_ARCH_X86) \|\| defined(PIPE_ARCH_X86_64)
20	#define PIPE_ARCH_LITTLE_ENDIAN
21	-#elif defined(PIPE_ARCH_PPC) \|\| defined(PIPE_ARCH_PPC_64)
22	+#elif defined(PIPE_ARCH_PPC) \|\| defined(PIPE_ARCH_PPC_64) \|\| defined(PIPE_ARCH_SPARC) \|\| defined(PIPE_ARCH_SPARC_64)
23	#define PIPE_ARCH_BIG_ENDIAN
24	#endif
25

Lines 1-99 Link Here

(-)graphics/libGL/files/extra-src__mesa__drivers__dri__nouveau__nouveau_array.c (-99 lines)
1	--- src/mesa/drivers/dri/nouveau/nouveau_array.c.orig 2011-01-06 01:19:15.000000000 +0100
2	+++ src/mesa/drivers/dri/nouveau/nouveau_array.c 2012-04-28 18:27:06.000000000 +0200
3	@@ -29,54 +29,71 @@
4	#include "nouveau_array.h"
5	#include "nouveau_bufferobj.h"
6
7	+#define EXTRACT(in_t, out_t) extract_func_##in_t##_to_##out_t
8	+
9	+#define EXTRACT_FUNC(in_t, out_t, k) \
10	+static out_t EXTRACT(in_t, out_t) \
11	+(struct nouveau_array *a, int i, int j) { \
12	+ in_t x = ((in_t )(a->buf + i a->stride))[j]; \
13	+ \
14	+ return (out_t)x / (k); \
15	+}
16	+
17	+EXTRACT_FUNC(GLchar, unsigned, 1);
18	+EXTRACT_FUNC(GLchar, float, SCHAR_MAX);
19	+EXTRACT_FUNC(GLubyte, unsigned, 1);
20	+EXTRACT_FUNC(GLubyte, float, UCHAR_MAX);
21	+EXTRACT_FUNC(GLshort, unsigned, 1);
22	+EXTRACT_FUNC(GLshort, float, SHRT_MAX);
23	+EXTRACT_FUNC(GLushort, unsigned, 1);
24	+EXTRACT_FUNC(GLushort, float, USHRT_MAX);
25	+EXTRACT_FUNC(GLint, unsigned, 1);
26	+EXTRACT_FUNC(GLint, float, INT_MAX);
27	+EXTRACT_FUNC(GLuint, unsigned, 1);
28	+EXTRACT_FUNC(GLuint, float, UINT_MAX);
29	+EXTRACT_FUNC(GLfloat, unsigned, 1.0 / UINT_MAX);
30	+EXTRACT_FUNC(GLfloat, float, 1);
31	+
32	+#undef EXTRACT_FUNC
33	+
34	static void
35	get_array_extract(struct nouveau_array a, extract_u_t extract_u,
36	extract_f_t *extract_f)
37	{
38	-#define EXTRACT(in_t, out_t, k) \
39	- ({ \
40	- auto out_t f(struct nouveau_array *, int, int); \
41	- out_t f(struct nouveau_array *a, int i, int j) { \
42	- in_t x = ((in_t )(a->buf + i a->stride))[j]; \
43	- \
44	- return (out_t)x / (k); \
45	- }; \
46	- f; \
47	- });
48	-
49	switch (a->type) {
50	case GL_BYTE:
51	- *extract_u = EXTRACT(char, unsigned, 1);
52	- *extract_f = EXTRACT(char, float, SCHAR_MAX);
53	+ *extract_u = EXTRACT(GLchar, unsigned);
54	+ *extract_f = EXTRACT(GLchar, float);
55	break;
56	case GL_UNSIGNED_BYTE:
57	- *extract_u = EXTRACT(unsigned char, unsigned, 1);
58	- *extract_f = EXTRACT(unsigned char, float, UCHAR_MAX);
59	+ *extract_u = EXTRACT(GLubyte, unsigned);
60	+ *extract_f = EXTRACT(GLubyte, float);
61	break;
62	case GL_SHORT:
63	- *extract_u = EXTRACT(short, unsigned, 1);
64	- *extract_f = EXTRACT(short, float, SHRT_MAX);
65	+ *extract_u = EXTRACT(GLshort, unsigned);
66	+ *extract_f = EXTRACT(GLshort, float);
67	break;
68	case GL_UNSIGNED_SHORT:
69	- *extract_u = EXTRACT(unsigned short, unsigned, 1);
70	- *extract_f = EXTRACT(unsigned short, float, USHRT_MAX);
71	+ *extract_u = EXTRACT(GLushort, unsigned);
72	+ *extract_f = EXTRACT(GLushort, float);
73	break;
74	case GL_INT:
75	- *extract_u = EXTRACT(int, unsigned, 1);
76	- *extract_f = EXTRACT(int, float, INT_MAX);
77	+ *extract_u = EXTRACT(GLint, unsigned);
78	+ *extract_f = EXTRACT(GLint, float);
79	break;
80	case GL_UNSIGNED_INT:
81	- *extract_u = EXTRACT(unsigned int, unsigned, 1);
82	- *extract_f = EXTRACT(unsigned int, float, UINT_MAX);
83	+ *extract_u = EXTRACT(GLuint, unsigned);
84	+ *extract_f = EXTRACT(GLuint, float);
85	break;
86	case GL_FLOAT:
87	- *extract_u = EXTRACT(float, unsigned, 1.0 / UINT_MAX);
88	- *extract_f = EXTRACT(float, float, 1);
89	+ *extract_u = EXTRACT(GLfloat, unsigned);
90	+ *extract_f = EXTRACT(GLfloat, float);
91	break;
92	default:
93	assert(0);
94	}
95	}
96	+#undef EXTRACT
97
98	void
99	nouveau_init_array(struct nouveau_array *a, int attr, int stride,

Lines 1-12 Link Here

(-)graphics/libGL/files/extra-src__mesa__x86-64__glapi_x86-64.S (-12 lines)
1	--- ./src/mesa/x86-64/glapi_x86-64.S.orig 2009-03-13 04:28:49.000000000 +0100
2	+++ ./src/mesa/x86-64/glapi_x86-64.S 2011-01-28 18:12:18.000000000 +0100
3	@@ -73,7 +73,8 @@ _x86_64_get_dispatch:
4
5	.p2align 4,,15
6	_x86_64_get_dispatch:
7	- movq _gl_DispatchTSD(%rip), %rdi
8	+ movq _gl_DispatchTSD@GOTPCREL(%rip), %rax
9	+ movl (%rax), %edi
10	jmp pthread_getspecific@PLT
11
12	#elif defined(THREADS)

Lines 1-74 Link Here

(-)graphics/libGL/files/extra-src__mesa__x86-64__xform4.S (-74 lines)
1	--- src/mesa/x86-64/xform4.S.orig 2009-01-22 18:38:35.000000000 +0100
2	+++ src/mesa/x86-64/xform4.S 2011-05-09 21:26:00.000000000 +0200
3	@@ -53,7 +53,7 @@ _mesa_x86_64_transform_points4_general:
4	* rdx = source
5	*/
6	movl V4F_COUNT(%rdx), %ecx /* count */
7	- movzx V4F_STRIDE(%rdx), %eax /* stride */
8	+ movzbl V4F_STRIDE(%rdx), %eax /* stride */
9
10	movl %ecx, V4F_COUNT(%rdi) /* set dest count */
11	movl $4, V4F_SIZE(%rdi) /* set dest size */
12	@@ -116,7 +116,7 @@ p4_constants:
13	.byte 0x00, 0x00, 0x00, 0x00
14	.byte 0x00, 0x00, 0x00, 0x00
15	.byte 0x00, 0x00, 0x00, 0x00
16	-.float 0f+1.0
17	+.float 1.0
18
19	.text
20	.align 16
21	@@ -135,7 +135,7 @@ _mesa_x86_64_transform_points4_3d:
22	movaps 16(%rax), %xmm10
23
24	movl V4F_COUNT(%rdx), %ecx /* count */
25	- movzx V4F_STRIDE(%rdx), %eax /* stride */
26	+ movzbl V4F_STRIDE(%rdx), %eax /* stride */
27
28	movl %ecx, V4F_COUNT(%rdi) /* set dest count */
29	movl $4, V4F_SIZE(%rdi) /* set dest size */
30	@@ -195,7 +195,7 @@ p4_3d_done:
31	_mesa_x86_64_transform_points4_identity:
32
33	movl V4F_COUNT(%rdx), %ecx /* count */
34	- movzx V4F_STRIDE(%rdx), %eax /* stride */
35	+ movzbl V4F_STRIDE(%rdx), %eax /* stride */
36
37	movl %ecx, V4F_COUNT(%rdi) /* set dest count */
38	movl $4, V4F_SIZE(%rdi) /* set dest size */
39	@@ -223,7 +223,7 @@ p4_identity_done:
40	_mesa_3dnow_transform_points4_3d_no_rot:
41
42	movl V4F_COUNT(%rdx), %ecx /* count */
43	- movzx V4F_STRIDE(%rdx), %eax /* stride */
44	+ movzbl V4F_STRIDE(%rdx), %eax /* stride */
45
46	movl %ecx, V4F_COUNT(%rdi) /* set dest count */
47	movl $4, V4F_SIZE(%rdi) /* set dest size */
48	@@ -287,7 +287,7 @@ p4_3d_no_rot_done:
49	_mesa_3dnow_transform_points4_perspective:
50
51	movl V4F_COUNT(%rdx), %ecx /* count */
52	- movzx V4F_STRIDE(%rdx), %eax /* stride */
53	+ movzbl V4F_STRIDE(%rdx), %eax /* stride */
54
55	movl %ecx, V4F_COUNT(%rdi) /* set dest count */
56	movl $4, V4F_SIZE(%rdi) /* set dest size */
57	@@ -353,7 +353,7 @@ p4_perspective_done:
58	_mesa_3dnow_transform_points4_2d_no_rot:
59
60	movl V4F_COUNT(%rdx), %ecx /* count */
61	- movzx V4F_STRIDE(%rdx), %eax /* stride */
62	+ movzbl V4F_STRIDE(%rdx), %eax /* stride */
63
64	movl %ecx, V4F_COUNT(%rdi) /* set dest count */
65	movl $4, V4F_SIZE(%rdi) /* set dest size */
66	@@ -408,7 +408,7 @@ p4_2d_no_rot_done:
67	_mesa_3dnow_transform_points4_2d:
68
69	movl V4F_COUNT(%rdx), %ecx /* count */
70	- movzx V4F_STRIDE(%rdx), %eax /* stride */
71	+ movzbl V4F_STRIDE(%rdx), %eax /* stride */
72
73	movl %ecx, V4F_COUNT(%rdi) /* set dest count */
74	movl $4, V4F_SIZE(%rdi) /* set dest size */

Lines 1-38 Link Here

(-)graphics/libGL/files/extra-src_glx_XF86dri.c (-38 lines)
1	--- src/glx/XF86dri.c.orig 2012-10-24 19:03:59.000000000 +0000
2	+++ src/glx/XF86dri.c 2013-05-29 10:07:33.000000000 +0000
3	@@ -43,6 +43,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN
4	#include <X11/extensions/Xext.h>
5	#include <X11/extensions/extutil.h>
6	#include "xf86dristr.h"
7	+#include <limits.h>
8
9	static XExtensionInfo _xf86dri_info_data;
10	static XExtensionInfo *xf86dri_info = &_xf86dri_info_data;
11	@@ -201,7 +202,11 @@ XF86DRIOpenConnection(Display * dpy, int
12	}
13
14	if (rep.length) {
15	- if (!(busIdString = (char ) Xcalloc(rep.busIdStringLength + 1, 1))) {
16	+ if (rep.busIdStringLength < INT_MAX)
17	+ *busIdString = Xcalloc(rep.busIdStringLength + 1, 1);
18	+ else
19	+ *busIdString = NULL;
20	+ if (*busIdString == NULL) {
21	_XEatData(dpy, ((rep.busIdStringLength + 3) & ~3));
22	UnlockDisplay(dpy);
23	SyncHandle();
24	@@ -300,9 +305,11 @@ XF86DRIGetClientDriverName(Display * dpy
25	*ddxDriverPatchVersion = rep.ddxDriverPatchVersion;
26
27	if (rep.length) {
28	- if (!
29	- (*clientDriverName =
30	- (char *) Xcalloc(rep.clientDriverNameLength + 1, 1))) {
31	+ if (rep.clientDriverNameLength < INT_MAX)
32	+ *clientDriverName = Xcalloc(rep.clientDriverNameLength + 1, 1);
33	+ else
34	+ *clientDriverName = NULL;
35	+ if (*clientDriverName == NULL) {
36	_XEatData(dpy, ((rep.clientDriverNameLength + 3) & ~3));
37	UnlockDisplay(dpy);
38	SyncHandle();

Lines 1-38 Link Here

(-)graphics/libGL/files/extra-src_glx_x11_XF86dri.c (-38 lines)
1	--- src/glx/x11/XF86dri.c.orig 2009-06-17 18:35:16.000000000 +0000
2	+++ src/glx/x11/XF86dri.c 2013-05-29 10:09:37.000000000 +0000
3	@@ -43,6 +43,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN
4	#include <X11/extensions/Xext.h>
5	#include <X11/extensions/extutil.h>
6	#include "xf86dristr.h"
7	+#include <limits.h>
8
9
10	#if defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__) >= 303
11	@@ -212,7 +213,11 @@ XF86DRIOpenConnection(Display * dpy, int
12	}
13
14	if (rep.length) {
15	- if (!(busIdString = (char ) Xcalloc(rep.busIdStringLength + 1, 1))) {
16	+ if (rep.busIdStringLength < INT_MAX)
17	+ *busIdString = Xcalloc(rep.busIdStringLength + 1, 1);
18	+ else
19	+ *busIdString = NULL;
20	+ if (*busIdString == NULL) {
21	_XEatData(dpy, ((rep.busIdStringLength + 3) & ~3));
22	UnlockDisplay(dpy);
23	SyncHandle();
24	@@ -311,9 +316,11 @@ XF86DRIGetClientDriverName(Display * dpy
25	*ddxDriverPatchVersion = rep.ddxDriverPatchVersion;
26
27	if (rep.length) {
28	- if (!
29	- (*clientDriverName =
30	- (char *) Xcalloc(rep.clientDriverNameLength + 1, 1))) {
31	+ if (rep.clientDriverNameLength < INT_MAX)
32	+ *clientDriverName = Xcalloc(rep.clientDriverNameLength + 1, 1);
33	+ else
34	+ *clientDriverName = NULL;
35	+ if (*clientDriverName == NULL) {
36	_XEatData(dpy, ((rep.clientDriverNameLength + 3) & ~3));
37	UnlockDisplay(dpy);
38	SyncHandle();

Line 0 Link Here

(-)graphics/libGL/files/patch-configure (+49 lines)
	1	--- configure.orig 2013-08-01 23:22:15.000000000 +0200
	2	+++ configure 2013-08-19 20:05:02.000000000 +0200
	3	@@ -21046,9 +21046,34 @@
	4	DEFINES="$DEFINES -DHAVE_PTHREAD -DUSE_EXTERNAL_DXTN_LIB=1"
	5	DEFINES="$DEFINES -DIN_DRI_DRIVER -DHAVE_ALIAS"
	6
	7	- if test "x$DRI_DIRS" = "xyes"; then
	8	- DRI_DIRS="i915 i965 nouveau r200 radeon swrast"
	9	- fi
	10	+ case "$host_cpu" in
	11	+ x86_64)
	12	+ # i810 is missing because there is no x86-64 system where it
	13	+ # could ever be used.
	14	+ if test "x$DRI_DIRS" = "xyes"; then
	15	+ DRI_DIRS="i915 i965 nouveau r200 radeon swrast"
	16	+ fi
	17	+ ;;
	18	+ i*86)
	19	+ if test "x$DRI_DIRS" = "xyes"; then
	20	+ DRI_DIRS="i915 i965 nouveau r200 radeon swrast"
	21	+ fi
	22	+ ;;
	23	+ powerpc*)
	24	+ # Build only the drivers for cards that exist on PowerPC.
	25	+ # At some point MGA will be added, but not yet.
	26	+ if test "x$DRI_DIRS" = "xyes"; then
	27	+ DRI_DIRS="r200 radeon swrast"
	28	+ fi
	29	+ ;;
	30	+ sparc*)
	31	+ # Build only the drivers for cards that exist on SPARC.
	32	+ if test "x$DRI_DIRS" = "xyes"; then
	33	+ DRI_DIRS="r200 radeon swrast"
	34	+ fi
	35	+ ;;
	36	+ esac
	37	+
	38	;;
	39	gnu*)
	40	DEFINES="$DEFINES -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER"
	41	@@ -23396,7 +23421,7 @@
	42	radeon_llvm_check() {
	43	LLVM_REQUIRED_VERSION_MAJOR="3"
	44	LLVM_REQUIRED_VERSION_MINOR="2"
	45	- if test "$LLVM_VERSION_INT" -ne "${LLVM_REQUIRED_VERSION_MAJOR}0${LLVM_REQUIRED_VERSION_MINOR}"; then
	46	+ if test "$LLVM_VERSION_INT" -lt "${LLVM_REQUIRED_VERSION_MAJOR}0${LLVM_REQUIRED_VERSION_MINOR}"; then
	47	as_fn_error $? "LLVM $LLVM_REQUIRED_VERSION_MAJOR.$LLVM_REQUIRED_VERSION_MINOR with R600 target enabled is required.
	48	To use the r600/radeonsi LLVM backend, you need to fetch the LLVM source from:
	49	git://people.freedesktop.org/~tstellar/llvm master

Line 0 Link Here

(-)graphics/libGL/files/patch-src-glsl_ir_constant_expression.cpp (+14 lines)
	1	--- src/glsl/ir_constant_expression.cpp.orig 2011-07-23 15:08:44.000000000 +0200
	2	+++ src/glsl/ir_constant_expression.cpp 2011-07-23 15:09:03.000000000 +0200
	3	@@ -39,6 +39,11 @@
	4	#include "ir_visitor.h"
	5	#include "glsl_types.h"
	6
	7	+#include <sys/param.h>
	8	+#if __FreeBSD_version <= 704100 \|\| (__FreeBSD_version >= 800000 && __FreeBSD_version < 802502) \|\| (__FreeBSD_version >= 900000 && __FreeBSD_version < 900027)
	9	+#define log2(x) (log(x) / log(2))
	10	+#endif
	11	+
	12	static float
	13	dot(ir_constant op0, ir_constant op1)
	14	{

Line 0 Link Here

(-)graphics/libGL/files/patch-src__gallium__include__pipe__p_config.h (+25 lines)
	1	--- src/gallium/include/pipe/p_config.h.orig 2011-10-15 02:43:58.000000000 +0200
	2	+++ src/gallium/include/pipe/p_config.h 2012-06-28 21:27:06.000000000 +0200
	3	@@ -106,6 +106,13 @@
	4	#endif
	5	#endif
	6
	7	+#if defined(__sparc__) \|\| defined(__sparc64__)
	8	+#define PIPE_ARCH_SPARC
	9	+#if defined(__sparc64__)
	10	+#define PIPE_ARCH_SPARC_64
	11	+#endif
	12	+#endif
	13	+
	14
	15	/*
	16	* Endian detection.
	17	@@ -133,7 +140,7 @@
	18
	19	#if defined(PIPE_ARCH_X86) \|\| defined(PIPE_ARCH_X86_64)
	20	#define PIPE_ARCH_LITTLE_ENDIAN
	21	-#elif defined(PIPE_ARCH_PPC) \|\| defined(PIPE_ARCH_PPC_64)
	22	+#elif defined(PIPE_ARCH_PPC) \|\| defined(PIPE_ARCH_PPC_64) \|\| defined(PIPE_ARCH_SPARC) \|\| defined(PIPE_ARCH_SPARC_64)
	23	#define PIPE_ARCH_BIG_ENDIAN
	24	#endif
	25

Line 0 Link Here

(-)graphics/libGL/files/patch-src_egl_main_Makefile.in (+19 lines)
	1	--- src/egl/main/Makefile.in.orig 2013-08-01 23:22:16.000000000 +0200
	2	+++ src/egl/main/Makefile.in 2013-09-01 11:33:47.000000000 +0200
	3	@@ -990,8 +990,14 @@
	4	# a while by putting a link to the driver into /lib of the build tree.
	5	all-local: libEGL.la
	6	$(MKDIR_P) $(top_builddir)/$(LIB_DIR);
	7	- ln -f .libs/libEGL.so.1.0.0 $(top_builddir)/$(LIB_DIR)/libEGL.so.1
	8	- ln -sf libEGL.so.1 $(top_builddir)/$(LIB_DIR)/libEGL.so
	9	+ base=$(basename $<); \
	10	+ dlname=$$(grep dlname= .libs/$< \| cut -d "'" -f 2); \
	11	+ ver=$$(grep current= .libs/$< \| cut -d "=" -f 2); \
	12	+ ln -f .libs/$$dlname $(top_builddir)/$(LIB_DIR)/$$dlname; \
	13	+ if [ ! -f $(top_builddir)/$(LIB_DIR)/$$base.so.$$ver ]; then \
	14	+ ln -sf $$dlname $(top_builddir)/$(LIB_DIR)/$$base.so.$$ver; \
	15	+ fi; \
	16	+ ln -sf $$base.so.$$ver $(top_builddir)/$(LIB_DIR)/$$base.so
	17
	18	# Tell versions [3.59,3.63) of GNU make to not export all variables.
	19	# Otherwise a system limit (for SysV at least) may be exceeded.

Line 0 Link Here

(-)graphics/libGL/files/patch-src_gallium_drivers_r300_r300-chipset.c (+26 lines)
	1	diff --git a/src/gallium/drivers/r300/r300_chipset.c b/src/gallium/drivers/r300/r300_chipset.c
	2	index 11061ed..daf990e 100644
	3	--- src/gallium/drivers/r300/r300_chipset.c
	4	+++ src/gallium/drivers/r300/r300_chipset.c
	5	@@ -48,6 +48,21 @@ static void r300_apply_hyperz_blacklist(struct r300_capabilities* caps)
	6	};
	7	int i;
	8
	9	+#if defined(__DragonFly__) \|\| \
	10	+ defined(__FreeBSD__) \|\| \
	11	+ defined(__NetBSD__) \|\| \
	12	+ defined(__OpenBSD__)
	13	+ const char progname, program_invocation_short_name;
	14	+
	15	+ progname = getprogname();
	16	+ program_invocation_short_name = strrchr(progname, '/');
	17	+ if (program_invocation_short_name) {
	18	+ program_invocation_short_name++;
	19	+ } else {
	20	+ program_invocation_short_name = progname;
	21	+ }
	22	+#endif
	23	+
	24	for (i = 0; i < Elements(list); i++) {
	25	if (strcmp(list[i], program_invocation_short_name) == 0) {
	26	caps->zmask_ram = 0;

Line 0 Link Here

(-)graphics/libGL/files/patch-src_gallium_drivers_r600_r600-asm.c (+15 lines)
	1	--- src/gallium/drivers/r600/r600_asm.c.orig 2013-03-20 00:28:25.000000000 +0100
	2	+++ src/gallium/drivers/r600/r600_asm.c 2013-06-26 23:29:14.000000000 +0200
	3	@@ -27,7 +27,12 @@
	4	#include "r600d.h"
	5
	6	#include <errno.h>
	7	+#if defined(__linux__)
	8	#include <byteswap.h>
	9	+#elif defined(__FreeBSD__)
	10	+#include <sys/endian.h>
	11	+#define bswap_32(x) bswap32((x))
	12	+#endif
	13	#include "util/u_memory.h"
	14	#include "pipe/p_shader_tokens.h"
	15

Line 0 Link Here

(-)graphics/libGL/files/patch-src_gallium_drivers_r600_r600-shader.c (+15 lines)
	1	--- src/gallium/drivers/r600/r600_shader.c.orig 2013-05-16 19:38:54.000000000 +0200
	2	+++ src/gallium/drivers/r600/r600_shader.c 2013-06-26 23:26:02.000000000 +0200
	3	@@ -35,7 +35,12 @@
	4	#include "util/u_memory.h"
	5	#include <stdio.h>
	6	#include <errno.h>
	7	+#if defined(__linux__)
	8	#include <byteswap.h>
	9	+#elif defined(__FreeBSD__)
	10	+#include <sys/endian.h>
	11	+#define bswap_32(x) bswap32((x))
	12	+#endif
	13
	14	/* CAYMAN notes
	15	Why CAYMAN got loops for lots of instructions is explained here.

Line 0 Link Here

(-)graphics/libGL/files/patch-src_gallium_drivers_r600_r600_state_common.c (+15 lines)
	1	--- src/gallium/drivers/r600/r600_state_common.c.orig 2013-03-06 00:25:39.000000000 +0100
	2	+++ src/gallium/drivers/r600/r600_state_common.c 2013-06-26 23:26:02.000000000 +0200
	3	@@ -33,7 +33,12 @@
	4	#include "util/u_memory.h"
	5	#include "util/u_upload_mgr.h"
	6	#include "tgsi/tgsi_parse.h"
	7	+#if defined(__linux__)
	8	#include <byteswap.h>
	9	+#elif defined(__FreeBSD__)
	10	+#include <sys/endian.h>
	11	+#define bswap_32(x) bswap32((x))
	12	+#endif
	13
	14	#define R600_PRIM_RECTANGLE_LIST PIPE_PRIM_MAX
	15

Line 0 Link Here

(-)graphics/libGL/files/patch-src_gallium_drivers_radeon_radeon-llvm-emit.cpp (+28 lines)
	1	--- src/gallium/drivers/radeon/radeon_llvm_emit.cpp.orig 2013-08-19 21:23:06.000000000 +0200
	2	+++ src/gallium/drivers/radeon/radeon_llvm_emit.cpp 2013-08-19 21:30:58.000000000 +0200
	3	@@ -25,13 +25,13 @@
	4	*/
	5	#include "radeon_llvm_emit.h"
	6
	7	-#include <llvm/LLVMContext.h>
	8	-#include <llvm/Module.h>
	9	+#include <llvm/IR/LLVMContext.h>
	10	+#include <llvm/IR/Module.h>
	11	#include <llvm/PassManager.h>
	12	#include <llvm/ADT/Triple.h>
	13	#include <llvm/Support/FormattedStream.h>
	14	#include <llvm/Support/Host.h>
	15	-#include <llvm/Support/IRReader.h>
	16	+#include <llvm/IRReader/IRReader.h>
	17	#include <llvm/Support/SourceMgr.h>
	18	#include <llvm/Support/TargetRegistry.h>
	19	#include <llvm/Support/TargetSelect.h>
	20	@@ -39,7 +39,7 @@
	21	#include <llvm/Target/TargetMachine.h>
	22	#include <llvm/Transforms/Scalar.h>
	23	#include <llvm-c/Target.h>
	24	-#include <llvm/DataLayout.h>
	25	+#include <llvm/IR/DataLayout.h>
	26
	27	#include <iostream>
	28	#include <stdlib.h>

Line 0 Link Here

(-)graphics/libGL/files/patch-src_gallium_drivers_radeonsi_r600-buffer.c (+16 lines)
	1	--- src/gallium/drivers/radeonsi/r600_buffer.c.orig 2013-08-01 00:56:45.000000000 +0200
	2	+++ src/gallium/drivers/radeonsi/r600_buffer.c 2013-08-19 21:36:02.000000000 +0200
	3	@@ -24,7 +24,13 @@
	4	* Jerome Glisse
	5	* Corbin Simpson <MostAwesomeDude@gmail.com>
	6	*/
	7	+
	8	+#if defined(__linux__)
	9	#include <byteswap.h>
	10	+#elif defined(__FreeBSD__)
	11	+#include <sys/endian.h>
	12	+#define bswap_32(x) bswap32((x))
	13	+#endif
	14
	15	#include "pipe/p_screen.h"
	16	#include "util/u_format.h"

Line 0 Link Here

(-)graphics/libGL/files/patch-src_gallium_winsys_svga_drm_vmw-screen-ioctl.c (+18 lines)
	1	diff --git a/src/gallium/winsys/svga/drm/vmw_screen_ioctl.c b/src/gallium/winsys/svga/drm/vmw_screen_ioctl.c
	2	index 36888dc..62a6e6a 100644
	3	--- src/gallium/winsys/svga/drm/vmw_screen_ioctl.c
	4	+++ src/gallium/winsys/svga/drm/vmw_screen_ioctl.c
	5	@@ -66,6 +66,13 @@ struct vmw_region
	6	*/
	7	#define SVGA3D_SURFACE_HINT_SCANOUT (1 << 9)
	8
	9	+#if defined(__DragonFly__) \|\| \
	10	+ defined(__FreeBSD__) \|\| \
	11	+ defined(__NetBSD__) \|\| \
	12	+ defined(__OpenBSD__)
	13	+#define ERESTART EINTR
	14	+#endif
	15	+
	16	uint32
	17	vmw_ioctl_context_create(struct vmw_winsys_screen *vws)
	18	{