Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (4d5ce93d01f4412e4781e55365a5c4bde6df509d)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (4d5ce93d01f4412e4781e55365a5c4bde6df509d)
  • Date: Sun, 24 Jul 2011 17:48:44 -0500

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

audio-soft/sox/DEPENDS | 19 +++-------
audio-soft/sox/HISTORY | 3 +
gnome2-libs/libgda4/DEPENDS | 10 -----
gnome2-libs/libgda4/HISTORY | 3 +
libs/sdl/DEPENDS | 4 +-
libs/sdl/HISTORY | 3 +
x11-libs/cairo/BUILD | 4 --
x11-libs/cairo/CONFIGURE | 4 +-
x11-libs/cairo/DEPENDS | 53
++++++++++++++++++++++--------
x11-libs/cairo/HISTORY | 10 +++++
x11-libs/cairo/PRE_SUB_DEPENDS | 4 +-
x11-libs/cairo/REPAIR^all^PRE_SUB_DEPENDS | 4 +-
x11-libs/cairo/SUB_DEPENDS | 4 +-
13 files changed, 77 insertions(+), 48 deletions(-)

New commits:
commit 4d5ce93d01f4412e4781e55365a5c4bde6df509d
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

cairo: simplified tee backend selection
(cherry picked from commit fc15c113c795b21bddefd3e50b0dc9879f4ddc73)

commit 19e65c8ed7c6efe6d4058a6d3b6e6e1a6d142332
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

cairo: backported dependency changes from devel-xorg-modular (stage 2)

commit e2fcfec049b64e7f2f2b160c7d3577745ab8ea3c
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

cairo: backported dependency changes from devel-xorg-modular (stage 1)

commit 070c54003073fe0ca35380bdece1785756db544e
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

libgda4: removed deprecated dependencies

commit cc10cbe4be7ef34c1c354978e4c837de00ca2fb7
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

sox: renewed and fixed configure flags for dependencies

commit 9522bd9d4f4600bca4def1f09c82f88baf92ef23
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

sdl: corrected dependency flags

diff --git a/audio-soft/sox/DEPENDS b/audio-soft/sox/DEPENDS
index 10970f1..56e84bc 100755
--- a/audio-soft/sox/DEPENDS
+++ b/audio-soft/sox/DEPENDS
@@ -1,21 +1,21 @@
optional_depends alsa-lib \
- "--enable-alsa" \
- "--disable-alsa" \
+ "--with-alsa" \
+ "--without-alsa" \
"for ALSA sound driver support" &&

optional_depends libao \
- "--enable-libao" \
- "--disable-libao" \
+ "--with-ao" \
+ "--without-ao" \
"for libao sound driver support" &&

optional_depends libsndfile \
- "--with-sndfle" \
+ "--with-sndfile" \
"--without-sndfile" \
"for libsndfile usage" &&

optional_depends libvorbis \
- "--with-ogg" \
- "--without-ogg" \
+ "--with-oggvorbis" \
+ "--without-oggvorbis" \
"for Ogg Vorbis usage" &&

optional_depends flac \
@@ -53,11 +53,6 @@ optional_depends libpng \
"--without-png" \
"for PNG usage" &&

-optional_depends libsamplerate \
- "--with-samplerate" \
- "--without-samplerate" \
- "for libsamplerate (a.k.a. Secret Rabbit Code) usage" &&
-
optional_depends ladspa \
"--with-ladspa-path=$INSTALL_ROOT/usr/lib/ladspa" \
"--without-ladspa" \
diff --git a/audio-soft/sox/HISTORY b/audio-soft/sox/HISTORY
index 9a77098..458f8a0 100644
--- a/audio-soft/sox/HISTORY
+++ b/audio-soft/sox/HISTORY
@@ -1,3 +1,6 @@
+2011-07-25 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS: renewed and fixed configure flags for dependencies
+
2011-06-22 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 14.3.2

