pixman: Changes to 'upstream-experimental'
Makefile.am | 4 ++--
configure.ac | 45 +++++++++++++++++++++++++++++++++++++++++++--
pixman-1.pc.in | 11 +++++++++++
pixman.pc.in | 11 -----------
pixman/Makefile.am | 11 ++++++-----
pixman/pixman-image.c | 7 ++++++-
pixman/pixman.h | 3 ++-
test/Makefile.am | 4 ++--
8 files changed, 72 insertions(+), 24 deletions(-)
New commits:
commit 43370d1ce793ef2754c2e6f0fc08e534d4247793
Author: Eric Anholt <eric@anholt.net>
Date: Mon Aug 6 20:06:48 2007 -0700
Update .pc file for library version name change.
diff --git a/pixman-1.pc.in b/pixman-1.pc.in
index 4cf163a..936d95d 100644
--- a/pixman-1.pc.in
+++ b/pixman-1.pc.in
@@ -7,5 +7,5 @@ Name: Pixman
Description: The pixman library (version 1)
Version: @PACKAGE_VERSION@
Cflags: -I${includedir}/pixman-1 @DEP_CFLAGS@
-Libs: -L${libdir} -lpixman @DEP_LIBS@
+Libs: -L${libdir} -lpixman-1 @DEP_LIBS@
commit 778a3f9d7136de062806473dd3604eb03ba5d866
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Wed Aug 1 14:16:55 2007 -0700
Return a bool from pixman_image_unref.
Returns TRUE when the refcount reaches 0 and the image is freed.
diff --git a/pixman/pixman-image.c b/pixman/pixman-image.c
index ca186a3..2cbf88c 100644
--- a/pixman/pixman-image.c
+++ b/pixman/pixman-image.c
@@ -106,7 +106,8 @@ pixman_image_ref (pixman_image_t *image)
return image;
}
-void
+/* returns TRUE when the image is freed */
+pixman_bool_t
pixman_image_unref (pixman_image_t *image)
{
image_common_t *common = (image_common_t *)image;
@@ -146,7 +147,11 @@ pixman_image_unref (pixman_image_t *image)
free (image->bits.free_me);
free (image);
+
+ return TRUE;
}
+
+ return FALSE;
}
/* Constructors */
diff --git a/pixman/pixman.h b/pixman/pixman.h
index 74358e0..ae5aa7a 100644
--- a/pixman/pixman.h
+++ b/pixman/pixman.h
@@ -451,7 +451,7 @@ pixman_image_t *pixman_image_create_bits (pixman_format_code_t
/* Destructor */
pixman_image_t *pixman_image_ref (pixman_image_t *image);
-void pixman_image_unref (pixman_image_t *image);
+pixman_bool_t pixman_image_unref (pixman_image_t *image);
/* Set properties */
commit 4838e2e9d9635883841e692a7074bcb2be96dcf5
Author: Søren Sandmann Pedersen <sandmann@redhat.com>
Date: Mon Aug 6 17:28:06 2007 -0400
Bump version number; fix typo in configure.ac
diff --git a/configure.ac b/configure.ac
index 518e7e8..2a0eb63 100644
--- a/configure.ac
+++ b/configure.ac
@@ -42,7 +42,7 @@ AC_PREREQ([2.57])
m4_define([pixman_major], 0)
m4_define([pixman_minor], 9)
-m4_define([pixman_micro], 3)
+m4_define([pixman_micro], 4)
m4_define([pixman_version],[pixman_major.pixman_minor.pixman_micro])
@@ -62,7 +62,7 @@ AC_C_BIGENDIAN
#
# pixman-$(pixman_major).0.minor.micro
#
-m4_define([lt_current], [pixman_minor)])
+m4_define([lt_current], [pixman_minor])
m4_define([lt_revision], [pixman_micro])
m4_define([lt_age], [pixman_minor])
commit 7b3c9cef49cdedef03112054925005fa21120bd5
Author: Søren Sandmann Pedersen <sandmann@redhat.com>
Date: Mon Aug 6 17:24:44 2007 -0400
Change the library name to pixman-1
Set the soname to something based on the library version.
diff --git a/Makefile.am b/Makefile.am
index 25be5f3..70035a1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
SUBDIRS = pixman test
pkgconfigdir=$(libdir)/pkgconfig
-pkgconfig_DATA=pixman.pc
+pkgconfig_DATA=pixman-1.pc
-$(pkgconfig_DATA): pixman.pc.in
+$(pkgconfig_DATA): pixman-1.pc.in
diff --git a/configure.ac b/configure.ac
index b759c7f..518e7e8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,31 @@ dnl Process this file with autoconf to create configure.
AC_PREREQ([2.57])
-AC_INIT(pixman, 0.9.3, "sandmann@daimi.au.dk", pixman)
+# Pixman versioning scheme
+#
+# - If the changes don't affect API or ABI, then increment pixman_micro
+# - If API is added, then increment PIXMAN_MINOR, and set MICRO to 0
+#
+# - If you break ABI, then
+# - In the first development release where you break ABI, find all instances of
+# "pixman-n" and change it to pixman-(n+1)
+#
+# This needs to be done at least in
+# configure.ac
+# all Makefile.am's
+# pixman-n.pc.in
+#
+# This ensures that binary incompatible versions can be installed in parallel.
+# See http://www106.pair.com/rhp/parallel.html for more information
+#
+
+m4_define([pixman_major], 0)
+m4_define([pixman_minor], 9)
+m4_define([pixman_micro], 3)
+
+m4_define([pixman_version],[pixman_major.pixman_minor.pixman_micro])
+
+AC_INIT(pixman, pixman_version, "sandmann@daimi.au.dk", pixman)
AM_INIT_AUTOMAKE([dist-bzip2])
AM_CONFIG_HEADER(config.h)
@@ -32,6 +56,23 @@ AC_PROG_LIBTOOL
AC_CHECK_FUNCS([getisax])
AC_C_BIGENDIAN
+#
+# We ignore pixman_major in the version here because the major version should
+# always be encoded in the actual library name. Ie., the soname is:
+#
+# pixman-$(pixman_major).0.minor.micro
+#
+m4_define([lt_current], [pixman_minor)])
+m4_define([lt_revision], [pixman_micro])
+m4_define([lt_age], [pixman_minor])
+
+LT_VERSION_INFO="lt_current:lt_revision:lt_age"
+
+PIXMAN_MAJOR=pixman_major
+AC_SUBST(AC_MAJOR)
+
+AC_SUBST(LT_VERSION_INFO)
+
# Check for dependencies
#PKG_CHECK_MODULES(DEP, x11)
@@ -84,7 +125,7 @@ AC_SUBST(GTK_LIBS)
AC_SUBST(DEP_CFLAGS)
AC_SUBST(DEP_LIBS)
-AC_OUTPUT([pixman.pc
+AC_OUTPUT([pixman-1.pc
Makefile
pixman/Makefile
test/Makefile])
diff --git a/pixman-1.pc.in b/pixman-1.pc.in
new file mode 100644
index 0000000..4cf163a
--- /dev/null
+++ b/pixman-1.pc.in
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: Pixman
+Description: The pixman library (version 1)
+Version: @PACKAGE_VERSION@
+Cflags: -I${includedir}/pixman-1 @DEP_CFLAGS@
+Libs: -L${libdir} -lpixman @DEP_LIBS@
+
diff --git a/pixman.pc.in b/pixman.pc.in
deleted file mode 100644
index 08c3abf..0000000
--- a/pixman.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: Pixman
-Description: The pixman library
-Version: @PACKAGE_VERSION@
-Cflags: -I${includedir} @DEP_CFLAGS@
-Libs: -L${libdir} -lpixman @DEP_LIBS@
-
diff --git a/pixman/Makefile.am b/pixman/Makefile.am
index 90c6436..708e0dd 100644
--- a/pixman/Makefile.am
+++ b/pixman/Makefile.am
@@ -1,6 +1,7 @@
-lib_LTLIBRARIES = libpixman.la
-libpixman_la_LIBADD = @DEP_LIBS@ -lm libpixmanwrapper.la
-libpixman_la_SOURCES = \
+lib_LTLIBRARIES = libpixman-1.la
+libpixman_1_la_LDFLAGS = -version-info $(LT_VERSION_INFO)
+libpixman_1_la_LIBADD = @DEP_LIBS@ -lm libpixmanwrapper.la
+libpixman_1_la_SOURCES = \
pixman.h \
pixman-region.c \
pixman-private.h \
@@ -14,7 +15,7 @@ libpixman_la_SOURCES = \
pixman-compute-region.c \
pixman-timer.c
-libpixmanincludedir = $(includedir)/pixman
+libpixmanincludedir = $(includedir)/pixman-1/
libpixmaninclude_HEADERS = pixman.h
# wrapper library
@@ -34,5 +35,5 @@ libpixman_mmx_la_SOURCES = \
pixman-mmx.h
libpixman_mmx_la_CFLAGS = $(DEP_CFLAGS) $(MMX_CFLAGS)
libpixman_mmx_la_LIBADD = $(DEP_LIBS)
-libpixman_la_LIBADD += libpixman-mmx.la
+libpixman_1_la_LIBADD += libpixman-mmx.la
endif
diff --git a/test/Makefile.am b/test/Makefile.am
index 6389b5b..6548ba5 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -7,7 +7,7 @@ noinst_PROGRAMS = $(TESTPROGRAMS)
INCLUDES = -I$(top_srcdir)/pixman $(GTK_CFLAGS)
-composite_test_LDADD = $(top_builddir)/pixman/libpixman.la $(GTK_LIBS)
-gradient_test_LDADD = $(top_builddir)/pixman/libpixman.la $(GTK_LIBS)
+composite_test_LDADD = $(top_builddir)/pixman/libpixman-1.la $(GTK_LIBS)
+gradient_test_LDADD = $(top_builddir)/pixman/libpixman-1.la $(GTK_LIBS)
endif
\ No newline at end of file
commit 19c46bf18b9cf6694fa3de9c836a3d1eed6c6dac
Author: Vladimir Vukicevic <vladimir@pobox.com>
Date: Fri Aug 3 15:24:03 2007 -0700
Fix OpenSolaris compilation
diff --git a/pixman/pixman.h b/pixman/pixman.h
index bd6045f..74358e0 100644
--- a/pixman/pixman.h
+++ b/pixman/pixman.h
@@ -74,6 +74,7 @@ SOFTWARE.
*/
#if defined (__SVR4) && defined (__sun)
# include <sys/int_types.h>
+# include <stdint.h>
#elif defined (__OpenBSD__)
# include <inttypes.h>
#elif defined (_MSC_VER)
Reply to: