mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-22 11:40:06 +02:00
Removed speex, sdl-image, libogg and sdl-net patches that are no longer needed as they have been applied upstream or only affected autotools files.
This commit is contained in:
Scott McCreary
@@ -1,88 +0,0 @@
|
||||
diff -ur libogg-1.1.3/configure.in libogg-1.1.3-haiku/configure.in
|
||||
--- libogg-1.1.3/configure.in 2005-11-28 04:26:07.000000000 +0000
|
||||
+++ libogg-1.1.3-haiku/configure.in 2008-05-30 11:00:35.000000000 +0000
|
||||
@@ -84,7 +84,7 @@
|
||||
AC_MSG_CHECKING(for int16_t)
|
||||
AC_CACHE_VAL(has_int16_t,
|
||||
[AC_TRY_RUN([
|
||||
-#ifdef __BEOS__
|
||||
+#if defined __BEOS__ && !defined __HAIKU__
|
||||
#include <inttypes.h>
|
||||
#endif
|
||||
#include <sys/types.h>
|
||||
@@ -100,7 +100,7 @@
|
||||
AC_MSG_CHECKING(for int32_t)
|
||||
AC_CACHE_VAL(has_int32_t,
|
||||
[AC_TRY_RUN([
|
||||
-#ifdef __BEOS__
|
||||
+#if defined __BEOS__ && !defined __HAIKU__
|
||||
#include <inttypes.h>
|
||||
#endif
|
||||
#include <sys/types.h>
|
||||
@@ -116,7 +116,7 @@
|
||||
AC_MSG_CHECKING(for uint32_t)
|
||||
AC_CACHE_VAL(has_uint32_t,
|
||||
[AC_TRY_RUN([
|
||||
-#ifdef __BEOS__
|
||||
+#if defined __BEOS__ && !defined __HAIKU__
|
||||
#include <inttypes.h>
|
||||
#endif
|
||||
#include <sys/types.h>
|
||||
@@ -132,7 +132,7 @@
|
||||
AC_MSG_CHECKING(for uint16_t)
|
||||
AC_CACHE_VAL(has_uint16_t,
|
||||
[AC_TRY_RUN([
|
||||
-#ifdef __BEOS__
|
||||
+#if defined __BEOS__ && !defined __HAIKU__
|
||||
#include <inttypes.h>
|
||||
#endif
|
||||
#include <sys/types.h>
|
||||
@@ -148,7 +148,7 @@
|
||||
AC_MSG_CHECKING(for u_int32_t)
|
||||
AC_CACHE_VAL(has_u_int32_t,
|
||||
[AC_TRY_RUN([
|
||||
-#ifdef __BEOS__
|
||||
+#if defined __BEOS__ && !defined __HAIKU__
|
||||
#include <inttypes.h>
|
||||
#endif
|
||||
#include <sys/types.h>
|
||||
@@ -164,7 +164,7 @@
|
||||
AC_MSG_CHECKING(for u_int16_t)
|
||||
AC_CACHE_VAL(has_u_int16_t,
|
||||
[AC_TRY_RUN([
|
||||
-#ifdef __BEOS__
|
||||
+#if defined __BEOS__ && !defined __HAIKU__
|
||||
#include <inttypes.h>
|
||||
#endif
|
||||
#include <sys/types.h>
|
||||
@@ -180,7 +180,7 @@
|
||||
AC_MSG_CHECKING(for int64_t)
|
||||
AC_CACHE_VAL(has_int64_t,
|
||||
[AC_TRY_RUN([
|
||||
-#ifdef __BEOS__
|
||||
+#if defined __BEOS__ && !defined __HAIKU__
|
||||
#include <inttypes.h>
|
||||
#endif
|
||||
#include <sys/types.h>
|
||||
diff -ur libogg-1.1.3/include/ogg/os_types.h libogg-1.1.3-haiku/include/ogg/os_types.h
|
||||
--- libogg-1.1.3/include/ogg/os_types.h 2005-11-28 04:26:05.000000000 +0000
|
||||
+++ libogg-1.1.3-haiku/include/ogg/os_types.h 2008-05-30 12:50:50.000000000 +0000
|
||||
@@ -73,7 +73,17 @@
|
||||
typedef u_int32_t ogg_uint32_t;
|
||||
typedef int64_t ogg_int64_t;
|
||||
|
||||
-#elif defined(__BEOS__)
|
||||
+#elif defined(__HAIKU__)
|
||||
+
|
||||
+ /* Haiku */
|
||||
+# include <sys/types.h>
|
||||
+ typedef short ogg_int16_t;
|
||||
+ typedef unsigned short ogg_uint16_t;
|
||||
+ typedef int ogg_int32_t;
|
||||
+ typedef unsigned int ogg_uint32_t;
|
||||
+ typedef long long ogg_int64_t;
|
||||
+
|
||||
+#elif defined(__BEOS__)
|
||||
|
||||
/* Be */
|
||||
# include <inttypes.h>
|
||||
@@ -1,79 +0,0 @@
|
||||
diff -urN SDL_image-1.2.6/acinclude/libtool.m4 SDL_image-1.2.6-haiku/acinclude/libtool.m4
|
||||
--- SDL_image-1.2.6/acinclude/libtool.m4 2007-07-13 03:38:28.000000000 +0000
|
||||
+++ SDL_image-1.2.6-haiku/acinclude/libtool.m4 2008-06-30 09:50:10.000000000 +0000
|
||||
@@ -734,6 +734,12 @@
|
||||
lt_cv_sys_max_cmd_len=8192;
|
||||
;;
|
||||
|
||||
+ haiku*)
|
||||
+ # On Haiku, this test takes a really really long time.
|
||||
+ # Haiku has a maximum line length of 4096 for now.
|
||||
+ lt_cv_sys_max_cmd_len=4096;
|
||||
+ ;;
|
||||
+
|
||||
amigaos*)
|
||||
# On AmigaOS with pdksh, this test takes hours, literally.
|
||||
# So we just punt and use a minimum line length of 8192.
|
||||
@@ -1288,7 +1294,7 @@
|
||||
finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
|
||||
;;
|
||||
|
||||
-beos*)
|
||||
+beos* | haiku*)
|
||||
library_names_spec='${libname}${shared_ext}'
|
||||
dynamic_linker="$host_os ld.so"
|
||||
shlibpath_var=LIBRARY_PATH
|
||||
@@ -2287,7 +2293,7 @@
|
||||
lt_cv_deplibs_check_method=pass_all
|
||||
;;
|
||||
|
||||
-beos*)
|
||||
+beos* | haiku*)
|
||||
lt_cv_deplibs_check_method=pass_all
|
||||
;;
|
||||
|
||||
@@ -2505,7 +2511,7 @@
|
||||
[AC_REQUIRE([AC_CANONICAL_HOST])dnl
|
||||
LIBM=
|
||||
case $host in
|
||||
-*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
|
||||
+*-*-beos* | haiku* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
|
||||
# These system don't have libm, or don't need it
|
||||
;;
|
||||
*-ncr-sysv4.3*)
|
||||
@@ -2996,7 +3002,7 @@
|
||||
fi
|
||||
;;
|
||||
|
||||
- beos*)
|
||||
+ beos* | haiku*)
|
||||
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
|
||||
_LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
|
||||
# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
|
||||
@@ -4850,7 +4856,7 @@
|
||||
# like `-m68040'.
|
||||
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
|
||||
;;
|
||||
- beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
|
||||
+ beos* | haiku* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
|
||||
# PIC is the default for these OSes.
|
||||
;;
|
||||
mingw* | os2* | pw32*)
|
||||
@@ -5123,7 +5129,7 @@
|
||||
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
|
||||
;;
|
||||
|
||||
- beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
|
||||
+ beos* | haiku* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
|
||||
# PIC is the default for these OSes.
|
||||
;;
|
||||
|
||||
@@ -5490,7 +5496,7 @@
|
||||
_LT_AC_TAGVAR(ld_shlibs, $1)=no
|
||||
;;
|
||||
|
||||
- beos*)
|
||||
+ beos* | haiku*)
|
||||
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
|
||||
_LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
|
||||
# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
|
||||
@@ -1,61 +0,0 @@
|
||||
diff -urN SDL_net-1.2.7/acinclude/libtool.m4 SDL_net-1.2.7-haiku/acinclude/libtool.m4
|
||||
--- SDL_net-1.2.7/acinclude/libtool.m4 2007-07-15 01:34:07.000000000 +0000
|
||||
+++ SDL_net-1.2.7-haiku/acinclude/libtool.m4 2008-07-10 23:46:27.000000000 +0000
|
||||
@@ -1288,7 +1288,7 @@
|
||||
finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
|
||||
;;
|
||||
|
||||
-beos*)
|
||||
+beos* | haiku*)
|
||||
library_names_spec='${libname}${shared_ext}'
|
||||
dynamic_linker="$host_os ld.so"
|
||||
shlibpath_var=LIBRARY_PATH
|
||||
@@ -2287,7 +2287,7 @@
|
||||
lt_cv_deplibs_check_method=pass_all
|
||||
;;
|
||||
|
||||
-beos*)
|
||||
+beos* | haiku*)
|
||||
lt_cv_deplibs_check_method=pass_all
|
||||
;;
|
||||
|
||||
@@ -2505,7 +2505,7 @@
|
||||
[AC_REQUIRE([AC_CANONICAL_HOST])dnl
|
||||
LIBM=
|
||||
case $host in
|
||||
-*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
|
||||
+*-*-beos* | *-*-haiku* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
|
||||
# These system don't have libm, or don't need it
|
||||
;;
|
||||
*-ncr-sysv4.3*)
|
||||
@@ -4850,7 +4850,7 @@
|
||||
# like `-m68040'.
|
||||
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
|
||||
;;
|
||||
- beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
|
||||
+ beos* | haiku* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
|
||||
# PIC is the default for these OSes.
|
||||
;;
|
||||
mingw* | os2* | pw32*)
|
||||
@@ -5123,7 +5123,7 @@
|
||||
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
|
||||
;;
|
||||
|
||||
- beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
|
||||
+ beos* | haiku* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
|
||||
# PIC is the default for these OSes.
|
||||
;;
|
||||
|
||||
diff -urN SDL_net-1.2.7/configure.in SDL_net-1.2.7-haiku/configure.in
|
||||
--- SDL_net-1.2.7/configure.in 2007-07-20 12:40:02.000000000 +0000
|
||||
+++ SDL_net-1.2.7-haiku/configure.in 2008-07-10 23:48:29.000000000 +0000
|
||||
@@ -92,6 +92,9 @@
|
||||
*-*-beos*)
|
||||
INETLIB=""
|
||||
;;
|
||||
+ *-*-haiku*)
|
||||
+ INETLIB="-lnetwork"
|
||||
+ ;;
|
||||
*)
|
||||
INETLIB=""
|
||||
;;
|
||||
@@ -1,27 +0,0 @@
|
||||
--- speex_types.h-old 2006-05-25 11:24:43.000000000 +0000
|
||||
+++ speex_types.h 2008-05-15 01:19:23.000000000 +0000
|
||||
@@ -64,7 +64,7 @@
|
||||
typedef int32_t spx_int32_t;
|
||||
typedef u_int32_t spx_uint32_t;
|
||||
|
||||
-#elif defined(__BEOS__)
|
||||
+#elif defined(__BEOS__) && !defined(__HAIKU__)
|
||||
|
||||
/* Be */
|
||||
# include <inttypes.h>
|
||||
@@ -73,6 +73,15 @@
|
||||
typedef int32_t spx_int32_t;
|
||||
typedef u_int32_t spx_uint32_t;
|
||||
|
||||
+#elif defined(__HAIKU__)
|
||||
+
|
||||
+ /* Haiku */
|
||||
+# include <sys/types.h>
|
||||
+ typedef short spx_int16_t;
|
||||
+ typedef unsigned short spx_uint16_t;
|
||||
+ typedef int spx_int32_t;
|
||||
+ typedef unsigned int spx_uint32_t;
|
||||
+
|
||||
#elif defined (__EMX__)
|
||||
|
||||
/* OS/2 GCC */
|
||||
Reference in New Issue
Block a user