[SM-Commit] GIT changes to master grimoire by George Sherwood (3bf111794985c798f52142579e72d6dc1dd7457a)

George Sherwood scm at sourcemage.org
Mon Jan 3 18:24:35 EST 2011


GIT changes to master grimoire by George Sherwood <gsherwood at sourcemage.org>:

 dev/null                                        |binary
 graphics-libs/mesalib/DETAILS                   |    4 +-
 graphics-libs/mesalib/HISTORY                   |    4 ++
 graphics-libs/mesalib/MesaLib-7.5.2.tar.bz2.sig |    0 
 graphics-libs/mesalib/MesaLib-7.6.1.tar.bz2.sig |    0 
 graphics-libs/mesalib/MesaLib-7.8.2.tar.bz2.sig |binary
 graphics-libs/mesalib/PRE_BUILD                 |    2 -
 graphics-libs/mesalib/gl_select.patch           |   36 ------------------------
 8 files changed, 7 insertions(+), 39 deletions(-)

New commits:
commit 3bf111794985c798f52142579e72d6dc1dd7457a
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: George Sherwood <gsherwood at sourcemage.org>

    mesalib 7.8.2 (stable), 7.9 (feature, developement)
    
    cast xorg-server 1.9.3:
    Requested 'dri >= 7.8.0' but version of dri is 7.5.2
    (cherry picked from commit b785b0ca73140622b876d8948dc248d0e2d0e9aa)

diff --git a/graphics-libs/mesalib/DETAILS b/graphics-libs/mesalib/DETAILS
index f79f3e7..a9d7c92 100755
--- a/graphics-libs/mesalib/DETAILS
+++ b/graphics-libs/mesalib/DETAILS
@@ -18,10 +18,10 @@ fi
 
 case $MESALIB_VER in 
       stable)
-         VERSION=7.5.2
+         VERSION=7.8.2
   ;;
      feature)
-         VERSION=7.6.1
+         VERSION=7.9
   ;;
 developement)
          VERSION=7.9
diff --git a/graphics-libs/mesalib/HISTORY b/graphics-libs/mesalib/HISTORY
index a484577..86c38ff 100644
--- a/graphics-libs/mesalib/HISTORY
+++ b/graphics-libs/mesalib/HISTORY
@@ -1,3 +1,7 @@
+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
diff --git a/graphics-libs/mesalib/MesaLib-7.5.2.tar.bz2.sig b/graphics-libs/mesalib/MesaLib-7.5.2.tar.bz2.sig
deleted file mode 100644
index a4e40dd..0000000
Binary files a/graphics-libs/mesalib/MesaLib-7.5.2.tar.bz2.sig and /dev/null differ
diff --git a/graphics-libs/mesalib/MesaLib-7.6.1.tar.bz2.sig b/graphics-libs/mesalib/MesaLib-7.6.1.tar.bz2.sig
deleted file mode 100644
index ff46b02..0000000
Binary files a/graphics-libs/mesalib/MesaLib-7.6.1.tar.bz2.sig and /dev/null differ
diff --git a/graphics-libs/mesalib/MesaLib-7.8.2.tar.bz2.sig b/graphics-libs/mesalib/MesaLib-7.8.2.tar.bz2.sig
new file mode 100644
index 0000000..38ce699
Binary files /dev/null and b/graphics-libs/mesalib/MesaLib-7.8.2.tar.bz2.sig differ
diff --git a/graphics-libs/mesalib/PRE_BUILD b/graphics-libs/mesalib/PRE_BUILD
index 01b02eb..92f6374 100755
--- a/graphics-libs/mesalib/PRE_BUILD
+++ b/graphics-libs/mesalib/PRE_BUILD
@@ -1,7 +1,7 @@
 default_pre_build                                            &&
 cd ${SOURCE_DIRECTORY}                                       &&
 if  [[  "$MESALIB_VER"  ==  "stable"  ]];  then
-  patch -p1 < $SPELL_DIRECTORY/gl_select.patch
+  patch -p1 < $SPELL_DIRECTORY/gl_select-scm.patch
 else
   patch -p1 < $SPELL_DIRECTORY/gl_select-scm.patch
 
diff --git a/graphics-libs/mesalib/gl_select.patch b/graphics-libs/mesalib/gl_select.patch
deleted file mode 100644
index c03b041..0000000
--- a/graphics-libs/mesalib/gl_select.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -Nuar Mesa-7.3.orig/src/mesa/Makefile Mesa-7.3/src/mesa/Makefile
---- Mesa-7.3.orig/src/mesa/Makefile	2009-02-08 22:21:58.000000000 +0000
-+++ Mesa-7.3/src/mesa/Makefile	2009-02-08 22:26:32.000000000 +0000
-@@ -114,14 +114,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
- 	$(INSTALL) $(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
-



More information about the SM-Commit mailing list