Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Vasil Yonkov (9f6ce4f09eb1530cd8ae48cc9b6fd41fba2e1423)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Vasil Yonkov (9f6ce4f09eb1530cd8ae48cc9b6fd41fba2e1423)

Chronological Thread  
    < Chronological >       < Thread >
  • From: Vasil Yonkov <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Vasil Yonkov (9f6ce4f09eb1530cd8ae48cc9b6fd41fba2e1423)
  • Date: Tue, 5 Oct 2010 09:47:52 -0500
GIT changes to master grimoire by Vasil Yonkov <spirtbrat AT sourcemage.org>:

dev/null |binary
graphics-libs/mesalib/BUILD | 17 +-----
graphics-libs/mesalib/CONFIGURE | 68
++++--------------------
graphics-libs/mesalib/DEPENDS | 32 ++---------
graphics-libs/mesalib/DETAILS | 6 +-
graphics-libs/mesalib/HISTORY | 9 ---
graphics-libs/mesalib/MesaLib-7.5.2.tar.bz2.sig |binary
graphics-libs/mesalib/MesaLib-7.9.tar.bz2.sig | 0
graphics-libs/mesalib/PREPARE | 4 -
graphics-libs/mesalib/PRE_BUILD | 6 +-
graphics-libs/mesalib/gl_select-scm.patch | 35 ++++++++++++
graphics-libs/mesalib/gl_select.patch | 13 ++--
utils/avahi/DEPENDS | 3 -
utils/avahi/HISTORY | 3 -
14 files changed, 78 insertions(+), 118 deletions(-)

New commits:
commit 9f6ce4f09eb1530cd8ae48cc9b6fd41fba2e1423
Author: Vasil Yonkov <spirtbrat AT sourcemage.org>
Commit: Vasil Yonkov <spirtbrat AT sourcemage.org>

Revert "mesalib: stable => 7.7.1, feature => 7.8.2, developement => 7.9;"

This reverts commit 5d61a4e070be6b8ce3f0ae9eeeb37cdf72666c3f.

commit 2514fc8170ce04f6395c51b4ade203205dc68fde
Author: Vasil Yonkov <spirtbrat AT sourcemage.org>
Commit: Vasil Yonkov <spirtbrat AT sourcemage.org>

Revert "avahi: libdaemon is not optional"

This reverts commit 96981f54e1f536844ac1c1733a40ed52bdd0cd74.

