diff options
author | kwm <kwm@058c260c-8361-11dd-a0ac-aa2bafec7d09> | 2014-10-17 18:06:26 +0800 |
---|---|---|
committer | kwm <kwm@058c260c-8361-11dd-a0ac-aa2bafec7d09> | 2014-10-17 18:06:26 +0800 |
commit | ffc92f3f5669779037430a2fe78912021a902645 (patch) | |
tree | eb5c42e7903cc6e6fefac9c6333db75a334f6eed | |
parent | ccfa1c9418ced9b42904c5c8f4342282e45c1d01 (diff) | |
download | xorg-devel-ports-ffc92f3f5669779037430a2fe78912021a902645.tar xorg-devel-ports-ffc92f3f5669779037430a2fe78912021a902645.tar.gz xorg-devel-ports-ffc92f3f5669779037430a2fe78912021a902645.tar.bz2 xorg-devel-ports-ffc92f3f5669779037430a2fe78912021a902645.tar.lz xorg-devel-ports-ffc92f3f5669779037430a2fe78912021a902645.tar.xz xorg-devel-ports-ffc92f3f5669779037430a2fe78912021a902645.tar.zst xorg-devel-ports-ffc92f3f5669779037430a2fe78912021a902645.zip |
Sync with what went into ports.
git-svn-id: https://trillian.chruetertee.ch/svn/ports/trunk@1533 058c260c-8361-11dd-a0ac-aa2bafec7d09
-rw-r--r-- | graphics/dri/Makefile | 3 | ||||
-rw-r--r-- | graphics/dri/pkg-plist | 4 | ||||
-rw-r--r-- | graphics/dri/pkg-plist-old | 30 | ||||
-rw-r--r-- | graphics/libEGL/pkg-plist | 2 | ||||
-rw-r--r-- | graphics/libGL/Makefile | 2 | ||||
-rw-r--r-- | graphics/libGL/bsd.mesalib.mk | 2 | ||||
-rw-r--r-- | graphics/libGL/pkg-plist | 2 | ||||
-rw-r--r-- | graphics/libdrm/pkg-plist | 2 | ||||
-rw-r--r-- | graphics/libglapi/Makefile | 2 | ||||
-rw-r--r-- | graphics/libglesv2/Makefile | 2 | ||||
-rw-r--r-- | graphics/libglesv2/pkg-plist | 2 |
11 files changed, 19 insertions, 34 deletions
diff --git a/graphics/dri/Makefile b/graphics/dri/Makefile index b035895..2dc5bf8 100644 --- a/graphics/dri/Makefile +++ b/graphics/dri/Makefile @@ -1,5 +1,5 @@ # Created by: Eric Anholt <anholt@FreeBSD.org> -# $FreeBSD: head/graphics/dri/Makefile 342087 2014-01-31 22:21:43Z kwm $ +# $FreeBSD$ PORTNAME= dri PORTVERSION= ${MESAVERSION} @@ -24,6 +24,7 @@ OPTIONS_DEFAULT_amd64= GALLIUM VDPAU GALLIUM_DESC= Gallium (llvm backed) dri drivers TEXTURE_DESC= Enable texture-float support (patent encumbered) +VDPAU_DESC= VDPAU (GPU video acceleration) support (needs Gallium) PKGHELP= ${.CURDIR}/pkg-help diff --git a/graphics/dri/pkg-plist b/graphics/dri/pkg-plist index 46e4737..83562b2 100644 --- a/graphics/dri/pkg-plist +++ b/graphics/dri/pkg-plist @@ -55,7 +55,3 @@ include/GL/internal/dri_interface.h libdata/pkgconfig/dri.pc @comment libdata/pkgconfig/gbm.pc @comment libdata/pkgconfig/gl.pc -%%VDPAU%%@dirrm lib/vdpau -@dirrm lib/dri -@dirrmtry include/GL/internal -@dirrmtry include/GL diff --git a/graphics/dri/pkg-plist-old b/graphics/dri/pkg-plist-old index 8393ec2..6ccab8b 100644 --- a/graphics/dri/pkg-plist-old +++ b/graphics/dri/pkg-plist-old @@ -48,24 +48,20 @@ lib/libdricore9.1.7.so.1.0.0 @comment lib/libglapi.so @comment lib/libglapi.so.0 @comment lib/libglapi.so.0.0.0 -lib/libllvmradeon%%VERSION%%.so -%%VDPAU%%lib/vdpau/libvdpau_r300.so -%%VDPAU%%lib/vdpau/libvdpau_r300.so.1 -%%VDPAU%%lib/vdpau/libvdpau_r300.so.1.0.0 -%%VDPAU%%lib/vdpau/libvdpau_r600.so -%%VDPAU%%lib/vdpau/libvdpau_r600.so.1 -%%VDPAU%%lib/vdpau/libvdpau_r600.so.1.0.0 -%%VDPAU%%lib/vdpau/libvdpau_radeonsi.so -%%VDPAU%%lib/vdpau/libvdpau_radeonsi.so.1 -%%VDPAU%%lib/vdpau/libvdpau_radeonsi.so.1.0.0 -%%VDPAU%%lib/vdpau/libvdpau_softpipe.so -%%VDPAU%%lib/vdpau/libvdpau_softpipe.so.1 -%%VDPAU%%lib/vdpau/libvdpau_softpipe.so.1.0.0 +%%GALLIUM%%lib/libllvmradeon%%VERSION%%.so +%%GALLIUM%%%%VDPAU%%lib/vdpau/libvdpau_r300.so +%%GALLIUM%%%%VDPAU%%lib/vdpau/libvdpau_r300.so.1 +%%GALLIUM%%%%VDPAU%%lib/vdpau/libvdpau_r300.so.1.0.0 +%%GALLIUM%%%%VDPAU%%lib/vdpau/libvdpau_r600.so +%%GALLIUM%%%%VDPAU%%lib/vdpau/libvdpau_r600.so.1 +%%GALLIUM%%%%VDPAU%%lib/vdpau/libvdpau_r600.so.1.0.0 +%%GALLIUM%%%%VDPAU%%lib/vdpau/libvdpau_radeonsi.so +%%GALLIUM%%%%VDPAU%%lib/vdpau/libvdpau_radeonsi.so.1 +%%GALLIUM%%%%VDPAU%%lib/vdpau/libvdpau_radeonsi.so.1.0.0 +%%GALLIUM%%%%VDPAU%%lib/vdpau/libvdpau_softpipe.so +%%GALLIUM%%%%VDPAU%%lib/vdpau/libvdpau_softpipe.so.1 +%%GALLIUM%%%%VDPAU%%lib/vdpau/libvdpau_softpipe.so.1.0.0 libdata/pkgconfig/dri.pc @comment libdata/pkgconfig/egl.pc @comment libdata/pkgconfig/gbm.pc @comment libdata/pkgconfig/gl.pc -%%VDPAU%%@dirrm lib/vdpau -@dirrm lib/dri -@dirrmtry include/GL/internal -@dirrmtry include/GL diff --git a/graphics/libEGL/pkg-plist b/graphics/libEGL/pkg-plist index af23bb9..fb478a8 100644 --- a/graphics/libEGL/pkg-plist +++ b/graphics/libEGL/pkg-plist @@ -8,5 +8,3 @@ lib/libEGL.so lib/libEGL.so.1 lib/libEGL.so.1.0.0 libdata/pkgconfig/egl.pc -@dirrmtry include/KHR -@dirrmtry include/EGL diff --git a/graphics/libGL/Makefile b/graphics/libGL/Makefile index eb3855e..8d67b6b 100644 --- a/graphics/libGL/Makefile +++ b/graphics/libGL/Makefile @@ -1,5 +1,5 @@ # Created by: Eric Anholt <anholt@FreeBSD.org> -# $FreeBSD: head/graphics/libGL/Makefile 347435 2014-03-08 00:08:21Z miwi $ +# $FreeBSD: head/graphics/libGL/Makefile 371035 2014-10-17 09:53:13Z kwm $ PORTNAME= libGL PORTVERSION= ${MESAVERSION} diff --git a/graphics/libGL/bsd.mesalib.mk b/graphics/libGL/bsd.mesalib.mk index fd01de1..56ded87 100644 --- a/graphics/libGL/bsd.mesalib.mk +++ b/graphics/libGL/bsd.mesalib.mk @@ -11,7 +11,7 @@ # - graphics/libglapi # - grahpics/libglesv2 # -# $FreeBSD$ +# $FreeBSD: head/graphics/libGL/bsd.mesalib.mk 371035 2014-10-17 09:53:13Z kwm $ # hw context support in the i915kms driver .if ${OPSYS} == FreeBSD && \ diff --git a/graphics/libGL/pkg-plist b/graphics/libGL/pkg-plist index d910c93..9a46715 100644 --- a/graphics/libGL/pkg-plist +++ b/graphics/libGL/pkg-plist @@ -18,5 +18,3 @@ lib/.libGL/libGL.so.1.2.0 @comment lib/libglapi.so.0.0.0 @comment libdata/pkgconfig/dri.pc libdata/pkgconfig/gl.pc -@dirrm lib/.libGL -@dirrmtry include/GL diff --git a/graphics/libdrm/pkg-plist b/graphics/libdrm/pkg-plist index 0e5463d..f11d4a3 100644 --- a/graphics/libdrm/pkg-plist +++ b/graphics/libdrm/pkg-plist @@ -56,5 +56,3 @@ libdata/pkgconfig/libdrm.pc %%MAN%%man/man7/drm-mm.7.gz %%MAN%%man/man7/drm-ttm.7.gz %%MAN%%man/man7/drm.7.gz -%%KMS%%@dirrm include/libkms -@dirrm include/libdrm diff --git a/graphics/libglapi/Makefile b/graphics/libglapi/Makefile index f5346c3..fd441c6 100644 --- a/graphics/libglapi/Makefile +++ b/graphics/libglapi/Makefile @@ -6,7 +6,7 @@ PORTVERSION= ${MESAVERSION} PORTREVISION= ${LIBGLAPI_REVISION} CATEGORIES= graphics -COMMENT= Common GL api libary used by Mesa based ports. +COMMENT= Common GL api library used by Mesa based ports LIB_DEPENDS+= libpthread-stubs.so:${PORTSDIR}/devel/libpthread-stubs diff --git a/graphics/libglesv2/Makefile b/graphics/libglesv2/Makefile index 4829157..5f74dbf 100644 --- a/graphics/libglesv2/Makefile +++ b/graphics/libglesv2/Makefile @@ -1,5 +1,5 @@ # Created by: kwm@FreeBSD.org -# $FreeBSD: head/graphics/libglesv2/Makefile 351411 2014-04-16 18:28:47Z zeising $ +# $FreeBSD$ PORTNAME= libglesv2 PORTVERSION= ${MESAVERSION} diff --git a/graphics/libglesv2/pkg-plist b/graphics/libglesv2/pkg-plist index 8abc024..3c7cb53 100644 --- a/graphics/libglesv2/pkg-plist +++ b/graphics/libglesv2/pkg-plist @@ -9,5 +9,3 @@ lib/libGLESv2.so lib/libGLESv2.so.2 lib/libGLESv2.so.2.0.0 libdata/pkgconfig/glesv2.pc -@dirrmtry include/GLES3 -@dirrmtry include/GLES2 |