diff options
author | kwm <kwm@FreeBSD.org> | 2014-11-21 19:34:04 +0800 |
---|---|---|
committer | kwm <kwm@FreeBSD.org> | 2014-11-21 19:34:04 +0800 |
commit | dbc73e7b31d8e2dc16c08264b687f54618b4ed53 (patch) | |
tree | 95f562d20f280d7f9d0d6b8dd8b91968aa4b48f2 /graphics/dri | |
parent | 743a4cfa2695f323c4147cc35fc90d4cc05ed8bf (diff) | |
download | freebsd-ports-gnome-dbc73e7b31d8e2dc16c08264b687f54618b4ed53.tar.gz freebsd-ports-gnome-dbc73e7b31d8e2dc16c08264b687f54618b4ed53.tar.zst freebsd-ports-gnome-dbc73e7b31d8e2dc16c08264b687f54618b4ed53.zip |
Update mesa to 10.3.3.
graphics/dri:
Move gettext:build to bsd.mesalib.mk so it present for all mesa ports. [1]
VDPAU needs GALLIUM so check for that, since it a Gallium state tracker. [1][2]
Rework llvm33/llvm34 selection so we can use the llvm version later on.
VDPAU links against the llvm libraries so we need to depend on the llvm port
as a run dependency .[1]
After discussion remove the VDPAU option for now. Radeon kernel drivers currently
don't support hardware-assisted video decoding. And Gallium/VDPAU doesn't support
the intel driver.
PR: 194655 [1]
PR: 194580 [2]
Diffstat (limited to 'graphics/dri')
-rw-r--r-- | graphics/dri/Makefile | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/graphics/dri/Makefile b/graphics/dri/Makefile index daa465d04307..9897bdd13f93 100644 --- a/graphics/dri/Makefile +++ b/graphics/dri/Makefile @@ -14,14 +14,13 @@ LIB_DEPENDS= libdrm.so:${PORTSDIR}/graphics/libdrm \ USE_XORG= glproto x11 xext xxf86vm xdamage xfixes dri2proto \ presentproto xvmc xshmfence -USES= gettext:build OPTIONS_DEFINE= TEXTURE -OPTIONS_DEFINE_i386= GALLIUM VDPAU -OPTIONS_DEFAULT_i386= GALLIUM VDPAU -OPTIONS_DEFINE_amd64= GALLIUM VDPAU -OPTIONS_DEFAULT_amd64= GALLIUM VDPAU +OPTIONS_DEFINE_i386= GALLIUM +OPTIONS_DEFAULT_i386= GALLIUM +OPTIONS_DEFINE_amd64= GALLIUM +OPTIONS_DEFAULT_amd64= GALLIUM GALLIUM_DESC= Gallium (llvm backed) dri drivers TEXTURE_DESC= Enable texture-float support (patent encumbered) @@ -60,16 +59,19 @@ DRIREVISION= 6 PLIST= ${.CURDIR}/pkg-plist-old .endif +DRI_LLVM_VER= 0 + .if ${PORT_OPTIONS:MGALLIUM} . if defined(WITH_NEW_MESA) # keep in sync with libopencl please -BUILD_DEPENDS+= llvm34>=0:${PORTSDIR}/devel/llvm34 -CONFIGURE_ENV+= LLVM_CONFIG=${LOCALBASE}/bin/llvm-config34 +DRI_LLVM_VER= 34 . else -BUILD_DEPENDS+= llvm33>=0:${PORTSDIR}/devel/llvm33 -CONFIGURE_ENV+= LLVM_CONFIG=${LOCALBASE}/bin/llvm-config33 +DRI_LLVM_VER= 33 . endif +BUILD_DEPENDS+= llvm${DRI_LLVM_VER}>=0:${PORTSDIR}/devel/llvm${DRI_LLVM_VER} +CONFIGURE_ENV+= LLVM_CONFIG=${LOCALBASE}/bin/llvm-config${DRI_LLVM_VER} + CONFIGURE_ARGS+=--enable-gallium-llvm \ --enable-xvmc \ --with-gallium-drivers=r300,r600,radeonsi,svga,swrast @@ -84,9 +86,13 @@ PLIST_SUB+= GALLIUM="@comment " CONFIGURE_ARGS+=--enable-texture-float .endif -.if ${PORT_OPTIONS:MVDPAU} +.if 0 #${PORT_OPTIONS:MVDPAU} +.if ${PORT_OPTIONS:MGALLIUM} == "" +IGNORE= VDPAU option requires GALLIUM support to be enabled +.endif CONFIGURE_ARGS+=--enable-vdpau LIB_DEPENDS+= libvdpau.so:${PORTSDIR}/multimedia/libvdpau +RUN_DEPENDS+= llvm${DRI_LLVM_VER}:${PORTSDIR}/lang/llvm${DRI_LLVM_VER} PLIST_SUB+= VDPAU="" .else CONFIGURE_ARGS+=--disable-vdpau |