CVS commit: pkgsrc/multimedia/libplacebo

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Fri Feb 16 08:24:33 UTC 2024

Modified Files:
        pkgsrc/multimedia/libplacebo: distinfo
Added Files:
        pkgsrc/multimedia/libplacebo/patches: patch-src_dither.c

Log Message:
libplacebo: Avoid use of illegal reserved typedef, helps build on SunOS


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/multimedia/libplacebo/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/multimedia/libplacebo/patches/patch-src_dither.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/multimedia/libplacebo/distinfo
diff -u pkgsrc/multimedia/libplacebo/distinfo:1.1 pkgsrc/multimedia/libplacebo/distinfo:1.2
--- pkgsrc/multimedia/libplacebo/distinfo:1.1   Mon Jan  1 15:43:26 2024
+++ pkgsrc/multimedia/libplacebo/distinfo       Fri Feb 16 08:24:33 2024
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1 2024/01/01 15:43:26 leot Exp $
+$NetBSD: distinfo,v 1.2 2024/02/16 08:24:33 nia Exp $
 
 BLAKE2s (libplacebo-6.338.1/fast_float.h) = dc9754b685f47fc6d6e0cba321b804829b6dda01f30f47c676374172bff12baf
 SHA512 (libplacebo-6.338.1/fast_float.h) = 85d4b85e03bdf42fe2f6d6ba40dfc2e85552c3367272e57469a274e7b9a283fc5953e1554dfe668be45bb08334e60ae91623faa4375fdea63d86a8c3b393e00f
@@ -6,3 +6,4 @@ Size (libplacebo-6.338.1/fast_float.h) =
 BLAKE2s (libplacebo-6.338.1/libplacebo-v6.338.1.tar.gz) = 8f0736a5de08a9b7c592c1d7fb589c5eefc2a6bef83d2c38de10cccabbf813ab
 SHA512 (libplacebo-6.338.1/libplacebo-v6.338.1.tar.gz) = a538a26552bda77af98264abde0e721c967f0c5eba73c0ffdff3cc7f52a4505ee5b618b99884becf502546261ff6e48881900ce7c782c5495ee3a6728dca9eb1
 Size (libplacebo-6.338.1/libplacebo-v6.338.1.tar.gz) = 840798 bytes
+SHA1 (patch-src_dither.c) = dd1b7bf8c7797a25e2c3fe4aef39e6490a4b1428

Added files:

