mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-22 03:30:05 +02:00
Cairo: bump, add debuginfo, no ABI breaks (#3606)
This commit is contained in:
miqlas
waddlesplash
@@ -1,100 +0,0 @@
|
||||
SUMMARY="Multi-platform 2D graphics library"
|
||||
DESCRIPTION="
|
||||
Cairo is a 2D graphics library with support for multiple output \
|
||||
devices. Currently supported output targets include the X Window \
|
||||
System (via both Xlib and XCB), quartz, win32, and image buffers, \
|
||||
as well as PDF, PostScript, and SVG file output. Experimental backends \
|
||||
include OpenGL, BeOS, OS/2, and DirectFB.
|
||||
"
|
||||
HOMEPAGE="http://cairographics.org"
|
||||
COPYRIGHT="
|
||||
2000, 2002, 2004-2007 Keith Packard
|
||||
2002-2003 University of Southern California
|
||||
2004-2010 Red Hat, Inc.
|
||||
2005-2010 Mozilla Corporation
|
||||
2006-2009 Adrian Johnson
|
||||
2007-2009 Chris Wilson
|
||||
2006-2013 Intel Corporation
|
||||
2011 Andrea Canciani
|
||||
2011 Samsung Electronics
|
||||
2010-2011 Linaro Limited
|
||||
2009-2010 Eric Anholt
|
||||
2002-2010 many others
|
||||
"
|
||||
LICENSE="
|
||||
GNU LGPL v2.1
|
||||
MPL v1.1
|
||||
"
|
||||
REVISION="1"
|
||||
SOURCE_URI="http://cairographics.org/releases/cairo-$portVersion.tar.xz"
|
||||
CHECKSUM_SHA256="2505959eb3f1de3e1841023b61585bfd35684b9733c7b6a3643f4f4cbde6d846"
|
||||
PATCHES="cairo-$portVersion.patchset"
|
||||
|
||||
ARCHITECTURES="!x86_gcc2 x86 x86_64"
|
||||
SECONDARY_ARCHITECTURES="x86"
|
||||
|
||||
PROVIDES="
|
||||
cairo$secondaryArchSuffix = $portVersion compat >= 1
|
||||
lib:libcairo$secondaryArchSuffix = 2.11200.16 compat >= 2
|
||||
lib:libcairo_script_interpreter$secondaryArchSuffix = 2.11200.16 compat >= 2
|
||||
"
|
||||
REQUIRES="
|
||||
haiku$secondaryArchSuffix
|
||||
lib:libbz2$secondaryArchSuffix # required by fontconfig
|
||||
lib:libfontconfig$secondaryArchSuffix
|
||||
lib:libfreetype$secondaryArchSuffix
|
||||
lib:libpixman_1$secondaryArchSuffix
|
||||
lib:libpng15$secondaryArchSuffix
|
||||
lib:libxml2$secondaryArchSuffix # required by fontconfig
|
||||
lib:libz$secondaryArchSuffix
|
||||
"
|
||||
|
||||
PROVIDES_devel="
|
||||
cairo${secondaryArchSuffix}_devel = $portVersion compat >= 1
|
||||
devel:libcairo$secondaryArchSuffix = 2.11200.16 compat >= 2
|
||||
devel:libcairo_script_interpreter$secondaryArchSuffix = 2.11200.16 compat >= 2
|
||||
"
|
||||
REQUIRES_devel="
|
||||
cairo$secondaryArchSuffix == $portVersion base
|
||||
"
|
||||
|
||||
BUILD_REQUIRES="
|
||||
haiku${secondaryArchSuffix}_devel
|
||||
devel:libbz2$secondaryArchSuffix # required by fontconfig
|
||||
devel:libfontconfig$secondaryArchSuffix
|
||||
devel:libfreetype$secondaryArchSuffix
|
||||
devel:libpixman_1$secondaryArchSuffix
|
||||
devel:libpng15$secondaryArchSuffix
|
||||
devel:libxml2$secondaryArchSuffix # required by fontconfig
|
||||
devel:libz$secondaryArchSuffix
|
||||
"
|
||||
BUILD_PREREQUIRES="
|
||||
cmd:aclocal
|
||||
cmd:autoconf
|
||||
cmd:automake
|
||||
cmd:gcc$secondaryArchSuffix
|
||||
cmd:ld$secondaryArchSuffix
|
||||
cmd:libtoolize
|
||||
cmd:make
|
||||
cmd:pkg_config$secondaryArchSuffix
|
||||
"
|
||||
|
||||
BUILD()
|
||||
{
|
||||
autoreconf -fi
|
||||
export CFLAGS=-D__BSD_VISIBLE
|
||||
runConfigure ./configure
|
||||
make $jobArgs
|
||||
}
|
||||
|
||||
INSTALL()
|
||||
{
|
||||
make install
|
||||
|
||||
prepareInstalledDevelLibs libcairo libcairo-script-interpreter
|
||||
fixPkgconfig
|
||||
|
||||
# devel package
|
||||
packageEntries devel \
|
||||
$developDir
|
||||
}
|
||||
@@ -1,97 +0,0 @@
|
||||
SUMMARY="Multi-platform 2D graphics library"
|
||||
DESCRIPTION="Cairo is a 2D graphics library with support for multiple output \
|
||||
devices. Currently supported output targets include the X Window \
|
||||
System (via both Xlib and XCB), quartz, win32, and image buffers, \
|
||||
as well as PDF, PostScript, and SVG file output. Experimental backends \
|
||||
include OpenGL, BeOS, OS/2, and DirectFB."
|
||||
HOMEPAGE="http://cairographics.org/"
|
||||
COPYRIGHT="2000, 2002, 2004-2007 Keith Packard
|
||||
2002-2003 University of Southern California
|
||||
2004-2010 Red Hat, Inc.
|
||||
2005-2010 Mozilla Corporation
|
||||
2006-2009 Adrian Johnson
|
||||
2007-2009 Chris Wilson
|
||||
2006-2013 Intel Corporation
|
||||
2011 Andrea Canciani
|
||||
2011 Samsung Electronics
|
||||
2010-2011 Linaro Limited
|
||||
2009-2010 Eric Anholt
|
||||
2002-2010 many others"
|
||||
LICENSE="GNU LGPL v2.1
|
||||
MPL v1.1"
|
||||
REVISION="3"
|
||||
SOURCE_URI="http://cairographics.org/releases/cairo-$portVersion.tar.xz"
|
||||
CHECKSUM_SHA256="dc59f0b7ac945ce4e138a03c227a29260915a8b05a4226c1f6f1be586ba7f5b6"
|
||||
PATCHES="cairo-$portVersion.patchset"
|
||||
|
||||
ARCHITECTURES="!x86_gcc2 x86 x86_64"
|
||||
SECONDARY_ARCHITECTURES="x86"
|
||||
|
||||
PROVIDES="
|
||||
cairo$secondaryArchSuffix = $portVersion compat >= 1
|
||||
lib:libcairo$secondaryArchSuffix = 2.11200.18 compat >= 2
|
||||
lib:libcairo_script_interpreter$secondaryArchSuffix = 2.11200.18 compat >= 2
|
||||
"
|
||||
REQUIRES="
|
||||
haiku$secondaryArchSuffix
|
||||
lib:libbz2$secondaryArchSuffix # required by fontconfig
|
||||
lib:libfontconfig$secondaryArchSuffix
|
||||
lib:libfreetype$secondaryArchSuffix
|
||||
lib:libpixman_1$secondaryArchSuffix
|
||||
lib:libpng16$secondaryArchSuffix
|
||||
lib:libxml2$secondaryArchSuffix # required by fontconfig
|
||||
lib:libz$secondaryArchSuffix
|
||||
"
|
||||
|
||||
PROVIDES_devel="
|
||||
cairo${secondaryArchSuffix}_devel = $portVersion compat >= 1
|
||||
devel:libcairo$secondaryArchSuffix = 2.11200.18 compat >= 2
|
||||
devel:libcairo_script_interpreter$secondaryArchSuffix = 2.11200.18 compat >= 2
|
||||
"
|
||||
REQUIRES_devel="
|
||||
cairo$secondaryArchSuffix == $portVersion base
|
||||
devel:libfontconfig$secondaryArchSuffix
|
||||
devel:libpixman_1$secondaryArchSuffix
|
||||
"
|
||||
|
||||
BUILD_REQUIRES="
|
||||
haiku${secondaryArchSuffix}_devel
|
||||
devel:libbz2$secondaryArchSuffix # required by fontconfig
|
||||
devel:libfontconfig$secondaryArchSuffix
|
||||
devel:libfreetype$secondaryArchSuffix
|
||||
devel:libpixman_1$secondaryArchSuffix
|
||||
devel:libpng16$secondaryArchSuffix
|
||||
devel:libxml2$secondaryArchSuffix # required by fontconfig
|
||||
devel:libz$secondaryArchSuffix
|
||||
"
|
||||
BUILD_PREREQUIRES="
|
||||
cmd:aclocal
|
||||
cmd:autoconf
|
||||
cmd:automake
|
||||
cmd:gcc$secondaryArchSuffix
|
||||
cmd:ld$secondaryArchSuffix
|
||||
cmd:libtoolize
|
||||
cmd:make
|
||||
cmd:pkg_config$secondaryArchSuffix
|
||||
"
|
||||
|
||||
BUILD()
|
||||
{
|
||||
autoreconf -fi
|
||||
export CFLAGS=-D__BSD_VISIBLE
|
||||
runConfigure ./configure
|
||||
make $jobArgs
|
||||
}
|
||||
|
||||
INSTALL()
|
||||
{
|
||||
make install
|
||||
|
||||
rm $libDir/libcairo*.la
|
||||
|
||||
prepareInstalledDevelLibs libcairo libcairo-script-interpreter
|
||||
fixPkgconfig
|
||||
|
||||
packageEntries devel \
|
||||
$developDir
|
||||
}
|
||||
@@ -21,16 +21,19 @@ LICENSE="GNU LGPL v2.1
|
||||
MPL v1.1"
|
||||
REVISION="1"
|
||||
SOURCE_URI="http://cairographics.org/releases/cairo-$portVersion.tar.xz"
|
||||
CHECKSUM_SHA256="8c90f00c500b2299c0a323dd9beead2a00353752b2092ead558139bd67f7bf16"
|
||||
CHECKSUM_SHA256="5e7b29b3f113ef870d1e3ecf8adf21f923396401604bda16d44be45e66052331"
|
||||
PATCHES="cairo-$portVersion.patchset"
|
||||
|
||||
ARCHITECTURES="!x86_gcc2 x86 x86_64"
|
||||
SECONDARY_ARCHITECTURES="x86"
|
||||
|
||||
libVersion="2.11600.0"
|
||||
libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
|
||||
|
||||
PROVIDES="
|
||||
cairo$secondaryArchSuffix = $portVersion compat >= 1
|
||||
lib:libcairo$secondaryArchSuffix = 2.11400.10 compat >= 2
|
||||
lib:libcairo_script_interpreter$secondaryArchSuffix = 2.11400.10 compat >= 2
|
||||
cairo$secondaryArchSuffix = $portVersion
|
||||
lib:libcairo$secondaryArchSuffix = $libVersionCompat
|
||||
lib:libcairo_script_interpreter$secondaryArchSuffix = $libVersionCompat
|
||||
"
|
||||
REQUIRES="
|
||||
haiku$secondaryArchSuffix
|
||||
@@ -42,9 +45,9 @@ REQUIRES="
|
||||
"
|
||||
|
||||
PROVIDES_devel="
|
||||
cairo${secondaryArchSuffix}_devel = $portVersion compat >= 1
|
||||
devel:libcairo$secondaryArchSuffix = 2.11400.10 compat >= 2
|
||||
devel:libcairo_script_interpreter$secondaryArchSuffix = 2.11400.10 compat >= 2
|
||||
cairo${secondaryArchSuffix}_devel = $portVersion
|
||||
devel:libcairo$secondaryArchSuffix = $libVersionCompat
|
||||
devel:libcairo_script_interpreter$secondaryArchSuffix = $libVersionCompat
|
||||
"
|
||||
REQUIRES_devel="
|
||||
cairo$secondaryArchSuffix == $portVersion base
|
||||
@@ -71,6 +74,10 @@ BUILD_PREREQUIRES="
|
||||
cmd:pkg_config$secondaryArchSuffix
|
||||
"
|
||||
|
||||
defineDebugInfoPackage cairo$secondaryArchSuffix \
|
||||
"$libDir"/libcairo.so.$libVersion \
|
||||
"$libDir"/libcairo-script-interpreter.so.$libVersion
|
||||
|
||||
BUILD()
|
||||
{
|
||||
autoreconf -fi
|
||||
@@ -1,47 +0,0 @@
|
||||
From c61f7f73be49c3b04386a297a80db217a974f474 Mon Sep 17 00:00:00 2001
|
||||
From: Jerome Duval <jerome.duval@gmail.com>
|
||||
Date: Fri, 3 Oct 2014 18:33:08 +0000
|
||||
Subject: Haiku patch
|
||||
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index fd54ad1..5146be6 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -285,6 +285,11 @@ CAIRO_ENABLE_SURFACE_BACKEND(beos, BeOS/Zeta, no, [
|
||||
AC_CHECK_LIB(be,main,beos_LIBS="$beos_LIBS -lbe")
|
||||
AC_CHECK_LIB(zeta,main,beos_LIBS="$beos_LIBS -lzeta")
|
||||
;;
|
||||
+ *-*-haiku)
|
||||
+ beos_LIBS=""
|
||||
+ AC_CHECK_LIB(be,main,beos_LIBS="$beos_LIBS -lbe")
|
||||
+ AC_CHECK_LIB(network,main,beos_LIBS="$beos_LIBS -lnetwork")
|
||||
+ ;;
|
||||
*)
|
||||
use_beos="no (requires a BeOS platform)"
|
||||
;;
|
||||
--
|
||||
1.8.3.4
|
||||
|
||||
|
||||
From 65d7e5c89870562d59cb0317eaf20743fa745a18 Mon Sep 17 00:00:00 2001
|
||||
From: Adrien Destugues <pulkomandy@gmail.com>
|
||||
Date: Mon, 6 Oct 2014 18:07:36 +0200
|
||||
Subject: Add missing include fenv.h.
|
||||
|
||||
|
||||
diff --git a/test/cairo-test.c b/test/cairo-test.c
|
||||
index a3a587a..e5b2945 100644
|
||||
--- a/test/cairo-test.c
|
||||
+++ b/test/cairo-test.c
|
||||
@@ -40,6 +40,7 @@
|
||||
#include <unistd.h>
|
||||
#endif
|
||||
#include <errno.h>
|
||||
+#include <fenv.h>
|
||||
#include <string.h>
|
||||
#if HAVE_FCFINI
|
||||
#include <fontconfig/fontconfig.h>
|
||||
--
|
||||
1.8.3.4
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user