--- cairo-1.8.4.orig/config.guess +++ cairo-1.8.4/config.guess @@ -0,0 +1,1526 @@ +#! /bin/sh +# Attempt to guess a canonical system name. +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 +# Free Software Foundation, Inc. + +timestamp='2008-01-23' + +# This file is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA +# 02110-1301, USA. +# +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + + +# Originally written by Per Bothner . +# Please send patches to . Submit a context +# diff and a properly formatted ChangeLog entry. +# +# This script attempts to guess a canonical system name similar to +# config.sub. If it succeeds, it prints the system name on stdout, and +# exits with 0. Otherwise, it exits with 1. +# +# The plan is that this can be called by configure scripts if you +# don't specify an explicit build system type. + +me=`echo "$0" | sed -e 's,.*/,,'` + +usage="\ +Usage: $0 [OPTION] + +Output the configuration name of the system \`$me' is run on. + +Operation modes: + -h, --help print this help, then exit + -t, --time-stamp print date of last modification, then exit + -v, --version print version number, then exit + +Report bugs and patches to ." + +version="\ +GNU config.guess ($timestamp) + +Originally written by Per Bothner. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, +2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + +This is free software; see the source for copying conditions. There is NO +warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." + +help=" +Try \`$me --help' for more information." + +# Parse command line +while test $# -gt 0 ; do + case $1 in + --time-stamp | --time* | -t ) + echo "$timestamp" ; exit ;; + --version | -v ) + echo "$version" ; exit ;; + --help | --h* | -h ) + echo "$usage"; exit ;; + -- ) # Stop option processing + shift; break ;; + - ) # Use stdin as input. + break ;; + -* ) + echo "$me: invalid option $1$help" >&2 + exit 1 ;; + * ) + break ;; + esac +done + +if test $# != 0; then + echo "$me: too many arguments$help" >&2 + exit 1 +fi + +trap 'exit 1' 1 2 15 + +# CC_FOR_BUILD -- compiler used by this script. Note that the use of a +# compiler to aid in system detection is discouraged as it requires +# temporary files to be created and, as you can see below, it is a +# headache to deal with in a portable fashion. + +# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still +# use `HOST_CC' if defined, but it is deprecated. + +# Portable tmp directory creation inspired by the Autoconf team. + +set_cc_for_build=' +trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; +trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; +: ${TMPDIR=/tmp} ; + { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || + { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || + { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || + { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; +dummy=$tmp/dummy ; +tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; +case $CC_FOR_BUILD,$HOST_CC,$CC in + ,,) echo "int x;" > $dummy.c ; + for c in cc gcc c89 c99 ; do + if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then + CC_FOR_BUILD="$c"; break ; + fi ; + done ; + if test x"$CC_FOR_BUILD" = x ; then + CC_FOR_BUILD=no_compiler_found ; + fi + ;; + ,,*) CC_FOR_BUILD=$CC ;; + ,*,*) CC_FOR_BUILD=$HOST_CC ;; +esac ; set_cc_for_build= ;' + +# This is needed to find uname on a Pyramid OSx when run in the BSD universe. +# (ghazi@noc.rutgers.edu 1994-08-24) +if (test -f /.attbin/uname) >/dev/null 2>&1 ; then + PATH=$PATH:/.attbin ; export PATH +fi + +UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown +UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown +UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown +UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown + +# Note: order is significant - the case branches are not exclusive. + +case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in + *:NetBSD:*:*) + # NetBSD (nbsd) targets should (where applicable) match one or + # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, + # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently + # switched to ELF, *-*-netbsd* would select the old + # object file format. This provides both forward + # compatibility and a consistent mechanism for selecting the + # object file format. + # + # Note: NetBSD doesn't particularly care about the vendor + # portion of the name. We always set it to "unknown". + sysctl="sysctl -n hw.machine_arch" + UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \ + /usr/sbin/$sysctl 2>/dev/null || echo unknown)` + case "${UNAME_MACHINE_ARCH}" in + armeb) machine=armeb-unknown ;; + arm*) machine=arm-unknown ;; + sh3el) machine=shl-unknown ;; + sh3eb) machine=sh-unknown ;; + sh5el) machine=sh5le-unknown ;; + *) machine=${UNAME_MACHINE_ARCH}-unknown ;; + esac + # The Operating System including object format, if it has switched + # to ELF recently, or will in the future. + case "${UNAME_MACHINE_ARCH}" in + arm*|i386|m68k|ns32k|sh3*|sparc|vax) + eval $set_cc_for_build + if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep __ELF__ >/dev/null + then + # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). + # Return netbsd for either. FIX? + os=netbsd + else + os=netbsdelf + fi + ;; + *) + os=netbsd + ;; + esac + # The OS release + # Debian GNU/NetBSD machines have a different userland, and + # thus, need a distinct triplet. However, they do not need + # kernel version information, so it can be replaced with a + # suitable tag, in the style of linux-gnu. + case "${UNAME_VERSION}" in + Debian*) + release='-gnu' + ;; + *) + release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` + ;; + esac + # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: + # contains redundant information, the shorter form: + # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. + echo "${machine}-${os}${release}" + exit ;; + *:OpenBSD:*:*) + UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` + echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} + exit ;; + *:ekkoBSD:*:*) + echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} + exit ;; + *:SolidBSD:*:*) + echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} + exit ;; + macppc:MirBSD:*:*) + echo powerpc-unknown-mirbsd${UNAME_RELEASE} + exit ;; + *:MirBSD:*:*) + echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} + exit ;; + alpha:OSF1:*:*) + case $UNAME_RELEASE in + *4.0) + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` + ;; + *5.*) + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` + ;; + esac + # According to Compaq, /usr/sbin/psrinfo has been available on + # OSF/1 and Tru64 systems produced since 1995. I hope that + # covers most systems running today. This code pipes the CPU + # types through head -n 1, so we only detect the type of CPU 0. + ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1` + case "$ALPHA_CPU_TYPE" in + "EV4 (21064)") + UNAME_MACHINE="alpha" ;; + "EV4.5 (21064)") + UNAME_MACHINE="alpha" ;; + "LCA4 (21066/21068)") + UNAME_MACHINE="alpha" ;; + "EV5 (21164)") + UNAME_MACHINE="alphaev5" ;; + "EV5.6 (21164A)") + UNAME_MACHINE="alphaev56" ;; + "EV5.6 (21164PC)") + UNAME_MACHINE="alphapca56" ;; + "EV5.7 (21164PC)") + UNAME_MACHINE="alphapca57" ;; + "EV6 (21264)") + UNAME_MACHINE="alphaev6" ;; + "EV6.7 (21264A)") + UNAME_MACHINE="alphaev67" ;; + "EV6.8CB (21264C)") + UNAME_MACHINE="alphaev68" ;; + "EV6.8AL (21264B)") + UNAME_MACHINE="alphaev68" ;; + "EV6.8CX (21264D)") + UNAME_MACHINE="alphaev68" ;; + "EV6.9A (21264/EV69A)") + UNAME_MACHINE="alphaev69" ;; + "EV7 (21364)") + UNAME_MACHINE="alphaev7" ;; + "EV7.9 (21364A)") + UNAME_MACHINE="alphaev79" ;; + esac + # A Pn.n version is a patched version. + # A Vn.n version is a released version. + # A Tn.n version is a released field test version. + # A Xn.n version is an unreleased experimental baselevel. + # 1.2 uses "1.2" for uname -r. + echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` + exit ;; + Alpha\ *:Windows_NT*:*) + # How do we know it's Interix rather than the generic POSIX subsystem? + # Should we change UNAME_MACHINE based on the output of uname instead + # of the specific Alpha model? + echo alpha-pc-interix + exit ;; + 21064:Windows_NT:50:3) + echo alpha-dec-winnt3.5 + exit ;; + Amiga*:UNIX_System_V:4.0:*) + echo m68k-unknown-sysv4 + exit ;; + *:[Aa]miga[Oo][Ss]:*:*) + echo ${UNAME_MACHINE}-unknown-amigaos + exit ;; + *:[Mm]orph[Oo][Ss]:*:*) + echo ${UNAME_MACHINE}-unknown-morphos + exit ;; + *:OS/390:*:*) + echo i370-ibm-openedition + exit ;; + *:z/VM:*:*) + echo s390-ibm-zvmoe + exit ;; + *:OS400:*:*) + echo powerpc-ibm-os400 + exit ;; + arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) + echo arm-acorn-riscix${UNAME_RELEASE} + exit ;; + arm:riscos:*:*|arm:RISCOS:*:*) + echo arm-unknown-riscos + exit ;; + SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) + echo hppa1.1-hitachi-hiuxmpp + exit ;; + Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*) + # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE. + if test "`(/bin/universe) 2>/dev/null`" = att ; then + echo pyramid-pyramid-sysv3 + else + echo pyramid-pyramid-bsd + fi + exit ;; + NILE*:*:*:dcosx) + echo pyramid-pyramid-svr4 + exit ;; + DRS?6000:unix:4.0:6*) + echo sparc-icl-nx6 + exit ;; + DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*) + case `/usr/bin/uname -p` in + sparc) echo sparc-icl-nx7; exit ;; + esac ;; + sun4H:SunOS:5.*:*) + echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; + sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) + echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; + i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) + echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; + sun4*:SunOS:6*:*) + # According to config.sub, this is the proper way to canonicalize + # SunOS6. Hard to guess exactly what SunOS6 will be like, but + # it's likely to be more like Solaris than SunOS4. + echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; + sun4*:SunOS:*:*) + case "`/usr/bin/arch -k`" in + Series*|S4*) + UNAME_RELEASE=`uname -v` + ;; + esac + # Japanese Language versions have a version number like `4.1.3-JL'. + echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'` + exit ;; + sun3*:SunOS:*:*) + echo m68k-sun-sunos${UNAME_RELEASE} + exit ;; + sun*:*:4.2BSD:*) + UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` + test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 + case "`/bin/arch`" in + sun3) + echo m68k-sun-sunos${UNAME_RELEASE} + ;; + sun4) + echo sparc-sun-sunos${UNAME_RELEASE} + ;; + esac + exit ;; + aushp:SunOS:*:*) + echo sparc-auspex-sunos${UNAME_RELEASE} + exit ;; + # The situation for MiNT is a little confusing. The machine name + # can be virtually everything (everything which is not + # "atarist" or "atariste" at least should have a processor + # > m68000). The system name ranges from "MiNT" over "FreeMiNT" + # to the lowercase version "mint" (or "freemint"). Finally + # the system name "TOS" denotes a system which is actually not + # MiNT. But MiNT is downward compatible to TOS, so this should + # be no problem. + atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) + echo m68k-atari-mint${UNAME_RELEASE} + exit ;; + atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) + echo m68k-atari-mint${UNAME_RELEASE} + exit ;; + *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) + echo m68k-atari-mint${UNAME_RELEASE} + exit ;; + milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) + echo m68k-milan-mint${UNAME_RELEASE} + exit ;; + hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) + echo m68k-hades-mint${UNAME_RELEASE} + exit ;; + *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) + echo m68k-unknown-mint${UNAME_RELEASE} + exit ;; + m68k:machten:*:*) + echo m68k-apple-machten${UNAME_RELEASE} + exit ;; + powerpc:machten:*:*) + echo powerpc-apple-machten${UNAME_RELEASE} + exit ;; + RISC*:Mach:*:*) + echo mips-dec-mach_bsd4.3 + exit ;; + RISC*:ULTRIX:*:*) + echo mips-dec-ultrix${UNAME_RELEASE} + exit ;; + VAX*:ULTRIX*:*:*) + echo vax-dec-ultrix${UNAME_RELEASE} + exit ;; + 2020:CLIX:*:* | 2430:CLIX:*:*) + echo clipper-intergraph-clix${UNAME_RELEASE} + exit ;; + mips:*:*:UMIPS | mips:*:*:RISCos) + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c +#ifdef __cplusplus +#include /* for printf() prototype */ + int main (int argc, char *argv[]) { +#else + int main (argc, argv) int argc; char *argv[]; { +#endif + #if defined (host_mips) && defined (MIPSEB) + #if defined (SYSTYPE_SYSV) + printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0); + #endif + #if defined (SYSTYPE_SVR4) + printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0); + #endif + #if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD) + printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0); + #endif + #endif + exit (-1); + } +EOF + $CC_FOR_BUILD -o $dummy $dummy.c && + dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` && + SYSTEM_NAME=`$dummy $dummyarg` && + { echo "$SYSTEM_NAME"; exit; } + echo mips-mips-riscos${UNAME_RELEASE} + exit ;; + Motorola:PowerMAX_OS:*:*) + echo powerpc-motorola-powermax + exit ;; + Motorola:*:4.3:PL8-*) + echo powerpc-harris-powermax + exit ;; + Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) + echo powerpc-harris-powermax + exit ;; + Night_Hawk:Power_UNIX:*:*) + echo powerpc-harris-powerunix + exit ;; + m88k:CX/UX:7*:*) + echo m88k-harris-cxux7 + exit ;; + m88k:*:4*:R4*) + echo m88k-motorola-sysv4 + exit ;; + m88k:*:3*:R3*) + echo m88k-motorola-sysv3 + exit ;; + AViiON:dgux:*:*) + # DG/UX returns AViiON for all architectures + UNAME_PROCESSOR=`/usr/bin/uname -p` + if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] + then + if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ + [ ${TARGET_BINARY_INTERFACE}x = x ] + then + echo m88k-dg-dgux${UNAME_RELEASE} + else + echo m88k-dg-dguxbcs${UNAME_RELEASE} + fi + else + echo i586-dg-dgux${UNAME_RELEASE} + fi + exit ;; + M88*:DolphinOS:*:*) # DolphinOS (SVR3) + echo m88k-dolphin-sysv3 + exit ;; + M88*:*:R3*:*) + # Delta 88k system running SVR3 + echo m88k-motorola-sysv3 + exit ;; + XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3) + echo m88k-tektronix-sysv3 + exit ;; + Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD) + echo m68k-tektronix-bsd + exit ;; + *:IRIX*:*:*) + echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'` + exit ;; + ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. + echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id + exit ;; # Note that: echo "'`uname -s`'" gives 'AIX ' + i*86:AIX:*:*) + echo i386-ibm-aix + exit ;; + ia64:AIX:*:*) + if [ -x /usr/bin/oslevel ] ; then + IBM_REV=`/usr/bin/oslevel` + else + IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} + fi + echo ${UNAME_MACHINE}-ibm-aix${IBM_REV} + exit ;; + *:AIX:2:3) + if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #include + + main() + { + if (!__power_pc()) + exit(1); + puts("powerpc-ibm-aix3.2.5"); + exit(0); + } +EOF + if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` + then + echo "$SYSTEM_NAME" + else + echo rs6000-ibm-aix3.2.5 + fi + elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then + echo rs6000-ibm-aix3.2.4 + else + echo rs6000-ibm-aix3.2 + fi + exit ;; + *:AIX:*:[456]) + IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` + if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then + IBM_ARCH=rs6000 + else + IBM_ARCH=powerpc + fi + if [ -x /usr/bin/oslevel ] ; then + IBM_REV=`/usr/bin/oslevel` + else + IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} + fi + echo ${IBM_ARCH}-ibm-aix${IBM_REV} + exit ;; + *:AIX:*:*) + echo rs6000-ibm-aix + exit ;; + ibmrt:4.4BSD:*|romp-ibm:BSD:*) + echo romp-ibm-bsd4.4 + exit ;; + ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and + echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to + exit ;; # report: romp-ibm BSD 4.3 + *:BOSX:*:*) + echo rs6000-bull-bosx + exit ;; + DPX/2?00:B.O.S.:*:*) + echo m68k-bull-sysv3 + exit ;; + 9000/[34]??:4.3bsd:1.*:*) + echo m68k-hp-bsd + exit ;; + hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*) + echo m68k-hp-bsd4.4 + exit ;; + 9000/[34678]??:HP-UX:*:*) + HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` + case "${UNAME_MACHINE}" in + 9000/31? ) HP_ARCH=m68000 ;; + 9000/[34]?? ) HP_ARCH=m68k ;; + 9000/[678][0-9][0-9]) + if [ -x /usr/bin/getconf ]; then + sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` + sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` + case "${sc_cpu_version}" in + 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 + 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 + 532) # CPU_PA_RISC2_0 + case "${sc_kernel_bits}" in + 32) HP_ARCH="hppa2.0n" ;; + 64) HP_ARCH="hppa2.0w" ;; + '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 + esac ;; + esac + fi + if [ "${HP_ARCH}" = "" ]; then + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + + #define _HPUX_SOURCE + #include + #include + + int main () + { + #if defined(_SC_KERNEL_BITS) + long bits = sysconf(_SC_KERNEL_BITS); + #endif + long cpu = sysconf (_SC_CPU_VERSION); + + switch (cpu) + { + case CPU_PA_RISC1_0: puts ("hppa1.0"); break; + case CPU_PA_RISC1_1: puts ("hppa1.1"); break; + case CPU_PA_RISC2_0: + #if defined(_SC_KERNEL_BITS) + switch (bits) + { + case 64: puts ("hppa2.0w"); break; + case 32: puts ("hppa2.0n"); break; + default: puts ("hppa2.0"); break; + } break; + #else /* !defined(_SC_KERNEL_BITS) */ + puts ("hppa2.0"); break; + #endif + default: puts ("hppa1.0"); break; + } + exit (0); + } +EOF + (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` + test -z "$HP_ARCH" && HP_ARCH=hppa + fi ;; + esac + if [ ${HP_ARCH} = "hppa2.0w" ] + then + eval $set_cc_for_build + + # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating + # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler + # generating 64-bit code. GNU and HP use different nomenclature: + # + # $ CC_FOR_BUILD=cc ./config.guess + # => hppa2.0w-hp-hpux11.23 + # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess + # => hppa64-hp-hpux11.23 + + if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | + grep __LP64__ >/dev/null + then + HP_ARCH="hppa2.0w" + else + HP_ARCH="hppa64" + fi + fi + echo ${HP_ARCH}-hp-hpux${HPUX_REV} + exit ;; + ia64:HP-UX:*:*) + HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` + echo ia64-hp-hpux${HPUX_REV} + exit ;; + 3050*:HI-UX:*:*) + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #include + int + main () + { + long cpu = sysconf (_SC_CPU_VERSION); + /* The order matters, because CPU_IS_HP_MC68K erroneously returns + true for CPU_PA_RISC1_0. CPU_IS_PA_RISC returns correct + results, however. */ + if (CPU_IS_PA_RISC (cpu)) + { + switch (cpu) + { + case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break; + case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break; + case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break; + default: puts ("hppa-hitachi-hiuxwe2"); break; + } + } + else if (CPU_IS_HP_MC68K (cpu)) + puts ("m68k-hitachi-hiuxwe2"); + else puts ("unknown-hitachi-hiuxwe2"); + exit (0); + } +EOF + $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` && + { echo "$SYSTEM_NAME"; exit; } + echo unknown-hitachi-hiuxwe2 + exit ;; + 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) + echo hppa1.1-hp-bsd + exit ;; + 9000/8??:4.3bsd:*:*) + echo hppa1.0-hp-bsd + exit ;; + *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) + echo hppa1.0-hp-mpeix + exit ;; + hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) + echo hppa1.1-hp-osf + exit ;; + hp8??:OSF1:*:*) + echo hppa1.0-hp-osf + exit ;; + i*86:OSF1:*:*) + if [ -x /usr/sbin/sysversion ] ; then + echo ${UNAME_MACHINE}-unknown-osf1mk + else + echo ${UNAME_MACHINE}-unknown-osf1 + fi + exit ;; + parisc*:Lites*:*:*) + echo hppa1.1-hp-lites + exit ;; + C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) + echo c1-convex-bsd + exit ;; + C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) + if getsysinfo -f scalar_acc + then echo c32-convex-bsd + else echo c2-convex-bsd + fi + exit ;; + C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) + echo c34-convex-bsd + exit ;; + C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) + echo c38-convex-bsd + exit ;; + C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) + echo c4-convex-bsd + exit ;; + CRAY*Y-MP:*:*:*) + echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit ;; + CRAY*[A-Z]90:*:*:*) + echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \ + | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ + -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \ + -e 's/\.[^.]*$/.X/' + exit ;; + CRAY*TS:*:*:*) + echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit ;; + CRAY*T3E:*:*:*) + echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit ;; + CRAY*SV1:*:*:*) + echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit ;; + *:UNICOS/mp:*:*) + echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit ;; + F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) + FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` + echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + exit ;; + 5000:UNIX_System_V:4.*:*) + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` + echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + exit ;; + i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) + echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} + exit ;; + sparc*:BSD/OS:*:*) + echo sparc-unknown-bsdi${UNAME_RELEASE} + exit ;; + *:BSD/OS:*:*) + echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} + exit ;; + *:FreeBSD:*:*) + case ${UNAME_MACHINE} in + pc98) + echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + amd64) + echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + *) + echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + esac + exit ;; + i*:CYGWIN*:*) + echo ${UNAME_MACHINE}-pc-cygwin + exit ;; + *:MINGW*:*) + echo ${UNAME_MACHINE}-pc-mingw32 + exit ;; + i*:windows32*:*) + # uname -m includes "-pc" on this system. + echo ${UNAME_MACHINE}-mingw32 + exit ;; + i*:PW*:*) + echo ${UNAME_MACHINE}-pc-pw32 + exit ;; + *:Interix*:[3456]*) + case ${UNAME_MACHINE} in + x86) + echo i586-pc-interix${UNAME_RELEASE} + exit ;; + EM64T | authenticamd) + echo x86_64-unknown-interix${UNAME_RELEASE} + exit ;; + IA64) + echo ia64-unknown-interix${UNAME_RELEASE} + exit ;; + esac ;; + [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) + echo i${UNAME_MACHINE}-pc-mks + exit ;; + i*:Windows_NT*:* | Pentium*:Windows_NT*:*) + # How do we know it's Interix rather than the generic POSIX subsystem? + # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we + # UNAME_MACHINE based on the output of uname instead of i386? + echo i586-pc-interix + exit ;; + i*:UWIN*:*) + echo ${UNAME_MACHINE}-pc-uwin + exit ;; + amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) + echo x86_64-unknown-cygwin + exit ;; + p*:CYGWIN*:*) + echo powerpcle-unknown-cygwin + exit ;; + prep*:SunOS:5.*:*) + echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; + *:GNU:*:*) + # the GNU system + echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` + exit ;; + *:GNU/*:*:*) + # other systems with GNU libc and userland + echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu + exit ;; + i*86:Minix:*:*) + echo ${UNAME_MACHINE}-pc-minix + exit ;; + arm*:Linux:*:*) + eval $set_cc_for_build + if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep -q __ARM_EABI__ + then + echo ${UNAME_MACHINE}-unknown-linux-gnu + else + echo ${UNAME_MACHINE}-unknown-linux-gnueabi + fi + exit ;; + avr32*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + cris:Linux:*:*) + echo cris-axis-linux-gnu + exit ;; + crisv32:Linux:*:*) + echo crisv32-axis-linux-gnu + exit ;; + frv:Linux:*:*) + echo frv-unknown-linux-gnu + exit ;; + ia64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + m32r*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + m68*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + mips:Linux:*:*) + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #undef CPU + #undef mips + #undef mipsel + #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) + CPU=mipsel + #else + #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) + CPU=mips + #else + CPU= + #endif + #endif +EOF + eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' + /^CPU/{ + s: ::g + p + }'`" + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } + ;; + mips64:Linux:*:*) + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #undef CPU + #undef mips64 + #undef mips64el + #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) + CPU=mips64el + #else + #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) + CPU=mips64 + #else + CPU= + #endif + #endif +EOF + eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' + /^CPU/{ + s: ::g + p + }'`" + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } + ;; + or32:Linux:*:*) + echo or32-unknown-linux-gnu + exit ;; + ppc:Linux:*:*) + echo powerpc-unknown-linux-gnu + exit ;; + ppc64:Linux:*:*) + echo powerpc64-unknown-linux-gnu + exit ;; + alpha:Linux:*:*) + case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in + EV5) UNAME_MACHINE=alphaev5 ;; + EV56) UNAME_MACHINE=alphaev56 ;; + PCA56) UNAME_MACHINE=alphapca56 ;; + PCA57) UNAME_MACHINE=alphapca56 ;; + EV6) UNAME_MACHINE=alphaev6 ;; + EV67) UNAME_MACHINE=alphaev67 ;; + EV68*) UNAME_MACHINE=alphaev68 ;; + esac + objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null + if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi + echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} + exit ;; + parisc:Linux:*:* | hppa:Linux:*:*) + # Look for CPU level + case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in + PA7*) echo hppa1.1-unknown-linux-gnu ;; + PA8*) echo hppa2.0-unknown-linux-gnu ;; + *) echo hppa-unknown-linux-gnu ;; + esac + exit ;; + parisc64:Linux:*:* | hppa64:Linux:*:*) + echo hppa64-unknown-linux-gnu + exit ;; + s390:Linux:*:* | s390x:Linux:*:*) + echo ${UNAME_MACHINE}-ibm-linux + exit ;; + sh64*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + sh*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + sparc:Linux:*:* | sparc64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + vax:Linux:*:*) + echo ${UNAME_MACHINE}-dec-linux-gnu + exit ;; + x86_64:Linux:*:*) + echo x86_64-unknown-linux-gnu + exit ;; + xtensa*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + i*86:Linux:*:*) + # The BFD linker knows what the default object file format is, so + # first see if it will tell us. cd to the root directory to prevent + # problems with other programs or directories called `ld' in the path. + # Set LC_ALL=C to ensure ld outputs messages in English. + ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \ + | sed -ne '/supported targets:/!d + s/[ ][ ]*/ /g + s/.*supported targets: *// + s/ .*// + p'` + case "$ld_supported_targets" in + elf32-i386) + TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" + ;; + a.out-i386-linux) + echo "${UNAME_MACHINE}-pc-linux-gnuaout" + exit ;; + coff-i386) + echo "${UNAME_MACHINE}-pc-linux-gnucoff" + exit ;; + "") + # Either a pre-BFD a.out linker (linux-gnuoldld) or + # one that does not give us useful --help. + echo "${UNAME_MACHINE}-pc-linux-gnuoldld" + exit ;; + esac + # Determine whether the default compiler is a.out or elf + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #include + #ifdef __ELF__ + # ifdef __GLIBC__ + # if __GLIBC__ >= 2 + LIBC=gnu + # else + LIBC=gnulibc1 + # endif + # else + LIBC=gnulibc1 + # endif + #else + #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) + LIBC=gnu + #else + LIBC=gnuaout + #endif + #endif + #ifdef __dietlibc__ + LIBC=dietlibc + #endif +EOF + eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' + /^LIBC/{ + s: ::g + p + }'`" + test x"${LIBC}" != x && { + echo "${UNAME_MACHINE}-pc-linux-${LIBC}" + exit + } + test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; } + ;; + i*86:DYNIX/ptx:4*:*) + # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. + # earlier versions are messed up and put the nodename in both + # sysname and nodename. + echo i386-sequent-sysv4 + exit ;; + i*86:UNIX_SV:4.2MP:2.*) + # Unixware is an offshoot of SVR4, but it has its own version + # number series starting with 2... + # I am not positive that other SVR4 systems won't match this, + # I just have to hope. -- rms. + # Use sysv4.2uw... so that sysv4* matches it. + echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} + exit ;; + i*86:OS/2:*:*) + # If we were able to find `uname', then EMX Unix compatibility + # is probably installed. + echo ${UNAME_MACHINE}-pc-os2-emx + exit ;; + i*86:XTS-300:*:STOP) + echo ${UNAME_MACHINE}-unknown-stop + exit ;; + i*86:atheos:*:*) + echo ${UNAME_MACHINE}-unknown-atheos + exit ;; + i*86:syllable:*:*) + echo ${UNAME_MACHINE}-pc-syllable + exit ;; + i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) + echo i386-unknown-lynxos${UNAME_RELEASE} + exit ;; + i*86:*DOS:*:*) + echo ${UNAME_MACHINE}-pc-msdosdjgpp + exit ;; + i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) + UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` + if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then + echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL} + else + echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} + fi + exit ;; + i*86:*:5:[678]*) + # UnixWare 7.x, OpenUNIX and OpenServer 6. + case `/bin/uname -X | grep "^Machine"` in + *486*) UNAME_MACHINE=i486 ;; + *Pentium) UNAME_MACHINE=i586 ;; + *Pent*|*Celeron) UNAME_MACHINE=i686 ;; + esac + echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} + exit ;; + i*86:*:3.2:*) + if test -f /usr/options/cb.name; then + UNAME_REL=`sed -n 's/.*Version //p' /dev/null >/dev/null ; then + UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')` + (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486 + (/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \ + && UNAME_MACHINE=i586 + (/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \ + && UNAME_MACHINE=i686 + (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \ + && UNAME_MACHINE=i686 + echo ${UNAME_MACHINE}-pc-sco$UNAME_REL + else + echo ${UNAME_MACHINE}-pc-sysv32 + fi + exit ;; + pc:*:*:*) + # Left here for compatibility: + # uname -m prints for DJGPP always 'pc', but it prints nothing about + # the processor, so we play safe by assuming i386. + echo i386-pc-msdosdjgpp + exit ;; + Intel:Mach:3*:*) + echo i386-pc-mach3 + exit ;; + paragon:*:*:*) + echo i860-intel-osf1 + exit ;; + i860:*:4.*:*) # i860-SVR4 + if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then + echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4 + else # Add other i860-SVR4 vendors below as they are discovered. + echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4 + fi + exit ;; + mini*:CTIX:SYS*5:*) + # "miniframe" + echo m68010-convergent-sysv + exit ;; + mc68k:UNIX:SYSTEM5:3.51m) + echo m68k-convergent-sysv + exit ;; + M680?0:D-NIX:5.3:*) + echo m68k-diab-dnix + exit ;; + M68*:*:R3V[5678]*:*) + test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;; + 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0) + OS_REL='' + test -r /etc/.relid \ + && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ + && { echo i486-ncr-sysv4.3${OS_REL}; exit; } + /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ + && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; + 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ + && { echo i486-ncr-sysv4; exit; } ;; + m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) + echo m68k-unknown-lynxos${UNAME_RELEASE} + exit ;; + mc68030:UNIX_System_V:4.*:*) + echo m68k-atari-sysv4 + exit ;; + TSUNAMI:LynxOS:2.*:*) + echo sparc-unknown-lynxos${UNAME_RELEASE} + exit ;; + rs6000:LynxOS:2.*:*) + echo rs6000-unknown-lynxos${UNAME_RELEASE} + exit ;; + PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*) + echo powerpc-unknown-lynxos${UNAME_RELEASE} + exit ;; + SM[BE]S:UNIX_SV:*:*) + echo mips-dde-sysv${UNAME_RELEASE} + exit ;; + RM*:ReliantUNIX-*:*:*) + echo mips-sni-sysv4 + exit ;; + RM*:SINIX-*:*:*) + echo mips-sni-sysv4 + exit ;; + *:SINIX-*:*:*) + if uname -p 2>/dev/null >/dev/null ; then + UNAME_MACHINE=`(uname -p) 2>/dev/null` + echo ${UNAME_MACHINE}-sni-sysv4 + else + echo ns32k-sni-sysv + fi + exit ;; + PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort + # says + echo i586-unisys-sysv4 + exit ;; + *:UNIX_System_V:4*:FTX*) + # From Gerald Hewes . + # How about differentiating between stratus architectures? -djm + echo hppa1.1-stratus-sysv4 + exit ;; + *:*:*:FTX*) + # From seanf@swdc.stratus.com. + echo i860-stratus-sysv4 + exit ;; + i*86:VOS:*:*) + # From Paul.Green@stratus.com. + echo ${UNAME_MACHINE}-stratus-vos + exit ;; + *:VOS:*:*) + # From Paul.Green@stratus.com. + echo hppa1.1-stratus-vos + exit ;; + mc68*:A/UX:*:*) + echo m68k-apple-aux${UNAME_RELEASE} + exit ;; + news*:NEWS-OS:6*:*) + echo mips-sony-newsos6 + exit ;; + R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) + if [ -d /usr/nec ]; then + echo mips-nec-sysv${UNAME_RELEASE} + else + echo mips-unknown-sysv${UNAME_RELEASE} + fi + exit ;; + BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. + echo powerpc-be-beos + exit ;; + BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only. + echo powerpc-apple-beos + exit ;; + BePC:BeOS:*:*) # BeOS running on Intel PC compatible. + echo i586-pc-beos + exit ;; + SX-4:SUPER-UX:*:*) + echo sx4-nec-superux${UNAME_RELEASE} + exit ;; + SX-5:SUPER-UX:*:*) + echo sx5-nec-superux${UNAME_RELEASE} + exit ;; + SX-6:SUPER-UX:*:*) + echo sx6-nec-superux${UNAME_RELEASE} + exit ;; + SX-7:SUPER-UX:*:*) + echo sx7-nec-superux${UNAME_RELEASE} + exit ;; + SX-8:SUPER-UX:*:*) + echo sx8-nec-superux${UNAME_RELEASE} + exit ;; + SX-8R:SUPER-UX:*:*) + echo sx8r-nec-superux${UNAME_RELEASE} + exit ;; + Power*:Rhapsody:*:*) + echo powerpc-apple-rhapsody${UNAME_RELEASE} + exit ;; + *:Rhapsody:*:*) + echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} + exit ;; + *:Darwin:*:*) + UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown + case $UNAME_PROCESSOR in + unknown) UNAME_PROCESSOR=powerpc ;; + esac + echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} + exit ;; + *:procnto*:*:* | *:QNX:[0123456789]*:*) + UNAME_PROCESSOR=`uname -p` + if test "$UNAME_PROCESSOR" = "x86"; then + UNAME_PROCESSOR=i386 + UNAME_MACHINE=pc + fi + echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} + exit ;; + *:QNX:*:4*) + echo i386-pc-qnx + exit ;; + NSE-?:NONSTOP_KERNEL:*:*) + echo nse-tandem-nsk${UNAME_RELEASE} + exit ;; + NSR-?:NONSTOP_KERNEL:*:*) + echo nsr-tandem-nsk${UNAME_RELEASE} + exit ;; + *:NonStop-UX:*:*) + echo mips-compaq-nonstopux + exit ;; + BS2000:POSIX*:*:*) + echo bs2000-siemens-sysv + exit ;; + DS/*:UNIX_System_V:*:*) + echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE} + exit ;; + *:Plan9:*:*) + # "uname -m" is not consistent, so use $cputype instead. 386 + # is converted to i386 for consistency with other x86 + # operating systems. + if test "$cputype" = "386"; then + UNAME_MACHINE=i386 + else + UNAME_MACHINE="$cputype" + fi + echo ${UNAME_MACHINE}-unknown-plan9 + exit ;; + *:TOPS-10:*:*) + echo pdp10-unknown-tops10 + exit ;; + *:TENEX:*:*) + echo pdp10-unknown-tenex + exit ;; + KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) + echo pdp10-dec-tops20 + exit ;; + XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*) + echo pdp10-xkl-tops20 + exit ;; + *:TOPS-20:*:*) + echo pdp10-unknown-tops20 + exit ;; + *:ITS:*:*) + echo pdp10-unknown-its + exit ;; + SEI:*:*:SEIUX) + echo mips-sei-seiux${UNAME_RELEASE} + exit ;; + *:DragonFly:*:*) + echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` + exit ;; + *:*VMS:*:*) + UNAME_MACHINE=`(uname -p) 2>/dev/null` + case "${UNAME_MACHINE}" in + A*) echo alpha-dec-vms ; exit ;; + I*) echo ia64-dec-vms ; exit ;; + V*) echo vax-dec-vms ; exit ;; + esac ;; + *:XENIX:*:SysV) + echo i386-pc-xenix + exit ;; + i*86:skyos:*:*) + echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//' + exit ;; + i*86:rdos:*:*) + echo ${UNAME_MACHINE}-pc-rdos + exit ;; +esac + +#echo '(No uname command or uname output not recognized.)' 1>&2 +#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2 + +eval $set_cc_for_build +cat >$dummy.c < +# include +#endif +main () +{ +#if defined (sony) +#if defined (MIPSEB) + /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed, + I don't know.... */ + printf ("mips-sony-bsd\n"); exit (0); +#else +#include + printf ("m68k-sony-newsos%s\n", +#ifdef NEWSOS4 + "4" +#else + "" +#endif + ); exit (0); +#endif +#endif + +#if defined (__arm) && defined (__acorn) && defined (__unix) + printf ("arm-acorn-riscix\n"); exit (0); +#endif + +#if defined (hp300) && !defined (hpux) + printf ("m68k-hp-bsd\n"); exit (0); +#endif + +#if defined (NeXT) +#if !defined (__ARCHITECTURE__) +#define __ARCHITECTURE__ "m68k" +#endif + int version; + version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`; + if (version < 4) + printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version); + else + printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version); + exit (0); +#endif + +#if defined (MULTIMAX) || defined (n16) +#if defined (UMAXV) + printf ("ns32k-encore-sysv\n"); exit (0); +#else +#if defined (CMU) + printf ("ns32k-encore-mach\n"); exit (0); +#else + printf ("ns32k-encore-bsd\n"); exit (0); +#endif +#endif +#endif + +#if defined (__386BSD__) + printf ("i386-pc-bsd\n"); exit (0); +#endif + +#if defined (sequent) +#if defined (i386) + printf ("i386-sequent-dynix\n"); exit (0); +#endif +#if defined (ns32000) + printf ("ns32k-sequent-dynix\n"); exit (0); +#endif +#endif + +#if defined (_SEQUENT_) + struct utsname un; + + uname(&un); + + if (strncmp(un.version, "V2", 2) == 0) { + printf ("i386-sequent-ptx2\n"); exit (0); + } + if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */ + printf ("i386-sequent-ptx1\n"); exit (0); + } + printf ("i386-sequent-ptx\n"); exit (0); + +#endif + +#if defined (vax) +# if !defined (ultrix) +# include +# if defined (BSD) +# if BSD == 43 + printf ("vax-dec-bsd4.3\n"); exit (0); +# else +# if BSD == 199006 + printf ("vax-dec-bsd4.3reno\n"); exit (0); +# else + printf ("vax-dec-bsd\n"); exit (0); +# endif +# endif +# else + printf ("vax-dec-bsd\n"); exit (0); +# endif +# else + printf ("vax-dec-ultrix\n"); exit (0); +# endif +#endif + +#if defined (alliant) && defined (i860) + printf ("i860-alliant-bsd\n"); exit (0); +#endif + + exit (1); +} +EOF + +$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` && + { echo "$SYSTEM_NAME"; exit; } + +# Apollos put the system type in the environment. + +test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; } + +# Convex versions that predate uname can use getsysinfo(1) + +if [ -x /usr/convex/getsysinfo ] +then + case `getsysinfo -f cpu_type` in + c1*) + echo c1-convex-bsd + exit ;; + c2*) + if getsysinfo -f scalar_acc + then echo c32-convex-bsd + else echo c2-convex-bsd + fi + exit ;; + c34*) + echo c34-convex-bsd + exit ;; + c38*) + echo c38-convex-bsd + exit ;; + c4*) + echo c4-convex-bsd + exit ;; + esac +fi + +cat >&2 < in order to provide the needed +information to handle your system. + +config.guess timestamp = $timestamp + +uname -m = `(uname -m) 2>/dev/null || echo unknown` +uname -r = `(uname -r) 2>/dev/null || echo unknown` +uname -s = `(uname -s) 2>/dev/null || echo unknown` +uname -v = `(uname -v) 2>/dev/null || echo unknown` + +/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null` +/bin/uname -X = `(/bin/uname -X) 2>/dev/null` + +hostinfo = `(hostinfo) 2>/dev/null` +/bin/universe = `(/bin/universe) 2>/dev/null` +/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null` +/bin/arch = `(/bin/arch) 2>/dev/null` +/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null` +/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null` + +UNAME_MACHINE = ${UNAME_MACHINE} +UNAME_RELEASE = ${UNAME_RELEASE} +UNAME_SYSTEM = ${UNAME_SYSTEM} +UNAME_VERSION = ${UNAME_VERSION} +EOF + +exit 1 + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "timestamp='" +# time-stamp-format: "%:y-%02m-%02d" +# time-stamp-end: "'" +# End: --- cairo-1.8.4.orig/config.sub +++ cairo-1.8.4/config.sub @@ -0,0 +1,1658 @@ +#! /bin/sh +# Configuration validation subroutine script. +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 +# Free Software Foundation, Inc. + +timestamp='2008-01-16' + +# This file is (in principle) common to ALL GNU software. +# The presence of a machine in this file suggests that SOME GNU software +# can handle that machine. It does not imply ALL GNU software can. +# +# This file is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA +# 02110-1301, USA. +# +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + + +# Please send patches to . Submit a context +# diff and a properly formatted ChangeLog entry. +# +# Configuration subroutine to validate and canonicalize a configuration type. +# Supply the specified configuration type as an argument. +# If it is invalid, we print an error message on stderr and exit with code 1. +# Otherwise, we print the canonical config type on stdout and succeed. + +# This file is supposed to be the same for all GNU packages +# and recognize all the CPU types, system types and aliases +# that are meaningful with *any* GNU software. +# Each package is responsible for reporting which valid configurations +# it does not support. The user should be able to distinguish +# a failure to support a valid configuration from a meaningless +# configuration. + +# The goal of this file is to map all the various variations of a given +# machine specification into a single specification in the form: +# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM +# or in some cases, the newer four-part form: +# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM +# It is wrong to echo any other type of specification. + +me=`echo "$0" | sed -e 's,.*/,,'` + +usage="\ +Usage: $0 [OPTION] CPU-MFR-OPSYS + $0 [OPTION] ALIAS + +Canonicalize a configuration name. + +Operation modes: + -h, --help print this help, then exit + -t, --time-stamp print date of last modification, then exit + -v, --version print version number, then exit + +Report bugs and patches to ." + +version="\ +GNU config.sub ($timestamp) + +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, +2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + +This is free software; see the source for copying conditions. There is NO +warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." + +help=" +Try \`$me --help' for more information." + +# Parse command line +while test $# -gt 0 ; do + case $1 in + --time-stamp | --time* | -t ) + echo "$timestamp" ; exit ;; + --version | -v ) + echo "$version" ; exit ;; + --help | --h* | -h ) + echo "$usage"; exit ;; + -- ) # Stop option processing + shift; break ;; + - ) # Use stdin as input. + break ;; + -* ) + echo "$me: invalid option $1$help" + exit 1 ;; + + *local*) + # First pass through any local machine types. + echo $1 + exit ;; + + * ) + break ;; + esac +done + +case $# in + 0) echo "$me: missing argument$help" >&2 + exit 1;; + 1) ;; + *) echo "$me: too many arguments$help" >&2 + exit 1;; +esac + +# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any). +# Here we must recognize all the valid KERNEL-OS combinations. +maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` +case $maybe_os in + nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ + uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ + storm-chaos* | os2-emx* | rtmk-nova*) + os=-$maybe_os + basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` + ;; + *) + basic_machine=`echo $1 | sed 's/-[^-]*$//'` + if [ $basic_machine != $1 ] + then os=`echo $1 | sed 's/.*-/-/'` + else os=; fi + ;; +esac + +### Let's recognize common machines as not being operating systems so +### that things like config.sub decstation-3100 work. We also +### recognize some manufacturers as not being operating systems, so we +### can provide default operating systems below. +case $os in + -sun*os*) + # Prevent following clause from handling this invalid input. + ;; + -dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \ + -att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \ + -unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \ + -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ + -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ + -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ + -apple | -axis | -knuth | -cray) + os= + basic_machine=$1 + ;; + -sim | -cisco | -oki | -wec | -winbond) + os= + basic_machine=$1 + ;; + -scout) + ;; + -wrs) + os=-vxworks + basic_machine=$1 + ;; + -chorusos*) + os=-chorusos + basic_machine=$1 + ;; + -chorusrdb) + os=-chorusrdb + basic_machine=$1 + ;; + -hiux*) + os=-hiuxwe2 + ;; + -sco6) + os=-sco5v6 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -sco5) + os=-sco3.2v5 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -sco4) + os=-sco3.2v4 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -sco3.2.[4-9]*) + os=`echo $os | sed -e 's/sco3.2./sco3.2v/'` + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -sco3.2v[4-9]*) + # Don't forget version if it is 3.2v4 or newer. + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -sco5v6*) + # Don't forget version if it is 3.2v4 or newer. + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -sco*) + os=-sco3.2v2 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -udk*) + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -isc) + os=-isc2.2 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -clix*) + basic_machine=clipper-intergraph + ;; + -isc*) + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -lynx*) + os=-lynxos + ;; + -ptx*) + basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'` + ;; + -windowsnt*) + os=`echo $os | sed -e 's/windowsnt/winnt/'` + ;; + -psos*) + os=-psos + ;; + -mint | -mint[0-9]*) + basic_machine=m68k-atari + os=-mint + ;; +esac + +# Decode aliases for certain CPU-COMPANY combinations. +case $basic_machine in + # Recognize the basic CPU types without company name. + # Some are omitted here because they have special meanings below. + 1750a | 580 \ + | a29k \ + | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ + | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ + | am33_2.0 \ + | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ + | bfin \ + | c4x | clipper \ + | d10v | d30v | dlx | dsp16xx \ + | fido | fr30 | frv \ + | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ + | i370 | i860 | i960 | ia64 \ + | ip2k | iq2000 \ + | m32c | m32r | m32rle | m68000 | m68k | m88k \ + | maxq | mb | microblaze | mcore | mep \ + | mips | mipsbe | mipseb | mipsel | mipsle \ + | mips16 \ + | mips64 | mips64el \ + | mips64vr | mips64vrel \ + | mips64orion | mips64orionel \ + | mips64vr4100 | mips64vr4100el \ + | mips64vr4300 | mips64vr4300el \ + | mips64vr5000 | mips64vr5000el \ + | mips64vr5900 | mips64vr5900el \ + | mipsisa32 | mipsisa32el \ + | mipsisa32r2 | mipsisa32r2el \ + | mipsisa64 | mipsisa64el \ + | mipsisa64r2 | mipsisa64r2el \ + | mipsisa64sb1 | mipsisa64sb1el \ + | mipsisa64sr71k | mipsisa64sr71kel \ + | mipstx39 | mipstx39el \ + | mn10200 | mn10300 \ + | mt \ + | msp430 \ + | nios | nios2 \ + | ns16k | ns32k \ + | or32 \ + | pdp10 | pdp11 | pj | pjl \ + | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ + | pyramid \ + | score \ + | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ + | sh64 | sh64le \ + | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ + | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ + | spu | strongarm \ + | tahoe | thumb | tic4x | tic80 | tron \ + | v850 | v850e \ + | we32k \ + | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ + | z8k) + basic_machine=$basic_machine-unknown + ;; + m6811 | m68hc11 | m6812 | m68hc12) + # Motorola 68HC11/12. + basic_machine=$basic_machine-unknown + os=-none + ;; + m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k) + ;; + ms1) + basic_machine=mt-unknown + ;; + + # We use `pc' rather than `unknown' + # because (1) that's what they normally are, and + # (2) the word "unknown" tends to confuse beginning users. + i*86 | x86_64) + basic_machine=$basic_machine-pc + ;; + # Object if more than one company name word. + *-*-*) + echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 + exit 1 + ;; + # Recognize the basic CPU types with company name. + 580-* \ + | a29k-* \ + | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ + | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ + | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ + | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ + | avr-* | avr32-* \ + | bfin-* | bs2000-* \ + | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ + | clipper-* | craynv-* | cydra-* \ + | d10v-* | d30v-* | dlx-* \ + | elxsi-* \ + | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ + | h8300-* | h8500-* \ + | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ + | i*86-* | i860-* | i960-* | ia64-* \ + | ip2k-* | iq2000-* \ + | m32c-* | m32r-* | m32rle-* \ + | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ + | m88110-* | m88k-* | maxq-* | mcore-* \ + | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ + | mips16-* \ + | mips64-* | mips64el-* \ + | mips64vr-* | mips64vrel-* \ + | mips64orion-* | mips64orionel-* \ + | mips64vr4100-* | mips64vr4100el-* \ + | mips64vr4300-* | mips64vr4300el-* \ + | mips64vr5000-* | mips64vr5000el-* \ + | mips64vr5900-* | mips64vr5900el-* \ + | mipsisa32-* | mipsisa32el-* \ + | mipsisa32r2-* | mipsisa32r2el-* \ + | mipsisa64-* | mipsisa64el-* \ + | mipsisa64r2-* | mipsisa64r2el-* \ + | mipsisa64sb1-* | mipsisa64sb1el-* \ + | mipsisa64sr71k-* | mipsisa64sr71kel-* \ + | mipstx39-* | mipstx39el-* \ + | mmix-* \ + | mt-* \ + | msp430-* \ + | nios-* | nios2-* \ + | none-* | np1-* | ns16k-* | ns32k-* \ + | orion-* \ + | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ + | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ + | pyramid-* \ + | romp-* | rs6000-* \ + | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ + | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ + | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ + | sparclite-* \ + | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ + | tahoe-* | thumb-* \ + | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ + | tron-* \ + | v850-* | v850e-* | vax-* \ + | we32k-* \ + | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ + | xstormy16-* | xtensa*-* \ + | ymp-* \ + | z8k-*) + ;; + # Recognize the basic CPU types without company name, with glob match. + xtensa*) + basic_machine=$basic_machine-unknown + ;; + # Recognize the various machine names and aliases which stand + # for a CPU type and a company and sometimes even an OS. + 386bsd) + basic_machine=i386-unknown + os=-bsd + ;; + 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc) + basic_machine=m68000-att + ;; + 3b*) + basic_machine=we32k-att + ;; + a29khif) + basic_machine=a29k-amd + os=-udi + ;; + abacus) + basic_machine=abacus-unknown + ;; + adobe68k) + basic_machine=m68010-adobe + os=-scout + ;; + alliant | fx80) + basic_machine=fx80-alliant + ;; + altos | altos3068) + basic_machine=m68k-altos + ;; + am29k) + basic_machine=a29k-none + os=-bsd + ;; + amd64) + basic_machine=x86_64-pc + ;; + amd64-*) + basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + amdahl) + basic_machine=580-amdahl + os=-sysv + ;; + amiga | amiga-*) + basic_machine=m68k-unknown + ;; + amigaos | amigados) + basic_machine=m68k-unknown + os=-amigaos + ;; + amigaunix | amix) + basic_machine=m68k-unknown + os=-sysv4 + ;; + apollo68) + basic_machine=m68k-apollo + os=-sysv + ;; + apollo68bsd) + basic_machine=m68k-apollo + os=-bsd + ;; + aux) + basic_machine=m68k-apple + os=-aux + ;; + balance) + basic_machine=ns32k-sequent + os=-dynix + ;; + blackfin) + basic_machine=bfin-unknown + os=-linux + ;; + blackfin-*) + basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; + c90) + basic_machine=c90-cray + os=-unicos + ;; + convex-c1) + basic_machine=c1-convex + os=-bsd + ;; + convex-c2) + basic_machine=c2-convex + os=-bsd + ;; + convex-c32) + basic_machine=c32-convex + os=-bsd + ;; + convex-c34) + basic_machine=c34-convex + os=-bsd + ;; + convex-c38) + basic_machine=c38-convex + os=-bsd + ;; + cray | j90) + basic_machine=j90-cray + os=-unicos + ;; + craynv) + basic_machine=craynv-cray + os=-unicosmp + ;; + cr16) + basic_machine=cr16-unknown + os=-elf + ;; + crds | unos) + basic_machine=m68k-crds + ;; + crisv32 | crisv32-* | etraxfs*) + basic_machine=crisv32-axis + ;; + cris | cris-* | etrax*) + basic_machine=cris-axis + ;; + crx) + basic_machine=crx-unknown + os=-elf + ;; + da30 | da30-*) + basic_machine=m68k-da30 + ;; + decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn) + basic_machine=mips-dec + ;; + decsystem10* | dec10*) + basic_machine=pdp10-dec + os=-tops10 + ;; + decsystem20* | dec20*) + basic_machine=pdp10-dec + os=-tops20 + ;; + delta | 3300 | motorola-3300 | motorola-delta \ + | 3300-motorola | delta-motorola) + basic_machine=m68k-motorola + ;; + delta88) + basic_machine=m88k-motorola + os=-sysv3 + ;; + djgpp) + basic_machine=i586-pc + os=-msdosdjgpp + ;; + dpx20 | dpx20-*) + basic_machine=rs6000-bull + os=-bosx + ;; + dpx2* | dpx2*-bull) + basic_machine=m68k-bull + os=-sysv3 + ;; + ebmon29k) + basic_machine=a29k-amd + os=-ebmon + ;; + elxsi) + basic_machine=elxsi-elxsi + os=-bsd + ;; + encore | umax | mmax) + basic_machine=ns32k-encore + ;; + es1800 | OSE68k | ose68k | ose | OSE) + basic_machine=m68k-ericsson + os=-ose + ;; + fx2800) + basic_machine=i860-alliant + ;; + genix) + basic_machine=ns32k-ns + ;; + gmicro) + basic_machine=tron-gmicro + os=-sysv + ;; + go32) + basic_machine=i386-pc + os=-go32 + ;; + h3050r* | hiux*) + basic_machine=hppa1.1-hitachi + os=-hiuxwe2 + ;; + h8300hms) + basic_machine=h8300-hitachi + os=-hms + ;; + h8300xray) + basic_machine=h8300-hitachi + os=-xray + ;; + h8500hms) + basic_machine=h8500-hitachi + os=-hms + ;; + harris) + basic_machine=m88k-harris + os=-sysv3 + ;; + hp300-*) + basic_machine=m68k-hp + ;; + hp300bsd) + basic_machine=m68k-hp + os=-bsd + ;; + hp300hpux) + basic_machine=m68k-hp + os=-hpux + ;; + hp3k9[0-9][0-9] | hp9[0-9][0-9]) + basic_machine=hppa1.0-hp + ;; + hp9k2[0-9][0-9] | hp9k31[0-9]) + basic_machine=m68000-hp + ;; + hp9k3[2-9][0-9]) + basic_machine=m68k-hp + ;; + hp9k6[0-9][0-9] | hp6[0-9][0-9]) + basic_machine=hppa1.0-hp + ;; + hp9k7[0-79][0-9] | hp7[0-79][0-9]) + basic_machine=hppa1.1-hp + ;; + hp9k78[0-9] | hp78[0-9]) + # FIXME: really hppa2.0-hp + basic_machine=hppa1.1-hp + ;; + hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893) + # FIXME: really hppa2.0-hp + basic_machine=hppa1.1-hp + ;; + hp9k8[0-9][13679] | hp8[0-9][13679]) + basic_machine=hppa1.1-hp + ;; + hp9k8[0-9][0-9] | hp8[0-9][0-9]) + basic_machine=hppa1.0-hp + ;; + hppa-next) + os=-nextstep3 + ;; + hppaosf) + basic_machine=hppa1.1-hp + os=-osf + ;; + hppro) + basic_machine=hppa1.1-hp + os=-proelf + ;; + i370-ibm* | ibm*) + basic_machine=i370-ibm + ;; +# I'm not sure what "Sysv32" means. Should this be sysv3.2? + i*86v32) + basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` + os=-sysv32 + ;; + i*86v4*) + basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` + os=-sysv4 + ;; + i*86v) + basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` + os=-sysv + ;; + i*86sol2) + basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` + os=-solaris2 + ;; + i386mach) + basic_machine=i386-mach + os=-mach + ;; + i386-vsta | vsta) + basic_machine=i386-unknown + os=-vsta + ;; + iris | iris4d) + basic_machine=mips-sgi + case $os in + -irix*) + ;; + *) + os=-irix4 + ;; + esac + ;; + isi68 | isi) + basic_machine=m68k-isi + os=-sysv + ;; + m68knommu) + basic_machine=m68k-unknown + os=-linux + ;; + m68knommu-*) + basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; + m88k-omron*) + basic_machine=m88k-omron + ;; + magnum | m3230) + basic_machine=mips-mips + os=-sysv + ;; + merlin) + basic_machine=ns32k-utek + os=-sysv + ;; + mingw32) + basic_machine=i386-pc + os=-mingw32 + ;; + mingw32ce) + basic_machine=arm-unknown + os=-mingw32ce + ;; + miniframe) + basic_machine=m68000-convergent + ;; + *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*) + basic_machine=m68k-atari + os=-mint + ;; + mips3*-*) + basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'` + ;; + mips3*) + basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown + ;; + monitor) + basic_machine=m68k-rom68k + os=-coff + ;; + morphos) + basic_machine=powerpc-unknown + os=-morphos + ;; + msdos) + basic_machine=i386-pc + os=-msdos + ;; + ms1-*) + basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` + ;; + mvs) + basic_machine=i370-ibm + os=-mvs + ;; + ncr3000) + basic_machine=i486-ncr + os=-sysv4 + ;; + netbsd386) + basic_machine=i386-unknown + os=-netbsd + ;; + netwinder) + basic_machine=armv4l-rebel + os=-linux + ;; + news | news700 | news800 | news900) + basic_machine=m68k-sony + os=-newsos + ;; + news1000) + basic_machine=m68030-sony + os=-newsos + ;; + news-3600 | risc-news) + basic_machine=mips-sony + os=-newsos + ;; + necv70) + basic_machine=v70-nec + os=-sysv + ;; + next | m*-next ) + basic_machine=m68k-next + case $os in + -nextstep* ) + ;; + -ns2*) + os=-nextstep2 + ;; + *) + os=-nextstep3 + ;; + esac + ;; + nh3000) + basic_machine=m68k-harris + os=-cxux + ;; + nh[45]000) + basic_machine=m88k-harris + os=-cxux + ;; + nindy960) + basic_machine=i960-intel + os=-nindy + ;; + mon960) + basic_machine=i960-intel + os=-mon960 + ;; + nonstopux) + basic_machine=mips-compaq + os=-nonstopux + ;; + np1) + basic_machine=np1-gould + ;; + nsr-tandem) + basic_machine=nsr-tandem + ;; + op50n-* | op60c-*) + basic_machine=hppa1.1-oki + os=-proelf + ;; + openrisc | openrisc-*) + basic_machine=or32-unknown + ;; + os400) + basic_machine=powerpc-ibm + os=-os400 + ;; + OSE68000 | ose68000) + basic_machine=m68000-ericsson + os=-ose + ;; + os68k) + basic_machine=m68k-none + os=-os68k + ;; + pa-hitachi) + basic_machine=hppa1.1-hitachi + os=-hiuxwe2 + ;; + paragon) + basic_machine=i860-intel + os=-osf + ;; + parisc) + basic_machine=hppa-unknown + os=-linux + ;; + parisc-*) + basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; + pbd) + basic_machine=sparc-tti + ;; + pbb) + basic_machine=m68k-tti + ;; + pc532 | pc532-*) + basic_machine=ns32k-pc532 + ;; + pc98) + basic_machine=i386-pc + ;; + pc98-*) + basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + pentium | p5 | k5 | k6 | nexgen | viac3) + basic_machine=i586-pc + ;; + pentiumpro | p6 | 6x86 | athlon | athlon_*) + basic_machine=i686-pc + ;; + pentiumii | pentium2 | pentiumiii | pentium3) + basic_machine=i686-pc + ;; + pentium4) + basic_machine=i786-pc + ;; + pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) + basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + pentiumpro-* | p6-* | 6x86-* | athlon-*) + basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) + basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + pentium4-*) + basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + pn) + basic_machine=pn-gould + ;; + power) basic_machine=power-ibm + ;; + ppc) basic_machine=powerpc-unknown + ;; + ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + ppcle | powerpclittle | ppc-le | powerpc-little) + basic_machine=powerpcle-unknown + ;; + ppcle-* | powerpclittle-*) + basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + ppc64) basic_machine=powerpc64-unknown + ;; + ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + ppc64le | powerpc64little | ppc64-le | powerpc64-little) + basic_machine=powerpc64le-unknown + ;; + ppc64le-* | powerpc64little-*) + basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + ps2) + basic_machine=i386-ibm + ;; + pw32) + basic_machine=i586-unknown + os=-pw32 + ;; + rdos) + basic_machine=i386-pc + os=-rdos + ;; + rom68k) + basic_machine=m68k-rom68k + os=-coff + ;; + rm[46]00) + basic_machine=mips-siemens + ;; + rtpc | rtpc-*) + basic_machine=romp-ibm + ;; + s390 | s390-*) + basic_machine=s390-ibm + ;; + s390x | s390x-*) + basic_machine=s390x-ibm + ;; + sa29200) + basic_machine=a29k-amd + os=-udi + ;; + sb1) + basic_machine=mipsisa64sb1-unknown + ;; + sb1el) + basic_machine=mipsisa64sb1el-unknown + ;; + sde) + basic_machine=mipsisa32-sde + os=-elf + ;; + sei) + basic_machine=mips-sei + os=-seiux + ;; + sequent) + basic_machine=i386-sequent + ;; + sh) + basic_machine=sh-hitachi + os=-hms + ;; + sh5el) + basic_machine=sh5le-unknown + ;; + sh64) + basic_machine=sh64-unknown + ;; + sparclite-wrs | simso-wrs) + basic_machine=sparclite-wrs + os=-vxworks + ;; + sps7) + basic_machine=m68k-bull + os=-sysv2 + ;; + spur) + basic_machine=spur-unknown + ;; + st2000) + basic_machine=m68k-tandem + ;; + stratus) + basic_machine=i860-stratus + os=-sysv4 + ;; + sun2) + basic_machine=m68000-sun + ;; + sun2os3) + basic_machine=m68000-sun + os=-sunos3 + ;; + sun2os4) + basic_machine=m68000-sun + os=-sunos4 + ;; + sun3os3) + basic_machine=m68k-sun + os=-sunos3 + ;; + sun3os4) + basic_machine=m68k-sun + os=-sunos4 + ;; + sun4os3) + basic_machine=sparc-sun + os=-sunos3 + ;; + sun4os4) + basic_machine=sparc-sun + os=-sunos4 + ;; + sun4sol2) + basic_machine=sparc-sun + os=-solaris2 + ;; + sun3 | sun3-*) + basic_machine=m68k-sun + ;; + sun4) + basic_machine=sparc-sun + ;; + sun386 | sun386i | roadrunner) + basic_machine=i386-sun + ;; + sv1) + basic_machine=sv1-cray + os=-unicos + ;; + symmetry) + basic_machine=i386-sequent + os=-dynix + ;; + t3e) + basic_machine=alphaev5-cray + os=-unicos + ;; + t90) + basic_machine=t90-cray + os=-unicos + ;; + tic54x | c54x*) + basic_machine=tic54x-unknown + os=-coff + ;; + tic55x | c55x*) + basic_machine=tic55x-unknown + os=-coff + ;; + tic6x | c6x*) + basic_machine=tic6x-unknown + os=-coff + ;; + tile*) + basic_machine=tile-unknown + os=-linux-gnu + ;; + tx39) + basic_machine=mipstx39-unknown + ;; + tx39el) + basic_machine=mipstx39el-unknown + ;; + toad1) + basic_machine=pdp10-xkl + os=-tops20 + ;; + tower | tower-32) + basic_machine=m68k-ncr + ;; + tpf) + basic_machine=s390x-ibm + os=-tpf + ;; + udi29k) + basic_machine=a29k-amd + os=-udi + ;; + ultra3) + basic_machine=a29k-nyu + os=-sym1 + ;; + v810 | necv810) + basic_machine=v810-nec + os=-none + ;; + vaxv) + basic_machine=vax-dec + os=-sysv + ;; + vms) + basic_machine=vax-dec + os=-vms + ;; + vpp*|vx|vx-*) + basic_machine=f301-fujitsu + ;; + vxworks960) + basic_machine=i960-wrs + os=-vxworks + ;; + vxworks68) + basic_machine=m68k-wrs + os=-vxworks + ;; + vxworks29k) + basic_machine=a29k-wrs + os=-vxworks + ;; + w65*) + basic_machine=w65-wdc + os=-none + ;; + w89k-*) + basic_machine=hppa1.1-winbond + os=-proelf + ;; + xbox) + basic_machine=i686-pc + os=-mingw32 + ;; + xps | xps100) + basic_machine=xps100-honeywell + ;; + ymp) + basic_machine=ymp-cray + os=-unicos + ;; + z8k-*-coff) + basic_machine=z8k-unknown + os=-sim + ;; + none) + basic_machine=none-none + os=-none + ;; + +# Here we handle the default manufacturer of certain CPU types. It is in +# some cases the only manufacturer, in others, it is the most popular. + w89k) + basic_machine=hppa1.1-winbond + ;; + op50n) + basic_machine=hppa1.1-oki + ;; + op60c) + basic_machine=hppa1.1-oki + ;; + romp) + basic_machine=romp-ibm + ;; + mmix) + basic_machine=mmix-knuth + ;; + rs6000) + basic_machine=rs6000-ibm + ;; + vax) + basic_machine=vax-dec + ;; + pdp10) + # there are many clones, so DEC is not a safe bet + basic_machine=pdp10-unknown + ;; + pdp11) + basic_machine=pdp11-dec + ;; + we32k) + basic_machine=we32k-att + ;; + sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele) + basic_machine=sh-unknown + ;; + sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) + basic_machine=sparc-sun + ;; + cydra) + basic_machine=cydra-cydrome + ;; + orion) + basic_machine=orion-highlevel + ;; + orion105) + basic_machine=clipper-highlevel + ;; + mac | mpw | mac-mpw) + basic_machine=m68k-apple + ;; + pmac | pmac-mpw) + basic_machine=powerpc-apple + ;; + *-unknown) + # Make sure to match an already-canonicalized machine name. + ;; + *) + echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 + exit 1 + ;; +esac + +# Here we canonicalize certain aliases for manufacturers. +case $basic_machine in + *-digital*) + basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'` + ;; + *-commodore*) + basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'` + ;; + *) + ;; +esac + +# Decode manufacturer-specific aliases for certain operating systems. + +if [ x"$os" != x"" ] +then +case $os in + # First match some system type aliases + # that might get confused with valid system types. + # -solaris* is a basic system type, with this one exception. + -solaris1 | -solaris1.*) + os=`echo $os | sed -e 's|solaris1|sunos4|'` + ;; + -solaris) + os=-solaris2 + ;; + -svr4*) + os=-sysv4 + ;; + -unixware*) + os=-sysv4.2uw + ;; + -gnu/linux*) + os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'` + ;; + # First accept the basic system types. + # The portable systems comes first. + # Each alternative MUST END IN A *, to match a version number. + # -sysv* is not here because it comes later, after sysvr4. + -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ + | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\ + | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ + | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ + | -aos* \ + | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ + | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ + | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ + | -openbsd* | -solidbsd* \ + | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ + | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ + | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ + | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ + | -chorusos* | -chorusrdb* \ + | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ + | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ + | -uxpv* | -beos* | -mpeix* | -udk* \ + | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ + | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ + | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ + | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ + | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ + | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ + | -skyos* | -haiku* | -rdos* | -toppers* | -drops*) + # Remember, each alternative MUST END IN *, to match a version number. + ;; + -qnx*) + case $basic_machine in + x86-* | i*86-*) + ;; + *) + os=-nto$os + ;; + esac + ;; + -nto-qnx*) + ;; + -nto*) + os=`echo $os | sed -e 's|nto|nto-qnx|'` + ;; + -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ + | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \ + | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) + ;; + -mac*) + os=`echo $os | sed -e 's|mac|macos|'` + ;; + -linux-dietlibc) + os=-linux-dietlibc + ;; + -linux*) + os=`echo $os | sed -e 's|linux|linux-gnu|'` + ;; + -sunos5*) + os=`echo $os | sed -e 's|sunos5|solaris2|'` + ;; + -sunos6*) + os=`echo $os | sed -e 's|sunos6|solaris3|'` + ;; + -opened*) + os=-openedition + ;; + -os400*) + os=-os400 + ;; + -wince*) + os=-wince + ;; + -osfrose*) + os=-osfrose + ;; + -osf*) + os=-osf + ;; + -utek*) + os=-bsd + ;; + -dynix*) + os=-bsd + ;; + -acis*) + os=-aos + ;; + -atheos*) + os=-atheos + ;; + -syllable*) + os=-syllable + ;; + -386bsd) + os=-bsd + ;; + -ctix* | -uts*) + os=-sysv + ;; + -nova*) + os=-rtmk-nova + ;; + -ns2 ) + os=-nextstep2 + ;; + -nsk*) + os=-nsk + ;; + # Preserve the version number of sinix5. + -sinix5.*) + os=`echo $os | sed -e 's|sinix|sysv|'` + ;; + -sinix*) + os=-sysv4 + ;; + -tpf*) + os=-tpf + ;; + -triton*) + os=-sysv3 + ;; + -oss*) + os=-sysv3 + ;; + -svr4) + os=-sysv4 + ;; + -svr3) + os=-sysv3 + ;; + -sysvr4) + os=-sysv4 + ;; + # This must come after -sysvr4. + -sysv*) + ;; + -ose*) + os=-ose + ;; + -es1800*) + os=-ose + ;; + -xenix) + os=-xenix + ;; + -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) + os=-mint + ;; + -aros*) + os=-aros + ;; + -kaos*) + os=-kaos + ;; + -zvmoe) + os=-zvmoe + ;; + -none) + ;; + *) + # Get rid of the `-' at the beginning of $os. + os=`echo $os | sed 's/[^-]*-//'` + echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2 + exit 1 + ;; +esac +else + +# Here we handle the default operating systems that come with various machines. +# The value should be what the vendor currently ships out the door with their +# machine or put another way, the most popular os provided with the machine. + +# Note that if you're going to try to match "-MANUFACTURER" here (say, +# "-sun"), then you have to tell the case statement up towards the top +# that MANUFACTURER isn't an operating system. Otherwise, code above +# will signal an error saying that MANUFACTURER isn't an operating +# system, and we'll never get to this point. + +case $basic_machine in + score-*) + os=-elf + ;; + spu-*) + os=-elf + ;; + *-acorn) + os=-riscix1.2 + ;; + arm*-rebel) + os=-linux + ;; + arm*-semi) + os=-aout + ;; + c4x-* | tic4x-*) + os=-coff + ;; + # This must come before the *-dec entry. + pdp10-*) + os=-tops20 + ;; + pdp11-*) + os=-none + ;; + *-dec | vax-*) + os=-ultrix4.2 + ;; + m68*-apollo) + os=-domain + ;; + i386-sun) + os=-sunos4.0.2 + ;; + m68000-sun) + os=-sunos3 + # This also exists in the configure program, but was not the + # default. + # os=-sunos4 + ;; + m68*-cisco) + os=-aout + ;; + mep-*) + os=-elf + ;; + mips*-cisco) + os=-elf + ;; + mips*-*) + os=-elf + ;; + or32-*) + os=-coff + ;; + *-tti) # must be before sparc entry or we get the wrong os. + os=-sysv3 + ;; + sparc-* | *-sun) + os=-sunos4.1.1 + ;; + *-be) + os=-beos + ;; + *-haiku) + os=-haiku + ;; + *-ibm) + os=-aix + ;; + *-knuth) + os=-mmixware + ;; + *-wec) + os=-proelf + ;; + *-winbond) + os=-proelf + ;; + *-oki) + os=-proelf + ;; + *-hp) + os=-hpux + ;; + *-hitachi) + os=-hiux + ;; + i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent) + os=-sysv + ;; + *-cbm) + os=-amigaos + ;; + *-dg) + os=-dgux + ;; + *-dolphin) + os=-sysv3 + ;; + m68k-ccur) + os=-rtu + ;; + m88k-omron*) + os=-luna + ;; + *-next ) + os=-nextstep + ;; + *-sequent) + os=-ptx + ;; + *-crds) + os=-unos + ;; + *-ns) + os=-genix + ;; + i370-*) + os=-mvs + ;; + *-next) + os=-nextstep3 + ;; + *-gould) + os=-sysv + ;; + *-highlevel) + os=-bsd + ;; + *-encore) + os=-bsd + ;; + *-sgi) + os=-irix + ;; + *-siemens) + os=-sysv4 + ;; + *-masscomp) + os=-rtu + ;; + f30[01]-fujitsu | f700-fujitsu) + os=-uxpv + ;; + *-rom68k) + os=-coff + ;; + *-*bug) + os=-coff + ;; + *-apple) + os=-macos + ;; + *-atari*) + os=-mint + ;; + *) + os=-none + ;; +esac +fi + +# Here we handle the case where we know the os, and the CPU type, but not the +# manufacturer. We pick the logical manufacturer. +vendor=unknown +case $basic_machine in + *-unknown) + case $os in + -riscix*) + vendor=acorn + ;; + -sunos*) + vendor=sun + ;; + -aix*) + vendor=ibm + ;; + -beos*) + vendor=be + ;; + -hpux*) + vendor=hp + ;; + -mpeix*) + vendor=hp + ;; + -hiux*) + vendor=hitachi + ;; + -unos*) + vendor=crds + ;; + -dgux*) + vendor=dg + ;; + -luna*) + vendor=omron + ;; + -genix*) + vendor=ns + ;; + -mvs* | -opened*) + vendor=ibm + ;; + -os400*) + vendor=ibm + ;; + -ptx*) + vendor=sequent + ;; + -tpf*) + vendor=ibm + ;; + -vxsim* | -vxworks* | -windiss*) + vendor=wrs + ;; + -aux*) + vendor=apple + ;; + -hms*) + vendor=hitachi + ;; + -mpw* | -macos*) + vendor=apple + ;; + -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) + vendor=atari + ;; + -vos*) + vendor=stratus + ;; + esac + basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"` + ;; +esac + +echo $basic_machine$os +exit + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "timestamp='" +# time-stamp-format: "%:y-%02m-%02d" +# time-stamp-end: "'" +# End: --- cairo-1.8.4.orig/debian/libcairo2-doc.doc-base +++ cairo-1.8.4/debian/libcairo2-doc.doc-base @@ -0,0 +1,11 @@ +Document: libcairo2-doc +Title: Cairo Reference Manual +Author: Cairo Project +Abstract: Cairo is a multi-platform library providing anti-aliased + vector-based rendering for multiple target backends. + This document covers programming using the Cairo library. +Section: Programming/C + +Format: HTML +Index: /usr/share/gtk-doc/html/cairo/index.html +Files: /usr/share/gtk-doc/html/cairo/*.html --- cairo-1.8.4.orig/debian/copyright +++ cairo-1.8.4/debian/copyright @@ -0,0 +1,533 @@ +This is the Debian package of the Cairo multi-platform 2D graphics library + +Packaged by Dave Beckett + +It was downloaded from http://cairographics.org/snapshots/ + +---------------------------------------------------------------------- + Copyright 1999 Tom Tromey + Copyright 2002, 2003 University of Southern California, Information + Sciences Institute (ISI) + Copyright 2000, 2002, 2004, 2005 Keith Packard + Copyright 2004 Calum Robinson + Copyright 2004 Richard D. Worth + Copyright 2004, 2005 Red Hat, Inc. + + Copyright 2004 David Reveman + Permission to use, copy, modify, distribute, and sell this software + and its documentation for any purpose is hereby granted without + fee, provided that the above copyright notice appear in all copies + and that both that copyright notice and this permission notice + appear in supporting documentation, and that the name of David + Reveman not be used in advertising or publicity pertaining to + distribution of the software without specific, written prior + permission. David Reveman makes no representations about the + suitability of this software for any purpose. It is provided "as + is" without express or implied warranty. + + DAVID REVEMAN DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS + SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND + FITNESS, IN NO EVENT SHALL DAVID REVEMAN BE LIABLE FOR ANY SPECIAL, + INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER + RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION + OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR + IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + + Author: David Reveman + +---------------------------------------------------------------------- + +Cairo is free software. + +Every source file in the implementation of cairo is available to be +redistributed and/or modified under the terms of either the GNU Lesser +General Public License (LPGL) version 2.1 or the Mozilla Public +License (MPL) version 1.1. Some files are available under more +liberal terms, but we believe that in all cases, each file may be used +under either the LGPL or the MPL. + +See the following files in this directory for the precise terms and +conditions of either license: + + COPYING-LGPL-2.1 + COPYING-MPL-1.1 + +Please see each file in the implementation for Copyright and licensing +information. + +---------------------------------------------------------------------- +On Debian systems, the complete text of the GNU General Lesser Public +License 2.1 can be found in /usr/share/common-licenses/LGPL-2.1 + +The Mozilla Public License 1.1 (COPYING-MPL-1.1 above) follows: + + MOZILLA PUBLIC LICENSE + Version 1.1 + + --------------- + +1. Definitions. + + 1.0.1. "Commercial Use" means distribution or otherwise making the + Covered Code available to a third party. + + 1.1. "Contributor" means each entity that creates or contributes to + the creation of Modifications. + + 1.2. "Contributor Version" means the combination of the Original + Code, prior Modifications used by a Contributor, and the Modifications + made by that particular Contributor. + + 1.3. "Covered Code" means the Original Code or Modifications or the + combination of the Original Code and Modifications, in each case + including portions thereof. + + 1.4. "Electronic Distribution Mechanism" means a mechanism generally + accepted in the software development community for the electronic + transfer of data. + + 1.5. "Executable" means Covered Code in any form other than Source + Code. + + 1.6. "Initial Developer" means the individual or entity identified + as the Initial Developer in the Source Code notice required by Exhibit + A. + + 1.7. "Larger Work" means a work which combines Covered Code or + portions thereof with code not governed by the terms of this License. + + 1.8. "License" means this document. + + 1.8.1. "Licensable" means having the right to grant, to the maximum + extent possible, whether at the time of the initial grant or + subsequently acquired, any and all of the rights conveyed herein. + + 1.9. "Modifications" means any addition to or deletion from the + substance or structure of either the Original Code or any previous + Modifications. When Covered Code is released as a series of files, a + Modification is: + A. Any addition to or deletion from the contents of a file + containing Original Code or previous Modifications. + + B. Any new file that contains any part of the Original Code or + previous Modifications. + + 1.10. "Original Code" means Source Code of computer software code + which is described in the Source Code notice required by Exhibit A as + Original Code, and which, at the time of its release under this + License is not already Covered Code governed by this License. + + 1.10.1. "Patent Claims" means any patent claim(s), now owned or + hereafter acquired, including without limitation, method, process, + and apparatus claims, in any patent Licensable by grantor. + + 1.11. "Source Code" means the preferred form of the Covered Code for + making modifications to it, including all modules it contains, plus + any associated interface definition files, scripts used to control + compilation and installation of an Executable, or source code + differential comparisons against either the Original Code or another + well known, available Covered Code of the Contributor's choice. The + Source Code can be in a compressed or archival form, provided the + appropriate decompression or de-archiving software is widely available + for no charge. + + 1.12. "You" (or "Your") means an individual or a legal entity + exercising rights under, and complying with all of the terms of, this + License or a future version of this License issued under Section 6.1. + For legal entities, "You" includes any entity which controls, is + controlled by, or is under common control with You. For purposes of + this definition, "control" means (a) the power, direct or indirect, + to cause the direction or management of such entity, whether by + contract or otherwise, or (b) ownership of more than fifty percent + (50%) of the outstanding shares or beneficial ownership of such + entity. + +2. Source Code License. + + 2.1. The Initial Developer Grant. + The Initial Developer hereby grants You a world-wide, royalty-free, + non-exclusive license, subject to third party intellectual property + claims: + (a) under intellectual property rights (other than patent or + trademark) Licensable by Initial Developer to use, reproduce, + modify, display, perform, sublicense and distribute the Original + Code (or portions thereof) with or without Modifications, and/or + as part of a Larger Work; and + + (b) under Patents Claims infringed by the making, using or + selling of Original Code, to make, have made, use, practice, + sell, and offer for sale, and/or otherwise dispose of the + Original Code (or portions thereof). + + (c) the licenses granted in this Section 2.1(a) and (b) are + effective on the date Initial Developer first distributes + Original Code under the terms of this License. + + (d) Notwithstanding Section 2.1(b) above, no patent license is + granted: 1) for code that You delete from the Original Code; 2) + separate from the Original Code; or 3) for infringements caused + by: i) the modification of the Original Code or ii) the + combination of the Original Code with other software or devices. + + 2.2. Contributor Grant. + Subject to third party intellectual property claims, each Contributor + hereby grants You a world-wide, royalty-free, non-exclusive license + + (a) under intellectual property rights (other than patent or + trademark) Licensable by Contributor, to use, reproduce, modify, + display, perform, sublicense and distribute the Modifications + created by such Contributor (or portions thereof) either on an + unmodified basis, with other Modifications, as Covered Code + and/or as part of a Larger Work; and + + (b) under Patent Claims infringed by the making, using, or + selling of Modifications made by that Contributor either alone + and/or in combination with its Contributor Version (or portions + of such combination), to make, use, sell, offer for sale, have + made, and/or otherwise dispose of: 1) Modifications made by that + Contributor (or portions thereof); and 2) the combination of + Modifications made by that Contributor with its Contributor + Version (or portions of such combination). + + (c) the licenses granted in Sections 2.2(a) and 2.2(b) are + effective on the date Contributor first makes Commercial Use of + the Covered Code. + + (d) Notwithstanding Section 2.2(b) above, no patent license is + granted: 1) for any code that Contributor has deleted from the + Contributor Version; 2) separate from the Contributor Version; + 3) for infringements caused by: i) third party modifications of + Contributor Version or ii) the combination of Modifications made + by that Contributor with other software (except as part of the + Contributor Version) or other devices; or 4) under Patent Claims + infringed by Covered Code in the absence of Modifications made by + that Contributor. + +3. Distribution Obligations. + + 3.1. Application of License. + The Modifications which You create or to which You contribute are + governed by the terms of this License, including without limitation + Section 2.2. The Source Code version of Covered Code may be + distributed only under the terms of this License or a future version + of this License released under Section 6.1, and You must include a + copy of this License with every copy of the Source Code You + distribute. You may not offer or impose any terms on any Source Code + version that alters or restricts the applicable version of this + License or the recipients' rights hereunder. However, You may include + an additional document offering the additional rights described in + Section 3.5. + + 3.2. Availability of Source Code. + Any Modification which You create or to which You contribute must be + made available in Source Code form under the terms of this License + either on the same media as an Executable version or via an accepted + Electronic Distribution Mechanism to anyone to whom you made an + Executable version available; and if made available via Electronic + Distribution Mechanism, must remain available for at least twelve (12) + months after the date it initially became available, or at least six + (6) months after a subsequent version of that particular Modification + has been made available to such recipients. You are responsible for + ensuring that the Source Code version remains available even if the + Electronic Distribution Mechanism is maintained by a third party. + + 3.3. Description of Modifications. + You must cause all Covered Code to which You contribute to contain a + file documenting the changes You made to create that Covered Code and + the date of any change. You must include a prominent statement that + the Modification is derived, directly or indirectly, from Original + Code provided by the Initial Developer and including the name of the + Initial Developer in (a) the Source Code, and (b) in any notice in an + Executable version or related documentation in which You describe the + origin or ownership of the Covered Code. + + 3.4. Intellectual Property Matters + (a) Third Party Claims. + If Contributor has knowledge that a license under a third party's + intellectual property rights is required to exercise the rights + granted by such Contributor under Sections 2.1 or 2.2, + Contributor must include a text file with the Source Code + distribution titled "LEGAL" which describes the claim and the + party making the claim in sufficient detail that a recipient will + know whom to contact. If Contributor obtains such knowledge after + the Modification is made available as described in Section 3.2, + Contributor shall promptly modify the LEGAL file in all copies + Contributor makes available thereafter and shall take other steps + (such as notifying appropriate mailing lists or newsgroups) + reasonably calculated to inform those who received the Covered + Code that new knowledge has been obtained. + + (b) Contributor APIs. + If Contributor's Modifications include an application programming + interface and Contributor has knowledge of patent licenses which + are reasonably necessary to implement that API, Contributor must + also include this information in the LEGAL file. + + (c) Representations. + Contributor represents that, except as disclosed pursuant to + Section 3.4(a) above, Contributor believes that Contributor's + Modifications are Contributor's original creation(s) and/or + Contributor has sufficient rights to grant the rights conveyed by + this License. + + 3.5. Required Notices. + You must duplicate the notice in Exhibit A in each file of the Source + Code. If it is not possible to put such notice in a particular Source + Code file due to its structure, then You must include such notice in a + location (such as a relevant directory) where a user would be likely + to look for such a notice. If You created one or more Modification(s) + You may add your name as a Contributor to the notice described in + Exhibit A. You must also duplicate this License in any documentation + for the Source Code where You describe recipients' rights or ownership + rights relating to Covered Code. You may choose to offer, and to + charge a fee for, warranty, support, indemnity or liability + obligations to one or more recipients of Covered Code. However, You + may do so only on Your own behalf, and not on behalf of the Initial + Developer or any Contributor. You must make it absolutely clear than + any such warranty, support, indemnity or liability obligation is + offered by You alone, and You hereby agree to indemnify the Initial + Developer and every Contributor for any liability incurred by the + Initial Developer or such Contributor as a result of warranty, + support, indemnity or liability terms You offer. + + 3.6. Distribution of Executable Versions. + You may distribute Covered Code in Executable form only if the + requirements of Section 3.1-3.5 have been met for that Covered Code, + and if You include a notice stating that the Source Code version of + the Covered Code is available under the terms of this License, + including a description of how and where You have fulfilled the + obligations of Section 3.2. The notice must be conspicuously included + in any notice in an Executable version, related documentation or + collateral in which You describe recipients' rights relating to the + Covered Code. You may distribute the Executable version of Covered + Code or ownership rights under a license of Your choice, which may + contain terms different from this License, provided that You are in + compliance with the terms of this License and that the license for the + Executable version does not attempt to limit or alter the recipient's + rights in the Source Code version from the rights set forth in this + License. If You distribute the Executable version under a different + license You must make it absolutely clear that any terms which differ + from this License are offered by You alone, not by the Initial + Developer or any Contributor. You hereby agree to indemnify the + Initial Developer and every Contributor for any liability incurred by + the Initial Developer or such Contributor as a result of any such + terms You offer. + + 3.7. Larger Works. + You may create a Larger Work by combining Covered Code with other code + not governed by the terms of this License and distribute the Larger + Work as a single product. In such a case, You must make sure the + requirements of this License are fulfilled for the Covered Code. + +4. Inability to Comply Due to Statute or Regulation. + + If it is impossible for You to comply with any of the terms of this + License with respect to some or all of the Covered Code due to + statute, judicial order, or regulation then You must: (a) comply with + the terms of this License to the maximum extent possible; and (b) + describe the limitations and the code they affect. Such description + must be included in the LEGAL file described in Section 3.4 and must + be included with all distributions of the Source Code. Except to the + extent prohibited by statute or regulation, such description must be + sufficiently detailed for a recipient of ordinary skill to be able to + understand it. + +5. Application of this License. + + This License applies to code to which the Initial Developer has + attached the notice in Exhibit A and to related Covered Code. + +6. Versions of the License. + + 6.1. New Versions. + Netscape Communications Corporation ("Netscape") may publish revised + and/or new versions of the License from time to time. Each version + will be given a distinguishing version number. + + 6.2. Effect of New Versions. + Once Covered Code has been published under a particular version of the + License, You may always continue to use it under the terms of that + version. You may also choose to use such Covered Code under the terms + of any subsequent version of the License published by Netscape. No one + other than Netscape has the right to modify the terms applicable to + Covered Code created under this License. + + 6.3. Derivative Works. + If You create or use a modified version of this License (which you may + only do in order to apply it to code which is not already Covered Code + governed by this License), You must (a) rename Your license so that + the phrases "Mozilla", "MOZILLAPL", "MOZPL", "Netscape", + "MPL", "NPL" or any confusingly similar phrase do not appear in your + license (except to note that your license differs from this License) + and (b) otherwise make it clear that Your version of the license + contains terms which differ from the Mozilla Public License and + Netscape Public License. (Filling in the name of the Initial + Developer, Original Code or Contributor in the notice described in + Exhibit A shall not of themselves be deemed to be modifications of + this License.) + +7. DISCLAIMER OF WARRANTY. + + COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, + WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, + WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF + DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. + THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED CODE + IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT, + YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE + COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER + OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF + ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER. + +8. TERMINATION. + + 8.1. This License and the rights granted hereunder will terminate + automatically if You fail to comply with terms herein and fail to cure + such breach within 30 days of becoming aware of the breach. All + sublicenses to the Covered Code which are properly granted shall + survive any termination of this License. Provisions which, by their + nature, must remain in effect beyond the termination of this License + shall survive. + + 8.2. If You initiate litigation by asserting a patent infringement + claim (excluding declatory judgment actions) against Initial Developer + or a Contributor (the Initial Developer or Contributor against whom + You file such action is referred to as "Participant") alleging that: + + (a) such Participant's Contributor Version directly or indirectly + infringes any patent, then any and all rights granted by such + Participant to You under Sections 2.1 and/or 2.2 of this License + shall, upon 60 days notice from Participant terminate prospectively, + unless if within 60 days after receipt of notice You either: (i) + agree in writing to pay Participant a mutually agreeable reasonable + royalty for Your past and future use of Modifications made by such + Participant, or (ii) withdraw Your litigation claim with respect to + the Contributor Version against such Participant. If within 60 days + of notice, a reasonable royalty and payment arrangement are not + mutually agreed upon in writing by the parties or the litigation claim + is not withdrawn, the rights granted by Participant to You under + Sections 2.1 and/or 2.2 automatically terminate at the expiration of + the 60 day notice period specified above. + + (b) any software, hardware, or device, other than such Participant's + Contributor Version, directly or indirectly infringes any patent, then + any rights granted to You by such Participant under Sections 2.1(b) + and 2.2(b) are revoked effective as of the date You first made, used, + sold, distributed, or had made, Modifications made by that + Participant. + + 8.3. If You assert a patent infringement claim against Participant + alleging that such Participant's Contributor Version directly or + indirectly infringes any patent where such claim is resolved (such as + by license or settlement) prior to the initiation of patent + infringement litigation, then the reasonable value of the licenses + granted by such Participant under Sections 2.1 or 2.2 shall be taken + into account in determining the amount or value of any payment or + license. + + 8.4. In the event of termination under Sections 8.1 or 8.2 above, + all end user license agreements (excluding distributors and resellers) + which have been validly granted by You or any distributor hereunder + prior to termination shall survive termination. + +9. LIMITATION OF LIABILITY. + + UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT + (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL + DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE, + OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR + ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY + CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, + WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER + COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN + INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF + LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY + RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW + PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE + EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO + THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU. + +10. U.S. GOVERNMENT END USERS. + + The Covered Code is a "commercial item," as that term is defined in + 48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer + software" and "commercial computer software documentation," as such + terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48 + C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995), + all U.S. Government End Users acquire Covered Code with only those + rights set forth herein. + +11. MISCELLANEOUS. + + This License represents the complete agreement concerning subject + matter hereof. If any provision of this License is held to be + unenforceable, such provision shall be reformed only to the extent + necessary to make it enforceable. This License shall be governed by + California law provisions (except to the extent applicable law, if + any, provides otherwise), excluding its conflict-of-law provisions. + With respect to disputes in which at least one party is a citizen of, + or an entity chartered or registered to do business in the United + States of America, any litigation relating to this License shall be + subject to the jurisdiction of the Federal Courts of the Northern + District of California, with venue lying in Santa Clara County, + California, with the losing party responsible for costs, including + without limitation, court costs and reasonable attorneys' fees and + expenses. The application of the United Nations Convention on + Contracts for the International Sale of Goods is expressly excluded. + Any law or regulation which provides that the language of a contract + shall be construed against the drafter shall not apply to this + License. + +12. RESPONSIBILITY FOR CLAIMS. + + As between Initial Developer and the Contributors, each party is + responsible for claims and damages arising, directly or indirectly, + out of its utilization of rights under this License and You agree to + work with Initial Developer and Contributors to distribute such + responsibility on an equitable basis. Nothing herein is intended or + shall be deemed to constitute any admission of liability. + +13. MULTIPLE-LICENSED CODE. + + Initial Developer may designate portions of the Covered Code as + "Multiple-Licensed". "Multiple-Licensed" means that the Initial + Developer permits you to utilize portions of the Covered Code under + Your choice of the NPL or the alternative licenses, if any, specified + by the Initial Developer in the file described in Exhibit A. + +EXHIBIT A -Mozilla Public License. + + ``The contents of this file are subject to the Mozilla Public License + Version 1.1 (the "License"); you may not use this file except in + compliance with the License. You may obtain a copy of the License at + http://www.mozilla.org/MPL/ + + Software distributed under the License is distributed on an "AS IS" + basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the + License for the specific language governing rights and limitations + under the License. + + The Original Code is ______________________________________. + + The Initial Developer of the Original Code is ________________________. + Portions created by ______________________ are Copyright (C) ______ + _______________________. All Rights Reserved. + + Contributor(s): ______________________________________. + + Alternatively, the contents of this file may be used under the terms + of the _____ license (the "[___] License"), in which case the + provisions of [______] License are applicable instead of those + above. If you wish to allow use of your version of this file only + under the terms of the [____] License and not to allow others to use + your version of this file under the MPL, indicate your decision by + deleting the provisions above and replace them with the notice and + other provisions required by the [___] License. If you do not delete + the provisions above, a recipient may use your version of this file + under either the MPL or the [___] License." + + [NOTE: The text of this Exhibit A may differ slightly from the text of + the notices in the Source Code files of the Original Code. You should + use the text of this Exhibit A rather than the text found in the + Original Code Source Code for Your Modifications.] + --- cairo-1.8.4.orig/debian/libcairo2.symbols +++ cairo-1.8.4/debian/libcairo2.symbols @@ -0,0 +1,282 @@ +libcairo.so.2 libcairo2 #MINVER# +* Build-Depends-Package: libcairo2-dev + cairo_append_path@Base 1.2.4 + cairo_arc@Base 1.2.4 + cairo_arc_negative@Base 1.2.4 + cairo_clip@Base 1.2.4 + cairo_clip_extents@Base 1.4.10 + cairo_clip_preserve@Base 1.2.4 + cairo_close_path@Base 1.2.4 + cairo_copy_clip_rectangle_list@Base 1.4.10 + cairo_copy_page@Base 1.2.4 + cairo_copy_path@Base 1.2.4 + cairo_copy_path_flat@Base 1.2.4 + cairo_create@Base 1.2.4 + cairo_curve_to@Base 1.2.4 + cairo_debug_reset_static_data@Base 1.2.4 + cairo_destroy@Base 1.2.4 + cairo_device_to_user@Base 1.2.4 + cairo_device_to_user_distance@Base 1.2.4 + cairo_directfb_surface_create@Base 1.8.2-2~ + cairo_fill@Base 1.2.4 + cairo_fill_extents@Base 1.2.4 + cairo_fill_preserve@Base 1.2.4 + cairo_font_extents@Base 1.2.4 + cairo_font_face_destroy@Base 1.2.4 + cairo_font_face_get_reference_count@Base 1.4.10 + cairo_font_face_get_type@Base 1.2.4 + cairo_font_face_get_user_data@Base 1.2.4 + cairo_font_face_reference@Base 1.2.4 + cairo_font_face_set_user_data@Base 1.2.4 + cairo_font_face_status@Base 1.2.4 + cairo_font_options_copy@Base 1.2.4 + cairo_font_options_create@Base 1.2.4 + cairo_font_options_destroy@Base 1.2.4 + cairo_font_options_equal@Base 1.2.4 + cairo_font_options_get_antialias@Base 1.2.4 + cairo_font_options_get_hint_metrics@Base 1.2.4 + cairo_font_options_get_hint_style@Base 1.2.4 + cairo_font_options_get_subpixel_order@Base 1.2.4 + cairo_font_options_hash@Base 1.2.4 + cairo_font_options_merge@Base 1.2.4 + cairo_font_options_set_antialias@Base 1.2.4 + cairo_font_options_set_hint_metrics@Base 1.2.4 + cairo_font_options_set_hint_style@Base 1.2.4 + cairo_font_options_set_subpixel_order@Base 1.2.4 + cairo_font_options_status@Base 1.2.4 + cairo_format_stride_for_width@Base 1.6.0 + cairo_ft_font_face_create_for_ft_face@Base 1.2.4 + cairo_ft_font_face_create_for_pattern@Base 1.2.4 + cairo_ft_font_options_substitute@Base 1.2.4 + cairo_ft_scaled_font_lock_face@Base 1.2.4 + cairo_ft_scaled_font_unlock_face@Base 1.2.4 + cairo_get_antialias@Base 1.2.4 + cairo_get_current_point@Base 1.2.4 + cairo_get_dash@Base 1.4.10 + cairo_get_dash_count@Base 1.4.10 + cairo_get_fill_rule@Base 1.2.4 + cairo_get_font_face@Base 1.2.4 + cairo_get_font_matrix@Base 1.2.4 + cairo_get_font_options@Base 1.2.4 + cairo_get_group_target@Base 1.2.4 + cairo_get_line_cap@Base 1.2.4 + cairo_get_line_join@Base 1.2.4 + cairo_get_line_width@Base 1.2.4 + cairo_get_matrix@Base 1.2.4 + cairo_get_miter_limit@Base 1.2.4 + cairo_get_operator@Base 1.2.4 + cairo_get_reference_count@Base 1.4.10 + cairo_get_scaled_font@Base 1.4.10 + cairo_get_source@Base 1.2.4 + cairo_get_target@Base 1.2.4 + cairo_get_tolerance@Base 1.2.4 + cairo_get_user_data@Base 1.4.10 + cairo_glyph_allocate@Base 1.7.2 + cairo_glyph_extents@Base 1.2.4 + cairo_glyph_free@Base 1.7.2 + cairo_glyph_path@Base 1.2.4 + cairo_has_current_point@Base 1.6.0 + cairo_identity_matrix@Base 1.2.4 + cairo_image_surface_create@Base 1.2.4 + cairo_image_surface_create_for_data@Base 1.2.4 + cairo_image_surface_create_from_png@Base 1.2.4 + cairo_image_surface_create_from_png_stream@Base 1.2.4 + cairo_image_surface_get_data@Base 1.2.4 + cairo_image_surface_get_format@Base 1.2.4 + cairo_image_surface_get_height@Base 1.2.4 + cairo_image_surface_get_stride@Base 1.2.4 + cairo_image_surface_get_width@Base 1.2.4 + cairo_in_fill@Base 1.2.4 + cairo_in_stroke@Base 1.2.4 + cairo_line_to@Base 1.2.4 + cairo_mask@Base 1.2.4 + cairo_mask_surface@Base 1.2.4 + cairo_matrix_init@Base 1.2.4 + cairo_matrix_init_identity@Base 1.2.4 + cairo_matrix_init_rotate@Base 1.2.4 + cairo_matrix_init_scale@Base 1.2.4 + cairo_matrix_init_translate@Base 1.2.4 + cairo_matrix_invert@Base 1.2.4 + cairo_matrix_multiply@Base 1.2.4 + cairo_matrix_rotate@Base 1.2.4 + cairo_matrix_scale@Base 1.2.4 + cairo_matrix_transform_distance@Base 1.2.4 + cairo_matrix_transform_point@Base 1.2.4 + cairo_matrix_translate@Base 1.2.4 + cairo_move_to@Base 1.2.4 + cairo_new_path@Base 1.2.4 + cairo_new_sub_path@Base 1.2.4 + cairo_paint@Base 1.2.4 + cairo_paint_with_alpha@Base 1.2.4 + cairo_path_destroy@Base 1.2.4 + cairo_path_extents@Base 1.6.0 + cairo_pattern_add_color_stop_rgb@Base 1.2.4 + cairo_pattern_add_color_stop_rgba@Base 1.2.4 + cairo_pattern_create_for_surface@Base 1.2.4 + cairo_pattern_create_linear@Base 1.2.4 + cairo_pattern_create_radial@Base 1.2.4 + cairo_pattern_create_rgb@Base 1.2.4 + cairo_pattern_create_rgba@Base 1.2.4 + cairo_pattern_destroy@Base 1.2.4 + cairo_pattern_get_color_stop_count@Base 1.4.10 + cairo_pattern_get_color_stop_rgba@Base 1.4.10 + cairo_pattern_get_extend@Base 1.2.4 + cairo_pattern_get_filter@Base 1.2.4 + cairo_pattern_get_linear_points@Base 1.4.10 + cairo_pattern_get_matrix@Base 1.2.4 + cairo_pattern_get_radial_circles@Base 1.4.10 + cairo_pattern_get_reference_count@Base 1.4.10 + cairo_pattern_get_rgba@Base 1.4.10 + cairo_pattern_get_surface@Base 1.4.10 + cairo_pattern_get_type@Base 1.2.4 + cairo_pattern_get_user_data@Base 1.4.10 + cairo_pattern_reference@Base 1.2.4 + cairo_pattern_set_extend@Base 1.2.4 + cairo_pattern_set_filter@Base 1.2.4 + cairo_pattern_set_matrix@Base 1.2.4 + cairo_pattern_set_user_data@Base 1.4.10 + cairo_pattern_status@Base 1.2.4 + cairo_pdf_surface_create@Base 1.2.4 + cairo_pdf_surface_create_for_stream@Base 1.2.4 + cairo_pdf_surface_set_size@Base 1.2.4 + cairo_pop_group@Base 1.2.4 + cairo_pop_group_to_source@Base 1.2.4 + cairo_ps_get_levels@Base 1.6.0 + cairo_ps_level_to_string@Base 1.6.0 + cairo_ps_surface_create@Base 1.2.4 + cairo_ps_surface_create_for_stream@Base 1.2.4 + cairo_ps_surface_dsc_begin_page_setup@Base 1.2.4 + cairo_ps_surface_dsc_begin_setup@Base 1.2.4 + cairo_ps_surface_dsc_comment@Base 1.2.4 + cairo_ps_surface_get_eps@Base 1.6.0 + cairo_ps_surface_restrict_to_level@Base 1.6.0 + cairo_ps_surface_set_eps@Base 1.6.0 + cairo_ps_surface_set_size@Base 1.2.4 + cairo_push_group@Base 1.2.4 + cairo_push_group_with_content@Base 1.2.4 + cairo_rectangle@Base 1.2.4 + cairo_rectangle_list_destroy@Base 1.4.10 + cairo_reference@Base 1.2.4 + cairo_rel_curve_to@Base 1.2.4 + cairo_rel_line_to@Base 1.2.4 + cairo_rel_move_to@Base 1.2.4 + cairo_reset_clip@Base 1.2.4 + cairo_restore@Base 1.2.4 + cairo_rotate@Base 1.2.4 + cairo_save@Base 1.2.4 + cairo_scale@Base 1.2.4 + cairo_scaled_font_create@Base 1.2.4 + cairo_scaled_font_destroy@Base 1.2.4 + cairo_scaled_font_extents@Base 1.2.4 + cairo_scaled_font_get_ctm@Base 1.2.4 + cairo_scaled_font_get_font_face@Base 1.2.4 + cairo_scaled_font_get_font_matrix@Base 1.2.4 + cairo_scaled_font_get_font_options@Base 1.2.4 + cairo_scaled_font_get_reference_count@Base 1.4.10 + cairo_scaled_font_get_scale_matrix@Base 1.7.2 + cairo_scaled_font_get_type@Base 1.2.4 + cairo_scaled_font_get_user_data@Base 1.4.10 + cairo_scaled_font_glyph_extents@Base 1.2.4 + cairo_scaled_font_reference@Base 1.2.4 + cairo_scaled_font_set_user_data@Base 1.4.10 + cairo_scaled_font_status@Base 1.2.4 + cairo_scaled_font_text_extents@Base 1.2.4 + cairo_scaled_font_text_to_glyphs@Base 1.7.2 + cairo_select_font_face@Base 1.2.4 + cairo_set_antialias@Base 1.2.4 + cairo_set_dash@Base 1.2.4 + cairo_set_fill_rule@Base 1.2.4 + cairo_set_font_face@Base 1.2.4 + cairo_set_font_matrix@Base 1.2.4 + cairo_set_font_options@Base 1.2.4 + cairo_set_font_size@Base 1.2.4 + cairo_set_line_cap@Base 1.2.4 + cairo_set_line_join@Base 1.2.4 + cairo_set_line_width@Base 1.2.4 + cairo_set_matrix@Base 1.2.4 + cairo_set_miter_limit@Base 1.2.4 + cairo_set_operator@Base 1.2.4 + cairo_set_scaled_font@Base 1.2.4 + cairo_set_source@Base 1.2.4 + cairo_set_source_rgb@Base 1.2.4 + cairo_set_source_rgba@Base 1.2.4 + cairo_set_source_surface@Base 1.2.4 + cairo_set_tolerance@Base 1.2.4 + cairo_set_user_data@Base 1.4.10 + cairo_show_glyphs@Base 1.2.4 + cairo_show_page@Base 1.2.4 + cairo_show_text@Base 1.2.4 + cairo_show_text_glyphs@Base 1.7.2 + cairo_status@Base 1.2.4 + cairo_status_to_string@Base 1.2.4 + cairo_stroke@Base 1.2.4 + cairo_stroke_extents@Base 1.2.4 + cairo_stroke_preserve@Base 1.2.4 + cairo_surface_copy_page@Base 1.6.0 + cairo_surface_create_similar@Base 1.2.4 + cairo_surface_destroy@Base 1.2.4 + cairo_surface_finish@Base 1.2.4 + cairo_surface_flush@Base 1.2.4 + cairo_surface_get_content@Base 1.2.4 + cairo_surface_get_device_offset@Base 1.2.4 + cairo_surface_get_fallback_resolution@Base 1.7.2 + cairo_surface_get_font_options@Base 1.2.4 + cairo_surface_get_reference_count@Base 1.4.10 + cairo_surface_get_type@Base 1.2.4 + cairo_surface_get_user_data@Base 1.2.4 + cairo_surface_has_show_text_glyphs@Base 1.8.0 + cairo_surface_mark_dirty@Base 1.2.4 + cairo_surface_mark_dirty_rectangle@Base 1.2.4 + cairo_surface_reference@Base 1.2.4 + cairo_surface_set_device_offset@Base 1.2.4 + cairo_surface_set_fallback_resolution@Base 1.2.4 + cairo_surface_set_user_data@Base 1.2.4 + cairo_surface_show_page@Base 1.6.0 + cairo_surface_status@Base 1.2.4 + cairo_surface_write_to_png@Base 1.2.4 + cairo_surface_write_to_png_stream@Base 1.2.4 + cairo_svg_get_versions@Base 1.2.4 + cairo_svg_surface_create@Base 1.2.4 + cairo_svg_surface_create_for_stream@Base 1.2.4 + cairo_svg_surface_restrict_to_version@Base 1.2.4 + cairo_svg_version_to_string@Base 1.2.4 + cairo_text_cluster_allocate@Base 1.7.2 + cairo_text_cluster_free@Base 1.7.2 + cairo_text_extents@Base 1.2.4 + cairo_text_path@Base 1.2.4 + cairo_toy_font_face_create@Base 1.7.2 + cairo_toy_font_face_get_family@Base 1.7.2 + cairo_toy_font_face_get_slant@Base 1.7.2 + cairo_toy_font_face_get_weight@Base 1.7.2 + cairo_transform@Base 1.2.4 + cairo_translate@Base 1.2.4 + cairo_user_font_face_create@Base 1.7.2 + cairo_user_font_face_get_init_func@Base 1.7.2 + cairo_user_font_face_get_render_glyph_func@Base 1.7.2 + cairo_user_font_face_get_text_to_glyphs_func@Base 1.7.2 + cairo_user_font_face_get_unicode_to_glyph_func@Base 1.7.2 + cairo_user_font_face_set_init_func@Base 1.7.2 + cairo_user_font_face_set_render_glyph_func@Base 1.7.2 + cairo_user_font_face_set_text_to_glyphs_func@Base 1.7.2 + cairo_user_font_face_set_unicode_to_glyph_func@Base 1.7.2 + cairo_user_to_device@Base 1.2.4 + cairo_user_to_device_distance@Base 1.2.4 + cairo_version@Base 1.2.4 + cairo_version_string@Base 1.2.4 + cairo_xcb_surface_create@Base 1.6.4-5~ + cairo_xcb_surface_create_for_bitmap@Base 1.6.4-5~ + cairo_xcb_surface_create_with_xrender_format@Base 1.6.4-5~ + cairo_xcb_surface_set_size@Base 1.6.4-5~ + cairo_xlib_surface_create@Base 1.2.4 + cairo_xlib_surface_create_for_bitmap@Base 1.2.4 + cairo_xlib_surface_create_with_xrender_format@Base 1.2.4 + cairo_xlib_surface_get_depth@Base 1.2.4 + cairo_xlib_surface_get_display@Base 1.2.4 + cairo_xlib_surface_get_drawable@Base 1.2.4 + cairo_xlib_surface_get_height@Base 1.2.4 + cairo_xlib_surface_get_screen@Base 1.2.4 + cairo_xlib_surface_get_visual@Base 1.2.4 + cairo_xlib_surface_get_width@Base 1.2.4 + cairo_xlib_surface_get_xrender_format@Base 1.6.0 + cairo_xlib_surface_set_drawable@Base 1.2.4 + cairo_xlib_surface_set_size@Base 1.2.4 --- cairo-1.8.4.orig/debian/watch +++ cairo-1.8.4/debian/watch @@ -0,0 +1,2 @@ +version=2 +http://cairographics.org/releases/ cairo-([\d+\.]+|\d+)\.tar\.gz debian uupdate --- cairo-1.8.4.orig/debian/control +++ cairo-1.8.4/debian/control @@ -0,0 +1,112 @@ +Source: cairo +Section: libs +Priority: optional +Maintainer: Ubuntu Core Developers +XSBC-Original-Maintainer: Dave Beckett +Uploaders: Sebastian Dröge +Build-Depends: debhelper (>= 5.0.22), dpkg-dev (>= 1.14.13), autotools-dev, pkg-config (>= 0.19), libfontconfig1-dev (>= 2.5.92), libfreetype6-dev (>= 2.3.5-1ubuntu4), libxrender-dev (>= 0.6.0), libx11-dev, libpng12-dev, libdirectfb-dev (>= 0.9.25), libsm-dev, xutils-dev, libxt-dev, dpatch, libpixman-1-dev (>= 0.12.0), libxcb1-dev (>= 0.9.92), libxcb-render0-dev (>= 0.9.92), libxcb-render-util0-dev +Standards-Version: 3.8.0 +Homepage: http://cairographics.org/ + +Package: libcairo2-dev +Provides: libcairo-dev +Conflicts: libcairo-dev, libcairo0.5.1-dev, libcairo0.6.0-dev, libcairo0.9.0-dev, libcairo-directfb2-dev (<< 1.8.2-2) +Replaces: libcairo0.5.1-dev, libcairo0.6.0-dev, libcairo0.9.0-dev +Suggests: libcairo2-doc +Section: libdevel +Architecture: any +Depends: libcairo2 (= ${binary:Version}), libfontconfig1-dev (>= 2.5.92), libfreetype6-dev (>= 2.3.0), libxrender-dev (>= 0.6.0), libpng12-dev, libdirectfb-dev (>= 0.9.25), libsm-dev, libpixman-1-dev (>= 0.12.0), libxcb1-dev, libxcb-render0-dev, libxcb-render-util0-dev +Description: Development files for the Cairo 2D graphics library + Cairo is a multi-platform library providing anti-aliased + vector-based rendering for multiple target backends. + . + This package contains the development libraries, header files needed by + programs that want to compile with Cairo. + +Package: libcairo2 +Section: libs +Architecture: any +Depends: ${shlibs:Depends} +Provides: libcairo +Conflicts: libcairo1 +Replaces: libcairo0.5.1, libcairo0.6.0, libcairo0.9.0, libcairo1 +Description: The Cairo 2D vector graphics library + Cairo is a multi-platform library providing anti-aliased + vector-based rendering for multiple target backends. Paths consist + of line segments and cubic splines and can be rendered at any width + with various join and cap styles. All colors may be specified with + optional translucence (opacity/alpha) and combined using the + extended Porter/Duff compositing algebra as found in the X Render + Extension. + . + Cairo exports a stateful rendering API similar in spirit to the path + construction, text, and painting operators of PostScript, (with the + significant addition of translucence in the imaging model). When + complete, the API is intended to support the complete imaging model of + PDF 1.4. + . + This package contains the shared libraries. + +Package: libcairo2-dbg +Section: libdevel +Priority: extra +Architecture: any +Depends: libcairo2 (= ${binary:Version}) +Description: The Cairo 2D vector graphics library (debugging symbols) + Debugging symbols for the Cairo 2D vector graphics library. This is + needed to debug programs linked against libcairo2. + +Package: libcairo2-doc +Section: doc +Architecture: all +Depends: lynx | www-browser +Conflicts: libcairo0.5.1-doc, libcairo0.6.0-doc, libcairo0.9.0-doc +Replaces: libcairo0.5.1-doc, libcairo0.6.0-doc, libcairo0.9.0-doc +Description: Documentation for the Cairo Multi-platform 2D graphics library + Cairo is a multi-platform library providing anti-aliased + vector-based rendering for multiple target backends. + . + This package contains the HTML documentation for the Cairo library + in /usr/share/gtk-doc/html/cairo/. + +Package: libcairo-directfb2-udeb +XC-Package-Type: udeb +Section: debian-installer +Architecture: any +Depends: ${shlibs:Depends} +Description: The Cairo 2D vector graphics library DirectFB build + Cairo is a multi-platform library providing anti-aliased + vector-based rendering for multiple target backends. + . + This is version of cairo with only the DirectFB backend, intended + primarily for use in the graphical Debian installer. + +Package: libcairo-directfb2 +Section: libs +Architecture: any +Depends: libcairo2 (= ${binary:Version}) +Provides: libcairo-directfb +Conflicts: libcairo2-directfb +Replaces: libcairo2-directfb +Description: The Cairo 2D vector graphics library DirectFB build (dummy package) + Cairo is a multi-platform library providing anti-aliased + vector-based rendering for multiple target backends. + . + This is a legacy compatibility package that provides files at locations + that are deprecated now. Anything required to run Cairo+DirectFB + binaries is in the libcairo2 package. + +Package: libcairo-directfb2-dev +Section: libdevel +Architecture: any +Conflicts: libcairo2-directfb-dev +Replaces: libcairo2-directfb-dev +Depends: libcairo-directfb2 (= ${binary:Version}), libcairo2-dev (= ${binary:Version}) +Description: Development files for Cairo graphics library DirectFB build (dummy package) + Cairo is a multi-platform library providing anti-aliased + vector-based rendering for multiple target backends. + . + This is a legacy compatibility package that provides files at locations + that are deprecated now. Anything required to build Cairo+DirectFB + binaries is in the libcairo2-dev package. + --- cairo-1.8.4.orig/debian/libcairo2-doc.install +++ cairo-1.8.4/debian/libcairo2-doc.install @@ -0,0 +1 @@ +debian/dist-main/usr/share/gtk-doc/html/cairo /usr/share/gtk-doc/html --- cairo-1.8.4.orig/debian/rules +++ cairo-1.8.4/debian/rules @@ -0,0 +1,206 @@ +#!/usr/bin/make -f + +# Configure for cairo packages + +# Supported backends (as of Cairo 1.7.4): +# (internal) Image +# xlib Xlib +# pdf PDF +# ps PostScript +# svg SVG +# +# Experimental and unsupported backends: +# directfb DirectFB (requires Build-Depend on libdirectfb-dev (>=0.9.25) ) +# glitz OpenGL (glitz) +# xcb XCB (requires Build-Depend on at least libxcb1-dev) +# +# Other platform backends are auto disabled: quartz/OSX, win32/Win32 +# +# Features: +# --enable-png PNG (default enabled) +# +MAIN_CONFIGURE_FLAGS = \ +--enable-xlib --enable-pdf --enable-ps --enable-svg \ +--disable-glitz --enable-xcb --enable-directfb \ +--enable-png + +# udeb package flags +# directfb DirectFB (requires Build-Depend on libdirectfb-dev (>= 0.9.25) ) +DIRECTFB_CONFIGURE_FLAGS = \ +--enable-directfb \ +--disable-xlib --enable-pdf --enable-ps --disable-svg \ +--disable-glitz --disable-xcb \ +--enable-png \ +--program-suffix=-directfb + +SRC_DIR=$(CURDIR) +MAIN_BUILD_DIR=$(CURDIR)/debian/build-main +DIRECTFB_BUILD_DIR=$(CURDIR)/debian/build-directfb + +MAIN_DIST_DIR=$(CURDIR)/debian/dist-main +DIRECTFB_DIST_DIR=$(CURDIR)/debian/dist-directfb + +export DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) + +CFLAGS = -g +CFLAGS_UDEB = -g + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 + CFLAGS_UDEB += -O0 +else + CFLAGS += -O2 + CFLAGS_UDEB += -Os +endif +ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) + INSTALL_PROGRAM += -s +endif + +# For autoconf 2.13 only +CONFFLAGS= +ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE)) + CONFFLAGS += $(DEB_HOST_GNU_TYPE) +else + CONFFLAGS += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE) +endif + +package := tmp +prefix := /usr +share := $(prefix)/share + +version := $(shell dpkg-parsechangelog | \ + sed -ne 's/^Version: *\([0-9]\+:\)*//p') + +include /usr/share/dpatch/dpatch.make + +configure: configure-main + +configure-common-stamp: patch-stamp + dh_testdir + +# handle timestamp skew; advice from autotools-dev README.Debian + touch configure.in && \ + touch aclocal.m4 && \ + touch configure + + touch $@ + +# Calling GNU configure properly; advice from autotools-dev README.Debian +configure-main: configure-common-stamp configure-main-stamp +configure-main-stamp: configure-common-stamp + dh_testdir + mkdir -p $(MAIN_BUILD_DIR); \ + cd $(MAIN_BUILD_DIR); \ + $(SRC_DIR)/configure \ + CFLAGS="$(CFLAGS)" \ + $(CONFFLAGS) \ + --prefix=$(prefix) \ + --mandir=$(share)/man \ + --infodir=$(share)/info \ + $(MAIN_CONFIGURE_FLAGS) + touch $@ + +configure-udeb: configure-common-stamp configure-udeb-stamp +configure-udeb-stamp: configure-common-stamp + dh_testdir + mkdir -p $(DIRECTFB_BUILD_DIR); \ + cd $(DIRECTFB_BUILD_DIR); \ + $(SRC_DIR)/configure \ + CFLAGS="$(CFLAGS_UDEB)" \ + $(CONFFLAGS) \ + --prefix=$(prefix) \ + --mandir=$(share)/man \ + --infodir=$(share)/info \ + $(DIRECTFB_CONFIGURE_FLAGS) + touch $@ + + +build: build-main build-udeb + +build-main: build-main-stamp +build-main-stamp: configure-main-stamp + dh_testdir + cd $(MAIN_BUILD_DIR) && $(MAKE) + touch $@ + +build-udeb: build-udeb-stamp +build-udeb-stamp: configure-udeb-stamp + dh_testdir + cd $(DIRECTFB_BUILD_DIR) && $(MAKE) + touch $@ + +clean: unpatch + dh_testdir + dh_testroot + rm -f *-stamp libtool + rm -rf debian/libcairo2 debian/libcairo2-dev debian/libcairo2-doc libcairo-directfb2-udeb debian/libcairo-directfb2-udeb-dev debian/libcairo-directfb2 + rm -rf $(MAIN_BUILD_DIR) $(DIRECTFB_BUILD_DIR) $(MAIN_DIST_DIR) $(DIRECTFB_DIST_DIR) + # Generated by configure and breaks the build if already existing + rm -f src/cairo-features.h + + -rm -f config.h config.cache config.status config.log + +# Copy in fresh copies of config.{sub,guess} +# (these are from autotools-dev, so must Build-Depend on it) + -test -r /usr/share/misc/config.sub && \ + cp -f /usr/share/misc/config.sub config.sub + -test -r /usr/share/misc/config.guess && \ + cp -f /usr/share/misc/config.guess config.guess + + dh_clean + + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + cd $(MAIN_BUILD_DIR) && $(MAKE) install DESTDIR=$(MAIN_DIST_DIR) + + cd $(DIRECTFB_BUILD_DIR) && $(MAKE) install DESTDIR=$(DIRECTFB_DIST_DIR) + + sed -i "/dependency_libs/ s/'.*'/''/" $(MAIN_DIST_DIR)/usr/lib/*.la + +# Build architecture-independent files here. +binary-indep: build install + dh_testdir + dh_testroot + dh_install -i + dh_installchangelogs -i ChangeLog + dh_installdocs -i -A NEWS README AUTHORS + dh_link -i + dh_compress -i + dh_fixperms -i + dh_installdeb -i + dh_gencontrol -i + dh_md5sums -i + dh_builddeb -i + +# Build architecture-dependent files here. +binary-arch: build install + dh_testdir + dh_testroot + dh_install -s + dh_installdocs -s -A README NEWS AUTHORS + dh_installchangelogs -s ChangeLog + dh_installman -s + dh_installexamples -s + dh_link -s + dh_strip -s --dbg-package=libcairo2-dbg -Nlibcairo-directfb2-udeb + dh_strip -plibcairo-directfb2-udeb + dh_compress -s + dh_fixperms -s + dh_makeshlibs -plibcairo2 --add-udeb=libcairo-directfb2-udeb -V 'libcairo2 (>= 1.8.0-2)' -- -c4 + dh_installdeb -s + dh_shlibdeps -s + dh_perl -s + dh_gencontrol -s + dh_md5sums -s + dh_builddeb -s + +binary: binary-indep binary-arch + +.PHONY: build clean binary-indep binary-arch binary install configure \ + patch unpatch clean --- cairo-1.8.4.orig/debian/libcairo-directfb2-dev.postinst +++ cairo-1.8.4/debian/libcairo-directfb2-dev.postinst @@ -0,0 +1,11 @@ +#! /bin/sh +set -e + +incdir=/usr/lib/libcairo-directfb/include/cairo +# This directory moved to be a symbolic link +if [ -d $incdir ] && [ ! -L $incdir ]; then + rmdir $incdir + ln -s ../../../include/cairo $incdir +fi + +#DEBHELPER# --- cairo-1.8.4.orig/debian/changelog +++ cairo-1.8.4/debian/changelog @@ -0,0 +1,1021 @@ +cairo (1.8.4-1ubuntu1) jaunty; urgency=low + + * Merge from debian experimental (1.8.4-1). LP: #301691. + Remaining ubuntu changes: + - debian/control: Build-depends and Depends: libfontconfig1-dev >= + 2.5.0-2ubuntu2 and libfreetype6-dev >= 2.3.5-1ubuntu4 + - debian/patches/04_lcd_filter.dpatch + + -- Fabien Tassin Wed, 19 Nov 2008 23:20:11 +0100 + +cairo (1.8.4-1) experimental; urgency=low + + * New upstream bugfix release. + + -- Sebastian Dröge Sat, 15 Nov 2008 08:46:56 +0100 + +cairo (1.8.2-2) experimental; urgency=low + + * ACK NMU and merge all changes, thanks Joss. + + -- Sebastian Dröge Wed, 05 Nov 2008 12:59:03 +0100 + +cairo (1.6.4-6.1) unstable; urgency=low + + * Non-maintainer upload. + * Remove the rpath stuff in /usr/lib/libcairo-directdb and only keep + it around for compatibility. Closes: #499662. + + Remove the rpath hack in the .pc file. + + Make the libcairo-directfb2{,dev} packages dummy, only keeping + symbolic links from the former locations. + + libcairo-directfb2-dev.postinst: do the symbolic link dance upon + upgrade. + + Update package descriptions accordingly. + + libcairo2.symbols: add cairo_directfb_surface_create. + + libcairo2-dev conflicts with libcairo-directfb2-dev + (<< 1.6.4-6.1). + * rules: completely cleanup the .la files from their dependency libs. + Closes: #491292. + * Add ~ to symbol versions to make backports possible. + * Fix doc-base section. + * Standards version is 3.8.0. + + -- Josselin Mouette Mon, 13 Oct 2008 11:00:24 +0200 + +cairo (1.8.2-1) experimental; urgency=low + + * New upstream stable release: + + debian/control: + - Update (Build-)Depends. + - Fix section of libcairo2 from docs to libs. + + debian/watch: + - Update location for releases. + + debian/rules: + - Patch from Ubuntu package to update config.guess/sub again properly. + - Update shlibs to 1.8.0 because of new API. + - Remove src/cairo-features.h as it's generated by configure and breaks + the build if it's already there. + + debian/libcairo-directfb2.symbols, + debian/libcairo2.symbols: + - Updated symbols. + * debian/patches/02_no-private-symbol-export.dpatch: + + Re-added to not export some private symbols. + + -- Sebastian Dröge Wed, 05 Nov 2008 12:17:09 +0100 + +cairo (1.7.4-1) experimental; urgency=low + + * New upstream snapshot release + * Removed debian/patches/02_no-private-symbol-export.dpatch merged upstream + * Removed debian/patches/01_directfb-no-accel.dpatch + Hoping that this GIT commit makes it moot: + + commit 7fbda72137d8685718a8e8fe1d3af5b1d377521c + Date: Sun Aug 10 05:05:27 2008 -0700 + * Known packaging errors: + - not copying new config.sub/config.guess for now + + -- Dave Beckett Thu, 11 Sep 2008 23:03:15 -0700 + +cairo (1.6.4-7) unstable; urgency=low + + * debian/rules: + + Remove libtool .la dependency_libs (Closes: #491292) + * debian/control: + + Update to standards version 3.8.0 + + Move libcairo2-doc to 'doc' section (Closes: #486174) + * debian/dpatch/*: Added ##DP descriptions (lintian) + * debian/libcairo2.symbols: Removed symbols with a debian revision (lintian) + * debian/libcairo2-doc.doc-base: Use section "Graphics" (lintian) + + -- Dave Beckett Sun, 07 Sep 2008 15:33:00 -0700 + +cairo (1.8.0-0ubuntu1) intrepid; urgency=low + + * New upstream (stable) version + * debian/patches/04_lcd_filter.dpatch, debian/patches/00list: + re-add the lcd filter dropped by upstream between 1.7.6 and 1.8.0 + * debian/libcairo2.symbols, debian/libcairo-directfb2.symbols: + updated to match the API + * debian/patches/02_no-private-symbol-export.dpatch refreshed + + -- Fabien Tassin Tue, 14 Oct 2008 15:49:39 +0200 + +cairo (1.7.6-0ubuntu1) intrepid; urgency=low + + * New upstream version. Most noticable changes are: + - some API changes with especially the removal of + cairo_font_options_set_lcd_filter and cairo_font_options_get_lcd_filter + - xlib: Faster bookkeeping + - PS: Fix gradients with non-constant alpha + - Fix deadlock in user-font code + * debian/patches/00list: Remove 03_from_git_fix_lcd_filter_default.dpatch, + add debian/patches/03_fix_ftbfs_withing_xcb.dpatch + * debian/libcairo2.symbols, debian/libcairo-directfb2.symbols: update + list of symbols + + -- Fabien Tassin Thu, 25 Sep 2008 16:22:33 +0200 + +cairo (1.7.4-0ubuntu2) intrepid; urgency=low + + * debian/control + - updated build-depends for libpixman-1-dev to >= 0.11.2 + - updated depends for libpixman-1-dev to >= 0.11.2 (LP: #271278) + + -- Andreas Moog Wed, 17 Sep 2008 21:19:00 +0200 + +cairo (1.7.4-0ubuntu1) intrepid; urgency=low + + * New upstream version: + - User fonts: new API allowing the user of cairo API to provide drawings + for glyphs in a font + - show_text_glyph: new API allows the caller of cairo to mark text glyphs + with their original text + - LCD subpixel filtering using FreeType + - Toy font face constructor and getter + - FreeType: respecting FC_FT_FACE + - PS/PDF: More efficient output + - Xlib: Dithering + - Xlib: Avoid rendering glyphs out of surface bounds + - Xlib: Improved performance with Xrender-less X servers + * debian/patches/00list: Remove lcd-filter patch now applied upstream + * debian/patches/01_directfb-no-accel.dpatch: Updated + * debian/patches/03_from_git_fix_lcd_filter_default.dpatch, + debian/patches/00list: patch from git: add the lcd_filter default to + the nil surfaces. + * debian/libcairo2.symbols, + debian/libcairo-directfb2.symbols: Add new symbols + + -- Fabien Tassin Mon, 18 Aug 2008 14:48:43 +0200 + +cairo (1.6.4-6ubuntu1) intrepid; urgency=low + + * Resynchronise with Debian. Remaining changes: + - 03_lcd-filter-freedesktop-bug10301.dpatch: Use FreeType's LCD + filtering support. Version libfontconfig1-dev and libfreetype6-dev + build-dependencies and dependencies to match. + * Update LCD filtering patch for fontconfig 2.5.92 (thanks, webograph; + LP: #244366). + + -- Colin Watson Mon, 07 Jul 2008 09:51:18 +0100 + +cairo (1.6.4-6) unstable; urgency=low + + * debian/control: + + Let libcairo2-dev depend on libxcb-render-util0-dev (Closes: #486006). + + -- Sebastian Dröge Fri, 13 Jun 2008 11:55:50 +0200 + +cairo (1.6.4-5) unstable; urgency=low + + * debian/rules, + debian/control, + debian/libcairo2.symbols: + + Enable XCB backend now that XCB is in unstable (Closes: #474353). + + -- Sebastian Dröge Tue, 10 Jun 2008 07:46:49 +0200 + +cairo (1.6.4-4) unstable; urgency=low + + * debian/rules: + + Make sure that the debug package contains debug symbols for the + libcairo2 package and not for the directfb one (Closes: #484603). + + -- Sebastian Dröge Thu, 05 Jun 2008 12:35:35 +0200 + +cairo (1.6.4-3) unstable; urgency=low + + * debian/patches/02_no-private-symbol-export.dpatch, + debian/libcairo2.symbols, + debian/libcairo-directfb2.symbols, + debian/rules: + + Don't export private symbols and pass -c4 to + dh_makeshlibs (Closes: #481260). + * debian/control: + + Fix documentation path in the package description (Closes: #464116). + * debian/rules: + + Only build the arch-indep packages when build-indep is + invoked (Closes: #476499). + + -- Sebastian Dröge Wed, 28 May 2008 11:19:21 +0200 + +cairo (1.6.4-2) unstable; urgency=low + + * debian/patches/01_directfb-no-accel.dpatch: + + Disable rendering acceleration for the DirectFB backend as it + causes broken screen repainting with the Debian installer + and other GTK/DirectFB applications (Closes: #477331). + + -- Sebastian Dröge Tue, 13 May 2008 10:34:26 +0200 + +cairo (1.6.4-1ubuntu1) intrepid; urgency=low + + * Drop buggy_repeat band-aid now that xorg-server fixes the issue + directly (LP: #186186) + * Merge from debian unstable (1.6.4-1). Remaining ubuntu changes: + - debian/control: + - Maintainer: Ubuntu Core Developers + - Build-depends and Depends: libfontconfig1-dev >= 2.5.0-2ubuntu2 and + libfreetype6-dev >= 2.3.5-1ubuntu4 + - debian/rules: + - Pass -c4 to dpkg-gensymbols + - debian/patches/02-lcd_filter_freedesktop_bug10301.dpatch + + -- Fabien Tassin Fri, 09 May 2008 15:02:48 +0200 + +cairo (1.6.4-1) unstable; urgency=low + + * New upstream release: + + Works on remote Sun displays by adding support for + 8 bit pseudocolors (Closes: #348109). + + Adds support for 32 bit visuals (Closes: #421266). + + Adds support for 655 xlib format (Closes: #413690). + + Fixes error when creating pdf charts (Closes: #474136). + + Fixes assertions in cairo_destroy (Closes: #423951). + + Fixes display errors with iceweasel 3.0 (Closes: #474395). + + debian/control: + - Update build dependencies and dependencies. + - Add myself as co-maintainer. + - Fix spelling error. + + debian/rules: + - Update shlibs to >= 1.6.0 because of API additions. + + debian/libcairo2.symbols, + debian/libcairo-directfb2.symbols: + - Add symbol files for the libraries. + + -- Sebastian Dröge Tue, 15 Apr 2008 20:07:29 +0200 + +cairo (1.6.0-0ubuntu1) hardy; urgency=low + + * New upstream version, no code change since the snapshot + * debian/patches/90_from_git_fix_xerox_printer_issues.dpatch: + - upstream change to not crash xerox printers when using evince (lp:#207776) + * debian/rules: + - update the shlib versions to the stable one + + -- Sebastien Bacher Fri, 11 Apr 2008 15:24:00 +0200 + +cairo (1.5.20-0ubuntu1) hardy; urgency=low + + * New upstream version + + -- Sebastien Bacher Tue, 08 Apr 2008 16:57:52 +0200 + +cairo (1.5.18-0ubuntu1) hardy; urgency=low + + * New upstream version: 1.5.18 (LP: #211791) + * Drop debian/patches/04-fix-CAIRO_FONT_TYPE_ATSUI-symbol.dpatch + - update debian/patches/00list + * Bump shlibs version + - update debian/rules + * Bump pixman requirement to >= 0.10.0 + - update debian/control + + -- Fabien Tassin Sun, 06 Apr 2008 22:57:10 +0200 + +cairo (1.5.14-0ubuntu2) hardy; urgency=low + + * Added patch to fix API breakage (LP: #208436) + - add debian/patches/04-fix-CAIRO_FONT_TYPE_ATSUI-symbol.dpatch + - update debian/patches/00list + + -- Christopher Brotherton Fri, 28 Mar 2008 11:01:04 -0600 + +cairo (1.5.14-0ubuntu1) hardy; urgency=low + + * New upstream version: 1.5.14 + * Drop debian/patches/90_from_git_fix_pdf_printing.dpatch + - update debian/patches/00list + * Bump shlibs version + - update debian/rules + + -- Fabien Tassin Fri, 21 Mar 2008 15:54:13 +0100 + +cairo (1.5.12-0ubuntu2) hardy; urgency=low + + * debian/patches/90_from_git_fix_pdf_printing.dpatch: + - change from git, fix pdf printing (lp: #199493) + + -- Sebastien Bacher Thu, 13 Mar 2008 12:23:25 +0100 + +cairo (1.5.12-0ubuntu1) hardy; urgency=low + + * New upstream version: 1.5.12 + * Drop patch applied upstream + - drop debian/patches/01-fixed_point_24.8_precision.dpatch + - update debian/patches/00list + * Refresh diverged debian/patches/02-lcd_filter_freedesktop_bug10301.dpatch + * Update shlibs version + - update debian/rules + * Add workaround for background corruption in firefox 3 by + setting buggy_repeat inconditionally (LP: #186186) + - add debian/patches/03-turn_on_buggy-repeat_handling.dpatch + - update debian/patches/00list + + -- Fabien Tassin Fri, 29 Feb 2008 22:54:20 +0100 + +cairo (1.5.8-1) experimental; urgency=low + + * New upstream release + + -- Dave Beckett Wed, 30 Jan 2008 08:27:44 -0800 + +cairo (1.5.8-0ubuntu1) hardy; urgency=low + + * debian/rules: + - updated shlibs version + + [ Fabien Tassin ] + * New upstream version: 1.5.8 + * debian/patches/01-fixed_point_24.8_precision.dpatch + - updated as CAIRO_FIXED_FRAC_BITS is now in cairo-fixed-type-private.h + * debian/patches/02-lcd_filter_freedesktop_bug10301.dpatch: + - updated to reflect upstream changes + * debian/rules + - drop TODO from dh_installdocs as it's gone + + -- Sebastien Bacher Thu, 31 Jan 2008 11:54:19 +0100 + +cairo (1.5.6-1ubuntu1) hardy; urgency=low + + * Sync on Debian + * New upstream version: + - Fix alignment issues (LP: #181001) + * debian/control.in: + - updated build-depends on libfreetype and libfontconfig + - updated maintainer information + * debian/patches/01-fixed_point_24.8_precision.dpatch: + - use 24.8 fixed point precision other firerox has rendering issues + * debian/patches/02-lcd_filter_freedesktop_bug10301.dpatch: + - better rendering change + + -- Sebastien Bacher Thu, 17 Jan 2008 13:00:59 +0100 + +cairo (1.5.6-1) experimental; urgency=low + + * New upstream release + + -- Dave Beckett Wed, 16 Jan 2008 19:14:02 -0800 + +cairo (1.5.4-1) experimental; urgency=low + + * Cairo snapshot packaging (Closes: #452736) + - NOTE: This is the *unstable* Cairo API and may change at any time before + the next stable release which will be called something like 1.6.0 + + -- Dave Beckett Mon, 24 Dec 2007 15:08:42 -0800 + +cairo (1.4.12-2) unstable; urgency=low + + * Apply fixes from upstream to fix PDF issues using + upstream cairo bug 8399 via dependent upstream bugs + - cairo bug 12284 (Early detection of a zero sized bitmap) + git commit d62f8861689d8b9a9a837043fb78813f0407abd4 + - cairo bug 9846 (Ignore FT_Load_Glyph errors other than out-of-memory + Same for FT_Render_Glyph) + git commit 21ab44f11d3d20eead5d988c7a6cf48eebff08c7 + (Closes: #428466, #435913, #439542, #440811, #442481) + * Apply fix from upstream + "PS: Ensure that xyshow operator has a pair of offsets for each glyph" + git commit 5e8f60531a09f357db38c4b646b1bbd29b97a891 (Closes: #453718) + + -- Dave Beckett Sun, 16 Dec 2007 12:57:00 -0800 + +cairo (1.4.12-1) unstable; urgency=low + + * New upstream release + - fixes SIG PIPE crash (Closes: #454768) + * Acknowledge NMU - Thanks Nico + * Correct source package name + * Added debug package libcairo2-dbg (Closes: #422597, #429335, #446637) + * debian/control: + - Standards version 3.7.3 + - Add homepage + - Use ${binary:Version} to replace deprecated ${Source-Version} in Depends + - libcairo2-doc package is now in Section doc + * debian/rules: fix cross build support (Closes: #451596) + * debian/libcairo2-doc.doc-base: fix lintian warning + doc-base-file-separator-extra-whitespaces + * Evaluated ubuntu patches to 1.4.10 and applied none: + - 02-cairo-1.4.8-lcd-filter-2.dpatch - changes Cairo public API + - 90_from_git_fix_not_available_glyph_handling.dpatch - from upstream + - 90_from_git_fix_zero_sized_bitmap_handling.dpatch - from upstream + - 91_malloc-overflow-fixes.dpatch - from upstream + + -- Dave Beckett Tue, 11 Dec 2007 09:33:10 -0800 + +libcairo (1.4.10-1.2) unstable; urgency=high + + * Fix floating point regressions introduced by the previous NMU. + Do not blindly call malloc if the size is zero + (Closes: #454768,#454650,#454413). + + -- Nico Golde Fri, 07 Dec 2007 20:33:11 +0100 + +libcairo (1.4.10-1.1) unstable; urgency=high + + * Non-maintainer upload by testing-security team. + * Fix multiple integer overflows leading to arbitrary code + execution (CVE-2007-5503; Closes: #453686). + + -- Nico Golde Mon, 03 Dec 2007 17:20:59 +0100 + +libcairo (1.5.4-0ubuntu1) hardy; urgency=low + + * debian/rules: + - updated shlibs version + + [ Fabien Tassin ] + * new upstream snapshot: 1.5.4 + * Drop patches no longer useful: + - debian/patches/91_malloc-overflow-fixes.dpatch + - debian/patches/90_from_git_fix_zero_sized_bitmap_handling.dpatch + - debian/patches/90_from_git_fix_not_available_glyph_handling.dpatch + * Replace Ubuntu's lcd patch by patch from Freedesktop bug #10301 + - drop debian/patches/02-cairo-1.4.8-lcd-filter-2.dpatch + - add debian/patches/02-lcd_filter_freedesktop_bug10301.patch + * Move from 16.16 to 24.8 fixed point precision + - add debian/patches/01-fixed_point_24.8_precision.dpatch + * Add libpixman-1-dev (>= 0.9.4) to Build-deps + - update debian/control + * Update debian/patches/00list + + -- Sebastien Bacher Fri, 21 Dec 2007 11:46:45 +0100 + +libcairo (1.4.10-1ubuntu6) hardy; urgency=low + + * Fix debian/patches/91_malloc-overflow-fixes.dpatch to avoid + divide-by-zero; patch from upstream fixes (LP: #173861): + http://gitweb.freedesktop.org/?p=cairo;a=commitdiff_plain;h=6020f67f1a49cfe3844c4938d4af24c63c8424cc;hp=c79fc9af334fd6f2d1078071d64178125561b187 + + -- Sebastien Bacher Tue, 11 Dec 2007 09:51:17 +0100 + +libcairo (1.4.10-1ubuntu5) hardy; urgency=low + + * debian/patches/90_from_git_fix_zero_sized_bitmap_handling.dpatch: + - patch from git, "Under rare circumstances we may need to extract a + surface that represents a bitmap with width==0 and rows==0. + Detect this case at the start and simply return a zero-sized surface." + This fix some pdf being displayed as mostly blank when using evince + (LP: #116236) + + -- Sebastien Bacher Sat, 08 Dec 2007 12:40:12 +0100 + +libcairo (1.4.10-1ubuntu4.1) gutsy-security; urgency=low + + * SECURITY UPDATE: arbitrary code execution via integer overflows in + PNG handling. + * Add debian/patches/91_malloc-overflow-fixes.dpatch: backported upstream + fixes. + * References + http://gitweb.freedesktop.org/?p=cairo;a=commitdiff;h=5c7d2d14d78e4dfb1ef6d2c40f0910f177e07360 + http://gitweb.freedesktop.org/?p=cairo;a=commitdiff;h=e49bcde27f88e21d5b8037a0089a226096f6514b + CVE-2007-5503 + + -- Kees Cook Thu, 29 Nov 2007 12:57:18 -0800 + +libcairo (1.4.10-1ubuntu4) gutsy; urgency=low + + * debian/patches/90_from_git_fix_not_available_glyph_handling.dpatch: + - patch from git, fix rendering issue when some glyphs are not available + (LP: #116236) + + -- Sebastien Bacher Fri, 28 Sep 2007 13:49:31 +0200 + +libcairo (1.4.10-1ubuntu3) gutsy; urgency=low + + * debian/patches/02-cairo-1.4.8-lcd-filter-2.dpatch: + - Restore patch that uses the new FreeType LCD colour filtering features, + with additional modification that the specific LCD Filter can be + changed. + + -- Scott James Remnant Thu, 20 Sep 2007 20:11:09 +0100 + +libcairo (1.4.10-1ubuntu2) gutsy; urgency=low + + * debian/patches/02-cairo-1.4.8-lcd-filter-1.patch: + - remove - interacts poorly with the bytecode interpreter in + freetype, which we already have enabled + + -- Matthew Garrett Thu, 20 Sep 2007 05:09:23 +0100 + +libcairo (1.4.10-1ubuntu1) gutsy; urgency=low + + [ Matti Lindell ] + * debian/patches/02-cairo-1.4.8-lcd-filter-1.patch: + - ClearType-like LCD filtering (David Turner's patches) + + [ Scott James Remnant ] + * Bump build-dependency on libfreetype6-dev to ensure we build with the + equally patched version. + + -- Scott James Remnant Tue, 18 Sep 2007 17:38:32 +0100 + +libcairo (1.4.10-1) unstable; urgency=low + + * New upstream release + - fixes XError crash seen in openoffice.org (Closes: #430550) + * Removed patch 001-148-directfb.dpatch merged upstream + + -- Dave Beckett Wed, 27 Jun 2007 18:20:10 -0700 + +libcairo (1.4.8-1) unstable; urgency=low + + * New upstream release + - fixes gnome bug http://bugzilla.gnome.org/show_bug.cgi?id=431990 + that caused gnome-about to crash (Closes: #425058) + * Added patch 001-148-directfb.dpatch to make directfb build with 1.4.8 + * Fix directfb udeb shlibs (Closes: #429672) + - remove udeb line from libcairo2 package shlibs + - libcairo-directfb2 package shlibs provide libcairo-directfb2(-udeb) + * Acknowledge NMU - thanks Don + + -- Dave Beckett Thu, 21 Jun 2007 01:03:51 -0700 + +libcairo (1.4.6-1.1) unstable; urgency=low + + * NMU + * Apply patch from Adrian Johnson to fix segfault with PS_surface + (closes: #422388) + + -- Don Armstrong Mon, 28 May 2007 11:11:45 -0700 + +libcairo (1.4.6-1) unstable; urgency=low + + * New upstream release + * Add debian/compat, remove DH_COMPAT from debian/rules + + -- Dave Beckett Tue, 1 May 2007 23:38:00 -0800 + +libcairo (1.4.4-1) unstable; urgency=low + + * New upstream release + * Remove different versioned shlibs dependency for one udeb + to get rid of duplicate dependencies (Closes: #418616) + * Switch shlibs API version to 1.4.0 since API calls were added + * PDF fonts fixed upstream (Closes: #406191) + + -- Dave Beckett Fri, 13 Apr 2007 21:46:46 -0700 + +libcairo (1.4.2-1) experimental; urgency=low + + * New upstream release (Closes: #416024) + * debian/rules: Pass on CFLAGS (Closes: #399868) + + -- Dave Beckett Tue, 27 Mar 2007 06:55:45 -0700 + +libcairo (1.2.6-1) experimental; urgency=low + + * New upstream release + * Removed patch 01-cairo_xlib_surface_add_glyph.patch now in upstream + * Require pkg-config 0.19 + + -- Dave Beckett Fri, 17 Nov 2006 20:42:08 -0800 + +libcairo (1.2.4-4) unstable; urgency=medium + + * Acknowledge NMU. + * Urgency medium since RC bugs are acknowledged. + * Patch 01-cairo_xlib_surface_add_glyph.patch added in + experimental confirmed fixes powerpc X byte copy crash + for bug #388116 which was closed by email after an NMU. + * Enable PDF and PS for the cairo+directfb build in unstable (Closes: #383297) + * Bump libcairo-directfb2's shlibs to >= 1.2.4-4 for the addition of + PDF and PS related symbols to the cairo+directfb lib. (Closes: #387289) + * Remove libcairo.la references to other .la files to aid future + removal of all .la files. + + -- Dave Beckett Thu, 19 Oct 2006 22:41:56 -0700 + +libcairo (1.2.4-3.2) experimental; urgency=low + + * NMU + * Re-upload to get the changes from -2 in experimental, that is + building cairo+directfb with PS and PDF support (needed by + Gtk+2.10+directfb). + * Bump libcairo-directfb shlibs to >= 1.2.4-3.2 so that packages depending + on the new +directfb things get the right dep. + + -- Marc 'HE' Brockschmidt Wed, 18 Oct 2006 11:09:16 +0200 + +libcairo (1.2.4-3.1) unstable; urgency=low + + * NMU + * Upload with 01-cairo_xlib_surface_add_glyph.patch but without + the directfb changes from -2. The patch fixes the segfault caused + by a broken loop condition (c >= 0 works like, eh, always after + doing "unsigned int c"...). (Closes: #388116) + + -- Marc 'HE' Brockschmidt Sun, 15 Oct 2006 16:25:06 +0200 + +libcairo (1.2.4-3) experimental; urgency=low + + * Added patch 01-cairo_xlib_surface_add_glyph.patch from upstream git + attempting to fix 388116 + + -- Dave Beckett Sun, 8 Oct 2006 11:08:23 -0700 + +libcairo (1.2.4-2) experimental; urgency=low + + * Enable PDF and PS for the cairo+directfb build in order to + allow GTK 2.10+directfb to build (Closes: #383297) + + -- Dave Beckett Sun, 3 Sep 2006 13:24:31 -0700 + +libcairo (1.2.4-1) unstable; urgency=low + + * New upstream release. + * Remove double call to dh_installdocs (Closes: #382594) + * Submit to override for libcairo2-doc, changing to section libs. + + -- Dave Beckett Fri, 18 Aug 2006 18:11:00 -0700 + +libcairo (1.2.2-1) unstable; urgency=medium + + * New upstream release. + * This version again handles BGR X server visuals such as used by + Exceed and VNC (Closes: #376858) + * Removed patches taken from upstream git: + - cairo-bug-7494.patch + - cairo-bug-7514.patch + * Build-Depend on xutils-dev and libxt-dev since the test for the + presence of X in the latest configure (as generated by autoconf 2.60) + uses xmkmf and checks for libxt-dev even though neither are used by + Cairo. + + -- Dave Beckett Tue, 8 Aug 2006 23:59:01 -0700 + +libcairo (1.2.0-5) unstable; urgency=medium + + * Rebuild against directfb 0.9.25 which has changed library and udeb + package names from 0.9.24 that all earlier cairos were built against, + and which are now removed. This should prevent Cairo from becoming + uninstallable due to this change. Urgency medium due to this. + + -- Dave Beckett Wed, 2 Aug 2006 22:04:17 -0700 + +libcairo (1.2.0-4) unstable; urgency=medium + + * Added patch cairo-bug-7494.patch (Closes: #378005) + * Added patch cairo-bug-7514.patch (Closes: #380064) + + -- Dave Beckett Tue, 1 Aug 2006 22:29:04 -0700 + +libcairo (1.2.0-3) unstable; urgency=low + + * Add libsm-dev to Build-Depends and libcairo2-dev depends to pull in + libSM and libICE (Closes: #377259) + * Remove unused libxrender-dev Depends from libcairo-directfb2-dev + + -- Dave Beckett Sun, 9 Jul 2006 16:36:10 -0700 + +libcairo (1.2.0-2) unstable; urgency=low + + * Remove libcairo2-dev depending on libdirectfb-dev (Closes: 376691) + + -- Dave Beckett Tue, 4 Jul 2006 10:45:33 -0700 + +libcairo (1.2.0-1) unstable; urgency=low + + * New upstream release. + + -- Dave Beckett Sat, 1 Jul 2006 19:43:51 -0700 + +libcairo (1.1.10-3) experimental; urgency=low + + * First upload of 1.1.x series to debian experimental + * Remove patch 02-no-ft-glyphslot-embolden.patch (was for bug #325526) + and depend on a new enough libfreetype6 (2.1.10) which is already in + testing. + * Removed Build-Depend on libxml2 for creating SVG as that has been + rewritten. + * Added libcairo2 Conflicts and Replaces libcairo1 (Closes: #366755) + + -- Dave Beckett Wed, 28 Jun 2006 19:04:10 -0700 + +libcairo (1.1.10-2) experimental; urgency=low + + * Add -Wl,-rpath,${libdir} to libcairo-directfb pkgconfig to make the + linker use the libcairo in the libdir + * Removed Provides: libcairo2 from libcairo-directfb2-udeb + + -- Dave Beckett Sun, 25 Jun 2006 10:20:40 -0700 + +libcairo (1.1.10-1) experimental; urgency=low + + * New upstream release + * Renamed directfb packages to be libcairo-directfb2* + * Use dh_makeshlibs with --add-udeb to make udeb: lines appear in shlibs + * Depend on debhelper 5.0.22 to get a working dh_makeshlibs with --add-udeb + + -- Dave Beckett Sat, 24 Jun 2006 10:03:02 -0700 + +libcairo (1.1.8-1) experimental; urgency=low + + * New upstream release + * Added libcairo2-directfb deb. + + -- Dave Beckett Wed, 14 Jun 2006 11:47:00 -0700 + +libcairo (1.1.6-1) experimental; urgency=low + + * New upstream release + * Enable PNG, PDF and SVG backends (add Build-Depend: on libxml2) + * Added Cairo DirectFB udeb packages libcairo2-directfb-udeb and + libcairo2-directfb-dev (add Build-Depend: on libdirectfb-dev) + * libcairo2-dev and libcairo2-directfb-dev can both be installed together + * Stop using CDBS since it cannot handle the double configure and build + setup. + * Use dpatch for patching and Build-Depend: on it. + + -- Dave Beckett Mon, 12 Jun 2006 12:57:38 -0700 + +libcairo (1.0.4-2) unstable; urgency=low + + * Rebuild against X11R7 to fix .la breakage xorg caused (Closes: #362237) + + -- Dave Beckett Tue, 25 Apr 2006 22:00:36 -0700 + +libcairo (1.0.4-1) unstable; urgency=low + + * New upstream release + * Removed patches merged upstream: + - 01-INT_pixman.patch + * Debhelper 5 + + -- Dave Beckett Wed, 5 Apr 2006 17:44:12 -0700 + +libcairo (1.0.2-4) unstable; urgency=low + + * Rebuild against current build dependencies since something in the + build depends changed to make it stop working. This may be the most + useless changelog entry ever. (Closes: #347675) + + -- Dave Beckett Thu, 12 Jan 2006 19:52:08 -0800 + +libcairo (1.0.2-3) unstable; urgency=low + + * Bump libcairo2 shlibs to 1.0.2-2 given all the freetype version changes. + + -- Dave Beckett Wed, 30 Nov 2005 09:21:02 -0800 + +libcairo (1.0.2-2) unstable; urgency=low + + * Fix libcairo2-doc section to doc (Closes: #337515) + * Re-add patch 02-no-ft-glyphslot-embolden.patch to use only + freetype 2.1.7 symbols even though sid has freetype 2.1.10. + The latter has ABI changes beyond it's declared shlibs of 2.1.5 + and is undergoing a large transition. + Require freetype 2.1.7+ again. (Closes: #338817) + * Added patch 01-INT_pixman.patch from CVS to remove spurious INT_ items + that broke build with recent binutils (Closes: #340073) + * Require pkg-config >= 0.18 since cairo.pc uses Require.private: + + -- Dave Beckett Fri, 25 Nov 2005 04:01:51 +0000 + +libcairo (1.0.2-1) unstable; urgency=low + + * New upstream release + * Removed patch 01-endianess-cairo-xlib-surface.patch previously taken + from upstream CVS. + * Removed patch 02-no-ft-glyphslot-embolden.patch to re-allow configure + to use FT_GlyphSlot_Embolden provided in freetype 2.1.10 which is now + in sid. + * Require freetype 2.1.10+ + + -- Dave Beckett Tue, 25 Oct 2005 18:45:57 +0100 + +libcairo (1.0.0-3) unstable; urgency=low + + * Added patch 02-no-ft-glyphslot-embolden.patch to disable use of + FT_GlyphSlot_Embolden in freetype, which was added after the + freetype version 2.1.7 currently in testing (closes: #325526) + * Require freetype 2.1.7+ + + -- Dave Beckett Tue, 13 Sep 2005 19:33:38 +0100 + +libcairo (1.0.0-2) unstable; urgency=low + + * Added patch 01-endianess-cairo-xlib-surface.patch from CVS to fix + endianess problem when running over remote X (Closes: #326920) + * Register cairo docs with doc-base (Closes: #325541) + + -- Dave Beckett Tue, 6 Sep 2005 18:15:57 +0100 + +libcairo (1.0.0-1) unstable; urgency=low + + * New upstream release + * Removed glitz backend as currently experimental and unsupported + * debian/watch: update to use stable release area + * Removed patch cairo-0.9.2-cache-eviction-fix.patch merged upstream. + + -- Dave Beckett Wed, 24 Aug 2005 18:14:23 +0100 + +libcairo (0.9.2-2) unstable; urgency=low + + * Add patch cairo-0.9.2-cache-eviction-fix.patch from Kristian Høgsberg + to make the freetype font cache evict correctly. + + -- Dave Beckett Mon, 15 Aug 2005 19:48:43 +0100 + +libcairo (0.9.2-1) unstable; urgency=low + + * New upstream release + * First stable API release - remove patching sonames + * libcairo2, libcairo2-dev and libcairo2-doc replace all previous versions + * No longer Depends: on libpixman, now an internal library + + -- Dave Beckett Sat, 13 Aug 2005 14:16:46 +0100 + +libcairo (0.9.0-1) unstable; urgency=low + + * New upstream release + * libcairo0.9.0 replaces libcairo0.6.0 + * Functions were added so create new sonames and libraries + + -- Dave Beckett Tue, 9 Aug 2005 08:21:50 +0100 + +libcairo (0.6.0-1) unstable; urgency=low + + * New upstream release + * libcairo0.6.0 replaces libcairo0.5.1 + * Functions were added so create new sonames and libraries + * Require glitz 0.4.4 API and libpixman 0.1.5 + + -- Dave Beckett Fri, 29 Jul 2005 23:31:05 +0100 + +libcairo (0.5.1-2) unstable; urgency=low + + * Upload to unstable + * libcairo0.5.1 replaces older libcairo1 + * libcairo0.5.1-dev already conflicted with libcairo1-dev so enable + shipping libcairo.so and delete patch 05-cairo.pc.in.patch as the + cairo.pc.in is ok again + + -- Dave Beckett Sun, 10 Jul 2005 22:07:22 +0100 + +libcairo (0.5.1-1) experimental; urgency=low + + * New upstream release + * Revert to source package name libcairo + * Reflect ABI version into both library soname as libcairo-1debian0.5.1 + and package name libcairo0.5.1 (Closes: #314776) + * libcairo0.5.1 no longer conflicts with libcairo1 + * Added a libcairo0.5.1-doc package with the HTML documentation + + -- Dave Beckett Wed, 22 Jun 2005 21:06:01 +0100 + +cairo (0.5.0-2) unstable; urgency=low + + * Fix the shlibs dependencies for libcairo0.5 + + -- Dave Beckett Thu, 9 Jun 2005 21:56:08 +0100 + +cairo (0.5.0-1) unstable; urgency=low + + * New upstream release (Closes: 311042) + * Change source package s/lib// and add API version to binary packages + * Enable glitz backend (Closes: 307573) + + -- Dave Beckett Thu, 9 Jun 2005 20:51:11 +0100 + +libcairo (0.4.0-1) unstable; urgency=low + + * New upstream release + * API changes for fonts so shlib version is now 0.4.0 + * Require libpixman 0.1.4 + + -- Dave Beckett Wed, 9 Mar 2005 19:39:44 +0000 + +libcairo (0.3.0-1) unstable; urgency=low + + * New upstream release. Closes: 284205 + * Bumped shlibs version since new functions were added. + * Headers have moved to below /usr/include/cairo + * Require libpixman 0.1.3 + + -- Dave Beckett Sun, 6 Feb 2005 12:40:04 +0000 + +libcairo (0.2.0-1) unstable; urgency=low + + * New upstream release + * Bumped shlibs version since new functions were added. + * Require libpixman 0.1.2 + * Still keep glitz disabled + + -- Dave Beckett Mon, 8 Nov 2004 22:19:29 +0000 + +libcairo (0.1.23-2) unstable; urgency=low + + * Replace Build-Depend on xlibs-dev with libx11-dev + * Changed to LGPL license (in CVS 2004-08-02) + * Disable use of glitz explicitly + + -- Dave Beckett Mon, 23 Aug 2004 22:25:16 +0100 + +libcairo (0.1.23-1) unstable; urgency=low + + * New upstream release. Closes: 248705 + * Add PNG backend, require libpng12-dev + * Requires libpixman >= 0.1.1 + + -- Dave Beckett Sat, 29 May 2004 21:10:58 +0100 + +libcairo (0.1.18-1) unstable; urgency=low + + * New upstream release + * Remove xlib-surface-debian.patch, not needed for XFree86 4.3.0+ + + -- Dave Beckett Thu, 19 Feb 2004 23:08:25 +0000 + +libcairo (0.1.17-4) unstable; urgency=low + + * Initial version to debian archive. Closes: #205346 + + -- Dave Beckett Sun, 15 Feb 2004 21:45:47 +0000 + +libcairo (0.1.17-3) unstable; urgency=low + + * Setting me as the maintainer temporarily + + -- Eduard Bloch Sat, 14 Feb 2004 16:49:18 +0100 + +libcairo (0.1.17-2) unstable; urgency=low + + * Add patch/xlib-surface-debian.patch to restore this to working for X. + + -- Dave Beckett Sat, 24 Jan 2004 18:02:38 +0000 + +libcairo (0.1.17-1) unstable; urgency=low + + * New upstream release + * Replace libpixman/libic dependencies with libpixman + + -- Dave Beckett Tue, 16 Dec 2003 17:49:55 +0000 + +libcairo (0.1.16-1) unstable; urgency=low + + * New upstream release + * Added libxrender-dev (>=0.6.0) requirement to match configure.in + + -- Dave Beckett Mon, 8 Dec 2003 20:39:59 +0000 + +libcairo (0.1.13-1) unstable; urgency=low + + * New upstream release + * Remove patch for src/config.h - merged upstream. + * Return libfreetype6 minimum version to 2.1.0. + + -- Dave Beckett Fri, 21 Nov 2003 20:05:38 +0000 + +libcairo (0.1.12-3) unstable; urgency=low + + * Pull patch from CVS to allow building with newer freetype using the + new include via defines mechanism now enforced in freetype 2.1.6 + + -- Dave Beckett Tue, 18 Nov 2003 20:15:08 +0000 + +libcairo (0.1.12-2) unstable; urgency=low + + * Remove dependency on libxft-dev, replaced with libfreetype6-dev and + libfontconfig1-dev + + -- Dave Beckett Sat, 8 Nov 2003 18:44:19 +0000 + +libcairo (0.1.12-1) unstable; urgency=low + + * New upstream release + + -- Dave Beckett Fri, 7 Nov 2003 20:43:33 +0000 + +libcairo (0.1.11-1) unstable; urgency=low + + * New upstream release + + -- Dave Beckett Tue, 4 Nov 2003 15:10:14 +0000 + +libcairo (0.1.10-1) unstable; urgency=low + + * New upstream release + + -- Dave Beckett Tue, 4 Nov 2003 00:23:16 +0000 + +libcairo (0.1.9-2) unstable; urgency=low + + * Generate packages correctly named after the library major soname: + libcairo1, libcairo1-dev + + -- Dave Beckett Thu, 30 Oct 2003 23:16:43 +0000 + +libcairo (0.1.9-1) unstable; urgency=low + + * New upstream release. + * Removed dependency on automake, autoconf, libtool + + -- Dave Beckett Thu, 30 Oct 2003 21:37:25 +0000 + +libcairo (0.1.8-1) unstable; urgency=low + + * Initial package + + -- Dave Beckett Wed, 29 Oct 2003 23:20:26 +0000 + --- cairo-1.8.4.orig/debian/libcairo-directfb2-udeb.install +++ cairo-1.8.4/debian/libcairo-directfb2-udeb.install @@ -0,0 +1 @@ +debian/dist-directfb/usr/lib/libcairo.so.* /usr/lib --- cairo-1.8.4.orig/debian/libcairo-directfb2.links +++ cairo-1.8.4/debian/libcairo-directfb2.links @@ -0,0 +1 @@ +/usr/lib/libcairo.so.2 /usr/lib/libcairo-directfb/lib/libcairo.so.2 --- cairo-1.8.4.orig/debian/libcairo-directfb2-dev.links +++ cairo-1.8.4/debian/libcairo-directfb2-dev.links @@ -0,0 +1,3 @@ +/usr/include/cairo /usr/lib/libcairo-directfb/include/cairo +/usr/lib/libcairo.so /usr/lib/libcairo-directfb/lib/libcairo.so +/usr/lib/libcairo.a /usr/lib/libcairo-directfb/lib/libcairo.a --- cairo-1.8.4.orig/debian/libcairo2-dev.install +++ cairo-1.8.4/debian/libcairo2-dev.install @@ -0,0 +1,5 @@ +debian/dist-main/usr/include/cairo/*.h /usr/include/cairo +debian/dist-main/usr/lib/libcairo.so /usr/lib +debian/dist-main/usr/lib/libcairo*.a /usr/lib +debian/dist-main/usr/lib/libcairo*.la /usr/lib +debian/dist-main/usr/lib/pkgconfig/cairo*.pc /usr/lib/pkgconfig --- cairo-1.8.4.orig/debian/compat +++ cairo-1.8.4/debian/compat @@ -0,0 +1 @@ +5 --- cairo-1.8.4.orig/debian/libcairo2.install +++ cairo-1.8.4/debian/libcairo2.install @@ -0,0 +1 @@ +debian/dist-main/usr/lib/libcairo.so.* /usr/lib --- cairo-1.8.4.orig/debian/patches/02_no-private-symbol-export.dpatch +++ cairo-1.8.4/debian/patches/02_no-private-symbol-export.dpatch @@ -0,0 +1,15 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run + +@DPATCH@ +diff -urNad cairo-1.8.0~/src/cairo-mutex.c cairo-1.8.0/src/cairo-mutex.c +--- cairo-1.8.0~/src/cairo-mutex.c 2008-09-25 13:36:35.000000000 +0200 ++++ cairo-1.8.0/src/cairo-mutex.c 2008-10-14 14:22:45.000000000 +0200 +@@ -35,7 +35,7 @@ + + #include "cairo-mutex-private.h" + +-#define CAIRO_MUTEX_DECLARE(mutex) cairo_mutex_t mutex = CAIRO_MUTEX_NIL_INITIALIZER; ++#define CAIRO_MUTEX_DECLARE(mutex) cairo_private cairo_mutex_t mutex = CAIRO_MUTEX_NIL_INITIALIZER; + #include "cairo-mutex-list-private.h" + #undef CAIRO_MUTEX_DECLARE + --- cairo-1.8.4.orig/debian/patches/04_lcd_filter.dpatch +++ cairo-1.8.4/debian/patches/04_lcd_filter.dpatch @@ -0,0 +1,1049 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 04_lcd_filter.dpatch by Fabien Tassin +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: From git rev 5d887ad5dca5af0f8216830d1b04d08a5aba9bee + +@DPATCH@ +diff -urNad cairo-1.8.0~/src/cairo-font-options.c cairo-1.8.0/src/cairo-font-options.c +--- cairo-1.8.0~/src/cairo-font-options.c 2008-09-25 22:30:14.000000000 +0200 ++++ cairo-1.8.0/src/cairo-font-options.c 2008-10-14 15:01:37.000000000 +0200 +@@ -39,6 +39,7 @@ + static const cairo_font_options_t _cairo_font_options_nil = { + CAIRO_ANTIALIAS_DEFAULT, + CAIRO_SUBPIXEL_ORDER_DEFAULT, ++ CAIRO_LCD_FILTER_DEFAULT, + CAIRO_HINT_STYLE_DEFAULT, + CAIRO_HINT_METRICS_DEFAULT + }; +@@ -54,6 +55,7 @@ + { + options->antialias = CAIRO_ANTIALIAS_DEFAULT; + options->subpixel_order = CAIRO_SUBPIXEL_ORDER_DEFAULT; ++ options->lcd_filter = CAIRO_LCD_FILTER_DEFAULT; + options->hint_style = CAIRO_HINT_STYLE_DEFAULT; + options->hint_metrics = CAIRO_HINT_METRICS_DEFAULT; + } +@@ -64,6 +66,7 @@ + { + options->antialias = other->antialias; + options->subpixel_order = other->subpixel_order; ++ options->lcd_filter = other->lcd_filter; + options->hint_style = other->hint_style; + options->hint_metrics = other->hint_metrics; + } +@@ -189,6 +192,8 @@ + options->antialias = other->antialias; + if (other->subpixel_order != CAIRO_SUBPIXEL_ORDER_DEFAULT) + options->subpixel_order = other->subpixel_order; ++ if (other->lcd_filter != CAIRO_LCD_FILTER_DEFAULT) ++ options->lcd_filter = other->lcd_filter; + if (other->hint_style != CAIRO_HINT_STYLE_DEFAULT) + options->hint_style = other->hint_style; + if (other->hint_metrics != CAIRO_HINT_METRICS_DEFAULT) +@@ -221,6 +226,7 @@ + + return (options->antialias == other->antialias && + options->subpixel_order == other->subpixel_order && ++ options->lcd_filter == other->lcd_filter && + options->hint_style == other->hint_style && + options->hint_metrics == other->hint_metrics); + } +@@ -246,7 +252,8 @@ + + return ((options->antialias) | + (options->subpixel_order << 4) | +- (options->hint_style << 8) | ++ (options->lcd_filter << 8) | ++ (options->hint_style << 12) | + (options->hint_metrics << 16)); + } + slim_hidden_def (cairo_font_options_hash); +@@ -328,6 +335,48 @@ + } + + /** ++ * _cairo_font_options_set_lcd_filter: ++ * @options: a #cairo_font_options_t ++ * @lcd_filter: the new LCD filter ++ * ++ * Sets the LCD filter for the font options object. The LCD filter ++ * specifies how pixels are filtered when rendered with an antialiasing ++ * mode of %CAIRO_ANTIALIAS_SUBPIXEL. See the documentation for ++ * #cairo_lcd_filter_t for full details. ++ * ++ * Since: 1.8 ++ **/ ++void ++_cairo_font_options_set_lcd_filter (cairo_font_options_t *options, ++ cairo_lcd_filter_t lcd_filter) ++{ ++ if (cairo_font_options_status (options)) ++ return; ++ ++ options->lcd_filter = lcd_filter; ++} ++ ++/** ++ * _cairo_font_options_get_lcd_filter: ++ * @options: a #cairo_font_options_t ++ * ++ * Gets the LCD filter for the font options object. ++ * See the documentation for #cairo_lcd_filter_t for full details. ++ * ++ * Return value: the LCD filter for the font options object ++ * ++ * Since: 1.8 ++ **/ ++cairo_lcd_filter_t ++_cairo_font_options_get_lcd_filter (const cairo_font_options_t *options) ++{ ++ if (cairo_font_options_status ((cairo_font_options_t *) options)) ++ return CAIRO_LCD_FILTER_DEFAULT; ++ ++ return options->lcd_filter; ++} ++ ++/** + * cairo_font_options_set_hint_style: + * @options: a #cairo_font_options_t + * @hint_style: the new hint style +diff -urNad cairo-1.8.0~/src/cairo-ft-font.c cairo-1.8.0/src/cairo-ft-font.c +--- cairo-1.8.0~/src/cairo-ft-font.c 2008-09-25 22:28:24.000000000 +0200 ++++ cairo-1.8.0/src/cairo-ft-font.c 2008-10-14 15:01:37.000000000 +0200 +@@ -57,6 +57,30 @@ + #include FT_SYNTHESIS_H + #endif + ++#if HAVE_FT_LIBRARY_SETLCDFILTER ++#include FT_LCD_FILTER_H ++#endif ++ ++/* Fontconfig version older than 2.6 didn't have these options */ ++#ifndef FC_LCD_FILTER ++#define FC_LCD_FILTER "lcdfilter" ++#endif ++/* Some Ubuntu versions defined FC_LCD_FILTER without defining the following */ ++#ifndef FC_LCD_NONE ++#define FC_LCD_NONE 0 ++#define FC_LCD_DEFAULT 1 ++#define FC_LCD_LIGHT 2 ++#define FC_LCD_LEGACY 3 ++#endif ++ ++/* FreeType version older than 2.3.5(?) didn't have these options */ ++#ifndef FT_LCD_FILTER_NONE ++#define FT_LCD_FILTER_NONE 0 ++#define FT_LCD_FILTER_DEFAULT 1 ++#define FT_LCD_FILTER_LIGHT 2 ++#define FT_LCD_FILTER_LEGACY 16 ++#endif ++ + #define DOUBLE_TO_26_6(d) ((FT_F26Dot6)((d) * 64.0)) + #define DOUBLE_FROM_26_6(t) ((double)(t) / 64.0) + #define DOUBLE_TO_16_16(d) ((FT_Fixed)((d) * 65536.0)) +@@ -737,23 +761,286 @@ + return CAIRO_STATUS_SUCCESS; + } + +-/* Empirically-derived subpixel filtering values thanks to Keith +- * Packard and libXft. */ +-static const int filters[3][3] = { +- /* red */ +-#if 0 +- { 65538*4/7,65538*2/7,65538*1/7 }, +- /* green */ +- { 65536*1/4, 65536*2/4, 65537*1/4 }, +- /* blue */ +- { 65538*1/7,65538*2/7,65538*4/7 }, ++/* we sometimes need to convert the glyph bitmap in a FT_GlyphSlot ++ * into a different format. For example, we want to convert a ++ * FT_PIXEL_MODE_LCD or FT_PIXEL_MODE_LCD_V bitmap into a 32-bit ++ * ARGB or ABGR bitmap. ++ * ++ * this function prepares a target descriptor for this operation. ++ * ++ * input :: target bitmap descriptor. The function will set its ++ * 'width', 'rows' and 'pitch' fields, and only these ++ * ++ * slot :: the glyph slot containing the source bitmap. this ++ * function assumes that slot->format == FT_GLYPH_FORMAT_BITMAP ++ * ++ * mode :: the requested final rendering mode. supported values are ++ * MONO, NORMAL (i.e. gray), LCD and LCD_V ++ * ++ * the function returns the size in bytes of the corresponding buffer, ++ * it's up to the caller to allocate the corresponding memory block ++ * before calling _fill_xrender_bitmap ++ * ++ * it also returns -1 in case of error (e.g. incompatible arguments, ++ * like trying to convert a gray bitmap into a monochrome one) ++ */ ++static int ++_compute_xrender_bitmap_size(FT_Bitmap *target, ++ FT_GlyphSlot slot, ++ FT_Render_Mode mode) ++{ ++ FT_Bitmap *ftbit; ++ int width, height, pitch; ++ ++ if (slot->format != FT_GLYPH_FORMAT_BITMAP) ++ return -1; ++ ++ /* compute the size of the final bitmap */ ++ ftbit = &slot->bitmap; ++ ++ width = ftbit->width; ++ height = ftbit->rows; ++ pitch = (width + 3) & ~3; ++ ++ switch (ftbit->pixel_mode) { ++ case FT_PIXEL_MODE_MONO: ++ if (mode == FT_RENDER_MODE_MONO) { ++ pitch = (((width + 31) & ~31) >> 3); ++ break; ++ } ++ /* fall-through */ ++ ++ case FT_PIXEL_MODE_GRAY: ++ if (mode == FT_RENDER_MODE_LCD || ++ mode == FT_RENDER_MODE_LCD_V) ++ { ++ /* each pixel is replicated into a 32-bit ARGB value */ ++ pitch = width * 4; ++ } ++ break; ++ ++ case FT_PIXEL_MODE_LCD: ++ if (mode != FT_RENDER_MODE_LCD) ++ return -1; ++ ++ /* horz pixel triplets are packed into 32-bit ARGB values */ ++ width /= 3; ++ pitch = width * 4; ++ break; ++ ++ case FT_PIXEL_MODE_LCD_V: ++ if (mode != FT_RENDER_MODE_LCD_V) ++ return -1; ++ ++ /* vert pixel triplets are packed into 32-bit ARGB values */ ++ height /= 3; ++ pitch = width * 4; ++ break; ++ ++ default: /* unsupported source format */ ++ return -1; ++ } ++ ++ target->width = width; ++ target->rows = height; ++ target->pitch = pitch; ++ target->buffer = NULL; ++ ++ return pitch * height; ++} ++ ++/* this functions converts the glyph bitmap found in a FT_GlyphSlot ++ * into a different format (see _compute_xrender_bitmap_size) ++ * ++ * you should call this function after _compute_xrender_bitmap_size ++ * ++ * target :: target bitmap descriptor. Note that its 'buffer' pointer ++ * must point to memory allocated by the caller ++ * ++ * slot :: the glyph slot containing the source bitmap ++ * ++ * mode :: the requested final rendering mode ++ * ++ * bgr :: boolean, set if BGR or VBGR pixel ordering is needed ++ */ ++static void ++_fill_xrender_bitmap(FT_Bitmap *target, ++ FT_GlyphSlot slot, ++ FT_Render_Mode mode, ++ int bgr) ++{ ++ FT_Bitmap *ftbit = &slot->bitmap; ++ unsigned char *srcLine = ftbit->buffer; ++ unsigned char *dstLine = target->buffer; ++ int src_pitch = ftbit->pitch; ++ int width = target->width; ++ int height = target->rows; ++ int pitch = target->pitch; ++ int subpixel; ++ int h; ++ ++ subpixel = (mode == FT_RENDER_MODE_LCD || ++ mode == FT_RENDER_MODE_LCD_V); ++ ++ if (src_pitch < 0) ++ srcLine -= src_pitch * (ftbit->rows - 1); ++ ++ target->pixel_mode = ftbit->pixel_mode; ++ ++ switch (ftbit->pixel_mode) { ++ case FT_PIXEL_MODE_MONO: ++ if (subpixel) { ++ /* convert mono to ARGB32 values */ ++ ++ for (h = height; h > 0; h--, srcLine += src_pitch, dstLine += pitch) { ++ int x; ++ ++ for (x = 0; x < width; x++) { ++ if (srcLine[(x >> 3)] & (0x80 >> (x & 7))) ++ ((unsigned int *) dstLine)[x] = 0xffffffffU; ++ } ++ } ++ target->pixel_mode = FT_PIXEL_MODE_LCD; ++ ++ } else if (mode == FT_RENDER_MODE_NORMAL) { ++ /* convert mono to 8-bit gray */ ++ ++ for (h = height; h > 0; h--, srcLine += src_pitch, dstLine += pitch) { ++ int x; ++ ++ for (x = 0; x < width; x++) { ++ if (srcLine[(x >> 3)] & (0x80 >> (x & 7))) ++ dstLine[x] = 0xff; ++ } ++ } ++ target->pixel_mode = FT_PIXEL_MODE_GRAY; ++ ++ } else { ++ /* copy mono to mono */ ++ ++ int bytes = (width + 7) >> 3; ++ ++ for (h = height; h > 0; h--, srcLine += src_pitch, dstLine += pitch) ++ memcpy (dstLine, srcLine, bytes); ++ } ++ break; ++ ++ case FT_PIXEL_MODE_GRAY: ++ if (subpixel) { ++ /* convert gray to ARGB32 values */ ++ ++ for (h = height; h > 0; h--, srcLine += src_pitch, dstLine += pitch) { ++ int x; ++ unsigned int *dst = (unsigned int *) dstLine; ++ ++ for (x = 0; x < width; x++) { ++ unsigned int pix = srcLine[x]; ++ ++ pix |= (pix << 8); ++ pix |= (pix << 16); ++ ++ dst[x] = pix; ++ } ++ } ++ target->pixel_mode = FT_PIXEL_MODE_LCD; ++ } else { ++ /* copy gray into gray */ ++ ++ for (h = height; h > 0; h--, srcLine += src_pitch, dstLine += pitch) ++ memcpy (dstLine, srcLine, width); ++ } ++ break; ++ ++ case FT_PIXEL_MODE_LCD: ++ if (!bgr) { ++ /* convert horizontal RGB into ARGB32 */ ++ ++ for (h = height; h > 0; h--, srcLine += src_pitch, dstLine += pitch) { ++ int x; ++ unsigned char *src = srcLine; ++ unsigned int *dst = (unsigned int *) dstLine; ++ ++ for (x = 0; x < width; x++, src += 3) { ++ unsigned int pix; ++ ++ pix = ((unsigned int)src[0] << 16) | ++ ((unsigned int)src[1] << 8) | ++ ((unsigned int)src[2] ) | ++ ((unsigned int)src[1] << 24) ; ++ ++ dst[x] = pix; ++ } ++ } ++ } else { ++ /* convert horizontal BGR into ARGB32 */ ++ ++ for (h = height; h > 0; h--, srcLine += src_pitch, dstLine += pitch) { ++ ++ int x; ++ unsigned char *src = srcLine; ++ unsigned int *dst = (unsigned int *) dstLine; ++ ++ for (x = 0; x < width; x++, src += 3) { ++ unsigned int pix; ++ ++ pix = ((unsigned int)src[2] << 16) | ++ ((unsigned int)src[1] << 8) | ++ ((unsigned int)src[0] ) | ++ ((unsigned int)src[1] << 24) ; ++ ++ dst[x] = pix; ++ } ++ } ++ } ++ break; ++ ++ default: /* FT_PIXEL_MODE_LCD_V */ ++ /* convert vertical RGB into ARGB32 */ ++ if (!bgr) { ++ ++ for (h = height; h > 0; h--, srcLine += 3 * src_pitch, dstLine += pitch) { ++ int x; ++ unsigned char* src = srcLine; ++ unsigned int* dst = (unsigned int *) dstLine; ++ ++ for (x = 0; x < width; x++, src += 1) { ++ unsigned int pix; ++#if 1 ++ pix = ((unsigned int)src[0] << 16) | ++ ((unsigned int)src[src_pitch] << 8) | ++ ((unsigned int)src[src_pitch*2] ) | ++ 0xFF000000 ; ++#else ++ pix = ((unsigned int)src[0] << 16) | ++ ((unsigned int)src[src_pitch] << 8) | ++ ((unsigned int)src[src_pitch*2] ) | ++ ((unsigned int)src[src_pitch] << 24) ; + #endif +- { 65538*9/13,65538*3/13,65538*1/13 }, +- /* green */ +- { 65538*1/6, 65538*4/6, 65538*1/6 }, +- /* blue */ +- { 65538*1/13,65538*3/13,65538*9/13 }, +-}; ++ dst[x] = pix; ++ } ++ } ++ } else { ++ ++ for (h = height; h > 0; h--, srcLine += 3*src_pitch, dstLine += pitch) { ++ int x; ++ unsigned char *src = srcLine; ++ unsigned int *dst = (unsigned int *) dstLine; ++ ++ for (x = 0; x < width; x++, src += 1) { ++ unsigned int pix; ++ ++ pix = ((unsigned int)src[src_pitch * 2] << 16) | ++ ((unsigned int)src[src_pitch] << 8) | ++ ((unsigned int)src[0] ) | ++ ((unsigned int)src[src_pitch] << 24) ; ++ ++ dst[x] = pix; ++ } ++ } ++ } ++ } ++} ++ + + /* Fills in val->image with an image surface created from @bitmap + */ +@@ -766,7 +1053,7 @@ + int width, height, stride; + unsigned char *data; + int format = CAIRO_FORMAT_A8; +- cairo_bool_t subpixel = FALSE; ++ cairo_image_surface_t *image; + + width = bitmap->width; + height = bitmap->rows; +@@ -823,11 +1110,7 @@ + case FT_PIXEL_MODE_LCD: + case FT_PIXEL_MODE_LCD_V: + case FT_PIXEL_MODE_GRAY: +- switch (font_options->antialias) { +- case CAIRO_ANTIALIAS_DEFAULT: +- case CAIRO_ANTIALIAS_GRAY: +- case CAIRO_ANTIALIAS_NONE: +- default: ++ if (font_options->antialias != CAIRO_ANTIALIAS_SUBPIXEL) { + stride = bitmap->pitch; + if (own_buffer) { + data = bitmap->buffer; +@@ -839,104 +1122,16 @@ + memcpy (data, bitmap->buffer, stride * height); + } + format = CAIRO_FORMAT_A8; +- break; +- case CAIRO_ANTIALIAS_SUBPIXEL: { +- int x, y; +- unsigned char *in_line, *out_line, *in; +- unsigned int *out; +- unsigned int red, green, blue; +- int rf, gf, bf; +- int s; +- int o, os; +- unsigned char *data_rgba; +- unsigned int width_rgba, stride_rgba; +- int vmul = 1; +- int hmul = 1; ++ } else { ++ /* if we get there, the data from the source bitmap ++ * really comes from _fill_xrender_bitmap, and is ++ * made of 32-bit ARGB or ABGR values */ ++ assert (own_buffer != 0); ++ assert (bitmap->pixel_mode != FT_PIXEL_MODE_GRAY); + +- switch (font_options->subpixel_order) { +- case CAIRO_SUBPIXEL_ORDER_DEFAULT: +- case CAIRO_SUBPIXEL_ORDER_RGB: +- case CAIRO_SUBPIXEL_ORDER_BGR: +- default: +- width /= 3; +- hmul = 3; +- break; +- case CAIRO_SUBPIXEL_ORDER_VRGB: +- case CAIRO_SUBPIXEL_ORDER_VBGR: +- vmul = 3; +- height /= 3; +- break; +- } +- /* +- * Filter the glyph to soften the color fringes +- */ +- width_rgba = width; ++ data = bitmap->buffer; + stride = bitmap->pitch; +- stride_rgba = (width_rgba * 4 + 3) & ~3; +- data_rgba = calloc (stride_rgba, height); +- if (data_rgba == NULL) { +- if (own_buffer) +- free (bitmap->buffer); +- return _cairo_error (CAIRO_STATUS_NO_MEMORY); +- } +- +- os = 1; +- switch (font_options->subpixel_order) { +- case CAIRO_SUBPIXEL_ORDER_VRGB: +- os = stride; +- case CAIRO_SUBPIXEL_ORDER_DEFAULT: +- case CAIRO_SUBPIXEL_ORDER_RGB: +- default: +- rf = 0; +- gf = 1; +- bf = 2; +- break; +- case CAIRO_SUBPIXEL_ORDER_VBGR: +- os = stride; +- case CAIRO_SUBPIXEL_ORDER_BGR: +- bf = 0; +- gf = 1; +- rf = 2; +- break; +- } +- in_line = bitmap->buffer; +- out_line = data_rgba; +- for (y = 0; y < height; y++) +- { +- in = in_line; +- out = (unsigned int *) out_line; +- in_line += stride * vmul; +- out_line += stride_rgba; +- for (x = 0; x < width * hmul; x += hmul) +- { +- red = green = blue = 0; +- o = 0; +- for (s = 0; s < 3; s++) +- { +- red += filters[rf][s]*in[x+o]; +- green += filters[gf][s]*in[x+o]; +- blue += filters[bf][s]*in[x+o]; +- o += os; +- } +- red = red / 65536; +- green = green / 65536; +- blue = blue / 65536; +- *out++ = (green << 24) | (red << 16) | (green << 8) | blue; +- } +- } +- +- /* Images here are stored in native format. The +- * backend must convert to its own format as needed +- */ +- +- if (own_buffer) +- free (bitmap->buffer); +- data = data_rgba; +- stride = stride_rgba; + format = CAIRO_FORMAT_ARGB32; +- subpixel = TRUE; +- break; +- } + } + break; + case FT_PIXEL_MODE_GRAY2: +@@ -948,19 +1143,20 @@ + return _cairo_error (CAIRO_STATUS_NO_MEMORY); + } + +- *surface = (cairo_image_surface_t *) ++ /* XXX */ ++ *surface = image = (cairo_image_surface_t *) + cairo_image_surface_create_for_data (data, + format, + width, height, stride); +- if ((*surface)->base.status) { ++ if (image->base.status) { + free (data); + return (*surface)->base.status; + } + +- if (subpixel) +- pixman_image_set_component_alpha ((*surface)->pixman_image, TRUE); ++ if (font_options->antialias == CAIRO_ANTIALIAS_SUBPIXEL) ++ pixman_image_set_component_alpha (image->pixman_image, TRUE); + +- _cairo_image_surface_assume_ownership_of_data ((*surface)); ++ _cairo_image_surface_assume_ownership_of_data (image); + + return CAIRO_STATUS_SUCCESS; + } +@@ -985,16 +1181,59 @@ + cairo_font_options_t *font_options, + cairo_image_surface_t **surface) + { ++ int rgba = FC_RGBA_UNKNOWN; ++ int lcd_filter = FT_LCD_FILTER_LEGACY; + FT_GlyphSlot glyphslot = face->glyph; + FT_Outline *outline = &glyphslot->outline; + FT_Bitmap bitmap; + FT_BBox cbox; +- FT_Matrix matrix; +- int hmul = 1; +- int vmul = 1; +- unsigned int width, height, stride; +- cairo_bool_t subpixel = FALSE; ++ unsigned int width, height; + cairo_status_t status; ++ FT_Error fterror; ++ FT_Library library = glyphslot->library; ++ FT_Render_Mode render_mode = FT_RENDER_MODE_NORMAL; ++ ++ switch (font_options->antialias) { ++ case CAIRO_ANTIALIAS_NONE: ++ render_mode = FT_RENDER_MODE_MONO; ++ break; ++ ++ case CAIRO_ANTIALIAS_SUBPIXEL: ++ switch (font_options->subpixel_order) { ++ case CAIRO_SUBPIXEL_ORDER_DEFAULT: ++ case CAIRO_SUBPIXEL_ORDER_RGB: ++ case CAIRO_SUBPIXEL_ORDER_BGR: ++ render_mode = FT_RENDER_MODE_LCD; ++ break; ++ ++ case CAIRO_SUBPIXEL_ORDER_VRGB: ++ case CAIRO_SUBPIXEL_ORDER_VBGR: ++ render_mode = FT_RENDER_MODE_LCD_V; ++ break; ++ } ++ ++ switch (font_options->lcd_filter) { ++ case CAIRO_LCD_FILTER_NONE: ++ lcd_filter = FT_LCD_FILTER_NONE; ++ break; ++ case CAIRO_LCD_FILTER_DEFAULT: ++ case CAIRO_LCD_FILTER_INTRA_PIXEL: ++ lcd_filter = FT_LCD_FILTER_LEGACY; ++ break; ++ case CAIRO_LCD_FILTER_FIR3: ++ lcd_filter = FT_LCD_FILTER_LIGHT; ++ break; ++ case CAIRO_LCD_FILTER_FIR5: ++ lcd_filter = FT_LCD_FILTER_DEFAULT; ++ break; ++ } ++ ++ break; ++ ++ case CAIRO_ANTIALIAS_DEFAULT: ++ case CAIRO_ANTIALIAS_GRAY: ++ render_mode = FT_RENDER_MODE_NORMAL; ++ } + + FT_Outline_Get_CBox (outline, &cbox); + +@@ -1005,20 +1244,21 @@ + + width = (unsigned int) ((cbox.xMax - cbox.xMin) >> 6); + height = (unsigned int) ((cbox.yMax - cbox.yMin) >> 6); +- stride = (width * hmul + 3) & ~3; + + if (width * height == 0) { + cairo_format_t format; + /* Looks like fb handles zero-sized images just fine */ +- switch (font_options->antialias) { +- case CAIRO_ANTIALIAS_NONE: ++ switch (render_mode) { ++ case FT_RENDER_MODE_MONO: + format = CAIRO_FORMAT_A1; + break; +- case CAIRO_ANTIALIAS_SUBPIXEL: ++ case FT_RENDER_MODE_LCD: ++ case FT_RENDER_MODE_LCD_V: + format= CAIRO_FORMAT_ARGB32; + break; +- case CAIRO_ANTIALIAS_DEFAULT: +- case CAIRO_ANTIALIAS_GRAY: ++ case FT_RENDER_MODE_LIGHT: ++ case FT_RENDER_MODE_NORMAL: ++ case FT_RENDER_MODE_MAX: + default: + format = CAIRO_FORMAT_A8; + break; +@@ -1030,73 +1270,73 @@ + return (*surface)->base.status; + } else { + +- matrix.xx = matrix.yy = 0x10000L; +- matrix.xy = matrix.yx = 0; ++ int bitmap_size; + +- switch (font_options->antialias) { +- case CAIRO_ANTIALIAS_NONE: +- bitmap.pixel_mode = FT_PIXEL_MODE_MONO; +- bitmap.num_grays = 1; +- stride = ((width + 31) & -32) >> 3; +- break; +- case CAIRO_ANTIALIAS_DEFAULT: +- case CAIRO_ANTIALIAS_GRAY: +- bitmap.pixel_mode = FT_PIXEL_MODE_GRAY; +- bitmap.num_grays = 256; +- stride = (width + 3) & -4; ++ switch (render_mode) { ++ case FT_RENDER_MODE_LCD: ++ if (font_options->subpixel_order == CAIRO_SUBPIXEL_ORDER_BGR) { ++ rgba = FC_RGBA_BGR; ++ } else { ++ rgba = FC_RGBA_RGB; ++ } + break; +- case CAIRO_ANTIALIAS_SUBPIXEL: +- switch (font_options->subpixel_order) { +- case CAIRO_SUBPIXEL_ORDER_RGB: +- case CAIRO_SUBPIXEL_ORDER_BGR: +- case CAIRO_SUBPIXEL_ORDER_DEFAULT: +- default: +- matrix.xx *= 3; +- hmul = 3; +- subpixel = TRUE; +- break; +- case CAIRO_SUBPIXEL_ORDER_VRGB: +- case CAIRO_SUBPIXEL_ORDER_VBGR: +- matrix.yy *= 3; +- vmul = 3; +- subpixel = TRUE; +- break; ++ case FT_RENDER_MODE_LCD_V: ++ if (font_options->subpixel_order == CAIRO_SUBPIXEL_ORDER_VBGR) { ++ rgba = FC_RGBA_VBGR; ++ } else { ++ rgba = FC_RGBA_VRGB; + } +- FT_Outline_Transform (outline, &matrix); +- +- bitmap.pixel_mode = FT_PIXEL_MODE_GRAY; +- bitmap.num_grays = 256; +- stride = (width * hmul + 3) & -4; ++ break; ++ case FT_RENDER_MODE_MONO: ++ case FT_RENDER_MODE_LIGHT: ++ case FT_RENDER_MODE_NORMAL: ++ case FT_RENDER_MODE_MAX: ++ default: ++ break; + } + +- bitmap.pitch = stride; +- bitmap.width = width * hmul; +- bitmap.rows = height * vmul; +- bitmap.buffer = calloc (stride, bitmap.rows); +- if (bitmap.buffer == NULL) ++#if HAVE_FT_LIBRARY_SETLCDFILTER ++ FT_Library_SetLcdFilter (library, lcd_filter); ++#endif ++ ++ fterror = FT_Render_Glyph (face->glyph, render_mode); ++ ++#if HAVE_FT_LIBRARY_SETLCDFILTER ++ FT_Library_SetLcdFilter (library, FT_LCD_FILTER_NONE); ++#endif ++ ++ if (fterror != 0) + return _cairo_error (CAIRO_STATUS_NO_MEMORY); + +- FT_Outline_Translate (outline, -cbox.xMin*hmul, -cbox.yMin*vmul); ++ bitmap_size = _compute_xrender_bitmap_size (&bitmap, ++ face->glyph, ++ render_mode); ++ if (bitmap_size < 0) ++ return _cairo_error (CAIRO_STATUS_NO_MEMORY); + +- if (FT_Outline_Get_Bitmap (glyphslot->library, outline, &bitmap) != 0) { +- free (bitmap.buffer); ++ bitmap.buffer = calloc (1, bitmap_size); ++ if (bitmap.buffer == NULL) + return _cairo_error (CAIRO_STATUS_NO_MEMORY); +- } + ++ _fill_xrender_bitmap (&bitmap, face->glyph, render_mode, ++ (rgba == FC_RGBA_BGR || rgba == FC_RGBA_VBGR)); ++ ++ /* Note: ++ * _get_bitmap_surface will free bitmap.buffer if there is an error ++ */ + status = _get_bitmap_surface (&bitmap, TRUE, font_options, surface); + if (status) + return status; +- } + +- /* +- * Note: the font's coordinate system is upside down from ours, so the +- * Y coordinate of the control box needs to be negated. Moreover, device +- * offsets are position of glyph origin relative to top left while xMin +- * and yMax are offsets of top left relative to origin. Another negation. +- */ +- cairo_surface_set_device_offset (&(*surface)->base, +- floor (-(double) cbox.xMin / 64.0), +- floor (+(double) cbox.yMax / 64.0)); ++ /* Note: the font's coordinate system is upside down from ours, so the ++ * Y coordinate of the control box needs to be negated. Moreover, device ++ * offsets are position of glyph origin relative to top left while xMin ++ * and yMax are offsets of top left relative to origin. Another negation. ++ */ ++ cairo_surface_set_device_offset (&(*surface)->base, ++ (double)-glyphslot->bitmap_left, ++ (double)+glyphslot->bitmap_top); ++ } + + return CAIRO_STATUS_SUCCESS; + } +@@ -1316,6 +1556,7 @@ + + if (antialias) { + cairo_subpixel_order_t subpixel_order; ++ int lcd_filter; + + /* disable hinting if requested */ + if (FcPatternGetBool (pattern, +@@ -1351,6 +1592,25 @@ + ft_options.base.antialias = CAIRO_ANTIALIAS_SUBPIXEL; + } + ++ if (FcPatternGetInteger (pattern, ++ FC_LCD_FILTER, 0, &lcd_filter) == FcResultMatch) ++ { ++ switch (lcd_filter) { ++ case FC_LCD_NONE: ++ ft_options.base.lcd_filter = CAIRO_LCD_FILTER_NONE; ++ break; ++ case FC_LCD_DEFAULT: ++ ft_options.base.lcd_filter = CAIRO_LCD_FILTER_FIR5; ++ break; ++ case FC_LCD_LIGHT: ++ ft_options.base.lcd_filter = CAIRO_LCD_FILTER_FIR3; ++ break; ++ case FC_LCD_LEGACY: ++ ft_options.base.lcd_filter = CAIRO_LCD_FILTER_INTRA_PIXEL; ++ break; ++ } ++ } ++ + #ifdef FC_HINT_STYLE + if (FcPatternGetInteger (pattern, + FC_HINT_STYLE, 0, &hintstyle) != FcResultMatch) +@@ -1451,6 +1711,12 @@ + if (other->base.hint_style == CAIRO_HINT_STYLE_NONE) + options->base.hint_style = CAIRO_HINT_STYLE_NONE; + ++ if (options->base.lcd_filter == CAIRO_LCD_FILTER_DEFAULT) ++ options->base.lcd_filter = other->base.lcd_filter; ++ ++ if (other->base.lcd_filter == CAIRO_LCD_FILTER_NONE) ++ options->base.lcd_filter = CAIRO_LCD_FILTER_NONE; ++ + if (options->base.antialias == CAIRO_ANTIALIAS_NONE) { + if (options->base.hint_style == CAIRO_HINT_STYLE_NONE) + load_flags |= FT_LOAD_NO_HINTING; +@@ -1474,11 +1740,11 @@ + case CAIRO_SUBPIXEL_ORDER_DEFAULT: + case CAIRO_SUBPIXEL_ORDER_RGB: + case CAIRO_SUBPIXEL_ORDER_BGR: +- load_target |= FT_LOAD_TARGET_LCD; ++ load_target = FT_LOAD_TARGET_LCD; + break; + case CAIRO_SUBPIXEL_ORDER_VRGB: + case CAIRO_SUBPIXEL_ORDER_VBGR: +- load_target |= FT_LOAD_TARGET_LCD_V; ++ load_target = FT_LOAD_TARGET_LCD_V; + break; + } + } +@@ -2421,6 +2687,34 @@ + } + } + ++ if (options->lcd_filter != CAIRO_LCD_FILTER_DEFAULT) ++ { ++ if (FcPatternGet (pattern, FC_LCD_FILTER, 0, &v) == FcResultNoMatch) ++ { ++ int lcd_filter; ++ ++ switch (options->lcd_filter) { ++ case CAIRO_LCD_FILTER_NONE: ++ lcd_filter = FT_LCD_FILTER_NONE; ++ break; ++ case CAIRO_LCD_FILTER_DEFAULT: ++ case CAIRO_LCD_FILTER_INTRA_PIXEL: ++ lcd_filter = FT_LCD_FILTER_LEGACY; ++ break; ++ case CAIRO_LCD_FILTER_FIR3: ++ lcd_filter = FT_LCD_FILTER_LIGHT; ++ break; ++ default: ++ case CAIRO_LCD_FILTER_FIR5: ++ lcd_filter = FT_LCD_FILTER_DEFAULT; ++ break; ++ } ++ ++ if (! FcPatternAddInteger (pattern, FC_LCD_FILTER, lcd_filter)) ++ return _cairo_error (CAIRO_STATUS_NO_MEMORY); ++ } ++ } ++ + if (options->hint_style != CAIRO_HINT_STYLE_DEFAULT) + { + if (FcPatternGet (pattern, FC_HINTING, 0, &v) == FcResultNoMatch) +diff -urNad cairo-1.8.0~/src/cairo-surface.c cairo-1.8.0/src/cairo-surface.c +--- cairo-1.8.0~/src/cairo-surface.c 2008-09-25 22:28:56.000000000 +0200 ++++ cairo-1.8.0/src/cairo-surface.c 2008-10-14 15:01:37.000000000 +0200 +@@ -73,6 +73,7 @@ + FALSE, /* has_font_options */ \ + { CAIRO_ANTIALIAS_DEFAULT, /* antialias */ \ + CAIRO_SUBPIXEL_ORDER_DEFAULT, /* subpixel_order */ \ ++ CAIRO_LCD_FILTER_DEFAULT, /* lcd_filter */ \ + CAIRO_HINT_STYLE_DEFAULT, /* hint_style */ \ + CAIRO_HINT_METRICS_DEFAULT /* hint_metrics */ \ + } /* font_options */ \ +diff -urNad cairo-1.8.0~/src/cairo-types-private.h cairo-1.8.0/src/cairo-types-private.h +--- cairo-1.8.0~/src/cairo-types-private.h 2008-09-25 22:29:06.000000000 +0200 ++++ cairo-1.8.0/src/cairo-types-private.h 2008-10-14 15:01:37.000000000 +0200 +@@ -113,9 +113,35 @@ + cairo_bool_t is_snapshot; + }; + ++ ++/** ++ * cairo_lcd_filter_t: ++ * @CAIRO_LCD_FILTER_DEFAULT: Use the default LCD filter for ++ * font backend and target device ++ * @CAIRO_LCD_FILTER_NONE: Do not perform LCD filtering ++ * @CAIRO_LCD_FILTER_INTRA_PIXEL: Intra-pixel filter ++ * @CAIRO_LCD_FILTER_FIR3: FIR filter with a 3x3 kernel ++ * @CAIRO_LCD_FILTER_FIR5: FIR filter with a 5x5 kernel ++ * ++ * The LCD filter specifies the low-pass filter applied to LCD-optimized ++ * bitmaps generated with an antialiasing mode of %CAIRO_ANTIALIAS_SUBPIXEL. ++ * ++ * Note: This API was temporarily made available in the public ++ * interface during the 1.7.x development series, but was made private ++ * before 1.8. ++ **/ ++typedef enum _cairo_lcd_filter { ++ CAIRO_LCD_FILTER_DEFAULT, ++ CAIRO_LCD_FILTER_NONE, ++ CAIRO_LCD_FILTER_INTRA_PIXEL, ++ CAIRO_LCD_FILTER_FIR3, ++ CAIRO_LCD_FILTER_FIR5 ++} cairo_lcd_filter_t; ++ + struct _cairo_font_options { + cairo_antialias_t antialias; + cairo_subpixel_order_t subpixel_order; ++ cairo_lcd_filter_t lcd_filter; + cairo_hint_style_t hint_style; + cairo_hint_metrics_t hint_metrics; + }; +diff -urNad cairo-1.8.0~/src/cairo-xlib-screen.c cairo-1.8.0/src/cairo-xlib-screen.c +--- cairo-1.8.0~/src/cairo-xlib-screen.c 2008-09-25 22:29:39.000000000 +0200 ++++ cairo-1.8.0/src/cairo-xlib-screen.c 2008-10-14 15:01:37.000000000 +0200 +@@ -150,13 +150,22 @@ + cairo_bool_t xft_antialias; + int xft_hintstyle; + int xft_rgba; ++ int xft_lcdfilter; + cairo_antialias_t antialias; + cairo_subpixel_order_t subpixel_order; ++ cairo_lcd_filter_t lcd_filter; + cairo_hint_style_t hint_style; + + if (!get_boolean_default (dpy, "antialias", &xft_antialias)) + xft_antialias = TRUE; + ++ if (!get_integer_default (dpy, "lcdfilter", &xft_lcdfilter)) { ++ /* -1 is an non-existant Fontconfig constant used to differentiate ++ * the case when no lcdfilter property is available. ++ */ ++ xft_lcdfilter = -1; ++ } ++ + if (!get_boolean_default (dpy, "hinting", &xft_hinting)) + xft_hinting = TRUE; + +@@ -239,6 +248,24 @@ + subpixel_order = CAIRO_SUBPIXEL_ORDER_DEFAULT; + } + ++ switch (xft_lcdfilter) { ++ case FC_LCD_NONE: ++ lcd_filter = CAIRO_LCD_FILTER_NONE; ++ break; ++ case FC_LCD_DEFAULT: ++ lcd_filter = CAIRO_LCD_FILTER_FIR5; ++ break; ++ case FC_LCD_LIGHT: ++ lcd_filter = CAIRO_LCD_FILTER_FIR3; ++ break; ++ case FC_LCD_LEGACY: ++ lcd_filter = CAIRO_LCD_FILTER_INTRA_PIXEL; ++ break; ++ default: ++ lcd_filter = CAIRO_LCD_FILTER_DEFAULT; ++ break; ++ } ++ + if (xft_antialias) { + if (subpixel_order == CAIRO_SUBPIXEL_ORDER_DEFAULT) + antialias = CAIRO_ANTIALIAS_GRAY; +@@ -251,6 +278,7 @@ + cairo_font_options_set_hint_style (&info->font_options, hint_style); + cairo_font_options_set_antialias (&info->font_options, antialias); + cairo_font_options_set_subpixel_order (&info->font_options, subpixel_order); ++ _cairo_font_options_set_lcd_filter (&info->font_options, lcd_filter); + cairo_font_options_set_hint_metrics (&info->font_options, CAIRO_HINT_METRICS_ON); + } + +diff -urNad cairo-1.8.0~/src/cairoint.h cairo-1.8.0/src/cairoint.h +--- cairo-1.8.0~/src/cairoint.h 2008-09-26 00:56:48.000000000 +0200 ++++ cairo-1.8.0/src/cairoint.h 2008-10-14 15:01:37.000000000 +0200 +@@ -1336,6 +1336,13 @@ + _cairo_font_options_init_copy (cairo_font_options_t *options, + const cairo_font_options_t *other); + ++cairo_private void ++_cairo_font_options_set_lcd_filter (cairo_font_options_t *options, ++ cairo_lcd_filter_t lcd_filter); ++ ++cairo_private cairo_lcd_filter_t ++_cairo_font_options_get_lcd_filter (const cairo_font_options_t *options); ++ + /* cairo-hull.c */ + cairo_private cairo_status_t + _cairo_hull_compute (cairo_pen_vertex_t *vertices, int *num_vertices); --- cairo-1.8.4.orig/debian/patches/00list +++ cairo-1.8.4/debian/patches/00list @@ -0,0 +1,2 @@ +02_no-private-symbol-export.dpatch +04_lcd_filter.dpatch