diff --git a/gnome2-libs/libgda4/DEPENDS b/gnome2-libs/libgda4/DEPENDS
index d628934..b8a657b 100755
--- a/gnome2-libs/libgda4/DEPENDS
+++ b/gnome2-libs/libgda4/DEPENDS
@@ -17,11 +17,6 @@ optional_depends db \
"--without-bdb" \
"for Berkeley DB backend support" &&

-optional_depends ODBC-MGR \
- "--with-odbc" \
- "--without-odbc" \
- "for Unix ODBC backend support" &&
-
optional_depends MYSQL \
"--with-mysql" \
"--without-mysql" \
@@ -37,11 +32,6 @@ optional_depends FIREBIRD \
"--without-firebird" \
"for FireBird backend support" &&

-optional_depends openldap \
- "--with-ldap" \
- "--without-ldap" \
- "for LDAP backend support" &&
-
optional_depends gnome-keyring \
"--with-gnome-keyring" \
"--without-gnome-keyring" \
diff --git a/gnome2-libs/libgda4/HISTORY b/gnome2-libs/libgda4/HISTORY
index 601a5be..df7e81d 100644
--- a/gnome2-libs/libgda4/HISTORY
+++ b/gnome2-libs/libgda4/HISTORY
@@ -1,3 +1,6 @@
+2011-07-25 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS: removed deprecated dependencies
+
2011-05-08 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 4.2.7

diff --git a/libs/sdl/DEPENDS b/libs/sdl/DEPENDS
index e3790ac..4be7d10 100755
--- a/libs/sdl/DEPENDS
+++ b/libs/sdl/DEPENDS
@@ -31,8 +31,8 @@ optional_depends libggi \
"for GGI video output support" &&

optional_depends svgalib \
- "--enable-svga" \
- "--disable-svga" \
+ "--enable-video-svga" \
+ "--disable-video-svga" \
"for SVGAlib video output support" &&

optional_depends esound \
diff --git a/libs/sdl/HISTORY b/libs/sdl/HISTORY
index b0f17f2..cd3a695 100644
--- a/libs/sdl/HISTORY
+++ b/libs/sdl/HISTORY
@@ -1,3 +1,6 @@
+2011-07-25 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS: corrected dependency flags
+
2010-10-18 Robin Cook <rcook AT wyrms.net>
* PRE_BUILD: apply mouse fix patch
http://bugzilla.libsdl.org/show_bug.cgi?id=894
diff --git a/x11-libs/cairo/BUILD b/x11-libs/cairo/BUILD
index 92da9e9..bad1ab6 100755
--- a/x11-libs/cairo/BUILD
+++ b/x11-libs/cairo/BUILD
@@ -1,5 +1,3 @@
-if [[ "$CAIRO_TEE" == "y" ]]; then
- OPTS="--enable-tee=yes $OPTS"
-fi &&
+OPTS="$CAIRO_OPTS $OPTS" &&

default_build
diff --git a/x11-libs/cairo/CONFIGURE b/x11-libs/cairo/CONFIGURE
index e38123f..6d4d95d 100755
--- a/x11-libs/cairo/CONFIGURE
+++ b/x11-libs/cairo/CONFIGURE
@@ -1 +1,3 @@
-config_query CAIRO_TEE "Enable cairo's tee surface backend feature?" n
+config_query_option CAIRO_OPTS "Enable cairo's tee surface backend feature?"
n \
+ "--enable-tee=yes" \
+ "--enable-tee=no"
diff --git a/x11-libs/cairo/DEPENDS b/x11-libs/cairo/DEPENDS
index 03bcf55..aed7b62 100755
--- a/x11-libs/cairo/DEPENDS
+++ b/x11-libs/cairo/DEPENDS
@@ -8,36 +8,56 @@ if spell_ok pixman && is_version_less $(installed_version
pixman) 0.18.4; then
force_depends pixman
fi &&

-optional_depends libx11 \
- "--enable-xlib" \
- "--disable-xlib" \
- "for Xlib surface backend feature" &&
+optional_depends zlib \
+ "--enable-xml" \
+ "--disable-xml" \
+ "for XML surface backend" &&

optional_depends libxcb \
"--enable-xcb" \
"--disable-xcb" \
- "for xcb rendering backend" &&
+ "for XCB surface backend feature" &&
+
+optional_depends libx11 \
+ "--enable-xlib" \
+ "--disable-xlib" \
+ "for Xlib surface backend feature" &&

if is_depends_enabled $SPELL libx11; then
optional_depends libxrender \
"--enable-xlib-xrender" \
"--disable-xlib-xrender" \
- "for Xlib Xrender surface backend"
+ "for Xlib Xrender surface backend" &&
+
+ config_query_option CAIRO_OPTS "Enable Xlib/XCB functions feature?" n \
+ "--enable-xlib-xcb" \
+ "--disable-xlib-xcb"
fi &&

-optional_depends xcb-util \
- "--enable-xcb" \
- "--disable-xcb" \
- "for XCB surface backend feature" &&
+optional_depends udev \
+ "--enable-drm" \
+ "--disable-drm" \
+ "for drm support" &&
+
+# these options are bogus
+#if is_depends_enabled $SPELL udev; then
+# config_query_option CAIRO_OPTS "Enable XCB drm functions feature?" n \
+# "--enable-xcb-drm" \
+# "--disable-xcb-drm" &&
+# optional_depends xorg-server \
+# "--enable-drm-xr" \
+# "--disable-drm-xr" \
+# "for DRM Xr (DDX) functions feature"
+#fi &&

optional_depends libpng \
"--enable-png --enable-svg" \
"--disable-png --disable-svg" \
"for PNG support" &&

-optional_depends glitz \
- "--enable-glitz" \
- "--disable-glitz" \
+optional_depends OPENGL \
+ "--enable-gl" \
+ "--disable-gl" \
"for OpenGL accelerated graphics" &&

optional_depends directfb \
@@ -48,4 +68,9 @@ optional_depends directfb \
optional_depends gtk-doc \
"--enable-gtk-doc" \
"--disable-gtk-doc" \
- "Build documentation with gtk-doc"
+ "Build documentation with gtk-doc" &&
+
+optional_depends valgrind \
+ "--enable-valgrind" \
+ "--disable-valgrind" \
+ "for Valgrind support"
diff --git a/x11-libs/cairo/HISTORY b/x11-libs/cairo/HISTORY
index ba507b1..f46c4b6 100644
--- a/x11-libs/cairo/HISTORY
+++ b/x11-libs/cairo/HISTORY
@@ -1,3 +1,7 @@
+2011-07-25 Vlad Glagolev <stealth AT sourcemage.org>
+ * BUILD, CONFIGURE, {{REPAIR^all^,}PRE_,}SUB_DEPENDS: simplified tee
+ backend selection
+
2011-06-24 Vlad Glagolev <stealth AT sourcemage.org>
* DEPENDS: correctly compare versions

@@ -11,6 +15,12 @@
* SUB_DEPENDS: Added sub_depends on TEE
* REPAIR^all^PRE_SUB_DEPENDS: Updated

