[arch-commits] Commit in colord/trunk (2 files)

[Jan Steffens]

    Date: Saturday, April 21, 2018 @ 19:58:15
  Author: heftig
Revision: 322772

1.4.3-1

Modified:
  colord/trunk/PKGBUILD
Deleted:
  colord/trunk/0001-Make-cd_color_get_blackbody_rgb_full-safer.patch

-------------------------------------------------------+
 0001-Make-cd_color_get_blackbody_rgb_full-safer.patch |   68 ----------------
 PKGBUILD                                              |   25 ++---
 2 files changed, 11 insertions(+), 82 deletions(-)

Deleted: 0001-Make-cd_color_get_blackbody_rgb_full-safer.patch
===================================================================
--- 0001-Make-cd_color_get_blackbody_rgb_full-safer.patch	2018-04-21 18:33:28 UTC (rev 322771)
+++ 0001-Make-cd_color_get_blackbody_rgb_full-safer.patch	2018-04-21 19:58:15 UTC (rev 322772)
@@ -1,68 +0,0 @@
-From 6d7a6ae89bd12640e863a10fc88b6678f9dc9477 Mon Sep 17 00:00:00 2001
-Message-Id: <6d7a6ae89bd12640e863a10fc88b6678f9dc9477.1513518702.git.jan.steffens at gmail.com>
-From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
-Date: Sat, 16 Dec 2017 04:18:01 +0100
-Subject: [PATCH] Make cd_color_get_blackbody_rgb_full safer
-
-Validate arguments. If temp is divisible by 100, avoid interpolation
-because it accesses beyond the data for temp == 10000.
----
- lib/colord/cd-color.c | 23 +++++++++++++++--------
- 1 file changed, 15 insertions(+), 8 deletions(-)
-
-diff --git a/lib/colord/cd-color.c b/lib/colord/cd-color.c
-index 6062595187616846..9960e7ecd247a289 100644
---- a/lib/colord/cd-color.c
-+++ b/lib/colord/cd-color.c
-@@ -1444,33 +1444,40 @@ cd_color_get_blackbody_rgb_full (gdouble temp,
- 				 CdColorBlackbodyFlags flags)
- {
- 	gboolean ret = TRUE;
--	gdouble alpha;
--	gint temp_index;
-+	guint temp_quot, temp_rem;
- 	const CdColorRGB *blackbody_func = blackbody_data_d65modified;
- 
-+	g_return_val_if_fail (!isnan (temp), FALSE);
-+	g_return_val_if_fail (result != NULL, FALSE);
-+
- 	/* use modified curve */
- 	if (flags & CD_COLOR_BLACKBODY_FLAG_USE_PLANCKIAN)
- 		blackbody_func = blackbody_data_d65plankian;
- 
- 	/* check lower bound */
- 	if (temp < 1000) {
- 		ret = FALSE;
- 		temp = 1000;
- 	}
- 
- 	/* check upper bound */
- 	if (temp > 10000) {
- 		ret = FALSE;
- 		temp = 10000;
- 	}
- 
- 	/* bilinear interpolate the blackbody data */
--	alpha = ((guint) temp % 100) / 100.0;
--	temp_index = ((guint) temp - 1000) / 100;
--	cd_color_rgb_interpolate (&blackbody_func[temp_index],
--				  &blackbody_func[temp_index + 1],
--				  alpha,
--				  result);
-+	temp_quot = (guint) temp / 100;
-+	temp_rem = (guint) temp % 100;
-+
-+	if (temp_rem == 0)
-+		*result = blackbody_func[temp_quot - 10];
-+	else
-+		cd_color_rgb_interpolate (&blackbody_func[temp_quot - 10],
-+					  &blackbody_func[temp_quot - 9],
-+					  temp_rem / 100.0,
-+					  result);
-+
- 	return ret;
- }
- 
--- 
-2.15.1
-

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-04-21 18:33:28 UTC (rev 322771)
+++ PKGBUILD	2018-04-21 19:58:15 UTC (rev 322772)
@@ -4,8 +4,8 @@
 
 pkgbase=colord
 pkgname=(colord colord-sane)
-pkgver=1.4.2
-pkgrel=3
+pkgver=1.4.3
+pkgrel=1
 pkgdesc="System daemon for managing color devices"
 url="https://www.freedesktop.org/software/colord"
 arch=(x86_64)
@@ -14,11 +14,9 @@
 makedepends=(gobject-introspection vala sane bash-completion argyllcms git docbook-utils
              docbook-sgml perl-sgmls meson gtk-doc)
 options=(!emptydirs)
-_commit=5b9aa8de432579a2636f13ad6895928f42511081  # tags/1.4.2^0
-source=("git+https://github.com/hughsie/colord#commit=$_commit"
-        0001-Make-cd_color_get_blackbody_rgb_full-safer.patch)
-sha256sums=('SKIP'
-            '73689805d46705c8680d9ae979a2f5203f661741e56aa07dc627b36059ab404b')
+_commit=cd7faac0d81f2dabef6c9787baf78b9e8fb0e1ae  # tags/1.4.3^0
+source=("git+https://github.com/hughsie/colord#commit=$_commit")
+sha256sums=('SKIP')
 validpgpkeys=('163EB50119225DB3DF8F49EA17ACBA8DFA970E17')  # Richard Hughes
 
 pkgver() {
@@ -28,16 +26,15 @@
 
 prepare() {
   cd colord
-  patch -Np1 -i ../0001-Make-cd_color_get_blackbody_rgb_full-safer.patch
 }
 
 build() {
   arch-meson colord build \
-    -Denable-libcolordcompat=true \
-    -Denable-sane=true \
-    -Denable-vala=true \
-    -Denable-print-profiles=true \
-    -Dwith-daemon-user=colord
+    -D libcolordcompat=true \
+    -D sane=true \
+    -D vapi=true \
+    -D print_profiles=true \
+    -D daemon_user=colord
   ninja -C build
 }
 
@@ -68,4 +65,4 @@
   mv colord-sane/* "$pkgdir"
 }
 
-# vim:set ts=2 sw=2 et:
+# vim:set sw=2 et: