Skip to Content.
Sympa Menu

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

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 (fa074fb4c7731dc75963030cc37bf0c512952895)
  • Date: Sat, 10 Nov 2007 12:49:15 -0600

GIT changes to master grimoire by Andraž Levstik <ruskie AT mages.ath.cx>:

graphics-libs/mesalib/DEPENDS | 23 ++++++++++++++---------
graphics-libs/mesalib/DETAILS | 5 ++---
graphics-libs/mesalib/HISTORY | 7 +++++++
graphics-libs/mesalib/INSTALL | 35 ++++++++++++++++++-----------------
graphics-libs/mesalib/PRE_BUILD | 6 ++----
graphics-libs/mesalib/glw.pc.in | 11 +++++++++++
6 files changed, 54 insertions(+), 33 deletions(-)

New commits:
commit fa074fb4c7731dc75963030cc37bf0c512952895
Author: Andraž Levstik <ruskie AT mages.ath.cx>
Commit: Andraž Levstik <ruskie AT mages.ath.cx>

mesalib: update to 7.0.2

diff --git a/graphics-libs/mesalib/DEPENDS b/graphics-libs/mesalib/DEPENDS
index fc66d3d..946a717 100755
--- a/graphics-libs/mesalib/DEPENDS
+++ b/graphics-libs/mesalib/DEPENDS
@@ -1,12 +1,17 @@
-depends libdrm &&
-depends xorg-utils &&
-depends expat &&
-depends libxdamage &&
-depends libx11 &&
-depends libxext &&
-depends libxxf86vm &&
-depends libxau &&
-depends libxfixes
+depends libdrm &&
+depends util-macros &&
+depends gccmakedep &&
+depends lndir &&
+depends xorg-cf-files &&
+depends imake &&
+depends makedepend &&
+depends expat &&
+depends libxdamage &&
+depends libx11 &&
+depends libxext &&
+depends libxxf86vm &&
+depends libxau &&
+depends libxfixes &&
if [[ "$MESALIB_GIT" == "y" ]]; then
depends git
fi
diff --git a/graphics-libs/mesalib/DETAILS b/graphics-libs/mesalib/DETAILS
index 640dc95..690aae3 100755
--- a/graphics-libs/mesalib/DETAILS
+++ b/graphics-libs/mesalib/DETAILS
@@ -11,12 +11,11 @@ SOURCE_DIRECTORY=${BUILD_DIRECTORY}/mesalib-git
SOURCE_URL[0]=git://anongit.freedesktop.org/git/mesa/mesa:mesalib-git
SOURCE_IGNORE=volatile
else
- VERSION=7.0.1
+ VERSION=7.0.2
SOURCE=MesaLib-${VERSION}.tar.bz2
SOURCE_URL[0]=${SOURCEFORGE_URL}/mesa3d/${SOURCE}
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/Mesa-${VERSION}
-
SOURCE_HASH=sha512:c2e55416af82261ca19ed580bf2451a62160d11fe4c6c81a600dfac148e82505593bfe0a0f5fef6d66af91a40b824354fa9a586ac22c8508425a21be58ad9b7c
- PATCHLEVEL=0
+
SOURCE_HASH=sha512:a69707bc16e0580d7ab7b45ff77d61c8209657545751a3cf2ad2b2e4edd1a153a2bb4c629d276636d3ee4d9d79c71f435f536bc07e7ef44e481816a1ab0b3dc7
fi
LICENSE[0]=GPL
WEB_SITE=http://mesa3d.sourceforge.net/
diff --git a/graphics-libs/mesalib/HISTORY b/graphics-libs/mesalib/HISTORY
index 803d3e2..bd293f2 100644
--- a/graphics-libs/mesalib/HISTORY
+++ b/graphics-libs/mesalib/HISTORY
@@ -1,3 +1,10 @@
+2007-11-10 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DETAILS: updated spell to 7.0.2
+ * INSTALL: using make install now
+ * DEPENDS: split up the xorg-utils into their separate components
+ * glw.pc.in: missing from 7.0.2 tarball
+ * PRE_BUILD: copy the missing file over, drop xorg-utils stuff
+
2007-09-30 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
* DEPENDS: lock in to -modular only

