Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Arjan Bouter (3aeaecb7ef82e1db195fad30d79b48eff292412e)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Arjan Bouter <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Arjan Bouter (3aeaecb7ef82e1db195fad30d79b48eff292412e)
  • Date: Thu, 19 Aug 2010 14:07:45 -0500

GIT changes to master grimoire by Arjan Bouter <abouter AT sourcemage.org>:

graphics-libs/mesalib/DEPENDS | 3 ++-
graphics-libs/mesalib/HISTORY | 5 +++++
graphics-libs/mesalib/PRE_BUILD | 4 +++-
graphics-libs/mesalib/PROVIDES | 1 +
graphics-libs/mesalib/autogen.patch | 9 +++++++++
graphics/netpbm/HISTORY | 3 +++
graphics/netpbm/PRE_BUILD | 2 +-
7 files changed, 24 insertions(+), 3 deletions(-)

New commits:
commit d11a0e8ea841e2878fdcf023d95a7ef427c8c090
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

mesalib: small fixes for latest scm version

commit fcae7b8e4ca7d54c79ed5f4e12a0a43d933b4b63
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

netpbm: small filename change in the advanced version

diff --git a/graphics-libs/mesalib/DEPENDS b/graphics-libs/mesalib/DEPENDS
index 2eddbf2..88ad890 100755
--- a/graphics-libs/mesalib/DEPENDS
+++ b/graphics-libs/mesalib/DEPENDS
@@ -30,5 +30,6 @@ fi &&


if [[ $MESALIB_VER == "git" ]]; then
- depends git
+ depends git &&
+ depends talloc
fi
diff --git a/graphics-libs/mesalib/HISTORY b/graphics-libs/mesalib/HISTORY
index 51d7a41..16db081 100644
--- a/graphics-libs/mesalib/HISTORY
+++ b/graphics-libs/mesalib/HISTORY
@@ -1,3 +1,8 @@
+2010-08-19 Arjan Bouter <abouter AT sourcemage.org>
+ * PROVIDES: enabled GLUT again, see docs/glu.html
+ * DEPENDS: added talloc for the scm version
+ * PRE_BUILD, autogen.patch: fixed autogen.sh for scm version
+
2010-06-17 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 7.8.2 (development)

diff --git a/graphics-libs/mesalib/PRE_BUILD b/graphics-libs/mesalib/PRE_BUILD
index 7f30ea9..acf89c1 100755
--- a/graphics-libs/mesalib/PRE_BUILD
+++ b/graphics-libs/mesalib/PRE_BUILD
@@ -35,6 +35,8 @@ sedit "s:/X11R6::g" Makefile
&&

if [[ $MESALIB_VER == "git" ]]; then
cd "$SOURCE_DIRECTORY" &&
- sedit "/.*configure.*/d" autogen.sh &&
+ patch -p0 < "${SCRIPT_DIRECTORY}/autogen.patch" &&
./autogen.sh
+ cd bin &&
+ ln -s install-sh minstall
fi
diff --git a/graphics-libs/mesalib/PROVIDES b/graphics-libs/mesalib/PROVIDES
index 3fc56f6..3721e17 100755
--- a/graphics-libs/mesalib/PROVIDES
+++ b/graphics-libs/mesalib/PROVIDES
@@ -1 +1,2 @@
OPENGL
+GLUT
diff --git a/graphics-libs/mesalib/autogen.patch
b/graphics-libs/mesalib/autogen.patch
new file mode 100644
index 0000000..eb50e7f
--- /dev/null
+++ b/graphics-libs/mesalib/autogen.patch
@@ -0,0 +1,9 @@
+--- autogen.sh 2010-08-19 17:21:46.000000000 +0200
++++ autogen.sh-fixed 2010-08-19 18:14:37.332895438 +0200
+@@ -14,5 +14,4 @@
+ MAKEFLAGS=""
+
+ autoreconf -v --install || exit 1
+-
+-"$srcdir"/configure "$@"
++automake --add-missing
diff --git a/graphics/netpbm/HISTORY b/graphics/netpbm/HISTORY
index 1ce7655..0714186 100644
--- a/graphics/netpbm/HISTORY
+++ b/graphics/netpbm/HISTORY
@@ -1,3 +1,6 @@
+2010-08-18 Arjan Bouter <abouter AT sourcemage.org>
+ * PRE_BUILD: sedit conig.mk instead of Makefile.common for recent scm
version
+
2010-01-16 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* BUILD: use ln -sf for symlinking

diff --git a/graphics/netpbm/PRE_BUILD b/graphics/netpbm/PRE_BUILD
index 7be99a2..77b5d3c 100755
--- a/graphics/netpbm/PRE_BUILD
+++ b/graphics/netpbm/PRE_BUILD
@@ -12,5 +12,5 @@ sed -i "s:/link:/lib:g" lib/Makefile &&
if [[ $NETPBM_RELEASE != advanced ]] && [[ $NETPBM_RELEASE != trunk ]]; then
sed -i "s:misc:share/netpbm:;s:/man/:/share/man/:g" Makefile.common
elif [[ $NETPBM_RELEASE == advanced ]]; then
- sed -i "s:misc:share/netpbm:;s:PKGMANDIR = man:PKGMANDIR = share/man:g"
Makefile.common
+ sed -i "s:misc:share/netpbm:;s:PKGMANDIR = man:PKGMANDIR = share/man:g"
common.mk
fi



  • [SM-Commit] GIT changes to master grimoire by Arjan Bouter (3aeaecb7ef82e1db195fad30d79b48eff292412e), Arjan Bouter, 08/19/2010

Archive powered by MHonArc 2.6.24.

Top of Page