commit: c0495e1b9d8fc78413393580a4f0456629c442b4
parent 5612be33b1cf0c0657b77035c34bdb5d88ac09e2
Author: Michael Forney <mforney@mforney.org>
Date: Thu, 23 Apr 2020 00:32:23 -0700
pixman: Update to 0.40.0
Diffstat:
4 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/pkg/pixman/config.h b/pkg/pixman/config.h
@@ -33,10 +33,10 @@
#define PACKAGE "pixman"
#define PACKAGE_BUGREPORT "pixman@lists.freedesktop.org"
#define PACKAGE_NAME "pixman"
-#define PACKAGE_STRING "pixman 0.38.4"
+#define PACKAGE_STRING "pixman 0.40.0"
#define PACKAGE_TARNAME "pixman"
#define PACKAGE_URL ""
-#define PACKAGE_VERSION "0.38.4"
+#define PACKAGE_VERSION "0.40.0"
/* #undef PIXMAN_GNUPLOT */
/* #undef PIXMAN_TIMERS */
#define SIZEOF_LONG 8
@@ -53,7 +53,7 @@
/* #undef USE_MIPS_DSPR2 */
/* #undef USE_OPENMP */
/* #undef USE_VMX */
-#define VERSION "0.38.4"
+#define VERSION "0.40.0"
#if defined AC_APPLE_UNIVERSAL_BUILD
# if defined __BIG_ENDIAN__
# define WORDS_BIGENDIAN 1
diff --git a/pkg/pixman/gen.lua b/pkg/pixman/gen.lua
@@ -13,7 +13,7 @@ build('cat', '$outdir/config.h', {
build('sed', '$outdir/include/pixman-version.h', '$srcdir/pixman/pixman-version.h.in', {
expr={
'-e s,@PIXMAN_VERSION_MAJOR@,0,',
- '-e s,@PIXMAN_VERSION_MINOR@,38,',
+ '-e s,@PIXMAN_VERSION_MINOR@,40,',
'-e s,@PIXMAN_VERSION_MICRO@,0,',
},
})
diff --git a/pkg/pixman/patch/0001-Prevent-empty-top-level-declaration.patch b/pkg/pixman/patch/0001-Prevent-empty-top-level-declaration.patch
@@ -1,4 +1,4 @@
-From 66f8839181d4cf81efc9beb8bd85cb8263795b56 Mon Sep 17 00:00:00 2001
+From 76c1b0d85878fb3eb6cba54b5a67ad3df095bad7 Mon Sep 17 00:00:00 2001
From: Michael Forney <mforney@mforney.org>
Date: Thu, 11 Jul 2019 00:12:19 -0700
Subject: [PATCH] Prevent empty top-level declaration
@@ -13,10 +13,10 @@ empty top-level declaration, which is not allowed in ISO C.
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/pixman/pixman-compiler.h b/pixman/pixman-compiler.h
-index 2489adc..e96d81e 100644
+index a02aa49..6394156 100644
--- a/pixman/pixman-compiler.h
+++ b/pixman/pixman-compiler.h
-@@ -107,14 +107,14 @@
+@@ -109,14 +109,14 @@
#if defined(PIXMAN_NO_TLS)
# define PIXMAN_DEFINE_THREAD_LOCAL(type, name) \
@@ -33,7 +33,7 @@ index 2489adc..e96d81e 100644
# define PIXMAN_GET_THREAD_LOCAL(name) \
(&name)
-@@ -174,7 +174,7 @@
+@@ -176,7 +176,7 @@
#elif defined(_MSC_VER)
# define PIXMAN_DEFINE_THREAD_LOCAL(type, name) \
@@ -56,5 +56,5 @@ index 2c7de4c..5a2cbfe 100644
static void
dummy_composite_rect (pixman_implementation_t *imp,
--
-2.22.0
+2.26.2
diff --git a/pkg/pixman/ver b/pkg/pixman/ver
@@ -1 +1 @@
-0.38.4 r1
+0.40.0 r0
