sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Eric Sandall (5fe6ae35ed20f9d2b52725eb31f6857586b214a7)

From: Eric Sandall <scm AT sourcemage.org>
To: sm-commit AT lists.ibiblio.org
Subject: [SM-Commit] GIT changes to master grimoire by Eric Sandall (5fe6ae35ed20f9d2b52725eb31f6857586b214a7)
Date: Fri, 31 May 2013 22:08:13 -0500

GIT changes to master grimoire by Eric Sandall <sandalle AT sourcemage.org>:

crypto/pinentry/DEPENDS | 36 ++++++++++++++++++++++--------------
crypto/pinentry/HISTORY | 6 ++++++
graphics-libs/mesalib/DEPENDS | 5 +++++
graphics-libs/mesalib/HISTORY | 3 +++
x11-libs/wine/DETAILS | 2 +-
x11-libs/wine/HISTORY | 3 +++
6 files changed, 40 insertions(+), 15 deletions(-)

New commits:
commit 5fe6ae35ed20f9d2b52725eb31f6857586b214a7
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

wine: Updated devel to 1.5.31

commit b8a847505ad663684f94b1ae24cd79c484ed8732
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

mesalib: GLUT functionality depends on libxmu and libxi (plus libx11)

checking for GLUT... no
configure: error: Package requirements (x11 xmu xi) were not met:

No package 'xmu' found

commit b0e5dc7cd1653e6db96ba84d9c6264e50f689039
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

pinentry: libx11 is optional (and the GUI toolkits are optional based on
this).
Need to explicitly disable X11 (and all the toolkits) to not fail
when libx11 is not installed.

diff --git a/crypto/pinentry/DEPENDS b/crypto/pinentry/DEPENDS
index 41b1e93..25d201a 100755
--- a/crypto/pinentry/DEPENDS
+++ b/crypto/pinentry/DEPENDS
@@ -1,15 +1,23 @@
depends pkgconfig &&
-optional_depends gtk+ \
- "" \
- "--disable-pinentry-gtk" \
- "to build GTK+ pinentry" &&
-
-optional_depends gtk+2 \
- "" \
- "--disable-pinentry-gtk2" \
- "to build GTK+2 pinentry" &&
-
-optional_depends qt4
\
- "--enable-pinentry-qt4" \
- "--disable-pinentry-qt4"
\
- "to build Qt4 pinentry"
+
+optional_depends libx11
\
+ "--with-x"
\
+ "--without-x --disable-pinentry-gtk --disable-pinentry-gtk2
--disable-pinentry-qt --disable-pinentry-qt4" \
+ "for X11 support (needed for GTK+/GTK+2/QT4 support)"
&&
+
+if is_depends_enabled "$SPELL" "libx11"; then
+ optional_depends gtk+ \
+ "" \
+ "--disable-pinentry-gtk" \
+ "to build GTK+ pinentry" &&
+
+ optional_depends gtk+2 \
+ "" \
+ "--disable-pinentry-gtk2" \
+ "to build GTK+2 pinentry" &&
+
+ optional_depends qt4 \
+ "--enable-pinentry-qt4" \
+ "--disable-pinentry-qt4" \
+ "to build Qt4 pinentry"
+fi
diff --git a/crypto/pinentry/HISTORY b/crypto/pinentry/HISTORY
index f3793a1..207d643 100644
--- a/crypto/pinentry/HISTORY
+++ b/crypto/pinentry/HISTORY
@@ -1,3 +1,9 @@
+2013-05-28 Eric Sandall <sandalle AT sourcemage.org>
+ * DEPENDS: libx11 is optional (and the GUI toolkits are optional based
+ upon this).
+ Need to explicitly disable X11 (and all the toolkits) to not fail
+ when libx11 is not installed.
+
2011-10-10 Bor Kraljič <pyrobor AT ver.si>
* DEPENDS: removed optional dependency on qt-x11

diff --git a/graphics-libs/mesalib/DEPENDS b/graphics-libs/mesalib/DEPENDS
index f63f9d7..0ece5f9 100755
--- a/graphics-libs/mesalib/DEPENDS
+++ b/graphics-libs/mesalib/DEPENDS
@@ -28,6 +28,11 @@ if list_find "$MESALIB_OPTS" "--enable-glu"; then
"--enable-glut" \
"--disable-glut" \
"to enable GLUT library"
+
+ if is_depends_enabled $SPELL $(get_spell_provider $SPELL GLUT) ; then
+ depends libxi &&
+ depends libxmu
+ fi
fi &&

optional_depends libxcb \
diff --git a/graphics-libs/mesalib/HISTORY b/graphics-libs/mesalib/HISTORY
index 37e5ac4..31cc51c 100644
--- a/graphics-libs/mesalib/HISTORY
+++ b/graphics-libs/mesalib/HISTORY
@@ -1,3 +1,6 @@
+2013-05-31 Eric Sandall <sandalle AT sourcemage.org>
+ * DEPENDS: GLUT functionality depends on libxmu and libxi (plus
libx11)
+
2012-06-29 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: PATCHLEVEL=1
* CONFIGURE: removed commented flags (moved to DEPENDS)
diff --git a/x11-libs/wine/DETAILS b/x11-libs/wine/DETAILS
index 6c7a403..bdf5e9f 100755
--- a/x11-libs/wine/DETAILS
+++ b/x11-libs/wine/DETAILS
@@ -12,7 +12,7 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-git"
FORCE_DOWNLOAD=1
else
if [[ $WINE_BRANCH == devel ]]; then
- VERSION=1.5.30
+ VERSION=1.5.31
else
VERSION=1.4.1
fi
diff --git a/x11-libs/wine/HISTORY b/x11-libs/wine/HISTORY
index 94aed49..b2a2820 100644
--- a/x11-libs/wine/HISTORY
+++ b/x11-libs/wine/HISTORY
@@ -1,3 +1,6 @@
+2013-05-31 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated devel to 1.5.31
+
2013-05-10 Ismael Luceno <ismael AT sourcemage.org>
* DETALIS: Updated devel to 1.5.30

[SM-Commit] GIT changes to master grimoire by Eric Sandall (5fe6ae35ed20f9d2b52725eb31f6857586b214a7), Eric Sandall, 05/31/2013