summaryrefslogtreecommitdiffstats
path: root/x11-libs/cairo
diff options
context:
space:
mode:
authorRemko van der Vossen2014-09-04 14:42:22 +0200
committerRemko van der Vossen2014-09-04 14:43:54 +0200
commit67bd1042d75eadcd62eb0542bc4003c780af6424 (patch)
treeb2ab2e65abb341450bf2ad3c45907d2a4644154a /x11-libs/cairo
parentc1521605671307c04fb4a519089232e8a3282d74 (diff)
parent5e35905b65250285330d2375c7756e3ffa9f749d (diff)
Merge branch 'master' into libpng
Conflicts: graphics-libs/libpng/DETAILS graphics-libs/libpng/HISTORY mail/thunderbird/PRE_BUILD mail/thunderbird/thunderbird.gpg x11-toolkits/qt-x11/HISTORY x11-toolkits/qt-x11/PRE_BUILD
Diffstat (limited to 'x11-libs/cairo')
-rwxr-xr-xx11-libs/cairo/DEPENDS33
-rwxr-xr-xx11-libs/cairo/DETAILS35
-rw-r--r--x11-libs/cairo/HISTORY53
-rwxr-xr-xx11-libs/cairo/PREPARE3
-rwxr-xr-xx11-libs/cairo/PRE_BUILD15
-rwxr-xr-xx11-libs/cairo/PRE_SUB_DEPENDS3
-rwxr-xr-xx11-libs/cairo/REPAIR^all^PRE_SUB_DEPENDS3
-rwxr-xr-xx11-libs/cairo/SUB_DEPENDS12
-rw-r--r--x11-libs/cairo/cairo-broken-lto-build.patch26
9 files changed, 149 insertions, 34 deletions
diff --git a/x11-libs/cairo/DEPENDS b/x11-libs/cairo/DEPENDS
index aed7b62f72..2aed2de375 100755
--- a/x11-libs/cairo/DEPENDS
+++ b/x11-libs/cairo/DEPENDS
@@ -3,8 +3,9 @@
depends freetype2 '--enable-ft' &&
depends fontconfig &&
depends pixman &&
+depends xz-utils &&
-if spell_ok pixman && is_version_less $(installed_version pixman) 0.18.4; then
+if spell_ok pixman && is_version_less $(installed_version pixman) 0.22.0; then
force_depends pixman
fi &&
@@ -13,17 +14,29 @@ optional_depends zlib \
"--disable-xml" \
"for XML surface backend" &&
+# uses libbfd-*.so
+optional_depends binutils \
+ "--enable-symbol-lookup" \
+ "--disable-symbol-lookup" \
+ "for symbol-lookup feature" &&
+
optional_depends libxcb \
"--enable-xcb" \
"--disable-xcb" \
"for XCB surface backend feature" &&
+optional_depends glib2 \
+ "--enable-gobject" \
+ "--disable-gobject" \
+ "for gobject functions feature" &&
+
optional_depends libx11 \
- "--enable-xlib" \
- "--disable-xlib" \
- "for Xlib surface backend feature" &&
+ "--enable-xlib" \
+ "--disable-xlib" \
+ "for Xlib surface backend feature" &&
if is_depends_enabled $SPELL libx11; then
+ depends xextproto &&
optional_depends libxrender \
"--enable-xlib-xrender" \
"--disable-xlib-xrender" \
@@ -34,12 +47,12 @@ if is_depends_enabled $SPELL libx11; then
"--disable-xlib-xcb"
fi &&
-optional_depends udev \
- "--enable-drm" \
- "--disable-drm" \
- "for drm support" &&
-
-# these options are bogus
+# these DRM options are bogus
+#optional_depends udev \
+# "--enable-drm" \
+# "--disable-drm" \
+# "for drm support" &&
+#
#if is_depends_enabled $SPELL udev; then
# config_query_option CAIRO_OPTS "Enable XCB drm functions feature?" n \
# "--enable-xcb-drm" \
diff --git a/x11-libs/cairo/DETAILS b/x11-libs/cairo/DETAILS
index df2d3fbd1f..c44f1da371 100755
--- a/x11-libs/cairo/DETAILS
+++ b/x11-libs/cairo/DETAILS
@@ -1,19 +1,28 @@
+. ${GRIMOIRE}/FUNCTIONS &&
SPELL=cairo
-if [[ $CAIRO_DEVEL == y ]]; then
- VERSION=1.10.2
- PATCHLEVEL=0
- SOURCE_HASH=sha512:8be4b9ce002f039014d747cc2b48c6a6dfac78df74ebc5ad711a8f36572b819b2c6da3cc4732d0ca93e9052b4b3bb42a146f5e7e346b75dde695d44477b19c9a
- SOURCE=$SPELL-$VERSION.tar.gz
+case "$CAIRO_BRANCH" in
+ scm)
+ VERSION=$(get_scm_version)
+ SOURCE=$SPELL-git.tar.bz2
+ SOURCE_URL[0]=git://anongit.freedesktop.org/git/cairo:cairo-git
+ SOURCE_IGNORE=volatile
+ FORCE_DOWNLOAD=1
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-git" ;;
+
+ devel)
+ VERSION=1.12.16
+ SOURCE_HASH=sha512:35389305ba0906e2e1beab92966650fc7d7f8f41231e355ea2bf8693a333946f0693c125d1c50681e12b7f2aff85ae1fdcf957f3d83bc7eaacd52569884c6b2f
+ SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_URL[0]=http://cairographics.org/releases/$SOURCE
-# SOURCE_GPG=gurus.gpg:$SOURCE.sig
-else
- VERSION=1.10.2
- PATCHLEVEL=0
- SOURCE_HASH=sha512:8be4b9ce002f039014d747cc2b48c6a6dfac78df74ebc5ad711a8f36572b819b2c6da3cc4732d0ca93e9052b4b3bb42a146f5e7e346b75dde695d44477b19c9a
- SOURCE=$SPELL-$VERSION.tar.gz
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION" ;;
+
+ stable)
+ VERSION=1.12.16
+ SOURCE_HASH=sha512:35389305ba0906e2e1beab92966650fc7d7f8f41231e355ea2bf8693a333946f0693c125d1c50681e12b7f2aff85ae1fdcf957f3d83bc7eaacd52569884c6b2f
+ SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_URL[0]=http://cairographics.org/releases/$SOURCE
-fi
-SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION" ;;
+esac
WEB_SITE=http://cairographics.org/
LICENSE[0]=MIT
ENTERED=20040617
diff --git a/x11-libs/cairo/HISTORY b/x11-libs/cairo/HISTORY
index cc67c14096..958fbbd257 100644
--- a/x11-libs/cairo/HISTORY
+++ b/x11-libs/cairo/HISTORY
@@ -1,3 +1,56 @@
+2014-08-26 Thomas Orgis <sobukus@sourcemage.org>
+ * DEPENDS: xextproto
+
+2014-08-24 Thomas Orgis <sobukus@sourcemage.org>
+ * PRE_BUILD, cairo-broken-lto-build.patch: a build fix, bad relocation
+
+2014-07-04 Pol Vinogradov <vin.public@gmail.com>
+ * DETAILS, PRE_BUILD, PREPARE, PRE_BUILD, PRE_SUB_DEPENDS,
+ REPAIR^all^PRE_SUB_DEPENDS, SUB_DEPENDS: added scm branch
+
+2013-09-12 Robin Cook <rcook@wyrms.net>
+ * DETAILS: updated VERSION to 1.12.16
+
+2013-06-03 Vlad Glagolev <stealth@sourcemage.org>
+ * DEPENDS: added binutils optional dependency
+
+2013-02-23 Vlad Glagolev <stealth@sourcemage.org>
+ * DETAILS: updated spell to 1.12.14
+
+2013-02-01 Vlad Glagolev <stealth@sourcemage.org>
+ * DETAILS: updated spell to 1.12.12
+
+2013-01-26 Vlad Glagolev <stealth@sourcemage.org>
+ * DETAILS: updated spell to 1.12.10
+
+2012-10-22 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 1.12.6
+
+2012-10-11 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 1.12.4
+
+2012-07-24 Vlad Glagolev <stealth@sourcemage.org>
+ * SUB_DEPENDS: corrected XCB comment, added GOBJ subdep
+ * {REPAIR^all^,}PRE_SUB_DEPENDS: added GOBJ subdep
+ * DEPENDS: added glib2 optional dep; fixed aligning for libx11
+
+2012-05-13 Remko van der Vossen <wich@sourcemage.org>
+ * DEPENDS: added xz-utils, it's not part of basesystem...
+
+2012-05-01 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 1.12.2
+
+2012-04-14 Vlad Glagolev <stealth@sourcemage.org>
+ * DEPENDS: bumped pixman version requirement; removed DRM options
+ to fix compilation cause of some missing functions
+
+2012-04-04 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 1.12.0
+
+2012-01-13 Eric Sandall <sandalle@sourcemage.org>
+ * SUB_DEPENDS: Remove prior TEE entries in CAIRO_OPTS to keep the list sane
+ Override any other entries in CAIRO_OPTS when doing a sub-dependency
+
2011-07-25 Vlad Glagolev <stealth@sourcemage.org>
* BUILD, CONFIGURE, {{REPAIR^all^,}PRE_,}SUB_DEPENDS: simplified tee
backend selection
diff --git a/x11-libs/cairo/PREPARE b/x11-libs/cairo/PREPARE
index 8f9397f2df..40600f7d24 100755
--- a/x11-libs/cairo/PREPARE
+++ b/x11-libs/cairo/PREPARE
@@ -1 +1,2 @@
-config_query CAIRO_DEVEL "Build devel (unstable) version?" n
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch stable devel scm
diff --git a/x11-libs/cairo/PRE_BUILD b/x11-libs/cairo/PRE_BUILD
index 682b8e2b76..d77360e4f4 100755
--- a/x11-libs/cairo/PRE_BUILD
+++ b/x11-libs/cairo/PRE_BUILD
@@ -1,4 +1,11 @@
-mk_source_dir $SOURCE_DIRECTORY &&
- unpack_file &&
-# http://bugs.gentoo.org/show_bug.cgi?id=336696
-patch -p1 -d $SOURCE_DIRECTORY < $SPELL_DIRECTORY/cairo-1.10.0-buggy_gradients.patch
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
+
+if [[ "$CAIRO_BRANCH" == "scm" ]]; then
+ NOCONFIGURE=1 ./autogen.sh
+else
+ # http://bugs.gentoo.org/show_bug.cgi?id=336696
+ patch -p1 -d "$SOURCE_DIRECTORY" < "$SPELL_DIRECTORY/cairo-1.10.0-buggy_gradients.patch" &&
+ # http://sourceforge.net/p/mingw-w64/bugs/396/
+ patch -p1 < "$SPELL_DIRECTORY/cairo-broken-lto-build.patch"
+fi
diff --git a/x11-libs/cairo/PRE_SUB_DEPENDS b/x11-libs/cairo/PRE_SUB_DEPENDS
index fd530b1872..32d996d520 100755
--- a/x11-libs/cairo/PRE_SUB_DEPENDS
+++ b/x11-libs/cairo/PRE_SUB_DEPENDS
@@ -1,7 +1,8 @@
case $THIS_SUB_DEPENDS in
- CAIRO_DEVEL) [[ "$CAIRO_DEVEL" == "y" ]];;
+ CAIRO_DEVEL) [[ "$CAIRO_BRANCH" == "devel" || "$CAIRO_BRANCH" == "scm" ]];;
PDF) [[ -f "$INSTALL_ROOT/usr/include/cairo/cairo-pdf.h" ]];;
XCB) is_depends_enabled $SPELL libxcb;;
+ 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" ]];;
diff --git a/x11-libs/cairo/REPAIR^all^PRE_SUB_DEPENDS b/x11-libs/cairo/REPAIR^all^PRE_SUB_DEPENDS
index fd530b1872..32d996d520 100755
--- a/x11-libs/cairo/REPAIR^all^PRE_SUB_DEPENDS
+++ b/x11-libs/cairo/REPAIR^all^PRE_SUB_DEPENDS
@@ -1,7 +1,8 @@
case $THIS_SUB_DEPENDS in
- CAIRO_DEVEL) [[ "$CAIRO_DEVEL" == "y" ]];;
+ CAIRO_DEVEL) [[ "$CAIRO_BRANCH" == "devel" || "$CAIRO_BRANCH" == "scm" ]];;
PDF) [[ -f "$INSTALL_ROOT/usr/include/cairo/cairo-pdf.h" ]];;
XCB) is_depends_enabled $SPELL libxcb;;
+ 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" ]];;
diff --git a/x11-libs/cairo/SUB_DEPENDS b/x11-libs/cairo/SUB_DEPENDS
index 8fe658ff13..8edd371f37 100755
--- a/x11-libs/cairo/SUB_DEPENDS
+++ b/x11-libs/cairo/SUB_DEPENDS
@@ -1,9 +1,11 @@
case $THIS_SUB_DEPENDS in
- CAIRO_DEVEL) echo "Devel release needed, forcing it." &&
- CAIRO_DEVEL="y" ;;
+ CAIRO_DEVEL) echo "Devel release needed, forcing it." &&
+ [[ "$CAIRO_BRANCH" == "scm" ]] || CAIRO_BRANCH="devel";;
PDF) return 0;;
- XCB) message "Cairo with XCB support requested, forcing xcb-util dependency" &&
+ XCB) message "Cairo with XCB support requested, forcing libxcb dependency" &&
depends libxcb "--enable-xcb";;
+ GOBJ) message "Cairo with gobject functions feature requested, forcing glib2 dependency" &&
+ depends glib2 "--enable-gobject";;
PNG) message "Cairo with PNG support requested, forcing libpng dependency" &&
depends libpng "--enable-png --enable-svg";;
PS) return 0;;
@@ -12,7 +14,9 @@ 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_OPTS="--enable-tee=yes $CAIRO_OPTS" ;;
+ list_remove CAIRO_OPTS '--enable-tee=no' &&
+ list_remove CAIRO_OPTS '--enable-tee=yes' &&
+ CAIRO_OPTS="$CAIRO_OPTS --enable-tee=yes" ;;
*) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL $THIS_SUB_DEPENDS${DEFAULT_COLOR}"
return 1;;
esac
diff --git a/x11-libs/cairo/cairo-broken-lto-build.patch b/x11-libs/cairo/cairo-broken-lto-build.patch
new file mode 100644
index 0000000000..8cb0f50b85
--- /dev/null
+++ b/x11-libs/cairo/cairo-broken-lto-build.patch
@@ -0,0 +1,26 @@
+diff -ru cairo-1.12.16.orig/build/configure.ac.warnings cairo-1.12.16/build/configure.ac.warnings
+--- cairo-1.12.16.orig/build/configure.ac.warnings 2013-08-26 17:07:21.000000000 +0200
++++ cairo-1.12.16/build/configure.ac.warnings 2014-08-08 08:13:14.566163013 +0200
+@@ -39,7 +39,7 @@
+ dnl -flto working really needs a test link, not just a compile
+
+ safe_MAYBE_WARN="$MAYBE_WARN"
+-MAYBE_WARN="$MAYBE_WARN -flto"
++MAYBE_WARN="$MAYBE_WARN -flto -ffat-lto-objects -fuse-linker-plugin"
+ AC_TRY_LINK([],[
+ int main(int argc, char **argv) { return 0; }
+ ],[],[
+Only in cairo-1.12.16/build: configure.ac.warnings.orig
+diff -ru cairo-1.12.16.orig/configure cairo-1.12.16/configure
+--- cairo-1.12.16.orig/configure 2013-08-26 19:00:41.000000000 +0200
++++ cairo-1.12.16/configure 2014-08-08 08:15:19.576158790 +0200
+@@ -18147,7 +18147,7 @@
+
+
+ safe_MAYBE_WARN="$MAYBE_WARN"
+-MAYBE_WARN="$MAYBE_WARN -flto"
++MAYBE_WARN="$MAYBE_WARN -flto -ffat-lto-objects -fuse-linker-plugin"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+Only in cairo-1.12.16: configure.orig