Index: pkgsrc/multimedia/libplacebo/patches/patch-src_dither.c
diff -u /dev/null pkgsrc/multimedia/libplacebo/patches/patch-src_dither.c:1.1
--- /dev/null   Fri Feb 16 08:24:33 2024
+++ pkgsrc/multimedia/libplacebo/patches/patch-src_dither.c     Fri Feb 16 08:24:33 2024
@@ -0,0 +1,105 @@
+$NetBSD: patch-src_dither.c,v 1.1 2024/02/16 08:24:33 nia Exp $
+
+Avoid use of reserved _t name, helps build on SunOS.
+
+--- src/dither.c.orig  2023-10-17 12:24:39.000000000 +0000
++++ src/dither.c
+@@ -58,20 +58,20 @@ void pl_generate_bayer_matrix(float *dat
+ #define MAX_SIZE (1 << MAX_SIZEB)
+ #define MAX_SIZE2 (MAX_SIZE * MAX_SIZE)
+ 
+-typedef uint_fast32_t index_t;
++typedef uint_fast32_t placebo_index_t;
+ 
+-#define WRAP_SIZE2(k, x) ((index_t)((index_t)(x) & ((k)->size2 - 1)))
+-#define XY(k, x, y) ((index_t)(((x) | ((y) << (k)->sizeb))))
++#define WRAP_SIZE2(k, x) ((placebo_index_t)((placebo_index_t)(x) & ((k)->size2 - 1)))
++#define XY(k, x, y) ((placebo_index_t)(((x) | ((y) << (k)->sizeb))))
+ 
+ struct ctx {
+     unsigned int sizeb, size, size2;
+     unsigned int gauss_radius;
+     unsigned int gauss_middle;
+     uint64_t gauss[MAX_SIZE2];
+-    index_t randomat[MAX_SIZE2];
++    placebo_index_t randomat[MAX_SIZE2];
+     bool calcmat[MAX_SIZE2];
+     uint64_t gaussmat[MAX_SIZE2];
+-    index_t unimat[MAX_SIZE2];
++    placebo_index_t unimat[MAX_SIZE2];
+ };
+ 
+ static void makegauss(struct ctx *k, unsigned int sizeb)
+@@ -88,13 +88,13 @@ static void makegauss(struct ctx *k, uns
+     unsigned int gauss_size = k->gauss_radius * 2 + 1;
+     unsigned int gauss_size2 = gauss_size * gauss_size;
+ 
+-    for (index_t c = 0; c < k->size2; c++)
++    for (placebo_index_t c = 0; c < k->size2; c++)
+         k->gauss[c] = 0;
+ 
+     double sigma = -log(1.5 / (double) UINT64_MAX * gauss_size2) / k->gauss_radius;
+ 
+-    for (index_t gy = 0; gy <= k->gauss_radius; gy++) {
+-        for (index_t gx = 0; gx <= gy; gx++) {
++    for (placebo_index_t gy = 0; gy <= k->gauss_radius; gy++) {
++        for (placebo_index_t gx = 0; gx <= gy; gx++) {
+             int cx = (int)gx - k->gauss_radius;
+             int cy = (int)gy - k->gauss_radius;
+             int sq = cx * cx + cy * cy;
+@@ -113,7 +113,7 @@ static void makegauss(struct ctx *k, uns
+ 
+ #ifndef NDEBUG
+     uint64_t total = 0;
+-    for (index_t c = 0; c < k->size2; c++) {
++    for (placebo_index_t c = 0; c < k->size2; c++) {
+         uint64_t oldtotal = total;
+         total += k->gauss[c];
+         assert(total >= oldtotal);
+@@ -121,7 +121,7 @@ static void makegauss(struct ctx *k, uns
+ #endif
+ }
+ 
+-static void setbit(struct ctx *k, index_t c)
++static void setbit(struct ctx *k, placebo_index_t c)
+ {
+     if (k->calcmat[c])
+         return;
+@@ -137,12 +137,12 @@ static void setbit(struct ctx *k, index_
+         *m++ += *g++;
+ }
+ 
+-static index_t getmin(struct ctx *k)
++static placebo_index_t getmin(struct ctx *k)
+ {
+     uint64_t min = UINT64_MAX;
+-    index_t resnum = 0;
++    placebo_index_t resnum = 0;
+     unsigned int size2 = k->size2;
+-    for (index_t c = 0; c < size2; c++) {
++    for (placebo_index_t c = 0; c < size2; c++) {
+         if (k->calcmat[c])
+             continue;
+         uint64_t total = k->gaussmat[c];
+@@ -165,8 +165,8 @@ static index_t getmin(struct ctx *k)
+ static void makeuniform(struct ctx *k)
+ {
+     unsigned int size2 = k->size2;
+-    for (index_t c = 0; c < size2; c++) {
+-        index_t r = getmin(k);
++    for (placebo_index_t c = 0; c < size2; c++) {
++        placebo_index_t r = getmin(k);
+         setbit(k, r);
+         k->unimat[r] = c;
+     }
+@@ -182,8 +182,8 @@ void pl_generate_blue_noise(float *data,
+     makegauss(k, shift);
+     makeuniform(k);
+     float invscale = k->size2;
+-    for(index_t y = 0; y < k->size; y++) {
+-        for(index_t x = 0; x < k->size; x++)
++    for(placebo_index_t y = 0; y < k->size; y++) {
++        for(placebo_index_t x = 0; x < k->size; x++)
+             data[x + y * k->size] = k->unimat[XY(k, x, y)] / invscale;
+     }
+     pl_free(k);