sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (cb5996612350d3fec44046dfa28f5453b7e64e82)

From: Pavel Vinogradov <scm AT sourcemage.org>
To: sm-commit AT lists.ibiblio.org
Subject: [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (cb5996612350d3fec44046dfa28f5453b7e64e82)
Date: Sat, 6 Aug 2022 22:40:29 +0000

GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemaage.org>:

x11-libs/cairo/CONFIGURE | 8 ++-
x11-libs/cairo/DEPENDS | 69
+++++++++++++-----------------
x11-libs/cairo/DETAILS | 1
x11-libs/cairo/HISTORY | 4 +
x11-libs/cairo/PRE_BUILD | 2
x11-libs/cairo/PRE_SUB_DEPENDS | 4 -
x11-libs/cairo/REPAIR^all^PRE_SUB_DEPENDS | 4 -
x11-libs/cairo/SUB_DEPENDS | 12 ++---
8 files changed, 52 insertions(+), 52 deletions(-)

New commits:
commit cb5996612350d3fec44046dfa28f5453b7e64e82
Author: Pavel Vinogradov <public AT sourcemaage.org>
Commit: Pavel Vinogradov <public AT sourcemaage.org>

x11-libs/cairo: switched to meson like build system

diff --git a/x11-libs/cairo/CONFIGURE b/x11-libs/cairo/CONFIGURE
index f25256b..0b78b2a 100755
--- a/x11-libs/cairo/CONFIGURE
+++ b/x11-libs/cairo/CONFIGURE
@@ -1,3 +1,7 @@
+. "${GRIMOIRE}/MESON_CONFIGURE" &&
+
+list_remove CAIRO_OPTS "--enable-tee=yes" &&
+list_remove CAIRO_OPTS "--enable-tee=no" &&
+
config_query_option CAIRO_OPTS "Enable cairo's tee surface backend feature?"
n \
- "--enable-tee=yes"
\
- "--enable-tee=no"
+ "tee=enabled" "tee=disabled"
diff --git a/x11-libs/cairo/DEPENDS b/x11-libs/cairo/DEPENDS
index 9c70d27..84b2f4a 100755
--- a/x11-libs/cairo/DEPENDS
+++ b/x11-libs/cairo/DEPENDS
@@ -1,4 +1,9 @@
. "$GRIMOIRE/FUNCTIONS" &&
+. "${GRIMOIRE}/MESON_DEPENDS" &&
+
+if [[ "${CAIRO_BRANCH}" == "scm" ]]; then
+ depends git
+fi &&

depends pixman &&

@@ -7,84 +12,72 @@ if spell_ok pixman && is_version_less $(installed_version
pixman) 0.30.0; then
fi &&

optional_depends zlib \
- "--enable-xml=yes" \
- "--enable-xml=no" \
+ "xml=enabled" \
+ "xml=disabled" \
"for XML surface backend" &&

# uses libbfd-*.so
optional_depends -sub LIBERTY binutils \
- "--enable-symbol-lookup=yes" \
- "--enable-symbol-lookup=no" \
+ "symbol-lookup=enabled" \
+ "symbol-lookup=disabled" \
"for symbol-lookup feature" &&

optional_depends freetype2 \
- "--enable-ft=yes" \
- "--enable-ft=no" \
+ "freetype=enabled" \
+ "freetype=disabled" \
"for Freetype font backend" &&
if is_depends_enabled ${SPELL} freetype2; then
optional_depends fontconfig \
- "--enable-fc=yes" \
- "--enable-fc=no" \
+ "fontconfig=enabled" \
+ "fontconfig=disabled" \
"for Fontconfig backend"
fi &&

optional_depends libxcb \
- "--enable-xcb=yes" \
- "--enable-xcb=no" \
+ "xcb=enabled" \
+ "xcb=disabled" \
"for XCB surface backend feature" &&

optional_depends glib2 \
- "--enable-gobject=yes" \
- "--enable-gobject=no" \
+ "glib=enabled" \
+ "glib=disabled" \
"for gobject functions feature" &&

optional_depends libx11 \
- "--enable-xlib=yes" \
- "--enable-xlib=no" \
+ "xlib=enabled" \
+ "xlib=disabled" \
"for Xlib surface backend feature" &&

if is_depends_enabled $SPELL libx11; then
depends xorgproto &&
depends libxext &&
- optional_depends libxrender \
- "--enable-xlib-xrender=yes" \
- "--enable-xlib-xrender=no" \
- "for Xlib Xrender surface backend" &&
+ depends libxrender &&

if is_depends_enabled ${SPELL} libxcb; then
config_query_option CAIRO_OPTS "Enable Xlib/XCB functions feature?" n \
- "--enable-xlib-xcb=yes" \
- "--enable-xlib-xcb=no" &&
+ "xlib-xcb=enabled" \
+ "xlib-xcb=disabled" &&
list_remove CAIRO_OPTS "--enable-xlib-xcb" &&
+ list_remove CAIRO_OPTS "--enable-xlib-xcb=yes" &&
+ list_remove CAIRO_OPTS "--enable-xlib-xcb=nno" &&
list_remove CAIRO_OPTS "--disable-xlib-xcb"
fi
fi &&

optional_depends libpng \
- "--enable-png=yes" \
- "--enable-png=no" \
+ "png=enabled" \
+ "png=disabled" \
"for PNG support" &&
-if is_depends_enabled ${SPELL} libpng; then
- optional_depends librsvg2 \
- "--enable-svg=yees" \
- "--enable-svg=no" \
- "for SVG support"
-fi &&

optional_depends lzo "" "" "for LZO compression support" &&

optional_depends OPENGL \
- "--enable-gl=yes" \
- "--enable-gl=no" \
+ "gl-backend=auto" \
+ "gl-backend=disabled" \
"for OpenGL accelerated graphics" &&

optional_depends gtk-doc \
- "--enable-gtk-doc=yes" \
- "--enable-gtk-doc=no" \
- "Build documentation with gtk-doc" &&
-
-optional_depends valgrind \
- "--enable-valgrind=yes" \
- "--enable-valgrind=no" \
- "for Valgrind support"
+ "gtk_doc=true" \
+ "gtk_doc=false" \
+ "Build documentation with gtk-doc"
diff --git a/x11-libs/cairo/DETAILS b/x11-libs/cairo/DETAILS
index 3a93fef..8271d26 100755
--- a/x11-libs/cairo/DETAILS
+++ b/x11-libs/cairo/DETAILS
@@ -1,4 +1,5 @@
. ${GRIMOIRE}/FUNCTIONS &&
+. "${GRIMOIRE}/MESON_FUNCTIONS"
SPELL=cairo
if [[ "${CAIRO_BRANCH}" == "scm" ]]; then
VERSION=$(get_scm_version)
diff --git a/x11-libs/cairo/HISTORY b/x11-libs/cairo/HISTORY
index 6eaabca..f7e1cbf 100644
--- a/x11-libs/cairo/HISTORY
+++ b/x11-libs/cairo/HISTORY
@@ -1,3 +1,7 @@
+2022-08-06 Pavel Vinogradov <public AT sourcemage.org>
+ * CONFIGURE, DEPENDS, DETAILS, PRE_BUILD, PRE_SUB_DEPENDS,
+ REPAIR^all^PRE_SUB_DEPENDS, SUB_DEPENDS: mesonified
+
2022-08-04 Pavel Vinogradov <public AT sourcemage.org>
* DEPENDS: freetype2 and fontconfig are optional now. added optional
lzo
dependency, dropped xz-utils
diff --git a/x11-libs/cairo/PRE_BUILD b/x11-libs/cairo/PRE_BUILD
index de0c1f8..0935b87 100755
--- a/x11-libs/cairo/PRE_BUILD
+++ b/x11-libs/cairo/PRE_BUILD
@@ -1,8 +1,6 @@
default_pre_build &&
cd ${SOURCE_DIRECTORY} &&

-NOCONFIGURE=1 ./autogen.sh
-
if [[ "$CAIRO_BRANCH" != "scm" ]]; then
# http://bugs.gentoo.org/show_bug.cgi?id=336696
patch -p1 -d "$SOURCE_DIRECTORY" <
"$SPELL_DIRECTORY/cairo-1.10.0-buggy_gradients.patch"
diff --git a/x11-libs/cairo/PRE_SUB_DEPENDS b/x11-libs/cairo/PRE_SUB_DEPENDS
index 32d996d..22ef3d2 100755
--- a/x11-libs/cairo/PRE_SUB_DEPENDS
+++ b/x11-libs/cairo/PRE_SUB_DEPENDS
@@ -5,9 +5,9 @@ case $THIS_SUB_DEPENDS in
GOBJ) is_depends_enabled $SPELL glib2;;
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" ]];;
+ SVG) [[ -f "$INSTALL_ROOT/usr/include/cairo/cairo-svg.h" ]];;
X) is_depends_enabled $SPELL libx11;;
- TEE) if ! list_find "$CAIRO_OPTS" "--enable-tee=yes"; then return 1; fi;;
+ TEE) if ! list_find "$CAIRO_OPTS" "tee=enabled"; 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 32d996d..22ef3d2 100755
--- a/x11-libs/cairo/REPAIR^all^PRE_SUB_DEPENDS
+++ b/x11-libs/cairo/REPAIR^all^PRE_SUB_DEPENDS
@@ -5,9 +5,9 @@ case $THIS_SUB_DEPENDS in
GOBJ) is_depends_enabled $SPELL glib2;;
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" ]];;
+ SVG) [[ -f "$INSTALL_ROOT/usr/include/cairo/cairo-svg.h" ]];;
X) is_depends_enabled $SPELL libx11;;
- TEE) if ! list_find "$CAIRO_OPTS" "--enable-tee=yes"; then return 1; fi;;
+ TEE) if ! list_find "$CAIRO_OPTS" "tee=enabled"; 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 8edd371..7d5691b 100755
--- a/x11-libs/cairo/SUB_DEPENDS
+++ b/x11-libs/cairo/SUB_DEPENDS
@@ -3,20 +3,20 @@ case $THIS_SUB_DEPENDS in
[[ "$CAIRO_BRANCH" == "scm" ]] ||
CAIRO_BRANCH="devel";;
PDF) return 0;;
XCB) message "Cairo with XCB support requested, forcing libxcb dependency"
&&
- depends libxcb "--enable-xcb";;
+ depends libxcb "xcb=enbled";;
GOBJ) message "Cairo with gobject functions feature requested, forcing
glib2 dependency" &&
- depends glib2 "--enable-gobject";;
+ depends glib2 "glib=enabled";;
PNG) message "Cairo with PNG support requested, forcing libpng dependency"
&&
- depends libpng "--enable-png --enable-svg";;
+ depends libpng "png=enabled";;
PS) return 0;;
SVG) message "Cairo with SVG support requested, forcing libpng dependency"
&&
- depends libpng "--enable-png --enable-svg";;
+ depends libpng "png=enabled";;
X) message "Cairo with Xlib support requested, forcing libx11
dependency" &&
- depends libx11 "--enable-xlib";;
+ depends libx11 "xlib=enabled";;
TEE) message "Cairo with tee backend request, forcing it" &&
list_remove CAIRO_OPTS '--enable-tee=no' &&
list_remove CAIRO_OPTS '--enable-tee=yes' &&
- CAIRO_OPTS="$CAIRO_OPTS --enable-tee=yes" ;;
+ CAIRO_OPTS="$CAIRO_OPTS tee=enabled" ;;
*) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}"
return 1;;
esac

[SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (cb5996612350d3fec44046dfa28f5453b7e64e82), Pavel Vinogradov, 08/06/2022