From 458bd6e8564bdd57343a56272abd115ec8e9ecd7 Mon Sep 17 00:00:00 2001
From: Schrijvers Luc <begasus@gmail.com>
Date: Fri, 14 Apr 2023 20:49:14 +0200
Subject: [PATCH] libpgf, bump version, disable static library (#8391)

---
 ...gf-7.15.32.recipe => libpgf-7.21.7.recipe} | 16 ++++--
 .../libpgf/patches/libpgf-7.15.32.patchset    | 39 --------------
 .../libpgf/patches/libpgf-7.21.7.patchset     | 51 +++++++++++++++++++
 3 files changed, 63 insertions(+), 43 deletions(-)
 rename media-libs/libpgf/{libpgf-7.15.32.recipe => libpgf-7.21.7.recipe} (82%)
 delete mode 100644 media-libs/libpgf/patches/libpgf-7.15.32.patchset
 create mode 100644 media-libs/libpgf/patches/libpgf-7.21.7.patchset

diff --git a/media-libs/libpgf/libpgf-7.15.32.recipe b/media-libs/libpgf/libpgf-7.21.7.recipe
similarity index 82%
rename from media-libs/libpgf/libpgf-7.15.32.recipe
rename to media-libs/libpgf/libpgf-7.21.7.recipe
index e66205f8b..90c003a30 100644
--- a/media-libs/libpgf/libpgf-7.15.32.recipe
+++ b/media-libs/libpgf/libpgf-7.21.7.recipe
@@ -5,10 +5,10 @@ HOMEPAGE="https://www.libpgf.org/"
 COPYRIGHT="2006 xeraina GmbH, Switzerland"
 LICENSE="GNU LGPL v2.1"
 REVISION="1"
-SOURCE_URI="https://downloads.sourceforge.net/libpgf/libpgf/$portVersion-latest/libPGF-codec-and-console-src.zip"
-CHECKSUM_SHA256="f1dd054b09b0f3651209d67529490b4cbc156a985d8b019ff3bfe575260f4221"
+SOURCE_URI="https://sourceforge.net/projects/libpgf/files/libpgf/$portVersion/libpgf.zip"
+CHECKSUM_SHA256="cba8f7cd6f77adadf75e5ad39944e7490a00e5ae9a00cd2214119cb338c5abad"
 SOURCE_FILENAME="libpgf-$portVersion.zip"
-SOURCE_DIR="PGF/Codec"
+SOURCE_DIR="libpgf"
 PATCHES="libpgf-$portVersion.patchset"
 
 ARCHITECTURES="all !x86_gcc2"
@@ -40,6 +40,7 @@ BUILD_PREREQUIRES="
 	cmd:aclocal
 	cmd:autoconf
 	cmd:automake
+	cmd:dos2unix
 	cmd:doxygen
 	cmd:g++$secondaryArchSuffix
 	cmd:gcc$secondaryArchSuffix
@@ -52,8 +53,10 @@ defineDebugInfoPackage libpgf$secondaryArchSuffix \
 
 BUILD()
 {
+	find . -type f | xargs dos2unix
+	mv README{.txt,}
 	sh ./autogen.sh
-	runConfigure ./configure
+	runConfigure ./configure --disable-static
 	make $jobArgs
 }
 
@@ -71,3 +74,8 @@ INSTALL()
 	fixPkgconfig
 	packageEntries devel "$developDir"
 }
+
+TEST()
+{
+	make check
+}
diff --git a/media-libs/libpgf/patches/libpgf-7.15.32.patchset b/media-libs/libpgf/patches/libpgf-7.15.32.patchset
deleted file mode 100644
index 94753d15b..000000000
--- a/media-libs/libpgf/patches/libpgf-7.15.32.patchset
+++ /dev/null
@@ -1,39 +0,0 @@
-From b9dcd0b355909011e35ed00ecab17a68cc008dca Mon Sep 17 00:00:00 2001
-From: Leorize <alaviss@users.noreply.github.com>
-Date: Mon, 8 Jan 2018 14:16:07 +0700
-Subject: PGFplatform: add Haiku support
-
-
-diff --git a/include/PGFplatform.h b/include/PGFplatform.h
-index 22634ac..e54097b 100644
---- a/include/PGFplatform.h
-+++ b/include/PGFplatform.h
-@@ -352,6 +352,25 @@ inline OSError SetFPos(HANDLE hFile, int posMode, INT64 posOff) {
- #endif // __NetBSD__ or __OpenBSD__ or __FreeBSD__
- 
- 
-+//-------------------------------------------------------------------------------
-+// HAIKU
-+//-------------------------------------------------------------------------------
-+#ifdef __HAIKU__
-+#ifndef __POSIX__
-+#define __POSIX__
-+#endif
-+
-+#ifndef off64_t
-+#define off64_t off_t
-+#endif
-+
-+#ifndef lseek64
-+#define lseek64 lseek
-+#endif
-+
-+#endif // __HAIKU__
-+
-+
- //-------------------------------------------------------------------------------
- // POSIX *NIXes
- //-------------------------------------------------------------------------------
--- 
-2.15.0
-
diff --git a/media-libs/libpgf/patches/libpgf-7.21.7.patchset b/media-libs/libpgf/patches/libpgf-7.21.7.patchset
new file mode 100644
index 000000000..8a5f3986d
--- /dev/null
+++ b/media-libs/libpgf/patches/libpgf-7.21.7.patchset
@@ -0,0 +1,51 @@
+From 519087814b4ec03cc2e8ed3e2d1f4abb8b3e37c2 Mon Sep 17 00:00:00 2001
+From: Leorize <alaviss@users.noreply.github.com>
+Date: Mon, 8 Jan 2018 14:16:07 +0700
+Subject: PGFplatform: add Haiku support
+
+
+diff --git a/include/PGFplatform.h b/include/PGFplatform.h
+index bda823b..9db0cc5 100644
+--- a/include/PGFplatform.h
++++ b/include/PGFplatform.h
+@@ -336,7 +336,7 @@ inline OSError SetFPos(HANDLE hFile, int posMode, INT64 posOff) {
+ //-------------------------------------------------------------------------------
+ // *BSD
+ //-------------------------------------------------------------------------------
+-#if defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__)
++#if defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__HAIKU__)
+ #ifndef __POSIX__ 
+ #define __POSIX__ 
+ #endif 
+@@ -349,7 +349,7 @@ inline OSError SetFPos(HANDLE hFile, int posMode, INT64 posOff) {
+ #define lseek64 lseek 
+ #endif 
+ 
+-#endif // __NetBSD__ or __OpenBSD__ or __FreeBSD__
++#endif // __NetBSD__ or __OpenBSD__ or __FreeBSD__ or __HAIKU__
+ 
+ 
+ //-------------------------------------------------------------------------------
+-- 
+2.37.3
+
+
+From ecece04c504393e91dc02d6ce6d8e7610a138838 Mon Sep 17 00:00:00 2001
+From: Begasus <begasus@gmail.com>
+Date: Fri, 14 Apr 2023 20:39:24 +0200
+Subject: Fix version
+
+
+diff --git a/configure.ac b/configure.ac
+index b60f053..bed03b3 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1,4 +1,4 @@
+-AC_INIT([libpgf], [7.15.32])
++AC_INIT([libpgf], [7.21.7])
+ AC_CONFIG_SRCDIR([src/PGFimage.cpp])
+ 
+ 
+-- 
+2.37.3
+