mirror of
https://github.com/yann64/haikuports.git
synced 2026-05-05 06:28:55 +02:00
65 lines
2.1 KiB
Plaintext
65 lines
2.1 KiB
Plaintext
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
|
|
|