pixman: Branch 'master' - 4 commits
Søren Sandmann Pedersen
sandmann at kemper.freedesktop.org
Tue Mar 25 23:21:44 PDT 2008
TODO | 4 ++
configure.ac | 33 +++++++++++++-------
pixman/Makefile.am | 38 +++++++++++------------
pixman/pixman-utils.c | 43 ++++++++++++++++++++++++++
pixman/pixman-version.c | 73 ---------------------------------------------
pixman/pixman-version.h.in | 4 ++
6 files changed, 92 insertions(+), 103 deletions(-)
New commits:
commit eec44d371f278ee1f7de03d1a0fcaa17941c8a00
Author: Søren Sandmann <sandmann at redhat.com>
Date: Wed Mar 26 02:20:42 2008 -0400
Make it distcheck
diff --git a/pixman/Makefile.am b/pixman/Makefile.am
index a4eacaa..251fef9 100644
--- a/pixman/Makefile.am
+++ b/pixman/Makefile.am
@@ -2,33 +2,34 @@ lib_LTLIBRARIES = libpixman-1.la
libpixman_1_la_LDFLAGS = -version-info $(LT_VERSION_INFO)
libpixman_1_la_LIBADD = @DEP_LIBS@ -lm
libpixman_1_la_SOURCES = \
- pixman.h \
- pixman-access.c \
+ pixman.h \
+ pixman-access.c \
pixman-access-accessors.c \
- pixman-region.c \
- pixman-private.h \
- pixman-image.c \
- pixman-combine.c \
- pixman-compose.c \
+ pixman-region.c \
+ pixman-private.h \
+ pixman-image.c \
+ pixman-combine.c \
+ pixman-compose.c \
pixman-compose-accessors.c \
- pixman-pict.c \
- pixman-source.c \
- pixman-transformed.c \
+ pixman-pict.c \
+ pixman-source.c \
+ pixman-transformed.c \
pixman-transformed-accessors.c \
- pixman-utils.c \
- pixman-edge.c \
+ pixman-utils.c \
+ pixman-edge.c \
pixman-edge-accessors.c \
- pixman-edge-imp.h \
- pixman-trap.c \
- pixman-compute-region.c \
+ pixman-edge-imp.h \
+ pixman-trap.c \
+ pixman-compute-region.c \
pixman-timer.c
libpixmanincludedir = $(includedir)/pixman-1/
libpixmaninclude_HEADERS = pixman.h pixman-version.h
+noinst_LTLIBRARIES =
# mmx code
if USE_MMX
-noinst_LTLIBRARIES = libpixman-mmx.la
+noinst_LTLIBRARIES += libpixman-mmx.la
libpixman_mmx_la_SOURCES = \
pixman-mmx.c \
pixman-mmx.h
@@ -40,7 +41,7 @@ endif
# sse2 code
if USE_SSE2
-noinst_LTLIBRARIES = libpixman-sse.la
+noinst_LTLIBRARIES += libpixman-sse.la
libpixman_sse_la_SOURCES = \
pixman-sse.c \
pixman-sse.h
commit 03b9c143770566ebcbee7ca3abde223529c07ce9
Author: Søren Sandmann <sandmann at redhat.com>
Date: Wed Mar 26 01:49:56 2008 -0400
Move version functions from pixman-version.c into pixman-utils.c.
Delete pixman-version.c
diff --git a/configure.ac b/configure.ac
index e39f4c0..f0563ac 100644
--- a/configure.ac
+++ b/configure.ac
@@ -24,25 +24,36 @@ AC_PREREQ([2.57])
# Pixman versioning scheme
#
-# - If the changes don't affect API or ABI, then increment pixman_micro
-# Note: This number is incremented immediately before *and*
-# immediately after a release. This gurantees that the micro
-# component is always an even number in any release.
+# - The git version must at all times have an odd MICRO version
+# number.
#
-# - If API is added, then increment PIXMAN_MINOR, and set MICRO to 0
+# - If you add API, increment the MICRO version to the next largest
+# odd number.
#
-# - 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)
+# - If you release a version that contains new API, then increment
+# MINOR and set MICRO to 0.
+#
+# - If you release a new version that does not contain new API, then
+# increment MICRO to the next even number.
+#
+# - After doing a release, increment MICRO again to make the version
+# number in git odd.
+#
+# - If you break the ABI, then
+#
+# - increment MAJOR
+#
+# - In the first development release where you break ABI, find
+# all instances of "pixman-n" and change them 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
-#
+# 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)
diff --git a/pixman/Makefile.am b/pixman/Makefile.am
index ff3997b..a4eacaa 100644
--- a/pixman/Makefile.am
+++ b/pixman/Makefile.am
@@ -21,8 +21,7 @@ libpixman_1_la_SOURCES = \
pixman-edge-imp.h \
pixman-trap.c \
pixman-compute-region.c \
- pixman-timer.c \
- pixman-version.c
+ pixman-timer.c
libpixmanincludedir = $(includedir)/pixman-1/
libpixmaninclude_HEADERS = pixman.h pixman-version.h
diff --git a/pixman/pixman-utils.c b/pixman/pixman-utils.c
index 9cba793..b100d09 100644
--- a/pixman/pixman-utils.c
+++ b/pixman/pixman-utils.c
@@ -408,6 +408,49 @@ pixman_malloc_abc (unsigned int a,
return malloc (a * b * c);
}
+
+/**
+ * pixman_version:
+ *
+ * Returns the version of the pixman library encoded in a single
+ * integer as per %PIXMAN_VERSION_ENCODE. The encoding ensures that
+ * later versions compare greater than earlier versions.
+ *
+ * A run-time comparison to check that pixman's version is greater than
+ * or equal to version X.Y.Z could be performed as follows:
+ *
+ * <informalexample><programlisting>
+ * if (pixman_version() >= PIXMAN_VERSION_ENCODE(X,Y,Z)) {...}
+ * </programlisting></informalexample>
+ *
+ * See also pixman_version_string() as well as the compile-time
+ * equivalents %PIXMAN_VERSION and %PIXMAN_VERSION_STRING.
+ *
+ * Return value: the encoded version.
+ **/
+int
+pixman_version (void)
+{
+ return PIXMAN_VERSION;
+}
+
+/**
+ * pixman_version_string:
+ *
+ * Returns the version of the pixman library as a human-readable string
+ * of the form "X.Y.Z".
+ *
+ * See also pixman_version() as well as the compile-time equivalents
+ * %PIXMAN_VERSION_STRING and %PIXMAN_VERSION.
+ *
+ * Return value: a string containing the version.
+ **/
+const char*
+pixman_version_string (void)
+{
+ return PIXMAN_VERSION_STRING;
+}
+
/**
* pixman_format_supported_destination:
* @format: A pixman_format_code_t format
diff --git a/pixman/pixman-version.c b/pixman/pixman-version.c
deleted file mode 100644
index 58ac057..0000000
--- a/pixman/pixman-version.c
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright © 2008 Red Hat, Inc.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use, copy,
- * modify, merge, publish, distribute, sublicense, and/or sell copies
- * of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- * Author: Carl D. Worth <cworth at cworth.org>
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include "pixman-private.h"
-
-/**
- * pixman_version:
- *
- * Returns the version of the pixman library encoded in a single
- * integer as per %PIXMAN_VERSION_ENCODE. The encoding ensures that
- * later versions compare greater than earlier versions.
- *
- * A run-time comparison to check that pixman's version is greater than
- * or equal to version X.Y.Z could be performed as follows:
- *
- * <informalexample><programlisting>
- * if (pixman_version() >= PIXMAN_VERSION_ENCODE(X,Y,Z)) {...}
- * </programlisting></informalexample>
- *
- * See also pixman_version_string() as well as the compile-time
- * equivalents %PIXMAN_VERSION and %PIXMAN_VERSION_STRING.
- *
- * Return value: the encoded version.
- **/
-int
-pixman_version (void)
-{
- return PIXMAN_VERSION;
-}
-
-/**
- * pixman_version_string:
- *
- * Returns the version of the pixman library as a human-readable string
- * of the form "X.Y.Z".
- *
- * See also pixman_version() as well as the compile-time equivalents
- * %PIXMAN_VERSION_STRING and %PIXMAN_VERSION.
- *
- * Return value: a string containing the version.
- **/
-const char*
-pixman_version_string (void)
-{
- return PIXMAN_VERSION_STRING;
-}
commit cb7fceabb9da30d03b29f9ff946a3793a1b9ebab
Author: Søren Sandmann <sandmann at redhat.com>
Date: Tue Mar 25 23:11:19 2008 -0400
Make pixman-version.h print an error if you include it by itself
diff --git a/pixman/pixman-version.h.in b/pixman/pixman-version.h.in
index ce86312..256b2e6 100644
--- a/pixman/pixman-version.h.in
+++ b/pixman/pixman-version.h.in
@@ -27,6 +27,10 @@
#ifndef PIXMAN_VERSION_H__
#define PIXMAN_VERSION_H__
+#ifndef PIXMAN_H__
+# error pixman-version.h should only be included by pixman.h
+#endif
+
#define PIXMAN_VERSION_MAJOR @PIXMAN_VERSION_MAJOR@
#define PIXMAN_VERSION_MINOR @PIXMAN_VERSION_MINOR@
#define PIXMAN_VERSION_MICRO @PIXMAN_VERSION_MICRO@
commit 0982adf0794507899f642bdb55f3a979d6cc486e
Author: Søren Sandmann <sandmann at redhat.com>
Date: Tue Mar 25 23:07:03 2008 -0400
Update TODO
diff --git a/TODO b/TODO
index 184f823..e1ee318 100644
--- a/TODO
+++ b/TODO
@@ -21,6 +21,10 @@
- There should only be one trap rasterization API.
+ - The PIXMAN_g8/c8/etc formats should use the A channel
+ to indicate the actual depth. That way PIXMAN_x4c4 and PIXMAN_c8
+ won't collide.
+
- Make pixman_region_point_in() survive a NULL box, then fix up
pixman-compose.c
More information about the xorg-commit
mailing list