diff --git a/graphics-libs/mesalib/BUILD b/graphics-libs/mesalib/BUILD
index a99cb49..6bffb44 100755
--- a/graphics-libs/mesalib/BUILD
+++ b/graphics-libs/mesalib/BUILD
@@ -1,20 +1,13 @@
local MESALIB_DRIVERS_CONF="${MESALIB_DRIVERS//\ /,}" &&

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" ;;
- r600) OPTS="${OPTS} --enable-gallium-r600" ;;
- nouveau) OPTS="${OPTS} --enable-gallium-nouveau" ;;
- swrast) OPTS="${OPTS} --enable-gallium-swrast" ;;
- none) OPTS="${OPTS} --disable-gallium" ;;
+ none) OPTS="${OPTS} --disable-gallium" ;;
+ intel) OPTS="${OPTS} --enable-gallium-intel" ;;
+ radeon) OPTS="${OPTS} --enable-gallium-radeon --disable-gallium-intel" ;;
+ nouveau) OPTS="${OPTS} --enable-gallium-nouveau --disable-gallium-intel" ;;
+ all) OPTS="${OPTS} --enable-gallium-intel --enable-gallium-radeon
--enable-gallium-nouveau" ;;
esac &&
-
OPTS="--with-driver=$MESALIB_BUILD \
--with-dri-drivers=$MESALIB_DRIVERS_CONF \
- $MESALIB_OPTS \
$OPTS" &&
default_build
diff --git a/graphics-libs/mesalib/CONFIGURE b/graphics-libs/mesalib/CONFIGURE
index 0bae706..9059a41 100755
--- a/graphics-libs/mesalib/CONFIGURE
+++ b/graphics-libs/mesalib/CONFIGURE
@@ -31,17 +31,20 @@ config_query_list MESALIB_BUILD
\
xlib \
dri \
osmesa &&
-
if [[ $MESALIB_BUILD == dri ]]; then
- AVAILABLE_DRIVERS="i915 i965 mach64 mga r128 r200 r300 r600 radeon \
- savage tdfx unichrome swrast" &&
-
+ if [[ "$MESALIB_VER" == "stable" ]]; then
+ AVAILABLE_DRIVERS="i810 i915 i965 mach64 mga r128 r200 r300 radeon s3v
savage sis tdfx trident unichrome ffb swrast"
+ elif [[ "$MESALIB_VER" == "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="i810 i915 i965 mach64 mga nouveau r128 r200 r300 r600
radeon s3v savage sis tdfx trident unichrome ffb swrast"
+ fi
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"
+ $AVAILABLE_DRIVERS &&
+ if list_find "$MESALIB_DRIVERS" all
+ then
+ MESALIB_DRIVERS="$AVAILABLE_DRIVERS"
fi
fi &&

@@ -49,53 +52,8 @@ if [[ $MESALIB_BUILD == xlib ]]; then
config_query_multi MESALIB_DRIVERS \
"What drivers would you like to build?" \
swrast
+fi &&

-if [[ "$MESALIB_VER" == "stable" ]]; then
-config_query_multi MESALIB_GALLIUM \
- "What Gallium3D drivers woulld you like to build?" \
- none svga intel radeon nouveau
-
-elif [[ "$MESALIB_VER" == "feature" ]]; then
-config_query_multi MESALIB_GALLIUM \
- "What Gallium3D drivers woulld you like to build?" \
- none svga intel radeon nouveau swrast
-
-elif [[ "$MESALIB_VER" == "developement" ]]; then
config_query_multi MESALIB_GALLIUM \
"What Gallium3D drivers woulld you like to build?" \
- none llvm svga i915 i965 radeon r600 nouveau swrast
-
-fi
-fi &&
-
-config_query_option MESALIB_OPTS "enable TLS support in GLX" n \
- "--enable-glx-tls" "--disable-glx-tls" &&
-
-config_query_option MESALIB_OPTS "enable EGL library?" y \
- "--enable-egl" "--disable-egl" &&
-
-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" &&
-
-# config_query_option MESALIB_OPTS "enable GLUT library" y \
-# "--enable-glut" "--disable-glut"
-
-if [[ "$MESALIB_VER" == "developement" ]] || \
- [[ "$MESALIB_VER" == "git" ]]; then
-
-config_query_option MESALIB_OPTS "enable support for OpenGL ES 1.x API?" n \
- "--enable-gles1" "--disable-gles1" &&
-
-config_query_option MESALIB_OPTS "enable support for OpenGL ES 2.x API?" n \
- "--enable-gles2" "--disable-gles2" &&
-
-if ( list_find "--enable-gles1" $MESALIB_OPTS ) || \
- ( list_find "--enable-gles2" $MESALIB_OPTS ); then
-config_query_option MESALIB_OPTS "build separate OpenGL ES only libraries?"
n \
- "--enable-gles-overlay" "--disable-gles-overlay"
-fi
-
-fi
+ none intel radeon nouveau all
diff --git a/graphics-libs/mesalib/DEPENDS b/graphics-libs/mesalib/DEPENDS
index e370466..88ad890 100755
--- a/graphics-libs/mesalib/DEPENDS
+++ b/graphics-libs/mesalib/DEPENDS
@@ -1,23 +1,19 @@
depends dri2proto &&
depends libdrm &&
-depends expat &&
-depends libxdamage &&
-depends libx11 &&
-depends libxext &&
-depends libxfixes &&
-depends glproto &&
-
depends util-macros &&
depends gccmakedep &&
depends lndir &&
depends xorg-cf-files &&
depends makedepend &&
+depends expat &&
+depends libxdamage &&
+depends libx11 &&
+depends libxext &&
depends libxxf86vm &&
+depends libxt &&
depends libxau &&
-
-if list_find "--enable-glw" $MESALIB_OPTS; then
- depends libxt
-fi &&
+depends libxfixes &&
+depends glproto &&

optional_depends libxcb \
'--enable-xcb' \
@@ -32,20 +28,6 @@ if spell_ok libdrm && [[ $(installed_version libdrm|sed
's:\.::g') -lt 243 ]]; t
force_depends libdrm
fi &&

-if ( list_find "i915" $MESALIB_DRIVERS ) || \
- ( list_find "i965" $MESALIB_DRIVERS ); then
- sub_depends libdrm INTEL
-fi &&
-
-if ( list_find "r200" $MESALIB_DRIVERS ) || \
- ( list_find "r300" $MESALIB_DRIVERS ) || \
- ( list_find "r600" $MESALIB_DRIVERS ); then
- sub_depends libdrm RADEON
-fi &&
-
-if [[ $MESALIB_VER == "developement" ]]; then
- depends talloc
-fi &&

if [[ $MESALIB_VER == "git" ]]; then
depends git &&
diff --git a/graphics-libs/mesalib/DETAILS b/graphics-libs/mesalib/DETAILS
index 4846499..562cb53 100755
--- a/graphics-libs/mesalib/DETAILS
+++ b/graphics-libs/mesalib/DETAILS
@@ -18,13 +18,13 @@ fi

case $MESALIB_VER in
stable)
- VERSION=7.7.1
+ VERSION=7.5.2
;;
feature)
- VERSION=7.8.2
+ VERSION=7.7.1
;;
developement)
- VERSION=7.9
+ VERSION=7.8.2
;;
git)
if [[ "$MESALIB_GIT_AUTOUPDATE" == "y" ]]; then
diff --git a/graphics-libs/mesalib/HISTORY b/graphics-libs/mesalib/HISTORY
index a75e19d..88bfe06 100644
--- a/graphics-libs/mesalib/HISTORY
+++ b/graphics-libs/mesalib/HISTORY
@@ -1,12 +1,3 @@
-2010-10-05 Vasil Yonkov <spirtbrat AT sourcemage.org>
- * DETAILS: stable => 7.7.1, feature => 7.8.2, developement => 7.9;
- 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;
- PREPARE: now using only gl_select-scm.patch
- mv gl_select-scm gl_select
-
2010-09-14 Pol Vinogradov <vin.public AT gmail.com>
* PRE_BUILD: removed link creation for git branch

diff --git a/graphics-libs/mesalib/MesaLib-7.5.2.tar.bz2.sig
b/graphics-libs/mesalib/MesaLib-7.5.2.tar.bz2.sig
new file mode 100644
index 0000000..a4e40dd
Binary files /dev/null and b/graphics-libs/mesalib/MesaLib-7.5.2.tar.bz2.sig
differ
diff --git a/graphics-libs/mesalib/MesaLib-7.9.tar.bz2.sig
b/graphics-libs/mesalib/MesaLib-7.9.tar.bz2.sig
deleted file mode 100644
index e8a2a73..0000000
Binary files a/graphics-libs/mesalib/MesaLib-7.9.tar.bz2.sig and /dev/null
differ
diff --git a/graphics-libs/mesalib/PREPARE b/graphics-libs/mesalib/PREPARE
index 9216781..efdb8ea 100755
--- a/graphics-libs/mesalib/PREPARE
+++ b/graphics-libs/mesalib/PREPARE
@@ -15,8 +15,8 @@ fi
###

config_query_list MESALIB_VER "Which version would you like to build?" \
- stable \
- feature \
+ stable \
+ feature \
developement \
git &&

diff --git a/graphics-libs/mesalib/PRE_BUILD b/graphics-libs/mesalib/PRE_BUILD
index 3660e50..01b02eb 100755
--- a/graphics-libs/mesalib/PRE_BUILD
+++ b/graphics-libs/mesalib/PRE_BUILD
@@ -1,7 +1,11 @@
default_pre_build &&
cd ${SOURCE_DIRECTORY} &&
-patch -p1 < $SPELL_DIRECTORY/gl_select.patch &&
+if [[ "$MESALIB_VER" == "stable" ]]; then
+ patch -p1 < $SPELL_DIRECTORY/gl_select.patch
+else
+ patch -p1 < $SPELL_DIRECTORY/gl_select-scm.patch

+fi &&
cd ${SOURCE_DIRECTORY}/configs &&
sedit "s:/usr/local:/usr:g" default &&

diff --git a/graphics-libs/mesalib/gl_select-scm.patch
b/graphics-libs/mesalib/gl_select-scm.patch
new file mode 100644
index 0000000..c770e9b
--- /dev/null
+++ b/graphics-libs/mesalib/gl_select-scm.patch
@@ -0,0 +1,35 @@
+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
index c770e9b..ff9bcfd 100644
--- a/graphics-libs/mesalib/gl_select.patch
+++ b/graphics-libs/mesalib/gl_select.patch
@@ -1,7 +1,7 @@
-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 @@
+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
@@ -27,9 +27,10 @@ diff -Naur ./mesalib-git.orig/src/mesa/Makefile
mesalib-git/src/mesa/Makefile
$(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) \
+ $(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/utils/avahi/DEPENDS b/utils/avahi/DEPENDS
index 9cae00f..666a751 100755
--- a/utils/avahi/DEPENDS
+++ b/utils/avahi/DEPENDS
@@ -31,8 +31,6 @@ if [[ "$AVAHI_DISCOVER" == 'y' ]]; then
depends libglade2
fi &&

-depends libdaemon --enable-libdaemon &&
-
# for the daemon it's technically optional, but that would make the spell
unreliable
if [[ "$AVAHI_DISCOVER" == 'y' ]] || [[ "$AVAHI_DAEMON" == 'y' ]] || \
[[ "$AVAHI_CLIENT" == 'y' ]] || [[ "$AVAHI_BOOKMARKS" == 'y' ]]; then
@@ -61,6 +59,7 @@ if [[ "$AVAHI_DISCOVER" == 'y' ]] && ( is_depends_enabled
$SPELL gdbm ); then
fi &&

if [[ "$AVAHI_DAEMON" == 'y' ]]; then
+ depends libdaemon --enable-libdaemon &&
depends expat --with-xml=expat &&
optional_depends libcap '' '' 'for chroot support'
fi &&
diff --git a/utils/avahi/HISTORY b/utils/avahi/HISTORY
index 2475335..fcbb270 100644
--- a/utils/avahi/HISTORY
+++ b/utils/avahi/HISTORY
@@ -1,6 +1,3 @@
-2010-10-04 Eric Sandall <sandalle AT sourcemage.org>
- * DEPENDS: libdaemon is not optional
-
2010-04-11 Ismael Luceno <ismael AT sourcemage.org>
* PRE_SUB_DEPENDS,
REPAIR^6dc6a5705994d7985da9e10dc00841d5^PRE_SUB_DEPENDS: Fixed


  • [SM-Commit] GIT changes to master grimoire by Vasil Yonkov (9f6ce4f09eb1530cd8ae48cc9b6fd41fba2e1423), Vasil Yonkov, 10/05/2010

Archive powered by MHonArc 2.6.24.

Top of Page