[packages/libmng] Rel 4
arekm
arekm at pld-linux.org
Sun Mar 15 02:14:10 CET 2026
commit 1ccaf0ff3498dd97a95a4f64e9f3e21066e08ba6
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Sun Mar 15 02:14:03 2026 +0100
Rel 4
libmng-contribs-fixes.patch | 86 +++++++++++++++++++++++++++++++++++++++++++++
libmng.spec | 4 ++-
2 files changed, 89 insertions(+), 1 deletion(-)
---
diff --git a/libmng.spec b/libmng.spec
index 8d7d2a5..2185fa6 100644
--- a/libmng.spec
+++ b/libmng.spec
@@ -11,13 +11,14 @@ Summary(uk.UTF-8): Бібліотека функцій для роботи з ф
Summary(ru.UTF-8): Библиотека функций для работы с файлами в формате MNG
Name: libmng
Version: 2.0.3
-Release: 3
+Release: 4
License: BSD-like
Group: Libraries
Source0: http://downloads.sourceforge.net/libmng/%{name}-%{version}.tar.xz
# Source0-md5: e9e899adb1b681b17f14d91e261878c5
Patch0: %{name}-automake.patch
Patch1: %{name}-gcc4.patch
+Patch2: %{name}-contribs-fixes.patch
URL: http://www.libmng.com/
BuildRequires: autoconf >= 2.65
BuildRequires: automake >= 1.3
@@ -163,6 +164,7 @@ mngplay - przeglądarka plików MNG oparta na SDL.
%setup -q
%patch -P0 -p1
%patch -P1 -p1
+%patch -P2 -p1
%build
cp makefiles/{Makefile.am,configure.ac} .
diff --git a/libmng-contribs-fixes.patch b/libmng-contribs-fixes.patch
new file mode 100644
index 0000000..bf74a76
--- /dev/null
+++ b/libmng-contribs-fixes.patch
@@ -0,0 +1,86 @@
+--- libmng-2.0.3/contrib/gcc/fbmngplay/console.c.orig 2014-08-02 06:00:37.000000000 +0200
++++ libmng-2.0.3/contrib/gcc/fbmngplay/console.c 2026-03-15 02:04:29.006571353 +0100
+@@ -13,6 +13,7 @@
+ */
+
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <unistd.h>
+ #include <fcntl.h>
+ #include <errno.h>
+--- libmng-2.0.3/contrib/gcc/fbmngplay/mng.h.orig 2014-08-02 06:00:37.000000000 +0200
++++ libmng-2.0.3/contrib/gcc/fbmngplay/mng.h 2026-03-15 02:04:30.779904686 +0100
+@@ -17,9 +17,9 @@
+
+ extern mngstuff *mng;
+
+-extern inline void mdelay(unsigned long msec);
+-extern mng_ptr mngalloc(mng_uint32 size);
+-extern void mngfree(mng_ptr p, mng_uint32 size);
++extern void mdelay(unsigned long msec);
++extern mng_ptr mngalloc(mng_size_t size);
++extern void mngfree(mng_ptr p, mng_size_t size);
+ extern mng_bool mngopenstream(mng_handle mng);
+ extern mng_bool mngclosestream(mng_handle mng);
+ extern mng_bool mngreadstream( mng_handle mng, mng_ptr buffer, mng_uint32 size, mng_uint32 * bytesread);
+--- libmng-2.0.3/contrib/gcc/fbmngplay/mng.c.orig 2014-08-02 06:00:37.000000000 +0200
++++ libmng-2.0.3/contrib/gcc/fbmngplay/mng.c 2026-03-15 02:04:35.656571352 +0100
+@@ -22,7 +22,7 @@
+ unsigned char *bufferstream;
+ unsigned long bufferpos = 0, buffersize = 0;
+
+-inline void mdelay(unsigned long msec)
++void mdelay(unsigned long msec)
+ {
+ usleep(msec * 1000);
+ }
+@@ -30,13 +30,13 @@
+ /* callbacks for the mng decoder */
+
+ /* memory allocation; data must be zeroed */
+-mng_ptr mngalloc(mng_uint32 size)
++mng_ptr mngalloc(mng_size_t size)
+ {
+ return (mng_ptr) calloc(1, size);
+ }
+
+ /* memory deallocation */
+-void mngfree(mng_ptr p, mng_uint32 size)
++void mngfree(mng_ptr p, mng_size_t size)
+ {
+ free(p);
+ return;
+@@ -72,7 +72,14 @@
+ return MNG_TRUE;
+ }
+ buffersize = len;
+- fread(bufferstream, 1, len, mymng->file);
++ if (fread(bufferstream, 1, len, mymng->file) != len) {
++ free(bufferstream);
++ bufferstream = NULL;
++ buffersize = 0;
++ fprintf(stderr, "error reading file into buffer\n");
++ buffered = 0;
++ return MNG_TRUE;
++ }
+ bufferpos = 0;
+ fclose(mymng->file);
+ mymng->file = NULL;
+--- libmng-2.0.3/contrib/gcc/sdl-mngplay/mngplay.c.orig 2014-08-02 06:00:37.000000000 +0200
++++ libmng-2.0.3/contrib/gcc/sdl-mngplay/mngplay.c 2026-03-15 02:10:00.000000000 +0100
+@@ -47,13 +47,13 @@
+ /* callbacks for the mng decoder */
+
+ /* memory allocation; data must be zeroed */
+-mng_ptr mymngalloc(mng_uint32 size)
++mng_ptr mymngalloc(mng_size_t size)
+ {
+ return (mng_ptr)calloc(1, size);
+ }
+
+ /* memory deallocation */
+-void mymngfree(mng_ptr p, mng_uint32 size)
++void mymngfree(mng_ptr p, mng_size_t size)
+ {
+ free(p);
+ return;
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/libmng.git/commitdiff/1ccaf0ff3498dd97a95a4f64e9f3e21066e08ba6
More information about the pld-cvs-commit
mailing list