diff options
| author | Treeve Jelbert | 2015-06-16 22:02:26 +0200 |
|---|---|---|
| committer | Treeve Jelbert | 2015-06-16 22:02:26 +0200 |
| commit | 49620f99ec89ddb1644ffdba6f6ba8cd3ed1ec4e (patch) | |
| tree | f52aa038035c55e978b435b5649db5d07059bc0b | |
| parent | 13b44b9726bce847746ba6a8f15873dbbc9e9e8a (diff) | |
| parent | e4c4d684daed7af337bd4835777917a1899a842b (diff) | |
Merge remote-tracking branch 'origin/master' into devel-merge-kde4+plasma5+kde5
| -rwxr-xr-x | graphics-libs/mesalib/CONFIGURE | 2 | ||||
| -rwxr-xr-x | graphics-libs/mesalib/DETAILS | 4 | ||||
| -rw-r--r-- | graphics-libs/mesalib/HISTORY | 5 |
3 files changed, 8 insertions, 3 deletions
diff --git a/graphics-libs/mesalib/CONFIGURE b/graphics-libs/mesalib/CONFIGURE index 549c1fe8af..1facefe577 100755 --- a/graphics-libs/mesalib/CONFIGURE +++ b/graphics-libs/mesalib/CONFIGURE @@ -40,7 +40,7 @@ case $MESALIB_BUILD in if [[ $MESALIB_GALLIUM != "" ]] && [[ $MESALIB_GALLIUM != none ]]; then list_add MESALIB_OPTS "--enable-egl" - config_query_multi MESA_EGL "which EGL platforms?" drm fbdev wayland x11 + config_query_multi MESA_EGL "which EGL platforms?" drm wayland x11 if list_find wayland "$MESA_EGL";then list_remove MESALIB_OPTS "--disable-shared-glapi" && list_remove MESALIB_OPTS "--disable-gbm" && diff --git a/graphics-libs/mesalib/DETAILS b/graphics-libs/mesalib/DETAILS index 9d710f5952..0503192936 100755 --- a/graphics-libs/mesalib/DETAILS +++ b/graphics-libs/mesalib/DETAILS @@ -7,8 +7,8 @@ if [[ "$MESALIB_BRANCH" == "scm" ]]; then SOURCE_DIRECTORY=${BUILD_DIRECTORY}/mesalib-git SOURCE_IGNORE=volatile else - VERSION=10.5.6 - SOURCE_HASH=sha512:691a757755a76a85ac0877617bad7491037dda9445fc36499e9fc32d0fbfb3d3cdf8666bc45596a4d8e0b6fea40860e86e5e2ef1adc041b23cb5990aceaf4903 + VERSION=10.6.0 + SOURCE_HASH=sha512:6a689de013269336b744f7b0a1acfd065eaffdb8ca2ed22d979eac0163abb16d2e6072433c0d529491083efae4d1645c60e26b22e838f5bd76f0082e3bc80e6d PATCHLEVEL=0 # VX=`echo $VERSION | cut -d. -f-2` SX=mesa-${VERSION} diff --git a/graphics-libs/mesalib/HISTORY b/graphics-libs/mesalib/HISTORY index fb3ecd309d..01f843bbf9 100644 --- a/graphics-libs/mesalib/HISTORY +++ b/graphics-libs/mesalib/HISTORY @@ -1,3 +1,8 @@ +2015-06-16 Treeve Jelbert <treeve@sourcemage.org> + * DETAILS: version 10.6.0 + * CONFIGURE: delete obsolete fbdev usage + * RECAST: delete spurios file + 2015-05-28 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version 10.5.6 |