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

tiff: bump to 3.9.7, drop lib*.la, add Gentoo patches, add TEST. (#777)

Browse Source
This commit is contained in:
fbrosson
2016-08-22 14:37:34 +00:00
committed by waddlesplash
parent 52a1ef5d76
commit 152456b726
2 changed files with 47 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
media-libs/tiff/patches/tiff-3.9.6.patchset → media-libs/tiff/patches/tiff-3.9.7.patchset
View File

@@ -5,7 +5,7 @@ Subject: checks for uint32, uint16, uint8 and uses SupportsDefs.h
diff --git a/configure.ac b/configure.ac diff --git a/configure.ac b/configure.ac
index d48a58b..763ed52 100644 index e7cf804..90e782c 100644
--- a/configure.ac --- a/configure.ac
+++ b/configure.ac +++ b/configure.ac
@@ -154,11 +154,14 @@ AC_CHECK_SIZEOF(long) @@ -154,11 +154,14 @@ AC_CHECK_SIZEOF(long)
@@ -25,7 +25,7 @@ index d48a58b..763ed52 100644
# Obtain size of a 'signed long' and define as SIZEOF_SIGNED_LONG # Obtain size of a 'signed long' and define as SIZEOF_SIGNED_LONG
diff --git a/libtiff/tif_config.h.in b/libtiff/tif_config.h.in diff --git a/libtiff/tif_config.h.in b/libtiff/tif_config.h.in
index 01e54de..41a5772 100644 index 95db77a..41a5772 100644
--- a/libtiff/tif_config.h.in --- a/libtiff/tif_config.h.in
+++ b/libtiff/tif_config.h.in +++ b/libtiff/tif_config.h.in
@@ -142,6 +142,15 @@ @@ -142,6 +142,15 @@
@@ -111,7 +111,7 @@ index 1a52b37..3cdcc28 100644
#undef SIZEOF_INT #undef SIZEOF_INT
diff --git a/libtiff/tiffiop.h b/libtiff/tiffiop.h diff --git a/libtiff/tiffiop.h b/libtiff/tiffiop.h
index f65f855..3f0e9f7 100644 index 2ecc994..fa5fb1c 100644
--- a/libtiff/tiffiop.h --- a/libtiff/tiffiop.h
+++ b/libtiff/tiffiop.h +++ b/libtiff/tiffiop.h
@@ -62,7 +62,7 @@ extern void *lfind(const void *, const void *, size_t *, size_t, @@ -62,7 +62,7 @@ extern void *lfind(const void *, const void *, size_t *, size_t,

50
media-libs/tiff/tiff-3.9.6.recipe → media-libs/tiff/tiff-3.9.7.recipe
View File

@@ -3,14 +3,36 @@ DESCRIPTION="TIFF the Tag Image File Format, is a widely used format for \
storing image data. Included in this software is a library, libtiff, for \ storing image data. Included in this software is a library, libtiff, for \
reading and writing TIFF and a small collection of tools for doing simple \ reading and writing TIFF and a small collection of tools for doing simple \
manipulations of TIFF images." manipulations of TIFF images."
HOMEPAGE="http://www.libtiff.org" 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="ftp://ftp.remotesensing.org/pub/libtiff/tiff-3.9.6.tar.gz" SOURCE_URI="ftp://ftp.remotesensing.org/pub/libtiff/tiff-$portVersion.tar.gz"
CHECKSUM_SHA256="0fba119156236074343a14afbd3a47907e3a5952c9c86102305d4eeb06ad6833" CHECKSUM_SHA256="f5d64dd4ce61c55f5e9f6dc3920fbe5a41e02c2e607da7117a35eb5c320cef6a"
PATCHES="tiff-${portVersion}.patchset" PATCHES="tiff-$portVersion.patchset"
patchesBaseUri="https://gitweb.gentoo.org/repo/gentoo.git/plain/media-libs/tiff/files"
SOURCE_FILENAME_2="tiff-$portVersion-CVE-2012-4447.patch"
SOURCE_FILENAME_3="tiff-$portVersion-CVE-2012-4564.patch"
SOURCE_FILENAME_4="tiff-$portVersion-CVE-2012-5581.patch"
SOURCE_FILENAME_5="tiff-$portVersion-tiffinfo-exif.patch"
SOURCE_FILENAME_6="tiff-$portVersion-printdir-width.patch"
srcGitRev_2="b280d8459134b9f05fcc1525a2aa2d4134091cf4"
srcGitRev_3="62108c88946351318c1985e167d5c04d8fdd6645"
srcGitRev_4="05f9e0b614456fc348168a9f9f8c739660c8fefa"
srcGitRev_5="05f9e0b614456fc348168a9f9f8c739660c8fefa"
srcGitRev_6="4d119880422822032a408ee1201c20dddde1357c"
SOURCE_URI_2="$patchesBaseUri/$SOURCE_FILENAME_2?id=$srcGitRev_2#noarchive"
SOURCE_URI_3="$patchesBaseUri/$SOURCE_FILENAME_3?id=$srcGitRev_3#noarchive"
SOURCE_URI_4="$patchesBaseUri/$SOURCE_FILENAME_4?id=$srcGitRev_4#noarchive"
SOURCE_URI_5="$patchesBaseUri/$SOURCE_FILENAME_5?id=$srcGitRev_5#noarchive"
SOURCE_URI_6="$patchesBaseUri/$SOURCE_FILENAME_6?id=$srcGitRev_6#noarchive"
CHECKSUM_SHA256_2="373020d6c383778ee40f642d90e5d9f3a878f0c17a529825e43e1647d27332cf"
CHECKSUM_SHA256_3="525f667e2148229520b50d6136c0ecd345b8db9acc62fde945a5f13dae4d51f3"
CHECKSUM_SHA256_4="f47b30c8fc0578df7285f6cf318f29d410db4b82550b3fbc9582beeb9a834415"
CHECKSUM_SHA256_5="2b333f3161f88aef3f764de316c4e8f10906932d33ee575b98f7723b2bff1db7"
CHECKSUM_SHA256_6="597406f727b26fd06106e1e22a1e4e4620b3ffa54a49c2c4b0b8ee6b1d54908b"
ARCHITECTURES="x86_gcc2 x86 x86_64" ARCHITECTURES="x86_gcc2 x86 x86_64"
SECONDARY_ARCHITECTURES="x86_gcc2 x86" SECONDARY_ARCHITECTURES="x86_gcc2 x86"
@@ -82,10 +104,19 @@ BUILD_PREREQUIRES="
cmd:automake cmd:automake
cmd:gcc$secondaryArchSuffix cmd:gcc$secondaryArchSuffix
cmd:ld$secondaryArchSuffix cmd:ld$secondaryArchSuffix
cmd:libtoolize cmd:libtoolize$secondaryArchSuffix
cmd:make cmd:make
" "
PATCH()
{
patch -p1 -i $sourceDir2/$SOURCE_FILENAME_2
patch -p1 -i $sourceDir3/$SOURCE_FILENAME_3
patch -p1 -i $sourceDir4/$SOURCE_FILENAME_4
patch -p1 -i $sourceDir5/$SOURCE_FILENAME_5
patch -p1 -i $sourceDir6/$SOURCE_FILENAME_6
}
BUILD() BUILD()
{ {
aclocal aclocal
@@ -101,6 +132,8 @@ INSTALL()
{ {
make install make install
rm $libDir/libtiff*.la
prepareInstalledDevelLibs libtiff libtiffxx prepareInstalledDevelLibs libtiff libtiffxx
# devel package # devel package
@@ -120,3 +153,8 @@ INSTALL()
rm -rf $documentationDir rm -rf $documentationDir
fi fi
} }
TEST()
{
make check
}