diff options
author | ryoon <ryoon@pkgsrc.org> | 2019-06-18 14:24:02 +0000 |
---|---|---|
committer | ryoon <ryoon@pkgsrc.org> | 2019-06-18 14:24:02 +0000 |
commit | 266159d6d307007fb00ab9675ebaec96f8f10066 (patch) | |
tree | bceadfe5c8c9be272a33cc52de6c5d6745d49e4e | |
parent | 9ec1f3634578c6ef6ca2e7c9eb574474c6312293 (diff) | |
download | pkgsrc-266159d6d307007fb00ab9675ebaec96f8f10066.tar.gz |
Update to 0.1.66
Changelog:
2019-06-12 babl-0.1.66
Added API call, babl_space_get_rgb_luminance,
Make most SIMD code-paths optional again on i686.
2019-05-25 babl-0.1.64
Support for Hygon Dhyana, and Y~aA formats for symmetric completeness.
Code consistency, gitlab CI, autotools and meson build improvements.
-rw-r--r-- | graphics/babl/Makefile | 4 | ||||
-rw-r--r-- | graphics/babl/distinfo | 12 | ||||
-rw-r--r-- | graphics/babl/patches/patch-extensions_gggl.c | 78 |
3 files changed, 47 insertions, 47 deletions
diff --git a/graphics/babl/Makefile b/graphics/babl/Makefile index 152c46030c4..c5eb302cd02 100644 --- a/graphics/babl/Makefile +++ b/graphics/babl/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.24 2019/04/09 13:08:00 ryoon Exp $ +# $NetBSD: Makefile,v 1.25 2019/06/18 14:24:02 ryoon Exp $ -DISTNAME= babl-0.1.62 +DISTNAME= babl-0.1.66 CATEGORIES= graphics MASTER_SITES= http://download.gimp.org/pub/babl/0.1/ EXTRACT_SUFX= .tar.bz2 diff --git a/graphics/babl/distinfo b/graphics/babl/distinfo index 7f43d161234..a1e6aa57b85 100644 --- a/graphics/babl/distinfo +++ b/graphics/babl/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.21 2019/04/09 13:08:00 ryoon Exp $ +$NetBSD: distinfo,v 1.22 2019/06/18 14:24:02 ryoon Exp $ -SHA1 (babl-0.1.62.tar.bz2) = aed2d7c093174a76179b4916f09da2769070dc2b -RMD160 (babl-0.1.62.tar.bz2) = 58cb4dbd495251c598281ef801be62c0f1b9520f -SHA512 (babl-0.1.62.tar.bz2) = 4d2ba25e39b8dcb122913731861fa04cafd97388a1c354afb2188e8582ac78e9e32f838e2be8e9f41ee9ac582081fdee1d79accb60e824b8b2c12995f96a8293 -Size (babl-0.1.62.tar.bz2) = 698161 bytes -SHA1 (patch-extensions_gggl.c) = fd0c5258436ebacfc0e866a236fb863b0dfd9bc0 +SHA1 (babl-0.1.66.tar.bz2) = 21404fc852770643d830833f138b256a7ac3bcb5 +RMD160 (babl-0.1.66.tar.bz2) = c57889951538f3aedcd3b25d6f4fd4e45e778eef +SHA512 (babl-0.1.66.tar.bz2) = 41534eea6cad21eae704af3fdce4857e9dc2b0efa48a7cfd7f98b23428198e95fc9ca2f30e522abf2fa06e907eaf4f7bbafc048b356cb5890fabcb9be21001b3 +Size (babl-0.1.66.tar.bz2) = 706100 bytes +SHA1 (patch-extensions_gggl.c) = 4981d58c145a84a8b4f579127221e6289f13c036 diff --git a/graphics/babl/patches/patch-extensions_gggl.c b/graphics/babl/patches/patch-extensions_gggl.c index 30bed8f3ad4..a80cb1a1081 100644 --- a/graphics/babl/patches/patch-extensions_gggl.c +++ b/graphics/babl/patches/patch-extensions_gggl.c @@ -1,13 +1,13 @@ -$NetBSD: patch-extensions_gggl.c,v 1.2 2018/11/22 12:59:07 ryoon Exp $ +$NetBSD: patch-extensions_gggl.c,v 1.3 2019/06/18 14:24:03 ryoon Exp $ Patch also submitted upstream: https://bugzilla.gnome.org/show_bug.cgi?id=795726 Fixes crashes on alignment critical architectures. ---- extensions/gggl.c.orig 2018-10-22 16:57:44.000000000 +0000 +--- extensions/gggl.c.orig 2019-03-21 11:34:40.000000000 +0000 +++ extensions/gggl.c -@@ -56,12 +56,15 @@ conv_F_8 (const Babl *conversion,unsigne +@@ -59,12 +59,15 @@ conv_F_8 (const Babl *conversion, while (n--) { @@ -26,8 +26,8 @@ Fixes crashes on alignment critical architectures. dst += 1; src += 4; -@@ -72,21 +75,26 @@ static void - conv_F_16 (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples) +@@ -78,21 +81,26 @@ conv_F_16 (const Babl *conversion, + long samples) { long n = samples; + unsigned short v; @@ -40,24 +40,24 @@ Fixes crashes on alignment critical architectures. if (f < 0.0) { - *(unsigned short *) dst = 0; -+ v = 0; -+ memcpy(dst, &v, sizeof(v)); ++ v = 0; ++ memcpy(dst, &v, sizeof(v)); } else if (f > 1.0) { - *(unsigned short *) dst = 65535; + v = 65535; -+ memcpy(dst, &v, sizeof(v)); ++ memcpy(dst, &v, sizeof(v)); } else { - *(unsigned short *) dst = lrint (f * 65535.0); + v = lrint (f * 65535.0); -+ memcpy(dst, &v, sizeof(v)); ++ memcpy(dst, &v, sizeof(v)); } dst += 2; src += 4; -@@ -100,7 +108,9 @@ conv_8_F (const Babl *conversion,unsigne +@@ -109,7 +117,9 @@ conv_8_F (const Babl *conversion, while (n--) { @@ -68,7 +68,7 @@ Fixes crashes on alignment critical architectures. dst += 4; src += 1; } -@@ -113,7 +123,8 @@ conv_16_F (const Babl *conversion,unsign +@@ -125,7 +135,8 @@ conv_16_F (const Babl *conversion, while (n--) { @@ -78,7 +78,7 @@ Fixes crashes on alignment critical architectures. dst += 4; src += 2; } -@@ -130,13 +141,18 @@ conv_rgbaF_rgb8 (const Babl *conversion, +@@ -145,13 +156,18 @@ conv_rgbaF_rgb8 (const Babl *conversi for (c = 0; c < 3; c++) { @@ -101,7 +101,7 @@ Fixes crashes on alignment critical architectures. dst += 1; src += 4; } -@@ -151,7 +167,11 @@ conv_F_D (const Babl *conversion,unsigne +@@ -169,7 +185,11 @@ conv_F_D (const Babl *conversion, while (n--) { @@ -114,7 +114,7 @@ Fixes crashes on alignment critical architectures. dst += 8; src += 4; } -@@ -164,7 +184,11 @@ conv_D_F (const Babl *conversion,unsigne +@@ -185,7 +205,11 @@ conv_D_F (const Babl *conversion, while (n--) { @@ -127,7 +127,7 @@ Fixes crashes on alignment critical architectures. dst += 4; src += 8; } -@@ -189,7 +213,9 @@ conv_16_8 (const Babl *conversion,unsign +@@ -213,7 +237,9 @@ conv_16_8 (const Babl *conversion, while (n--) { @@ -138,7 +138,7 @@ Fixes crashes on alignment critical architectures. dst += 1; src += 2; } -@@ -201,7 +227,8 @@ conv_8_16 (const Babl *conversion,unsign +@@ -228,7 +254,8 @@ conv_8_16 (const Babl *conversion, long n = samples; while (n--) { @@ -148,7 +148,7 @@ Fixes crashes on alignment critical architectures. dst += 2; src += 1; } -@@ -363,12 +390,14 @@ conv_gaF_gAF (const Babl *conversion,uns +@@ -453,12 +480,14 @@ conv_gaF_gAF (const Babl *conversion, while (n--) { @@ -167,7 +167,7 @@ Fixes crashes on alignment critical architectures. dst += 4; src += 4; } -@@ -381,15 +410,19 @@ conv_gAF_gaF (const Babl *conversion,uns +@@ -474,15 +503,19 @@ conv_gAF_gaF (const Babl *conversion, while (n--) { @@ -192,7 +192,7 @@ Fixes crashes on alignment critical architectures. dst += 4; src += 4; } -@@ -404,16 +437,9 @@ conv_rgbaF_rgbF (const Babl *conversion, +@@ -500,16 +533,9 @@ conv_rgbaF_rgbF (const Babl *conversi while (n--) { @@ -212,8 +212,8 @@ Fixes crashes on alignment critical architectures. } } -@@ -421,15 +447,12 @@ static void - conv_rgbF_rgbaF (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples) +@@ -520,15 +546,12 @@ conv_rgbF_rgbaF (const Babl *conversi + long samples) { long n = samples; - float *fsrc = (void*) src; @@ -231,7 +231,7 @@ Fixes crashes on alignment critical architectures. } } -@@ -443,7 +466,7 @@ conv_gaF_gF (const Babl *conversion,unsi +@@ -545,7 +568,7 @@ conv_gaF_gF (const Babl *conversion, while (n--) { @@ -240,8 +240,8 @@ Fixes crashes on alignment critical architectures. dst += 4; src += 4; src += 4; -@@ -454,13 +477,14 @@ static void - conv_gF_gaF (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples) +@@ -559,13 +582,14 @@ conv_gF_gaF (const Babl *conversion, + long samples) { long n = samples; + float one = 1.0f; @@ -257,7 +257,7 @@ Fixes crashes on alignment critical architectures. dst += 4; } } -@@ -482,7 +506,7 @@ conv_gF_rgbF (const Babl *conversion,uns +@@ -590,7 +614,7 @@ conv_gF_rgbF (const Babl *conversion, for (c = 0; c < 3; c++) { @@ -266,7 +266,7 @@ Fixes crashes on alignment critical architectures. dst += 4; } src += 4; -@@ -531,11 +555,11 @@ conv_gaF_rgbaF (const Babl *conversion,u +@@ -648,11 +672,11 @@ conv_gaF_rgbaF (const Babl *conversio for (c = 0; c < 3; c++) { @@ -280,7 +280,7 @@ Fixes crashes on alignment critical architectures. dst += 4; src += 4; } -@@ -553,16 +577,20 @@ conv_rgbaF_rgbA8 (const Babl *conversion +@@ -673,16 +697,20 @@ conv_rgbaF_rgbA8 (const Babl *convers while (n--) { @@ -304,7 +304,7 @@ Fixes crashes on alignment critical architectures. dst++; src += 4; } -@@ -579,12 +607,17 @@ conv_rgbaF_rgb16 (const Babl *conversion +@@ -702,12 +730,17 @@ conv_rgbaF_rgb16 (const Babl *convers for (c = 0; c < 3; c++) { @@ -327,7 +327,7 @@ Fixes crashes on alignment critical architectures. dst += 2; src += 4; } -@@ -599,10 +632,14 @@ conv_rgbA16_rgbaF (const Babl *conversio +@@ -725,10 +758,14 @@ conv_rgbA16_rgbaF (const Babl *conver while (n--) { @@ -343,7 +343,7 @@ Fixes crashes on alignment critical architectures. if (alpha == 0.0f) recip_alpha = 10000.0; else -@@ -610,11 +647,15 @@ conv_rgbA16_rgbaF (const Babl *conversio +@@ -736,11 +773,15 @@ conv_rgbA16_rgbaF (const Babl *conver for (c = 0; c < 3; c++) { @@ -361,8 +361,8 @@ Fixes crashes on alignment critical architectures. dst += 4; src += 2; } -@@ -624,16 +665,13 @@ static void - conv_gF_rgbaF (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples) +@@ -753,16 +794,13 @@ conv_gF_rgbaF (const Babl *conversion + long samples) { long n = samples; + float one = 1.0f; @@ -382,7 +382,7 @@ Fixes crashes on alignment critical architectures. dst += 4; src += 4; } -@@ -648,15 +686,18 @@ conv_gF_rgbaF (const Babl *conversion,un +@@ -777,15 +815,18 @@ conv_gF_rgbaF (const Babl *conversion int samples) { long n=samples; @@ -403,7 +403,7 @@ Fixes crashes on alignment critical architectures. dst += 4; } } -@@ -667,15 +708,18 @@ conv_gF_rgbaF (const Babl *conversion,un +@@ -796,15 +837,18 @@ conv_gF_rgbaF (const Babl *conversion int samples) { long n=samples; @@ -424,7 +424,7 @@ Fixes crashes on alignment critical architectures. dst += 4; } } -@@ -686,15 +730,21 @@ conv_gF_rgbaF (const Babl *conversion,un +@@ -815,15 +859,21 @@ conv_gF_rgbaF (const Babl *conversion int samples) { long n=samples; @@ -448,7 +448,7 @@ Fixes crashes on alignment critical architectures. src += 2; dst += 4; } -@@ -706,14 +756,12 @@ conv_gF_rgbaF (const Babl *conversion,un +@@ -835,14 +885,12 @@ conv_gF_rgbaF (const Babl *conversion int samples) { long n=samples; @@ -468,7 +468,7 @@ Fixes crashes on alignment critical architectures. dst += 4; src += 4; -@@ -729,11 +777,12 @@ conv_rgba8_rgbA8 (const Babl *conversion +@@ -861,11 +909,12 @@ conv_rgba8_rgbA8 (const Babl *convers { if (src[3] == 255) { @@ -483,7 +483,7 @@ Fixes crashes on alignment critical architectures. } else { -@@ -757,12 +806,13 @@ conv_rgbA8_rgba8 (const Babl *conversion +@@ -892,12 +941,13 @@ conv_rgbA8_rgba8 (const Babl *convers { if (src[3] == 255) { @@ -499,7 +499,7 @@ Fixes crashes on alignment critical architectures. dst += 4; } else -@@ -786,7 +836,10 @@ conv_rgb8_rgba8 (const Babl *conversion, +@@ -924,7 +974,10 @@ conv_rgb8_rgba8 (const Babl *conversi long n = samples-1; while (n--) { |