<pre style='margin:0'>
Ryan Carsten Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/1c40b40154530a6542f6cd3ce7b4a6dcb775d45f">https://github.com/macports/macports-ports/commit/1c40b40154530a6542f6cd3ce7b4a6dcb775d45f</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 1c40b401545 glpong: Fix build with libpng 1.5+
</span>1c40b401545 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 1c40b40154530a6542f6cd3ce7b4a6dcb775d45f
</span>Author: Ryan Carsten Schmidt <ryandesign@macports.org>
AuthorDate: Tue Aug 6 23:02:44 2024 -0500
<span style='display:block; white-space:pre;color:#404040;'> glpong: Fix build with libpng 1.5+
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/70497
</span>---
games/glpong/Portfile | 15 ++++++++-------
games/glpong/files/src_image.c.patch | 27 ++++++++++++++++++++-------
2 files changed, 28 insertions(+), 14 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/glpong/Portfile b/games/glpong/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index bda7202b8f0..e2b9c324ad3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/games/glpong/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/games/glpong/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,12 @@
</span> PortSystem 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup github 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup erikg glpong 1.3 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 a0077de5855b8a66f90fbf10c10275546b922772 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 e77fb2c08875da08f1f28ed76faa464953d4546b3f2ebbc788b4983053bc1f32 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 251959
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-name glpong
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.3
</span> categories games
license GPL-2+
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,11 +14,7 @@ description Implementation of pong using OpenGL, playable vs. AI.
</span> long_description Implementation of pong using OpenGL, SDL, SDL_image, \
and SDL_mixer. Only mode of play is you against an AI.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://math.missouristate.edu/~erik/software.php?id=72
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites http://math.missouristate.edu/~erik/files/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums md5 7e6f5a0e048623f3425d2e309ba86453 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha1 e391d12a50f2d82e581b9f85de33b308a3a3152d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 a0077de5855b8a66f90fbf10c10275546b922772
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites macports_distfiles
</span>
depends_lib port:libsdl \
port:libsdl_image \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/glpong/files/src_image.c.patch b/games/glpong/files/src_image.c.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 30a8f3bccf7..199d4c0d9a5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/games/glpong/files/src_image.c.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/games/glpong/files/src_image.c.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,19 +1,32 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/image.c.orig 2008-01-15 15:36:48.000000000 +1100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/image.c 2012-05-09 15:05:24.000000000 +1000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -120,7 +120,7 @@ readpng (void *buf, int *width, int *hei
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/erikg/glpong/commit/90d9c5dba95d51f31a36884dc7c61533340b408d
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/image.c.orig 2008-01-14 22:36:48.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/image.c 2024-08-06 22:56:55.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -84,7 +84,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (png_ptr == NULL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bar = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- memcpy (data, (void *) ((size_t)(png_ptr->io_ptr) + bar), length);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ memcpy (data, (png_get_io_ptr(png_ptr) + bar), length);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bar += length;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -120,7 +120,7 @@
</span>
png_read_png (png_ptr, info_ptr,
PNG_TRANSFORM_PACKING | PNG_TRANSFORM_STRIP_16 |
- PNG_TRANSFORM_EXPAND, png_voidp_NULL);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ PNG_TRANSFORM_EXPAND, (png_voidp)NULL);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ PNG_TRANSFORM_EXPAND, NULL);
</span> pitch = png_get_rowbytes (png_ptr, info_ptr);
*width = png_get_image_width (png_ptr, info_ptr);
*height = png_get_image_height (png_ptr, info_ptr);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -133,6 +133,6 @@ readpng (void *buf, int *width, int *hei
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -131,8 +131,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ row_pointers = png_get_rows (png_ptr, info_ptr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> out = malloc ((*width) * (*height) * (*bpp));
<span style='display:block; white-space:pre;background:#ffe0e0;'>- for (i = 0; i < info_ptr->height; ++i)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- for (i = 0; i < info_ptr->height; ++i)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ for (i = 0; i < *height; ++i)
</span> memcpy ((void *)((size_t)out + i * pitch), row_pointers[i], pitch);
- png_destroy_read_struct (&png_ptr, &info_ptr, png_infopp_NULL);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ png_destroy_read_struct (&png_ptr, &info_ptr, (png_infopp)NULL);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ png_destroy_read_struct (&png_ptr, &info_ptr, NULL);
</span> return out;
}
</pre><pre style='margin:0'>
</pre>