+2011-01-13 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS: glitz is superseded by OpenGL; added missing dependencies;
+ use queries for selecting different options
+ * REPAIR^all^{,PRE_{,SUB_DEPENDS}}: needs libxcb, not xcb-util
+ * BUILD: added, to use CAIRO_OPTS
+
2011-01-02 George Sherwood <gsherwood AT sourcemage.org>
* PRE_SUB_DEPENDS: Fix to work correctly
* REPAIR^all^PRE_SUB_DEPENDS: Updated to be current with
diff --git a/x11-libs/cairo/PRE_SUB_DEPENDS b/x11-libs/cairo/PRE_SUB_DEPENDS
index 927b610..fd530b1 100755
--- a/x11-libs/cairo/PRE_SUB_DEPENDS
+++ b/x11-libs/cairo/PRE_SUB_DEPENDS
@@ -1,12 +1,12 @@
case $THIS_SUB_DEPENDS in
CAIRO_DEVEL) [[ "$CAIRO_DEVEL" == "y" ]];;
PDF) [[ -f "$INSTALL_ROOT/usr/include/cairo/cairo-pdf.h" ]];;
- XCB) is_depends_enabled $SPELL xcb-util;;
+ XCB) is_depends_enabled $SPELL libxcb;;
PNG) is_depends_enabled $SPELL libpng;;
PS) [[ -f "$INSTALL_ROOT/usr/include/cairo/cairo-ps.h" ]];;
SVG) [[ -f "$INSTALL_ROOT/usr/include/cairo/cairo-svg.h" ]];;
X) is_depends_enabled $SPELL libx11;;
- TEE) if [[ $CAIRO_TEE != "y" ]]; then return 1; fi;;
+ TEE) if ! list_find "$CAIRO_OPTS" "--enable-tee=yes"; then return 1; fi;;
*) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}"
return 1;;
esac
diff --git a/x11-libs/cairo/REPAIR^all^PRE_SUB_DEPENDS
b/x11-libs/cairo/REPAIR^all^PRE_SUB_DEPENDS
index 927b610..fd530b1 100755
--- a/x11-libs/cairo/REPAIR^all^PRE_SUB_DEPENDS
+++ b/x11-libs/cairo/REPAIR^all^PRE_SUB_DEPENDS
@@ -1,12 +1,12 @@
case $THIS_SUB_DEPENDS in
CAIRO_DEVEL) [[ "$CAIRO_DEVEL" == "y" ]];;
PDF) [[ -f "$INSTALL_ROOT/usr/include/cairo/cairo-pdf.h" ]];;
- XCB) is_depends_enabled $SPELL xcb-util;;
+ XCB) is_depends_enabled $SPELL libxcb;;
PNG) is_depends_enabled $SPELL libpng;;
PS) [[ -f "$INSTALL_ROOT/usr/include/cairo/cairo-ps.h" ]];;
SVG) [[ -f "$INSTALL_ROOT/usr/include/cairo/cairo-svg.h" ]];;
X) is_depends_enabled $SPELL libx11;;
- TEE) if [[ $CAIRO_TEE != "y" ]]; then return 1; fi;;
+ TEE) if ! list_find "$CAIRO_OPTS" "--enable-tee=yes"; then return 1; fi;;
*) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}"
return 1;;
esac
diff --git a/x11-libs/cairo/SUB_DEPENDS b/x11-libs/cairo/SUB_DEPENDS
index 8647655..8fe658f 100755
--- a/x11-libs/cairo/SUB_DEPENDS
+++ b/x11-libs/cairo/SUB_DEPENDS
@@ -3,7 +3,7 @@ case $THIS_SUB_DEPENDS in
CAIRO_DEVEL="y" ;;
PDF) return 0;;
XCB) message "Cairo with XCB support requested, forcing xcb-util
dependency" &&
- depends xcb-util "--enable-xcb";;
+ depends libxcb "--enable-xcb";;
PNG) message "Cairo with PNG support requested, forcing libpng dependency"
&&
depends libpng "--enable-png --enable-svg";;
PS) return 0;;
@@ -12,7 +12,7 @@ case $THIS_SUB_DEPENDS in
X) message "Cairo with Xlib support requested, forcing libx11
dependency" &&
depends libx11 "--enable-xlib";;
TEE) message "Cairo with tee backend request, forcing it" &&
- CAIRO_TEE=y ;;
+ CAIRO_OPTS="--enable-tee=yes $CAIRO_OPTS" ;;
*) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}"
return 1;;
esac



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (4d5ce93d01f4412e4781e55365a5c4bde6df509d), Vlad Glagolev, 07/24/2011

Archive powered by MHonArc 2.6.24.

Top of Page