sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Arwed v. Merkatz (486c0c4e95837323a4f31ac91854e5079aae172c)

From: "Arwed v. Merkatz" <scm AT mail.sourcemage.org>
To: sm-commit AT lists.ibiblio.org
Subject: [SM-Commit] GIT changes to master grimoire by Arwed v. Merkatz (486c0c4e95837323a4f31ac91854e5079aae172c)
Date: Sun, 27 Aug 2006 05:53:20 -0500

GIT changes to master grimoire by Arwed v. Merkatz <v.merkatz AT gmx.net>:

x11-libs/cairo/BUILD | 10 ----------
x11-libs/cairo/CONFIGURE | 2 --
x11-libs/cairo/DEPENDS | 5 +++++
x11-libs/cairo/HISTORY | 4 ++++
4 files changed, 9 insertions(+), 12 deletions(-)

New commits:
commit 486c0c4e95837323a4f31ac91854e5079aae172c
Author: Arwed v. Merkatz <v.merkatz AT gmx.net>
Commit: Arwed v. Merkatz <v.merkatz AT gmx.net>

cairo: removed old unnecessary options, added optional_depends on libpng

diff --git a/x11-libs/cairo/BUILD b/x11-libs/cairo/BUILD
deleted file mode 100755
index 96bc30c..0000000
--- a/x11-libs/cairo/BUILD
+++ /dev/null
@@ -1,10 +0,0 @@
-if [ "$CPDF" == "y" ]; then
- OPTS="$OPTS --enable-pdf"
-fi &&
-
-if [ "$CPS" == "y" ]; then
- OPTS="$OPTS --enable-ps"
-fi &&
-
-CFLAGS="${CFLAGS/-O3/-O2}" &&
-default_build
diff --git a/x11-libs/cairo/CONFIGURE b/x11-libs/cairo/CONFIGURE
deleted file mode 100755
index 86b6ef2..0000000
--- a/x11-libs/cairo/CONFIGURE
+++ /dev/null
@@ -1,2 +0,0 @@
-config_query CPDF "Enable experimental PDF backend?" n &&
-config_query CPS "Enable experimental Postscript backend?" n
diff --git a/x11-libs/cairo/DEPENDS b/x11-libs/cairo/DEPENDS
index abd2b3e..22114d4 100755
--- a/x11-libs/cairo/DEPENDS
+++ b/x11-libs/cairo/DEPENDS
@@ -1,5 +1,10 @@
depends X11-LIBS &&

+optional_depends "libpng" \
+ "--enable-png" \
+ "--disable-png" \
+ "for PNG support" &&
+
optional_depends "glitz" \
"--enable-glitz" \
"--disable-glitz" \
diff --git a/x11-libs/cairo/HISTORY b/x11-libs/cairo/HISTORY
index cdae670..00ad871 100644
--- a/x11-libs/cairo/HISTORY
+++ b/x11-libs/cairo/HISTORY
@@ -1,3 +1,7 @@
+2006-08-27 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * BUILD, CONFIGURE: removed, the backends aren't experimental anymore
+ * DEPENDS: added optional_depends on libpng
+
2006-08-19 Flavien Bridault <vlaaad AT sourcemage.org>
* DETAILS: Updated to 1.2.4

[SM-Commit] GIT changes to master grimoire by Arwed v. Merkatz (486c0c4e95837323a4f31ac91854e5079aae172c), Arwed v. Merkatz, 08/27/2006