Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (df683e9fbeff16724fa1e063096af2fe4884bfc1)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Treeve Jelbert (df683e9fbeff16724fa1e063096af2fe4884bfc1)

Chronological Thread  
    < Chronological >       < Thread >
  • From: Treeve Jelbert <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (df683e9fbeff16724fa1e063096af2fe4884bfc1)
  • Date: Tue, 22 Sep 2015 11:00:25 +0000
GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

graphics-libs/mesalib/CONFIGURE | 16 +++-
graphics-libs/mesalib/DEPENDS | 6 -
graphics-libs/mesalib/DETAILS | 4 -
graphics-libs/mesalib/HISTORY | 7 +
graphics-libs/mesalib/PRE_BUILD | 5 -
graphics-libs/mesalib/gl_select.patch | 67
+++++++++++--------
graphics-libs/mesalib/mesa-10.0-nv50-fix-build.patch | 12 ---
7 files changed, 64 insertions(+), 53 deletions(-)

New commits:
commit df683e9fbeff16724fa1e063096af2fe4884bfc1
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

mesalib: => 11.0.0

diff --git a/graphics-libs/mesalib/CONFIGURE b/graphics-libs/mesalib/CONFIGURE
index 1facefe..63081e1 100755
--- a/graphics-libs/mesalib/CONFIGURE
+++ b/graphics-libs/mesalib/CONFIGURE
@@ -36,12 +36,20 @@ case $MESALIB_BUILD in
none all $AVAILABLE_GALLIUM
if [[ $MESALIB_GALLIUM = all ]]; then
MESALIB_GALLIUM=$AVAILABLE_GALLIUM
- fi
+ fi &&
+
+ if list_find "$MESALIB_GALLIUM" r600;then
+ config_query_option MESALIB_OPTS "LLVM backend for graphics shaders " n\
+ "--enable-r600-llvm-compiler" ""
+ fi &&

if [[ $MESALIB_GALLIUM != "" ]] && [[ $MESALIB_GALLIUM != none ]]; then
- list_add MESALIB_OPTS "--enable-egl"
+ list_add MESALIB_OPTS "--enable-gallium-llvm" &&
+ list_add MESALIB_OPTS "--enable-egl" &&
+# remove obsolete fbdev option
+ list_remove MESA_EGL fbdev &&
config_query_multi MESA_EGL "which EGL platforms?" drm wayland x11
- if list_find wayland "$MESA_EGL";then
+ if list_find "$MESA_EGL" wayland;then
list_remove MESALIB_OPTS "--disable-shared-glapi" &&
list_remove MESALIB_OPTS "--disable-gbm" &&
list_remove MESALIB_OPTS "--disable-gles2" &&
@@ -63,7 +71,7 @@ case $MESALIB_BUILD in
MESALIB_GALLIUM=
config_query_option MESALIB_OPTS "enable EGL library?" y \
"--enable-egl" "--disable-egl"
- if list_find --enable-egl "$MESALIB_OPTS"; then
+ if list_find "$MESALIB_OPTS" --enable-egl; then
MESALIB_OPTS+=" --enable-gbm" # Mandatory!
fi
fi
diff --git a/graphics-libs/mesalib/DEPENDS b/graphics-libs/mesalib/DEPENDS
index f89fdce..6b1813c 100755
--- a/graphics-libs/mesalib/DEPENDS
+++ b/graphics-libs/mesalib/DEPENDS
@@ -16,14 +16,13 @@ depends expat &&
depends libxdamage &&
depends libx11 &&
depends glproto &&
-depends dri3proto &&
depends presentproto &&
depends libxshmfence &&
+optional_depends dri3proto '--enable-dri3' '' 'DRI3 support' &&

case $MESALIB_BUILD in
dri)
depends dri2proto &&
- depends libdrm &&
depends libxext &&
depends libxxf86vm &&
depends libxdamage &&
@@ -41,13 +40,14 @@ esac &&

if [[ -n $MESALIB_GALLIUM ]] && [[ "$MESALIB_GALLIUM" != "none" ]]; then
depends llvm &&
+ depends libelf &&
depends mako &&
depends python &&
if list_find "$MESA_EGL" wayland;then
depends wayland
fi &&
if list_find "$MESALIB_GALLIUM" radeonsi;then
- depends libelf
+ sub_depends libdrm AMD
fi
fi &&

diff --git a/graphics-libs/mesalib/DETAILS b/graphics-libs/mesalib/DETAILS
index a962840..43fac11 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.6.7
-
SOURCE_HASH=sha512:c966bb56472bda5642c425255761e4e20fdcdf9d3a56fa3f5dcb2605525c09155e01a641a14f2a2a0b8fbba08646dbf04b69a388ff4a9dd63ab52e1eeb4f4107
+ VERSION=11.0.0
+
SOURCE_HASH=sha512:9938010f3d5e72bb8dea371e3502622e2ff6eae14e0265011df8fc81ec915d632abda9be7e772828adb8f0c7c12c830d89dce42e196ca18489fb1386a766220f
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 7bde075..96390f8 100644
--- a/graphics-libs/mesalib/HISTORY
+++ b/graphics-libs/mesalib/HISTORY
@@ -1,3 +1,10 @@
+2015-09-22 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 11.0.0
+ * CONFIGURE DEPNDS: adjust
+ * mesa-10.0-nv50-fix-build.patch: deleted
+ * gl_select.patch: updated
+ * PRE_BUILD: do not apply nv50 patch
+
2015-09-13 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 10.6.7

