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

tiff4: bump to 4.0.10, fix PROVIDES_tools, add debuginfo.

Browse Source
This commit is contained in:
fbrosson
2018-11-12 00:47:53 +00:00
parent 520a35d14e
commit 173b3f9920
2 changed files with 37 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
media-libs/tiff/patches/tiff4-4.0.9.patchset → media-libs/tiff/patches/tiff4-4.0.10.patchset
View File

@@ -5,10 +5,10 @@ Subject: applying patch tiff-4.0.3.patch
diff --git a/libtiff/tiff.h b/libtiff/tiff.h diff --git a/libtiff/tiff.h b/libtiff/tiff.h
index fb39634..339492d 100644 index 5b0a0c9..762722c 100644
--- a/libtiff/tiff.h --- a/libtiff/tiff.h
+++ b/libtiff/tiff.h +++ b/libtiff/tiff.h
@@ -65,6 +65,12 @@ @@ -63,6 +63,12 @@
* strings unsigned char* * strings unsigned char*
*/ */
@@ -21,7 +21,7 @@ index fb39634..339492d 100644
typedef TIFF_INT8_T int8; typedef TIFF_INT8_T int8;
typedef TIFF_UINT8_T uint8; typedef TIFF_UINT8_T uint8;
@@ -77,6 +83,8 @@ typedef TIFF_UINT32_T uint32; @@ -75,6 +81,8 @@ typedef TIFF_UINT32_T uint32;
typedef TIFF_INT64_T int64; typedef TIFF_INT64_T int64;
typedef TIFF_UINT64_T uint64; typedef TIFF_UINT64_T uint64;
@@ -31,7 +31,7 @@ index fb39634..339492d 100644
* Some types as promoted in a variable argument list * Some types as promoted in a variable argument list
* We use uint16_vap rather then directly using int, because this way * We use uint16_vap rather then directly using int, because this way
-- --
2.2.2 2.19.1
From 2c7a559393ece94809e7290fd35995c1f84dc6e7 Mon Sep 17 00:00:00 2001 From 2c7a559393ece94809e7290fd35995c1f84dc6e7 Mon Sep 17 00:00:00 2001
@@ -60,5 +60,5 @@ index b54feb7..efde82c 100644
AS_IF([test "X$ax_cv_check_gl_libgl" = Xno -a "X$no_x" = Xyes], AS_IF([test "X$ax_cv_check_gl_libgl" = Xno -a "X$no_x" = Xyes],
-- --
2.2.2 2.19.1

49
media-libs/tiff/tiff4-4.0.9.recipe → media-libs/tiff/tiff4-4.0.10.recipe
View File

@@ -7,19 +7,23 @@ HOMEPAGE="http://www.libtiff.org/"
COPYRIGHT="1988-1997 Sam Leffler COPYRIGHT="1988-1997 Sam Leffler
1991-1997 Silicon Graphics, Inc." 1991-1997 Silicon Graphics, Inc."
LICENSE="MIT" LICENSE="MIT"
REVISION="2" REVISION="1"
SOURCE_URI="http://download.osgeo.org/libtiff/tiff-$portVersion.tar.gz" SOURCE_URI="https://download.osgeo.org/libtiff/tiff-$portVersion.tar.gz"
CHECKSUM_SHA256="6e7bdeec2c310734e734d19aae3a71ebe37a4d842e0e23dbb1b8921c0026cfcd" CHECKSUM_SHA256="2c52d11ccaf767457db0c46795d9c7d1a8d8f76f68b0b800a3dfe45786b996e4"
SOURCE_DIR="tiff-$portVersion" SOURCE_DIR="tiff-$portVersion"
PATCHES="tiff4-$portVersion.patchset" PATCHES="tiff4-$portVersion.patchset"
ARCHITECTURES="x86_gcc2 x86 x86_64" ARCHITECTURES="x86_gcc2 x86 x86_64"
SECONDARY_ARCHITECTURES="x86_gcc2 x86" SECONDARY_ARCHITECTURES="x86_gcc2 x86"
libVersion="5.4.0"
libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
portVersionCompat="$portVersion compat >= ${portVersion%%.*}"
PROVIDES=" PROVIDES="
tiff4$secondaryArchSuffix = $portVersion compat >= 4 tiff4$secondaryArchSuffix = $portVersionCompat
lib:libtiff$secondaryArchSuffix = 5.3.0 compat >= 5 lib:libtiff$secondaryArchSuffix = $libVersionCompat
lib:libtiffxx$secondaryArchSuffix = 5.3.0 compat >= 5 lib:libtiffxx$secondaryArchSuffix = $libVersionCompat
" "
REQUIRES=" REQUIRES="
haiku$secondaryArchSuffix haiku$secondaryArchSuffix
@@ -28,9 +32,9 @@ REQUIRES="
" "
PROVIDES_devel=" PROVIDES_devel="
tiff4${secondaryArchSuffix}_devel = $portVersion compat >= 4 tiff4${secondaryArchSuffix}_devel = $portVersionCompat
devel:libtiff$secondaryArchSuffix = 5.3.0 compat >= 5 devel:libtiff$secondaryArchSuffix = $libVersionCompat
devel:libtiffxx$secondaryArchSuffix = 5.3.0 compat >= 5 devel:libtiffxx$secondaryArchSuffix = $libVersionCompat
" "
REQUIRES_devel=" REQUIRES_devel="
tiff4$secondaryArchSuffix == $portVersion base tiff4$secondaryArchSuffix == $portVersion base
@@ -43,16 +47,13 @@ if [ -z "$secondaryArchSuffix" ]; then
SUMMARY_tools="The TIFF tools" SUMMARY_tools="The TIFF tools"
PROVIDES_tools=" PROVIDES_tools="
tiff4_tools = $portVersion tiff4_tools = $portVersion
cmd:bmp2tiff
cmd:fax2ps cmd:fax2ps
cmd:fax2tiff cmd:fax2tiff
cmd:gif2tiff
cmd:pal2rgb cmd:pal2rgb
cmd:ppm2tiff cmd:ppm2tiff
cmd:ras2tiff
cmd:raw2tiff cmd:raw2tiff
cmd:rgb2ycbcr # cmd:rgb2ycbcr
cmd:thumbnail # cmd:thumbnail
cmd:tiff2bw cmd:tiff2bw
cmd:tiff2pdf cmd:tiff2pdf
cmd:tiff2ps cmd:tiff2ps
@@ -62,6 +63,7 @@ if [ -z "$secondaryArchSuffix" ]; then
cmd:tiffcrop cmd:tiffcrop
cmd:tiffdither cmd:tiffdither
cmd:tiffdump cmd:tiffdump
# cmd:tiffgt
cmd:tiffinfo cmd:tiffinfo
cmd:tiffmedian cmd:tiffmedian
cmd:tiffset cmd:tiffset
@@ -90,11 +92,24 @@ BUILD_PREREQUIRES="
cmd:make cmd:make
" "
debugList=(
"$libDir"/libtiff.so.$libVersion
"$libDir"/libtiffxx.so.$libVersion
)
if [ -z "$secondaryArchSuffix" ]; then
for i in `echo "$PROVIDES_tools" | sed -n -e "s/^\s*cmd://p"`; do
debugList+=("${binDir/$portName/${portName}_tools}"/$i)
done
fi
defineDebugInfoPackage $portName "${debugList[@]}"
PATCH() PATCH()
{ {
if [ $effectiveTargetArchitecture == x86_gcc2 ]; then if [ "$effectiveTargetArchitecture" = x86_gcc2 ]; then
sed -i 's/ios::pos_type/streampos/g' libtiff/tif_stream.cxx sed -i \
sed -i 's/ios::off_type/streamoff/g' libtiff/tif_stream.cxx -e 's/ios::pos_type/streampos/g' \
-e 's/ios::off_type/streamoff/g' \
libtiff/tif_stream.cxx
fi fi
} }