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

tiff4: bump version.

Browse Source
This commit is contained in:
Jerome Duval
2015-08-11 18:14:50 +00:00
parent 00b581c97b
commit 7902328bab
3 changed files with 70 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
media-libs/tiff/patches/tiff-4.0.3.patch
View File

@@ -1,26 +0,0 @@
diff --git a/libtiff/tiff.h b/libtiff/tiff.h
index 5c32d3a..370827d 100644
--- a/libtiff/tiff.h
+++ b/libtiff/tiff.h
@@ -65,6 +65,12 @@
* strings unsigned char*
*/
+#ifdef __HAIKU__
+
+#include <SupportDefs.h>
+
+#else
+
typedef TIFF_INT8_T int8;
typedef TIFF_UINT8_T uint8;
@@ -77,6 +83,8 @@ typedef TIFF_UINT32_T uint32;
typedef TIFF_INT64_T int64;
typedef TIFF_UINT64_T uint64;
+#endif
+
/*
* Some types as promoted in a variable argument list
* We use uint16_vap rather then directly using int, because this way

64
media-libs/tiff/patches/tiff4-4.0.4.patchset Normal file
View File

@@ -0,0 +1,64 @@
From 7ef15b6a0adeaad6285ca1449fa432b8c3896d4f Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Tue, 11 Aug 2015 17:32:57 +0000
Subject: applying patch tiff-4.0.3.patch
diff --git a/libtiff/tiff.h b/libtiff/tiff.h
index bc46acd..4500e6a 100644
--- a/libtiff/tiff.h
+++ b/libtiff/tiff.h
@@ -65,6 +65,12 @@
* strings unsigned char*
*/
+#ifdef __HAIKU__
+
+#include <SupportDefs.h>
+
+#else
+
typedef TIFF_INT8_T int8;
typedef TIFF_UINT8_T uint8;
@@ -77,6 +83,8 @@ typedef TIFF_UINT32_T uint32;
typedef TIFF_INT64_T int64;
typedef TIFF_UINT64_T uint64;
+#endif
+
/*
* Some types as promoted in a variable argument list
* We use uint16_vap rather then directly using int, because this way
--
2.2.2
From 2c7a559393ece94809e7290fd35995c1f84dc6e7 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Tue, 11 Aug 2015 18:07:00 +0000
Subject: remove GL libraries checks, gcc2 loops forever..
diff --git a/m4/acinclude.m4 b/m4/acinclude.m4
index b54feb7..efde82c 100644
--- a/m4/acinclude.m4
+++ b/m4/acinclude.m4
@@ -273,13 +273,7 @@ for ax_lib in ${ax_check_libs}; do
[ax_try_lib="${ax_lib}"])
LIBS="${ax_try_lib} ${GL_LIBS} ${ax_save_LIBS}"
AC_LINK_IFELSE([AX_CHECK_GL_PROGRAM],
- [ax_cv_check_gl_libgl="${ax_try_lib}"; break],
- [ax_check_gl_nvidia_flags="-L/usr/${ax_check_gl_libdir}/nvidia" LIBS="${ax_try_lib} ${ax_check_gl_nvidia_flags} ${GL_LIBS} ${ax_save_LIBS}"
-AC_LINK_IFELSE([AX_CHECK_GL_PROGRAM],
- [ax_cv_check_gl_libgl="${ax_try_lib} ${ax_check_gl_nvidia_flags}"; break],
- [ax_check_gl_dylib_flag='-dylib_file /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib' LIBS="${ax_try_lib} ${ax_check_gl_dylib_flag} ${GL_LIBS} ${ax_save_LIBS}"
-AC_LINK_IFELSE([AX_CHECK_GL_PROGRAM],
- [ax_cv_check_gl_libgl="${ax_try_lib} ${ax_check_gl_dylib_flag}"; break])])])
+ [ax_cv_check_gl_libgl="${ax_try_lib}"; break],)
done
AS_IF([test "X$ax_cv_check_gl_libgl" = Xno -a "X$no_x" = Xyes],
--
2.2.2

13
media-libs/tiff/tiff4-4.0.3.recipe → media-libs/tiff/tiff4-4.0.4.recipe
View File

@@ -8,17 +8,17 @@ COPYRIGHT="1988-1997 Sam Leffler
LICENSE="MIT"
REVISION="1"
SOURCE_URI="ftp://ftp.remotesensing.org/pub/libtiff/tiff-$portVersion.tar.gz"
CHECKSUM_SHA256="ea1aebe282319537fb2d4d7805f478dd4e0e05c33d0928baba76a7c963684872"
CHECKSUM_SHA256="8cb1d90c96f61cdfc0bcf036acc251c9dbe6320334da941c7a83cfe1576ef890"
SOURCE_DIR="tiff-$portVersion"
PATCHES="tiff-4.0.3.patch"
PATCHES="tiff4-$portVersion.patchset"
ARCHITECTURES="x86_gcc2 x86 x86_64"
SECONDARY_ARCHITECTURES="x86_gcc2 x86"
PROVIDES="
tiff4$secondaryArchSuffix = $portVersion compat >= 4
lib:libtiff$secondaryArchSuffix = 5.2.0 compat >= 5
lib:libtiffxx$secondaryArchSuffix = 5.2.0 compat >= 5
lib:libtiff$secondaryArchSuffix = 5.2.2 compat >= 5
lib:libtiffxx$secondaryArchSuffix = 5.2.2 compat >= 5
"
REQUIRES="
haiku$secondaryArchSuffix
@@ -29,8 +29,8 @@ REQUIRES="
PROVIDES_devel="
tiff4${secondaryArchSuffix}_devel = $portVersion compat >= 4
devel:libtiff$secondaryArchSuffix = 5.2.0 compat >= 5
devel:libtiffxx$secondaryArchSuffix = 5.2.0 compat >= 5
devel:libtiff$secondaryArchSuffix = 5.2.2 compat >= 5
devel:libtiffxx$secondaryArchSuffix = 5.2.2 compat >= 5
"
REQUIRES_devel="
tiff4$secondaryArchSuffix == $portVersion base
@@ -103,7 +103,6 @@ BUILD()
{
autoreconf -fi
runConfigure ./configure --with-docdir=$documentationDir/$portName
# --enable-shared
make $jobArgs
}