[gtk+/gtk-2-22] Make GTK+ build against an external gdk-pixbuf
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/gtk-2-22] Make GTK+ build against an external gdk-pixbuf
- Date: Sat, 26 Jun 2010 06:31:02 +0000 (UTC)
commit cb29d2770714943af7b488a6a94f1f37b7466c8f
Author: Matthias Clasen <mclasen redhat com>
Date: Sat Jun 26 02:29:29 2010 -0400
Make GTK+ build against an external gdk-pixbuf
INSTALL.in | 4 +-
Makefile.am | 4 +-
configure.in | 479 +--
contrib/Makefile.am | 8 -
contrib/gdk-pixbuf-xlib/ChangeLog | 354 --
contrib/gdk-pixbuf-xlib/Makefile.am | 42 -
contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.0.pc.in | 11 -
contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-drawable.c | 1338 -----
contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-private.h | 30 -
contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-render.c | 398 --
contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib.c | 63 -
contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib.h | 87 -
contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlibrgb.c | 3724 ------------
contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlibrgb.h | 188 -
demos/Makefile.am | 18 +-
demos/gtk-demo/Makefile.am | 5 +-
docs/reference/Makefile.am | 2 +-
docs/reference/gdk-pixbuf/Makefile.am | 99 -
docs/reference/gdk-pixbuf/apple-red-1a.png | Bin 29895 -> 0 bytes
docs/reference/gdk-pixbuf/apple-red-2c.png | Bin 19103 -> 0 bytes
docs/reference/gdk-pixbuf/composite.dia | Bin 2351 -> 0 bytes
docs/reference/gdk-pixbuf/composite.png | Bin 106599 -> 0 bytes
docs/reference/gdk-pixbuf/gdk-pixbuf-csource.xml | 177 -
.../gdk-pixbuf/gdk-pixbuf-from-drawables.sgml | 29 -
.../gdk-pixbuf/gdk-pixbuf-query-loaders.xml | 55 -
.../reference/gdk-pixbuf/gdk-pixbuf-rendering.sgml | 32 -
docs/reference/gdk-pixbuf/gdk-pixbuf-sections.txt | 302 -
docs/reference/gdk-pixbuf/gdk-pixbuf.sgml | 192 -
docs/reference/gdk-pixbuf/gdk-pixbuf.types | 8 -
docs/reference/gdk-pixbuf/gnome-gmush-1.png | Bin 23814 -> 0 bytes
docs/reference/gdk-pixbuf/porting-from-imlib.sgml | 358 --
docs/reference/gdk-pixbuf/tmpl/animation.sgml | 200 -
docs/reference/gdk-pixbuf/tmpl/creating.sgml | 129 -
docs/reference/gdk-pixbuf/tmpl/file-loading.sgml | 109 -
docs/reference/gdk-pixbuf/tmpl/file-saving.sgml | 143 -
.../gdk-pixbuf/tmpl/gdk-pixbuf-loader.sgml | 209 -
.../gdk-pixbuf/tmpl/gdk-pixbuf-unused.sgml | 569 --
.../tmpl/gdk-pixbuf-xlib-from-drawables.sgml | 54 -
.../gdk-pixbuf/tmpl/gdk-pixbuf-xlib-init.sgml | 52 -
.../gdk-pixbuf/tmpl/gdk-pixbuf-xlib-rendering.sgml | 100 -
.../gdk-pixbuf/tmpl/gdk-pixbuf-xlib-rgb.sgml | 290 -
docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf.sgml | 294 -
.../gdk-pixbuf/tmpl/initialization_versions.sgml | 106 -
docs/reference/gdk-pixbuf/tmpl/inline.sgml | 137 -
.../gdk-pixbuf/tmpl/module_interface.sgml | 382 --
docs/reference/gdk-pixbuf/tmpl/refcounting.sgml | 84 -
docs/reference/gdk-pixbuf/tmpl/scaling.sgml | 246 -
docs/reference/gdk-pixbuf/tmpl/util.sgml | 87 -
docs/reference/gdk-pixbuf/version.xml.in | 1 -
docs/reference/gdk/Makefile.am | 2 +-
docs/reference/gtk/Makefile.am | 4 +-
docs/reference/gtk/building.sgml | 21 +-
docs/tools/Makefile.am | 9 +-
gdk-pixbuf/ChangeLog | 6289 --------------------
gdk-pixbuf/Makefile.am | 748 ---
gdk-pixbuf/abicheck.sh | 5 -
gdk-pixbuf/gdk-pixbuf-animation.c | 734 ---
gdk-pixbuf/gdk-pixbuf-animation.h | 151 -
gdk-pixbuf/gdk-pixbuf-core.h | 267 -
gdk-pixbuf/gdk-pixbuf-csource.1 | 91 -
gdk-pixbuf/gdk-pixbuf-csource.c | 304 -
gdk-pixbuf/gdk-pixbuf-data.c | 83 -
gdk-pixbuf/gdk-pixbuf-enum-types.c.template | 38 -
gdk-pixbuf/gdk-pixbuf-enum-types.h.template | 28 -
gdk-pixbuf/gdk-pixbuf-features.h.in | 39 -
gdk-pixbuf/gdk-pixbuf-i18n.h | 32 -
gdk-pixbuf/gdk-pixbuf-io.c | 2678 ---------
gdk-pixbuf/gdk-pixbuf-io.h | 172 -
gdk-pixbuf/gdk-pixbuf-loader.c | 785 ---
gdk-pixbuf/gdk-pixbuf-loader.h | 102 -
gdk-pixbuf/gdk-pixbuf-marshal.list | 28 -
gdk-pixbuf/gdk-pixbuf-private.h | 102 -
gdk-pixbuf/gdk-pixbuf-scale.c | 463 --
gdk-pixbuf/gdk-pixbuf-scaled-anim.c | 286 -
gdk-pixbuf/gdk-pixbuf-scaled-anim.h | 47 -
gdk-pixbuf/gdk-pixbuf-simple-anim.c | 553 --
gdk-pixbuf/gdk-pixbuf-simple-anim.h | 61 -
gdk-pixbuf/gdk-pixbuf-transform.h | 119 -
gdk-pixbuf/gdk-pixbuf-util.c | 337 --
gdk-pixbuf/gdk-pixbuf-xform.c | 104 -
gdk-pixbuf/gdk-pixbuf.c | 765 ---
gdk-pixbuf/gdk-pixbuf.h | 45 -
gdk-pixbuf/gdk-pixbuf.symbols | 210 -
gdk-pixbuf/gdk-pixdata.c | 903 ---
gdk-pixbuf/gdk-pixdata.h | 170 -
gdk-pixbuf/gdk_pixbuf.rc.in | 30 -
gdk-pixbuf/gen-color-table.pl | 74 -
gdk-pixbuf/io-ani-animation.c | 347 --
gdk-pixbuf/io-ani-animation.h | 113 -
gdk-pixbuf/io-ani.c | 720 ---
gdk-pixbuf/io-bmp.c | 1429 -----
gdk-pixbuf/io-gdip-animation.c | 383 --
gdk-pixbuf/io-gdip-animation.h | 117 -
gdk-pixbuf/io-gdip-bmp.c | 87 -
gdk-pixbuf/io-gdip-emf.c | 64 -
gdk-pixbuf/io-gdip-gif.c | 85 -
gdk-pixbuf/io-gdip-ico.c | 64 -
gdk-pixbuf/io-gdip-jpeg.c | 141 -
gdk-pixbuf/io-gdip-native.h | 264 -
gdk-pixbuf/io-gdip-png.c | 138 -
gdk-pixbuf/io-gdip-propertytags.h | 228 -
gdk-pixbuf/io-gdip-tiff.c | 87 -
gdk-pixbuf/io-gdip-utils.c | 1022 ----
gdk-pixbuf/io-gdip-utils.h | 52 -
gdk-pixbuf/io-gdip-wmf.c | 63 -
gdk-pixbuf/io-gif-animation.c | 602 --
gdk-pixbuf/io-gif-animation.h | 175 -
gdk-pixbuf/io-gif.c | 1698 ------
gdk-pixbuf/io-icns.c | 404 --
gdk-pixbuf/io-ico.c | 1254 ----
gdk-pixbuf/io-jasper.c | 313 -
gdk-pixbuf/io-jpeg.c | 1315 ----
gdk-pixbuf/io-pcx.c | 761 ---
gdk-pixbuf/io-png.c | 1117 ----
gdk-pixbuf/io-pnm.c | 1086 ----
gdk-pixbuf/io-qtif.c | 608 --
gdk-pixbuf/io-ras.c | 551 --
gdk-pixbuf/io-tga.c | 1013 ----
gdk-pixbuf/io-tiff.c | 875 ---
gdk-pixbuf/io-wbmp.c | 380 --
gdk-pixbuf/io-xbm.c | 497 --
gdk-pixbuf/io-xpm.c | 821 ---
gdk-pixbuf/make-inline-pixbuf.c | 230 -
gdk-pixbuf/makefile.msc | 197 -
gdk-pixbuf/makegdkpixbufalias.pl | 137 -
gdk-pixbuf/pixops/DETAILS | 355 --
gdk-pixbuf/pixops/Makefile.am | 34 -
gdk-pixbuf/pixops/README | 163 -
gdk-pixbuf/pixops/composite_line_22_4a4_mmx.S | 241 -
.../pixops/composite_line_color_22_4a4_mmx.S | 253 -
gdk-pixbuf/pixops/have_mmx.S | 76 -
gdk-pixbuf/pixops/makefile.msc | 65 -
gdk-pixbuf/pixops/pixbuf-transform-math.ltx | 112 -
gdk-pixbuf/pixops/pixops-internal.h | 25 -
gdk-pixbuf/pixops/pixops.c | 2560 --------
gdk-pixbuf/pixops/pixops.h | 120 -
gdk-pixbuf/pixops/scale_line_22_33_mmx.S | 206 -
gdk-pixbuf/pixops/timescale.c | 267 -
gdk-pixbuf/pltcheck.sh | 17 -
gdk-pixbuf/queryloaders.c | 327 -
gdk-pixbuf/test-gdk-pixbuf.c | 241 -
gdk-pixbuf/xpm-color-table.h | 1521 -----
gdk/Makefile.am | 23 +-
gdk/gdkdraw.c | 41 +-
gdk/gdkpixbuf-drawable.c | 31 +-
gdk/gdkpixbuf-render.c | 26 +-
gdk/x11/Makefile.am | 2 +-
gtk/Makefile.am | 18 +-
gtk/tests/Makefile.am | 2 -
gtk/theme-bits/Makefile.am | 4 +-
modules/engines/pixbuf/Makefile.am | 3 +-
modules/input/Makefile.am | 2 -
modules/other/gail/Makefile.am | 1 -
perf/Makefile.am | 2 -
po-properties/POTFILES.in | 24 -
po/POTFILES.in | 32 -
tests/Makefile.am | 15 +-
157 files changed, 111 insertions(+), 54214 deletions(-)
---
diff --git a/INSTALL.in b/INSTALL.in
index 5181298..e5ff4c5 100644
--- a/INSTALL.in
+++ b/INSTALL.in
@@ -3,9 +3,9 @@ Prerequisites
GTK+ requires the following packages:
- - The GLib, Pango, ATK and cairo libraries, available at the same
+ - The GLib, Pango, GdkPixbuf, ATK and cairo libraries, available at the same
location as GTK+. GTK+ @GTK_VERSION@ requires at least GLib 2.23.6,
- Pango 1.20, ATK 1.29.2 and cairo 1.6.0.
+ Pango 1.20, GdkPixbuf 2.21.0, ATK 1.29.2 and cairo 1.6.0.
- gobject-introspection 0.6.7 or newer.
diff --git a/Makefile.am b/Makefile.am
index 055656a..8e3a2f1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
## Makefile.am for GTK+
include $(top_srcdir)/Makefile.decl
-SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests perf contrib
+SRC_SUBDIRS = gdk gtk modules demos tests perf
SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros build
# require automake 1.4
@@ -160,7 +160,7 @@ gdk-$(GDKTARGET)-2.0-uninstalled.pc: gdk-2.0-uninstalled.pc
cp gdk-2.0-uninstalled.pc gdk-$(GDKTARGET)-2.0-uninstalled.pc
pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA= gdk-pixbuf-2.0.pc gdk-$(GDKTARGET)-2.0.pc gtk+-$(GDKTARGET)-2.0.pc gail.pc
+pkgconfig_DATA= gdk-$(GDKTARGET)-2.0.pc gtk+-$(GDKTARGET)-2.0.pc gail.pc
if OS_UNIX
pkgconfig_DATA += gtk+-unix-print-2.0.pc
diff --git a/configure.in b/configure.in
index 54b66d6..d5fe1d2 100644
--- a/configure.in
+++ b/configure.in
@@ -35,6 +35,7 @@ m4_define([glib_required_version], [2.25.8])
m4_define([pango_required_version], [1.20])
m4_define([atk_required_version], [1.29.2])
m4_define([cairo_required_version], [1.6])
++m4_define([gdk_pixbuf_required_version], [2.21.0])
AC_INIT([gtk+], [gtk_version],
@@ -108,19 +109,6 @@ m4_define([gail_lt_current_minus_age],[m4_eval(gail_lt_current - gail_lt_age)])
AC_SUBST([GAIL_LT_VERSION_INFO],[gail_lt_version_info])
AC_SUBST([GAIL_LT_CURRENT_MINUS_AGE],[gail_lt_current_minus_age])
-#
-# gdk-pixbuf gets versioned separately, and for now, using standard
-# libtool versioning, not GTK+-style versioning
-#
-GDK_PIXBUF_MAJOR=gtk_major_version
-GDK_PIXBUF_MINOR=gtk_minor_version
-GDK_PIXBUF_MICRO=gtk_micro_version
-GDK_PIXBUF_VERSION="${GDK_PIXBUF_MAJOR}.${GDK_PIXBUF_MINOR}.${GDK_PIXBUF_MICRO}"
-AC_SUBST(GDK_PIXBUF_MAJOR)
-AC_SUBST(GDK_PIXBUF_MINOR)
-AC_SUBST(GDK_PIXBUF_MICRO)
-AC_SUBST(GDK_PIXBUF_VERSION)
-
GETTEXT_PACKAGE=gtk20
AC_SUBST(GETTEXT_PACKAGE)
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE",
@@ -387,7 +375,8 @@ PKG_CHECK_MODULES(BASE_DEPENDENCIES,
[glib-2.0 >= glib_required_version dnl
atk >= atk_required_version dnl
pango >= pango_required_version dnl
- cairo >= cairo_required_version])
+ cairo >= cairo_required_version dnl
+ gdk-pixbuf-2.0 >= gdk_pixbuf_required_version])
## In addition to checking that cairo is present, we also need to
## check that the correct cairo backend is there. E.g. if the GDK
@@ -407,7 +396,7 @@ if test "$os_win32" != yes; then
# right now, symbols starting with _ are not exported
LIBTOOL_EXPORT_OPTIONS='-export-symbols-regex "^[[^_]].*"'
else
- # We currently use .def files on Windows (for gdk-pixbuf, gdk and gtk)
+ # We currently use .def files on Windows (for gdk and gtk)
LIBTOOL_EXPORT_OPTIONS=
fi
AC_SUBST(LIBTOOL_EXPORT_OPTIONS)
@@ -616,7 +605,7 @@ AC_TRY_COMPILE([#include <dirent.h>], [DIR *dir;],
# Run AM_PATH_GLIB_2_0 to make sure that GLib is installed and working
#
-GLIB_PACKAGES="gobject-2.0 gmodule-no-export-2.0"
+GLIB_PACKAGES="gobject-2.0 gio-2.0 gmodule-no-export-2.0"
AM_PATH_GLIB_2_0(glib_required_version, :,
AC_MSG_ERROR([
@@ -763,27 +752,6 @@ AC_CHECK_HEADERS(crt_externs.h)
AC_CHECK_FUNCS(_NSGetEnviron)
-##################################################
-# Checks for gdk-pixbuf
-##################################################
-
-dnl ********************************************************
-dnl * See whether we need to load our modules as .la files *
-dnl ********************************************************
-
-use_la_modules=false
-case $host in
- *-aix*) use_la_modules=true
-esac
-
-if $use_la_modules ; then
- AC_DEFINE(USE_LA_MODULES, 1,
- [Whether to load modules via .la files rather than directly])
-fi
-
-
-AC_MSG_CHECKING(whether to build gmodulized gdk-pixbuf)
-
AC_ARG_ENABLE(modules,
[AC_HELP_STRING([--disable-modules],
[disable dynamic module loading])])
@@ -804,13 +772,13 @@ else
dnl Now we check to see if our libtool supports shared lib deps
dnl (in a rather ugly way even)
if $dynworks; then
- pixbuf_libtool_config="${CONFIG_SHELL-/bin/sh} ./libtool --config"
- pixbuf_deplibs_check=`$pixbuf_libtool_config | \
+ module_libtool_config="${CONFIG_SHELL-/bin/sh} ./libtool --config"
+ module_deplibs_check=`$pixbuf_libtool_config | \
grep '^[[a-z_]]*check[[a-z_]]*_method=[['\''"]]' | \
sed 's/.*[['\''"]]\(.*\)[['\''"]]$/\1/'`
- if test "x$pixbuf_deplibs_check" = "xnone" || \
- test "x$pixbuf_deplibs_check" = "xunknown" || \
- test "x$pixbuf_deplibs_check" = "x"; then
+ if test "x$module_deplibs_check" = "xnone" || \
+ test "x$module_deplibs_check" = "xunknown" || \
+ test "x$module_deplibs_check" = "x"; then
dynworks=false
fi
fi
@@ -824,298 +792,9 @@ else
fi
fi
-dnl We allow people to disable image loaders explicitely, but if they don't we error
-dnl out so that people don't accidentally build without them.
-
-AC_ARG_WITH(libpng,
- [AC_HELP_STRING([--without-libpng],
- [disable PNG loader for gdk-pixbuf])])
-AC_ARG_WITH(libjpeg,
- [AC_HELP_STRING([--without-libjpeg],
- [disable JPEG loader for gdk-pixbuf])])
-AC_ARG_WITH(libtiff,
- [AC_HELP_STRING([--without-libtiff],
- [disable TIFF loader for gdk-pixbuf])])
-AC_ARG_WITH(libjasper,
- [AC_HELP_STRING([--with-libjasper],
- [enable JPEG2000 loader for gdk-pixbuf])])
-
-AC_ARG_ENABLE(gdiplus,
- [AC_HELP_STRING([--enable-gdiplus],
- [enble GDI+ loaders for gdk-pixbuf (currently known to be broken)])],,
- [enable_gdiplus=no])
-
-AM_CONDITIONAL(BUILD_GDIPLUS_LOADERS, [ test x$os_win32 = xyes && test x$enable_gdiplus != xno ])
-
-dnl Test for libtiff
-if test x$os_win32 = xno || test x$enable_gdiplus = xno; then
- if test x$with_libtiff != xno && test -z "$LIBTIFF"; then
- AC_CHECK_LIB(tiff, TIFFReadRGBAImageOriented,
- [AC_CHECK_HEADER(tiffio.h,
- TIFF='tiff'; LIBTIFF='-ltiff',
- AC_MSG_WARN(*** TIFF loader will not be built (TIFF header files not found) ***))],
- [AC_CHECK_LIB(tiff, TIFFWriteScanline,
- [AC_CHECK_HEADER(tiffio.h,
- TIFF='tiff'; LIBTIFF='-ltiff -ljpeg -lz',
- AC_MSG_WARN(*** TIFF loader will not be built (TIFF header files not found) ***))],
- [AC_CHECK_LIB(tiff34, TIFFFlushData,
- [AC_CHECK_HEADER(tiffio.h,
- TIFF='tiff'; LIBTIFF='-ltiff34 -ljpeg -lz',
- AC_MSG_WARN(*** TIFF loader will not be built (TIFF header files not found) ***))],
- AC_MSG_WARN(*** TIFF loader will not be built (TIFF library not found) ***), -ljpeg -lz -lm)], -ljpeg -lz -lm)], -lm)
- fi
-
- if test x$with_libtiff != xno && test -z "$LIBTIFF"; then
- AC_MSG_ERROR([
-*** Checks for TIFF loader failed. You can build without it by passing
-*** --without-libtiff to configure but some programs using GTK+ may
-*** not work properly])
- fi
-fi
-
-dnl Test for libjpeg
-if test x$os_win32 = xno || test x$enable_gdiplus = xno; then
- if test x$with_libjpeg != xno && test -z "$LIBJPEG"; then
- AC_CHECK_LIB(jpeg, jpeg_destroy_decompress,
- jpeg_ok=yes,
- jpeg_ok=no
- AC_MSG_WARN(*** JPEG loader will not be built (JPEG library not found) ***))
- if test "$jpeg_ok" = yes; then
- AC_MSG_CHECKING([for jpeglib.h])
- AC_TRY_CPP(
-[#include <stdio.h>
-#undef PACKAGE
-#undef VERSION
-#undef HAVE_STDLIB_H
-#include <jpeglib.h>],
- jpeg_ok=yes,
- jpeg_ok=no)
- AC_MSG_RESULT($jpeg_ok)
- if test "$jpeg_ok" = yes; then
- LIBJPEG='-ljpeg'
- AC_CHECK_LIB(jpeg, jpeg_simple_progression,
- AC_DEFINE(HAVE_PROGRESSIVE_JPEG, 1,
- [Define to 1 is libjpeg supports progressive JPEG]),
- AC_MSG_WARN(JPEG library does not support progressive saving.))
- else
- AC_MSG_WARN(*** JPEG loader will not be built (JPEG header file not found) ***)
- fi
- fi
- fi
-
- if test x$with_libjpeg != xno && test -z "$LIBJPEG"; then
- AC_MSG_ERROR([
-*** Checks for JPEG loader failed. You can build without it by passing
-*** --without-libjpeg to configure but some programs using GTK+ may
-*** not work properly])
- fi
-fi
-
-dnl Test for libpng
- if test x$with_libpng != xno && test -z "$LIBPNG"; then
- AC_MSG_CHECKING(for libpng12)
- if $PKG_CONFIG --exists libpng12 ; then
- AC_MSG_RESULT(yes)
- PNG='png'
- PNG_DEP_CFLAGS_PACKAGES=libpng12
- LIBPNG=`$PKG_CONFIG --libs libpng12`
- else
- AC_MSG_RESULT(no)
- AC_CHECK_LIB(png, png_read_info,
- [AC_CHECK_HEADER(png.h,
- png_ok=yes,
- png_ok=no)],
- AC_MSG_WARN(*** PNG loader will not be built (PNG library not found) ***), -lz -lm)
- if test "$png_ok" = yes; then
- AC_MSG_CHECKING([for png_structp in png.h])
- AC_TRY_COMPILE([#include <png.h>],
- [png_structp pp; png_infop info; png_colorp cmap; png_create_read_struct;],
- png_ok=yes,
- png_ok=no)
- AC_MSG_RESULT($png_ok)
- if test "$png_ok" = yes; then
- PNG='png'; LIBPNG='-lpng -lz'
- else
- AC_MSG_WARN(*** PNG loader will not be built (PNG library is too old) ***)
- fi
- else
- AC_MSG_WARN(*** PNG loader will not be built (PNG header file not found) ***)
- fi
- fi
- fi
-
- if test x$with_libpng != xno && test -z "$LIBPNG"; then
- AC_MSG_ERROR([
-*** Checks for PNG loader failed. You can build without it by passing
-*** --without-libpng to configure but many programs using GTK+ will
-*** not work properly. The PNG loader is also needed if you are compiling
-*** from CVS.])
- fi
-
-dnl Test for libjasper
- if test x$with_libjasper = xyes && test -z "$LIBJASPER"; then
- AC_CHECK_LIB(jasper, jas_init, LIBJASPER=-ljasper, [], -ljpeg -lm)
- fi
-
- if test x$with_libjasper = xyes && test -z "$LIBJASPER"; then
- AC_MSG_ERROR([
-*** Checks for JPEG2000 loader failed. You can build without it by passing
-*** --without-libjasper to configure])
- fi
-
-AC_SUBST(LIBTIFF)
-AC_SUBST(LIBJPEG)
-AC_SUBST(LIBPNG)
-AC_SUBST(LIBJASPER)
-
AM_CONDITIONAL(BUILD_DYNAMIC_MODULES, $dynworks)
#
-# Allow building some or all gdk-pixbuf loaders included
-#
-AC_MSG_CHECKING(pixbuf loaders to build)
-
-dnl due to an autoconf bug, commas in the first arg to
-dnl AC_HELP_STRING cause problems.
-dnl AC_HELP_STRING([--with-included-loaders=LOADER1 LOADER2 ...],
-dnl [build the specified loaders into gdk-pixbuf])
-AC_ARG_WITH(included_loaders,
-[ --with-included-loaders=LOADER1,LOADER2,...
- build the specified loaders into gdk-pixbuf])
-
-if $dynworks; then
- :
-else
- ## if the option was specified, leave it; otherwise disable included loaders
- if test x$with_included_loaders = xno; then
- with_included_loaders=yes
- fi
-fi
-
-# Use the traditional png loader instead of the GDI+ one on Windows,
-# because some important apps like GIMP need to read and write
-# arbitrary tEXt chunks which doesn't seem to be possible through GDI+
-
-all_loaders="ani,icns,pcx,ras,tga,png,pnm,wbmp,xbm,xpm,qtif"
-if test x$with_libjasper != xno; then
- all_loaders="$all_loaders,jasper"
-fi
-if test x$os_win32 = xyes && test x$enable_gdiplus != xno; then
- # Skip PNG, see comment above
- gdip_formats="bmp emf gif ico jpeg tiff wmf"
- for f in $gdip_formats; do
- all_loaders="$all_loaders,gdip-$f"
- done
-else
- all_loaders="$all_loaders,bmp,gif,ico,jpeg,tiff"
-fi
-included_loaders=""
-# If no loaders specified, include all
-if test "x$with_included_loaders" = xyes ; then
- included_loaders="$all_loaders"
-else
- included_loaders="$with_included_loaders"
-fi
-
-AC_MSG_RESULT($included_loaders)
-
-INCLUDED_LOADER_OBJ=
-INCLUDED_LOADER_DEFINE=
-
-IFS="${IFS= }"; gtk_save_ifs="$IFS"; IFS=","
-for loader in $included_loaders; do
- if echo "$all_loaders" | egrep "(^|,)$loader(\$|,)" > /dev/null; then
- :
- else
- AC_MSG_ERROR([the specified loader $loader does not exist])
- fi
-
- loader_underscores=`echo $loader | sed -e 's/-/_/g'`
- INCLUDED_LOADER_OBJ="$INCLUDED_LOADER_OBJ libstatic-pixbufloader-$loader.la"
-
- # Don't bother defining separate -DINCLUDE_gdip_foo for each gdip-foo loader
- case $loader in
- gdip-*) ;;
- *) INCLUDED_LOADER_DEFINE="$INCLUDED_LOADER_DEFINE -DINCLUDE_$loader_underscores";;
- esac
- eval INCLUDE_$loader_underscores=yes
-done
-
-# Just define one -DINCLUDE_gdiplus for all the gdip-foo loaders
-# (except gdip-png, which isn't built at all)
-if test x"$INCLUDE_gdip_ico" = xyes; then
- INCLUDED_LOADER_DEFINE="$INCLUDED_LOADER_DEFINE -DINCLUDE_gdiplus"
-fi
-
-IFS="$gtk_save_ifs"
-AC_SUBST(INCLUDED_LOADER_OBJ)
-AC_SUBST(INCLUDED_LOADER_DEFINE)
-
-AM_CONDITIONAL(INCLUDE_PNG, [test x"$INCLUDE_png" = xyes])
-AM_CONDITIONAL(INCLUDE_BMP, [test x"$INCLUDE_bmp" = xyes])
-AM_CONDITIONAL(INCLUDE_WBMP, [test x"$INCLUDE_wbmp" = xyes])
-AM_CONDITIONAL(INCLUDE_GIF, [test x"$INCLUDE_gif" = xyes])
-AM_CONDITIONAL(INCLUDE_ICO, [test x"$INCLUDE_ico" = xyes])
-AM_CONDITIONAL(INCLUDE_ANI, [test x"$INCLUDE_ani" = xyes])
-AM_CONDITIONAL(INCLUDE_JPEG, [test x"$INCLUDE_jpeg" = xyes])
-AM_CONDITIONAL(INCLUDE_PNM, [test x"$INCLUDE_pnm" = xyes])
-AM_CONDITIONAL(INCLUDE_RAS, [test x"$INCLUDE_ras" = xyes])
-AM_CONDITIONAL(INCLUDE_TIFF, [test x"$INCLUDE_tiff" = xyes])
-AM_CONDITIONAL(INCLUDE_XPM, [test x"$INCLUDE_xpm" = xyes])
-AM_CONDITIONAL(INCLUDE_XBM, [test x"$INCLUDE_xbm" = xyes])
-AM_CONDITIONAL(INCLUDE_TGA, [test x"$INCLUDE_tga" = xyes])
-AM_CONDITIONAL(INCLUDE_PCX, [test x"$INCLUDE_pcx" = xyes])
-AM_CONDITIONAL(INCLUDE_ICNS, [test x"$INCLUDE_icns" = xyes])
-AM_CONDITIONAL(INCLUDE_JASPER, [test x"$INCLUDE_jasper" = xyes])
-AM_CONDITIONAL(INCLUDE_QTIF, [test x"$INCLUDE_qtif" = xyes])
-# As all GDI+ loaders are either built-in or not, arbitrarily just
-# check one of the variables here
-AM_CONDITIONAL(INCLUDE_GDIPLUS, [test x"$INCLUDE_gdip_ico" = xyes])
-
-if test x$gio_can_sniff = x; then
- AC_MSG_CHECKING([if gio can sniff png])
- gtk_save_LIBS="$LIBS"
- gtk_save_CFLAGS="$CFLAGS"
- LIBS="`$PKG_CONFIG --libs gio-2.0`"
- CFLAGS="`$PKG_CONFIG --cflags gio-2.0`"
- AC_RUN_IFELSE([AC_LANG_SOURCE([[
- #include <gio/gio.h>
- static const gsize data_size = 159;
- static const guint8 data[] =
- {
- 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d,
- 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01,
- 0x08, 0x02, 0x00, 0x00, 0x00, 0x90, 0x77, 0x53, 0xde, 0x00, 0x00, 0x00,
- 0x01, 0x73, 0x52, 0x47, 0x42, 0x00, 0xae, 0xce, 0x1c, 0xe9, 0x00, 0x00,
- 0x00, 0x09, 0x70, 0x48, 0x59, 0x73, 0x00, 0x00, 0x0b, 0x13, 0x00, 0x00,
- 0x0b, 0x13, 0x01, 0x00, 0x9a, 0x9c, 0x18, 0x00, 0x00, 0x00, 0x07, 0x74,
- 0x49, 0x4d, 0x45, 0x07, 0xd8, 0x07, 0x0f, 0x10, 0x08, 0x15, 0x61, 0xd8,
- 0x35, 0x37, 0x00, 0x00, 0x00, 0x19, 0x74, 0x45, 0x58, 0x74, 0x43, 0x6f,
- 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x00, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65,
- 0x64, 0x20, 0x77, 0x69, 0x74, 0x68, 0x20, 0x47, 0x49, 0x4d, 0x50, 0x57,
- 0x81, 0x0e, 0x17, 0x00, 0x00, 0x00, 0x0c, 0x49, 0x44, 0x41, 0x54, 0x08,
- 0xd7, 0x63, 0xf8, 0xff, 0xff, 0x3f, 0x00, 0x05, 0xfe, 0x02, 0xfe, 0xdc,
- 0xcc, 0x59, 0xe7, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae,
- 0x42, 0x60, 0x82
- };
- int
- main (int argc, char **argv)
- {
- char *content_type;
- char *image_png;
- content_type = g_content_type_guess (NULL, data, data_size, NULL);
- image_png = g_content_type_from_mime_type ("image/png");
- return !!strcmp (content_type, image_png);
- }]])],
- [gio_can_sniff=yes
- AC_DEFINE(GDK_PIXBUF_USE_GIO_MIME, 1, [Define if gio can sniff image data])],
- [gio_can_sniff=no])
- AC_MSG_RESULT($gio_can_sniff)
- LIBS="$gtk_save_LIBS"
- CFLAGS="$gtk_save_CFLAGS"
-fi
-
-#
# Allow building some or all immodules included
#
AC_MSG_CHECKING(immodules to build)
@@ -1194,29 +873,6 @@ AC_HEADER_SYS_WAIT
AC_TYPE_SIGNAL
-AM_CONDITIONAL(HAVE_TIFF, test "x$LIBTIFF" != x)
-AM_CONDITIONAL(HAVE_PNG, test "x$LIBPNG" != x)
-AM_CONDITIONAL(HAVE_JPEG, test "x$LIBJPEG" != x)
-AM_CONDITIONAL(HAVE_JASPER, test "x$LIBJASPER" != x)
-
-if $dynworks ; then
- STATIC_LIB_DEPS=
- if echo "$included_loaders" | egrep '(^|,)tiff($|,)' > /dev/null; then
- STATIC_LIB_DEPS="$STATIC_LIB_DEPS $LIBTIFF"
- fi
- if echo "$included_loaders" | egrep '(^|,)jpeg($|,)' > /dev/null; then
- STATIC_LIB_DEPS="$STATIC_LIB_DEPS $LIBJPEG"
- fi
- if echo "$included_loaders" | egrep '(^|,)png($|,)' > /dev/null; then
- STATIC_LIB_DEPS="$STATIC_LIB_DEPS $LIBPNG"
- fi
- if echo "$included_loaders" | egrep '(^|,)jasper($|,)' > /dev/null; then
- STATIC_LIB_DEPS="$STATIC_LIB_DEPS $LIBJASPER"
- fi
-else
- STATIC_LIB_DEPS="$LIBTIFF $LIBJPEG $LIBPNG $LIBJASPER"
-fi
-
# Checks to see whether we should include mediaLib
# support.
#
@@ -1249,64 +905,19 @@ fi
AM_CONDITIONAL(USE_MEDIALIB, test $use_mlib = yes)
AM_CONDITIONAL(USE_MEDIALIB25, test $use_mlib25 = yes)
-# Checks to see if we should compile in MMX support (there will be
-# a runtime test when the code is actually run to see if it should
-# be used - this just checks if we can compile it.)
-#
-# This code is partially taken from Mesa
-#
-AC_MSG_CHECKING(for x86 platform)
-case $host_cpu in
- i386|i486|i586|i686|i786|k6|k7)
- use_x86_asm=yes
- ;;
- *)
- use_x86_asm=no
-esac
-AC_MSG_RESULT($use_x86_asm)
-
-use_mmx_asm=no
-if test $use_x86_asm = yes; then
- save_ac_ext=$ac_ext
- ac_ext=S
-
- AC_MSG_CHECKING(compiler support for MMX)
- cp $srcdir/gdk-pixbuf/pixops/scale_line_22_33_mmx.S conftest.S
- if AC_TRY_EVAL(ac_compile); then
- use_mmx_asm=yes
- fi
-
- rm -rf conftest*
-
- ac_ext=$save_ac_ext
- if test $use_mmx_asm = yes; then
- AC_DEFINE(USE_MMX, 1,
- [Define to 1 if XXM is available and should be used])
- AC_MSG_RESULT(yes)
- else
- AC_MSG_RESULT(no)
- fi
-fi
-
-AM_CONDITIONAL(USE_MMX, test x$use_mmx_asm = xyes)
-
-REBUILD_PNGS=
-if test -z "$LIBPNG" && test x"$os_win32" = xno -o x$enable_gdiplus = xno; then
- REBUILD_PNGS=#
-fi
-
dnl Look for a host system's gdk-pixbuf-csource if we are cross-compiling
AM_CONDITIONAL(CROSS_COMPILING, test $cross_compiling = yes)
if test $cross_compiling = yes; then
- AC_PATH_PROG(GDK_PIXBUF_CSOURCE, gdk-pixbuf-csource, no)
AC_PATH_PROG(GTK_UPDATE_ICON_CACHE, gtk-update-icon-cache, no)
if test x$GTK_UPDATE_ICON_CACHE = xno; then
REBUILD_PNGS=#
fi
fi
+AC_PATH_PROG(GDK_PIXBUF_CSOURCE, gdk-pixbuf-csource, no)
+
if test ! -f $srcdir/gtk/gtkbuiltincache.h &&
test "x$REBUILD_PNGS" = "x#" ; then
AC_MSG_ERROR([
@@ -1315,22 +926,10 @@ if test ! -f $srcdir/gtk/gtkbuiltincache.h &&
*** don't have a prebuilt gtk-update-icon-cache on the build system.])
fi
-AC_SUBST(REBUILD_PNGS)
-
-GDK_PIXBUF_PACKAGES="gmodule-no-export-2.0 gobject-2.0 gio-2.0"
-GDK_PIXBUF_EXTRA_LIBS="$STATIC_LIB_DEPS $MATH_LIB $MEDIA_LIB"
-GDK_PIXBUF_EXTRA_CFLAGS=
-GDK_PIXBUF_DEP_LIBS="`$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES` $GDK_PIXBUF_EXTRA_LIBS"
-GDK_PIXBUF_DEP_CFLAGS="`$PKG_CONFIG --cflags gthread-2.0 $GDK_PIXBUF_PACKAGES $PNG_DEP_CFLAGS_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS"
-
########################################
# Windowing system checks
########################################
-GDK_PIXBUF_XLIB_PACKAGES=
-GDK_PIXBUF_XLIB_EXTRA_CFLAGS=
-GDK_PIXBUF_XLIB_EXTRA_LIBS=
-
GDK_EXTRA_LIBS="$GDK_WLIBS"
GDK_EXTRA_CFLAGS=
@@ -1368,8 +967,7 @@ if test "x$gdktarget" = "xx11"; then
*) x_libs_for_checks="$x_libs_for_checks $I" ;;
esac
done
-
- GDK_PIXBUF_XLIB_PACKAGES="x11"
+
GTK_PACKAGES_FOR_X="x11"
else
have_base_x_pc=false
@@ -1381,8 +979,6 @@ if test "x$gdktarget" = "xx11"; then
x_cflags="$X_CFLAGS"
x_libs_for_checks="$X_LIBS -lXext -lXrender -lX11 $X_EXTRA_LIBS"
- GDK_PIXBUF_XLIB_EXTRA_CFLAGS="$x_cflags"
- GDK_PIXBUF_XLIB_EXTRA_LIBS="$X_LIBS -lX11 $X_EXTRA_LIBS"
GTK_DEP_LIBS_FOR_X="$X_LIBS -lXrender -lX11 $X_EXTRA_LIBS"
fi
@@ -1662,15 +1258,6 @@ else
AM_CONDITIONAL(USE_QUARTZ, false)
fi
-GDK_PIXBUF_XLIB_DEP_LIBS="`$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES $GDK_PIXBUF_XLIB_PACKAGES` $GDK_PIXBUF_XLIB_EXTRA_LIBS $GDK_PIXBUF_EXTRA_LIBS"
-GDK_PIXBUF_XLIB_DEP_CFLAGS="`$PKG_CONFIG --cflags gthread-2.0 $GDK_PIXBUF_PACKAGES $GDK_PIXBUF_XLIB_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS $GDK_PIXBUF_XLIB_EXTRA_CFLAGS"
-
-AC_SUBST(GDK_PIXBUF_XLIB_PACKAGES)
-AC_SUBST(GDK_PIXBUF_XLIB_EXTRA_LIBS)
-AC_SUBST(GDK_PIXBUF_XLIB_EXTRA_CFLAGS)
-AC_SUBST(GDK_PIXBUF_XLIB_DEP_LIBS)
-AC_SUBST(GDK_PIXBUF_XLIB_DEP_CFLAGS)
-
if test "x$gdktarget" = "xdirectfb"; then
DIRECTFB_REQUIRED_VERSION=1.0.0
AC_MSG_CHECKING(for DirectFB)
@@ -1721,13 +1308,13 @@ LDFLAGS="$saved_ldflags"
# Pull in gio-unix for GDesktopAppInfo usage, see at least gdkapplaunchcontext-x11.c
if test "x$gdktarget" = "xx11"; then
- GDK_PACKAGES="$PANGO_PACKAGES gio-unix-2.0 $X_PACKAGES cairo-$cairo_backend"
+ GDK_PACKAGES="$PANGO_PACKAGES gio-unix-2.0 $X_PACKAGES gdk-pixbuf-2.0 cairo-$cairo_backend"
else
- GDK_PACKAGES="$PANGO_PACKAGES $X_PACKAGES cairo-$cairo_backend"
+ GDK_PACKAGES="$PANGO_PACKAGES $X_PACKAGES gdk-pixbuf-2.0 cairo-$cairo_backend"
fi
-GDK_DEP_LIBS="$GDK_EXTRA_LIBS `$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES $GDK_PACKAGES` $GDK_PIXBUF_EXTRA_LIBS"
-GDK_DEP_CFLAGS="`$PKG_CONFIG --cflags gthread-2.0 $GDK_PIXBUF_PACKAGES $GDK_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS $GDK_EXTRA_CFLAGS"
+GDK_DEP_LIBS="$GDK_EXTRA_LIBS `$PKG_CONFIG --libs $GDK_PACKAGES`"
+GDK_DEP_CFLAGS="`$PKG_CONFIG --cflags gthread-2.0 $GDK_PACKAGES` $GDK_EXTRA_CFLAGS"
#
# If we aren't writing explicit dependencies, then don't put the extra libraries we need
# into the pkg-config files
@@ -1773,14 +1360,14 @@ else
LIBS="$gtk_save_LIBS"
fi
-GTK_PACKAGES="atk cairo gio-2.0"
+GTK_PACKAGES="atk cairo gdk-pixbuf-2.0 gio-2.0"
if test "x$gdktarget" = "xx11"; then
GTK_PACKAGES="$GTK_PACKAGES pangoft2"
fi
GTK_EXTRA_LIBS=
GTK_EXTRA_CFLAGS=
-GTK_DEP_LIBS="$GDK_EXTRA_LIBS $GTK_DEP_LIBS_FOR_X `$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES $PANGO_PACKAGES $GTK_PACKAGES_FOR_X $GTK_PACKAGES` $GTK_EXTRA_LIBS $GDK_PIXBUF_EXTRA_LIBS"
-GTK_DEP_CFLAGS="`$PKG_CONFIG --cflags gthread-2.0 $GDK_PIXBUF_PACKAGES $GDK_PACKAGES $GTK_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS $GDK_EXTRA_CFLAGS $GTK_EXTRA_CFLAGS"
+GTK_DEP_LIBS="$GDK_EXTRA_LIBS $GTK_DEP_LIBS_FOR_X `$PKG_CONFIG --libs $PANGO_PACKAGES $GTK_PACKAGES_FOR_X $GTK_PACKAGES` $GTK_EXTRA_LIBS"
+GTK_DEP_CFLAGS="`$PKG_CONFIG --cflags gthread-2.0 $GDK_PACKAGES $GTK_PACKAGES` $GDK_EXTRA_CFLAGS $GTK_EXTRA_CFLAGS"
if test x"$os_win32" = xyes; then
GTK_EXTRA_CFLAGS="$msnative_struct"
@@ -1791,16 +1378,6 @@ ATK_PREFIX="`$PKG_CONFIG --variable=prefix atk`"
PANGO_PREFIX="`$PKG_CONFIG --variable=prefix pango`"
CAIRO_PREFIX="`pkg-config --variable=prefix cairo`"
-if test $enable_explicit_deps != yes ; then
- GDK_PIXBUF_EXTRA_LIBS=
-fi
-
-AC_SUBST(GDK_PIXBUF_PACKAGES)
-AC_SUBST(GDK_PIXBUF_EXTRA_LIBS)
-AC_SUBST(GDK_PIXBUF_EXTRA_CFLAGS)
-AC_SUBST(GDK_PIXBUF_DEP_LIBS)
-AC_SUBST(GDK_PIXBUF_DEP_CFLAGS)
-
AC_SUBST(GTK_PACKAGES)
AC_SUBST(GTK_EXTRA_LIBS)
AC_SUBST(GTK_EXTRA_CFLAGS)
@@ -1815,6 +1392,9 @@ AC_SUBST(CAIRO_PREFIX)
AC_SUBST(GTK_DEBUG_FLAGS)
AC_SUBST(GTK_XIM_FLAGS)
+GDK_PIXBUF_LIBS=`$PKG_CONFIG --libs gdk-pixbuf-2.0`
+AC_SUBST(GDK_PIXBUF_LIBS)
+
########################
# Checks needed for gail
########################
@@ -1976,8 +1556,6 @@ AM_CONDITIONAL(TEST_PRINT_BACKEND, test "x$enable_test_print_backend" != "xno")
export SED
export_dynamic=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
if test -n "$export_dynamic"; then
- GDK_PIXBUF_DEP_LIBS=`echo $GDK_PIXBUF_DEP_LIBS | sed -e "s/$export_dynamic//"`
- GDK_PIXBUF_XLIB_DEP_LIBS=`echo $GDK_PIXBUF_XLIB_DEP_LIBS | sed -e "s/$export_dynamic//"`
GDK_DEP_LIBS=`echo $GDK_DEP_LIBS | sed -e "s/$export_dynamic//"`
GTK_DEP_LIBS=`echo $GTK_DEP_LIBS | sed -e "s/$export_dynamic//"`
fi
@@ -2109,12 +1687,10 @@ AC_CONFIG_FILES([
config.h.win32
gtk-zip.sh
Makefile
-gdk-pixbuf-2.0.pc
gdk-2.0.pc
gtk+-2.0.pc
gtk+-unix-print-2.0.pc
gail.pc
-gdk-pixbuf-2.0-uninstalled.pc
gdk-2.0-uninstalled.pc
gtk+-2.0-uninstalled.pc
gail-uninstalled.pc
@@ -2127,8 +1703,6 @@ demos/gtk-demo/geninclude.pl
tests/Makefile
docs/Makefile
docs/reference/Makefile
-docs/reference/gdk-pixbuf/Makefile
-docs/reference/gdk-pixbuf/version.xml
docs/reference/gdk/Makefile
docs/reference/gdk/version.xml
docs/reference/gtk/Makefile
@@ -2140,10 +1714,6 @@ docs/tutorial/Makefile
build/Makefile
build/win32/Makefile
build/win32/vs9/Makefile
-gdk-pixbuf/Makefile
-gdk-pixbuf/gdk_pixbuf.rc
-gdk-pixbuf/gdk-pixbuf-features.h
-gdk-pixbuf/pixops/Makefile
gdk/Makefile
gdk/x11/Makefile
gdk/win32/Makefile
@@ -2176,9 +1746,6 @@ modules/printbackends/file/Makefile
modules/printbackends/papi/Makefile
modules/printbackends/test/Makefile
perf/Makefile
-contrib/Makefile
-contrib/gdk-pixbuf-xlib/Makefile
-contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.0.pc
])
AC_OUTPUT
diff --git a/demos/Makefile.am b/demos/Makefile.am
index f87b3cd..aea3dd7 100644
--- a/demos/Makefile.am
+++ b/demos/Makefile.am
@@ -12,12 +12,10 @@ INCLUDES = \
$(GTK_DEP_CFLAGS)
DEPS = \
- $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
$(top_builddir)/gdk/$(gdktargetlib) \
$(top_builddir)/gtk/$(gtktargetlib)
LDADDS = \
- $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
$(top_builddir)/gdk/$(gdktargetlib) \
$(top_builddir)/gtk/$(gtktargetlib) \
$(GTK_DEP_LIBS) \
@@ -32,21 +30,11 @@ noinst_PROGRAMS = \
pixbuf-demo
# Need to build test-inline-pixbufs.h for testpixbuf
-if HAVE_PNG
noinst_PROGRAMS += testpixbuf
BUILT_SOURCES = test-inline-pixbufs.h
-endif
-if CROSS_COMPILING
-pixbuf_csource=$(GDK_PIXBUF_CSOURCE)
-pixbuf_csource_deps=
-else
-pixbuf_csource=GDK_PIXBUF_MODULE_FILE=$(top_builddir)/gdk-pixbuf/gdk-pixbuf.loaders $(top_builddir)/gdk-pixbuf/gdk-pixbuf-csource
-pixbuf_csource_deps=$(top_builddir)/gdk-pixbuf/gdk-pixbuf-csource $(top_builddir)/gdk-pixbuf/gdk-pixbuf.loaders
-endif
-
-test-inline-pixbufs.h: $(pixbuf_csource_deps) apple-red.png gnome-foot.png
- $(pixbuf_csource) --raw --build-list \
+test-inline-pixbufs.h: apple-red.png gnome-foot.png
+ $(GDK_PIXBUF_CSOURCE) --raw --build-list \
apple_red $(srcdir)/apple-red.png \
gnome_foot $(srcdir)/gnome-foot.png \
> test-inline-pixbufs.h \
diff --git a/demos/gtk-demo/Makefile.am b/demos/gtk-demo/Makefile.am
index 698c242..cf4434e 100644
--- a/demos/gtk-demo/Makefile.am
+++ b/demos/gtk-demo/Makefile.am
@@ -55,15 +55,14 @@ INCLUDES = \
$(GTK_DEP_CFLAGS)
DEPS = \
- $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
$(top_builddir)/gdk/$(gdktargetlib) \
$(top_builddir)/gtk/$(gtktargetlib)
LDADDS = \
- $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
$(top_builddir)/gdk/$(gdktargetlib) \
$(top_builddir)/gtk/$(gtktargetlib) \
- $(GTK_DEP_LIBS)
+ $(GTK_DEP_LIBS) \
+ -lm
bin_PROGRAMS = gtk-demo
diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am
index f780c4f..a2f772e 100644
--- a/docs/reference/Makefile.am
+++ b/docs/reference/Makefile.am
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
include $(top_srcdir)/Makefile.decl
-SUBDIRS = gdk-pixbuf gdk gtk libgail-util
+SUBDIRS = gdk gtk libgail-util
GITIGNOREFILES = */*.1
diff --git a/docs/reference/gdk/Makefile.am b/docs/reference/gdk/Makefile.am
index 7e21e35..cb9b0d3 100644
--- a/docs/reference/gdk/Makefile.am
+++ b/docs/reference/gdk/Makefile.am
@@ -142,7 +142,7 @@ HTML_IMAGES = \
images/xterm.png
# Extra options to supply to gtkdoc-fixref
-FIXXREF_OPTIONS=--extra-dir=../gdk-pixbuf/html \
+FIXXREF_OPTIONS= \
--extra-dir=$(GLIB_PREFIX)/share/gtk-doc/html/gobject \
--extra-dir=$(GLIB_PREFIX)/share/gtk-doc/html/glib \
--extra-dir=$(CAIRO_PREFIX)/share/gtk-doc/html/cairo
diff --git a/docs/reference/gtk/Makefile.am b/docs/reference/gtk/Makefile.am
index 6ec1956..86d404e 100644
--- a/docs/reference/gtk/Makefile.am
+++ b/docs/reference/gtk/Makefile.am
@@ -26,7 +26,6 @@ CFILE_GLOB=$(top_srcdir)/gtk/*.c
IGNORE_HFILES= \
gtkalias.h \
fnmatch.h \
- gdk-pixbuf-loader.h \
gtkdebug.h \
gtkbuilderprivate.h \
gtkdndcursors.h \
@@ -110,7 +109,6 @@ CPPFLAGS += \
-UGTK_DISABLE_SINGLE_INCLUDES
GTKDOC_LIBS = \
- $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
$(top_builddir)/gdk/$(gdktargetlib) \
$(top_builddir)/gtk/$(gtktargetlib)
@@ -354,7 +352,7 @@ HTML_IMAGES = \
$(srcdir)/images/layout-tbrl.png
# Extra options to supply to gtkdoc-fixref
-FIXXREF_OPTIONS=--extra-dir=../gdk-pixbuf/html --extra-dir=../gdk/html \
+FIXXREF_OPTIONS=--extra-dir=../gdk/html \
--extra-dir=$(GLIB_PREFIX)/share/gtk-doc/html/gobject \
--extra-dir=$(GLIB_PREFIX)/share/gtk-doc/html/glib \
--extra-dir=$(ATK_PREFIX)/share/gtk-doc/html/atk \
diff --git a/docs/reference/gtk/building.sgml b/docs/reference/gtk/building.sgml
index 3d3da46..33e633a 100644
--- a/docs/reference/gtk/building.sgml
+++ b/docs/reference/gtk/building.sgml
@@ -165,8 +165,8 @@ How to compile GTK+ itself
</itemizedlist>
<para>
Three of the libraries that GTK+ depends on are maintained by
- by the GTK+ team: GLib, Pango, and ATK. Other libraries are
- maintained separately.
+ by the GTK+ team: GLib, GdkPixbuf, Pango, and ATK. Other libraries
+ are maintained separately.
</para>
<itemizedlist>
<listitem>
@@ -329,9 +329,6 @@ How to compile GTK+ itself
<arg>--enable-modules</arg>
</group>
<group>
- <arg>--with-included-loaders==LOADER1,LOADER2,...</arg>
- </group>
- <group>
<arg>--with-included-immodules=MODULE1,MODULE2,...</arg>
</group>
<group>
@@ -386,8 +383,8 @@ How to compile GTK+ itself
<systemitem>--enable-modules</systemitem></title>
<para>
- Normally GTK+ will try to build the GdkPixbuf image file
- format loaders as little shared libraries that are loaded on
+ Normally GTK+ will try to build the input method modules
+ as little shared libraries that are loaded on
demand. The <systemitem>--disable-modules</systemitem>
argument indicates that they should all be built statically
into the GTK+ library instead. This is useful for
@@ -400,16 +397,6 @@ How to compile GTK+ itself
</formalpara>
<formalpara>
- <title><systemitem>--with-included-loaders</systemitem></title>
-
- <para>
- This option allows you to specify which image loaders you
- want to include; for example, you might include only the PNG
- loader to create a smaller GdkPixbuf binary.
- </para>
- </formalpara>
-
- <formalpara>
<title><systemitem>--with-included-immodules</systemitem></title>
<para>
diff --git a/docs/tools/Makefile.am b/docs/tools/Makefile.am
index 66ba8b5..54b77b7 100644
--- a/docs/tools/Makefile.am
+++ b/docs/tools/Makefile.am
@@ -9,16 +9,15 @@ INCLUDES = \
$(GTK_DEP_CFLAGS)
DEPS = \
- $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
$(top_builddir)/gdk/$(gdktargetlib) \
$(top_builddir)/gtk/$(gtktargetlib)
LDADDS = \
- $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
- $(top_builddir)/gdk/$(gdktargetlib) \
+ $(top_builddir)/gdk/$(gdktargetlib) \
$(top_builddir)/gtk/$(gtktargetlib) \
- $(GTK_DEP_LIBS) \
- $(GDK_DEP_LIBS)
+ $(GTK_DEP_LIBS) \
+ $(GDK_DEP_LIBS) \
+ -lm
if USE_X11
noinst_PROGRAMS = \
diff --git a/gdk/Makefile.am b/gdk/Makefile.am
index 478a5b1..f7a7e3b 100644
--- a/gdk/Makefile.am
+++ b/gdk/Makefile.am
@@ -2,12 +2,10 @@
include $(top_srcdir)/Makefile.decl
-include $(INTROSPECTION_MAKEFILE)
INTROSPECTION_GIRS =
-INTROSPECTION_SCANNER_ARGS = \
- --add-include-path=../gdk-pixbuf
+INTROSPECTION_SCANNER_ARGS =
INTROSPECTION_COMPILER_ARGS = \
--includedir=$(srcdir) \
- --includedir=. \
- --includedir=../gdk-pixbuf
+ --includedir=.
SUBDIRS = $(gdktarget) . tests
DIST_SUBDIRS = win32 x11 quartz directfb tests
@@ -38,7 +36,6 @@ INCLUDES = \
-DGDK_COMPILATION \
-I$(top_srcdir) \
-I$(top_builddir)/gdk \
- -I$(top_srcdir)/gdk-pixbuf \
$(GTK_DEBUG_FLAGS) \
$(GDK_DEP_CFLAGS)
@@ -171,24 +168,20 @@ common_sources = \
gdkmarshalers.c \
gdkmarshalers.h
-libgdk_directfb_2_0_la_SOURCES = $(common_sources)
-libgdk_directfb_2_0_la_LIBADD = directfb/libgdk-directfb.la $(GDK_DEP_LIBS) \
- $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la
+libgdk_directfb_2_0_la_SOURCES = $(common_sources)
+libgdk_directfb_2_0_la_LIBADD = directfb/libgdk-directfb.la $(GDK_DEP_LIBS)
libgdk_directfb_2_0_la_LDFLAGS = $(LDADD)
libgdk_x11_2_0_la_SOURCES = $(common_sources)
-libgdk_x11_2_0_la_LIBADD = x11/libgdk-x11.la $(GDK_DEP_LIBS) \
- $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la
+libgdk_x11_2_0_la_LIBADD = x11/libgdk-x11.la $(GDK_DEP_LIBS)
libgdk_x11_2_0_la_LDFLAGS = $(LDADD)
libgdk_quartz_2_0_la_SOURCES = $(common_sources) gdkkeynames.c
-libgdk_quartz_2_0_la_LIBADD = quartz/libgdk-quartz.la $(GDK_DEP_LIBS) \
- $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la
+libgdk_quartz_2_0_la_LIBADD = quartz/libgdk-quartz.la $(GDK_DEP_LIBS)
libgdk_quartz_2_0_la_LDFLAGS = $(LDADD)
libgdk_win32_2_0_la_SOURCES = $(common_sources) gdkkeynames.c
-libgdk_win32_2_0_la_LIBADD = win32/libgdk-win32.la $(GDK_DEP_LIBS) \
- $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la
+libgdk_win32_2_0_la_LIBADD = win32/libgdk-win32.la $(GDK_DEP_LIBS)
libgdk_win32_2_0_la_DEPENDENCIES = win32/libgdk-win32.la win32/rc/gdk-win32-res.o gdk.def
libgdk_win32_2_0_la_LDFLAGS = -Wl,win32/rc/gdk-win32-res.o -export-symbols $(srcdir)/gdk.def $(LDADD)
@@ -202,7 +195,7 @@ introspection_files = \
x11/*.c
Gdk-2.0.gir: $(gdktargetlib) Makefile
-Gdk_2_0_gir_SCANNERFLAGS = --strip-prefix=Gdk --add-include-path=../gdk-pixbuf
+Gdk_2_0_gir_SCANNERFLAGS = --strip-prefix=Gdk
Gdk_2_0_gir_INCLUDES = Gio-2.0 GdkPixbuf-2.0 Pango-1.0
Gdk_2_0_gir_LIBS = $(gdktargetlib)
Gdk_2_0_gir_FILES = $(addprefix $(srcdir)/,$(introspection_files))
diff --git a/gdk/gdkdraw.c b/gdk/gdkdraw.c
index e3737f6..81df162 100644
--- a/gdk/gdkdraw.c
+++ b/gdk/gdkdraw.c
@@ -27,12 +27,12 @@
#include "config.h"
#include <math.h>
#include <pango/pangocairo.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include "gdkcairo.h"
#include "gdkdrawable.h"
#include "gdkinternals.h"
#include "gdkwindow.h"
#include "gdkscreen.h"
-#include "gdk-pixbuf-private.h"
#include "gdkpixbuf.h"
#include "gdkalias.h"
@@ -1555,20 +1555,21 @@ gdk_drawable_real_draw_pixbuf (GdkDrawable *drawable,
GdkDrawable *real_drawable;
g_return_if_fail (GDK_IS_PIXBUF (pixbuf));
- g_return_if_fail (pixbuf->colorspace == GDK_COLORSPACE_RGB);
- g_return_if_fail (pixbuf->n_channels == 3 || pixbuf->n_channels == 4);
- g_return_if_fail (pixbuf->bits_per_sample == 8);
+ g_return_if_fail (gdk_pixbuf_get_colorspace (pixbuf) == GDK_COLORSPACE_RGB);
+ g_return_if_fail (gdk_pixbuf_get_n_channels (pixbuf) == 3 ||
+ gdk_pixbuf_get_n_channels (pixbuf) == 4);
+ g_return_if_fail (gdk_pixbuf_get_bits_per_sample (pixbuf) == 8);
g_return_if_fail (drawable != NULL);
if (width == -1)
- width = pixbuf->width;
+ width = gdk_pixbuf_get_width (pixbuf);
if (height == -1)
- height = pixbuf->height;
+ height = gdk_pixbuf_get_height (pixbuf);
g_return_if_fail (width >= 0 && height >= 0);
- g_return_if_fail (src_x >= 0 && src_x + width <= pixbuf->width);
- g_return_if_fail (src_y >= 0 && src_y + height <= pixbuf->height);
+ g_return_if_fail (src_x >= 0 && src_x + width <= gdk_pixbuf_get_width (pixbuf));
+ g_return_if_fail (src_y >= 0 && src_y + height <= gdk_pixbuf_get_height (pixbuf));
/* Clip to the drawable; this is required for get_from_drawable() so
* can't be done implicitly
@@ -1638,7 +1639,7 @@ gdk_drawable_real_draw_pixbuf (GdkDrawable *drawable,
else
real_drawable = GDK_PIXMAP_OBJECT (drawable)->impl;
- if (pixbuf->has_alpha)
+ if (gdk_pixbuf_get_has_alpha (pixbuf))
{
GdkVisual *visual = gdk_drawable_get_visual (drawable);
void (*composite_func) (guchar *src_buf,
@@ -1701,8 +1702,8 @@ gdk_drawable_real_draw_pixbuf (GdkDrawable *drawable,
dest_x + x0, dest_y + y0,
xs0, ys0,
width1, height1);
- (*composite_func) (pixbuf->pixels + (src_y + y0) * pixbuf->rowstride + (src_x + x0) * 4,
- pixbuf->rowstride,
+ (*composite_func) (gdk_pixbuf_get_pixels (pixbuf) + (src_y + y0) * gdk_pixbuf_get_rowstride (pixbuf) + (src_x + x0) * 4,
+ gdk_pixbuf_get_rowstride (pixbuf),
(guchar*)image->mem + ys0 * image->bpl + xs0 * image->bpp,
image->bpl,
visual->byte_order,
@@ -1729,10 +1730,10 @@ gdk_drawable_real_draw_pixbuf (GdkDrawable *drawable,
width, height);
if (composited)
- composite (pixbuf->pixels + src_y * pixbuf->rowstride + src_x * 4,
- pixbuf->rowstride,
- composited->pixels,
- composited->rowstride,
+ composite (gdk_pixbuf_get_pixels (pixbuf) + src_y * gdk_pixbuf_get_rowstride (pixbuf) + src_x * 4,
+ gdk_pixbuf_get_rowstride (pixbuf),
+ gdk_pixbuf_get_pixels (composited),
+ gdk_pixbuf_get_rowstride (composited),
width, height);
}
}
@@ -1744,26 +1745,26 @@ gdk_drawable_real_draw_pixbuf (GdkDrawable *drawable,
pixbuf = composited;
}
- if (pixbuf->n_channels == 4)
+ if (gdk_pixbuf_get_n_channels (pixbuf) == 4)
{
- guchar *buf = pixbuf->pixels + src_y * pixbuf->rowstride + src_x * 4;
+ guchar *buf = gdk_pixbuf_get_pixels (pixbuf) + src_y * gdk_pixbuf_get_rowstride (pixbuf) + src_x * 4;
gdk_draw_rgb_32_image_dithalign (real_drawable, gc,
dest_x, dest_y,
width, height,
dither,
- buf, pixbuf->rowstride,
+ buf, gdk_pixbuf_get_rowstride (pixbuf),
x_dither, y_dither);
}
else /* n_channels == 3 */
{
- guchar *buf = pixbuf->pixels + src_y * pixbuf->rowstride + src_x * 3;
+ guchar *buf = gdk_pixbuf_get_pixels (pixbuf) + src_y * gdk_pixbuf_get_rowstride (pixbuf) + src_x * 3;
gdk_draw_rgb_image_dithalign (real_drawable, gc,
dest_x, dest_y,
width, height,
dither,
- buf, pixbuf->rowstride,
+ buf, gdk_pixbuf_get_rowstride (pixbuf),
x_dither, y_dither);
}
diff --git a/gdk/gdkpixbuf-drawable.c b/gdk/gdkpixbuf-drawable.c
index 036ff52..ff85cb7 100644
--- a/gdk/gdkpixbuf-drawable.c
+++ b/gdk/gdkpixbuf-drawable.c
@@ -25,13 +25,14 @@
#include "config.h"
#include <stdio.h>
#include <string.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
#include "gdkcolor.h"
#include "gdkimage.h"
#include "gdkvisual.h"
#include "gdkwindow.h"
#include "gdkpixbuf.h"
#include "gdkpixmap.h"
-#include "gdk-pixbuf-private.h"
#include "gdkinternals.h"
#include "gdkalias.h"
@@ -1230,9 +1231,10 @@ gdk_pixbuf_get_from_drawable (GdkPixbuf *dest,
g_return_val_if_fail (dest_x == 0 && dest_y == 0, NULL);
else
{
- g_return_val_if_fail (dest->colorspace == GDK_COLORSPACE_RGB, NULL);
- g_return_val_if_fail (dest->n_channels == 3 || dest->n_channels == 4, NULL);
- g_return_val_if_fail (dest->bits_per_sample == 8, NULL);
+ g_return_val_if_fail (gdk_pixbuf_get_colorspace (dest) == GDK_COLORSPACE_RGB, NULL);
+ g_return_val_if_fail (gdk_pixbuf_get_n_channels (dest) == 3 ||
+ gdk_pixbuf_get_n_channels (dest) == 4, NULL);
+ g_return_val_if_fail (gdk_pixbuf_get_bits_per_sample (dest) == 8, NULL);
}
if (cmap == NULL)
@@ -1281,8 +1283,8 @@ gdk_pixbuf_get_from_drawable (GdkPixbuf *dest,
if (dest)
{
g_return_val_if_fail (dest_x >= 0 && dest_y >= 0, NULL);
- g_return_val_if_fail (dest_x + width <= dest->width, NULL);
- g_return_val_if_fail (dest_y + height <= dest->height, NULL);
+ g_return_val_if_fail (dest_x + width <= gdk_pixbuf_get_width (dest), NULL);
+ g_return_val_if_fail (dest_y + height <= gdk_pixbuf_get_height (dest), NULL);
}
for (y0 = 0; y0 < height; y0 += GDK_SCRATCH_IMAGE_HEIGHT)
@@ -1348,9 +1350,10 @@ gdk_pixbuf_get_from_image (GdkPixbuf *dest,
g_return_val_if_fail (dest_x == 0 && dest_y == 0, NULL);
else
{
- g_return_val_if_fail (dest->colorspace == GDK_COLORSPACE_RGB, NULL);
- g_return_val_if_fail (dest->n_channels == 3 || dest->n_channels == 4, NULL);
- g_return_val_if_fail (dest->bits_per_sample == 8, NULL);
+ g_return_val_if_fail (gdk_pixbuf_get_colorspace (dest) == GDK_COLORSPACE_RGB, NULL);
+ g_return_val_if_fail (gdk_pixbuf_get_n_channels (dest) == 3 ||
+ gdk_pixbuf_get_n_channels (dest) == 4, NULL);
+ g_return_val_if_fail (gdk_pixbuf_get_bits_per_sample (dest) == 8, NULL);
}
if (cmap == NULL)
@@ -1380,8 +1383,8 @@ gdk_pixbuf_get_from_image (GdkPixbuf *dest,
if (dest)
{
g_return_val_if_fail (dest_x >= 0 && dest_y >= 0, NULL);
- g_return_val_if_fail (dest_x + width <= dest->width, NULL);
- g_return_val_if_fail (dest_y + height <= dest->height, NULL);
+ g_return_val_if_fail (dest_x + width <= gdk_pixbuf_get_width (dest), NULL);
+ g_return_val_if_fail (dest_y + height <= gdk_pixbuf_get_height (dest), NULL);
}
/* Create the pixbuf if needed */
@@ -1392,14 +1395,14 @@ gdk_pixbuf_get_from_image (GdkPixbuf *dest,
return NULL;
}
- alpha = dest->has_alpha;
- rowstride = dest->rowstride;
+ alpha = gdk_pixbuf_get_has_alpha (dest);
+ rowstride = gdk_pixbuf_get_rowstride (dest);
bpp = alpha ? 4 : 3;
/* we offset into the image data based on the position we are
* retrieving from
*/
- rgbconvert (src, dest->pixels +
+ rgbconvert (src, gdk_pixbuf_get_pixels (dest) +
(dest_y * rowstride) + (dest_x * bpp),
rowstride,
alpha,
diff --git a/gdk/gdkpixbuf-render.c b/gdk/gdkpixbuf-render.c
index a702e2e..f4f5d2e 100644
--- a/gdk/gdkpixbuf-render.c
+++ b/gdk/gdkpixbuf-render.c
@@ -22,7 +22,7 @@
#include "config.h"
#include <gdk/gdk.h>
-#include "gdk-pixbuf-private.h"
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include "gdkpixbuf.h"
#include "gdkscreen.h"
#include "gdkinternals.h"
@@ -63,20 +63,20 @@ gdk_pixbuf_render_threshold_alpha (GdkPixbuf *pixbuf,
int start, start_status;
int status;
- g_return_if_fail (GDK_IS_PIXBUF (pixbuf));
- g_return_if_fail (pixbuf->colorspace == GDK_COLORSPACE_RGB);
- g_return_if_fail (pixbuf->n_channels == 3 || pixbuf->n_channels == 4);
- g_return_if_fail (pixbuf->bits_per_sample == 8);
+ g_return_val_if_fail (gdk_pixbuf_get_colorspace (pixbuf) == GDK_COLORSPACE_RGB, NULL);
+ g_return_val_if_fail (gdk_pixbuf_get_n_channels (pixbuf) == 3 ||
+ gdk_pixbuf_get_n_channels (pixbuf) == 4, NULL);
+ g_return_val_if_fail (gdk_pixbuf_get_bits_per_sample (pixbuf) == 8, NULL);
if (width == -1)
- width = pixbuf->width;
+ width = gdk_pixbuf_get_width (pixbuf);
if (height == -1)
- height = pixbuf->height;
+ height = gdk_pixbuf_get_height (pixbuf);
g_return_if_fail (bitmap != NULL);
g_return_if_fail (width >= 0 && height >= 0);
- g_return_if_fail (src_x >= 0 && src_x + width <= pixbuf->width);
- g_return_if_fail (src_y >= 0 && src_y + height <= pixbuf->height);
+ g_return_if_fail (src_x >= 0 && src_x + width <= gdk_pixbuf_get_width (pixbuf));
+ g_return_if_fail (src_y >= 0 && src_y + height <= gdk_pixbuf_get_height (pixbuf));
g_return_if_fail (alpha_threshold >= 0 && alpha_threshold <= 255);
@@ -85,7 +85,7 @@ gdk_pixbuf_render_threshold_alpha (GdkPixbuf *pixbuf,
gc = _gdk_drawable_get_scratch_gc (bitmap, FALSE);
- if (!pixbuf->has_alpha)
+ if (!gdk_pixbuf_get_has_alpha (pixbuf))
{
color.pixel = (alpha_threshold == 255) ? 0 : 1;
gdk_gc_set_foreground (gc, &color);
@@ -102,8 +102,8 @@ gdk_pixbuf_render_threshold_alpha (GdkPixbuf *pixbuf,
for (y = 0; y < height; y++)
{
- p = (pixbuf->pixels + (y + src_y) * pixbuf->rowstride + src_x * pixbuf->n_channels
- + pixbuf->n_channels - 1);
+ p = (gdk_pixbuf_get_pixels (pixbuf) + (y + src_y) * gdk_pixbuf_get_rowstride (pixbuf) + src_x * gdk_pixbuf_get_n_channels (pixbuf)
+ + gdk_pixbuf_get_n_channels (pixbuf) - 1);
start = 0;
start_status = *p < alpha_threshold;
@@ -123,7 +123,7 @@ gdk_pixbuf_render_threshold_alpha (GdkPixbuf *pixbuf,
start_status = status;
}
- p += pixbuf->n_channels;
+ p += gdk_pixbuf_get_n_channels (pixbuf);
}
if (!start_status)
diff --git a/gdk/x11/Makefile.am b/gdk/x11/Makefile.am
index 5d41ec8..3ad1357 100644
--- a/gdk/x11/Makefile.am
+++ b/gdk/x11/Makefile.am
@@ -71,7 +71,7 @@ libgdkinclude_HEADERS = \
noinst_PROGRAMS = checksettings
-checksettings_LDADD = libgdk-x11.la $(GLIB_LIBS) $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la
+checksettings_LDADD = libgdk-x11.la $(GLIB_LIBS)
TESTS = checksettings
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index f17faf5..5023074 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -3,12 +3,10 @@ include $(top_srcdir)/Makefile.decl
-include $(INTROSPECTION_MAKEFILE)
INTROSPECTION_GIRS =
INTROSPECTION_SCANNER_ARGS = \
- --add-include-path=../gdk-pixbuf \
--add-include-path=../gdk
INTROSPECTION_COMPILER_ARGS = \
--includedir=$(srcdir) \
--includedir=. \
- --includedir=../gdk-pixbuf \
--includedir=../gdk
if USE_QUARTZ
@@ -50,7 +48,6 @@ INCLUDES = \
-I$(top_builddir)/gtk \
-I$(top_srcdir) -I../gdk \
-I$(top_srcdir)/gdk \
- -I$(top_srcdir)/gdk-pixbuf -I../gdk-pixbuf \
-DGDK_DISABLE_DEPRECATED \
-DGTK_DISABLE_DEPRECATED \
-DGTK_FILE_SYSTEM_ENABLE_UNSUPPORTED \
@@ -124,7 +121,6 @@ endif
libgtkincludedir = $(includedir)/gtk-2.0/gtk
libadd = \
- $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
$(top_builddir)/gdk/$(gdktargetlib) \
$(GTK_DEP_LIBS)
deps =
@@ -976,13 +972,12 @@ distclean-local:
rm -f $(MAINTAINERCLEANFILES); \
fi
-DEPS = $(gtktargetlib) $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la $(top_builddir)/gdk/$(gdktargetlib)
+DEPS = $(gtktargetlib) $(top_builddir)/gdk/$(gdktargetlib)
TEST_DEPS = $(DEPS) gtk.immodules
LDADDS = \
$(gtktargetlib) \
- $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
$(top_builddir)/gdk/$(gdktargetlib) \
$(GTK_DEP_LIBS)
@@ -1058,16 +1053,10 @@ endif
gtk_query_immodules_2_0_DEPENDENCIES = $(DEPS)
gtk_query_immodules_2_0_LDADD = $(LDADDS)
-
gtk_query_immodules_2_0_SOURCES = queryimmodules.c
-gtk_update_icon_cache_LDADD = \
- $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
- $(GDK_PIXBUF_DEP_LIBS)
-
-
-gtk_update_icon_cache_SOURCES = \
- updateiconcache.c
+gtk_update_icon_cache_LDADD = $(GDK_PIXBUF_LIBS)
+gtk_update_icon_cache_SOURCES = updateiconcache.c
.PHONY: files test test-debug
@@ -1372,7 +1361,6 @@ if CROSS_COMPILING
gtk_update_icon_cache_program = $(GTK_UPDATE_ICON_CACHE)
else
gtk_update_icon_cache_program = \
- GDK_PIXBUF_MODULE_FILE=$(top_builddir)/gdk-pixbuf/gdk-pixbuf.loaders \
./gtk-update-icon-cache
endif
diff --git a/gtk/tests/Makefile.am b/gtk/tests/Makefile.am
index d257f2b..5641a3b 100644
--- a/gtk/tests/Makefile.am
+++ b/gtk/tests/Makefile.am
@@ -10,12 +10,10 @@ INCLUDES = \
$(GTK_DEP_CFLAGS)
DEPS = \
- $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
$(top_builddir)/gdk/$(gdktargetlib) \
$(top_builddir)/gtk/$(gtktargetlib)
progs_ldadd = \
- $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
$(top_builddir)/gdk/$(gdktargetlib) \
$(top_builddir)/gtk/$(gtktargetlib) \
$(GTK_DEP_LIBS)
diff --git a/gtk/theme-bits/Makefile.am b/gtk/theme-bits/Makefile.am
index dee422e..0c6d3b2 100644
--- a/gtk/theme-bits/Makefile.am
+++ b/gtk/theme-bits/Makefile.am
@@ -3,12 +3,12 @@ include $(top_srcdir)/Makefile.decl
INCLUDES = \
-I$(top_srcdir) \
-I$(top_builddir) \
- $(GDK_PIXBUF_DEP_CFLAGS)
+ $(BASE_DEPENDENCIES_CFLAGS)
noinst_PROGRAMS = decompose-bits
decompose_bits_SOURCES = decompose-bits.c
-decompose_bits_LDADD = $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la $(GLIB_LIBS)
+decompose_bits_LDADD = $(BASE_DEPENDENCIES_LIBS)
EXTRA_DIST += check-13.png check-13-inconsistent.png radio-13.png radio-13-inconsistent.png
diff --git a/modules/engines/pixbuf/Makefile.am b/modules/engines/pixbuf/Makefile.am
index f90bdd5..4562db3 100644
--- a/modules/engines/pixbuf/Makefile.am
+++ b/modules/engines/pixbuf/Makefile.am
@@ -13,9 +13,8 @@ INCLUDES = \
LDADDS = \
$(GTK_DEP_LIBS) \
- $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-2.0.la \
$(top_builddir)/gdk/$(gdktargetlib) \
- $(top_builddir)/gtk/$(gtktargetlib)
+ $(top_builddir)/gtk/$(gtktargetlib)
enginedir = $(libdir)/gtk-2.0/$(GTK_BINARY_VERSION)/engines
diff --git a/modules/input/Makefile.am b/modules/input/Makefile.am
index 9a1bf2e..155b60e 100644
--- a/modules/input/Makefile.am
+++ b/modules/input/Makefile.am
@@ -17,12 +17,10 @@ INCLUDES = \
$(INCLUDED_IMMODULE_DEFINE)
DEPS = \
- $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
$(top_builddir)/gdk/$(gdktargetlib) \
$(top_builddir)/gtk/$(gtktargetlib)
LDADDS = \
- $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
$(top_builddir)/gdk/$(gdktargetlib) \
$(top_builddir)/gtk/$(gtktargetlib) \
$(GTK_DEP_LIBS)
diff --git a/modules/other/gail/Makefile.am b/modules/other/gail/Makefile.am
index 6ffe591..8272e3f 100644
--- a/modules/other/gail/Makefile.am
+++ b/modules/other/gail/Makefile.am
@@ -157,7 +157,6 @@ libgail_la_CFLAGS = \
$(AM_CFLAGS)
libgail_la_LIBADD = \
- $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
$(top_builddir)/gdk/$(gdktargetlib) \
$(top_builddir)/gtk/$(gtktargetlib) \
$(top_builddir)/modules/other/gail/libgail-util/libgailutil.la \
diff --git a/perf/Makefile.am b/perf/Makefile.am
index 5662b32..736b6cb 100644
--- a/perf/Makefile.am
+++ b/perf/Makefile.am
@@ -11,12 +11,10 @@ INCLUDES = \
$(GTK_DEP_CFLAGS)
DEPS = \
- $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
$(top_builddir)/gdk/$(gdktargetlib) \
$(top_builddir)/gtk/$(gtktargetlib)
LDADDS = \
- $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
$(top_builddir)/gdk/$(gdktargetlib) \
$(top_builddir)/gtk/$(gtktargetlib) \
$(GTK_DEP_LIBS)
diff --git a/po-properties/POTFILES.in b/po-properties/POTFILES.in
index 7d88064..9c762a9 100644
--- a/po-properties/POTFILES.in
+++ b/po-properties/POTFILES.in
@@ -1,29 +1,5 @@
# Files from the Gtk distribution which have already been
# marked to allow runtime translation of messages
-gdk-pixbuf/gdk-pixbuf-animation.c
-gdk-pixbuf/gdk-pixbuf-data.c
-gdk-pixbuf/gdk-pixbuf-io.c
-gdk-pixbuf/gdk-pixbuf-loader.c
-gdk-pixbuf/gdk-pixbuf-simple-anim.c
-gdk-pixbuf/gdk-pixbuf.c
-gdk-pixbuf/gdk-pixdata.c
-gdk-pixbuf/io-ani.c
-gdk-pixbuf/io-bmp.c
-gdk-pixbuf/io-gif.c
-gdk-pixbuf/io-icns.c
-gdk-pixbuf/io-ico.c
-gdk-pixbuf/io-jasper.c
-gdk-pixbuf/io-jpeg.c
-gdk-pixbuf/io-pcx.c
-gdk-pixbuf/io-png.c
-gdk-pixbuf/io-pnm.c
-gdk-pixbuf/io-qtif.c
-gdk-pixbuf/io-ras.c
-gdk-pixbuf/io-tga.c
-gdk-pixbuf/io-tiff.c
-gdk-pixbuf/io-wbmp.c
-gdk-pixbuf/io-xbm.c
-gdk-pixbuf/io-xpm.c
gdk/directfb/gdkdisplay-directfb.c
gdk/gdk.c
gdk/gdkdisplaymanager.c
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 50729d6..94143be 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -7,38 +7,6 @@ gdk/gdkpango.c
gdk/gdkscreen.c
gdk/gdkwindow.c
gdk/keyname-table.h
-gdk-pixbuf/gdk-pixbuf-animation.c
-gdk-pixbuf/gdk-pixbuf.c
-gdk-pixbuf/gdk-pixbuf-data.c
-gdk-pixbuf/gdk-pixbuf-io.c
-gdk-pixbuf/gdk-pixbuf-loader.c
-gdk-pixbuf/gdk-pixbuf-simple-anim.c
-gdk-pixbuf/gdk-pixdata.c
-gdk-pixbuf/io-ani.c
-gdk-pixbuf/io-bmp.c
-gdk-pixbuf/io-gif.c
-gdk-pixbuf/io-ico.c
-gdk-pixbuf/io-icns.c
-gdk-pixbuf/io-jasper.c
-gdk-pixbuf/io-jpeg.c
-gdk-pixbuf/io-pcx.c
-gdk-pixbuf/io-png.c
-gdk-pixbuf/io-pnm.c
-gdk-pixbuf/io-qtif.c
-gdk-pixbuf/io-ras.c
-gdk-pixbuf/io-tga.c
-gdk-pixbuf/io-tiff.c
-gdk-pixbuf/io-wbmp.c
-gdk-pixbuf/io-xbm.c
-gdk-pixbuf/io-xpm.c
-gdk-pixbuf/io-gdip-bmp.c
-gdk-pixbuf/io-gdip-emf.c
-gdk-pixbuf/io-gdip-gif.c
-gdk-pixbuf/io-gdip-ico.c
-gdk-pixbuf/io-gdip-jpeg.c
-gdk-pixbuf/io-gdip-png.c
-gdk-pixbuf/io-gdip-utils.c
-gdk-pixbuf/io-gdip-wmf.c
gdk/win32/gdkmain-win32.c
gdk/x11/gdkmain-x11.c
gdk/x11/gdkapplaunchcontext-x11.c
diff --git a/tests/Makefile.am b/tests/Makefile.am
index eeecc64..e1f6766 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -11,15 +11,14 @@ INCLUDES = \
$(GTK_DEP_CFLAGS)
DEPS = \
- $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
$(top_builddir)/gdk/$(gdktargetlib) \
$(top_builddir)/gtk/$(gtktargetlib)
LDADDS = \
- $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
$(top_builddir)/gdk/$(gdktargetlib) \
$(top_builddir)/gtk/$(gtktargetlib) \
- $(GTK_DEP_LIBS)
+ $(GTK_DEP_LIBS) \
+ -lm
if USE_X11
testsocket_programs = testsocket testsocket_child
@@ -86,11 +85,6 @@ noinst_PROGRAMS = $(TEST_PROGS) \
treestoretest \
testxinerama \
testwindows \
- pixbuf-read \
- pixbuf-lowmem \
- pixbuf-randomly-modified \
- pixbuf-random \
- pixbuf-threads \
testmerge \
testactions \
testgrouping \
@@ -234,11 +228,6 @@ testtreesort_LDADD = $(LDADDS)
testtext_LDADD = $(LDADDS)
treestoretest_LDADD = $(LDADDS)
testxinerama_LDADD = $(LDADDS)
-pixbuf_read_LDADD = $(LDADDS)
-pixbuf_lowmem_LDADD = $(LDADDS)
-pixbuf_randomly_modified_LDADD = $(LDADDS)
-pixbuf_random_LDADD = $(LDADDS)
-pixbuf_threads_LDADD = $(LDADDS) $(GLIB_LIBS)
testmerge_LDADD = $(LDADDS)
testactions_LDADD = $(LDADDS)
testgrouping_LDADD = $(LDADDS)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
