diff options
| author | kwm <kwm@058c260c-8361-11dd-a0ac-aa2bafec7d09> | 2012-09-01 05:01:43 +0800 |
|---|---|---|
| committer | kwm <kwm@058c260c-8361-11dd-a0ac-aa2bafec7d09> | 2012-09-01 05:01:43 +0800 |
| commit | 57c4131dd8b224d1839b5d7a9a088ba4ed676c49 (patch) | |
| tree | bbec00c1486142f4ec557441563af57cfc7c25ad /graphics/libGL/bsd.mesalib.mk | |
| parent | cff3c7280063f6dd0a51754f7a184ddbfa45be61 (diff) | |
| download | xorg-devel-ports-57c4131dd8b224d1839b5d7a9a088ba4ed676c49.tar xorg-devel-ports-57c4131dd8b224d1839b5d7a9a088ba4ed676c49.tar.gz xorg-devel-ports-57c4131dd8b224d1839b5d7a9a088ba4ed676c49.tar.bz2 xorg-devel-ports-57c4131dd8b224d1839b5d7a9a088ba4ed676c49.tar.lz xorg-devel-ports-57c4131dd8b224d1839b5d7a9a088ba4ed676c49.tar.xz xorg-devel-ports-57c4131dd8b224d1839b5d7a9a088ba4ed676c49.tar.zst xorg-devel-ports-57c4131dd8b224d1839b5d7a9a088ba4ed676c49.zip | |
Sync with ports. This includes the final libGL/xorg-server/nvidia-driver patch.
git-svn-id: https://trillian.chruetertee.ch/svn/ports/trunk@574 058c260c-8361-11dd-a0ac-aa2bafec7d09
Diffstat (limited to 'graphics/libGL/bsd.mesalib.mk')
| -rw-r--r-- | graphics/libGL/bsd.mesalib.mk | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/graphics/libGL/bsd.mesalib.mk b/graphics/libGL/bsd.mesalib.mk index 5eaed41..b1e9130 100644 --- a/graphics/libGL/bsd.mesalib.mk +++ b/graphics/libGL/bsd.mesalib.mk @@ -51,9 +51,18 @@ CONFIGURE_ARGS+=--enable-gallium-llvm=no --without-gallium-drivers \ --disable-egl .if defined(WITH_NEW_XORG) -EXTRA_PATCHES+= ${PATCHDIR}/extra-src-glsl_ir_constant_expression.cpp +EXTRA_PATCHES+= ${PATCHDIR}/extra-configure \ + ${PATCHDIR}/extra-mach64_context.h \ + ${PATCHDIR}/extra-sis_context.h \ + ${PATCHDIR}/extra-src-glsl_ir_constant_expression.cpp \ + ${PATCHDIR}/extra-src__gallium__include__pipe__p_config.h \ + ${PATCHDIR}/extra-src__mesa__drivers__dri__nouveau__nouveau_array.c \ + ${PATCHDIR}/extra-src__mesa__drivers__dri__nouveau__nouveau_render_t.c \ + ${PATCHDIR}/extra-src__mesa__drivers__dri__radeon__radeon_span.c .else -EXTRA_PATCHES+= ${PATCHDIR}/extra-src__mesa__x86-64__glapi_x86-64.S \ +EXTRA_PATCHES+= ${PATCHDIR}/extra-configure-old \ + ${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 @@ -100,3 +109,10 @@ post-patch: ${WRKSRC}/src/mesa/Makefile \ ${WRKSRC}/src/mesa/drivers/dri/Makefile +.if defined(WITH_NEW_XORG) +# replace hardlinks with patched radeon_span.c +.for i in r200 r300 r600 + @${CP} -fp ${WRKSRC}/src/mesa/drivers/dri/radeon/radeon_span.c \ + ${WRKSRC}/src/mesa/drivers/dri/${i}/ +.endfor +.endif |