sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to devel-xorg-modular grimoire by Treeve Jelbert (db4925ef6975214e1dc4eddf7fbf7bd597bbf17b)
- From: Treeve Jelbert <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org
- Subject: [SM-Commit] GIT changes to devel-xorg-modular grimoire by Treeve Jelbert (db4925ef6975214e1dc4eddf7fbf7bd597bbf17b)
- Date: Thu, 25 Sep 2014 14:41:07 -0500
GIT changes to devel-xorg-modular grimoire by Treeve Jelbert
<treeve AT sourcemage.org>:
ChangeLog | 4
dev/null |binary
gnome2-libs/pango/DEPENDS | 2
gnome2-libs/pango/HISTORY | 3
graphics-libs/glu/DEPENDS | 2
graphics-libs/glu/HISTORY | 3
graphics-libs/libcaca/DEPENDS | 2
graphics-libs/libcaca/HISTORY | 3
graphics-libs/mesalib-1x/BUILD | 11
graphics-libs/mesalib-1x/CONFIGURE | 77 --
graphics-libs/mesalib-1x/CONFLICTS | 1
graphics-libs/mesalib-1x/DEPENDS | 48 -
graphics-libs/mesalib-1x/DETAILS | 26
graphics-libs/mesalib-1x/EXPORTS | 1
graphics-libs/mesalib-1x/HISTORY | 48 -
graphics-libs/mesalib-1x/PRE_BUILD | 8
graphics-libs/mesalib-1x/PRE_SUB_DEPENDS | 9
graphics-libs/mesalib-1x/PROVIDES | 2
graphics-libs/mesalib-1x/SUB_DEPENDS | 29
graphics-libs/mesalib-1x/gl_select.patch | 59 -
graphics-libs/mesalib-1x/mesa-10.0-nv50-fix-build.patch | 12
graphics-libs/mesalib/BUILD | 45 -
graphics-libs/mesalib/CONFIGURE | 104 --
graphics-libs/mesalib/DEPENDS | 100 --
graphics-libs/mesalib/DETAILS | 49 -
graphics-libs/mesalib/FINAL | 2
graphics-libs/mesalib/HISTORY | 567
+---------------
graphics-libs/mesalib/INSTALL | 6
graphics-libs/mesalib/Makefile-fix-sed-expression.patch | 11
graphics-libs/mesalib/POST_RESURRECT | 2
graphics-libs/mesalib/PREPARE | 2
graphics-libs/mesalib/PRE_BUILD | 51 -
graphics-libs/mesalib/PRE_SUB_DEPENDS | 6
graphics-libs/mesalib/PROVIDES | 1
graphics-libs/mesalib/REPAIR^all^EXPORTS | 1
graphics-libs/mesalib/REPAIR^all^POST_RESURRECT | 2
graphics-libs/mesalib/REPAIR^all^PRE_SUB_DEPENDS | 5
graphics-libs/mesalib/SUB_DEPENDS | 25
graphics-libs/mesalib/UP_TRIGGERS | 18
graphics-libs/mesalib/autogen.patch | 9
graphics-libs/mesalib/gl_select-scm.patch | 35
graphics-libs/mesalib/gl_select.patch | 59 +
graphics-libs/mesalib/mesa-10.0-nv50-fix-build.patch | 12
graphics-libs/mesalib/mesa-8.0.3-llvm-3.1.patch | 53 -
http/eflwebkit/DEPENDS | 2
http/eflwebkit/HISTORY | 3
http/webkitgtk/DEPENDS | 2
http/webkitgtk/HISTORY | 3
http/webkitgtk3/DEPENDS | 2
http/webkitgtk3/HISTORY | 3
libs/libva/DEPENDS | 2
libs/libva/HISTORY | 3
libs/openscenegraph/DEPENDS | 2
libs/openscenegraph/HISTORY | 3
libs/sdl2/DEPENDS | 4
libs/sdl2/HISTORY | 3
video/mplayer/DEPENDS | 2
video/mplayer/HISTORY | 3
x11-toolkits/fltk2/DEPENDS | 2
x11-toolkits/fltk2/HISTORY | 3
x11-toolkits/wxgtk/DEPENDS | 2
x11-toolkits/wxgtk/HISTORY | 3
x11/xlockmore/DEPENDS | 2
x11/xlockmore/HISTORY | 3
xorg-app/weston/DEPENDS | 2
xorg-app/weston/HISTORY | 3
xorg-app/xdriinfo/DEPENDS | 2
xorg-app/xdriinfo/HISTORY | 3
xorg-driver/glamor/DEPENDS | 2
xorg-driver/glamor/HISTORY | 3
xorg-driver/xf86-video-ati/DEPENDS | 2
xorg-driver/xf86-video-ati/HISTORY | 3
xorg-driver/xf86-video-glint/DEPENDS | 2
xorg-driver/xf86-video-glint/HISTORY | 3
xorg-driver/xf86-video-mga/DEPENDS | 2
xorg-driver/xf86-video-mga/HISTORY | 3
xorg-driver/xf86-video-modesetting/DEPENDS | 2
xorg-driver/xf86-video-modesetting/HISTORY | 3
xorg-driver/xf86-video-openchrome/DEPENDS | 2
xorg-driver/xf86-video-openchrome/HISTORY | 3
xorg-driver/xf86-video-r128/DEPENDS | 2
xorg-driver/xf86-video-r128/HISTORY | 3
xorg-driver/xf86-video-sis/DEPENDS | 2
xorg-driver/xf86-video-sis/HISTORY | 3
xorg-driver/xf86-video-tdfx/DEPENDS | 2
xorg-driver/xf86-video-tdfx/HISTORY | 3
xorg-driver/xf86-video-via/DEPENDS | 2
xorg-driver/xf86-video-via/HISTORY | 3
xorg-xserver/xorg-server/DEPENDS | 2
xorg-xserver/xorg-server/HISTORY | 1
90 files changed, 345 insertions(+), 1285 deletions(-)
New commits:
commit db4925ef6975214e1dc4eddf7fbf7bd597bbf17b
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
mesalib - nolonger provides MESALIB
commit 8d04ffecfd93da377728be502f0cc7ee1a383e84
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
xf86-video-via - depends mesalib
commit 139ad6bd0f6e4efc2613da50435f34459dcdf810
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
xf86-video-tdfx - depends mesalib
commit 708360c7d242c6c277663740251c0d35d4507c28
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
xf86-video-sis - depends mesalib
commit a49c11922f32a7defe9abe2303a2f6cdcb9e330b
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
xf86-video-r128 - depends mesalib
commit f9f82539fd4cdfa68dd97398bc09ca8880487476
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
xf86-video-openchrome - depends mesalib
commit ae4356d5009948f197078a98af4ef0178c8761af
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
xf86-video-modesetting - depends mesalib
commit c41461595ce2b115b156e4c4175ba0bf8f4df6f3
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
xf86-video-mga - depends mesalib
commit 3222492a9745e6135446983ca96b2ccb7f468c30
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
xf86-video-glint - depends mesalib
commit 7e6d7d3cbb6a11804141261cdc169a583f86c918
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
xf86-video-ati - depends mesalib
commit 1ed91a998cbc221865f7940d67175e15fc1648b0
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
glamor - depends mesalib
commit 2599c027506477c98a4de760ce5addb8b4836209
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
xdriinfo - depends mesalib
commit 05f17f2859511e785d6d89086e1b311c842a7c1e
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
weston - depends mesalib
commit 6747356cd7256157bbd03780003d71a1540ecb63
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
xlockmore - depends mesalib
commit d5651e0bbcaad84eef33406dd499b040013838cd
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
wxgtk - depends mesalib
commit bea577b08cfd26131b38a075e37e1ca6983d0da4
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
fltk2 - depends mesalib
commit afedf51d69a26abc176c160e524686cc2bd9ef0d
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
mplayer - depends mesalib
commit 3d8865d2f12ccd3d2b88fbc1f49877fb7214391e
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
sdl2 - depends mesalib
commit 2c627e7a72224cd4dd69f60f0d6896d33dec725a
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
openscenegraph - depends mesalib
commit 61642f88eebc67eb63b8a00611b2ccd405c688f8
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
libva - depends mesalib
commit 3dc85259bbfccdd8f1f1f2b1e0fd39d7019e77c0
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
webkitgtk3 - depends mesalib
commit 6bc93d8b7d2cc7322a8b4124231f70c8a7fe1a8d
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
webkitgtk - depends mesalib
commit 08162a5f39b589b24838468596b7cca814c18cba
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
eflwebkit - depends mesalib
commit 14b3787eb0d5dbc07582e36576a226193f3f3e7f
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
libcaca - depends mesalib
commit 47d3a089cef1f0b8acf988002e6e124ed2749f91
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
glu - depends mesalib
commit 934a57275720afc90d56f8f176f7b106897669a7
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
pango - depends mesalib
commit 8ab378467c74bb4b059d6d11dfe8156ed7608841
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
xorg-server - depends mesalib
commit 364188bfe4c08ae25be8d1460e17bf3bdc87b159
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
rename mesalib-1x => mesalib
commit 8d1c1358160440515a8b2e5eb8dfc31a7b03e8f7
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
delete obsolete mesalib
diff --git a/ChangeLog b/ChangeLog
index fddcd06..e580320 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2014-09-25 Treeve Jelbert <treeve AT sourcemage.org>
+ * mesalib: deleted, this is now obsolete, as xorg-srver requires
mesalib-1x
+ * rename mesalib-1x => mesalib
+
2014-09-25 Ismael Luceno <ismael AT sourcemage.org>
* utils/lxc: new spell, Userspace tools for the Linux kernel
containers
diff --git a/gnome2-libs/pango/DEPENDS b/gnome2-libs/pango/DEPENDS
index 4573481..c9d882a 100755
--- a/gnome2-libs/pango/DEPENDS
+++ b/gnome2-libs/pango/DEPENDS
@@ -9,7 +9,7 @@ depends glib2 &&
depends harfbuzz &&
depends libffi &&
depends libpng &&
-depends MESALIB &&
+depends mesalib &&
depends pcre &&
depends pixman &&
diff --git a/gnome2-libs/pango/HISTORY b/gnome2-libs/pango/HISTORY
index 8c07505..7919c25 100644
--- a/gnome2-libs/pango/HISTORY
+++ b/gnome2-libs/pango/HISTORY
@@ -1,3 +1,6 @@
+2014-09-25 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: MESALIB => mesalib
+
2014-09-25 Remko van der Vossen <wich AT sourcemage.org>
* DEPENDS: MESALIB
diff --git a/graphics-libs/glu/DEPENDS b/graphics-libs/glu/DEPENDS
index ca5faf0..2d5dbfe 100755
--- a/graphics-libs/glu/DEPENDS
+++ b/graphics-libs/glu/DEPENDS
@@ -1,2 +1,2 @@
depends -sub CXX gcc &&
-depends MESALIB
+depends mesalib
diff --git a/graphics-libs/glu/HISTORY b/graphics-libs/glu/HISTORY
index 2814e4f..d45c343 100644
--- a/graphics-libs/glu/HISTORY
+++ b/graphics-libs/glu/HISTORY
@@ -1,3 +1,6 @@
+2014-09-25 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: MESALIB => mesalib
+
2014-04-14 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: mesalib => MESALIB
diff --git a/graphics-libs/libcaca/DEPENDS b/graphics-libs/libcaca/DEPENDS
index 12fe270..dbc487c 100755
--- a/graphics-libs/libcaca/DEPENDS
+++ b/graphics-libs/libcaca/DEPENDS
@@ -1,7 +1,7 @@
optional_depends slang "" "--disable-slang" "to build support for slang
output" &&
optional_depends imlib2 "" "--disable-imlib2" "to open not only BMP files"
&&
optional_depends doxygen "" "--disable-doc" "to generate documentation"
&&
-optional_depends MESALIB "" "--disable-gl" "for OpenGL support"
&&
+optional_depends mesalib "" "--disable-gl" "for OpenGL support"
&&
optional_depends ncurses "" "--disable-ncurses" "Enable ncurses graphics
support?" &&
optional_depends libx11 "" "--disable-x11" "Enable X11 support?"
&&
optional_depends GLUT "" "" "Enable GLUT support?"
&&
diff --git a/graphics-libs/libcaca/HISTORY b/graphics-libs/libcaca/HISTORY
index 02d515a..3e948d1 100644
--- a/graphics-libs/libcaca/HISTORY
+++ b/graphics-libs/libcaca/HISTORY
@@ -1,3 +1,6 @@
+2014-09-25 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: MESALIB => mesalib
+
2014-04-14 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: mesalib => MESALIB
diff --git a/graphics-libs/mesalib-1x/BUILD b/graphics-libs/mesalib-1x/BUILD
deleted file mode 100755
index aa52e67..0000000
--- a/graphics-libs/mesalib-1x/BUILD
+++ /dev/null
@@ -1,11 +0,0 @@
-# I am confused about that. According to
-# https://bugs.freedesktop.org/show_bug.cgi?id=70471
-# llvm-config output should contain -fno-rtti.
-CXXFLAGS+=" -fno-rtti" &&
-OPTS="--with-dri-drivers=${MESALIB_DRIVERS// /,} \
- --with-gallium-drivers=${MESALIB_GALLIUM// /,} \
- $MESALIB_OPTS \
- --with-egl-platforms=${MESA_EGL//\ /,} \
- $OPTS" &&
-echo "OPTS=$OPTS" &&
-default_build
diff --git a/graphics-libs/mesalib-1x/CONFIGURE
b/graphics-libs/mesalib-1x/CONFIGURE
deleted file mode 100755
index 7cd72ae..0000000
--- a/graphics-libs/mesalib-1x/CONFIGURE
+++ /dev/null
@@ -1,77 +0,0 @@
-. $GRIMOIRE/config_query_multi.function &&
-message "${MESSAGE_COLOR}MesaLib build types:\n" \
- "xlib: Stand-alone software rendering library;\n" \
- " Output is via xlib library functions;\n" \
- " No X server integration.\n" \
- "dri: Hardware acceleration in Linux with DRI-enabled kernel;\n"\
- " Integrated with DRI-enabled X server;\n" \
- " Required for building xorg-xserver with DRI enabled.\n" \
- "osmesa: Stand-alone software rendering library;\n" \
- " Off-screen rendering only;\n" \
- " No connection to X server at all.${DEFAULT_COLOR}" &&
-config_query_list MESALIB_BUILD \
- "Select build type?" \
- xlib \
- dri \
- osmesa &&
-
-case $MESALIB_BUILD in
- dri)
- AVAILABLE_DRIVERS="i915 i965 nouveau r200 radeon swrast"
-
- config_query_multi MESALIB_DRIVERS \
- "What drivers would you like to build?" \
- all $AVAILABLE_DRIVERS &&
-
- if list_find "$MESALIB_DRIVERS" all; then
- MESALIB_DRIVERS="$AVAILABLE_DRIVERS"
- fi &&
-
-
-# TODO: Proper dependencies for those ... also libdrm ...
- AVAILABLE_GALLIUM="i915 ilo nouveau r300 r600 radeonsi swrast"
-
- config_query_multi MESALIB_GALLIUM \
- "What Gallium3D drivers woulld you like to build?" \
- none all $AVAILABLE_GALLIUM
- if [[ $MESALIB_GALLIUM = all ]]; then
- MESALIB_GALLIUM=$AVAILABLE_GALLIUM
- fi
-
- if [[ $MESALIB_GALLIUM != none ]]; then
- list_add MESALIB_OPTS "--enable-egl"
- config_query_multi MESA_EGL "which EGL platforms?" drm fbdev wayland x11
- if list_find wayland "$MESA_EGL";then
- list_remove MESALIB_OPTS "--disable-shared-glapi" &&
- list_remove MESALIB_OPTS "--disable-gbm" &&
- list_remove MESALIB_OPTS "--disable-gles2" &&
- list_add MESALIB_OPTS "--enable-shared-glapi"&&
- list_add MESALIB_OPTS "--enable-gbm" &&
- list_add MESALIB_OPTS "--enable-gles2"
- else
- config_query_option MESALIB_OPTS "enable shared GLapi" n \
- "--enable-shared-glapi" "--disable-shared-glapi" &&
-
- config_query_option MESALIB_OPTS "enable Generic Buffer Management?" n
\
- "--enable-gbm" "--disable-gbm"
- config_query_option MESALIB_OPTS "enable support for OpenGL ES 2.x
API?" n \
- "--enable-gles2" "--disable-gles2"
- fi
-# config_query_option MESALIB_OPTS "enable support for OpenGL ES 1.x
API?" n \
-# "--enable-gles1" "--disable-gles1"
- else
- MESALIB_GALLIUM=
- config_query_option MESALIB_OPTS "enable EGL library?" y \
- "--enable-egl" "--disable-egl"
- if list_find --enable-egl "$MESALIB_OPTS"; then
- MESALIB_OPTS+=" --enable-gbm" # Mandatory!
- fi
- fi
- ;;
- xlib)
- MESALIB_DRIVERS="swrast"
- ;;
-esac &&
-
-config_query_option MESALIB_OPTS "enable TLS support in GLX" n \
- "--enable-glx-tls" "--disable-glx-tls"
diff --git a/graphics-libs/mesalib-1x/CONFLICTS
b/graphics-libs/mesalib-1x/CONFLICTS
deleted file mode 100755
index 24d2e5a..0000000
--- a/graphics-libs/mesalib-1x/CONFLICTS
+++ /dev/null
@@ -1 +0,0 @@
-conflicts mesalib
diff --git a/graphics-libs/mesalib-1x/DEPENDS
b/graphics-libs/mesalib-1x/DEPENDS
deleted file mode 100755
index 0fac5a2..0000000
--- a/graphics-libs/mesalib-1x/DEPENDS
+++ /dev/null
@@ -1,48 +0,0 @@
-depends bison &&
-depends flex &&
-depends libx11 &&
-
-case $MESALIB_BUILD in
- dri)
- depends glproto &&
- depends dri2proto &&
- depends dri3proto &&
- depends presentproto &&
- depends libdrm &&
- depends UDEV &&
- depends libxext &&
- depends libxxf86vm &&
- depends libxdamage &&
- depends libxfixes &&
- depends libxcb &&
- depends expat
- ;;
- *)
- ;;
-esac &&
-depends python &&
-depends -sub PYTHON libxml2 &&
-
-if [[ "$MESALIB_GALLIUM" != "none" ]]; then
- depends llvm
- if list_find "$MESA_EGL" wayland;then
- depends wayland
- fi
-fi &&
-
-if ( list_find $MESALIB_DRIVERS i915 ) || \
- ( list_find $MESALIB_DRIVERS i965); then
- sub_depends libdrm INTEL
-fi &&
-
-if ( list_find $MESALIB_DRIVERS r200) || \
- ( list_find $MESALIB_DRIVERS radeon); then
- sub_depends libdrm RADEON
-fi &&
-
-if ( list_find $MESALIB_DRIVERS nouveau); then
- sub_depends libdrm NOUVEAU
-fi &&
-optional_depends wayland '' '' 'Wayland support'
-optional_depends libvdpau '' '' 'VDPAU support'
-optional_depends libxvmc '--enable-xvmc' '--disable-xvmc' 'XvMC support
(obsolete)'
diff --git a/graphics-libs/mesalib-1x/DETAILS
b/graphics-libs/mesalib-1x/DETAILS
deleted file mode 100755
index 68a2d9a..0000000
--- a/graphics-libs/mesalib-1x/DETAILS
+++ /dev/null
@@ -1,26 +0,0 @@
- SPELL=mesalib-1x
- SPELLX=MesaLib
- VERSION=10.2.6
-
SOURCE_HASH=sha512:07775699fe29f373f84265f7f715b15a945c66cb98bef05faf3cb86fc34accbd9ace3a77b5dae928259118846867324375d9f48b1fef4a92681ecc091aa66266
- PATCHLEVEL=0
-# VX=`echo $VERSION | cut -d. -f-2`
- SX=${SPELLX}-${VERSION}
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/Mesa-$VERSION
- SOURCE=$SX.tar.bz2
- SOURCE_URL[0]=ftp://ftp.freedesktop.org/pub/mesa/${VERSION}/$SOURCE
- LICENSE[0]=GPL
- WEB_SITE=http://www.mesa3d.org/
- KEYWORDS="graphics libs"
- ENTERED=20140414
- STAGED_INSTALL=off
- SHORT="Mesa implementation of the OpenGL(TM) API"
-cat << EOF
-Mesa is a 3-D graphics library with an API which is very similar to
-that of OpenGL.* To the extent that Mesa utilizes the OpenGL command
-syntax or state machine, it is being used with authorization from
-Silicon Graphics, Inc.(SGI). However, the author does not possess an
-OpenGL license from SGI, and makes no claim that Mesa is in any way a
-compatible replacement for OpenGL or associated with SGI. Those who
-want a licensed implementation of OpenGL should contact a licensed
-vendor.
-EOF
diff --git a/graphics-libs/mesalib-1x/EXPORTS
b/graphics-libs/mesalib-1x/EXPORTS
deleted file mode 100755
index e9b2106..0000000
--- a/graphics-libs/mesalib-1x/EXPORTS
+++ /dev/null
@@ -1 +0,0 @@
-MESALIB_BUILD
diff --git a/graphics-libs/mesalib-1x/HISTORY
b/graphics-libs/mesalib-1x/HISTORY
deleted file mode 100644
index 887ff9a..0000000
--- a/graphics-libs/mesalib-1x/HISTORY
+++ /dev/null
@@ -1,48 +0,0 @@
-2014-09-19 Treeve Jelbert <treeve AT sourcemage.org>
- * SUB_DEPENDS, PRE_SUB_DEPENDS,DEPENDS: fix list_find usage
-
-2014-08-24 Thomas Orgis <sobukus AT sourcemage.org>
- * BUILD, CONFIGURE: Change driver selection and make this beast build.
- It is not perfect, but results in a working build including r600 and
- nouveau drivers for me.
- * PRE_BUILD, mesa-10.0-nv50-fix-build.patch: Remove typeid usage since
- RTTI just won't work for us (another way would be to hack enforced
NDEBUG
- where it belongs).
-
-2014-08-23 Thomas Orgis <sobukus AT sourcemage.org>
- * DETAILS: version 10.2.6
-
-2014-08-11 Sukneet Basuta <sukneet AT sourcemage.org>
- * PRE_BUILD, gl_select.patch: added to install GL headers and libs
- to correct path for smgl-gl_select
-
-2014-08-03 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 10.2.5
-
-2014-07-18 Sukneet Basuta <sukneet AT sourcemage.org>
- * DEPENDS: corrected libdrm NOUVEAU sub_depends to NV
-
-2014-07-11 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 10.2.3
-
-2014-06-25 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 10.2.2
-
-2014-06-07 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 10.2.1
-
-2014-05-10 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 10.1.3
-
-2014-14-19 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 10.1.1
-
-2014-14-14 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 10.1.0
-
-2012-07-26 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version git
- use STAGED_INSTALL=off, as 'make install' tries to
- create invalid hard links
- simplified version of spell from main grimoire
-
diff --git a/graphics-libs/mesalib-1x/PRE_BUILD
b/graphics-libs/mesalib-1x/PRE_BUILD
deleted file mode 100755
index 8644f9f..0000000
--- a/graphics-libs/mesalib-1x/PRE_BUILD
+++ /dev/null
@@ -1,8 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-# Wait ... why isn't NDEBUG in place? Seems to be filtered ...
-#
http://pkgs.fedoraproject.org/cgit/mesa.git/tree/mesa-10.0-nv50-fix-build.patch
-patch -p1 < "$SCRIPT_DIRECTORY/mesa-10.0-nv50-fix-build.patch" &&
-
-patch -p0 < $SPELL_DIRECTORY/gl_select.patch &&
-autoreconf -f -i --symlink
diff --git a/graphics-libs/mesalib-1x/PRE_SUB_DEPENDS
b/graphics-libs/mesalib-1x/PRE_SUB_DEPENDS
deleted file mode 100755
index 5372493..0000000
--- a/graphics-libs/mesalib-1x/PRE_SUB_DEPENDS
+++ /dev/null
@@ -1,9 +0,0 @@
-case $THIS_SUB_DEPENDS in
- DRI) [[ $MESALIB_BUILD == dri ]] && return 0 ;;
- WAYLAND)
- if list_find "$MESA_EGL" wayland;then
- return 0
- fi
- ;;
-esac
-return 1
diff --git a/graphics-libs/mesalib-1x/PROVIDES
b/graphics-libs/mesalib-1x/PROVIDES
deleted file mode 100755
index 324200b..0000000
--- a/graphics-libs/mesalib-1x/PROVIDES
+++ /dev/null
@@ -1,2 +0,0 @@
-OPENGL
-MESALIB
diff --git a/graphics-libs/mesalib-1x/SUB_DEPENDS
b/graphics-libs/mesalib-1x/SUB_DEPENDS
deleted file mode 100755
index 08c625e..0000000
--- a/graphics-libs/mesalib-1x/SUB_DEPENDS
+++ /dev/null
@@ -1,29 +0,0 @@
-case $THIS_SUB_DEPENDS in
- DRI)
- MESALIB_BUILD=dri &&
- persistent_add MESALIB_BUILD &&
-
- message "${MESSAGE_COLOR}DRI support requested, forcing build type" \
- "$MESALIB_BUILD for architecture\n${SMGL_COMPAT_ARCHS[1]}." \
- "$DEFAULT_COLOR" &&
-
- . $GRIMOIRE/config_query_multi.function &&
- if [[ $MESALIB_BUILD == dri ]]; then
- AVAILABLE_DRIVERS="i915 i965 nouveau r200 radeon swrast" &&
-
- config_query_multi MESALIB_DRIVERS \
- "What drivers would you like to build?" \
- $AVAILABLE_DRIVERS &&
- if list_find "$MESALIB_DRIVERS" all
- then
- MESALIB_DRIVERS="$AVAILABLE_DRIVERS"
- fi
- fi ;;
- WAYLAND)
- if ! list_find "$MESA_EGL" wayland;then
- list_add MESA_EGL wayland
- fi
-
- ;;
- *) echo "Unknown sub_depends $THIS_SUB_DEPENDS!"; return 1 ;;
-esac
diff --git a/graphics-libs/mesalib-1x/gl_select.patch
b/graphics-libs/mesalib-1x/gl_select.patch
deleted file mode 100644
index 4b8d285..0000000
--- a/graphics-libs/mesalib-1x/gl_select.patch
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/mesa/Makefile.am.o 2014-07-18 13:00:29.382566095 -0400
-+++ src/mesa/Makefile.am 2014-07-18 12:59:30.160564051 -0400
-@@ -33,7 +33,7 @@
- SUBDIRS += drivers/osmesa
- endif
-
--gldir = $(includedir)/GL
-+gldir = $(includedir)/GL/.mesa
- gl_HEADERS = $(top_srcdir)/include/GL/*.h
-
- .PHONY: $(BUILDDIR)main/git_sha1.h.tmp
---- src/glx/Makefile.am.o 2014-08-11 03:31:09.352150655 -0400
-+++ src/glx/Makefile.am 2014-08-11 03:30:38.336149584 -0400
-@@ -49,7 +49,8 @@
- $(GLPROTO_CFLAGS) \
- $(X11_INCLUDES)
-
--lib_LTLIBRARIES = lib@GL_LIB@.la
-+gldir = ${libdir}/.mesa
-+gl_LTLIBRARIES = lib@GL_LIB@.la
-
- noinst_LTLIBRARIES = libglx.la
-
---- src/egl/main/Makefile.am.o 2014-08-11 03:32:22.588153184 -0400
-+++ src/egl/main/Makefile.am 2014-08-11 03:33:31.992155580 -0400
-@@ -29,7 +29,8 @@
- -D_EGL_DRIVER_SEARCH_DIR=\"$(EGL_DRIVER_INSTALL_DIR)\" \
- -D_EGL_OS_UNIX=1
-
--lib_LTLIBRARIES = libEGL.la
-+egllibdir = ${libdir}/.mesa
-+egllib_LTLIBRARIES = libEGL.la
-
- libEGL_la_SOURCES = \
- eglapi.c \
---- src/mapi/es2api/Makefile.am.o 2014-08-11 03:37:39.123164113 -0400
-+++ src/mapi/es2api/Makefile.am 2014-08-11 03:38:35.648166064 -0400
-@@ -45,7 +45,8 @@
- $(top_srcdir)/include/GLES3/gl3ext.h \
- $(top_srcdir)/include/GLES3/gl3platform.h
-
--lib_LTLIBRARIES = libGLESv2.la
-+glesdir = ${libdir}/.mesa
-+gles_LTLIBRARIES = libGLESv2.la
-
- libGLESv2_la_SOURCES = ../entry.c glapi_mapi_tmp.h
- libGLESv2_la_LIBADD = $(GLESv2_LIB_DEPS)
---- src/mapi/es1api/Makefile.am.o 2014-08-11 03:39:24.923167766 -0400
-+++ src/mapi/es1api/Makefile.am 2014-08-11 03:39:51.135168671 -0400
-@@ -40,7 +40,8 @@
- $(top_srcdir)/include/GLES/glext.h \
- $(top_srcdir)/include/GLES/glplatform.h
-
--lib_LTLIBRARIES = libGLESv1_CM.la
-+glesdir = ${libdir}/.mesa
-+gles_LTLIBRARIES = libGLESv1_CM.la
-
- libGLESv1_CM_la_SOURCES = ../entry.c glapi_mapi_tmp.h
- libGLESv1_CM_la_LIBADD = $(GLESv1_CM_LIB_DEPS)
diff --git a/graphics-libs/mesalib-1x/mesa-10.0-nv50-fix-build.patch
b/graphics-libs/mesalib-1x/mesa-10.0-nv50-fix-build.patch
deleted file mode 100644
index 51d3160..0000000
--- a/graphics-libs/mesalib-1x/mesa-10.0-nv50-fix-build.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -uNr mesa-20131201.orig/src/gallium/drivers/nouveau/codegen/nv50_ir.cpp
mesa-20131201/src/gallium/drivers/nouveau/codegen/nv50_ir.cpp
---- mesa-20131201.orig/src/gallium/drivers/nouveau/codegen/nv50_ir.cpp
2013-12-01 11:29:21.000000000 +0400
-+++ mesa-20131201/src/gallium/drivers/nouveau/codegen/nv50_ir.cpp
2013-12-01 16:05:06.488417551 +0400
-@@ -739,7 +739,7 @@
- if (!i)
- i = new_Instruction(pol.context(), op, dType);
- #ifndef NDEBUG // non-conformant assert, so this is required
-- assert(typeid(*i) == typeid(*this));
-+ //assert(typeid(*i) == typeid(*this));
- #endif
-
- pol.set<Instruction>(this, i);
diff --git a/graphics-libs/mesalib/BUILD b/graphics-libs/mesalib/BUILD
index 4be58de..aa52e67 100755
--- a/graphics-libs/mesalib/BUILD
+++ b/graphics-libs/mesalib/BUILD
@@ -1,38 +1,11 @@
-local MESALIB_DRIVERS_CONF="${MESALIB_DRIVERS//\ /,}" &&
-
-if [[ "x${MESALIB_BRANCH}" == "xdevelopment" ||
- "x${MESALIB_BRANCH}" == "xscm" ]]; then
- case $MESALIB_GALLIUM in
- llvm) OPTS="${OPTS} --enable-gallium-llvm" ;;
- i915) MESALIB_GALLIUM_CONF="$MESALIB_GALLIUM_CONF,i915" ;;
- nouveau) MESALIB_GALLIUM_CONF="$MESALIB_GALLIUM_CONF,nouveau" ;;
- r300) MESALIB_GALLIUM_CONF="$MESALIB_GALLIUM_CONF,r300" ;;
- r600) MESALIB_GALLIUM_CONF="$MESALIB_GALLIUM_CONF,r600" ;;
- svga) MESALIB_GALLIUM_CONF="$MESALIB_GALLIUM_CONF,svga" ;;
- swrast) MESALIB_GALLIUM_CONF="$MESALIB_GALLIUM_CONF,swrast" ;;
- esac &&
-
- OPTS="--with-gallium-drivers=$MESALIB_GALLIUM_CONF \
- $OPTS"
-else
- case $MESALIB_GALLIUM in
- llvm) OPTS="${OPTS} --enable-gallium-llvm" ;;
- svga) OPTS="${OPTS} --enable-gallium-svga" ;;
- intel) OPTS="${OPTS} --enable-gallium-intel" ;;
- i915) OPTS="${OPTS} --enable-gallium-i915" ;;
- i965) OPTS="${OPTS} --enable-gallium-i965" ;;
- radeon) OPTS="${OPTS} --enable-gallium-radeon --disable-gallium-intel"
- LDFLAGS="${LDFLAGS/-s/}" ;;
- r600) OPTS="${OPTS} --enable-gallium-r600" ;;
- nouveau) OPTS="${OPTS} --enable-gallium-nouveau --disable-gallium-intel"
;;
- swrast) OPTS="${OPTS} --enable-gallium-swrast" ;;
- none) OPTS="${OPTS} --disable-gallium" ;;
- esac
-fi &&
-
-OPTS="--with-driver=$MESALIB_BUILD \
- --with-dri-drivers=$MESALIB_DRIVERS_CONF \
+# I am confused about that. According to
+# https://bugs.freedesktop.org/show_bug.cgi?id=70471
+# llvm-config output should contain -fno-rtti.
+CXXFLAGS+=" -fno-rtti" &&
+OPTS="--with-dri-drivers=${MESALIB_DRIVERS// /,} \
+ --with-gallium-drivers=${MESALIB_GALLIUM// /,} \
+ $MESALIB_OPTS \
--with-egl-platforms=${MESA_EGL//\ /,} \
- $MESALIB_OPTS \
- $OPTS" &&
+ $OPTS" &&
+echo "OPTS=$OPTS" &&
default_build
diff --git a/graphics-libs/mesalib/CONFIGURE b/graphics-libs/mesalib/CONFIGURE
index 74fbf77..7cd72ae 100755
--- a/graphics-libs/mesalib/CONFIGURE
+++ b/graphics-libs/mesalib/CONFIGURE
@@ -1,20 +1,3 @@
-list_remove MESALIB_DRIVERS i915tex || true
-# ordering is important
-MESALIB_BUILD=${MESALIB_BUILD/linux-dri/dri}
-MESALIB_BUILD=${MESALIB_BUILD/linux-dri-x86-64/dri}
-MESALIB_BUILD=${MESALIB_BUILD/linux-dri-x86/dri}
-MESALIB_BUILD=${MESALIB_BUILD/linux-dri-ppc/dri}
-MESALIB_BUILD=${MESALIB_BUILD/linux-ppc/xlib}
-MESALIB_BUILD=${MESALIB_BUILD/linux-x86-64/xlib}
-MESALIB_BUILD=${MESALIB_BUILD/linux-x86/xlib}
-MESALIB_BUILD=${MESALIB_BUILD/linux-fbdev/xlib}
-MESALIB_BUILD=${MESALIB_BUILD/linux-directfb/xlib}
-MESALIB_BUILD=${MESALIB_BUILD/linux-glide/xlib}
-MESALIB_BUILD=${MESALIB_BUILD/linux-sparc5/xlib}
-MESALIB_BUILD=${MESALIB_BUILD/linux-sparc/xlib}
-MESALIB_BUILD=${MESALIB_BUILD/linux-ultrasparc/xlib}
-MESALIB_BUILD=${MESALIB_BUILD/linux/xlib}
-
. $GRIMOIRE/config_query_multi.function &&
message "${MESSAGE_COLOR}MesaLib build types:\n" \
"xlib: Stand-alone software rendering library;\n" \
@@ -32,8 +15,9 @@ config_query_list MESALIB_BUILD
\
dri \
osmesa &&
-if [[ $MESALIB_BUILD == dri ]]; then
- AVAILABLE_DRIVERS="i915 i965 intel r200 radeon swrast"
+case $MESALIB_BUILD in
+ dri)
+ AVAILABLE_DRIVERS="i915 i965 nouveau r200 radeon swrast"
config_query_multi MESALIB_DRIVERS \
"What drivers would you like to build?" \
@@ -43,43 +27,21 @@ if [[ $MESALIB_BUILD == dri ]]; then
MESALIB_DRIVERS="$AVAILABLE_DRIVERS"
fi &&
- if [[ "x${MESALIB_BRANCH}" == "xdevelopment" ||
- "x${MESALIB_BRANCH}" == "xscm" ]]; then
- if list_find "radeon" MESALIB_GALLIUM; then
- MESALIB_GALLIUM="r300 r600"
- fi &&
- list_remove MESALIB_GALLIUM "i965" &&
- list_remove MESALIB_GALLIUM "radeon" &&
- config_query_multi MESALIB_GALLIUM \
- "What Gallium3D drivers would you like to build?" \
- none llvm svga i915 r300 r600 nouveau swrast
- else
- config_query_multi MESALIB_GALLIUM \
- "What Gallium3D drivers would you like to build?" \
- none llvm svga i915 i965 radeon nouveau swrast
- fi
-fi &&
-
-if [[ $MESALIB_BUILD == xlib ]]; then MESALIB_DRIVERS="swrast"
-fi &&
-
-config_query_option MESALIB_OPTS "enable TLS support in GLX" n \
- "--enable-glx-tls" "--disable-glx-tls" &&
+
+# TODO: Proper dependencies for those ... also libdrm ...
+ AVAILABLE_GALLIUM="i915 ilo nouveau r300 r600 radeonsi swrast"
-config_query_option MESALIB_OPTS "enable EGL library?" y \
- "--enable-egl" "--disable-egl" &&
+ config_query_multi MESALIB_GALLIUM \
+ "What Gallium3D drivers woulld you like to build?" \
+ none all $AVAILABLE_GALLIUM
+ if [[ $MESALIB_GALLIUM = all ]]; then
+ MESALIB_GALLIUM=$AVAILABLE_GALLIUM
+ fi
-case "$MESALIB_BRANCH" in
- scm|development)
- list_remove MESALIB_OPTS "--enable-gles-overlay" &&
- list_remove MESALIB_OPTS "--disable-gles-overlay" &&
- list_remove MESALIB_OPTS "--enable-glu" &&
- list_remove MESALIB_OPTS "--disable-glu" &&
- list_remove MESALIB_OPTS "--enable-glw" &&
- list_remove MESALIB_OPTS "--disable-glw" &&
-# list_remove MESALIB_OPTS "" &&
- config_query_multi MESA_EGL "which EGL platforms?" drm fbdev wayland x11
none
- if list_find wayland MESA_EGL;then
+ if [[ $MESALIB_GALLIUM != none ]]; then
+ list_add MESALIB_OPTS "--enable-egl"
+ config_query_multi MESA_EGL "which EGL platforms?" drm fbdev wayland x11
+ if list_find wayland "$MESA_EGL";then
list_remove MESALIB_OPTS "--disable-shared-glapi" &&
list_remove MESALIB_OPTS "--disable-gbm" &&
list_remove MESALIB_OPTS "--disable-gles2" &&
@@ -93,19 +55,23 @@ case "$MESALIB_BRANCH" in
config_query_option MESALIB_OPTS "enable Generic Buffer Management?" n
\
"--enable-gbm" "--disable-gbm"
config_query_option MESALIB_OPTS "enable support for OpenGL ES 2.x
API?" n \
- "--enable-gles2" "--disable-gles2"
- fi &&
- config_query_option MESALIB_OPTS "enable support for OpenGL ES 1.x API?"
n \
- "--enable-gles1" "--disable-gles1"
-
- ;;
- *)
- config_query_option MESALIB_OPTS "enable OpenGL Utility library?" y \
- "--enable-glu" "--disable-glu" &&
-
- config_query_option MESALIB_OPTS "enable Xt/Motif widget library?" y \
- "--enable-glw" "--disable-glw" &&
+ "--enable-gles2" "--disable-gles2"
+ fi
+# config_query_option MESALIB_OPTS "enable support for OpenGL ES 1.x
API?" n \
+# "--enable-gles1" "--disable-gles1"
+ else
+ MESALIB_GALLIUM=
+ config_query_option MESALIB_OPTS "enable EGL library?" y \
+ "--enable-egl" "--disable-egl"
+ if list_find --enable-egl "$MESALIB_OPTS"; then
+ MESALIB_OPTS+=" --enable-gbm" # Mandatory!
+ fi
+ fi
+ ;;
+ xlib)
+ MESALIB_DRIVERS="swrast"
+ ;;
+esac &&
- config_query_multi MESA_EGL "which EGL platforms?" drm fbdev x11 none
- ;;
-esac
+config_query_option MESALIB_OPTS "enable TLS support in GLX" n \
+ "--enable-glx-tls" "--disable-glx-tls"
diff --git a/graphics-libs/mesalib/DEPENDS b/graphics-libs/mesalib/DEPENDS
index a111431..0fac5a2 100755
--- a/graphics-libs/mesalib/DEPENDS
+++ b/graphics-libs/mesalib/DEPENDS
@@ -1,78 +1,48 @@
-. "$GRIMOIRE/FUNCTIONS" &&
-
-depends dri2proto &&
-depends libdrm &&
-depends util-macros &&
-depends lndir &&
-depends xorg-cf-files &&
-depends makedepend &&
-depends expat &&
-depends libxdamage &&
+depends bison &&
+depends flex &&
depends libx11 &&
-depends libxext &&
-depends libxxf86vm &&
-depends libxau &&
-depends libxfixes &&
-depends libxt &&
-depends glproto &&
-depends libxml2 &&
-sub_depends libxml2 PYTHON &&
-case "$MESALIB_BRANCH" in
- scm)
- depends git
- ;;
- development)
- depends libxcb &&
- if [[ "$MESALIB_GALLIUM" != "none" ]]; then
- depends llvm
- if list_find wayland MESA_EGL;then
- depends wayland
- fi
- fi
- ;;
+case $MESALIB_BUILD in
+ dri)
+ depends glproto &&
+ depends dri2proto &&
+ depends dri3proto &&
+ depends presentproto &&
+ depends libdrm &&
+ depends UDEV &&
+ depends libxext &&
+ depends libxxf86vm &&
+ depends libxdamage &&
+ depends libxfixes &&
+ depends libxcb &&
+ depends expat
+ ;;
*)
-# these only apply to older branches
-if list_find "$MESALIB_OPTS" "--enable-glw"; then
- depends libxt
-fi &&
-
-if list_find "$MESALIB_OPTS" "--enable-glu"; then
- optional_depends GLUT \
- "--enable-glut" \
- "--disable-glut" \
- "to enable GLUT library"
+ ;;
+esac &&
+depends python &&
+depends -sub PYTHON libxml2 &&
- if is_depends_enabled $SPELL $(get_spell_provider $SPELL GLUT) ; then
- depends libxi &&
- depends libxmu
+if [[ "$MESALIB_GALLIUM" != "none" ]]; then
+ depends llvm
+ if list_find "$MESA_EGL" wayland;then
+ depends wayland
fi
fi &&
-optional_depends libxcb \
- '--enable-xcb' \
- '--disable-xcb' \
- 'Enable XCB support?'
-
-if is_depends_enabled $SPELL libxcb;then
- sub_depends libx11 XCB
-fi &&
-
-if spell_ok libdrm && is_version_less $(installed_version libdrm) 2.4.3; then
- force_depends libdrm
-fi
- ;;
-esac &&
-
-if ( list_find "i915" $MESALIB_DRIVERS ) || \
- ( list_find "i965" $MESALIB_DRIVERS ); then
+if ( list_find $MESALIB_DRIVERS i915 ) || \
+ ( list_find $MESALIB_DRIVERS i965); then
sub_depends libdrm INTEL
fi &&
-if ( list_find "r200" $MESALIB_DRIVERS ) || \
- ( list_find "radeon" $MESALIB_DRIVERS ); then
+if ( list_find $MESALIB_DRIVERS r200) || \
+ ( list_find $MESALIB_DRIVERS radeon); then
sub_depends libdrm RADEON
fi &&
-optional_depends udev '' '' 'hardware detection'
-
+if ( list_find $MESALIB_DRIVERS nouveau); then
+ sub_depends libdrm NOUVEAU
+fi &&
+optional_depends wayland '' '' 'Wayland support'
+optional_depends libvdpau '' '' 'VDPAU support'
+optional_depends libxvmc '--enable-xvmc' '--disable-xvmc' 'XvMC support
(obsolete)'
diff --git a/graphics-libs/mesalib/DETAILS b/graphics-libs/mesalib/DETAILS
index ca461f5..f4a4e14 100755
--- a/graphics-libs/mesalib/DETAILS
+++ b/graphics-libs/mesalib/DETAILS
@@ -1,45 +1,18 @@
-. "$GRIMOIRE/FUNCTIONS"
SPELL=mesalib
-
-if [[ -z $MESALIB_BRANCH ]]; then
- MESALIB_BRANCH="stable"
-fi
-
-case "$MESALIB_BRANCH" in
- stable)
- VERSION=7.9.2
- SOURCE=MesaLib-${VERSION}.tar.bz2
- SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
- ;;
- feature)
- VERSION=7.10.3
- SOURCE=MesaLib-${VERSION}.tar.bz2
- SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
- ;;
- development)
- VERSION=8.0.5
- SOURCE=MesaLib-${VERSION}.tar.bz2
-
SOURCE_HASH=sha512:d805af05231789bd4fdcba2c16c3697c682ae0f8e6d649dc2ced18ec10fdd3155ea520bc3fcf70c9783ca315d8e7004c7967983338973b0a04be11efc085717d
- ;;
- scm)
- VERSION=$(get_scm_version)
- SOURCE=$SPELL-git.tar.bz2
- FORCE_DOWNLOAD="on"
- SOURCE_URL[0]=git://anongit.freedesktop.org/git/mesa/mesa:mesalib-git
-SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-git"
- SOURCE_IGNORE=volatile
- ;;
-esac
-
-if [[ "$MESALIB_BRANCH" != "scm" ]]; then
- SOURCE_URL[0]=ftp://ftp.freedesktop.org/pub/mesa/${VERSION//-rc?/}/$SOURCE
-SOURCE_DIRECTORY="${BUILD_DIRECTORY}/Mesa-${VERSION}"
-fi
- PATCHLEVEL=1
+ SPELLX=MesaLib
+ VERSION=10.2.6
+
SOURCE_HASH=sha512:07775699fe29f373f84265f7f715b15a945c66cb98bef05faf3cb86fc34accbd9ace3a77b5dae928259118846867324375d9f48b1fef4a92681ecc091aa66266
+ PATCHLEVEL=0
+# VX=`echo $VERSION | cut -d. -f-2`
+ SX=${SPELLX}-${VERSION}
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/Mesa-$VERSION
+ SOURCE=$SX.tar.bz2
+ SOURCE_URL[0]=ftp://ftp.freedesktop.org/pub/mesa/${VERSION}/$SOURCE
LICENSE[0]=GPL
WEB_SITE=http://www.mesa3d.org/
KEYWORDS="graphics libs"
- ENTERED=20021120
+ ENTERED=20140414
+ STAGED_INSTALL=off
SHORT="Mesa implementation of the OpenGL(TM) API"
cat << EOF
Mesa is a 3-D graphics library with an API which is very similar to
diff --git a/graphics-libs/mesalib/FINAL b/graphics-libs/mesalib/FINAL
deleted file mode 100755
index 5592ab8..0000000
--- a/graphics-libs/mesalib/FINAL
+++ /dev/null
@@ -1,2 +0,0 @@
-. $GRIMOIRE/FUNCTIONS &&
-glselect mesa
diff --git a/graphics-libs/mesalib/HISTORY b/graphics-libs/mesalib/HISTORY
index e6959a6..e64302b 100644
--- a/graphics-libs/mesalib/HISTORY
+++ b/graphics-libs/mesalib/HISTORY
@@ -1,542 +1,53 @@
-2014-09-25 Remko van der Vossen <wich AT sourcemage.org>
- * DEPENDS: libxt
+2014-09-25 Treeve Jelbert <treeve AT sourcemage.org>
+ * rename spell => mesalib
+ * UP_TRIGGERS: added, detect old mesalib libraries
+ * PROVIDES: delete MESALIB
-2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
- * DETAILS: Use get_scm_version
+2014-09-19 Treeve Jelbert <treeve AT sourcemage.org>
+ * SUB_DEPENDS, PRE_SUB_DEPENDS,DEPENDS: fix list_find usage
-2014-04-14 Treeve Jelbert <treeve AT sourcemage.org>
- * PROVIDES: add MESALIB
- * CONFLICTS: added, conflicts mesalib-1x
+2014-08-24 Thomas Orgis <sobukus AT sourcemage.org>
+ * BUILD, CONFIGURE: Change driver selection and make this beast build.
+ It is not perfect, but results in a working build including r600 and
+ nouveau drivers for me.
+ * PRE_BUILD, mesa-10.0-nv50-fix-build.patch: Remove typeid usage since
+ RTTI just won't work for us (another way would be to hack enforced
NDEBUG
+ where it belongs).
-2013-05-31 Eric Sandall <sandalle AT sourcemage.org>
- * DEPENDS: GLUT functionality depends on libxmu and libxi (plus
libx11)
+2014-08-23 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS: version 10.2.6
-2013-01-11 Eric Sandall <sandalle AT sourcemage.org>
- * CONFIGURE: No more radeon, i965 Gallium3D drivers in development/scm
- Add r300 and r600 Gallium3D drivers in development/scm branch
- * BUILD: Gallium3D drivers in development/scm branch use
- --with-gallium-drivers=... (like --with-dri-drivers=...) except for
- llvm, which retains --enable-gallium-llvm
+2014-08-11 Sukneet Basuta <sukneet AT sourcemage.org>
+ * PRE_BUILD, gl_select.patch: added to install GL headers and libs
+ to correct path for smgl-gl_select
-2013-01-10 Eric Sandall <sandalle AT sourcemage.org>
- * DEPENDS: Fix scm dependency typo ";&" -> ";;"
+2014-08-03 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 10.2.5
-2012-10-27 Ladislav Hagara <hgr AT vabo.cz>
- * DETAILS: 8.0.5 (development)
+2014-07-18 Sukneet Basuta <sukneet AT sourcemage.org>
+ * DEPENDS: corrected libdrm NOUVEAU sub_depends to NV
-2012-10-08 Vlad Glagolev <stealth AT sourcemage.org>
- * DETAILS: unbreak the spell for stable and feature branches
- * CONFIGURE: corrected typo
+2014-07-11 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 10.2.3
-2012-07-22 Treeve Jelbert <treeve AT sourcemage.org>
- * CONFIGURE, DEPENDS:
- remove some options which do not exist in latest versions
- cleanup testing of various versions
+2014-06-25 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 10.2.2
-2012-07-11 Ladislav Hagara <hgr AT vabo.cz>
- * DETAILS: 8.0.4 (development)
+2014-06-07 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 10.2.1
-2012-06-29 Vlad Glagolev <stealth AT sourcemage.org>
- * DETAILS: PATCHLEVEL=1
- * CONFIGURE: removed commented flags (moved to DEPENDS)
- * PROVIDES: removed GLUT, mesalib can't provide GLUT since it doesn't
- install GL/glut.h header, but requires it; plus GLU != GLUT
- * DEPENDS: added missing optional dependency on GLUT if GLU had been
- enabled; corrected list_find
+2014-05-10 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 10.1.3
-2012-06-02 Robin Cook <rcook AT wyrms.net>
- * PRE_BUILD: added patch for development version to build with llmv
3.1
- https://bugs.gentoo.org/show_bug.cgi?id=417363
+2014-14-19 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 10.1.1
-2012-05-26 Ladislav Hagara <hgr AT vabo.cz>
- * DETAILS: 8.0.3 (development)
+2014-14-14 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 10.1.0
-2012-04-25 Treeve Jelbert <treeve AT sourcemage.org>
- * DEPENDS: remove talloc
- it has not been needed by mesalib since 7.9.2/7.10.1
-
-2012-03-26 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 8.0.2 (devel)
-
-2012-02-18 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 8.0.1 (devel)
-
-2012-02-12 Treeve Jelbert <treeve AT sourcemage.org>
- * DEPENDS: add optional wayland support
- * CONFIGURE: more options for wayland support
- * BUILD: add wayland support
-
-2012-02-11 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 8.0 (devel)
- * DEPENDS: add optional udev
- * CONFIGURE: add --enable-gallium and --enable-shared-glapi options
-
-2012-02-02 Treeve Jelbert <treeve AT sourcemage.org>
- * DEPENDS: remove gccmakedep
- remove obsolete rxxx references, use radeon instead
-
-2012-01-29 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 8.0-rc2 (devel)
-
-2012-01-15 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 8.0-rc1 (devel)
- this builds with llvm-3.0
- * CONFIGURE, SUB_DEPENDS: update AVAILABLE_DRIVERS MESALIB_GALLIUM
- remove several old drivers:
- i810, mach64, mga, r128, savage, sis, tdfx, unichrome and fbdev
- radeon now includes r600 and r300
- remove some obsolete options
- * PRE_BUILD: glw has been removed
- suppress some unnecessay sedit for the devel branch
-
-2011-11-21 Eric Sandall <sandalle AT sourcemage.org>
- * DETAILS: Latest development is 7.11.1
- Spell "development" correctly (and match PREPARE)
- * DEPENDS: llvm is required to build at least r300 Gallium drivers in
7.11
- * PRE_BUILD: No X11R6 mentioned in Makefiles and no Makefile.template
- for dri driver for 7.11.
- * PRE_BUILD, PRE_SUB_DEPENDS, SUB_DEPENDS: MESALIB_VER ->
MESALIB_BRANCH
- Also, "git" -> "scm" for MESALIB_BRANCH selection
-
-2011-09-27 Ismael Luceno <ismael AT sourcemage.org>
- * CONFIGURE: Fix broken case statement
-
-2011-09-26 Vlad Glagolev <stealth AT sourcemage.org>
- * DETAILS: select stable branch by default
-
-2011-09-22 Ismael Luceno <ismael AT sourcemage.org>
- * CONFIGURE, DEPENDS, DETAILS, PREPARE: Use prepare_select_branch
-
-2011-06-24 Vlad Glagolev <stealth AT sourcemage.org>
- * DEPENDS: correctly compare versions
-
-2011-06-14 Ladislav Hagara <hgr AT vabo.cz>
- * DETAILS: 7.10.3 (feature, developement)
-
-2011-04-10 Ladislav Hagara <hgr AT vabo.cz>
- * DETAILS: 7.10.2 (feature, developement)
-
-2011-03-03 Ladislav Hagara <hgr AT vabo.cz>
- * DETAILS: 7.9.2 (stable), 7.10.1 (feature, developement)
-
-2011-02-27 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
- * PRE_BUILD: apply Makefile-fix-sed-expression.patch to all versions
-
-2011-02-16 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
- * PRE_BUILD, Makefile-fix-sed-expression.patch: added patch to fix
- error caused by malformed sed expression
-
-2011-02-11 Vlad Glagolev <stealth AT sourcemage.org>
- * REPAIR^all^EXPORTS: really export MESALIB_BUILD
-
-2011-01-13 Vlad Glagolev <stealth AT sourcemage.org>
- * {REPAIR^all^,}EXPORTS: added, to export MESALIB_BUILD
-
-2011-01-11 Remko van der Vossen <wich AT sourcemage.org>
- * DEPENDS: stable now too depends on talloc and needs python bindings
- for libxml
-
-2011-01-10 Ladislav Hagara <hgr AT vabo.cz>
- * DETAILS: 7.9.1 (stable), 7.10 (feature, developement)
- * CONFIGURE: MESALIB_GALLIUM updated
-
-2011-01-07 Ladislav Hagara <hgr AT vabo.cz>
- * CONFIGURE: config_query_multi MESALIB_GALLIUM updated
- * CONFIGURE: AVAILABLE_DRIVERS updated
- * SUB_DEPENDS: added r600 to stable's AVAILABLE_DRIVERS
-
-2010-12-22 Ladislav Hagara <hgr AT vabo.cz>
- * DETAILS: 7.8.2 (stable), 7.9 (feature, developement)
- * PRE_BUILD, gl_select.patch: patch removed
-
-2010-11-12 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
- * gl_select-scm.patch: fixes for glselect
- * gl_select.patch: fixes for glselect
-
-2010-10-14 Eric Sandall <sandalle AT sourcemage.org>
- * BUILD: Radeon's mklib does not properly pass '-s' to LDFLAGS (bad
fix)
-
-2010-10-05 Vasil Yonkov <spirtbrat AT sourcemage.org>
- * DETAILS: feature => 7.6.2, developement => 7.9;
- updated MESALIB_VER=developement to 7.9
- updated MESALIB_VER=feature to 7.6.1
- BUILD: updated gallium options, added MESALIB_OPTS;
- CONFIGURE: updated gallium and dri drivers options; added missing
options;
- DEPENDS: made libxt optional; added conditional sub_depends on
libdrm;
- added talloc
-
-2010-09-14 Pol Vinogradov <vin.public AT gmail.com>
- * PRE_BUILD: removed link creation for git branch
-
-2010-08-19 Arjan Bouter <abouter AT sourcemage.org>
- * PROVIDES: enabled GLUT again, see docs/glu.html
- * DEPENDS: added talloc for the scm version
- * PRE_BUILD, autogen.patch: fixed autogen.sh for scm version
-
-2010-06-17 Ladislav Hagara <hgr AT vabo.cz>
- * DETAILS: 7.8.2 (development)
-
-2010-06-13 Robin Cook <rcook AT wyrms.net>
- * PROVIDES: removed GLUT
-
-2010-04-26 Eric Sandall <sandalle AT sourcemage.org>
- * CONFIGURE, SUB_DEPENDS: Enable nouveau for 7.8.1+ (development)
-
-2010-04-10 Treeve Jelbert <treeve AT sourcemage.org>
- * DEPENDS: remove imake, not needed
- * REPAIR^cfe9d942370d8c12716d288816996d37^DEPENDS: deleted
-
-2010-04-06 Eric Sandall <sandalle AT sourcemage.org>
- * {PRE_,}SUB_DEPENDS: Allow requiring non-stable (e.g. for new
- xf86-video-ati which needs the new KMS code)
-
-2010-04-06 Vasil Yonkov <spirtbrat AT sourcemage.org>
- * DETAILS: updated MESALIB_VER=developement to 7.8.1
-
-2010-04-03 Ladislav Hagara <hgr AT vabo.cz>
- * PRE_BUILD: removed sedit, none X11R6 in dri_glx.c (7.5.2, 7.7.1,
7.8)
-
-2010-03-31 Vasil Yonkov <spirtbrat AT sourcemage.org>
- * DETAILS: updated MESALIB_VER=feature to 7.7.1
- updated MESALIB_VER=developement to 7.8
-
-2010-02-26 Eric Sandall <sandalle AT sourcemage.org>
- * INSTALL: Fails with multiple make jobs
-
-2010-02-10 Pol Vinogradov <vin.public AT gmail.com>
- * PRE_BUILD: fix for git branch
-
-2010-02-03 Vasil Yonkov <spirtbrat AT sourcemage.org>
- * DETAILS, PREPARE: added a default version
-
-2010-01-23 Vasil Yonkov <spirtbrat AT sourcemage.org>
- * CONFIGURE, DEPENDS, DETAILS, PREPARE, PRE_BUILD,
- SUB_DEPENDS: added test and developement branches
-
-2010-01-02 Robert Figura <template AT sourcemage.org>
- * DETAILS: version 7.5.2
-
-2009-10-03 Treeve Jelbert <treeve AT sourcemage.org>
- * DEPENDS: force sub_depends XCB for libx11
-
-2009-09-13 Peng Chang (Charles) <chp AT sourcemage.org>
- * DETAILS: updated to 7.5.1, also updated SOURCE_URL and WEB_SITE
-
-2009-08-06 Arjan Bouter <abouter AT sourcemage.org>
- * CONFIGURE, BUILD: added gallium drivers
-
-2009-07-31 Eric Sandall <sandalle AT sourcemage.org>
- * DEPENDS: Bash does not support floating point arithmetic, reduce
- to integer.
- Need to use -lt instead of < for comparison otherwise stupid simple
- math such as 2411 < 243 will be true, but 2411 < 241 will be false.
- This fixes libdrm always being forced
- * PRE_BUILD: autogen.sh only exists in GIT checkout so only fix there
-
-2009-07-28 Arjan Bouter <abouter AT sourcemage.org>
- * PRE_BUILD: moved the sedit for configure
-
-2009-07-25 Arjan Bouter <abouter AT sourcemage.org>
- * PRE_BUILD: add patch for scm version, don't run configure
- from autogen.sh
- * DEPENDS: added optional dep on libxcb
- * CONFIGURE, SUB_DEPENDS: added r600 for scm version
- * PROVIDES: provides GLUT
- * gl_select-scm.patch: added
-
-2009-07-17 Eric Sandall <sandalle AT sourcemage.org>
- * DETAILS: Updated to 7.5
- SOURCE matches upstream posted MD5
-
-2009-06-24 Ladislav Hagara <hgr AT vabo.cz>
- * DETAILS: 7.4.4
-
-2009-06-20 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 7.4.3
-
-2009-05-28 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 7.4.2
-
-2009-04-18 Eric Sandall <sandalle AT sourcemage.org>
- * DETAILS: Updated to 7.4.1
-
-2009-04-01 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
- * DETAILS: updated spell to 7.4
-
-2009-02-20 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
- * FINAL: forgot sourcing of FUNCTIONS
-
-2009-02-20 Juuso Alasuutari <iuso AT sourcemage.org>
- * PRE_BUILD: Fix git build by changing to $SOURCE_DIRECTORY
- before running ./autogen.sh.
-
-2009-02-09 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
- * DEPENDS: removed smgl-gl_select
- * FINAL: using internal glselect
- * POST_RESURRECT: restore mesa on resurrection, added FUNCTIONS
- * REPAIR^all^POST_RESURRECT: copy of POST_RESURRECT
-
-2009-02-08 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
- * PRE_BUILD: added a patch for smgl-gl_select
- * gl_select.patch: patch to install to subdir
- * DEPENDS: smgl-gl_depends
- * DETAILS: patchlevel++
-
-2009-01-26 Eric Sandall <sandalle AT sourcemage.org>
- * DEPENDS: Force dependency on libdrm if libdrm < 2.4.3
-
-2009-01-23 Eric Sandall <sandalle AT sourcemage.org>
- * DETAILS: Updated to 7.3
- * DEPENDS: Depends on dri2proto
-
-2009-01-20 Ethan Grammatikidis <eekee57 AT fastmail.fm>
- * CONFIGURE: Added much longer message to really explain the build
- type option, based on what I read on mesalib's web site today.
-
-2009-01-18 Ethan Grammatikidis <eekee57 AT fastmail.fm>
- * CONFIGURE: Added text to query to ease building of xorg-server
-
-2008-12-21 Juuso Alasuutari <iuso AT sourcemage.org>
- * PRE_BUILD: Run autogen.sh for git build.
-
-2008-11-14 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
- * BUILD: updated build type so that swrast can be built
- * SUB_DEPENDS: updated sub depends to work with the auto* build
- * PRE_SUB_DEPENDS: updated sub depends to work with the auto* build
- * CONFIGURE: updated build type so that swrast can be built
-
-2008-10-14 Vlad Glagolev <stealth AT sourcemage.org>
- * DEPENDS: added missing dep (#14775); cleaned up
-
-2008-10-13 Vlad Glagolev <stealth AT sourcemage.org>
- * INSTALL: removed deprecated comments; fixed #14821
-
-2008-10-06 Eric Sandall <sandalle AT sourcemage.org>
- * DETAILS: Updated to 7.2
- Seems to still honour MESALIB_BUILD
- * CONFIGURE: No more nouveau, i915tex
- * PRE_BUILD: glw.pc.in is now included
-
-2008-08-22 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
- * DETAILS: updated spell to 7.0.4
-
-2008-06-16 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
- * DETAILS: mesalib 7.0.3
-
-2008-03-18 Eric Sandall <sandalle AT sourcemage.org>
- * PRE_BUILD: xorg-utils is the only X11-UTILS now
-
-2007-12-14 Thomas Orgis <sobukus AT sourcemage.org>
- * DEPENDS: Needs glproto for build (GL headers).
-
-2007-12-13 Thomas Orgis <sobukus AT sourcemage.org>
- * PRE_BUILD: Change x86-64 configs to install libs in lib/, not lib64/
-
-2007-11-23 Eric Sandall <sandalle AT sourcemage.org>
- * CONFLICTS: No longer conflicts with xorg-modular profile spell, xorg
-
-2007-11-10 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
- * DETAILS: updated spell to 7.0.2
- * INSTALL: using make install now
- * DEPENDS: split up the xorg-utils into their separate components
- * glw.pc.in: missing from 7.0.2 tarball
- * PRE_BUILD: copy the missing file over, drop xorg-utils stuff
-
-2007-09-30 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
- * DEPENDS: lock in to -modular only
-
-2007-09-04 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
- * DEPENDS: missing various dependencies droping X11-LIBS
- it's useless as it conflicts with all other providers but
- the xorg-modular ones
-
-2007-08-07 Ladislav Hagara <hgr AT vabo.cz>
- * DETAILS: 7.0.1
-
-2007-06-28 Ladislav Hagara <hgr AT vabo.cz>
- * DETAILS: 7.0
-
-2007-05-15 Eric Sandall <sandalle AT sourcemage.org>
- * PREPARE: Only query for autoupdate if MESALIB_GIT=y
-
-2007-04-30 Pol Vinogradov <vin.public AT gmail.com>
- * DEPENDS: added sourcing of $GRIMOIRE/FUNCTIONS for
- check_if_xorg_modular_libs
-
-2007-04-29 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
- * CONFLICTS: added to finnaly stop reciving bogus bugs when
- people try to build it against monolithic X
- * DEPENDS: added some missing deps as noted by dmlb2000
-
-2007-04-28 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
- * DETAILS: version update 6.5.3
- * CONFIGURE: added two new drivers
- * SUB_DEPENDS: added two new drivers
-
-2007-04-03 Eric Sandall <sandalle AT sourcemage.org>
- * PREPARE: Query for checking out latest development version
- * DETAILS: Added code for git version
- * DEPENDS: Depend on git if checking out development version
-
-2007-01-02 Treeve Jelbert <treeve AT sourcemage.org>
- * BUILD: add 'make_single', as x86-64 fails with multiple jobs
-
-2006-12-26 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
- * CONFIGURE: added i915tex
- * SUB_DEPENDS: added i915tex
- * DETAILS: patchlevel++
-
-2006-12-03 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
- * glxext.diff: removed fixed upstream
- * PRE_BUILD: minor fix for alternate arches
- * DETAILS: version update to 6.5.2
-
-2006-11-12 Flavien Bridault <vlaaad AT sourcemage.org>
- * glxext.h: fixes for bug #13256
- * PRE_BUILD: applied patch
- * DETAILS: PATCHLEVEL++
-
-2006-10-21 Juuso Alasuutari <iuso AT sourcemage.org>
- * PRE_SUB_DEPENDS, SUB_DEPENDS: Added, sub-dependency for DRI
- build option.
-
-2006-09-21 Juuso Alasuutari <iuso AT sourcemage.org>
- * PROVIDES: [automated] Fixed invalid entries.
-
-2006-09-16 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
- * DETAILS: version update 6.5.1
- * PRE_BUILD: minor fixes
-
-2006-09-10 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
- * CONFIGURE: added driver selection bug #12655
- * PRE_BUILD: added driver selection
- * DETAILS: patchevel++
-
-2006-08-27 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
- * PRE_BUILD: ne wonder this doesn't work the check won't work as
mesalib
- does not require X11-LIBS so nothing to check against
-
-2006-07-31 Pol Vinogradov <vin.public AT gmail.com>
- * DETAILS: removed UPDATED and BUILD_API=2 lines
- * PRE_BUILD: switched to check_if_xorg_modular_libs from grimoire's
- FUNCTIONS for modular X checking
-
-2006-07-19 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
- * DETAILS: PATCHLEVEL=1
- * INSTALL: there's a missing symlink generation here which
- makes the install useless for dri stuff
-
-2006-05-27 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
- * INSTALL: add install for x86_64 bug #12141
-
-2006-05-26 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
- * DEPENDS: removed X11-LIBS and added X11-UTILS
-
-2006-05-23 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
- * DETAILS: version update, PATCHLEVEL droped new version
- * DEPENDS: added libdrm
- * PRE_BUILD: check if we're acctually installing for -modular
- * INSTALL: finnaly fix for the non-dri targets
-
-2006-05-01 Robin Cook <rcook AT wyrms.net>
- * volatiles: modified for the libGL.so.* files
-
-2006-04-30 Robin Cook <rcook AT wyrms.net>
- * volatiles: added for the files nvidia_driver installs
-
-2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
- * DETAILS: (automated) Add KEYWORDS
-
-2006-03-04 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
- * BUILD: removed mesademos own spell
- * CONFIGURE: use proper ARCH variable for selection
- removed mesademos uses own spell
- * DETAILS: removed mesademos uses own spell
- * INSTALL: removed mesademos uses own spell
- * PRE_BUILD: removed mesademos uses own spell
-
-2006-03-03 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
- * DETAILS: added mesademos
- PATCHLEVEL, multiple bugfixes and new functinality
- * PRE_BUILD: added mesademos
- * INSTALL: fix for instalation of dri drivers
- and added mesademos support
- * BUILD: added mesademos support
- * CONFIGURE: added mesademos support,
- fixed for arch selection...
- * DEPENDS: uses X11-LIBS for now
-
-2006-02-03 Robin Cook <rcook AT wyrms.net>
- * DETAILS: updated VERSION to 6.4.2
-
-2006-01-05 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
- * DEPENDS: added makedepend
-
-2005-12-26 Robin Cook <rcook AT wyrms.net>
- * CONFIGURE: corrected query question
-
-2006-02-17 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 6.4.2
-
-2005-11-29 Seth Woolley <seth AT tautology.org>
- * DETAILS: MD5 -> SHA512
-
-2005-11-28 Seth Woolley <seth AT tautology.org>
- * BUILD: unpack api update
-
-2005-06-08 Ladislav Hagara <hgr AT vabo.cz>
- * CONFLICTS: deleted, MesaLib was removed from grimoire
-
-2005-02-28 Eric Sandall <sandalle AT sourcemage.org>
- * Renamed from MesaLib
- * DETAILS: Renamed to mesalib
- Updated UPDATED
- Added BUILD_API=2
- * CONFIGURE: Converted to config_query
- * CONFLICTS: Auto-conflicts with MesaLib
- * BUILD: Converted to build_api 2
- Apply CONFIGURE flags to OPTS
- * INSTALL: Branched from BUILD
- Converted to build_api 2
-
-2003-11-06 hgg <hgreig AT bigpond.net.au>
- * DETAILS: correct md5 (they released an updated tarball)
- * BUILD: remove my fudge from previously
-
-2003-10-27 Eric Sandall <sandalle AT sourcemage.org>
- * DEPENDS: Changed 'glut' to 'GLUT'
-
-2003-10-10 hgg <hgreig AT bigpond.net.au>
- * HISTORY: convert to new format
- * PROVIDES: uppercase
- * DEPENDS: uppercase for providers
-
-2003-10-03 hgg <hgreig AT bigpond.net.au>
- * DEPENDS: Change optional_depends xfree86 to x11-libs, needs devel
sorcery now
-
-2003-09-27 hgg <hgreig AT bigpond.net.au>
- * DETAILS: Fix my faulty update by adding a correct MD5[0]
-
-2003-09-13 hgg <hgreig AT bigpond.net.au>
- * DEPENDS: Xfree86 is an optional depends, added other options to
DEPENDS
- * DETAILS,BUILD: Update to 5.0.2(lot of work for some reason?),
- remove /usr/X11R6/lib reference from BUILD as it breaks non-X
builds.
-
-2003-08-11 hgg <hgreig AT bigpond.net.au>
- * DEPENDS: Add xfree86 as depends
-
-2003-07-08 hgg <hgreig AT bigpond.net.au>
- * ALL: Moved to x11 section
-
-2003-07-06 hgg <hgreig AT bigpond.net.au>
- * BUILD,POST_INSTALL: Found some aliens from the POST_INSTALL so
removed that and modified the BUILD.
-
-2003-06-24 hgg <hgreig AT bigpond.net.au>
- * DETAILS: Update to 5.0.1
-
-2002-11-26 Julian v. Bock <julian AT wongr.net>
- * ALL: add spell.
-
-2002-11-20 Eric Sandall <sandalle AT sourcemage.org>
- * ALL: Spell created
+2012-07-26 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version git
+ use STAGED_INSTALL=off, as 'make install' tries to
+ create invalid hard links
+ simplified version of spell from main grimoire
diff --git a/graphics-libs/mesalib/INSTALL b/graphics-libs/mesalib/INSTALL
deleted file mode 100755
index 66e3e2a..0000000
--- a/graphics-libs/mesalib/INSTALL
+++ /dev/null
@@ -1,6 +0,0 @@
-if [[ -h "$INSTALL_ROOT/usr/lib/dri" ]]; then
- rm "$INSTALL_ROOT/usr/lib/dri"
-fi &&
-
-make_single &&
-default_install
diff --git a/graphics-libs/mesalib/Makefile-fix-sed-expression.patch
b/graphics-libs/mesalib/Makefile-fix-sed-expression.patch
deleted file mode 100644
index bda163c..0000000
--- a/graphics-libs/mesalib/Makefile-fix-sed-expression.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/mesa/Makefile.orig 2011-02-16 11:56:43.988419616 +0100
-+++ src/mesa/Makefile 2011-02-16 11:57:05.599502708 +0100
-@@ -201,7 +201,7 @@
- $(pcedit) \
- -e 's,@OSMESA_LIB@,$(OSMESA_LIB),' \
- -e 's,@OSMESA_PC_REQ@,$(OSMESA_PC_REQ),' \
-- -e 's,@OSMESA_PC_LIB_PRIV@,$(OSMESA_PC_LIB_PRIV),'
-+ -e 's:@OSMESA_PC_LIB_PRIV@:$(OSMESA_PC_LIB_PRIV):'
-
- osmesa.pc: osmesa.pc.in
- $(osmesa_pcedit) $< > $@
diff --git a/graphics-libs/mesalib/MesaLib-7.10.3.tar.bz2.sig
b/graphics-libs/mesalib/MesaLib-7.10.3.tar.bz2.sig
deleted file mode 100644
index 470e433..0000000
Binary files a/graphics-libs/mesalib/MesaLib-7.10.3.tar.bz2.sig and /dev/null
differ
diff --git a/graphics-libs/mesalib/MesaLib-7.11.1.tar.bz2.sig
b/graphics-libs/mesalib/MesaLib-7.11.1.tar.bz2.sig
deleted file mode 100644
index 2916753..0000000
Binary files a/graphics-libs/mesalib/MesaLib-7.11.1.tar.bz2.sig and /dev/null
differ
diff --git a/graphics-libs/mesalib/MesaLib-7.9.2.tar.bz2.sig
b/graphics-libs/mesalib/MesaLib-7.9.2.tar.bz2.sig
deleted file mode 100644
index 03bc32e..0000000
Binary files a/graphics-libs/mesalib/MesaLib-7.9.2.tar.bz2.sig and /dev/null
differ
diff --git a/graphics-libs/mesalib/POST_RESURRECT
b/graphics-libs/mesalib/POST_RESURRECT
deleted file mode 100755
index 44b0976..0000000
--- a/graphics-libs/mesalib/POST_RESURRECT
+++ /dev/null
@@ -1,2 +0,0 @@
-. $GRIMOIRE/FUNCTIONS
-glselect mesa
diff --git a/graphics-libs/mesalib/PREPARE b/graphics-libs/mesalib/PREPARE
deleted file mode 100755
index 954086c..0000000
--- a/graphics-libs/mesalib/PREPARE
+++ /dev/null
@@ -1,2 +0,0 @@
-. ${GRIMOIRE}/FUNCTIONS &&
-prepare_select_branch stable feature development scm
diff --git a/graphics-libs/mesalib/PRE_BUILD b/graphics-libs/mesalib/PRE_BUILD
index f224457..8644f9f 100755
--- a/graphics-libs/mesalib/PRE_BUILD
+++ b/graphics-libs/mesalib/PRE_BUILD
@@ -1,43 +1,8 @@
-default_pre_build &&
-cd ${SOURCE_DIRECTORY} &&
-patch -p1 < $SPELL_DIRECTORY/gl_select-scm.patch &&
-patch -p0 < ${SPELL_DIRECTORY}/Makefile-fix-sed-expression.patch &&
-cd ${SOURCE_DIRECTORY}/configs &&
-sedit "s:/usr/local:/usr:g" default &&
-
-if grep -q dri <<< "$MESALIB_BUILD"
-then
-sedit "/^DRI_DIRS/ { N; s/.*/DRI_DIRS = $MESALIB_DRIVERS/ }"
$SOURCE_DIRECTORY/configs/linux-dri
-sedit "/^DRI_DIRS/ { N; s/.*/DRI_DIRS = $MESALIB_DRIVERS/ }"
$SOURCE_DIRECTORY/configs/linux-dri-x86-64
-fi &&
-
-# x86-64 libs go into normal lib/
-for i in linux*x86-64
-do
- sedit "s/LIB_DIR = lib64//" "$i"
-done &&
-cd ${SOURCE_DIRECTORY}/docs &&
-sedit "s:/X11R6::g" install.html &&
-if [[ "$MESALIB_BRANCH" != "development" ]]; then
- cd ${SOURCE_DIRECTORY}/configs &&
- sedit "s:MKDEP = /usr/X11R6:MKDEP = /usr/:g" linux-dri &&
- sedit "s:MKDEP = /usr/X11R6:MKDEP = /usr/:g" linux-indirect &&
- sedit "s:/X11R6::g" linux-dri &&
- sedit "s:/X11R6::g" default &&
- sedit "s:/X11R6::g" linux-indirect &&
-
- cd ${SOURCE_DIRECTORY}/src/mesa/drivers/dri &&
- sedit "s:/X11R6::g" Makefile.template
- cd ${SOURCE_DIRECTORY}/src/glw &&
- sedit "s:/X11R6::g" Makefile
-else
- cd $SOURCE_DIRECTORY &&
- patch -p0 < $SPELL_DIRECTORY/mesa-8.0.3-llvm-3.1.patch
-fi &&
-
-if [[ "$MESALIB_BRANCH" == "scm" ]]; then
- cd "$SOURCE_DIRECTORY" &&
- patch -p0 < "${SCRIPT_DIRECTORY}/autogen.patch" &&
- ./autogen.sh
- cd bin
-fi
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+# Wait ... why isn't NDEBUG in place? Seems to be filtered ...
+#
http://pkgs.fedoraproject.org/cgit/mesa.git/tree/mesa-10.0-nv50-fix-build.patch
+patch -p1 < "$SCRIPT_DIRECTORY/mesa-10.0-nv50-fix-build.patch" &&
+
+patch -p0 < $SPELL_DIRECTORY/gl_select.patch &&
+autoreconf -f -i --symlink
diff --git a/graphics-libs/mesalib/PRE_SUB_DEPENDS
b/graphics-libs/mesalib/PRE_SUB_DEPENDS
index e3cccf7..5372493 100755
--- a/graphics-libs/mesalib/PRE_SUB_DEPENDS
+++ b/graphics-libs/mesalib/PRE_SUB_DEPENDS
@@ -1,5 +1,9 @@
case $THIS_SUB_DEPENDS in
- NONSTABLE) [[ "$MESALIB_BRANCH" != "stable" ]] && return 0 ;;
DRI) [[ $MESALIB_BUILD == dri ]] && return 0 ;;
+ WAYLAND)
+ if list_find "$MESA_EGL" wayland;then
+ return 0
+ fi
+ ;;
esac
return 1
diff --git a/graphics-libs/mesalib/PROVIDES b/graphics-libs/mesalib/PROVIDES
index 324200b..3fc56f6 100755
--- a/graphics-libs/mesalib/PROVIDES
+++ b/graphics-libs/mesalib/PROVIDES
@@ -1,2 +1 @@
OPENGL
-MESALIB
diff --git a/graphics-libs/mesalib/REPAIR^all^EXPORTS
b/graphics-libs/mesalib/REPAIR^all^EXPORTS
deleted file mode 100755
index e9b2106..0000000
--- a/graphics-libs/mesalib/REPAIR^all^EXPORTS
+++ /dev/null
@@ -1 +0,0 @@
-MESALIB_BUILD
diff --git a/graphics-libs/mesalib/REPAIR^all^POST_RESURRECT
b/graphics-libs/mesalib/REPAIR^all^POST_RESURRECT
deleted file mode 100755
index 44b0976..0000000
--- a/graphics-libs/mesalib/REPAIR^all^POST_RESURRECT
+++ /dev/null
@@ -1,2 +0,0 @@
-. $GRIMOIRE/FUNCTIONS
-glselect mesa
diff --git a/graphics-libs/mesalib/REPAIR^all^PRE_SUB_DEPENDS
b/graphics-libs/mesalib/REPAIR^all^PRE_SUB_DEPENDS
deleted file mode 100755
index e3cccf7..0000000
--- a/graphics-libs/mesalib/REPAIR^all^PRE_SUB_DEPENDS
+++ /dev/null
@@ -1,5 +0,0 @@
-case $THIS_SUB_DEPENDS in
- NONSTABLE) [[ "$MESALIB_BRANCH" != "stable" ]] && return 0 ;;
- DRI) [[ $MESALIB_BUILD == dri ]] && return 0 ;;
-esac
-return 1
diff --git a/graphics-libs/mesalib/SUB_DEPENDS
b/graphics-libs/mesalib/SUB_DEPENDS
index cd1fa20..08c625e 100755
--- a/graphics-libs/mesalib/SUB_DEPENDS
+++ b/graphics-libs/mesalib/SUB_DEPENDS
@@ -1,14 +1,4 @@
case $THIS_SUB_DEPENDS in
- NONSTABLE)
- if [[ "$MESALIB_BRANCH" == "stable" ]]; then
- MESALIB_BRANCH="feature" &&
- persistent_add MESALIB_BRANCH &&
- message "${MESSAGE_COLOR}Non-stable branch of
${SPELL_COLOR}mesalib${DEFAULT_COLOR}" \
- "${MESSAGE_COLOR}requested, upgrading to
${SPELL_COLOR}feature${DEFAULT_COLOR}" \
- "${MESSAGE_COLOR}branch."
- fi
- ;;
-
DRI)
MESALIB_BUILD=dri &&
persistent_add MESALIB_BUILD &&
@@ -16,17 +6,11 @@ case $THIS_SUB_DEPENDS in
message "${MESSAGE_COLOR}DRI support requested, forcing build type" \
"$MESALIB_BUILD for architecture\n${SMGL_COMPAT_ARCHS[1]}." \
"$DEFAULT_COLOR" &&
- list_remove MESALIB_DRIVERS i915tex || true
. $GRIMOIRE/config_query_multi.function &&
if [[ $MESALIB_BUILD == dri ]]; then
- if [[ "$MESALIB_BRANCH" == "stable" ]]; then
- AVAILABLE_DRIVERS="i810 i915 i965 mach64 mga r128 r200 r300 r600
radeon s3v savage sis tdfx trident unichrome ffb swrast"
- elif [[ "$MESALIB_BRANCH" == "feature" ]]; then
- AVAILABLE_DRIVERS="i810 i915 i965 mach64 mga r128 r200 r300 r600
radeon s3v savage sis tdfx trident unichrome ffb swrast"
- else
- AVAILABLE_DRIVERS="i915 i965 nouveau r200 radeon swrast"
- fi
+ AVAILABLE_DRIVERS="i915 i965 nouveau r200 radeon swrast" &&
+
config_query_multi MESALIB_DRIVERS \
"What drivers would you like to build?" \
$AVAILABLE_DRIVERS &&
@@ -35,6 +19,11 @@ case $THIS_SUB_DEPENDS in
MESALIB_DRIVERS="$AVAILABLE_DRIVERS"
fi
fi ;;
+ WAYLAND)
+ if ! list_find "$MESA_EGL" wayland;then
+ list_add MESA_EGL wayland
+ fi
+ ;;
*) echo "Unknown sub_depends $THIS_SUB_DEPENDS!"; return 1 ;;
esac
diff --git a/graphics-libs/mesalib/UP_TRIGGERS
b/graphics-libs/mesalib/UP_TRIGGERS
new file mode 100755
index 0000000..45ea2fd
--- /dev/null
+++ b/graphics-libs/mesalib/UP_TRIGGERS
@@ -0,0 +1,18 @@
+if spell_ok $SPELL; then
+ local OLD_SPELL_VERSION="$(installed_version $SPELL)"
+ if [[ "${VERSION%.*}" != "${OLD_SPELL_VERSION%.*}" ]]; then
+ message "This is an ABI incompatible update of mesalib..."
+ message "Determining which spells need to be recast, this may take a
while."
+
+ for other_spell in $(gaze installed | cut -d: -f1); do
+ if gaze install $other_spell \
+ | xargs file -e apptype -e ascii -e compress -e tar \
+ | grep '\<ELF\>.*\<dynamically linked\>' \
+ | cut -d: -f1 \
+ | xargs readelf -d 2> /dev/null \
+ | grep -q -P 'NEEDED\)\s*Shared library: \[libGL'; then
+ up_trigger $other_spell cast_self
+ fi
+ done
+ fi
+fi
diff --git a/graphics-libs/mesalib/autogen.patch
b/graphics-libs/mesalib/autogen.patch
deleted file mode 100644
index eb50e7f..0000000
--- a/graphics-libs/mesalib/autogen.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- autogen.sh 2010-08-19 17:21:46.000000000 +0200
-+++ autogen.sh-fixed 2010-08-19 18:14:37.332895438 +0200
-@@ -14,5 +14,4 @@
- MAKEFLAGS=""
-
- autoreconf -v --install || exit 1
--
--"$srcdir"/configure "$@"
-+automake --add-missing
diff --git a/graphics-libs/mesalib/gl_select-scm.patch
b/graphics-libs/mesalib/gl_select-scm.patch
deleted file mode 100644
index 197fb31..0000000
--- a/graphics-libs/mesalib/gl_select-scm.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -Naur ./mesalib-git.orig/src/mesa/Makefile mesalib-git/src/mesa/Makefile
---- ./mesalib-git.orig/src/mesa/Makefile 2009-07-24 12:06:06.000000000
+0200
-+++ mesalib-git/src/mesa/Makefile 2009-07-25 21:02:07.827668651 +0200
-@@ -123,14 +123,30 @@
-
- install-headers:
- $(INSTALL) -d $(DESTDIR)$(INSTALL_INC_DIR)/GL
-+ $(INSTALL) -d $(DESTDIR)$(INSTALL_INC_DIR)/GL/.mesa
-+ $(INSTALL) -m 644 $(TOP)/include/GL/gl.h \
-+ $(DESTDIR)$(INSTALL_INC_DIR)/GL/.mesa/
-+ $(INSTALL) -m 644 $(TOP)/include/GL/glx.h \
-+ $(DESTDIR)$(INSTALL_INC_DIR)/GL/.mesa/
-+ $(INSTALL) -m 644 $(TOP)/include/GL/glxext.h \
-+ $(DESTDIR)$(INSTALL_INC_DIR)/GL/.mesa/
-+ $(INSTALL) -m 644 $(TOP)/include/GL/glext.h \
-+ $(DESTDIR)$(INSTALL_INC_DIR)/GL/.mesa/
-+ mkdir -p $(TOP)/include/GL/backups
-+ mv $(TOP)/include/GL/gl.h $(TOP)/include/GL/backups/
-+ mv $(TOP)/include/GL/glx.h $(TOP)/include/GL/backups/
-+ mv $(TOP)/include/GL/glxext.h $(TOP)/include/GL/backups/
-+ mv $(TOP)/include/GL/glext.h $(TOP)/include/GL/backups/
- $(INSTALL) -m 644 $(TOP)/include/GL/*.h \
- $(DESTDIR)$(INSTALL_INC_DIR)/GL
-+ mv $(TOP)/include/GL/backups/* $(TOP)/include/GL/
-
- install-libgl: default gl.pc install-headers
- $(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)
-+ $(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)/.mesa
- $(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig
- $(MINSTALL) $(TOP)/$(LIB_DIR)/$(GL_LIB_GLOB) \
-- $(DESTDIR)$(INSTALL_LIB_DIR)
-+ $(DESTDIR)$(INSTALL_LIB_DIR)/.mesa
- $(INSTALL) -m 644 gl.pc $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig
-
- install-osmesa: default osmesa.pc
diff --git a/graphics-libs/mesalib/gl_select.patch
b/graphics-libs/mesalib/gl_select.patch
new file mode 100644
index 0000000..4b8d285
--- /dev/null
+++ b/graphics-libs/mesalib/gl_select.patch
@@ -0,0 +1,59 @@
+--- src/mesa/Makefile.am.o 2014-07-18 13:00:29.382566095 -0400
++++ src/mesa/Makefile.am 2014-07-18 12:59:30.160564051 -0400
+@@ -33,7 +33,7 @@
+ SUBDIRS += drivers/osmesa
+ endif
+
+-gldir = $(includedir)/GL
++gldir = $(includedir)/GL/.mesa
+ gl_HEADERS = $(top_srcdir)/include/GL/*.h
+
+ .PHONY: $(BUILDDIR)main/git_sha1.h.tmp
+--- src/glx/Makefile.am.o 2014-08-11 03:31:09.352150655 -0400
++++ src/glx/Makefile.am 2014-08-11 03:30:38.336149584 -0400
+@@ -49,7 +49,8 @@
+ $(GLPROTO_CFLAGS) \
+ $(X11_INCLUDES)
+
+-lib_LTLIBRARIES = lib@GL_LIB@.la
++gldir = ${libdir}/.mesa
++gl_LTLIBRARIES = lib@GL_LIB@.la
+
+ noinst_LTLIBRARIES = libglx.la
+
+--- src/egl/main/Makefile.am.o 2014-08-11 03:32:22.588153184 -0400
++++ src/egl/main/Makefile.am 2014-08-11 03:33:31.992155580 -0400
+@@ -29,7 +29,8 @@
+ -D_EGL_DRIVER_SEARCH_DIR=\"$(EGL_DRIVER_INSTALL_DIR)\" \
+ -D_EGL_OS_UNIX=1
+
+-lib_LTLIBRARIES = libEGL.la
++egllibdir = ${libdir}/.mesa
++egllib_LTLIBRARIES = libEGL.la
+
+ libEGL_la_SOURCES = \
+ eglapi.c \
+--- src/mapi/es2api/Makefile.am.o 2014-08-11 03:37:39.123164113 -0400
++++ src/mapi/es2api/Makefile.am 2014-08-11 03:38:35.648166064 -0400
+@@ -45,7 +45,8 @@
+ $(top_srcdir)/include/GLES3/gl3ext.h \
+ $(top_srcdir)/include/GLES3/gl3platform.h
+
+-lib_LTLIBRARIES = libGLESv2.la
++glesdir = ${libdir}/.mesa
++gles_LTLIBRARIES = libGLESv2.la
+
+ libGLESv2_la_SOURCES = ../entry.c glapi_mapi_tmp.h
+ libGLESv2_la_LIBADD = $(GLESv2_LIB_DEPS)
+--- src/mapi/es1api/Makefile.am.o 2014-08-11 03:39:24.923167766 -0400
++++ src/mapi/es1api/Makefile.am 2014-08-11 03:39:51.135168671 -0400
+@@ -40,7 +40,8 @@
+ $(top_srcdir)/include/GLES/glext.h \
+ $(top_srcdir)/include/GLES/glplatform.h
+
+-lib_LTLIBRARIES = libGLESv1_CM.la
++glesdir = ${libdir}/.mesa
++gles_LTLIBRARIES = libGLESv1_CM.la
+
+ libGLESv1_CM_la_SOURCES = ../entry.c glapi_mapi_tmp.h
+ libGLESv1_CM_la_LIBADD = $(GLESv1_CM_LIB_DEPS)
diff --git a/graphics-libs/mesalib/mesa-10.0-nv50-fix-build.patch
b/graphics-libs/mesalib/mesa-10.0-nv50-fix-build.patch
new file mode 100644
index 0000000..51d3160
--- /dev/null
+++ b/graphics-libs/mesalib/mesa-10.0-nv50-fix-build.patch
@@ -0,0 +1,12 @@
+diff -uNr mesa-20131201.orig/src/gallium/drivers/nouveau/codegen/nv50_ir.cpp
mesa-20131201/src/gallium/drivers/nouveau/codegen/nv50_ir.cpp
+--- mesa-20131201.orig/src/gallium/drivers/nouveau/codegen/nv50_ir.cpp
2013-12-01 11:29:21.000000000 +0400
++++ mesa-20131201/src/gallium/drivers/nouveau/codegen/nv50_ir.cpp
2013-12-01 16:05:06.488417551 +0400
+@@ -739,7 +739,7 @@
+ if (!i)
+ i = new_Instruction(pol.context(), op, dType);
+ #ifndef NDEBUG // non-conformant assert, so this is required
+- assert(typeid(*i) == typeid(*this));
++ //assert(typeid(*i) == typeid(*this));
+ #endif
+
+ pol.set<Instruction>(this, i);
diff --git a/graphics-libs/mesalib/mesa-8.0.3-llvm-3.1.patch
b/graphics-libs/mesalib/mesa-8.0.3-llvm-3.1.patch
deleted file mode 100644
index 8df86c8..0000000
--- a/graphics-libs/mesalib/mesa-8.0.3-llvm-3.1.patch
+++ /dev/null
@@ -1,53 +0,0 @@
---- src/gallium/auxiliary/gallivm/lp_bld_debug.cpp 2012-03-21
11:54:27.000000000 -0400
-+++ src/gallium/auxiliary/gallivm/lp_bld_debug.cpp.mod 2012-05-25
22:13:11.808747221 -0400
-@@ -54,6 +54,10 @@
- #include <llvm/MC/MCInstPrinter.h>
- #endif /* HAVE_LLVM >= 0x0207 */
-
-+#if HAVE_LLVM >= 0x0301
-+#include <llvm/MC/MCRegisterInfo.h>
-+#endif /* HAVE_LLVM >= 0x0301 */
-+
- #include "util/u_math.h"
- #include "util/u_debug.h"
-
-@@ -235,7 +239,23 @@ lp_disassemble(const void* func)
- int AsmPrinterVariant = AsmInfo->getAssemblerDialect();
- #endif
-
--#if HAVE_LLVM >= 0x0300
-+#if HAVE_LLVM >= 0x0301
-+ OwningPtr<const MCRegisterInfo> MRI(T->createMCRegInfo(Triple));
-+ if (!MRI) {
-+ debug_printf("error: no register info for target %s\n",
Triple.c_str());
-+ return;
-+ }
-+ OwningPtr<const MCInstrInfo> MII(T->createMCInstrInfo());
-+ if (!MII) {
-+ debug_printf("error: no instruction info for target %s\n",
Triple.c_str());
-+ return;
-+ }
-+#endif
-+
-+#if HAVE_LLVM >= 0x0301
-+ OwningPtr<MCInstPrinter> Printer(
-+ T->createMCInstPrinter(AsmPrinterVariant, *AsmInfo, *MII,
*MRI, *STI));
-+#elif HAVE_LLVM >= 0x0300
- OwningPtr<MCInstPrinter> Printer(
- T->createMCInstPrinter(AsmPrinterVariant, *AsmInfo, *STI));
- #elif HAVE_LLVM >= 0x0208
-
---- src/gallium/auxiliary/gallivm/lp_bld_misc.cpp 2012-03-21
11:54:27.000000000 -0400
-+++ src/gallium/auxiliary/gallivm/lp_bld_misc.cpp.mod 2012-05-25
22:08:02.150281687 -0400
-@@ -62,7 +62,11 @@
- extern "C" void
- lp_register_oprofile_jit_event_listener(LLVMExecutionEngineRef EE)
- {
--
llvm::unwrap(EE)->RegisterJITEventListener(llvm::createOProfileJITEventListener());
-+ #if HAVE_LLVM >= 0x0301
-+
llvm::unwrap(EE)->RegisterJITEventListener(llvm::JITEventListener::createOProfileJITEventListener());
-+ #else
-+
llvm::unwrap(EE)->RegisterJITEventListener(llvm::createOProfileJITEventListener());
-+ #endif
- }
-
diff --git a/http/eflwebkit/DEPENDS b/http/eflwebkit/DEPENDS
index 5df9966..fc90423 100755
--- a/http/eflwebkit/DEPENDS
+++ b/http/eflwebkit/DEPENDS
@@ -10,7 +10,7 @@ depends libxt &&
depends fontconfig &&
depends cairo &&
depends freetype2 &&
-depends MESALIB &&
+depends mesalib &&
depends cmake &&
depends eina &&
depends eet &&
diff --git a/http/eflwebkit/HISTORY b/http/eflwebkit/HISTORY
index 5fc09eb..2b42f1e 100644
--- a/http/eflwebkit/HISTORY
+++ b/http/eflwebkit/HISTORY
@@ -1,3 +1,6 @@
+2014-09-25 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: MESALIB => mesalib
+
2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: Use get_scm_version
diff --git a/http/webkitgtk/DEPENDS b/http/webkitgtk/DEPENDS
index d176250..a1e8519 100755
--- a/http/webkitgtk/DEPENDS
+++ b/http/webkitgtk/DEPENDS
@@ -13,7 +13,7 @@ depends libxt &&
depends libxrender &&
depends libxcomposite &&
depends libxdamage &&
-depends MESALIB --enable-accelerated-compositing &&
+depends mesalib --enable-accelerated-compositing &&
depends glib2 &&
depends fontconfig &&
depends freetype2 &&
diff --git a/http/webkitgtk/HISTORY b/http/webkitgtk/HISTORY
index f5a5a06..4779251 100644
--- a/http/webkitgtk/HISTORY
+++ b/http/webkitgtk/HISTORY
@@ -1,3 +1,6 @@
+2014-09-25 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: MESALIB => mesalib
+
2014-07-12 Pol Vinogradov <vin.public AT gmail.com>
* DETAILS: version 2.4.4
diff --git a/http/webkitgtk3/DEPENDS b/http/webkitgtk3/DEPENDS
index eddaa40..1d451a7 100755
--- a/http/webkitgtk3/DEPENDS
+++ b/http/webkitgtk3/DEPENDS
@@ -12,7 +12,7 @@ depends libxt &&
depends libxrender &&
depends libxcomposite &&
depends libxdamage &&
-depends MESALIB &&
+depends mesalib &&
depends glib2 &&
depends fontconfig &&
depends freetype2 &&
diff --git a/http/webkitgtk3/HISTORY b/http/webkitgtk3/HISTORY
index 557a79b..fd9a00f 100644
--- a/http/webkitgtk3/HISTORY
+++ b/http/webkitgtk3/HISTORY
@@ -1,3 +1,6 @@
+2014-09-25 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: MESALIB => mesalib
+
2014-08-02 Pol Vinogradov <vin.public AT gmail.com>
* DETAILS: version 2.5.1
* CONFIGURE, DEPENDS, BUILD: converted to cmake build system,
diff --git a/libs/libva/DEPENDS b/libs/libva/DEPENDS
index 5c6210a..61e0068 100755
--- a/libs/libva/DEPENDS
+++ b/libs/libva/DEPENDS
@@ -1,4 +1,4 @@
-depends MESALIB &&
+depends mesalib &&
optional_depends libdrm --enable-drm --disable-drm "DRM driver" &&
# Those should be optional in future. Interdependencies of the
diff --git a/libs/libva/HISTORY b/libs/libva/HISTORY
index e6fb48a..3578f59 100644
--- a/libs/libva/HISTORY
+++ b/libs/libva/HISTORY
@@ -1,3 +1,6 @@
+2014-09-25 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: MESALIB => mesalib
+
2014-08-27 Thomas Orgis <sobukus AT sourcemage.org>
* DETAILS: version 1.3.1
* DEPENDS: more of them, with options
diff --git a/libs/openscenegraph/DEPENDS b/libs/openscenegraph/DEPENDS
index 4941f1c..9d785b4 100755
--- a/libs/openscenegraph/DEPENDS
+++ b/libs/openscenegraph/DEPENDS
@@ -11,7 +11,7 @@ depends libxext &&
depends libice &&
depends libxml2 &&
depends libxrandr &&
-depends MESALIB &&
+depends mesalib &&
depends tiff &&
depends unzip &&
depends zlib &&
diff --git a/libs/openscenegraph/HISTORY b/libs/openscenegraph/HISTORY
index a78deca..5ef0e58 100644
--- a/libs/openscenegraph/HISTORY
+++ b/libs/openscenegraph/HISTORY
@@ -1,3 +1,6 @@
+2014-09-25 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: MESALIB => mesalib
+
2014-05-30 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: giflib => GIFLIB
diff --git a/libs/sdl2/DEPENDS b/libs/sdl2/DEPENDS
index 69ee55a..15e21db 100755
--- a/libs/sdl2/DEPENDS
+++ b/libs/sdl2/DEPENDS
@@ -74,11 +74,11 @@ optional_depends directfb \
"--enable-video-directfb" "--disable-video-directfb" \
"Use DirectFB video driver?" &&
-suggest_depends MESALIB \
+suggest_depends mesalib \
"--enable-video-opengl" "--disable-video-opengl" \
"Include OpenGL support?" &&
-suggest_depends MESALIB \
+suggest_depends mesalib \
"--enable-video-opengles" "--disable-video-opengles" \
"Include OpenGL ES support?" &&
diff --git a/libs/sdl2/HISTORY b/libs/sdl2/HISTORY
index 5a263cd..0d7f4fc 100644
--- a/libs/sdl2/HISTORY
+++ b/libs/sdl2/HISTORY
@@ -1,3 +1,6 @@
+2014-09-25 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: MESALIB => mesalib
+
2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: Use get_scm_version
diff --git a/video/mplayer/DEPENDS b/video/mplayer/DEPENDS
index 4e70752..aa9f2f8 100755
--- a/video/mplayer/DEPENDS
+++ b/video/mplayer/DEPENDS
@@ -70,7 +70,7 @@ if is_depends_enabled $SPELL xorg-server; then
depends libxinerama &&
depends libxxf86dga &&
depends libxxf86vm &&
- depends MESALIB
+ depends mesalib
fi &&
optional_depends libxv "--enable-xv" "--disable-xv" "for xv output support"
&&
diff --git a/video/mplayer/HISTORY b/video/mplayer/HISTORY
index 795843b..bb0f385 100644
--- a/video/mplayer/HISTORY
+++ b/video/mplayer/HISTORY
@@ -1,3 +1,6 @@
+2014-09-25 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: MESALIB => mesalib
+
2014-09-25 Remko van der Vossen <wich AT sourcemage.org>
* DEPENDS: missing depends
diff --git a/x11-toolkits/fltk2/DEPENDS b/x11-toolkits/fltk2/DEPENDS
index c45971f..d2e12e9 100755
--- a/x11-toolkits/fltk2/DEPENDS
+++ b/x11-toolkits/fltk2/DEPENDS
@@ -1,7 +1,7 @@
depends -sub CXX gcc &&
depends libx11 &&
-optional_depends MESALIB "--enable-gl=yes" "--enable-gl=no" \
+optional_depends mesalib "--enable-gl=yes" "--enable-gl=no" \
"for OpenGL support" &&
optional_depends JPEG "--enable-jpeg" "--disable-jpeg" \
"to use the system JPEG library" &&
diff --git a/x11-toolkits/fltk2/HISTORY b/x11-toolkits/fltk2/HISTORY
index 1888eb4..06c940b 100644
--- a/x11-toolkits/fltk2/HISTORY
+++ b/x11-toolkits/fltk2/HISTORY
@@ -1,3 +1,6 @@
+2014-09-25 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: MESALIB => mesalib
+
2014-04-14 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: mesalib => MESALIB
diff --git a/x11-toolkits/wxgtk/DEPENDS b/x11-toolkits/wxgtk/DEPENDS
index 36a6323..82a33f2 100755
--- a/x11-toolkits/wxgtk/DEPENDS
+++ b/x11-toolkits/wxgtk/DEPENDS
@@ -18,7 +18,7 @@ optional_depends pcre '--with-regex=sys' \
'--with-regex=builtin' \
'do not use pcre for advanced features' &&
-optional_depends MESALIB \
+optional_depends mesalib \
'--with-opengl' \
'--without-opengl' \
'for OpenGL support' &&
diff --git a/x11-toolkits/wxgtk/HISTORY b/x11-toolkits/wxgtk/HISTORY
index f58a948..b7a7552 100644
--- a/x11-toolkits/wxgtk/HISTORY
+++ b/x11-toolkits/wxgtk/HISTORY
@@ -1,3 +1,6 @@
+2014-09-25 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: MESALIB => mesalib
+
2014-04-24 Thomas Orgis <sobukus AT sourcemage.org>
* DEPENDS: ... and when MESALIB is mesalib-1x, depends on glu
diff --git a/x11/xlockmore/DEPENDS b/x11/xlockmore/DEPENDS
index f08f6ac..216547d 100755
--- a/x11/xlockmore/DEPENDS
+++ b/x11/xlockmore/DEPENDS
@@ -1,7 +1,7 @@
depends libx11 &&
if list_find $XLOCKMORE_OPTS "--disable-blank-only"; then
- optional_depends MESALIB \
+ optional_depends mesalib \
"--with-mesa" \
"--without-mesa" \
"for Mesa 3D modes" &&
diff --git a/x11/xlockmore/HISTORY b/x11/xlockmore/HISTORY
index c26d475..f2734cf 100644
--- a/x11/xlockmore/HISTORY
+++ b/x11/xlockmore/HISTORY
@@ -1,3 +1,6 @@
+2014-09-25 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: MESALIB => mesalib
+
2014-04-14 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: mesalib => MESALIB
diff --git a/xorg-app/weston/DEPENDS b/xorg-app/weston/DEPENDS
index bd15514..02cd43c 100755
--- a/xorg-app/weston/DEPENDS
+++ b/xorg-app/weston/DEPENDS
@@ -1,6 +1,6 @@
depends pkgconfig &&
depends libpng &&
-depends MESALIB &&
+depends mesalib &&
depends UDEV &&
depends cairo &&
depends librsvg2 &&
diff --git a/xorg-app/weston/HISTORY b/xorg-app/weston/HISTORY
index d44f311..01ac080 100644
--- a/xorg-app/weston/HISTORY
+++ b/xorg-app/weston/HISTORY
@@ -1,3 +1,6 @@
+2014-09-25 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: MESALIB => mesalib
+
2014-09-19 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.6.0
diff --git a/xorg-app/xdriinfo/DEPENDS b/xorg-app/xdriinfo/DEPENDS
index 27dd67b..35a467a 100755
--- a/xorg-app/xdriinfo/DEPENDS
+++ b/xorg-app/xdriinfo/DEPENDS
@@ -1,4 +1,4 @@
depends util-macros &&
depends libx11 &&
depends glproto &&
-depends MESALIB
+depends mesalib
diff --git a/xorg-app/xdriinfo/HISTORY b/xorg-app/xdriinfo/HISTORY
index e1efa9e..393752b 100644
--- a/xorg-app/xdriinfo/HISTORY
+++ b/xorg-app/xdriinfo/HISTORY
@@ -1,3 +1,6 @@
+2014-09-25 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: MESALIB => mesalib
+
2014-04-14 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: mesalib => MESALIB
diff --git a/xorg-driver/glamor/DEPENDS b/xorg-driver/glamor/DEPENDS
index ca5faf0..2d5dbfe 100755
--- a/xorg-driver/glamor/DEPENDS
+++ b/xorg-driver/glamor/DEPENDS
@@ -1,2 +1,2 @@
depends -sub CXX gcc &&
-depends MESALIB
+depends mesalib
diff --git a/xorg-driver/glamor/HISTORY b/xorg-driver/glamor/HISTORY
index 18cbfba..ba0f034 100644
--- a/xorg-driver/glamor/HISTORY
+++ b/xorg-driver/glamor/HISTORY
@@ -1,3 +1,6 @@
+2014-09-25 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: MESALIB => mesalib
+
2014-08-24 Thomas Orgis <sobukus AT sourcemage.org>
* DEPENDS: MESALIB
diff --git a/xorg-driver/xf86-video-ati/DEPENDS
b/xorg-driver/xf86-video-ati/DEPENDS
index 8fd983a..afd1cd8 100755
--- a/xorg-driver/xf86-video-ati/DEPENDS
+++ b/xorg-driver/xf86-video-ati/DEPENDS
@@ -7,7 +7,7 @@ depends xineramaproto &&
depends xorg-server &&
depends xproto &&
-optional_depends MESALIB \
+optional_depends mesalib \
"--enable-dri" \
"--disable-dri" \
"Do you want dri support" &&
diff --git a/xorg-driver/xf86-video-ati/HISTORY
b/xorg-driver/xf86-video-ati/HISTORY
index 393485a..a079b97 100644
--- a/xorg-driver/xf86-video-ati/HISTORY
+++ b/xorg-driver/xf86-video-ati/HISTORY
@@ -1,3 +1,6 @@
+2014-09-25 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: MESALIB => mesalib
+
2014-09-25 Remko van der Vossen <wich AT sourcemage.org>
* DEPENDS: added missing dependencies
diff --git a/xorg-driver/xf86-video-glint/DEPENDS
b/xorg-driver/xf86-video-glint/DEPENDS
index 325e1a5..a51187e 100755
--- a/xorg-driver/xf86-video-glint/DEPENDS
+++ b/xorg-driver/xf86-video-glint/DEPENDS
@@ -1,7 +1,7 @@
depends util-macros &&
depends xproto &&
depends xorg-server &&
-optional_depends MESALIB \
+optional_depends mesalib \
"--enable-dri" \
"--disable-dri" \
"Do you want dri support" &&
diff --git a/xorg-driver/xf86-video-glint/HISTORY
b/xorg-driver/xf86-video-glint/HISTORY
index 6d9f43a..d4b40f4 100644
--- a/xorg-driver/xf86-video-glint/HISTORY
+++ b/xorg-driver/xf86-video-glint/HISTORY
@@ -1,3 +1,6 @@
+2014-09-25 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: MESALIB => mesalib
+
2014-04-14 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: mesalib => MESALIB
diff --git a/xorg-driver/xf86-video-mga/DEPENDS
b/xorg-driver/xf86-video-mga/DEPENDS
index 325e1a5..a51187e 100755
--- a/xorg-driver/xf86-video-mga/DEPENDS
+++ b/xorg-driver/xf86-video-mga/DEPENDS
@@ -1,7 +1,7 @@
depends util-macros &&
depends xproto &&
depends xorg-server &&
-optional_depends MESALIB \
+optional_depends mesalib \
"--enable-dri" \
"--disable-dri" \
"Do you want dri support" &&
diff --git a/xorg-driver/xf86-video-mga/HISTORY
b/xorg-driver/xf86-video-mga/HISTORY
index f427a5a..f9fabaa 100644
--- a/xorg-driver/xf86-video-mga/HISTORY
+++ b/xorg-driver/xf86-video-mga/HISTORY
@@ -1,3 +1,6 @@
+2014-09-25 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: MESALIB => mesalib
+
2014-08-24 Thomas Orgis <sobukus AT sourcemage.org>
* DETAILS: bump to 1.6.3 (removed sig)
diff --git a/xorg-driver/xf86-video-modesetting/DEPENDS
b/xorg-driver/xf86-video-modesetting/DEPENDS
index f1b0929..fb3c9f9 100755
--- a/xorg-driver/xf86-video-modesetting/DEPENDS
+++ b/xorg-driver/xf86-video-modesetting/DEPENDS
@@ -10,7 +10,7 @@ depends xf86driproto &&
depends libpciaccess &&
optional_depends UDEV '' '' 'hardware detection' &&
-optional_depends -sub DRI MESALIB \
+optional_depends -sub DRI mesalib \
"--enable-dri" \
"--disable-dri" \
"Do you want dri support"
diff --git a/xorg-driver/xf86-video-modesetting/HISTORY
b/xorg-driver/xf86-video-modesetting/HISTORY
index acba069..799ec0d 100644
--- a/xorg-driver/xf86-video-modesetting/HISTORY
+++ b/xorg-driver/xf86-video-modesetting/HISTORY
@@ -1,3 +1,6 @@
+2014-09-25 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: MESALIB => mesalib
+
2014-06-26 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS version 0.9.0
diff --git a/xorg-driver/xf86-video-openchrome/DEPENDS
b/xorg-driver/xf86-video-openchrome/DEPENDS
index 928092d..92d51e4a 100755
--- a/xorg-driver/xf86-video-openchrome/DEPENDS
+++ b/xorg-driver/xf86-video-openchrome/DEPENDS
@@ -7,7 +7,7 @@ if [[ "$XF86_VIDEO_OPENCHROME_BRANCH" == "scm" ]]; then
depends subversion
fi &&
-optional_depends MESALIB \
+optional_depends mesalib \
"--enable-dri" \
"--disable-dri" \
"Do you want dri support" &&
diff --git a/xorg-driver/xf86-video-openchrome/HISTORY
b/xorg-driver/xf86-video-openchrome/HISTORY
index 65776c1..fac9231 100644
--- a/xorg-driver/xf86-video-openchrome/HISTORY
+++ b/xorg-driver/xf86-video-openchrome/HISTORY
@@ -1,3 +1,6 @@
+2014-09-25 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: MESALIB => mesalib
+
2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: Use get_scm_version
diff --git a/xorg-driver/xf86-video-r128/DEPENDS
b/xorg-driver/xf86-video-r128/DEPENDS
index 325e1a5..a51187e 100755
--- a/xorg-driver/xf86-video-r128/DEPENDS
+++ b/xorg-driver/xf86-video-r128/DEPENDS
@@ -1,7 +1,7 @@
depends util-macros &&
depends xproto &&
depends xorg-server &&
-optional_depends MESALIB \
+optional_depends mesalib \
"--enable-dri" \
"--disable-dri" \
"Do you want dri support" &&
diff --git a/xorg-driver/xf86-video-r128/HISTORY
b/xorg-driver/xf86-video-r128/HISTORY
index 60d2e16..226d33d 100644
--- a/xorg-driver/xf86-video-r128/HISTORY
+++ b/xorg-driver/xf86-video-r128/HISTORY
@@ -1,3 +1,6 @@
+2014-09-25 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: MESALIB => mesalib
+
2014-04-14 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: mesalib => MESALIB
diff --git a/xorg-driver/xf86-video-sis/DEPENDS
b/xorg-driver/xf86-video-sis/DEPENDS
index 9b173af..2b33821 100755
--- a/xorg-driver/xf86-video-sis/DEPENDS
+++ b/xorg-driver/xf86-video-sis/DEPENDS
@@ -1,7 +1,7 @@
depends util-macros &&
depends xproto &&
depends xorg-server &&
-optional_depends MESALIB \
+optional_depends mesalib \
"--enable-dri" \
"--disable-dri" \
"Do you want dri support" &&
diff --git a/xorg-driver/xf86-video-sis/HISTORY
b/xorg-driver/xf86-video-sis/HISTORY
index 29b7753..5a1e25f 100644
--- a/xorg-driver/xf86-video-sis/HISTORY
+++ b/xorg-driver/xf86-video-sis/HISTORY
@@ -1,3 +1,6 @@
+2014-09-25 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: MESALIB => mesalib
+
2014-04-14 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: mesalib => MESALIB
diff --git a/xorg-driver/xf86-video-tdfx/DEPENDS
b/xorg-driver/xf86-video-tdfx/DEPENDS
index 9b173af..2b33821 100755
--- a/xorg-driver/xf86-video-tdfx/DEPENDS
+++ b/xorg-driver/xf86-video-tdfx/DEPENDS
@@ -1,7 +1,7 @@
depends util-macros &&
depends xproto &&
depends xorg-server &&
-optional_depends MESALIB \
+optional_depends mesalib \
"--enable-dri" \
"--disable-dri" \
"Do you want dri support" &&
diff --git a/xorg-driver/xf86-video-tdfx/HISTORY
b/xorg-driver/xf86-video-tdfx/HISTORY
index 1ff292d..ea43ad0 100644
--- a/xorg-driver/xf86-video-tdfx/HISTORY
+++ b/xorg-driver/xf86-video-tdfx/HISTORY
@@ -1,3 +1,6 @@
+2014-09-25 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: MESALIB => mesalib
+
2014-04-14 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: mesalib => MESALIB
diff --git a/xorg-driver/xf86-video-via/DEPENDS
b/xorg-driver/xf86-video-via/DEPENDS
index 9bc878e..b4e9d94 100755
--- a/xorg-driver/xf86-video-via/DEPENDS
+++ b/xorg-driver/xf86-video-via/DEPENDS
@@ -3,7 +3,7 @@ depends xproto &&
depends xorg-server &&
depends libdrm &&
depends libxvmc &&
-optional_depends MESALIB \
+optional_depends mesalib \
"--enable-dri" \
"--disable-dri" \
"Do you want dri support" &&
diff --git a/xorg-driver/xf86-video-via/HISTORY
b/xorg-driver/xf86-video-via/HISTORY
index a93132c..d5ae397 100644
--- a/xorg-driver/xf86-video-via/HISTORY
+++ b/xorg-driver/xf86-video-via/HISTORY
@@ -1,3 +1,6 @@
+2014-09-25 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: MESALIB => mesalib
+
2014-04-14 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: mesalib => MESALIB
diff --git a/xorg-xserver/xorg-server/DEPENDS
b/xorg-xserver/xorg-server/DEPENDS
index 5b2a608..a6944b7 100755
--- a/xorg-xserver/xorg-server/DEPENDS
+++ b/xorg-xserver/xorg-server/DEPENDS
@@ -132,7 +132,7 @@ depends pkgconfig &&
depends libtool &&
depends AWK &&
depends gawk &&
-depends mesalib-1x &&
+depends mesalib &&
depends rgb &&
depends font-cursor-misc &&
depends font-misc-misc &&
diff --git a/xorg-xserver/xorg-server/HISTORY
b/xorg-xserver/xorg-server/HISTORY
index 90908f9..190a69c 100644
--- a/xorg-xserver/xorg-server/HISTORY
+++ b/xorg-xserver/xorg-server/HISTORY
@@ -1,5 +1,6 @@
2014-09-25 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: 1.16.1
+ * DEPENDS: now use mesalib
2014-09-18 Pol Vinogradov <vin.public AT gmail.com>
* PRE_SUB_DEPENDS, REPAIR*SUB_DEPENDS: fixed GLAMOR subdependency
- [SM-Commit] GIT changes to devel-xorg-modular grimoire by Treeve Jelbert (db4925ef6975214e1dc4eddf7fbf7bd597bbf17b), Treeve Jelbert, 09/25/2014
Archive powered by MHonArc 2.6.24.