pixman: Branch 'master' - 5 commits
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Sun Apr 19 22:02:02 UTC 2020
Makefile.am | 60 ++++++++++++++++++++++++------------------------
configure.ac | 6 ++--
meson.build | 2 -
pixman/Makefile.am | 1
pixman/Makefile.sources | 1
5 files changed, 36 insertions(+), 34 deletions(-)
New commits:
commit 10a057e27f3a256c3b3ffc4fa71c45b0bbb783f7
Author: Matt Turner <mattst88 at gmail.com>
Date: Sun Apr 19 15:01:30 2020 -0700
Post-release version bump to 0.40.1
Signed-off-by: Matt Turner <mattst88 at gmail.com>
diff --git a/configure.ac b/configure.ac
index 43e9b20..8231e67 100644
--- a/configure.ac
+++ b/configure.ac
@@ -54,7 +54,7 @@ AC_PREREQ([2.57])
m4_define([pixman_major], 0)
m4_define([pixman_minor], 40)
-m4_define([pixman_micro], 0)
+m4_define([pixman_micro], 1)
m4_define([pixman_version],[pixman_major.pixman_minor.pixman_micro])
diff --git a/meson.build b/meson.build
index 1cec227..5d65417 100644
--- a/meson.build
+++ b/meson.build
@@ -21,7 +21,7 @@
project(
'pixman',
['c'],
- version : '0.40.0',
+ version : '0.40.1',
license : 'MIT',
meson_version : '>= 0.50.0',
default_options : ['buildtype=debugoptimized'],
commit 244383bf9f3493c014985de46876e40fd5db43f3
Author: Matt Turner <mattst88 at gmail.com>
Date: Sun Apr 19 14:37:14 2020 -0700
Pre-release version bump to 0.40.0
Signed-off-by: Matt Turner <mattst88 at gmail.com>
diff --git a/configure.ac b/configure.ac
index 90a6035..43e9b20 100644
--- a/configure.ac
+++ b/configure.ac
@@ -53,8 +53,8 @@ AC_PREREQ([2.57])
#
m4_define([pixman_major], 0)
-m4_define([pixman_minor], 38)
-m4_define([pixman_micro], 5)
+m4_define([pixman_minor], 40)
+m4_define([pixman_micro], 0)
m4_define([pixman_version],[pixman_major.pixman_minor.pixman_micro])
diff --git a/meson.build b/meson.build
index a45c969..1cec227 100644
--- a/meson.build
+++ b/meson.build
@@ -21,7 +21,7 @@
project(
'pixman',
['c'],
- version : '0.38.5',
+ version : '0.40.0',
license : 'MIT',
meson_version : '>= 0.50.0',
default_options : ['buildtype=debugoptimized'],
commit 405f26068caed14c0259981085928e617f5facc6
Author: Matt Turner <mattst88 at gmail.com>
Date: Sun Apr 19 14:51:51 2020 -0700
Move from MD5/SHA1 to SHA256/SHA512 digests
Signed-off-by: Matt Turner <mattst88 at gmail.com>
diff --git a/Makefile.am b/Makefile.am
index b451a50..dccbf16 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -33,31 +33,31 @@ EXTRA_DIST = \
tar_gz = $(PACKAGE)-$(VERSION).tar.gz
tar_xz = $(PACKAGE)-$(VERSION).tar.xz
-sha1_tgz = $(tar_gz).sha1
-md5_tgz = $(tar_gz).md5
+sha512_tgz = $(tar_gz).sha512
+sha256_tgz = $(tar_gz).sha256
-sha1_txz = $(tar_xz).sha1
-md5_txz = $(tar_xz).md5
+sha512_txz = $(tar_xz).sha512
+sha256_txz = $(tar_xz).sha256
-gpg_file = $(sha1_tgz).asc
+gpg_file = $(sha512_tgz).asc
-$(sha1_tgz): $(tar_gz)
- sha1sum $^ > $@
+$(sha512_tgz): $(tar_gz)
+ sha512sum $^ > $@
-$(md5_tgz): $(tar_gz)
- md5sum $^ > $@
+$(sha256_tgz): $(tar_gz)
+ sha256sum $^ > $@
-$(sha1_txz): $(tar_xz)
- sha1sum $^ > $@
+$(sha512_txz): $(tar_xz)
+ sha512sum $^ > $@
-$(md5_txz): $(tar_xz)
- md5sum $^ > $@
+$(sha256_txz): $(tar_xz)
+ sha256sum $^ > $@
-$(gpg_file): $(sha1_tgz)
+$(gpg_file): $(sha512_tgz)
@echo "Please enter your GPG password to sign the checksum."
gpg --armor --sign $^
-HASHFILES = $(sha1_tgz) $(sha1_txz) $(md5_tgz) $(md5_txz)
+HASHFILES = $(sha512_tgz) $(sha512_txz) $(sha256_tgz) $(sha256_txz)
release-verify-newer:
@echo -n "Checking that no $(VERSION) release already exists at $(RELEASE_XORG_HOST)..."
@@ -91,8 +91,8 @@ release-check: ensure-prev release-verify-newer release-remove-old distcheck
release-tag:
git tag -u $(GPGKEY) -m "$(PACKAGE) $(VERSION) release" $(PACKAGE)-$(VERSION)
-release-upload: release-check $(tar_gz) $(tar_xz) $(sha1_tgz) $(sha1_txz) $(md5_tgz) $(gpg_file)
- scp $(tar_gz) $(sha1_tgz) $(gpg_file) $(RELEASE_CAIRO_HOST):$(RELEASE_CAIRO_DIR)
+release-upload: release-check $(tar_gz) $(tar_xz) $(sha512_tgz) $(sha512_txz) $(sha256_tgz) $(gpg_file)
+ scp $(tar_gz) $(sha512_tgz) $(gpg_file) $(RELEASE_CAIRO_HOST):$(RELEASE_CAIRO_DIR)
scp $(tar_gz) $(tar_xz) $(RELEASE_XORG_HOST):$(RELEASE_XORG_DIR)
ssh $(RELEASE_CAIRO_HOST) "rm -f $(RELEASE_CAIRO_DIR)/LATEST-$(PACKAGE)-[0-9]* && ln -s $(tar_gz) $(RELEASE_CAIRO_DIR)/LATEST-$(PACKAGE)-$(VERSION)"
@@ -115,14 +115,14 @@ release-publish-message: $(HASHFILES) ensure-prev
@echo " $(RELEASE_XORG_URL)/$(tar_xz)"
@echo ""
@echo "Hashes:"
- @echo -n " MD5: "
- @cat $(md5_tgz)
- @echo -n " MD5: "
- @cat $(md5_txz)
- @echo -n " SHA1: "
- @cat $(sha1_tgz)
- @echo -n " SHA1: "
- @cat $(sha1_txz)
+ @echo -n " SHA256: "
+ @cat $(sha256_tgz)
+ @echo -n " SHA256: "
+ @cat $(sha256_txz)
+ @echo -n " SHA512: "
+ @cat $(sha512_tgz)
+ @echo -n " SHA512: "
+ @cat $(sha512_txz)
@echo ""
@echo "GPG signature:"
@echo " $(RELEASE_CAIRO_URL)/$(gpg_file)"
commit 88b167d18c98dd64bb5934ebd9c7e627923bdc8b
Author: Matt Turner <mattst88 at gmail.com>
Date: Sun Apr 19 14:46:34 2020 -0700
Build xz tarballs instead of bzip2
Signed-off-by: Matt Turner <mattst88 at gmail.com>
diff --git a/Makefile.am b/Makefile.am
index e33b2b9..b451a50 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -31,13 +31,13 @@ EXTRA_DIST = \
$(NULL)
tar_gz = $(PACKAGE)-$(VERSION).tar.gz
-tar_bz2 = $(PACKAGE)-$(VERSION).tar.bz2
+tar_xz = $(PACKAGE)-$(VERSION).tar.xz
sha1_tgz = $(tar_gz).sha1
md5_tgz = $(tar_gz).md5
-sha1_tbz2 = $(tar_bz2).sha1
-md5_tbz2 = $(tar_bz2).md5
+sha1_txz = $(tar_xz).sha1
+md5_txz = $(tar_xz).md5
gpg_file = $(sha1_tgz).asc
@@ -47,17 +47,17 @@ $(sha1_tgz): $(tar_gz)
$(md5_tgz): $(tar_gz)
md5sum $^ > $@
-$(sha1_tbz2): $(tar_bz2)
+$(sha1_txz): $(tar_xz)
sha1sum $^ > $@
-$(md5_tbz2): $(tar_bz2)
+$(md5_txz): $(tar_xz)
md5sum $^ > $@
$(gpg_file): $(sha1_tgz)
@echo "Please enter your GPG password to sign the checksum."
gpg --armor --sign $^
-HASHFILES = $(sha1_tgz) $(sha1_tbz2) $(md5_tgz) $(md5_tbz2)
+HASHFILES = $(sha1_tgz) $(sha1_txz) $(md5_tgz) $(md5_txz)
release-verify-newer:
@echo -n "Checking that no $(VERSION) release already exists at $(RELEASE_XORG_HOST)..."
@@ -72,7 +72,7 @@ release-verify-newer:
@echo "Good."
release-remove-old:
- $(RM) $(tar_gz) $(tar_bz2) $(HASHFILES) $(gpg_file)
+ $(RM) $(tar_gz) $(tar_xz) $(HASHFILES) $(gpg_file)
ensure-prev:
@if [[ "$(PREV)" == "" ]]; then \
@@ -91,9 +91,9 @@ release-check: ensure-prev release-verify-newer release-remove-old distcheck
release-tag:
git tag -u $(GPGKEY) -m "$(PACKAGE) $(VERSION) release" $(PACKAGE)-$(VERSION)
-release-upload: release-check $(tar_gz) $(tar_bz2) $(sha1_tgz) $(sha1_tbz2) $(md5_tgz) $(gpg_file)
+release-upload: release-check $(tar_gz) $(tar_xz) $(sha1_tgz) $(sha1_txz) $(md5_tgz) $(gpg_file)
scp $(tar_gz) $(sha1_tgz) $(gpg_file) $(RELEASE_CAIRO_HOST):$(RELEASE_CAIRO_DIR)
- scp $(tar_gz) $(tar_bz2) $(RELEASE_XORG_HOST):$(RELEASE_XORG_DIR)
+ scp $(tar_gz) $(tar_xz) $(RELEASE_XORG_HOST):$(RELEASE_XORG_DIR)
ssh $(RELEASE_CAIRO_HOST) "rm -f $(RELEASE_CAIRO_DIR)/LATEST-$(PACKAGE)-[0-9]* && ln -s $(tar_gz) $(RELEASE_CAIRO_DIR)/LATEST-$(PACKAGE)-$(VERSION)"
RELEASE_TYPE = $$(if test "x$(PIXMAN_VERSION_MINOR)" = "x$$(echo "$(PIXMAN_VERSION_MINOR)/2*2" | bc)" ; then echo "stable release in the" ; else echo "development snapshot leading up to a stable"; fi)
@@ -111,18 +111,18 @@ release-publish-message: $(HASHFILES) ensure-prev
@echo " $(RELEASE_CAIRO_URL)/$(tar_gz)"
@echo " $(RELEASE_XORG_URL)/$(tar_gz)"
@echo ""
- @echo "tar.bz2:"
- @echo " $(RELEASE_XORG_URL)/$(tar_bz2)"
+ @echo "tar.xz:"
+ @echo " $(RELEASE_XORG_URL)/$(tar_xz)"
@echo ""
@echo "Hashes:"
@echo -n " MD5: "
@cat $(md5_tgz)
@echo -n " MD5: "
- @cat $(md5_tbz2)
+ @cat $(md5_txz)
@echo -n " SHA1: "
@cat $(sha1_tgz)
@echo -n " SHA1: "
- @cat $(sha1_tbz2)
+ @cat $(sha1_txz)
@echo ""
@echo "GPG signature:"
@echo " $(RELEASE_CAIRO_URL)/$(gpg_file)"
diff --git a/configure.ac b/configure.ac
index fd7df47..90a6035 100644
--- a/configure.ac
+++ b/configure.ac
@@ -59,7 +59,7 @@ m4_define([pixman_micro], 5)
m4_define([pixman_version],[pixman_major.pixman_minor.pixman_micro])
AC_INIT(pixman, pixman_version, [pixman at lists.freedesktop.org], pixman)
-AM_INIT_AUTOMAKE([foreign dist-bzip2])
+AM_INIT_AUTOMAKE([foreign dist-xz])
# Suppress verbose compile lines
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
commit 54a13221ee74cd59a40943ae060840a4b0e9cd48
Author: Matt Turner <mattst88 at gmail.com>
Date: Sun Apr 19 14:45:23 2020 -0700
Distribute the blue-noise files
Signed-off-by: Matt Turner <mattst88 at gmail.com>
diff --git a/pixman/Makefile.am b/pixman/Makefile.am
index 3de2615..8f780a1 100644
--- a/pixman/Makefile.am
+++ b/pixman/Makefile.am
@@ -12,6 +12,7 @@ noinst_LTLIBRARIES =
EXTRA_DIST = \
Makefile.win32 \
+ dither/make-blue-noise.c \
pixman-region.c \
solaris-hwcap.mapfile \
meson.build \
diff --git a/pixman/Makefile.sources b/pixman/Makefile.sources
index c624eb9..23d1d97 100644
--- a/pixman/Makefile.sources
+++ b/pixman/Makefile.sources
@@ -32,6 +32,7 @@ libpixman_sources = \
$(NULL)
libpixman_headers = \
+ dither/blue-noise-64x64.h \
pixman.h \
pixman-accessor.h \
pixman-combine32.h \
More information about the xorg-commit
mailing list