diff --git a/graphics-libs/mesalib/INSTALL b/graphics-libs/mesalib/INSTALL
index e3cfda4..dea107d 100755
--- a/graphics-libs/mesalib/INSTALL
+++ b/graphics-libs/mesalib/INSTALL
@@ -1,17 +1,18 @@
-mkdir -p ${INSTALL_ROOT}/usr/include/GL &&
-mkdir -p ${INSTALL_ROOT}/usr/include/GLES &&
-mkdir -p ${INSTALL_ROOT}/usr/lib/modules/dri &&
-mv -fv ${SOURCE_DIRECTORY}/include/GL/*.h ${INSTALL_ROOT}/usr/include/GL &&
-## NOT YET: cp -f ${TOP}/include/GLES/*.h ${INCLUDE_DIR}/GLES &&
-local base_lib_dir=lib
-if [[ "${SMGL_COMPAT_ARCHS[1]}" == "x86_64" ]]
-then
-base_lib_dir=lib64
-fi
-if grep -q dri <<< "$MESALIB_BUILD"
-then
-mv -fv ${SOURCE_DIRECTORY}/$base_lib_dir/*_dri*
${INSTALL_ROOT}/usr/lib/modules/dri &&
-ln -s ${INSTALL_ROOT}/usr/lib/modules/dri ${INSTALL_ROOT}/usr/lib/dri
-fi &&
-mv -fv ${SOURCE_DIRECTORY}/$base_lib_dir/* ${INSTALL_ROOT}/usr/lib
-
+#mkdir -p ${INSTALL_ROOT}/usr/include/GL
&&
+#mkdir -p ${INSTALL_ROOT}/usr/include/GLES
&&
+#mkdir -p ${INSTALL_ROOT}/usr/lib/modules/dri
&&
+#mv -fv ${SOURCE_DIRECTORY}/include/GL/*.h ${INSTALL_ROOT}/usr/include/GL
&&
+### NOT YET: cp -f ${TOP}/include/GLES/*.h ${INCLUDE_DIR}/GLES
&&
+#local base_lib_dir=lib
+#if [[ "${SMGL_COMPAT_ARCHS[1]}" == "x86_64" ]]
+#then
+#base_lib_dir=lib64
+#fi
+#if grep -q dri <<< "$MESALIB_BUILD"
+#then
+#mv -fv ${SOURCE_DIRECTORY}/$base_lib_dir/*_dri*
${INSTALL_ROOT}/usr/lib/modules/dri &&
+#ln -s ${INSTALL_ROOT}/usr/lib/modules/dri ${INSTALL_ROOT}/usr/lib/dri
+#fi
&&
+#mv -fv ${SOURCE_DIRECTORY}/$base_lib_dir/* ${INSTALL_ROOT}/usr/lib
+#
+default_install
diff --git a/graphics-libs/mesalib/PRE_BUILD b/graphics-libs/mesalib/PRE_BUILD
index 9fb0956..0e23739 100755
--- a/graphics-libs/mesalib/PRE_BUILD
+++ b/graphics-libs/mesalib/PRE_BUILD
@@ -1,4 +1,6 @@
default_pre_build &&
+# missing file in 7.0.2 release tarball
+cp $SPELL_DIRECTORY/glw.pc.in $SOURCE_DIRECTORY/src/glw/ &&
cd ${SOURCE_DIRECTORY}/configs &&
sedit "s:/usr/local:/usr:g" default &&

@@ -7,9 +9,6 @@ then
sedit "/^DRI_DIRS/ { N; s/.*/DRI_DIRS = $MESALIB_DRIVERS/ }"
$SOURCE_DIRECTORY/configs/linux-dri
sedit "/^DRI_DIRS/ { N; s/.*/DRI_DIRS = $MESALIB_DRIVERS/ }"
$SOURCE_DIRECTORY/configs/linux-dri-x86-64
fi &&
-
-if [[ "$(get_spell_provider $SPELL X11-UTILS)" == "xorg-utils" ]]
-then
sedit "s:MKDEP = /usr/X11R6:MKDEP = /usr/:g" linux-dri &&
sedit "s:MKDEP = /usr/X11R6:MKDEP = /usr/:g" linux-indirect &&
sedit "s:/X11R6::g" linux-dri &&
@@ -23,4 +22,3 @@ cd ${SOURCE_DIRECTORY}/src/glx/x11
&&
sedit "s:/X11R6::g" dri_glx.c &&
cd ${SOURCE_DIRECTORY}/src/glw &&
sedit "s:/X11R6::g" Makefile
-fi
diff --git a/graphics-libs/mesalib/glw.pc.in b/graphics-libs/mesalib/glw.pc.in
new file mode 100644
index 0000000..951e2dc
--- /dev/null
+++ b/graphics-libs/mesalib/glw.pc.in
@@ -0,0 +1,11 @@
+prefix=@INSTALL_DIR@
+exec_prefix=${prefix}
+libdir=${exec_prefix}/@LIB_DIR@
+includedir=${prefix}/include
+
+Name: glw
+Description: Mesa OpenGL widget library
+Requires: gl
+Version: @VERSION@
+Libs: -L${libdir} -lGLU
+Cflags: -I${includedir}



  • [SM-Commit] GIT changes to master grimoire by Andraž Levstik (fa074fb4c7731dc75963030cc37bf0c512952895), Andraž Levstik, 11/10/2007

Archive powered by MHonArc 2.6.24.

Top of Page