diff --git a/graphics-libs/mesalib/PRE_BUILD b/graphics-libs/mesalib/PRE_BUILD
index 8644f9f..174fd19 100755
--- a/graphics-libs/mesalib/PRE_BUILD
+++ b/graphics-libs/mesalib/PRE_BUILD
@@ -1,8 +1,5 @@
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 &&
+patch -p1 < $SPELL_DIRECTORY/gl_select.patch &&
autoreconf -f -i --symlink
diff --git a/graphics-libs/mesalib/gl_select.patch
b/graphics-libs/mesalib/gl_select.patch
index 3ac3a54..a73b51b 100644
--- a/graphics-libs/mesalib/gl_select.patch
+++ b/graphics-libs/mesalib/gl_select.patch
@@ -1,17 +1,22 @@
---- 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
+diff --git a/src/egl/Makefile.am b/src/egl/Makefile.am
+index 5c2ba30..43e688b 100644
+--- a/src/egl/Makefile.am
++++ b/src/egl/Makefile.am
+@@ -32,7 +32,8 @@ AM_CFLAGS = \
+ $(EGL_CFLAGS) \
+ -D_EGL_NATIVE_PLATFORM=$(EGL_NATIVE_PLATFORM)

--gldir = $(includedir)/GL
-+gldir = $(includedir)/GL/.mesa
- gl_HEADERS = $(top_srcdir)/include/GL/*.h
+-lib_LTLIBRARIES = libEGL.la
++egllibdir = ${libdir}/.mesa
++egllib_LTLIBRARIES = libEGL.la

- .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 @@
+ libEGL_la_SOURCES = \
+ $(LIBEGL_C_FILES)
+diff --git a/src/glx/Makefile.am b/src/glx/Makefile.am
+index 6e50e09..0d6479d 100644
+--- a/src/glx/Makefile.am
++++ b/src/glx/Makefile.am
+@@ -52,7 +52,8 @@ AM_CFLAGS = \
$(GLPROTO_CFLAGS) \
$(X11_INCLUDES)

@@ -21,21 +26,11 @@

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/Makefile.am.o 2015-03-19 00:36:03.220665254 -0400
-+++ src/mapi/Makefile.am 2015-03-19 00:29:47.847652293 -0400
-@@ -161,7 +161,8 @@
+diff --git a/src/mapi/Makefile.am b/src/mapi/Makefile.am
+index 307e05d..42c7e59 100644
+--- a/src/mapi/Makefile.am
++++ b/src/mapi/Makefile.am
+@@ -159,7 +159,8 @@ GLES_include_HEADERS = \
$(top_srcdir)/include/GLES/glext.h \
$(top_srcdir)/include/GLES/glplatform.h

@@ -45,7 +40,7 @@

es1api_libGLESv1_CM_la_SOURCES = entry.c es1api/glapi_mapi_tmp.h
es1api_libGLESv1_CM_la_CFLAGS = \
-@@ -205,7 +206,8 @@
+@@ -205,7 +206,8 @@ GLES3_include_HEADERS = \
$(top_srcdir)/include/GLES3/gl3ext.h \
$(top_srcdir)/include/GLES3/gl3platform.h

@@ -55,3 +50,19 @@

es2api_libGLESv2_la_SOURCES = entry.c es2api/glapi_mapi_tmp.h
es2api_libGLESv2_la_CFLAGS = \
+diff --git a/src/mesa/Makefile.am b/src/mesa/Makefile.am
+index 69506f2..7894ad6 100644
+--- a/src/mesa/Makefile.am
++++ b/src/mesa/Makefile.am
+@@ -33,7 +33,7 @@ if HAVE_OSMESA
+ SUBDIRS += drivers/osmesa
+ endif
+
+-gldir = $(includedir)/GL
++gldir = $(includedir)/GL/.mesa
+ gl_HEADERS = $(top_srcdir)/include/GL/*.h
+
+ .PHONY: main/git_sha1.h.tmp
+--
+2.5.0
+
diff --git a/graphics-libs/mesalib/mesa-10.0-nv50-fix-build.patch
b/graphics-libs/mesalib/mesa-10.0-nv50-fix-build.patch
deleted file mode 100644
index 51d3160..0000000
--- a/graphics-libs/mesalib/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);


  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (df683e9fbeff16724fa1e063096af2fe4884bfc1), Treeve Jelbert, 09/22/2015

Archive powered by MHonArc 2.6.24.

Top of Page