Source Mage code commit list

[Pavel Vinogradov <scm AT sourcemage.org>]

GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemage.org>:

 graphics-libs/mesalib/HISTORY         |    4 ++
 graphics-libs/mesalib/PRE_BUILD       |   17 +++++++-
 graphics-libs/mesalib/gl_select.patch |   68 
----------------------------------
 3 files changed, 19 insertions(+), 70 deletions(-)

New commits:
commit 37e07b2b35f14325c9316012897f98f0f48ed7fc
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

    graphics-libs/mesalib: replaced gl_select.patch with sed scripts

diff --git a/graphics-libs/mesalib/HISTORY b/graphics-libs/mesalib/HISTORY
index 1ee0c33..6a13f18 100644
--- a/graphics-libs/mesalib/HISTORY
+++ b/graphics-libs/mesalib/HISTORY
@@ -1,3 +1,7 @@
+2016-07-07 Pavel Vinogradov <public AT sourcemage.org>
+       * PRE_BUILD: replaced gl_select.patch with sed scripts
+       * gl_select.patch: removed
+
 2016-07-05 Treeve Jelbert <treeve AT sourcemage.org>
        * UP_TRIGGERS: deleted, rely on xorg-server's triggers
 
diff --git a/graphics-libs/mesalib/PRE_BUILD b/graphics-libs/mesalib/PRE_BUILD
index 174fd19..d9bca09 100755
--- a/graphics-libs/mesalib/PRE_BUILD
+++ b/graphics-libs/mesalib/PRE_BUILD
@@ -1,5 +1,18 @@
 default_pre_build    &&
-cd $SOURCE_DIRECTORY &&
 
-patch -p1 < $SPELL_DIRECTORY/gl_select.patch &&
+cd ${SOURCE_DIRECTORY}/src &&
+sed -e '/lib_LTLIBRARIES/s:lib_:egl&:' \
+    -e '/lib_LTLIBRARIES/iegllibdir = ${libdir}/.mesa' \
+    -i egl/Makefile.am &&
+sed -e '/lib_LTLIBRARIES/s:lib_:gl_:' \
+    -e '/gl_LTLIBRARIES/igldir = ${libdir}/.mesa' \
+    -i glx/Makefile.am &&
+sed -e '/lib_LTLIBRARIES += es1api/s:lib_:gles_:' \
+    -e '/_LTLIBRARIES += es1api/iglesdir = ${libdir}/.mesa' \
+    -e '/lib_LTLIBRARIES += es2api/s:lib_:gles2_:' \
+    -e '/_LTLIBRARIES += es2api/igles2dir = ${libdir}/.mesa' \
+    -i mapi/Makefile.am &&
+sed -i '/gldir/s;GL;&/.mesa;' mesa/Makefile.am &&
+
+cd ${SOURCE_DIRECTORY} &&
 autoreconf -f -i --symlink
diff --git a/graphics-libs/mesalib/gl_select.patch 
b/graphics-libs/mesalib/gl_select.patch
deleted file mode 100644
index a73b51b..0000000
--- a/graphics-libs/mesalib/gl_select.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-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)
- 
--lib_LTLIBRARIES = libEGL.la
-+egllibdir = ${libdir}/.mesa
-+egllib_LTLIBRARIES = libEGL.la
- 
- 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)
- 
--lib_LTLIBRARIES = lib@GL_LIB@.la
-+gldir = ${libdir}/.mesa
-+gl_LTLIBRARIES = lib@GL_LIB@.la
- 
- noinst_LTLIBRARIES = libglx.la
- 
-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
- 
--lib_LTLIBRARIES += es1api/libGLESv1_CM.la
-+glesdir = ${libdir}/.mesa
-+gles_LTLIBRARIES = es1api/libGLESv1_CM.la
- 
- es1api_libGLESv1_CM_la_SOURCES = entry.c es1api/glapi_mapi_tmp.h
- es1api_libGLESv1_CM_la_CFLAGS = \
-@@ -205,7 +206,8 @@ GLES3_include_HEADERS = \
-       $(top_srcdir)/include/GLES3/gl3ext.h \
-       $(top_srcdir)/include/GLES3/gl3platform.h
- 
--lib_LTLIBRARIES += es2api/libGLESv2.la
-+gles2dir = ${libdir}/.mesa
-+gles2_LTLIBRARIES = es2api/libGLESv2.la
- 
- 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
-