mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-19 10:10:06 +02:00
Moved netpbm to a safe installation source (#4435)
* Moved netpbm to a safe installation source
This commit is contained in:
redsPL
Schrijvers Luc
@@ -231,9 +231,9 @@ COPYRIGHT="2001 411toppm: Steve Allen
|
||||
1993 zeisstopnm: Oliver Trepte"
|
||||
LICENSE="GNU GPL v2"
|
||||
REVISION="2"
|
||||
SOURCE_URI="svn+http://svn.code.sf.net/p/netpbm/code/advanced#2294"
|
||||
CHECKSUM_SHA256="835ce1d42ea9f50eddf74754f2b06b1c0f7a1d8e46deb89b839a5ca018599793"
|
||||
SOURCE_DIR="advanced"
|
||||
SOURCE_URI="https://github.com/t6/netpbm/releases/download/v$portVersion/netpbm-$portVersion.tar.xz"
|
||||
CHECKSUM_SHA256="8f18b9f1b5521f2392a1b87a2cbc6a751eae1276e67520ad4c383d513040c3b2"
|
||||
SOURCE_DIR="netpbm-$portVersion/"
|
||||
PATCHES="netpbm-$portVersion.patchset"
|
||||
|
||||
ARCHITECTURES="x86_gcc2 x86 x86_64"
|
||||
@@ -277,6 +277,7 @@ PROVIDES="
|
||||
cmd:leaftoppm
|
||||
cmd:lispmtopgm
|
||||
cmd:macptopbm
|
||||
cmd:manweb
|
||||
cmd:mdatopbm
|
||||
cmd:mgrtopbm
|
||||
cmd:mrftopbm
|
||||
@@ -285,8 +286,10 @@ PROVIDES="
|
||||
cmd:palmtopnm
|
||||
cmd:pamaddnoise
|
||||
cmd:pamarith
|
||||
cmd:pamaltsat
|
||||
cmd:pambackground
|
||||
cmd:pambayer
|
||||
cmd:pambrighten
|
||||
cmd:pamchannel
|
||||
cmd:pamcomp
|
||||
cmd:pamcrater
|
||||
@@ -300,15 +303,20 @@ PROVIDES="
|
||||
cmd:pamenlarge
|
||||
cmd:pamexec
|
||||
cmd:pamfile
|
||||
cmd:pamfind
|
||||
cmd:pamfix
|
||||
cmd:pamfixtrunc
|
||||
cmd:pamflip
|
||||
cmd:pamfunc
|
||||
cmd:pamgauss
|
||||
cmd:pamgetcolor
|
||||
cmd:pamgradient
|
||||
cmd:pamhue
|
||||
cmd:pamlookup
|
||||
cmd:pamlevels
|
||||
cmd:pammasksharpen
|
||||
cmd:pammixinterlace
|
||||
cmd:pammixmulti
|
||||
cmd:pammosaicknit
|
||||
cmd:pamoil
|
||||
cmd:pampaintspill
|
||||
@@ -330,6 +338,8 @@ PROVIDES="
|
||||
cmd:pamstereogram
|
||||
cmd:pamstretch
|
||||
cmd:pamstretch_gen
|
||||
cmd:pamtable
|
||||
cmd:pamtris
|
||||
cmd:pamsumm
|
||||
cmd:pamsummcol
|
||||
cmd:pamthreshold
|
||||
@@ -346,6 +356,7 @@ PROVIDES="
|
||||
cmd:pamtopam
|
||||
cmd:pamtopdbimg
|
||||
cmd:pamtopfm
|
||||
cmd:pamtopng
|
||||
cmd:pamtopnm
|
||||
cmd:pamtosrf
|
||||
cmd:pamtosvg
|
||||
@@ -355,8 +366,10 @@ PROVIDES="
|
||||
cmd:pamtowinicon
|
||||
cmd:pamtoxvmini
|
||||
cmd:pamundice
|
||||
cmd:pamunlookup
|
||||
cmd:pamvalidate
|
||||
cmd:pamwipeout
|
||||
cmd:pamx
|
||||
cmd:pbmclean
|
||||
cmd:pbmlife
|
||||
cmd:pbmmake
|
||||
@@ -408,6 +421,7 @@ PROVIDES="
|
||||
cmd:pbmupc
|
||||
cmd:pc1toppm
|
||||
cmd:pcdovtoppm
|
||||
cmd:pcdindex
|
||||
cmd:pcxtoppm
|
||||
cmd:pdbimgtopam
|
||||
cmd:pfmtopam
|
||||
@@ -434,6 +448,8 @@ PROVIDES="
|
||||
cmd:pgmtopbm
|
||||
cmd:pgmtopgm
|
||||
cmd:pgmtoppm
|
||||
cmd:pgmtosbig
|
||||
cmd:pgmtost4
|
||||
cmd:pi1toppm
|
||||
cmd:pi3topbm
|
||||
cmd:picttoppm
|
||||
@@ -557,6 +573,7 @@ PROVIDES="
|
||||
cmd:ppmtosixel
|
||||
cmd:ppmtospu
|
||||
cmd:ppmtoterm
|
||||
cmd:ppmtotga
|
||||
cmd:ppmtouil
|
||||
cmd:ppmtowinicon
|
||||
cmd:ppmtoxpm
|
||||
@@ -581,7 +598,9 @@ PROVIDES="
|
||||
cmd:spottopgm
|
||||
cmd:sputoppm
|
||||
cmd:srftopam
|
||||
cmd:st4topgm
|
||||
cmd:sunicontopnm
|
||||
cmd:svgtopam
|
||||
cmd:tgatoppm
|
||||
cmd:thinkjettopbm
|
||||
cmd:tifftopnm
|
||||
@@ -596,8 +615,9 @@ PROVIDES="
|
||||
cmd:ybmtopbm
|
||||
cmd:yuvsplittoppm
|
||||
cmd:yuvtoppm
|
||||
cmd:yuy2topam
|
||||
cmd:zeisstopnm
|
||||
lib:libnetpbm$secondaryArchSuffix = 11.68 compat >= 11
|
||||
lib:libnetpbm$secondaryArchSuffix = 11.88 compat >= 11
|
||||
"
|
||||
REQUIRES="
|
||||
haiku$secondaryArchSuffix
|
||||
@@ -605,12 +625,13 @@ REQUIRES="
|
||||
lib:libjpeg$secondaryArchSuffix
|
||||
lib:libpng$secondaryArchSuffix
|
||||
lib:libtiff$secondaryArchSuffix
|
||||
lib:libxml2$secondaryArchSuffix
|
||||
lib:libz$secondaryArchSuffix
|
||||
"
|
||||
|
||||
PROVIDES_devel="
|
||||
netpbm${secondaryArchSuffix}_devel = $portVersion compat >= 10
|
||||
devel:libnetpbm$secondaryArchSuffix = 11.68 compat >= 11
|
||||
devel:libnetpbm$secondaryArchSuffix = 11.88 compat >= 11
|
||||
"
|
||||
REQUIRES_devel="
|
||||
netpbm$secondaryArchSuffix == $portVersion base
|
||||
@@ -623,6 +644,7 @@ BUILD_REQUIRES="
|
||||
devel:libpng$secondaryArchSuffix
|
||||
devel:libtiff$secondaryArchSuffix
|
||||
devel:libz$secondaryArchSuffix
|
||||
devel:libxml2$secondaryArchSuffix
|
||||
"
|
||||
BUILD_PREREQUIRES="
|
||||
cmd:flex
|
||||
@@ -659,10 +681,7 @@ INSTALL()
|
||||
mkdir -p $(dirname $manDir) $dataDir $developDir/headers
|
||||
mv $prefix/temp/bin $binDir
|
||||
mv $prefix/temp/lib $libDir
|
||||
mv $prefix/temp/man $manDir
|
||||
mv $prefix/temp/include/* $developDir/headers/
|
||||
rm -r $manDir/web
|
||||
rm $binDir/manweb $binDir/doc.url
|
||||
rm $prefix/temp/{README,VERSION,config_template,pkgconfig_template,pkginfo}
|
||||
mv $prefix/temp/misc $dataDir/netpbm
|
||||
rm -r $prefix/temp
|
||||
@@ -1,36 +0,0 @@
|
||||
From a7cbcaef10622962a1aaa3ed36d76590ac49dd9a Mon Sep 17 00:00:00 2001
|
||||
From: Jerome Duval <jerome.duval@gmail.com>
|
||||
Date: Fri, 27 Feb 2015 17:36:32 +0000
|
||||
Subject: Haiku patch
|
||||
|
||||
|
||||
diff --git a/lib/Makefile b/lib/Makefile
|
||||
index b47c3aa..f63a6cd 100644
|
||||
--- a/lib/Makefile
|
||||
+++ b/lib/Makefile
|
||||
@@ -126,7 +126,7 @@ $(SONAME): libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ).$(MIN)
|
||||
$(SYMLINK) $< $@
|
||||
libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ).$(MIN): $(LIBOBJECTS) $(LIBOBJECTS_X)
|
||||
$(LD) $(LDSHLIB) -o $@ $(LIBOBJECTS) $(LIBOBJECTS_X) \
|
||||
- $(SHLIB_CLIB) -lm $(LADD)
|
||||
+ $(SHLIB_CLIB) $(MATHLIB) $(LADD)
|
||||
endif
|
||||
|
||||
ifeq ($(NETPBMLIBTYPE),dll)
|
||||
diff --git a/lib/util/pm_c_util.h b/lib/util/pm_c_util.h
|
||||
index 01a0765..6dbf2b6 100644
|
||||
--- a/lib/util/pm_c_util.h
|
||||
+++ b/lib/util/pm_c_util.h
|
||||
@@ -54,7 +54,8 @@
|
||||
/* The test for __STDC__ is paranoid. It is there just in case some
|
||||
nonstandard compiler defines __STDC_VERSION__ in an arbitrary manner.
|
||||
*/
|
||||
- #if ( defined(__GNUC__) && (__GNUC__ >= 3) ) || \
|
||||
+ #if defined(__HAIKU__) || \
|
||||
+ ( defined(__GNUC__) && (__GNUC__ >= 3) ) || \
|
||||
( defined(__STDC__) && (__STDC__ ==1) && \
|
||||
defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) )
|
||||
#include <stdbool.h>
|
||||
--
|
||||
1.8.3.4
|
||||
|
||||
48
media-libs/netpbm/patches/netpbm-10.88.01.patchset
Normal file
48
media-libs/netpbm/patches/netpbm-10.88.01.patchset
Normal file
@@ -0,0 +1,48 @@
|
||||
From 138a84d8b3702b5dcfac726a32d6880498f6c8d4 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
|
||||
--- 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
|
||||
match those in AIX system header files. Otherwise, compile fails on
|
||||
AIX. 2000.09.11.
|
||||
*/
|
||||
+
|
||||
+#if defined(__HAIKU__)
|
||||
+#include <SupportDefs.h>
|
||||
+#else
|
||||
typedef unsigned char uint8;
|
||||
typedef signed char int8;
|
||||
typedef unsigned short uint16;
|
||||
@@ -142,6 +145,7 @@ typedef signed short int16;
|
||||
* 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;
|
||||
typedef unsigned int uint32;
|
||||
typedef signed int int32;
|
||||
#endif
|
||||
-
|
||||
+#endif
|
||||
|
||||
/*========*
|
||||
* MACROS *
|
||||
--
|
||||
2.23.0
|
||||
|
||||
Reference in New Issue
Block a user