mirror of
https://git.freebsd.org/ports.git
synced 2025-06-01 10:56:27 -04:00
- Please welcome Xorg 7.5.2
The Xorg Team is pleased to announce the next round of Xorg updates.
The team created a new flag called WITH_NEW_XORG that users can include
in /etc/make.conf. This was created for the intel KMS work being done
althouthough It probably works for other chips. Unfortunately, the intel
KMS driver will only work on FreeBSD 9(RELENG|STABLE) or 10/HEAD users.
Older version of FreeBSD will not be supported. Intel users will need
to patch their source manually with Konstantin?s KMS kernel patch to get
the newer chips to work. Please carefully read UPDATING entry.
Changes:
- libdrm 2.4.31 (including KMS support)
- mesa 7.11.2
- xorg-server 1.10.6
- a lot of new Graphic Drivers.
I would like to thank:
Koop Mast
Eitan Adler
Niclas Zeising
and all helpers and testers from x11@.
This commit is contained in:
Martin Wilke
parent
5514960022
commit
29e347e197
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=295195
187 changed files with 1027 additions and 738 deletions
|
|
@ -141,6 +141,10 @@ USE_XORG+= pciaccess
|
|||
|
||||
.endif
|
||||
|
||||
.if exists(${LOCALBASE}/bin/X)
|
||||
XSERVER_VER= ${LOCALBASE}/bin/X -version 2>&1 | sed -n 's;^X\.Org X Server \([^ ]*\).*;\1;p'
|
||||
.endif
|
||||
|
||||
.if defined(_POSTMKINCLUDED) && !defined(Xorg_Post_Include)
|
||||
|
||||
Xorg_Post_Include= bsd.xorg.mk
|
||||
|
|
|
|||
12
UPDATING
12
UPDATING
|
|
@ -5,6 +5,18 @@ they are unavoidable.
|
|||
You should get into the habit of checking this file for changes each time
|
||||
you update your ports collection, before attempting any port upgrades.
|
||||
|
||||
20120421:
|
||||
AFFECTS: users of x11/xorg
|
||||
AUTHOR: x11@FreeBSD.org
|
||||
|
||||
The default mesa has been updated to 7.6.1 and the default xorg-server to 1.7.7.
|
||||
A switch is available for people that want to use mesa 7.11.x and xorg-server
|
||||
1.10.6. This requires an nvidia card or Intel+KMS support. If you have an intel
|
||||
card and can try these experimental KMS support patches: 10/head with a
|
||||
patch: http://people.freebsd.org/~kib/drm/
|
||||
FreeBSD stable/9 and releng/9.0
|
||||
http://lists.freebsd.org/pipermail/freebsd-x11/2012-April/011640.html
|
||||
|
||||
20120419:
|
||||
AFFECTS: users of security/openssl
|
||||
AUTHOR: dinoex@FreeBSD.org
|
||||
|
|
|
|||
|
|
@ -14,17 +14,9 @@ COMMENT= OpenGL hardware acceleration drivers for the DRI
|
|||
|
||||
LIB_DEPENDS= drm:${PORTSDIR}/graphics/libdrm \
|
||||
expat.6:${PORTSDIR}/textproc/expat2
|
||||
BUILD_DEPENDS= makedepend:${PORTSDIR}/devel/makedepend
|
||||
|
||||
CONFLICTS= dri-6.2.2005* dri-6.5.2006*
|
||||
MAKE_JOBS_UNSAFE= yes
|
||||
|
||||
USE_XORG= glproto x11 xext xxf86vm xdamage xfixes dri2proto
|
||||
|
||||
EXTRA_PATCHES+= ${FILESDIR}/patch-mach64_context.h \
|
||||
${FILESDIR}/patch-sis_context.h
|
||||
|
||||
|
||||
do-install:
|
||||
cd ${WRKSRC}/src/mesa; ${GMAKE} install-dri
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
SHA256 (MesaLib-7.4.4.tar.bz2) = eaf73d7a3a2dc959ddc0753abaa18160c64bec00b35bf4a0c96040b2072918ec
|
||||
SIZE (MesaLib-7.4.4.tar.bz2) = 3375615
|
||||
SHA256 (MesaLib-7.6.1.tar.bz2) = 701f0e4cb85d6298181651b780d1c0a439fadd02aad29ee6623fc05588bb8d44
|
||||
SIZE (MesaLib-7.6.1.tar.bz2) = 4886995
|
||||
SHA256 (MesaLib-7.11.2.tar.bz2) = 57746aa8c60bc6f5596ec6c6c7274de40fa12edce5ec33fe899e704fa00b5357
|
||||
SIZE (MesaLib-7.11.2.tar.bz2) = 6257280
|
||||
|
|
|
|||
|
|
@ -4,10 +4,11 @@ lib/dri/i915_dri.so
|
|||
lib/dri/i965_dri.so
|
||||
lib/dri/mach64_dri.so
|
||||
lib/dri/mga_dri.so
|
||||
%%NEW%%lib/dri/nouveau_vieux_dri.so
|
||||
lib/dri/r128_dri.so
|
||||
lib/dri/r200_dri.so
|
||||
lib/dri/r300_dri.so
|
||||
%%MESALIB76%%lib/dri/r600_dri.so
|
||||
lib/dri/r600_dri.so
|
||||
lib/dri/radeon_dri.so
|
||||
lib/dri/savage_dri.so
|
||||
lib/dri/sis_dri.so
|
||||
|
|
|
|||
|
|
@ -11,7 +11,6 @@ CATEGORIES= graphics
|
|||
|
||||
COMMENT= OpenGL library that renders using GLX or DRI
|
||||
|
||||
BUILD_DEPENDS+= makedepend:${PORTSDIR}/devel/makedepend
|
||||
LIB_DEPENDS+= drm:${PORTSDIR}/graphics/libdrm \
|
||||
expat.6:${PORTSDIR}/textproc/expat2
|
||||
|
||||
|
|
|
|||
|
|
@ -21,50 +21,57 @@
|
|||
MESAVERSION= ${MESABASEVERSION}${MESASUBVERSION:C/^(.)/.\1/}
|
||||
MESADISTVERSION=${MESABASEVERSION}${MESASUBVERSION:C/^(.)/-\1/}
|
||||
|
||||
.ifdef WITHOUT_NOUVEAU
|
||||
MESABASEVERSION= 7.6.1
|
||||
MESASUBVERSION=
|
||||
PLIST_SUB+= MESALIB76= MESALIB74="@comment "
|
||||
.if defined(WITH_NEW_XORG)
|
||||
MESABASEVERSION= 7.11.2
|
||||
# if there is a subversion, include the '-' between 7.11-rc2 for example.
|
||||
MESASUBVERSION=
|
||||
PLIST_SUB+= OLD="@comment " NEW=""
|
||||
.else
|
||||
MESABASEVERSION= 7.4.4
|
||||
MESASUBVERSION=
|
||||
PLIST_SUB+= MESALIB74= MESALIB76="@comment "
|
||||
EXTRA_PATCHES+= ${PATCHDIR}/mesalib74-configure
|
||||
MESABASEVERSION= 7.6.1
|
||||
MESASUBVERSION=
|
||||
PLIST_SUB+= OLD="" NEW="@comment "
|
||||
.endif
|
||||
|
||||
MASTER_SITES?= ftp://ftp.freedesktop.org/pub/mesa/${MESABASEVERSION}/:mesa,glut,demos
|
||||
MASTER_SITE_SUBDIR= mesa3d
|
||||
DISTFILES= MesaLib-${MESADISTVERSION}${EXTRACT_SUFX}:mesa
|
||||
MASTER_SITES= ftp://ftp.freedesktop.org/pub/mesa/${MESABASEVERSION}/:mesa,glut
|
||||
DISTFILES= MesaLib-${MESADISTVERSION}${EXTRACT_SUFX}:mesa
|
||||
MAINTAINER?= x11@FreeBSD.org
|
||||
|
||||
USE_BZIP2= yes
|
||||
USE_GMAKE= yes
|
||||
BUILD_DEPENDS+= makedepend:${PORTSDIR}/devel/makedepend \
|
||||
${PYTHON_SITELIBDIR}/libxml2.py:${PORTSDIR}/textproc/py-libxml2
|
||||
|
||||
USE_BISON= build
|
||||
USE_PYTHON_BUILD=yes
|
||||
USE_BZIP2= yes
|
||||
USE_GMAKE= yes
|
||||
USE_LDCONFIG= yes
|
||||
GNU_CONFIGURE= yes
|
||||
MAKE_JOBS_SAFE= yes
|
||||
|
||||
CPPFLAGS+= -I${LOCALBASE}/include
|
||||
LDFLAGS+= -L${LOCALBASE}/lib
|
||||
CONFIGURE_ARGS= --disable-gallium
|
||||
CONFIGURE_ARGS+=--enable-gallium-llvm=no --without-gallium-drivers \
|
||||
--disable-egl
|
||||
|
||||
.if defined(WITH_NEW_XORG)
|
||||
EXTRA_PATCHES+= ${PATCHDIR}/extra-mach64_context.h \
|
||||
${PATCHDIR}/extra-sis_context.h \
|
||||
${PATCHDIR}/extra-src-glsl_ir_constant_expression.cpp
|
||||
.else
|
||||
EXTRA_PATCHES+= ${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
|
||||
.endif
|
||||
|
||||
ALL_TARGET= default
|
||||
|
||||
#MAKE_ARGS= SHELL=${SH}
|
||||
#CFLAGS+= -DUSE_XSHM -DHZ=100
|
||||
|
||||
PATCHDIR= ${.CURDIR}/../../graphics/libGL/files
|
||||
WRKSRC= ${WRKDIR}/Mesa-${MESABASEVERSION}
|
||||
WRKSRC= ${WRKDIR}/Mesa-${MESABASEVERSION}${MESASUBVERSION}
|
||||
|
||||
.if !defined(ARCH)
|
||||
ARCH!= uname -p
|
||||
.endif
|
||||
|
||||
.if ${ARCH} == alpha
|
||||
FAST_MATH=
|
||||
.else
|
||||
FAST_MATH= -ffast-math
|
||||
.endif
|
||||
|
||||
COMPONENT= ${PORTNAME:L:C/^lib//:C/mesa-//}
|
||||
|
||||
.if ${COMPONENT:Mglut} == ""
|
||||
|
|
@ -83,13 +90,6 @@ CONFIGURE_ARGS+= --disable-glw
|
|||
CONFIGURE_ARGS+= --enable-motif
|
||||
.endif
|
||||
|
||||
.if ${COMPONENT:Mdemos} == ""
|
||||
CONFIGURE_ARGS+= --with-demos=no
|
||||
.else
|
||||
DISTFILES+= MesaDemos-${MESADISTVERSION}${EXTRACT_SUFX}:demos
|
||||
CONFIGURE_ARGS+= --with-demos=demos,xdemos
|
||||
.endif
|
||||
|
||||
.if ${COMPONENT:Mdri} == ""
|
||||
CONFIGURE_ARGS+= --with-dri-drivers=no
|
||||
.endif
|
||||
|
|
@ -112,10 +112,3 @@ post-patch:
|
|||
@${REINPLACE_CMD} -e 's|[$$](INSTALL_LIB_DIR)/pkgconfig|${PREFIX}/libdata/pkgconfig|' \
|
||||
${WRKSRC}/src/glut/glx/Makefile
|
||||
.endif
|
||||
.if ${COMPONENT:Mdemos} != ""
|
||||
@${REINPLACE_CMD} -e 's|../images/|${DATADIR}/images/|g' \
|
||||
-e 's|geartrain.dat|${DATADIR}/data/geartrain.dat|g' \
|
||||
-e 's|terrain.dat|${DATADIR}/data/terrain.dat|g' \
|
||||
-e 's|isosurf.dat|${DATADIR}/data/isosurf.dat|g' \
|
||||
${WRKSRC}/progs/demos/*.c ${WRKSRC}/progs/xdemos/*.c
|
||||
.endif
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
SHA256 (MesaLib-7.4.4.tar.bz2) = eaf73d7a3a2dc959ddc0753abaa18160c64bec00b35bf4a0c96040b2072918ec
|
||||
SIZE (MesaLib-7.4.4.tar.bz2) = 3375615
|
||||
SHA256 (MesaLib-7.6.1.tar.bz2) = 701f0e4cb85d6298181651b780d1c0a439fadd02aad29ee6623fc05588bb8d44
|
||||
SIZE (MesaLib-7.6.1.tar.bz2) = 4886995
|
||||
SHA256 (MesaLib-7.11.2.tar.bz2) = 57746aa8c60bc6f5596ec6c6c7274de40fa12edce5ec33fe899e704fa00b5357
|
||||
SIZE (MesaLib-7.11.2.tar.bz2) = 6257280
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
--- src/mesa/drivers/dri/mach64/mach64_context.h.orig 2009-01-21 10:55:48.000000000 -0500
|
||||
+++ src/mesa/drivers/dri/mach64/mach64_context.h 2009-01-22 13:48:00.000000000 -0500
|
||||
@@ -288,17 +288,20 @@
|
||||
--- src/mesa/drivers/dri/mach64/mach64_context.h.orig 2011-05-13 01:47:18.000000000 +0200
|
||||
+++ src/mesa/drivers/dri/mach64/mach64_context.h 2011-07-27 09:59:53.000000000 +0200
|
||||
@@ -289,7 +289,7 @@
|
||||
/* ================================================================
|
||||
* Byte ordering
|
||||
*/
|
||||
|
|
@ -9,19 +9,13 @@
|
|||
#define LE32_IN( x ) ( *(GLuint *)(x) )
|
||||
#define LE32_IN_FLOAT( x ) ( *(GLfloat *)(x) )
|
||||
#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__)
|
||||
@@ -298,6 +298,9 @@
|
||||
#if defined(__OpenBSD__) || defined(__NetBSD__)
|
||||
#include <machine/endian.h>
|
||||
#define bswap_32 bswap32
|
||||
+#elif defined(__FreeBSD__)
|
||||
+#include <sys/endian.h>
|
||||
+#define bswap_32 bswap32
|
||||
+#else
|
||||
+#include <byteswap.h>
|
||||
#else
|
||||
#include <byteswap.h>
|
||||
#endif
|
||||
|
||||
#define LE32_IN( x ) bswap_32( *(GLuint *)(x) )
|
||||
|
|
@ -1,13 +1,11 @@
|
|||
--- src/mesa/drivers/dri/sis/sis_context.h.orig 2008-09-22 13:38:53.000000000 +0100
|
||||
+++ src/mesa/drivers/dri/sis/sis_context.h 2008-09-22 13:40:51.000000000 +0100
|
||||
@@ -401,10 +401,20 @@
|
||||
--- src/mesa/drivers/dri/sis/sis_context.h.orig 2010-12-14 22:43:15.000000000 +0100
|
||||
+++ src/mesa/drivers/dri/sis/sis_context.h 2011-07-27 09:58:22.000000000 +0200
|
||||
@@ -400,10 +400,18 @@
|
||||
#define MMIO_READ(reg) *(volatile GLint *)(smesa->IOBase + (reg))
|
||||
#define MMIO_READf(reg) *(volatile GLfloat *)(smesa->IOBase + (reg))
|
||||
|
||||
-#if defined(__i386__) || defined(__x86_64__)
|
||||
+#if defined(__alpha__)
|
||||
+#define MMIO_WMB() __asm __volatile("wmb" : : : "memory")
|
||||
+#elif defined(__i386__) || defined(__x86_64__) || defined(__amd64__)
|
||||
+#if defined(__i386__) || defined(__x86_64__) || defined(__amd64__)
|
||||
#define MMIO_WMB() __asm __volatile("" : : : "memory")
|
||||
#elif defined(__ia64__)
|
||||
#define MMIO_WMB() __asm __volatile("mf" : : : "memory")
|
||||
|
|
@ -0,0 +1,14 @@
|
|||
--- 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)
|
||||
{
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
--- configure.orig 2009-03-28 00:59:46.000000000 +0000
|
||||
+++ configure 2009-04-05 11:53:44.000000000 +0000
|
||||
@@ -5739,7 +5739,7 @@
|
||||
;;
|
||||
*freebsd* | dragonfly*)
|
||||
case "$host_cpu" in
|
||||
- i*86|x86_64) default_driver="dri";;
|
||||
+ i*86|x86_64|powerpc*|sparc*) default_driver="dri";;
|
||||
esac
|
||||
;;
|
||||
esac
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
include/GL/dmesa.h
|
||||
include/GL/ggimesa.h
|
||||
%%OLD%%include/GL/dmesa.h
|
||||
%%OLD%%include/GL/ggimesa.h
|
||||
include/GL/gl.h
|
||||
include/GL/gl_mangle.h
|
||||
include/GL/glext.h
|
||||
|
|
@ -8,11 +8,11 @@ include/GL/glx.h
|
|||
include/GL/glx_mangle.h
|
||||
include/GL/glxext.h
|
||||
include/GL/mesa_wgl.h
|
||||
include/GL/mglmesa.h
|
||||
%%OLD%%include/GL/mglmesa.h
|
||||
include/GL/osmesa.h
|
||||
include/GL/svgamesa.h
|
||||
%%OLD%%include/GL/svgamesa.h
|
||||
include/GL/vms_x_fix.h
|
||||
%%MESALIB76%%include/GL/wglext.h
|
||||
include/GL/wglext.h
|
||||
include/GL/wmesa.h
|
||||
lib/libGL.so
|
||||
lib/libGL.so.1
|
||||
|
|
|
|||
|
|
@ -15,6 +15,7 @@ USE_GL= gl
|
|||
USE_XORG= glproto x11 xext xxf86vm xdamage xfixes dri2proto
|
||||
|
||||
do-install:
|
||||
@${MKDIR} ${PREFIX}/include/GL/
|
||||
cd ${WRKSRC}/src/glu; ${GMAKE} install
|
||||
${INSTALL_DATA} ${WRKSRC}/include/GL/glu*.h ${PREFIX}/include/GL/
|
||||
cd ${WRKSRC}/src/glu; ${GMAKE} install
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
SHA256 (MesaLib-7.4.4.tar.bz2) = eaf73d7a3a2dc959ddc0753abaa18160c64bec00b35bf4a0c96040b2072918ec
|
||||
SIZE (MesaLib-7.4.4.tar.bz2) = 3375615
|
||||
SHA256 (MesaLib-7.6.1.tar.bz2) = 701f0e4cb85d6298181651b780d1c0a439fadd02aad29ee6623fc05588bb8d44
|
||||
SIZE (MesaLib-7.6.1.tar.bz2) = 4886995
|
||||
SHA256 (MesaLib-7.11.2.tar.bz2) = 57746aa8c60bc6f5596ec6c6c7274de40fa12edce5ec33fe899e704fa00b5357
|
||||
SIZE (MesaLib-7.11.2.tar.bz2) = 6257280
|
||||
|
|
|
|||
|
|
@ -7,13 +7,10 @@
|
|||
|
||||
PORTNAME= libGLw
|
||||
PORTVERSION= ${MESAVERSION}
|
||||
PORTREVISION= 1
|
||||
CATEGORIES= graphics
|
||||
|
||||
COMMENT= OpenGL widgets library
|
||||
|
||||
BUILD_DEPENDS+= makedepend:${PORTSDIR}/devel/makedepend
|
||||
|
||||
USE_GL= gl
|
||||
USE_MOTIF= yes
|
||||
USE_XORG= glproto xt x11 xext xxf86vm xdamage xfixes dri2proto
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
SHA256 (MesaLib-7.4.4.tar.bz2) = eaf73d7a3a2dc959ddc0753abaa18160c64bec00b35bf4a0c96040b2072918ec
|
||||
SIZE (MesaLib-7.4.4.tar.bz2) = 3375615
|
||||
SHA256 (MesaLib-7.6.1.tar.bz2) = 701f0e4cb85d6298181651b780d1c0a439fadd02aad29ee6623fc05588bb8d44
|
||||
SIZE (MesaLib-7.6.1.tar.bz2) = 4886995
|
||||
SHA256 (MesaLib-7.11.2.tar.bz2) = 57746aa8c60bc6f5596ec6c6c7274de40fa12edce5ec33fe899e704fa00b5357
|
||||
SIZE (MesaLib-7.11.2.tar.bz2) = 6257280
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
PORTNAME= libdrm
|
||||
PORTVERSION= ${LIBDRM_VERSION}
|
||||
PORTREVISION= 1
|
||||
PORTREVISION= ${LIBDRM_REVISION}
|
||||
CATEGORIES= graphics x11
|
||||
MASTER_SITES= http://dri.freedesktop.org/libdrm/
|
||||
|
||||
|
|
@ -15,29 +15,44 @@ MAINTAINER= x11@FreeBSD.org
|
|||
COMMENT= Userspace interface to kernel Direct Rendering Module services
|
||||
|
||||
BUILD_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/pthread-stubs.pc:${PORTSDIR}/devel/libpthread-stubs
|
||||
LIB_DEPENDS= pciaccess.0:${PORTSDIR}/devel/libpciaccess \
|
||||
pthread-stubs.0:${PORTSDIR}/devel/libpthread-stubs
|
||||
RUN_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/pthread-stubs.pc:${PORTSDIR}/devel/libpthread-stubs
|
||||
|
||||
USE_BZIP2= yes
|
||||
GNU_CONFIGURE= yes
|
||||
USE_LDCONFIG= yes
|
||||
|
||||
CONFIGURE_ARGS= --enable-nouveau-experimental-api
|
||||
|
||||
MAKE_JOBS_SAFE= yes
|
||||
|
||||
.include <bsd.port.pre.mk>
|
||||
.if defined(WITH_NEW_XORG)
|
||||
|
||||
.if defined(WITHOUT_NOUVEAU)
|
||||
LIBDRM_VERSION= 2.4.17
|
||||
CONFIGURE_ARGS= --disable-nouveau-experimental-api \
|
||||
--disable-radeon-experimental-api
|
||||
PLIST_SUB+= NEW= OLD="@comment "
|
||||
OPTIONS= KMS "Enable KMS support (very experimental)" off
|
||||
|
||||
.include <bsd.port.options.mk>
|
||||
|
||||
.if defined(WITH_KMS)
|
||||
CONFIGURE_ARGS+=--enable-libkms
|
||||
EXTRA_PATCHES+= ${FILESDIR}/extra-xf86drmMode.c
|
||||
PLIST_SUB+= KMS=""
|
||||
.else
|
||||
LIBDRM_VERSION= 2.4.12
|
||||
CONFIGURE_ARGS= --enable-nouveau-experimental-api
|
||||
PLIST_SUB+= OLD= NEW="@comment "
|
||||
PLIST_SUB+= KMS="@comment "
|
||||
.endif
|
||||
|
||||
LIBDRM_VERSION= 2.4.31
|
||||
LIBDRM_REVISION=1
|
||||
PLIST_SUB+= OLD="@comment " NEW=""
|
||||
.else
|
||||
LIBDRM_VERSION= 2.4.17
|
||||
LIBDRM_REVISION=0
|
||||
PLIST_SUB+= OLD="" NEW="@comment "
|
||||
.endif
|
||||
|
||||
pre-patch:
|
||||
@${REINPLACE_CMD} 's|{libdir}/pkgconfig|{prefix}/libdata/pkgconfig|g' \
|
||||
${WRKSRC}/configure
|
||||
@${REINPLACE_CMD} 's|{libdir}/pkgconfig|{prefix}/libdata/pkgconfig|g; \
|
||||
12661s/x86_/amd/g' \
|
||||
${WRKSRC}/configure
|
||||
|
||||
.include <bsd.port.post.mk>
|
||||
.include <bsd.port.mk>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
SHA256 (libdrm-2.4.12.tar.bz2) = 89e3b16aff13c5219d13b08f9143793f74777b752d87c760ec6e52fb8676bd31
|
||||
SIZE (libdrm-2.4.12.tar.bz2) = 414175
|
||||
SHA256 (libdrm-2.4.17.tar.bz2) = b8a4e7c610b0e970546d791c06e28882857a49d34698633a89292d7ae142316a
|
||||
SIZE (libdrm-2.4.17.tar.bz2) = 408882
|
||||
SHA256 (libdrm-2.4.31.tar.bz2) = 8fc7e0e5b2f9bf493447a4ef7adc49174a700824457774cb53c1b8f2da866af4
|
||||
SIZE (libdrm-2.4.31.tar.bz2) = 475677
|
||||
|
|
|
|||
29
graphics/libdrm/files/extra-xf86drmMode.c
Normal file
29
graphics/libdrm/files/extra-xf86drmMode.c
Normal file
|
|
@ -0,0 +1,29 @@
|
|||
--- xf86drmMode.c.orig 2010-09-08 14:23:39.000000000 +0200
|
||||
+++ xf86drmMode.c 2011-07-18 18:59:11.000000000 +0200
|
||||
@@ -54,7 +54,7 @@
|
||||
|
||||
static inline DRM_IOCTL(int fd, int cmd, void *arg)
|
||||
{
|
||||
- int ret = drmIoctl(fd, cmd, arg);
|
||||
+ int ret = drmIoctl(fd, (unsigned)cmd, arg);
|
||||
return ret < 0 ? -errno : ret;
|
||||
}
|
||||
|
||||
@@ -659,7 +659,7 @@
|
||||
*/
|
||||
int drmCheckModesettingSupported(const char *busid)
|
||||
{
|
||||
-#ifdef __linux__
|
||||
+#if defined (__linux__)
|
||||
char pci_dev_dir[1024];
|
||||
int domain, bus, dev, func;
|
||||
DIR *sysdir;
|
||||
@@ -709,6 +709,8 @@
|
||||
closedir(sysdir);
|
||||
if (found)
|
||||
return 0;
|
||||
+#elif defined(__FreeBSD__)
|
||||
+ return 0;
|
||||
#endif
|
||||
return -ENOSYS;
|
||||
|
||||
|
|
@ -1,28 +1,53 @@
|
|||
include/drm/drm.h
|
||||
include/drm/drm_mode.h
|
||||
include/drm/drm_sarea.h
|
||||
include/drm/i915_drm.h
|
||||
include/drm/mach64_drm.h
|
||||
include/drm/mga_drm.h
|
||||
include/drm/nouveau_drm.h
|
||||
%%OLD%%include/drm/drm.h
|
||||
%%OLD%%include/drm/drm_mode.h
|
||||
%%OLD%%include/drm/drm_sarea.h
|
||||
%%OLD%%include/drm/i915_drm.h
|
||||
%%OLD%%include/drm/mach64_drm.h
|
||||
%%OLD%%include/drm/mga_drm.h
|
||||
%%OLD%%include/drm/nouveau_drm.h
|
||||
%%OLD%%include/drm/nouveau_drmif.h
|
||||
include/drm/r128_drm.h
|
||||
%%OLD%%include/drm/r300_reg.h
|
||||
include/drm/radeon_drm.h
|
||||
include/drm/savage_drm.h
|
||||
include/drm/sis_drm.h
|
||||
%%OLD%%include/drm/via_3d_reg.h
|
||||
include/drm/via_drm.h
|
||||
%%OLD%%include/drm/xgi_drm.h
|
||||
include/intel_bufmgr.h
|
||||
%%OLD%%include/nouveau/nouveau_bo.h
|
||||
%%OLD%%include/nouveau/nouveau_channel.h
|
||||
%%OLD%%include/drm/r128_drm.h
|
||||
%%OLD%%include/drm/radeon_drm.h
|
||||
%%OLD%%include/drm/savage_drm.h
|
||||
%%OLD%%include/drm/sis_drm.h
|
||||
%%OLD%%include/drm/via_drm.h
|
||||
%%OLD%%include/intel_bufmgr.h
|
||||
%%NEW%%include/libdrm/drm.h
|
||||
%%NEW%%include/libdrm/drm_fourcc.h
|
||||
%%NEW%%include/libdrm/drm_mode.h
|
||||
%%NEW%%include/libdrm/drm_sarea.h
|
||||
%%NEW%%include/libdrm/i915_drm.h
|
||||
%%NEW%%include/libdrm/intel_bufmgr.h
|
||||
%%NEW%%include/libdrm/intel_debug.h
|
||||
%%NEW%%include/libdrm/mach64_drm.h
|
||||
%%NEW%%include/libdrm/mga_drm.h
|
||||
%%NEW%%include/libdrm/nouveau_drm.h
|
||||
%%NEW%%include/libdrm/nouveau_drmif.h
|
||||
%%NEW%%include/libdrm/r128_drm.h
|
||||
%%NEW%%include/libdrm/r600_pci_ids.h
|
||||
%%NEW%%include/libdrm/radeon_bo.h
|
||||
%%NEW%%include/libdrm/radeon_bo_gem.h
|
||||
%%NEW%%include/libdrm/radeon_bo_int.h
|
||||
%%NEW%%include/libdrm/radeon_cs.h
|
||||
%%NEW%%include/libdrm/radeon_cs_gem.h
|
||||
%%NEW%%include/libdrm/radeon_cs_int.h
|
||||
%%NEW%%include/libdrm/radeon_drm.h
|
||||
%%NEW%%include/libdrm/radeon_surface.h
|
||||
%%NEW%%include/libdrm/savage_drm.h
|
||||
%%NEW%%include/libdrm/sis_drm.h
|
||||
%%NEW%%include/libdrm/via_drm.h
|
||||
%%NEW%%%%KMS%%include/libkms/libkms.h
|
||||
include/nouveau/nouveau_bo.h
|
||||
include/nouveau/nouveau_channel.h
|
||||
%%OLD%%include/nouveau/nouveau_class.h
|
||||
%%OLD%%include/nouveau/nouveau_device.h
|
||||
%%OLD%%include/nouveau/nouveau_grobj.h
|
||||
%%OLD%%include/nouveau/nouveau_notifier.h
|
||||
%%OLD%%include/nouveau/nouveau_pushbuf.h
|
||||
%%OLD%%include/nouveau/nouveau_resource.h
|
||||
include/nouveau/nouveau_device.h
|
||||
include/nouveau/nouveau_grobj.h
|
||||
include/nouveau/nouveau_notifier.h
|
||||
include/nouveau/nouveau_pushbuf.h
|
||||
%%NEW%%include/nouveau/nouveau_reloc.h
|
||||
include/nouveau/nouveau_resource.h
|
||||
%%NEW%%include/nouveau/nv04_pushbuf.h
|
||||
%%NEW%%include/nouveau/nvc0_pushbuf.h
|
||||
include/xf86drm.h
|
||||
include/xf86drmMode.h
|
||||
lib/libdrm.la
|
||||
|
|
@ -31,11 +56,21 @@ lib/libdrm.so.2
|
|||
lib/libdrm_intel.la
|
||||
lib/libdrm_intel.so
|
||||
lib/libdrm_intel.so.1
|
||||
%%OLD%%lib/libdrm_nouveau.la
|
||||
%%OLD%%lib/libdrm_nouveau.so
|
||||
%%OLD%%lib/libdrm_nouveau.so.1
|
||||
lib/libdrm_nouveau.la
|
||||
lib/libdrm_nouveau.so
|
||||
lib/libdrm_nouveau.so.1
|
||||
%%NEW%%lib/libdrm_radeon.la
|
||||
%%NEW%%lib/libdrm_radeon.so
|
||||
%%NEW%%lib/libdrm_radeon.so.1
|
||||
%%NEW%%%%KMS%%lib/libkms.la
|
||||
%%NEW%%%%KMS%%lib/libkms.so
|
||||
%%NEW%%%%KMS%%lib/libkms.so.1
|
||||
libdata/pkgconfig/libdrm.pc
|
||||
libdata/pkgconfig/libdrm_intel.pc
|
||||
%%OLD%%libdata/pkgconfig/libdrm_nouveau.pc
|
||||
@dirrm include/drm
|
||||
%%OLD%%@dirrm include/nouveau
|
||||
libdata/pkgconfig/libdrm_nouveau.pc
|
||||
%%NEW%%libdata/pkgconfig/libdrm_radeon.pc
|
||||
%%NEW%%%%KMS%%libdata/pkgconfig/libkms.pc
|
||||
@dirrm include/nouveau
|
||||
%%NEW%%%%KMS%%@dirrm include/libkms
|
||||
%%NEW%%@dirrm include/libdrm
|
||||
%%OLD%%@dirrm include/drm
|
||||
|
|
|
|||
|
|
@ -12,14 +12,12 @@ CATEGORIES= graphics
|
|||
MAINTAINER= x11@FreeBSD.org
|
||||
COMMENT= OpenGL utility toolkit
|
||||
|
||||
CONFLICTS= freeglut-[0-9]*
|
||||
|
||||
USE_GL= glu
|
||||
USE_XORG= glproto x11 xext xxf86vm xdamage xfixes xi xmu dri2proto
|
||||
|
||||
do-install:
|
||||
cd ${WRKSRC}/src/glut/glx; ${GMAKE} install
|
||||
${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \
|
||||
${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \
|
||||
${WRKSRC}/include/GL/glutf90.h \
|
||||
${PREFIX}/include/GL
|
||||
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
SHA256 (MesaLib-7.4.4.tar.bz2) = eaf73d7a3a2dc959ddc0753abaa18160c64bec00b35bf4a0c96040b2072918ec
|
||||
SIZE (MesaLib-7.4.4.tar.bz2) = 3375615
|
||||
SHA256 (MesaGLUT-7.4.4.tar.bz2) = 66c9486d73061ffd8d17a05b6e62851fec575867a99ad8cfc6137c2c16848c2e
|
||||
SIZE (MesaGLUT-7.4.4.tar.bz2) = 328900
|
||||
SHA256 (MesaLib-7.6.1.tar.bz2) = 701f0e4cb85d6298181651b780d1c0a439fadd02aad29ee6623fc05588bb8d44
|
||||
SIZE (MesaLib-7.6.1.tar.bz2) = 4886995
|
||||
SHA256 (MesaGLUT-7.6.1.tar.bz2) = c828f572a4e5c521e87ef265c5d2f1f02ba99ea2307e6323aa8165b152e4eb9d
|
||||
SIZE (MesaGLUT-7.6.1.tar.bz2) = 321756
|
||||
SHA256 (MesaLib-7.11.2.tar.bz2) = 57746aa8c60bc6f5596ec6c6c7274de40fa12edce5ec33fe899e704fa00b5357
|
||||
SIZE (MesaLib-7.11.2.tar.bz2) = 6257280
|
||||
SHA256 (MesaGLUT-7.11.2.tar.bz2) = 46b9fd1c261cbbd090a71ae1db328c37d2ff5118b83c38b8ebc8f150484e94f7
|
||||
SIZE (MesaGLUT-7.11.2.tar.bz2) = 201575
|
||||
|
|
|
|||
|
|
@ -5,25 +5,54 @@
|
|||
# $FreeBSD$
|
||||
#
|
||||
|
||||
PORTNAME= demos
|
||||
PORTVERSION= ${MESAVERSION}
|
||||
PORTNAME= mesa-demos
|
||||
PORTVERSION= 7.6.1
|
||||
CATEGORIES= graphics
|
||||
MASTER_SITES= CRITICAL/mesa3d:mesa,glut,demos
|
||||
PKGNAMEPREFIX= mesa-
|
||||
MASTER_SITES= ftp://ftp.freedesktop.org/pub/mesa/${PORTVERSION}/
|
||||
DISTFILES= MesaLib-${PORTVERSION}${EXTRACT_SUFX} \
|
||||
MesaDemos-${PORTVERSION}${EXTRACT_SUFX}
|
||||
|
||||
MAINTAINER= x11@FreeBSD.org
|
||||
COMMENT= OpenGL demos distributed with Mesa
|
||||
|
||||
USE_BZIP2= yes
|
||||
USE_GMAKE= yes
|
||||
USE_LDCONFIG= yes
|
||||
GNU_CONFIGURE= yes
|
||||
MAKE_JOBS_SAFE= yes
|
||||
USE_GL= glu glut
|
||||
USE_XORG= glproto x11 xext xxf86vm xdamage xfixes dri2proto
|
||||
CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
|
||||
CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
|
||||
CONFIGURE_ARGS= --disable-gallium --with-demos=demos,xdemos
|
||||
|
||||
#ALL_TARGET= yes
|
||||
|
||||
WRKSRC= ${WRKDIR}/Mesa-${PORTVERSION}/
|
||||
|
||||
DATADIR= ${PREFIX}/share/${PKGNAMEPREFIX}${PORTNAME}
|
||||
|
||||
OPTIONS= NVIDIA_GL "Use NVIDIA's libraries" off
|
||||
|
||||
EXTRA_PATCHES+= ${FILESDIR}/patch-progs-xdemos-glxpixmap.c \
|
||||
${FILESDIR}/patch-progs-xdemos-yuvrect_client.c
|
||||
.if defined(WITHOUT_XCB)
|
||||
CONFIGURE_ARGS+= --disable-xcb
|
||||
.else
|
||||
CONFIGURE_ARGS+= --enable-xcb
|
||||
.endif
|
||||
|
||||
post-patch:
|
||||
@${REINPLACE_CMD} -e 's|-ffast-math|${FAST_MATH}|' -e 's|x86_64|amd64|' \
|
||||
${WRKSRC}/configure
|
||||
@${REINPLACE_CMD} -e 's|[$$](INSTALL_LIB_DIR)/pkgconfig|${PREFIX}/libdata/pkgconfig|' \
|
||||
${WRKSRC}/src/glu/Makefile \
|
||||
${WRKSRC}/src/glw/Makefile \
|
||||
${WRKSRC}/src/mesa/Makefile \
|
||||
${WRKSRC}/src/mesa/drivers/dri/Makefile
|
||||
@${REINPLACE_CMD} -e 's|../images/|${DATADIR}/images/|g' \
|
||||
-e 's|geartrain.dat|${DATADIR}/data/geartrain.dat|g' \
|
||||
-e 's|terrain.dat|${DATADIR}/data/terrain.dat|g' \
|
||||
-e 's|isosurf.dat|${DATADIR}/data/isosurf.dat|g' \
|
||||
${WRKSRC}/progs/demos/*.c ${WRKSRC}/progs/xdemos/*.c
|
||||
|
||||
do-install:
|
||||
@for i in demos xdemos; do \
|
||||
|
|
@ -45,13 +74,14 @@ do-install:
|
|||
${INSTALL_DATA} $$i ${DATADIR}/data; \
|
||||
done
|
||||
|
||||
.include "${.CURDIR}/../../graphics/libGL/bsd.mesalib.mk"
|
||||
.include <bsd.port.pre.mk>
|
||||
CPPFLAGS+= ${PTHREAD_CFLAGS} -I${LOCALBASE}/include
|
||||
LDFLAGS+= ${PTHREAD_LIBS} -L${LOCALBASE}/lib
|
||||
|
||||
.if defined(WITH_NVIDIA_GL)
|
||||
CFLAGS+= -DWITH_NVIDIA_GL=1
|
||||
.endif
|
||||
|
||||
.if !defined(ARCH)
|
||||
ARCH!= uname -p
|
||||
.endif
|
||||
|
||||
.include <bsd.port.post.mk>
|
||||
|
|
|
|||
|
|
@ -1,7 +1,3 @@
|
|||
SHA256 (MesaLib-7.4.4.tar.bz2) = eaf73d7a3a2dc959ddc0753abaa18160c64bec00b35bf4a0c96040b2072918ec
|
||||
SIZE (MesaLib-7.4.4.tar.bz2) = 3375615
|
||||
SHA256 (MesaDemos-7.4.4.tar.bz2) = 2b055f1b364795caec122092dedca9ac3ecce4fcf61947f52a286a681e9d1111
|
||||
SIZE (MesaDemos-7.4.4.tar.bz2) = 1367659
|
||||
SHA256 (MesaLib-7.6.1.tar.bz2) = 701f0e4cb85d6298181651b780d1c0a439fadd02aad29ee6623fc05588bb8d44
|
||||
SIZE (MesaLib-7.6.1.tar.bz2) = 4886995
|
||||
SHA256 (MesaDemos-7.6.1.tar.bz2) = d2368fc86d032dc6478df70f99b114abdf6c0c1da57bf1d3927ab179876f9c4b
|
||||
|
|
|
|||
|
|
@ -1,30 +0,0 @@
|
|||
# Configuration for mesa-demos port for FreeBSD
|
||||
# Taken from Mesa CVS mesa/Mesa/configs/freebsd Rev 1.2
|
||||
# $FreeBSD$
|
||||
#
|
||||
|
||||
# Set and remember $CFLAGS, $CXXFLAGS, $CC and $CXX before they are
|
||||
# overriden in default include
|
||||
|
||||
_CC := $(CC)
|
||||
_CXX := $(CXX)
|
||||
_CFLAGS := -fPIC -pedantic -I$(LOCALBASE)/include -DUSE_XSHM -DHZ=100 $(CFLAGS) \
|
||||
-DPTHREADS $(PTHREAD_CFLAGS)
|
||||
_CXXFLAGS := -fPIC -pedantic $(CXXFLAGS)
|
||||
|
||||
include $(TOP)/configs/default
|
||||
|
||||
CONFIG_NAME = FreeBSD
|
||||
|
||||
# Now reset compiler and flags
|
||||
CC = $(_CC)
|
||||
CXX = $(_CXX)
|
||||
CFLAGS = $(_CFLAGS)
|
||||
CXXFLAGS = $(_CXXFLAGS)
|
||||
|
||||
GLUT_CFLAGS = -fexceptions
|
||||
|
||||
LIB_DIR = $(LOCALBASE)/lib
|
||||
|
||||
APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lXext -lXmu -lXi -lX11 -lm $(PTHREAD_LIBS)
|
||||
|
||||
|
|
@ -0,0 +1,12 @@
|
|||
--- ./src/mesa/x86-64/glapi_x86-64.S.orig 2009-03-13 04:28:49.000000000 +0100
|
||||
+++ ./src/mesa/x86-64/glapi_x86-64.S 2011-01-28 18:12:18.000000000 +0100
|
||||
@@ -73,7 +73,8 @@ _x86_64_get_dispatch:
|
||||
|
||||
.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)
|
||||
74
graphics/mesa-demos/files/patch-src__mesa__x86-64__xform4.S
Normal file
74
graphics/mesa-demos/files/patch-src__mesa__x86-64__xform4.S
Normal file
|
|
@ -0,0 +1,74 @@
|
|||
--- src/mesa/x86-64/xform4.S.orig 2009-01-22 18:38:35.000000000 +0100
|
||||
+++ src/mesa/x86-64/xform4.S 2011-05-09 21:26:00.000000000 +0200
|
||||
@@ -53,7 +53,7 @@ _mesa_x86_64_transform_points4_general:
|
||||
* rdx = 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 */
|
||||
11
graphics/mesa-demos/files/patch-src__mesa__x86__glapi_x86.S
Normal file
11
graphics/mesa-demos/files/patch-src__mesa__x86__glapi_x86.S
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
--- ./src/mesa/x86/glapi_x86.S.orig 2009-03-13 04:28:49.000000000 +0100
|
||||
+++ ./src/mesa/x86/glapi_x86.S 2011-01-28 18:11:56.000000000 +0100
|
||||
@@ -47,7 +47,7 @@
|
||||
#define GL_OFFSET(x) CODEPTR(REGOFF(4 * x, EAX))
|
||||
|
||||
#if defined(GNU_ASSEMBLER) && !defined(__DJGPP__) && !defined(__MINGW32__)
|
||||
-#define GLOBL_FN(x) GLOBL x ; .type x, function
|
||||
+#define GLOBL_FN(x) GLOBL x ; .type x, @function
|
||||
#else
|
||||
#define GLOBL_FN(x) GLOBL x
|
||||
#endif
|
||||
|
|
@ -0,0 +1,11 @@
|
|||
--- ./src/mesa/x86/read_rgba_span_x86.S.orig 2008-08-25 16:46:47.000000000 +0200
|
||||
+++ ./src/mesa/x86/read_rgba_span_x86.S 2011-01-28 18:10:06.000000000 +0100
|
||||
@@ -648,7 +648,7 @@ _generic_read_RGBA_span_RGB565_MMX:
|
||||
testl $0x01, %ecx
|
||||
je .L01
|
||||
|
||||
- movzxw (%eax), %ecx
|
||||
+ movzwl (%eax), %ecx
|
||||
movd %ecx, %mm4
|
||||
|
||||
pshufw $0x00, %mm4, %mm0
|
||||
|
|
@ -6,11 +6,11 @@ bin/clearspd
|
|||
bin/copypix
|
||||
bin/corender
|
||||
bin/cubemap
|
||||
%%MESALIB76%%bin/dinoshade
|
||||
bin/dinoshade
|
||||
bin/drawpix
|
||||
bin/engine
|
||||
bin/fbo_firecube
|
||||
%%MESALIB76%%bin/fbotexture
|
||||
bin/fbotexture
|
||||
bin/fire
|
||||
bin/fogcoord
|
||||
bin/fplight
|
||||
|
|
@ -21,11 +21,9 @@ bin/gears
|
|||
bin/geartrain
|
||||
bin/glinfo
|
||||
bin/gloss
|
||||
%%MESALIB74%%bin/glslnoise
|
||||
bin/glsync
|
||||
bin/gltestperf
|
||||
bin/glthreads
|
||||
%%MESALIB74%%bin/glutfx
|
||||
bin/glxcontexts
|
||||
bin/glxdemo
|
||||
bin/glxgears
|
||||
|
|
@ -43,14 +41,14 @@ bin/lodbias
|
|||
bin/manywin
|
||||
bin/morph3d
|
||||
bin/multiarb
|
||||
%%MESALIB76%%bin/multictx
|
||||
bin/multictx
|
||||
bin/offset
|
||||
bin/overlay
|
||||
bin/paltex
|
||||
bin/pbdemo
|
||||
bin/pbinfo
|
||||
bin/pointblast
|
||||
%%MESALIB76%%bin/projtex
|
||||
bin/projtex
|
||||
bin/rain
|
||||
bin/ray
|
||||
bin/readpix
|
||||
|
|
@ -58,21 +56,18 @@ bin/reflect
|
|||
bin/renormal
|
||||
bin/shadowtex
|
||||
bin/sharedtex
|
||||
%%MESALIB76%%bin/sharedtex_mt
|
||||
bin/sharedtex_mt
|
||||
bin/singlebuffer
|
||||
bin/spectex
|
||||
bin/spriteblast
|
||||
bin/stex3d
|
||||
%%MESALIB74%%bin/streaming_rect
|
||||
bin/teapot
|
||||
bin/terrain
|
||||
bin/tessdemo
|
||||
bin/texcyl
|
||||
%%MESALIB74%%bin/texdown
|
||||
bin/texenv
|
||||
%%MESALIB74%%bin/texobj
|
||||
bin/texture_from_pixmap
|
||||
%%MESALIB76%%bin/textures
|
||||
bin/textures
|
||||
bin/trispd
|
||||
bin/tunnel
|
||||
bin/tunnel2
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@
|
|||
|
||||
PORTNAME= input-wacom
|
||||
PORTVERSION= ${KLD_VERSION}.${WACOM_VERSION:C/-/./g}
|
||||
PORTREVISION= 1
|
||||
CATEGORIES= x11-drivers kld
|
||||
MASTER_SITES= http://www.chillt.de/bsdwacom/:bsdwacom \
|
||||
SF/linuxwacom/xf86-input-wacom/:linuxwacom
|
||||
|
|
|
|||
|
|
@ -6,14 +6,14 @@
|
|||
#
|
||||
|
||||
PORTNAME= xf86-input-acecad
|
||||
PORTVERSION= 1.4.0
|
||||
PORTREVISION= 1
|
||||
PORTVERSION= 1.5.0
|
||||
CATEGORIES= x11-drivers
|
||||
|
||||
MAINTAINER= x11@FreeBSD.org
|
||||
COMMENT= X.Org acecad input driver
|
||||
|
||||
XORG_CAT= driver
|
||||
USE_XORG= xextproto videoproto
|
||||
MAN4= acecad.4x
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
|
|
|||
|
|
@ -1,2 +1,2 @@
|
|||
SHA256 (xorg/driver/xf86-input-acecad-1.4.0.tar.bz2) = 48341d8b6b0060228134b36543986c949ea828d6ce6d0484d29b3dde9ddbd556
|
||||
SIZE (xorg/driver/xf86-input-acecad-1.4.0.tar.bz2) = 255888
|
||||
SHA256 (xorg/driver/xf86-input-acecad-1.5.0.tar.bz2) = c3032f38a07b54772299ce8832e16109a685ee63eeefbb17cef9fe1dd100a448
|
||||
SIZE (xorg/driver/xf86-input-acecad-1.5.0.tar.bz2) = 262818
|
||||
|
|
|
|||
|
|
@ -24,4 +24,8 @@ MAN4= egalax.4x
|
|||
IGNORE= is useless without uep(4) kernel driver
|
||||
.endif
|
||||
|
||||
.if defined(WITH_NEW_XORG)
|
||||
IGNORE= does not build with X server 1.10
|
||||
.endif
|
||||
|
||||
.include <bsd.port.post.mk>
|
||||
|
|
|
|||
|
|
@ -1,3 +1 @@
|
|||
This package contains the X.Org xf86-input-egalax driver. See also uep(4).
|
||||
|
||||
WWW: http://home.eeti.com.tw/web20/eGalaxTouchDriver/linuxDriver.htm
|
||||
|
|
|
|||
|
|
@ -6,13 +6,23 @@
|
|||
#
|
||||
|
||||
PORTNAME= xf86-input-elographics
|
||||
PORTVERSION= 1.2.4
|
||||
PORTVERSION= ${ELO_VERSION}
|
||||
PORTREVISION= ${ELO_REVISION}
|
||||
CATEGORIES= x11-drivers
|
||||
|
||||
MAINTAINER= x11@FreeBSD.org
|
||||
COMMENT= X.Org elographics input driver
|
||||
|
||||
XORG_CAT= driver
|
||||
USE_XORG= xextproto videoproto
|
||||
MAN4= elographics.4x
|
||||
|
||||
.if defined(WITH_NEW_XORG)
|
||||
ELO_VERSION= 1.3.0
|
||||
ELO_REVISION= 0
|
||||
.else
|
||||
ELO_VERSION= 1.2.4
|
||||
ELO_REVISION= 0
|
||||
.endif
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
|
|
|||
|
|
@ -1,2 +1,4 @@
|
|||
SHA256 (xorg/driver/xf86-input-elographics-1.2.4.tar.bz2) = dfede47c14c40e51294c84bf8f9bec5f5e0b17c80f370ae2ac6bddad79f9e66b
|
||||
SIZE (xorg/driver/xf86-input-elographics-1.2.4.tar.bz2) = 259101
|
||||
SHA256 (xorg/driver/xf86-input-elographics-1.3.0.tar.bz2) = 8c0bb3864a8fbc696c8f3d5442b2f20db1249a6ca23f5d020639f2cbcfe4ab9e
|
||||
SIZE (xorg/driver/xf86-input-elographics-1.3.0.tar.bz2) = 276070
|
||||
|
|
|
|||
|
|
@ -6,13 +6,25 @@
|
|||
#
|
||||
|
||||
PORTNAME= xf86-input-hyperpen
|
||||
PORTVERSION= 1.3.0
|
||||
PORTREVISION= 5
|
||||
PORTVERSION= ${HYPERVER}
|
||||
PORTREVISION= ${HYPERREVISION}
|
||||
CATEGORIES= x11-drivers
|
||||
|
||||
MAINTAINER= x11@FreeBSD.org
|
||||
COMMENT= X.Org hyperpen input driver
|
||||
|
||||
XORG_CAT= driver
|
||||
USE_XORG= xextproto videoproto
|
||||
|
||||
.if defined(WITH_NEW_XORG)
|
||||
HYPERVER= 1.4.1
|
||||
HYPERREVISION= 0
|
||||
EXTRA_PATCHES+= ${FILESDIR}/extra-patch-src_xf86HyperPen.c
|
||||
|
||||
.else
|
||||
HYPERVER= 1.3.0
|
||||
HYPERREVISION= 6
|
||||
EXTRA_PATCHES+= ${FILESDIR}/extra-patch-src_xf86HyperPen.c
|
||||
.endif
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
|
|
|||
|
|
@ -1,2 +1,4 @@
|
|||
SHA256 (xorg/driver/xf86-input-hyperpen-1.3.0.tar.bz2) = e7a13a7597fa32f05d595d05a66cf94c529ba8ce1d03249bb9da5be9512c4b7b
|
||||
SIZE (xorg/driver/xf86-input-hyperpen-1.3.0.tar.bz2) = 236593
|
||||
SHA256 (xorg/driver/xf86-input-hyperpen-1.4.1.tar.bz2) = 31a816f032a2adf4be10909811831191a7528152347e1726b04810ff88436816
|
||||
SIZE (xorg/driver/xf86-input-hyperpen-1.4.1.tar.bz2) = 266891
|
||||
|
|
|
|||
|
|
@ -6,16 +6,25 @@
|
|||
#
|
||||
|
||||
PORTNAME= xf86-input-joystick
|
||||
PORTVERSION= 1.5.0
|
||||
PORTREVISION= 1
|
||||
PORTVERSION= ${JOYVER}
|
||||
PORTREVISION= ${JOYREVISION}
|
||||
CATEGORIES= x11-drivers
|
||||
|
||||
MAINTAINER= x11@FreeBSD.org
|
||||
COMMENT= X.Org joystick input driver
|
||||
|
||||
XORG_CAT= driver
|
||||
USE_XORG= xextproto videoproto
|
||||
MAN4= joystick.4x
|
||||
|
||||
.if defined(WITH_NEW_XORG)
|
||||
JOYVER= 1.6.0
|
||||
JOYREVISION= 0
|
||||
.else
|
||||
JOYVER= 1.5.0
|
||||
JOYREVISION= 1
|
||||
.endif
|
||||
|
||||
post-patch:
|
||||
@${REINPLACE_CMD} -e 's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g' \
|
||||
${WRKSRC}/Makefile.in
|
||||
|
|
|
|||
|
|
@ -1,2 +1,4 @@
|
|||
SHA256 (xorg/driver/xf86-input-joystick-1.5.0.tar.bz2) = 718118c5d769529f604c1ff099fe637173442cf01fc40bdef7d45f4baea282a9
|
||||
SIZE (xorg/driver/xf86-input-joystick-1.5.0.tar.bz2) = 283763
|
||||
SHA256 (xorg/driver/xf86-input-joystick-1.6.0.tar.bz2) = 4f1c15ec7372dd340ec7e1a8ca19d75148896ee3883184c3663cbaa12cf738f1
|
||||
SIZE (xorg/driver/xf86-input-joystick-1.6.0.tar.bz2) = 310552
|
||||
|
|
|
|||
|
|
@ -6,14 +6,14 @@
|
|||
#
|
||||
|
||||
PORTNAME= xf86-input-keyboard
|
||||
PORTVERSION= 1.5.0
|
||||
PORTVERSION= 1.6.1
|
||||
CATEGORIES= x11-drivers
|
||||
|
||||
MAINTAINER= x11@FreeBSD.org
|
||||
COMMENT= X.Org keyboard input driver
|
||||
|
||||
XORG_CAT= driver
|
||||
USE_XORG= kbproto
|
||||
USE_XORG= kbproto xextproto videoproto
|
||||
MAN4= kbd.4x
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
|
|
|||
|
|
@ -1,2 +1,2 @@
|
|||
SHA256 (xorg/driver/xf86-input-keyboard-1.5.0.tar.bz2) = 2303510e905465ebee91f22cdd75706a15afb108258bc220c7500f213de19cb0
|
||||
SIZE (xorg/driver/xf86-input-keyboard-1.5.0.tar.bz2) = 301181
|
||||
SHA256 (xorg/driver/xf86-input-keyboard-1.6.1.tar.bz2) = aa9ec96e7f7f87bc086cb86b871ee6f4b9a7809fb1e7d50d0abbd7c2e50a8cc3
|
||||
SIZE (xorg/driver/xf86-input-keyboard-1.6.1.tar.bz2) = 304166
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
PORTNAME= xf86-input-magictouch
|
||||
PORTVERSION= 1.0.0.5
|
||||
PORTREVISION= 7
|
||||
PORTREVISION= 8
|
||||
CATEGORIES= x11-drivers
|
||||
|
||||
MAINTAINER= x11@FreeBSD.org
|
||||
|
|
|
|||
|
|
@ -6,13 +6,16 @@
|
|||
#
|
||||
|
||||
PORTNAME= xf86-input-mouse
|
||||
PORTVERSION= 1.6.0
|
||||
PORTVERSION= 1.7.1
|
||||
CATEGORIES= x11-drivers
|
||||
|
||||
MAINTAINER= x11@FreeBSD.org
|
||||
COMMENT= X.Org mouse input driver
|
||||
|
||||
CONFIGURE_ARGS+=--disable-silent-rules
|
||||
|
||||
XORG_CAT= driver
|
||||
USE_XORG= xextproto videoproto
|
||||
MAN4= mousedrv.4x
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
|
|
|||
|
|
@ -1,2 +1,2 @@
|
|||
SHA256 (xorg/driver/xf86-input-mouse-1.6.0.tar.bz2) = c7ae245e5168276346145f196d1d1faed618f41d5174a2031c71fab6e1a2fbdb
|
||||
SIZE (xorg/driver/xf86-input-mouse-1.6.0.tar.bz2) = 316953
|
||||
SHA256 (xorg/driver/xf86-input-mouse-1.7.1.tar.bz2) = d2c5b4b9bf03f8f7ef7b37bab25197d3f99a4d889c61bb67a68df33ec2c2ff12
|
||||
SIZE (xorg/driver/xf86-input-mouse-1.7.1.tar.bz2) = 319429
|
||||
|
|
|
|||
|
|
@ -6,14 +6,20 @@
|
|||
#
|
||||
|
||||
PORTNAME= xf86-input-mutouch
|
||||
PORTVERSION= 1.2.1
|
||||
PORTREVISION= 6
|
||||
PORTVERSION= 1.3.0
|
||||
CATEGORIES= x11-drivers
|
||||
|
||||
MAINTAINER= x11@FreeBSD.org
|
||||
COMMENT= X.Org mutouch input driver
|
||||
|
||||
XORG_CAT= driver
|
||||
USE_XORG= xextproto videoproto
|
||||
MAN4= mutouch.4x
|
||||
|
||||
.if !defined(WITH_NEW_XORG)
|
||||
IGNORE= does not build with xorg-server 1.7.7
|
||||
.else
|
||||
|
||||
.endif
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
|
|
|||
|
|
@ -1,2 +1,2 @@
|
|||
SHA256 (xorg/driver/xf86-input-mutouch-1.2.1.tar.bz2) = 53bfe976042de69f87e28261ad581cf418c67b5cb69a09cfe1eea169021db35b
|
||||
SIZE (xorg/driver/xf86-input-mutouch-1.2.1.tar.bz2) = 246240
|
||||
SHA256 (xorg/driver/xf86-input-mutouch-1.3.0.tar.bz2) = e28907ec71f010353550e897c7a1f161b59969c6ad84379fb5285e032448a43c
|
||||
SIZE (xorg/driver/xf86-input-mutouch-1.3.0.tar.bz2) = 268865
|
||||
|
|
|
|||
|
|
@ -1,70 +0,0 @@
|
|||
--- src/xf86MuTouch.c.orig 2010-05-03 13:16:26.000000000 -0500
|
||||
+++ src/xf86MuTouch.c 2010-05-03 13:16:34.000000000 -0500
|
||||
@@ -426,9 +426,9 @@
|
||||
* or we will feed X with quite bogus event positions.
|
||||
*/
|
||||
if (priv->x_inverted)
|
||||
- cur_x = priv->max_x - cur_x;
|
||||
+ cur_x = priv->max_x - cur_x + priv->min_x;
|
||||
if (priv->y_inverted)
|
||||
- cur_y = priv->max_y - cur_y;
|
||||
+ cur_y = priv->max_y - cur_y + priv->min_y;
|
||||
xf86PostMotionEvent(local_to_use->dev, TRUE, 0, 2, cur_x, cur_y);
|
||||
|
||||
/*
|
||||
@@ -749,6 +749,10 @@
|
||||
unsigned char req[MuT_PACKET_SIZE];
|
||||
unsigned char reply[MuT_BUFFER_SIZE];
|
||||
char *id_string = DEVICE_ID(local->private_flags) == FINGER_ID ? "finger" : "stylus";
|
||||
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
|
||||
+ Atom btn_label;
|
||||
+ Atom axis_labels[2] = { 0, 0 };
|
||||
+#endif
|
||||
|
||||
switch(mode) {
|
||||
|
||||
@@ -766,7 +770,11 @@
|
||||
/*
|
||||
* Device reports button press for up to 1 button.
|
||||
*/
|
||||
- if (InitButtonClassDeviceStruct(dev, 1, map) == FALSE) {
|
||||
+ if (InitButtonClassDeviceStruct(dev, 1,
|
||||
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
|
||||
+ &btn_label,
|
||||
+#endif
|
||||
+ map) == FALSE) {
|
||||
ErrorF("Unable to allocate ButtonClassDeviceStruct\n");
|
||||
return !Success;
|
||||
}
|
||||
@@ -779,6 +787,9 @@
|
||||
* screen to fit one meter.
|
||||
*/
|
||||
if (InitValuatorClassDeviceStruct(dev, 2,
|
||||
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
|
||||
+ axis_labels,
|
||||
+#endif
|
||||
#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3
|
||||
xf86GetMotionEvents,
|
||||
#endif
|
||||
@@ -787,11 +798,19 @@
|
||||
return !Success;
|
||||
}
|
||||
else {
|
||||
- InitValuatorAxisStruct(dev, 0, priv->min_x, priv->max_x,
|
||||
+ InitValuatorAxisStruct(dev, 0,
|
||||
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
|
||||
+ axis_labels[0],
|
||||
+#endif
|
||||
+ priv->min_x, priv->max_x,
|
||||
9500,
|
||||
0 /* min_res */,
|
||||
9500 /* max_res */);
|
||||
- InitValuatorAxisStruct(dev, 1, priv->min_y, priv->max_y,
|
||||
+ InitValuatorAxisStruct(dev, 1,
|
||||
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
|
||||
+ axis_labels[1],
|
||||
+#endif
|
||||
+ priv->min_y, priv->max_y,
|
||||
10500,
|
||||
0 /* min_res */,
|
||||
10500 /* max_res */);
|
||||
|
|
@ -6,14 +6,23 @@
|
|||
#
|
||||
|
||||
PORTNAME= xf86-input-penmount
|
||||
PORTVERSION= 1.4.1
|
||||
PORTREVISION= 1
|
||||
PORTVERSION= ${PEN_VERSION}
|
||||
PORTREVISION= ${PEN_REVISION}
|
||||
CATEGORIES= x11-drivers
|
||||
|
||||
MAINTAINER= x11@FreeBSD.org
|
||||
COMMENT= X.Org penmount input driver
|
||||
|
||||
XORG_CAT= driver
|
||||
USE_XORG= xextproto videoproto
|
||||
MAN4= penmount.4x
|
||||
|
||||
.if defined(WITH_NEW_XORG)
|
||||
PEN_VERSION= 1.5.0
|
||||
PEN_REVISION= 0
|
||||
.else
|
||||
PEN_VERSION= 1.4.1
|
||||
PEN_REVISION= 1
|
||||
.endif
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
|
|
|||
|
|
@ -1,2 +1,4 @@
|
|||
SHA256 (xorg/driver/xf86-input-penmount-1.4.1.tar.bz2) = 6f281a7bce9db34772bcf762eb0ed57b8121a204a6f15d5405fe870a0af57182
|
||||
SIZE (xorg/driver/xf86-input-penmount-1.4.1.tar.bz2) = 255951
|
||||
SHA256 (xorg/driver/xf86-input-penmount-1.5.0.tar.bz2) = f45a85911a59647ba24f84c15f49d31d5f62a9bb86ca56881bf3ecbc21113ce7
|
||||
SIZE (xorg/driver/xf86-input-penmount-1.5.0.tar.bz2) = 276864
|
||||
|
|
|
|||
|
|
@ -1 +1,4 @@
|
|||
This package contains the X.Org xf86-input-penmount driver.
|
||||
|
||||
- Florent Thoumie
|
||||
flz@FreeBSD.org
|
||||
|
|
|
|||
|
|
@ -6,8 +6,7 @@
|
|||
#
|
||||
|
||||
PORTNAME= xf86-input-synaptics
|
||||
PORTVERSION= 1.2.1
|
||||
PORTREVISION= 1
|
||||
PORTVERSION= 1.5.0
|
||||
CATEGORIES= x11-drivers
|
||||
|
||||
MAINTAINER= x11@FreeBSD.org
|
||||
|
|
@ -15,8 +14,10 @@ COMMENT= X.Org synaptics input driver
|
|||
|
||||
CONFLICTS= synaptics-[0-9]*
|
||||
|
||||
LIB_DEPENDS+= hal.1:${PORTSDIR}/sysutils/hal
|
||||
|
||||
USE_GNOME= gnomehack
|
||||
USE_XORG= x11
|
||||
USE_XORG= x11 xextproto videoproto
|
||||
XORG_CAT= driver
|
||||
|
||||
MAN1= syndaemon.1 \
|
||||
|
|
@ -25,7 +26,13 @@ MAN4= synaptics.4x
|
|||
|
||||
post-install:
|
||||
${MKDIR} ${PREFIX}/share/hal/fdi/policy/10osvendor
|
||||
${INSTALL_DATA} ${WRKSRC}/fdi/11-x11-synaptics.fdi \
|
||||
${INSTALL_DATA} ${WRKSRC}/conf/11-x11-synaptics.fdi \
|
||||
${PREFIX}/share/hal/fdi/policy/10osvendor/
|
||||
|
||||
.if defined(WITH_NEW_XORG)
|
||||
PLIST_SUB+= NEW="" OLD="@comment "
|
||||
.else
|
||||
PLIST_SUB+= NEW="@comment " OLD=""
|
||||
.endif
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
|
|
|||
|
|
@ -1,2 +1,2 @@
|
|||
SHA256 (xorg/driver/xf86-input-synaptics-1.2.1.tar.bz2) = a63b48c5c8eb09416b941dea591a948e111d1b2e14d4620f25377cf47cf877e6
|
||||
SIZE (xorg/driver/xf86-input-synaptics-1.2.1.tar.bz2) = 295524
|
||||
SHA256 (xorg/driver/xf86-input-synaptics-1.5.0.tar.bz2) = 95cc5399fc49c9a35b02c2272cd99b8438f4609b219278c66a79e74c916a1c4e
|
||||
SIZE (xorg/driver/xf86-input-synaptics-1.5.0.tar.bz2) = 431123
|
||||
|
|
|
|||
|
|
@ -5,7 +5,9 @@ include/xorg/synaptics.h
|
|||
lib/xorg/modules/input/synaptics_drv.la
|
||||
lib/xorg/modules/input/synaptics_drv.so
|
||||
libdata/pkgconfig/xorg-synaptics.pc
|
||||
%%NEW%%share/X11/xorg.conf.d/50-synaptics.conf
|
||||
share/hal/fdi/policy/10osvendor/11-x11-synaptics.fdi
|
||||
%%OLD%%share/hal/fdi/policy/20thirdparty/11-x11-synaptics.fdi
|
||||
@dirrmtry lib/xorg/modules/input
|
||||
@dirrmtry lib/xorg/modules
|
||||
@dirrmtry lib/xorg
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
PORTNAME= xf86-input-vmmouse
|
||||
PORTVERSION= 12.6.9
|
||||
PORTREVISION= 1
|
||||
PORTREVISION= 2
|
||||
CATEGORIES= x11-drivers
|
||||
|
||||
MAINTAINER= x11@FreeBSD.org
|
||||
|
|
|
|||
|
|
@ -6,13 +6,24 @@
|
|||
#
|
||||
|
||||
PORTNAME= xf86-input-void
|
||||
PORTVERSION= 1.3.1
|
||||
PORTVERSION= ${VOID_VERSION}
|
||||
PORTREVISION= ${VOID_REVISION}
|
||||
CATEGORIES= x11-drivers
|
||||
|
||||
MAINTAINER= x11@FreeBSD.org
|
||||
COMMENT= X.Org void input driver
|
||||
|
||||
XORG_CAT= driver
|
||||
USE_XORG= xextproto videoproto
|
||||
MAN4= void.4x
|
||||
|
||||
.if defined(WITH_NEW_XORG)
|
||||
VOID_VERSION= 1.4.0
|
||||
VOID_REVISION= 0
|
||||
.else
|
||||
VOID_VERSION= 1.3.1
|
||||
VOID_REVISION= 0
|
||||
.endif
|
||||
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
|
|
|||
|
|
@ -1,2 +1,4 @@
|
|||
SHA256 (xorg/driver/xf86-input-void-1.3.1.tar.bz2) = aba69784ac83f5951af3e164312adb4b8b1c91a8f79ab35dc5165c534e14c674
|
||||
SIZE (xorg/driver/xf86-input-void-1.3.1.tar.bz2) = 242189
|
||||
SHA256 (xorg/driver/xf86-input-void-1.4.0.tar.bz2) = 2ab95865252c64cc88050fa0089a74e063c357b71907bf9be7886047c4987505
|
||||
SIZE (xorg/driver/xf86-input-void-1.4.0.tar.bz2) = 273454
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@
|
|||
|
||||
PORTNAME= xf86-video-apm
|
||||
PORTVERSION= 1.2.3
|
||||
PORTREVISION= 1
|
||||
CATEGORIES= x11-drivers
|
||||
|
||||
MAINTAINER= x11@FreeBSD.org
|
||||
|
|
|
|||
|
|
@ -7,12 +7,13 @@
|
|||
|
||||
PORTNAME= xf86-video-ark
|
||||
PORTVERSION= 0.7.3
|
||||
PORTREVISION= 1
|
||||
CATEGORIES= x11-drivers
|
||||
|
||||
MAINTAINER= x11@FreeBSD.org
|
||||
COMMENT= X.Org ark display driver
|
||||
|
||||
XORG_CAT= driver
|
||||
USE_XORG= xextproto
|
||||
USE_XORG= xextproto videoproto
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@
|
|||
|
||||
PORTNAME= xf86-video-ati
|
||||
PORTVERSION= 6.14.3
|
||||
PORTREVISION= 1
|
||||
CATEGORIES= x11-drivers
|
||||
|
||||
MAINTAINER= x11@FreeBSD.org
|
||||
|
|
|
|||
17
x11-drivers/xf86-video-ati/files/patch-src_radeon_accel.c
Normal file
17
x11-drivers/xf86-video-ati/files/patch-src_radeon_accel.c
Normal file
|
|
@ -0,0 +1,17 @@
|
|||
--- src/radeon_accel.c.orig 2012-04-15 19:36:08.000000000 +0200
|
||||
+++ src/radeon_accel.c 2012-04-15 19:36:15.000000000 +0200
|
||||
@@ -982,10 +982,9 @@
|
||||
|
||||
for (; nwords > 0; --nwords, ++d, ++s)
|
||||
#ifdef __powerpc__
|
||||
- asm volatile("stwbrx %0,0,%1" : : "r" (*s), "r" (d));
|
||||
+ asm volatile("sthbrx %0,0,%1" : : "r" (*s), "r" (d));
|
||||
#else
|
||||
- *d = ((*s >> 24) & 0xff) | ((*s >> 8) & 0xff00)
|
||||
- | ((*s & 0xff00) << 8) | ((*s & 0xff) << 24);
|
||||
+ *d = (*s >> 8) | (*s << 8);
|
||||
#endif
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -7,6 +7,7 @@
|
|||
|
||||
PORTNAME= xf86-video-ati613
|
||||
PORTVERSION= 6.13.2
|
||||
PORTREVISION= 1
|
||||
CATEGORIES= x11-drivers
|
||||
DISTNAME= xf86-video-ati-${PORTVERSION}
|
||||
|
||||
|
|
@ -19,4 +20,8 @@ XORG_CAT= driver
|
|||
USE_XORG= xf86driproto xineramaproto videoproto xf86miscproto xextproto glproto
|
||||
MAN4= ati.4x radeon.4x
|
||||
|
||||
.if defined(WITH_NEW_XORG)
|
||||
IGNORE= Please use x11-drivers/xf86-video-ati
|
||||
.endif
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
#
|
||||
|
||||
PORTNAME= xf86-video-chips
|
||||
PORTVERSION= 1.2.3
|
||||
PORTVERSION= 1.2.4
|
||||
CATEGORIES= x11-drivers
|
||||
|
||||
MAINTAINER= x11@FreeBSD.org
|
||||
|
|
|
|||
|
|
@ -1,2 +1,2 @@
|
|||
SHA256 (xorg/driver/xf86-video-chips-1.2.3.tar.bz2) = 0561278e06f84d4ee20317b19831cc8d42c952a1577c7865163ad2d6d900cb1d
|
||||
SIZE (xorg/driver/xf86-video-chips-1.2.3.tar.bz2) = 338968
|
||||
SHA256 (xorg/driver/xf86-video-chips-1.2.4.tar.bz2) = fb6dc34a8d7db82dc6d555cebe6f95c2269dda4872118978345f6e1215ab4d25
|
||||
SIZE (xorg/driver/xf86-video-chips-1.2.4.tar.bz2) = 365618
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
PORTNAME= xf86-video-cirrus
|
||||
PORTVERSION= 1.3.2
|
||||
PORTREVISION= 1
|
||||
PORTREVISION= 2
|
||||
CATEGORIES= x11-drivers
|
||||
|
||||
MAINTAINER= x11@FreeBSD.org
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
PORTNAME= xf86-video-cyrix
|
||||
PORTVERSION= 1.1.0
|
||||
PORTREVISION= 7
|
||||
PORTREVISION= 8
|
||||
CATEGORIES= x11-drivers
|
||||
|
||||
MAINTAINER= x11@FreeBSD.org
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
#
|
||||
|
||||
PORTNAME= xf86-video-dummy
|
||||
PORTVERSION= 0.3.4
|
||||
PORTVERSION= 0.3.5
|
||||
CATEGORIES= x11-drivers
|
||||
|
||||
MAINTAINER= x11@FreeBSD.org
|
||||
|
|
|
|||
|
|
@ -1,2 +1,2 @@
|
|||
SHA256 (xorg/driver/xf86-video-dummy-0.3.4.tar.bz2) = 7e84dff50eb3a783c0bc718a08f82f1f34583531469c98ca75a815d177871bdc
|
||||
SIZE (xorg/driver/xf86-video-dummy-0.3.4.tar.bz2) = 255658
|
||||
SHA256 (xorg/driver/xf86-video-dummy-0.3.5.tar.bz2) = d5adc63543bb93b6d88008ea746303a2ab3e8b570974704926e81d882728d95f
|
||||
SIZE (xorg/driver/xf86-video-dummy-0.3.5.tar.bz2) = 274761
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@
|
|||
|
||||
PORTNAME= xf86-video-fbdev
|
||||
PORTVERSION= 0.4.2
|
||||
PORTREVISION= 1
|
||||
CATEGORIES= x11-drivers
|
||||
|
||||
MAINTAINER= x11@FreeBSD.org
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
#
|
||||
|
||||
PORTNAME= xf86-video-glint
|
||||
PORTVERSION= 1.2.5
|
||||
PORTVERSION= 1.2.6
|
||||
CATEGORIES= x11-drivers
|
||||
|
||||
MAINTAINER= x11@FreeBSD.org
|
||||
|
|
|
|||
|
|
@ -1,2 +1,2 @@
|
|||
SHA256 (xorg/driver/xf86-video-glint-1.2.5.tar.bz2) = 5675f2732ab7b099a568ef4e5c7bb0d0e1bb4b0eb4d19133dc1b2225fd9c814b
|
||||
SIZE (xorg/driver/xf86-video-glint-1.2.5.tar.bz2) = 394136
|
||||
SHA256 (xorg/driver/xf86-video-glint-1.2.6.tar.bz2) = d43350ed3c149576db1dbcacf5e9a30a3268a3f49742724c9151b6f1e4bd21a7
|
||||
SIZE (xorg/driver/xf86-video-glint-1.2.6.tar.bz2) = 393872
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@
|
|||
|
||||
PORTNAME= xf86-video-i128
|
||||
PORTVERSION= 1.3.4
|
||||
PORTREVISION= 1
|
||||
CATEGORIES= x11-drivers
|
||||
|
||||
MAINTAINER= x11@FreeBSD.org
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
PORTNAME= xf86-video-i740
|
||||
PORTVERSION= 1.3.2
|
||||
PORTREVISION= 1
|
||||
PORTREVISION= 2
|
||||
CATEGORIES= x11-drivers
|
||||
|
||||
MAINTAINER= x11@FreeBSD.org
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
PORTNAME= xf86-video-imstt
|
||||
PORTVERSION= 1.1.0
|
||||
PORTREVISION= 7
|
||||
PORTREVISION= 8
|
||||
CATEGORIES= x11-drivers
|
||||
|
||||
MAINTAINER= x11@FreeBSD.org
|
||||
|
|
|
|||
|
|
@ -6,20 +6,59 @@
|
|||
#
|
||||
|
||||
PORTNAME= xf86-video-intel
|
||||
PORTVERSION= 2.7.1
|
||||
PORTREVISION= 4
|
||||
PORTVERSION= ${INTEL_VERSION}
|
||||
PORTREVISION= ${INTEL_REVISION}
|
||||
CATEGORIES= x11-drivers
|
||||
|
||||
MAINTAINER= x11@FreeBSD.org
|
||||
COMMENT= Driver for Intel integrated graphics chipsets
|
||||
|
||||
CONFLICTS= xf86-video-i810-[0-9]*
|
||||
|
||||
ONLY_FOR_ARCHS= amd64 i386
|
||||
USE_GL= gl
|
||||
|
||||
USE_LDCONFIG= yes
|
||||
XORG_CAT= driver
|
||||
USE_XORG= xvmc xineramaproto xextproto x11 xf86driproto glproto
|
||||
MAN4= intel.4x
|
||||
|
||||
.include <bsd.port.mk>
|
||||
.if defined(WITH_NEW_XORG)
|
||||
INTEL_VERSION= 2.17.0
|
||||
INTEL_REVISION= 0
|
||||
MAKE_JOBS_UNSAFE=yes
|
||||
PLIST_SUB+= OLD="@comment "
|
||||
.else
|
||||
INTEL_VERSION= 2.7.1
|
||||
INTEL_REVISION= 4
|
||||
PLIST_SUB+= OLD=""
|
||||
|
||||
EXTRA_PATCHES+= ${PATCHDIR}/extra-src_ch7017_ch7017.c \
|
||||
${PATCHDIR}/extra-src_i830_render.c \
|
||||
${PATCHDIR}/extra-src_ch7xxx_ch7xxx.c \
|
||||
${PATCHDIR}/extra-src_i830_video.c \
|
||||
${PATCHDIR}/extra-src_i810_driver.c \
|
||||
${PATCHDIR}/extra-src_i915_hwmc.c \
|
||||
${PATCHDIR}/extra-src_i810_hwmc.c \
|
||||
${PATCHDIR}/extra-src_i915_render.c \
|
||||
${PATCHDIR}/extra-src_i810_video.c \
|
||||
${PATCHDIR}/extra-src_i965_render.c \
|
||||
${PATCHDIR}/extra-src_i830_dri.c \
|
||||
${PATCHDIR}/extra-src_ivch_ivch.c \
|
||||
${PATCHDIR}/extra-src_i830_driver.c \
|
||||
${PATCHDIR}/extra-src_sil164_sil164.c \
|
||||
${PATCHDIR}/extra-src_i830_dvo.c \
|
||||
${PATCHDIR}/extra-src_tfp410_tfp410.c \
|
||||
${PATCHDIR}/extra-src_i830_i2c.c \
|
||||
${PATCHDIR}/extra-uxa_uxa-priv.h
|
||||
.endif
|
||||
|
||||
.include <bsd.port.pre.mk>
|
||||
|
||||
.if defined(WITH_NEW_XORG)
|
||||
pre-configure:
|
||||
.if !exists(${LOCALBASE}/lib/libkms.so)
|
||||
@${ECHO} "${PKGNAME}: Rebuild graphics/libdrm with the WITH_KMS option."
|
||||
@${FALSE}
|
||||
.endif
|
||||
.endif
|
||||
|
||||
.include <bsd.port.post.mk>
|
||||
|
|
|
|||
|
|
@ -1,2 +1,4 @@
|
|||
SHA256 (xorg/driver/xf86-video-intel-2.7.1.tar.bz2) = 255c0d54249cc0132f743254a43c21fac695fab2139c8ed96a07cf3c628e5f42
|
||||
SIZE (xorg/driver/xf86-video-intel-2.7.1.tar.bz2) = 780625
|
||||
SHA256 (xorg/driver/xf86-video-intel-2.17.0.tar.bz2) = 8b8450f2a2cc52ef31a83414e2f290e748a956690e11b41759d5650aaedc4387
|
||||
SIZE (xorg/driver/xf86-video-intel-2.17.0.tar.bz2) = 1339717
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Add table
Reference in a new issue