haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-08 21:00:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

netpbm, switch to official super_stable uri (#10725)

Browse Source
This commit is contained in:
Schrijvers Luc
2024-07-22 11:32:57 +02:00
committed by GitHub
parent 4f372d72bf
commit 5410da2278
2 changed files with 16 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
media-libs/netpbm/netpbm-10.91.01.recipe → media-libs/netpbm/netpbm-10.86.42.recipe
View File

@@ -231,16 +231,19 @@ COPYRIGHT="2001 411toppm: Steve Allen
1993 zeisstopnm: Oliver Trepte"
LICENSE="GNU GPL v2"
REVISION="1"
SOURCE_URI="https://github.com/t6/netpbm/releases/download/v$portVersion/netpbm-$portVersion.tar.xz"
CHECKSUM_SHA256="dba419ffa3ac6af7d88c866abdeca64985c498a696906906e2dd719e10c7e12d"
SOURCE_URI="https://sourceforge.net/projects/netpbm/files/super_stable/$portVersion/netpbm-$portVersion.tgz"
CHECKSUM_SHA256="d4d2ca69d82b8d8518aee1d0a2f400664324afa8237859386764a41784d497f6"
PATCHES="netpbm-$portVersion.patchset"
ARCHITECTURES="all"
SECONDARY_ARCHITECTURES="x86_gcc2 x86"
libVersion="11.86"
libVersionCompat="$libVersion compat >= ${libVersion%.*}"
PROVIDES="
netpbm$secondaryArchSuffix = $portVersion
lib:libnetpbm$secondaryArchSuffix = 11.91 compat >= 11
lib:libnetpbm$secondaryArchSuffix = $libVersionCompat
"
if [ -z "$secondaryArchSuffix" ]; then
@@ -636,7 +639,7 @@ REQUIRES="
PROVIDES_devel="
netpbm${secondaryArchSuffix}_devel = $portVersion
devel:libnetpbm$secondaryArchSuffix = 11.91 compat >= 11
devel:libnetpbm$secondaryArchSuffix = $libVersionCompat
"
REQUIRES_devel="
netpbm$secondaryArchSuffix == $portVersion base
@@ -667,7 +670,7 @@ BUILD()
DEFAULT_TARGET = nonmerge
NETPBMLIBTYPE=unixshared
NETPBMLIBSUFFIX=so
STATICLIB_TOO=Y
STATICLIB_TOO=N
LINKERISCOMPILER = Y
TIFFLIB = libtiff.so
JPEGLIB = libjpeg.so
@@ -689,8 +692,7 @@ INSTALL()
mv $prefix/temp/include/* $includeDir
rm $prefix/temp/{README,VERSION,config_template,pkgconfig_template,pkginfo}
mv $prefix/temp/misc $dataDir/netpbm
mv $prefix/temp/staticlink/libnetpbm.a $developLibDir
cp man/* $manDir/man1
cp doc/*.1 $manDir/man1
rm -r $prefix/temp
ln -s libnetpbm.so.11 $libDir/libnetpbm.so

23
media-libs/netpbm/patches/netpbm-10.91.01.patchset → media-libs/netpbm/patches/netpbm-10.86.42.patchset
View File

@@ -1,25 +1,17 @@
From 138a84d8b3702b5dcfac726a32d6880498f6c8d4 Mon Sep 17 00:00:00 2001
From 3c5f0745e18f350ba0a3dc771bba08217614b11c Mon Sep 17 00:00:00 2001
From: reds <reds@sakamoto.pl>
Date: Sat, 14 Dec 2019 20:30:06 +0100
Subject: fixes ppmtompeg typedefs
diff --git a/converter/ppm/ppmtompeg/headers/general.h b/converter/ppm/ppmtompeg/headers/general.h
index 59c33c7..ee696c3 100644
index 59c33c7..487c142 100644
--- a/converter/ppm/ppmtompeg/headers/general.h
+++ b/converter/ppm/ppmtompeg/headers/general.h
@@ -110,13 +110,16 @@ int pclose();
#define NULL_CHAR '\0'
#define NEWLINE '\n'
-
typedef int boolean;
/* In the following, we need the "signed" in order to make these typedefs
@@ -117,6 +117,9 @@ typedef int boolean;
match those in AIX system header files. Otherwise, compile fails on
AIX. 2000.09.11.
*/
+
+#if defined(__HAIKU__)
+#include <SupportDefs.h>
+#else
@@ -30,19 +22,18 @@ index 59c33c7..ee696c3 100644
* 1) long's are 32 bits and
* 2) int's are not
*/
+
+
#ifdef LONG_32
typedef unsigned long uint32;
typedef long int32;
@@ -149,7 +153,7 @@ typedef long int32;
@@ -149,6 +153,7 @@ typedef long int32;
typedef unsigned int uint32;
typedef signed int int32;
#endif
-
+#endif
/*========*
* MACROS *
--
2.23.0
2.45.2