Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Justin Boffemmyer (87c14cfce7bdc1aa12ba8665a06f8e04621d54be)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Justin Boffemmyer <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Justin Boffemmyer (87c14cfce7bdc1aa12ba8665a06f8e04621d54be)
  • Date: Thu, 21 May 2009 20:46:56 -0500

GIT changes to master grimoire by Justin Boffemmyer <flux AT sourcemage.org>:

e/imlib2/BUILD | 4 +++-
e/imlib2/CONFIGURE | 1 +
e/imlib2/DEPENDS | 8 ++++----
e/imlib2/HISTORY | 8 +++++++-
e/imlib2/Imlib2.h.patch | 13 +++++++++++++
e/imlib2/PRE_BUILD | 4 ++++
6 files changed, 32 insertions(+), 6 deletions(-)

New commits:
commit 87c14cfce7bdc1aa12ba8665a06f8e04621d54be
Author: Justin Boffemmyer <flux AT sourcemage.org>
Commit: Justin Boffemmyer <flux AT sourcemage.org>

e/imlib2: better support for building without X

Support not only building imlib2 itself without X, but also programs
that link against imlib2 by patching the Imlib2.h header as necessary.

commit fcdf2bd13dfb4b28110717e177e87b74ee4e4bad
Author: Justin Boffemmyer <flux AT sourcemage.org>
Commit: Justin Boffemmyer <flux AT sourcemage.org>

Revert "e/imlib2: make xorg-libs optional_depends"

This reverts commit 480f0028ab547b4dd8877311c84d7b620537aeac.

This commit correctly enabled imlib2 to build without X, but the
installed system header Imlib2.h still incorrectly relied on X even when
built using --without-x.

diff --git a/e/imlib2/BUILD b/e/imlib2/BUILD
index 7b82be6..b3b9881 100755
--- a/e/imlib2/BUILD
+++ b/e/imlib2/BUILD
@@ -1,5 +1,7 @@
if [[ $HOST == x86_64-* ]]; then
- OPTS="--disable-mmx $OPTS"
+ OPTS="--disable-mmx $IMLIB2_X11 $OPTS"
+else
+ OPTS="$IMLIB2_X11 $OPTS"
fi &&

default_build
diff --git a/e/imlib2/CONFIGURE b/e/imlib2/CONFIGURE
new file mode 100755
index 0000000..a770cab
--- /dev/null
+++ b/e/imlib2/CONFIGURE
@@ -0,0 +1 @@
+config_query_option IMLIB2_X11 "Enable X11 support?" y "" "--without-x"
diff --git a/e/imlib2/DEPENDS b/e/imlib2/DEPENDS
index ff41d21..9e8de0c 100755
--- a/e/imlib2/DEPENDS
+++ b/e/imlib2/DEPENDS
@@ -1,16 +1,16 @@
depends libtool &&
depends zlib &&
depends freetype2 &&
+depends xorg-libs &&

if [[ $IMLIB2_CVS == y ]]; then
depends CVS &&
depends automake-1.9
fi &&

-optional_depends 'xorg-libs' \
- '' \
- '--without-x' \
- 'X11 support' &&
+if [[ -z $IMLIB2_X11 ]]; then
+ depends xorg-libs
+fi &&

optional_depends 'tiff' \
'--with-tiff' \
diff --git a/e/imlib2/HISTORY b/e/imlib2/HISTORY
index 31d7df0..1f0ff5d 100644
--- a/e/imlib2/HISTORY
+++ b/e/imlib2/HISTORY
@@ -1,5 +1,11 @@
2009-5-21 Justin Boffemmyer <flux AT sourcemage.org>
- * DEPENDS: make xorg-libs an optional dependency
+ * CONFIGURE: new, ask if X support is wanted
+ * BUILD: add IMLIB2_X11 to OPTS
+ * DEPENDS: test IMLIB2_X11 and depends xorg-libs if building with X
+ support
+ * PRE_BUILD: patch Imlib2.h if building without X support
+ * Imlib2.h.patch: new, patch to remove all X11 defines for building
+ without X support

2008-10-23 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.4.2; quoting paths; cleaned up;
diff --git a/e/imlib2/Imlib2.h.patch b/e/imlib2/Imlib2.h.patch
new file mode 100644
index 0000000..5b3c122
--- /dev/null
+++ b/e/imlib2/Imlib2.h.patch
@@ -0,0 +1,13 @@
+--- src/lib/Imlib2.h 2008-08-17 05:39:12.000000000 -0400
++++ src/lib/Imlib2.h 2009-05-22 00:00:30.000000000 -0400
+@@ -22,10 +22,6 @@
+ # endif
+ # endif
+
+-# ifndef X_DISPLAY_MISSING
+-# include <X11/Xlib.h>
+-# endif
+-
+ /* Data types to use */
+ # ifndef DATA64
+ # define DATA64 unsigned long long
diff --git a/e/imlib2/PRE_BUILD b/e/imlib2/PRE_BUILD
index e2c00f4..e859dc1 100755
--- a/e/imlib2/PRE_BUILD
+++ b/e/imlib2/PRE_BUILD
@@ -7,3 +7,7 @@ if [[ $IMLIB2_CVS == y ]]; then
sed -i "s/; automake/; automake-1.9/" autogen.sh &&
NOCONFIGURE=ON ./autogen.sh
fi
+
+if [[ $IMLIB2_X11 == "--without-x" ]]; then
+ patch -p0 < "$SCRIPT_DIRECTORY"/Imlib2.h.patch
+fi




Archive powered by MHonArc 2.6.24.

Top of Page