* [gentoo-commits] proj/x11:master commit in: media-libs/mesa/files/
@ 2012-02-10 18:12 Matt Turner
0 siblings, 0 replies; 6+ messages in thread
From: Matt Turner @ 2012-02-10 18:12 UTC (permalink / raw
To: gentoo-commits
commit: 93285e9c98d0ff2c47cb59c01d88af4d7b8a196f
Author: Matt Turner <mattst88 <AT> gmail <DOT> com>
AuthorDate: Fri Feb 10 18:12:09 2012 +0000
Commit: Matt Turner <mattst88 <AT> gmail <DOT> com>
CommitDate: Fri Feb 10 18:12:09 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=93285e9c
media-libs/mesa: remove i965g, r300c, and r600c drivers from eselect
---
media-libs/mesa/files/eselect-mesa.conf.8.0 | 3 ---
1 files changed, 0 insertions(+), 3 deletions(-)
diff --git a/media-libs/mesa/files/eselect-mesa.conf.8.0 b/media-libs/mesa/files/eselect-mesa.conf.8.0
index 73b2752..2fc9900 100644
--- a/media-libs/mesa/files/eselect-mesa.conf.8.0
+++ b/media-libs/mesa/files/eselect-mesa.conf.8.0
@@ -20,16 +20,13 @@ 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,galliumdriver]="i965g_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"
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/x11:master commit in: media-libs/mesa/files/
@ 2012-05-16 3:29 Matt Turner
0 siblings, 0 replies; 6+ messages in thread
From: Matt Turner @ 2012-05-16 3:29 UTC (permalink / raw
To: gentoo-commits
commit: 98ecb21060ab485ffb45ae779554f5e32dc2588f
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Wed May 16 03:28:20 2012 +0000
Commit: Matt Turner <mattst88 <AT> gmail <DOT> com>
CommitDate: Wed May 16 03:28:20 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=98ecb210
media-libs/mesa: update r300/LLVM patch (bug 415557)
---
.../mesa-9999-dont-require-llvm-for-r300.patch | 16 +++++++---------
1 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/media-libs/mesa/files/mesa-9999-dont-require-llvm-for-r300.patch b/media-libs/mesa/files/mesa-9999-dont-require-llvm-for-r300.patch
index b294083..9fe7e32 100644
--- a/media-libs/mesa/files/mesa-9999-dont-require-llvm-for-r300.patch
+++ b/media-libs/mesa/files/mesa-9999-dont-require-llvm-for-r300.patch
@@ -1,8 +1,6 @@
-diff --git a/configure.ac b/configure.ac
-index 846b623..fbd05c1 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1839,14 +1839,6 @@ gallium_check_st() {
+--- 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
}
@@ -14,10 +12,10 @@ index 846b623..fbd05c1 100644
- fi
-}
-
- dnl Gallium drivers
- dnl Duplicates in GALLIUM_DRIVERS_DIRS are removed by sorting it after this block
- if test "x$with_gallium_drivers" != x; then
-@@ -1868,7 +1860,6 @@ if test "x$with_gallium_drivers" != x; then
+ 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])
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/x11:master commit in: media-libs/mesa/files/
@ 2013-04-28 12:54 Chi-Thanh Christopher Nguyen
0 siblings, 0 replies; 6+ messages in thread
From: Chi-Thanh Christopher Nguyen @ 2013-04-28 12:54 UTC (permalink / raw
To: gentoo-commits
commit: 2127fdc5e5c311eb26e39c61b538e93722da0f8b
Author: Chi-Thanh Christopher Nguyen <chithanh <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 28 12:54:07 2013 +0000
Commit: Chi-Thanh Christopher Nguyen <chithanh <AT> cs <DOT> tu-berlin <DOT> de>
CommitDate: Sun Apr 28 12:54:07 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=2127fdc5
media-libs/mesa: add eselect-mesa config for the ilo driver
---
media-libs/mesa/files/eselect-mesa.conf.9.2 | 39 +++++++++++++++++++++++++++
1 files changed, 39 insertions(+), 0 deletions(-)
diff --git a/media-libs/mesa/files/eselect-mesa.conf.9.2 b/media-libs/mesa/files/eselect-mesa.conf.9.2
new file mode 100644
index 0000000..ff590f5
--- /dev/null
+++ b/media-libs/mesa/files/eselect-mesa.conf.9.2
@@ -0,0 +1,39 @@
+# 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 GMA 965, G/Q3x, G/Q4x, HD)"
+MESA_DRIVERS[i965,classicdriver]="i965_dri.so"
+MESA_DRIVERS[i965,galliumdriver]="ilo_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"
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/x11:master commit in: media-libs/mesa/files/
@ 2013-05-06 17:37 Chi-Thanh Christopher Nguyen
0 siblings, 0 replies; 6+ messages in thread
From: Chi-Thanh Christopher Nguyen @ 2013-05-06 17:37 UTC (permalink / raw
To: gentoo-commits
commit: 42617e8df3be80768a1d79b1a61307ac06097e15
Author: Chi-Thanh Christopher Nguyen <chithanh <AT> gentoo <DOT> org>
AuthorDate: Mon May 6 17:35:37 2013 +0000
Commit: Chi-Thanh Christopher Nguyen <chithanh <AT> cs <DOT> tu-berlin <DOT> de>
CommitDate: Mon May 6 17:35:37 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=42617e8d
Revert "Update patch"
This reverts commit a0494c8882d53ae6f129a49ba00a27afc45a6a93.
---
...mesa-9999-clover-use-non-null-platform-id.patch | 26 ++++----------------
1 files changed, 5 insertions(+), 21 deletions(-)
diff --git a/media-libs/mesa/files/mesa-9999-clover-use-non-null-platform-id.patch b/media-libs/mesa/files/mesa-9999-clover-use-non-null-platform-id.patch
index 1c2d065..5be513d 100644
--- a/media-libs/mesa/files/mesa-9999-clover-use-non-null-platform-id.patch
+++ b/media-libs/mesa/files/mesa-9999-clover-use-non-null-platform-id.patch
@@ -1,7 +1,4 @@
-From cc0fb86ba8ca9c96806f05e71b70db3da5edf4fd Mon Sep 17 00:00:00 2001
-From: Tom Stellard <thomas.stellard@amd.com>
-Date: Fri, 5 Apr 2013 13:23:01 -0700
-Subject: [PATCH] clover: Use a non-NULL value to represent the platform_id v3
+From: Tom Stellard <thomas.stellard at amd.com>
Using a NULL value for the platform_id is legal according to the spec,
however, passing a NULL value as the platform parameter to
@@ -18,29 +15,17 @@ v2:
v3:
- Use MESA_PLATFORM_ID when calling clGetDeviceIDs() from
clCreateContextFromType()
-
-v4:
- - Use MESA_PLATFORM_ID when checking the CL_CONTEXT_PLATFORM property
---
- src/gallium/state_trackers/clover/api/context.cpp | 4 ++--
+ src/gallium/state_trackers/clover/api/context.cpp | 2 +-
src/gallium/state_trackers/clover/api/device.cpp | 2 +-
src/gallium/state_trackers/clover/api/platform.cpp | 4 ++--
src/gallium/state_trackers/clover/api/util.hpp | 2 ++
- 4 files changed, 7 insertions(+), 5 deletions(-)
+ 4 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/gallium/state_trackers/clover/api/context.cpp b/src/gallium/state_trackers/clover/api/context.cpp
-index 80afb6b..f25856f 100644
+index 80afb6b..d509619 100644
--- a/src/gallium/state_trackers/clover/api/context.cpp
+++ b/src/gallium/state_trackers/clover/api/context.cpp
-@@ -42,7 +42,7 @@ clCreateContext(const cl_context_properties *props, cl_uint num_devs,
-
- for (auto p : mprops) {
- if (!(p.first == CL_CONTEXT_PLATFORM &&
-- (cl_platform_id)p.second == NULL))
-+ (cl_platform_id)p.second == MESA_PLATFORM_ID))
- throw error(CL_INVALID_PROPERTY);
- }
-
@@ -65,7 +65,7 @@ clCreateContextFromType(const cl_context_properties *props,
cl_device_id dev;
cl_int ret;
@@ -99,5 +84,4 @@ index 2f9ec1f..0e80cda 100644
///
/// Return a matrix (a container of containers) in \a buf with
--
-1.8.1.5
-
+1.7.11.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/x11:master commit in: media-libs/mesa/files/
@ 2013-07-24 7:29 Matt Turner
0 siblings, 0 replies; 6+ messages in thread
From: Matt Turner @ 2013-07-24 7:29 UTC (permalink / raw
To: gentoo-commits
commit: cb36e1054f2bf023e02f573141da574ac803eb31
Author: Matt Turner <mattst88 <AT> gmail <DOT> com>
AuthorDate: Wed Jul 24 07:28:21 2013 +0000
Commit: Matt Turner <mattst88 <AT> gmail <DOT> com>
CommitDate: Wed Jul 24 07:28:21 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=cb36e105
media-libs/mesa: Update r300/don't require llvm patch.
Bug 477962.
---
.../mesa-9999-dont-require-llvm-for-r300.patch | 27 ++++++----------------
1 file changed, 7 insertions(+), 20 deletions(-)
diff --git a/media-libs/mesa/files/mesa-9999-dont-require-llvm-for-r300.patch b/media-libs/mesa/files/mesa-9999-dont-require-llvm-for-r300.patch
index 9fe7e32..bd24787 100644
--- a/media-libs/mesa/files/mesa-9999-dont-require-llvm-for-r300.patch
+++ b/media-libs/mesa/files/mesa-9999-dont-require-llvm-for-r300.patch
@@ -1,25 +1,12 @@
---- 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 @@
- ;;
+diff --git a/configure.ac b/configure.ac
+index 21a1986..94b2247 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1777,7 +1777,6 @@ if test "x$with_gallium_drivers" != x; then
xr300)
+ HAVE_GALLIUM_R300=yes
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"
+ gallium_check_st "radeon/drm" "dri-r300" "" "" "xvmc-r300" "vdpau-r300"
;;
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/x11:master commit in: media-libs/mesa/files/
@ 2014-03-03 3:41 David Heidelberger
0 siblings, 0 replies; 6+ messages in thread
From: David Heidelberger @ 2014-03-03 3:41 UTC (permalink / raw
To: gentoo-commits
commit: 1e97c86c51e510952388ad7dbe487ce6d4d3bcc8
Author: David Heidelberger <david.heidelberger <AT> ixit <DOT> cz>
AuthorDate: Mon Mar 3 03:40:01 2014 +0000
Commit: David Heidelberger <d.okias <AT> gmail <DOT> com>
CommitDate: Mon Mar 3 03:40:01 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=1e97c86c
media-libs/mesa: update r300 patch
---
.../mesa/files/mesa-9999-dont-require-llvm-for-r300.patch | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/media-libs/mesa/files/mesa-9999-dont-require-llvm-for-r300.patch b/media-libs/mesa/files/mesa-9999-dont-require-llvm-for-r300.patch
index bd24787..a85a3c1 100644
--- a/media-libs/mesa/files/mesa-9999-dont-require-llvm-for-r300.patch
+++ b/media-libs/mesa/files/mesa-9999-dont-require-llvm-for-r300.patch
@@ -1,12 +1,11 @@
-diff --git a/configure.ac b/configure.ac
-index 21a1986..94b2247 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1777,7 +1777,6 @@ if test "x$with_gallium_drivers" != x; then
- xr300)
+diff -Naur a/configure.ac b/configure.ac
+--- a/configure.ac 2014-03-03 04:05:33.110522943 +0100
++++ b/configure.ac 2014-03-03 04:06:44.165518094 +0100
+@@ -1774,7 +1774,6 @@
HAVE_GALLIUM_R300=yes
PKG_CHECK_MODULES([RADEON], [libdrm_radeon >= $LIBDRM_RADEON_REQUIRED])
+ gallium_require_drm_loader
- gallium_require_llvm "Gallium R300"
GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS r300"
- gallium_check_st "radeon/drm" "dri-r300" "" "" "xvmc-r300" "vdpau-r300"
- ;;
+ gallium_check_st "radeon/drm" "r300/dri" "" "" ""
+ DRICOMMON_NEED_LIBDRM=yes
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2014-03-03 3:41 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-07-24 7:29 [gentoo-commits] proj/x11:master commit in: media-libs/mesa/files/ Matt Turner
-- strict thread matches above, loose matches on Subject: below --
2014-03-03 3:41 David Heidelberger
2013-05-06 17:37 Chi-Thanh Christopher Nguyen
2013-04-28 12:54 Chi-Thanh Christopher Nguyen
2012-05-16 3:29 Matt Turner
2012-02-10 18:12 Matt Turner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox