Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Andraž Levstik (4a36a3d4fc335b8034e578e4d79b1369e84e7891)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Andraž Levstik <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Andraž Levstik (4a36a3d4fc335b8034e578e4d79b1369e84e7891)
  • Date: Fri, 12 Nov 2010 14:17:39 -0600

GIT changes to master grimoire by Andraž Levstik
<ruskie+2054d253 AT codemages.net>:

ChangeLog | 3 +++
glselect.function | 24 ++++++++++++------------
graphics-libs/mesalib/HISTORY | 4 ++++
graphics-libs/mesalib/gl_select-scm.patch | 14 +++++++-------
graphics-libs/mesalib/gl_select.patch | 14 +++++++-------
smgl/smgl-gl_select/DETAILS | 2 +-
smgl/smgl-gl_select/HISTORY | 4 ++++
smgl/smgl-gl_select/smgl-gl_select | 30
+++++++++++++++---------------
xorg-xserver/xorg-server/HISTORY | 3 +++
xorg-xserver/xorg-server/gl_select.patch | 8 ++++----
10 files changed, 60 insertions(+), 46 deletions(-)

New commits:
commit 92d92610656796d138bfd9e11ebd9f04c80707c4
Author: Andraž Levstik <ruskie+2054d253 AT codemages.net>
Commit: Andraž Levstik <ruskie+2054d253 AT codemages.net>

xorg-server: updated glselect

commit 727c9222d33a100f21a9ab46d0c70179f1f725f3
Author: Andraž Levstik <ruskie+2054d253 AT codemages.net>
Commit: Andraž Levstik <ruskie+2054d253 AT codemages.net>

smgl-gl_select: updated to 2.0.3 updated for stupid xorg

commit da375afb6cba1ac2716bedb01f873d63fd039f1c
Author: Andraž Levstik <ruskie+2054d253 AT codemages.net>
Commit: Andraž Levstik <ruskie+2054d253 AT codemages.net>

mesalib: updated for glselect

commit 2ca47f3bef7128e400da07599b88a17fe08a1bc9
Author: Andraž Levstik <ruskie+2054d253 AT codemages.net>
Commit: Andraž Levstik <ruskie+2054d253 AT codemages.net>

glselect.function: updated for xorg stupidity

diff --git a/ChangeLog b/ChangeLog
index 7192c6f..0a560c4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2010-11-12 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
+ * glselect.function: fixes for stupid xorg
+
2010-11-10 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
* utils/taskwarrior: new spell, command line tasks manager

diff --git a/glselect.function b/glselect.function
index 00690b8..b2dddd5 100755
--- a/glselect.function
+++ b/glselect.function
@@ -23,15 +23,15 @@ function glselect(){
/usr/include/GL/glxext.h
"
local dir_list=( \
- "/usr/lib/ati" \
- "/usr/lib/nvidia" \
- "/usr/lib/mesa" \
- "/usr/include/GL/ati" \
- "/usr/include/GL/nvidia" \
- "/usr/include/GL/mesa" \
- "/usr/lib/xorg/modules/extensions/ati" \
- "/usr/lib/xorg/modules/extensions/nvidia" \
- "/usr/lib/xorg/modules/extensions/mesa" \
+ "/usr/lib/.ati" \
+ "/usr/lib/.nvidia" \
+ "/usr/lib/.mesa" \
+ "/usr/include/GL/.ati" \
+ "/usr/include/GL/.nvidia" \
+ "/usr/include/GL/.mesa" \
+ "/usr/lib/xorg/modules/extensions/.ati" \
+ "/usr/lib/xorg/modules/extensions/.nvidia" \
+ "/usr/lib/xorg/modules/extensions/.mesa" \
)
local rm_file orig_dir
local gl_lib=$1
@@ -95,9 +95,9 @@ nvidia)
message "You can manage the libGL providers at runtime by using"
message "either smgl-gl_select or manually by symlinking the files"
message "from their respective directories i.e.:"
- message "/usr/lib/[nvidia|ati|mesa]/libGL.so"
- message
"/usr/lib/xorg/modules/extensions/[nvidia,ati,mesa]/lib{glx,dri}.so"
- message "/usr/include/GL/[nvidia|ati|mesa]/gl{x,xext,ext}.h"
+ message "/usr/lib/.[nvidia|ati|mesa]/libGL.so"
+ message
"/usr/lib/xorg/modules/extensions/.[nvidia,ati,mesa]/lib{glx,dri}.so"
+ message "/usr/include/GL/.[nvidia|ati|mesa]/gl{x,xext,ext}.h"
message ""
message "To:"
message "/usr/lib/libGL.so"
diff --git a/graphics-libs/mesalib/HISTORY b/graphics-libs/mesalib/HISTORY
index 07c8b32..a484577 100644
--- a/graphics-libs/mesalib/HISTORY
+++ b/graphics-libs/mesalib/HISTORY
@@ -1,3 +1,7 @@
+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)

diff --git a/graphics-libs/mesalib/gl_select-scm.patch
b/graphics-libs/mesalib/gl_select-scm.patch
index c770e9b..197fb31 100644
--- a/graphics-libs/mesalib/gl_select-scm.patch
+++ b/graphics-libs/mesalib/gl_select-scm.patch
@@ -5,15 +5,15 @@ diff -Naur ./mesalib-git.orig/src/mesa/Makefile
mesalib-git/src/mesa/Makefile

install-headers:
$(INSTALL) -d $(DESTDIR)$(INSTALL_INC_DIR)/GL
-+ $(INSTALL) -d $(DESTDIR)$(INSTALL_INC_DIR)/GL/mesa
++ $(INSTALL) -d $(DESTDIR)$(INSTALL_INC_DIR)/GL/.mesa
+ $(INSTALL) -m 644 $(TOP)/include/GL/gl.h \
-+ $(DESTDIR)$(INSTALL_INC_DIR)/GL/mesa/
++ $(DESTDIR)$(INSTALL_INC_DIR)/GL/.mesa/
+ $(INSTALL) -m 644 $(TOP)/include/GL/glx.h \
-+ $(DESTDIR)$(INSTALL_INC_DIR)/GL/mesa/
++ $(DESTDIR)$(INSTALL_INC_DIR)/GL/.mesa/
+ $(INSTALL) -m 644 $(TOP)/include/GL/glxext.h \
-+ $(DESTDIR)$(INSTALL_INC_DIR)/GL/mesa/
++ $(DESTDIR)$(INSTALL_INC_DIR)/GL/.mesa/
+ $(INSTALL) -m 644 $(TOP)/include/GL/glext.h \
-+ $(DESTDIR)$(INSTALL_INC_DIR)/GL/mesa/
++ $(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/
@@ -25,11 +25,11 @@ diff -Naur ./mesalib-git.orig/src/mesa/Makefile
mesalib-git/src/mesa/Makefile

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)/.mesa
$(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig
$(MINSTALL) $(TOP)/$(LIB_DIR)/$(GL_LIB_GLOB) \
- $(DESTDIR)$(INSTALL_LIB_DIR)
-+ $(DESTDIR)$(INSTALL_LIB_DIR)/mesa
++ $(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
index ff9bcfd..c03b041 100644
--- a/graphics-libs/mesalib/gl_select.patch
+++ b/graphics-libs/mesalib/gl_select.patch
@@ -5,15 +5,15 @@ diff -Nuar Mesa-7.3.orig/src/mesa/Makefile
Mesa-7.3/src/mesa/Makefile

install-headers:
$(INSTALL) -d $(DESTDIR)$(INSTALL_INC_DIR)/GL
-+ $(INSTALL) -d $(DESTDIR)$(INSTALL_INC_DIR)/GL/mesa
++ $(INSTALL) -d $(DESTDIR)$(INSTALL_INC_DIR)/GL/.mesa
+ $(INSTALL) -m 644 $(TOP)/include/GL/gl.h \
-+ $(DESTDIR)$(INSTALL_INC_DIR)/GL/mesa/
++ $(DESTDIR)$(INSTALL_INC_DIR)/GL/.mesa/
+ $(INSTALL) -m 644 $(TOP)/include/GL/glx.h \
-+ $(DESTDIR)$(INSTALL_INC_DIR)/GL/mesa/
++ $(DESTDIR)$(INSTALL_INC_DIR)/GL/.mesa/
+ $(INSTALL) -m 644 $(TOP)/include/GL/glxext.h \
-+ $(DESTDIR)$(INSTALL_INC_DIR)/GL/mesa/
++ $(DESTDIR)$(INSTALL_INC_DIR)/GL/.mesa/
+ $(INSTALL) -m 644 $(TOP)/include/GL/glext.h \
-+ $(DESTDIR)$(INSTALL_INC_DIR)/GL/mesa/
++ $(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/
@@ -25,11 +25,11 @@ diff -Nuar Mesa-7.3.orig/src/mesa/Makefile
Mesa-7.3/src/mesa/Makefile

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)/.mesa
$(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig
$(INSTALL) $(TOP)/$(LIB_DIR)/$(GL_LIB_GLOB) \
- $(DESTDIR)$(INSTALL_LIB_DIR)
-+ $(DESTDIR)$(INSTALL_LIB_DIR)/mesa/
++ $(DESTDIR)$(INSTALL_LIB_DIR)/.mesa/
$(INSTALL) -m 644 gl.pc $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig

install-osmesa: default osmesa.pc
diff --git a/smgl/smgl-gl_select/DETAILS b/smgl/smgl-gl_select/DETAILS
index 8a99f67..a9439df 100755
--- a/smgl/smgl-gl_select/DETAILS
+++ b/smgl/smgl-gl_select/DETAILS
@@ -1,5 +1,5 @@
SPELL=smgl-gl_select
- VERSION=2.0.2
+ VERSION=2.0.3
WEB_SITE=http://www.sourcemage.org
ENTERED=20061014
LICENSE[0]=GPL
diff --git a/smgl/smgl-gl_select/HISTORY b/smgl/smgl-gl_select/HISTORY
index cb19238..038b721 100644
--- a/smgl/smgl-gl_select/HISTORY
+++ b/smgl/smgl-gl_select/HISTORY
@@ -1,3 +1,7 @@
+2010-11-12 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
+ * DETAILS: updated to 2.0.3
+ * smgl-gl_select: fixes for stupid xorg
+
2010-08-04 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 2.0.2
* smgl-gl_select: corrected path in messages
diff --git a/smgl/smgl-gl_select/smgl-gl_select
b/smgl/smgl-gl_select/smgl-gl_select
index f83dda7..dc064b2 100755
--- a/smgl/smgl-gl_select/smgl-gl_select
+++ b/smgl/smgl-gl_select/smgl-gl_select
@@ -7,7 +7,7 @@
# Point - bugfixes/filelist changes and so on
#
GL_SELECT_VERSION="2.0.1"
-GL_LIBS="$(ls ${TRACK_ROOT}/usr/lib/*/libGL.so | awk -F"/" '{print $4}' 2>
/dev/null )"
+GL_LIBS="$(ls ${TRACK_ROOT}/usr/lib/.{mesa,nvidia,ati}/libGL.so | awk -F"/"
'{print $4}' 2> /dev/null )"
. /etc/sysconfig/gl_select

. /var/lib/sorcery/modules/libmedia
@@ -18,8 +18,8 @@ function message() {

function gl_list() {
message "Available GL Libraries on the system"
- ls -1 --color=none ${TRACK_ROOT}/usr/lib/*/libGL.so \
- | awk -F"/" '{print $4}' 2> /dev/null
+ ls -1 --color=none ${TRACK_ROOT}/usr/lib/.{mesa,nvidia,ati}/libGL.so \
+ | awk -F"/" '{print $4}' | sed -e "s:\.::" 2> /dev/null
exit 0
}

@@ -38,15 +38,15 @@ function gl_pick() {
/usr/include/GL/glxext.h
"
local dir_list=( \
- "/usr/lib/ati" \
- "/usr/lib/nvidia" \
- "/usr/lib/mesa" \
- "/usr/include/GL/ati" \
- "/usr/include/GL/nvidia" \
- "/usr/include/GL/mesa" \
- "/usr/lib/xorg/modules/extensions/ati" \
- "/usr/lib/xorg/modules/extensions/nvidia" \
- "/usr/lib/xorg/modules/extensions/mesa" \
+ "/usr/lib/.ati" \
+ "/usr/lib/.nvidia" \
+ "/usr/lib/.mesa" \
+ "/usr/include/GL/.ati" \
+ "/usr/include/GL/.nvidia" \
+ "/usr/include/GL/.mesa" \
+ "/usr/lib/xorg/modules/extensions/.ati" \
+ "/usr/lib/xorg/modules/extensions/.nvidia" \
+ "/usr/lib/xorg/modules/extensions/.mesa" \
)
local rm_file orig_dir
local gl_lib=$1
@@ -110,9 +110,9 @@ nvidia)
message "You can manage the libGL providers at runtime by using"
message "either smgl-gl_select or manually by symlinking the files"
message "from their respective directories i.e.:"
- message "/usr/lib/[nvidia|ati|mesa]/libGL.so"
- message
"/usr/lib/xorg/modules/extensions/[nvidia,ati,mesa]/lib{glx,dri}.so"
- message "/usr/include/GL/[nvidia|ati|mesa]/gl{x,xext,ext}.h"
+ message "/usr/lib/.[nvidia|ati|mesa]/libGL.so"
+ message
"/usr/lib/xorg/modules/extensions/.[nvidia,ati,mesa]/lib{glx,dri}.so"
+ message "/usr/include/GL/.[nvidia|ati|mesa]/gl{x,xext,ext}.h"
message ""
message "To:"
message "/usr/lib/libGL.so"
diff --git a/xorg-xserver/xorg-server/HISTORY
b/xorg-xserver/xorg-server/HISTORY
index 0a6a9d6..67df5f7 100644
--- a/xorg-xserver/xorg-server/HISTORY
+++ b/xorg-xserver/xorg-server/HISTORY
@@ -1,3 +1,6 @@
+2010-11-12 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
+ * gl_select.patch: updated for glselect
+
2010-10-18 Ladislav Hagara <hgr AT vabo.cz>
* DEPENDS: removed xf86-video-i810 (has been removed form test
already)

diff --git a/xorg-xserver/xorg-server/gl_select.patch
b/xorg-xserver/xorg-server/gl_select.patch
index db24e5c..6dd4a59 100755
--- a/xorg-xserver/xorg-server/gl_select.patch
+++ b/xorg-xserver/xorg-server/gl_select.patch
@@ -15,12 +15,12 @@ diff -Nuar hw.orig/xfree86/dixmods/Makefile.in
hw/xfree86/dixmods/Makefile.in
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-extsmoduleLTLIBRARIES: $(extsmodule_LTLIBRARIES)
@$(NORMAL_INSTALL)
-+ $(mkdir_p) "$(DESTDIR)$(extsmoduledir)/mesa"
++ $(mkdir_p) "$(DESTDIR)$(extsmoduledir)/.mesa"
+ @lst='$(GLXMODS)'; for r in $$lst; do \
+ if test -f $$r; then \
+ h=$(am__strip_dir) \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS)
--mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) '$$r'
'$(DESTDIR)$(extsmoduledir)/mesa/'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install
$(INSTALL) $(INSTALL_STRIP_FLAG) $$r "$(DESTDIR)$(extsmoduledir)/mesa/"; \
++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS)
--mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) '$$r'
'$(DESTDIR)$(extsmoduledir)/.mesa/'"; \
++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install
$(INSTALL) $(INSTALL_STRIP_FLAG) $$r "$(DESTDIR)$(extsmoduledir)/.mesa/"; \
+ else :; fi; \
+ done
test -z "$(extsmoduledir)" || $(MKDIR_P) "$(DESTDIR)$(extsmoduledir)"
@@ -43,7 +43,7 @@ diff -Nuar hw.orig/xfree86/dri/Makefile.in
hw/xfree86/dri/Makefile.in

libdri_la_LDFLAGS = -module -avoid-version @LIBDRM_LIBS@
-libdri_ladir = $(moduledir)/extensions
-+libdri_ladir = $(moduledir)/extensions/mesa
++libdri_ladir = $(moduledir)/extensions/.mesa
libdri_la_SOURCES = \
dri.c \
dri.h \



  • [SM-Commit] GIT changes to master grimoire by Andraž Levstik (4a36a3d4fc335b8034e578e4d79b1369e84e7891), Andraž Levstik, 11/12/2010

Archive powered by MHonArc 2.6.24.

Top of Page