diff --git a/baselibs.conf b/baselibs.conf index 2c4ceb0..9c9b74a 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,3 +1,6 @@ -cairo +libcairo2 + provides "cairo- = " + obsoletes "cairo- < " +libcairo-script-interpreter2 arch ppc package cairo-devel arch sparcv9 package cairo-devel diff --git a/cairo.changes b/cairo.changes index 11ac68c..797e00e 100644 --- a/cairo.changes +++ b/cairo.changes @@ -1,15 +1,76 @@ +------------------------------------------------------------------- +Wed Jul 21 16:36:50 CEST 2010 - vuntz@opensuse.org + +- Clean up update to 1.9.12. +- Split main package in libcairo2, libcairo-script-interpreter2 and + cairo-utils subpackages, to follow the shared library policy. + Note that libcairo2 provides/obsoletes cairo. +- Change freetype2-devel, libpng-devel, xorg-x11-devel, + xorg-x11-libxcb-devel BuildRequires to pkgconfig() BuildRequires + for: fontconfig, freetype2, libpng, pixman-1, x11, xcb, xrender. +- Remove Provides/Obsoletes for libpixman <= 0.1.1 (this was for + very old versions of SUSE Linux). +- Remove fontconfig-devel, freetype2-devel, libpng-devel, + xorg-x11-devel, xorg-x11-libX11-devel, xorg-x11-libXrender-devel, + xorg-x11-libxcb-devel Requires of devel package: they're now all + required with the automatically added pkgconfig(). +- Fix self-obsoletion of cairo-doc. + ------------------------------------------------------------------- Mon Jul 19 12:13:18 UTC 2010 - dimstar@opensuse.org - Update to version 1.9.12: - + Linker no longer requires g++ + + Various API additions (see NEWS for details). + + Bug fixes. + + Updated documentation. +- Remove gcc-c++ BuildRequires. ------------------------------------------------------------------- Thu Jul 8 23:00:26 CEST 2010 - dimstar@opensuse.org - Update to version 1.9.10: - + Jump to devel branch again for early Factory development. -- BuildRequire gcc-c++: one linker stage requires it. + + Fix many bugs introduced in 1.9.x releases. + + Add WGL interface for cairo-gl + + Include the downstream patch to honour the user's LCD filtering + preferences for subpixel rendering of fonts +- Changes from version 1.9.8: + + Various API additions (see NEWS for details). + + Backend-specific improvements: + - cairo-gl: many changes + - cairo-xlib: + . access to the underlying connection to the Display is now + thread-safe + . attempt to use PolyModeImprecise when compositing + trapezoids + - cairo-svg: enable SVG to reference external image through the + use an extended MIME data type. +- Changes from version 1.9.6: + + Various API additions (see NEWS for details). + + Completely drop cairo-glitz. + + Many improvements for drawing of dashed strokes. + + Optimize spans-based renderers for repeated rows. + + Backend-specific improvements: + - add cairo-drm backend + - start using GLSL to accelerate many operations in cairo-gl + - make cairo-image faster + - cairo-quartz fixes + - improvement to embedding jpeg/jpeg2000 data in cairo-pdf + - fix printing of rotated user fonts in cairo-ps +- Changes from version 1.9.4: + + Various API additions (see NEWS for details). + + New cairo-test-trace utility. + + Add server-side gradients to xlib backend. + + New experimental backends: Qt, OpenVG, OpenGL. + + Fix long-standing bug with self-intersecting strokes. +- Changes from version 1.9.2: + + Various API additions (see NEWS for details). + + New CairoScript experimental backend. + + New cairo-trace and cairo-perf-trace utilities. + + Test suite overhaul. + + Add polygon rasterisation. + + Add copy-on-write snapshot support. + + Various bug fixes. +- Add gcc-c++ BuildRequires: one linker stage requires it. - Add cairo-modules-no-version.patch to build the modules not as versioned shared objects - Drop cairo-1.8.6-repeat-modes.patch and cairo-lcd-filter.patch, diff --git a/cairo.spec b/cairo.spec index 7dc074a..cc1139d 100644 --- a/cairo.spec +++ b/cairo.spec @@ -20,9 +20,6 @@ Name: cairo Version: 1.9.12 Release: 1 -# These libraries are needed only for tests. -# Do not enable tests in build systems, it causes build loop! -#BuildRequires: librsvg-devel poppler-devel License: LGPL v2.1 or later ; MPL .. Summary: Vector Graphics Library with Cross-Device Output Support Url: http://cairographics.org/ @@ -31,21 +28,19 @@ Source: %{name}-%{version}.tar.bz2 Source99: baselibs.conf # PATCH-FIX-UPSTREAM cairo-modules-no-version.patch dimstar@opensuse.org -- Build modules with -module -avoid-version. Patch0: cairo-modules-no-version.patch -BuildRequires: freetype2-devel +# These libraries are needed only for tests. +# Do not enable tests in build systems, it causes build loop! +#BuildRequires: librsvg-devel poppler-devel BuildRequires: gtk-doc -BuildRequires: libpng-devel BuildRequires: pkg-config -BuildRequires: xorg-x11-devel -BuildRequires: xorg-x11-libxcb-devel -# Last present in SuSE Linux 10.0 (and NLD9): -Obsoletes: libpixman <= 0.1.1 -Provides: libpixman <= 0.1.1 +BuildRequires: pkgconfig(fontconfig) +BuildRequires: pkgconfig(freetype2) +BuildRequires: pkgconfig(libpng) +BuildRequires: pkgconfig(pixman-1) +BuildRequires: pkgconfig(x11) +BuildRequires: pkgconfig(xcb) +BuildRequires: pkgconfig(xrender) BuildRoot: %{_tmppath}/%{name}-%{version}-build -# bug437293 -%ifarch ppc64 -Obsoletes: cairo-64bit -%endif -# %description Cairo is a vector graphics library with cross-device output support. @@ -54,23 +49,61 @@ in-memory image buffers, and PostScript. Cairo is designed to produce identical output on all output media while taking advantage of display hardware acceleration when available. +%package -n libcairo2 +Summary: Vector Graphics Library with Cross-Device Output Support +License: LGPL v2.1 or later ; MPL .. +Group: Development/Libraries/X11 +Provides: cairo = %{version} +Obsoletes: cairo < %{version} +# bug437293 +%ifarch ppc64 +Obsoletes: cairo-64bit +%endif +# + +%description -n libcairo2 +Cairo is a vector graphics library with cross-device output support. +Currently supported output targets include the X Window System, +in-memory image buffers, and PostScript. Cairo is designed to produce +identical output on all output media while taking advantage of display +hardware acceleration when available. + +%package -n libcairo-script-interpreter2 +Summary: Vector Graphics Library with Cross-Device Output Support +License: LGPL v2.1 or later ; MPL .. +Group: Development/Libraries/X11 + +%description -n libcairo-script-interpreter2 +Cairo is a vector graphics library with cross-device output support. +Currently supported output targets include the X Window System, +in-memory image buffers, and PostScript. Cairo is designed to produce +identical output on all output media while taking advantage of display +hardware acceleration when available. + +%package utils +Summary: Vector Graphics Library with Cross-Device Output Support -- Utilities +License: LGPL v2.1 or later ; MPL .. +Group: Development/Libraries/X11 +# We need an explicit requires since nothing links to the cairo library +Requires: libcairo2 = %{version} + +%description utils +Cairo is a vector graphics library with cross-device output support. +Currently supported output targets include the X Window System, +in-memory image buffers, and PostScript. Cairo is designed to produce +identical output on all output media while taking advantage of display +hardware acceleration when available. + +This package contains various cairo utilities. + %package devel License: LGPL v2.1 or later ; MPL .. Summary: Development environment for cairo Group: Development/Libraries/X11 -Requires: %{name} = %{version} -Requires: fontconfig-devel -Requires: freetype2-devel -Requires: libpng-devel -Requires: xorg-x11-devel -Requires: xorg-x11-libX11-devel -Requires: xorg-x11-libXrender-devel -Requires: xorg-x11-libxcb-devel +Requires: libcairo2 = %{version} +Requires: libcairo-script-interpreter2 = %{version} Provides: cairo-doc = %{version} -Obsoletes: cairo-doc <= %{version} -# Last present in SuSE Linux 10.0 (and NLD9): -Provides: libpixman-devel <= 0.1.1 -Obsoletes: libpixman-devel <= 0.1.1 +Obsoletes: cairo-doc < %{version} # bug437293 %ifarch ppc64 Obsoletes: cairo-devel-64bit @@ -104,19 +137,32 @@ NOCONFIGURE=1 ./autogen.sh find %{buildroot} -type f -name "*.la" -delete -print %endif -%post -p /sbin/ldconfig +%post -n libcairo2 -p /sbin/ldconfig -%postun -p /sbin/ldconfig +%postun -n libcairo2 -p /sbin/ldconfig + +%post -n libcairo-script-interpreter2 -p /sbin/ldconfig + +%postun -n libcairo-script-interpreter2 -p /sbin/ldconfig %clean %{__rm} -rf %{buildroot} -%files +%files -n libcairo2 %defattr(-, root, root) %doc AUTHORS COPYING COPYING-LGPL-2.1 COPYING-MPL-1.1 ChangeLog NEWS README +%{_libdir}/libcairo.so.* + +%files -n libcairo-script-interpreter2 +%defattr(-, root, root) +%{_libdir}/libcairo-script-interpreter.so.* + +%files utils +%defattr(-, root, root) %{_bindir}/cairo-trace -%{_libdir}/*.so.* -%{_libdir}/cairo +%dir %{_libdir}/cairo +%{_libdir}/cairo/libcairo-trace.so +%{_libdir}/cairo/cairo-fdr.so %files devel %defattr(-, root, root)