diff options
Diffstat (limited to 'media-libs/mesa/files')
5 files changed, 155 insertions, 0 deletions
diff --git a/media-libs/mesa/files/0002-radeong-opencl-rename-target-from-r600-to-r600-amd-n.patch b/media-libs/mesa/files/0002-radeong-opencl-rename-target-from-r600-to-r600-amd-n.patch new file mode 100644 index 0000000..2eebc9c --- /dev/null +++ b/media-libs/mesa/files/0002-radeong-opencl-rename-target-from-r600-to-r600-amd-n.patch @@ -0,0 +1,26 @@ +From 7c4d0a88c45acedfd47eba93646bf5ea7435472c Mon Sep 17 00:00:00 2001 +From: Alexey Shvetsov <alexxy@gentoo.org> +Date: Sun, 3 Jun 2012 13:52:00 +0400 +Subject: [PATCH 2/3] radeong/opencl rename target from r600-- to + r600-amd-none + +--- + src/gallium/drivers/r600/r600_pipe.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/gallium/drivers/r600/r600_pipe.c b/src/gallium/drivers/r600/r600_pipe.c +index e0ee823..790afcc 100644 +--- a/src/gallium/drivers/r600/r600_pipe.c ++++ b/src/gallium/drivers/r600/r600_pipe.c +@@ -582,7 +582,7 @@ static int r600_get_compute_param(struct pipe_screen *screen, + switch (param) { + case PIPE_COMPUTE_CAP_IR_TARGET: + if (ret) { +- strcpy(ret, "r600--"); ++ strcpy(ret, "r600-amd-none"); + } + return 7 * sizeof(char); + +-- +1.7.10.2 + diff --git a/media-libs/mesa/files/0003-clover-fix-building-and-add-standart-locations-for-l.patch b/media-libs/mesa/files/0003-clover-fix-building-and-add-standart-locations-for-l.patch new file mode 100644 index 0000000..2b18806 --- /dev/null +++ b/media-libs/mesa/files/0003-clover-fix-building-and-add-standart-locations-for-l.patch @@ -0,0 +1,38 @@ +From 3d4239edd2c89d3b67aef11786f0846fba96d718 Mon Sep 17 00:00:00 2001 +From: Alexey Shvetsov <alexxy@gentoo.org> +Date: Sun, 3 Jun 2012 04:35:51 +0400 +Subject: [PATCH 3/3] clover fix building and add standart locations for + libclc + +--- + src/gallium/state_trackers/clover/llvm/invocation.cpp | 4 ++-- + src/gallium/targets/opencl/Makefile.am | 1 + + 2 files changed, 3 insertions(+), 2 deletions(-) + +diff --git a/src/gallium/state_trackers/clover/llvm/invocation.cpp b/src/gallium/state_trackers/clover/llvm/invocation.cpp +index 27276bc..78c8670 100644 +--- a/src/gallium/state_trackers/clover/llvm/invocation.cpp ++++ b/src/gallium/state_trackers/clover/llvm/invocation.cpp +@@ -107,7 +107,7 @@ namespace { + c.getHeaderSearchOpts().ResourceDir = CLANG_RESOURCE_DIR; + + // Add libclc generic search path +- c.getHeaderSearchOpts().AddPath(LIBCLC_PATH "/generic/include/", ++ c.getHeaderSearchOpts().AddPath(LIBCLC_PATH "/include/", + clang::frontend::Angled, + false, false, false); + +@@ -142,7 +142,7 @@ namespace { + llvm::Linker linker("clover", mod); + + // Link the kernel with libclc +- linker.LinkInFile(llvm::sys::Path(LIBCLC_PATH + triple + "/lib/builtins.bc"), isNative); ++ linker.LinkInFile(llvm::sys::Path(LIBCLC_PATH + ("/lib/clc/" + triple + "/builtins.bc")), isNative); + mod = linker.releaseModule(); + + // Run link time optimizations +diff --git a/src/gallium/targets/opencl/Makefile.am b/src/gallium/targets/opencl/Makefile.am +index d55b21e..4c89e36 100644 +-- +1.7.10.2 + diff --git a/media-libs/mesa/files/eselect-mesa.conf.8.1 b/media-libs/mesa/files/eselect-mesa.conf.8.1 new file mode 100644 index 0000000..63a21aa --- /dev/null +++ b/media-libs/mesa/files/eselect-mesa.conf.8.1 @@ -0,0 +1,38 @@ +# mesa classic/gallium implementations in this release + +# Syntax description: +# * MESA_IMPLEMENTATIONS contains a space-delimited list of switchable +# classic/gallium implementations. +# * MESA_DRIVERS is an associative array, for each member "foo" of +# MESA_IMPLEMENTATIONS it contains the following elements: +# foo,description - Human-readable description of the driver +# foo,classicdriver - Filename of the classic driver +# foo,galliumdriver - Filename of the gallium driver +# foo,default - which of classic or gallium is chosen by default + +MESA_IMPLEMENTATIONS="i915 i965 r300 r600 sw" +declare -A MESA_DRIVERS || die "MESA_DRIVERS already in environment and not associative." + +MESA_DRIVERS[i915,description]="i915 (Intel 915, 945)" +MESA_DRIVERS[i915,classicdriver]="i915_dri.so" +MESA_DRIVERS[i915,galliumdriver]="i915g_dri.so" +MESA_DRIVERS[i915,default]="gallium" + +MESA_DRIVERS[i965,description]="i965 (Intel 965, G/Q3x, G/Q4x)" +MESA_DRIVERS[i965,classicdriver]="i965_dri.so" +MESA_DRIVERS[i965,default]="classic" + +MESA_DRIVERS[r300,description]="r300 (Radeon R300-R500)" +MESA_DRIVERS[r300,classicdriver]="r300_dri.so" +MESA_DRIVERS[r300,galliumdriver]="r300g_dri.so" +MESA_DRIVERS[r300,default]="gallium" + +MESA_DRIVERS[r600,description]="r600 (Radeon R600-R700, Evergreen, Northern Islands)" +MESA_DRIVERS[r600,classicdriver]="r600_dri.so" +MESA_DRIVERS[r600,galliumdriver]="r600g_dri.so" +MESA_DRIVERS[r600,default]="gallium" + +MESA_DRIVERS[sw,description]="sw (Software renderer)" +MESA_DRIVERS[sw,classicdriver]="swrast_dri.so" +MESA_DRIVERS[sw,galliumdriver]="swrastg_dri.so" +MESA_DRIVERS[sw,default]="gallium" diff --git a/media-libs/mesa/files/glx_ro_text_segm.patch b/media-libs/mesa/files/glx_ro_text_segm.patch new file mode 100644 index 0000000..495b7dc --- /dev/null +++ b/media-libs/mesa/files/glx_ro_text_segm.patch @@ -0,0 +1,28 @@ +2011-02-09 Jeremy Huddleston <jeremyhu@freedesktop.org + + #240956 + * configure.ac add support to enable readonly test segment on x86 + +--- configure.ac.orig 2008-11-17 23:19:38.000000000 +0100 ++++ configure.ac 2008-11-17 23:20:17.000000000 +0100 +@@ -499,6 +499,20 @@ + enable_xcb=no + fi + ++ ++dnl readonly text segment on x86 hardened platforms ++AC_ARG_ENABLE([glx_rts], ++ [AS_HELP_STRING([--enable-glx-rts], ++ [on x86, use a readonly text segment for libGL @<:@default=disabled@:>@])], ++ [enable_glx_rts="$enableval"], ++ [enable_glx_rts=no]) ++if test "x$enable_glx_rts" = xyes; then ++ DEFINES="$DEFINES -DGLX_X86_READONLY_TEXT" ++else ++ enable_glx_rts=no ++fi ++ ++ + dnl + dnl libGL configuration per driver + dnl diff --git a/media-libs/mesa/files/mesa-8.1-dont-require-llvm-for-r300.patch b/media-libs/mesa/files/mesa-8.1-dont-require-llvm-for-r300.patch new file mode 100644 index 0000000..9fe7e32 --- /dev/null +++ b/media-libs/mesa/files/mesa-8.1-dont-require-llvm-for-r300.patch @@ -0,0 +1,25 @@ +--- a/configure.ac 2012-05-12 11:50:09.786970584 +0200 ++++ b/configure.ac 2012-05-12 12:00:00.770582272 +0200 +@@ -1922,14 +1922,6 @@ + fi + } + +-gallium_require_llvm() { +- if test "x$MESA_LLVM" = x0; then +- case "$host_cpu" in +- i*86|x86_64) AC_MSG_ERROR([LLVM is required to build $1 on x86 and x86_64]);; +- esac +- fi +-} +- + gallium_require_drm_loader() { + if test "x$enable_gallium_loader" = xyes; then + PKG_CHECK_MODULES([LIBUDEV], [libudev], [], +@@ -1962,7 +1954,6 @@ + ;; + xr300) + PKG_CHECK_MODULES([RADEON], [libdrm_radeon >= $LIBDRM_RADEON_REQUIRED]) +- gallium_require_llvm "Gallium R300" + GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS r300" + gallium_check_st "radeon/drm" "dri-r300" "xorg-r300" "" "xvmc-r300" "vdpau-r300" "va-r300" + ;; |