From d627a1ac33fa99b007f479fccd10885f97e38949 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Mon, 12 Oct 2009 16:13:58 +0000 Subject: [PATCH] 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. --- media-libs/libogg/libogg-1.1.3-haiku.diff | 88 ------------------- .../sdl-image/SDL_image-1.2.6-haiku.diff | 79 ----------------- media-libs/sdl-net/SDL_net-1.2.7-haiku.diff | 61 ------------- media-libs/speex/speex_types.h.diff | 27 ------ 4 files changed, 255 deletions(-) delete mode 100644 media-libs/libogg/libogg-1.1.3-haiku.diff delete mode 100644 media-libs/sdl-image/SDL_image-1.2.6-haiku.diff delete mode 100644 media-libs/sdl-net/SDL_net-1.2.7-haiku.diff delete mode 100644 media-libs/speex/speex_types.h.diff diff --git a/media-libs/libogg/libogg-1.1.3-haiku.diff b/media-libs/libogg/libogg-1.1.3-haiku.diff deleted file mode 100644 index 900224d7b..000000000 --- a/media-libs/libogg/libogg-1.1.3-haiku.diff +++ /dev/null @@ -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 - #endif - #include -@@ -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 - #endif - #include -@@ -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 - #endif - #include -@@ -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 - #endif - #include -@@ -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 - #endif - #include -@@ -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 - #endif - #include -@@ -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 - #endif - #include -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 -+ 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 diff --git a/media-libs/sdl-image/SDL_image-1.2.6-haiku.diff b/media-libs/sdl-image/SDL_image-1.2.6-haiku.diff deleted file mode 100644 index b92f2ff0b..000000000 --- a/media-libs/sdl-image/SDL_image-1.2.6-haiku.diff +++ /dev/null @@ -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 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 says some releases of gcc diff --git a/media-libs/sdl-net/SDL_net-1.2.7-haiku.diff b/media-libs/sdl-net/SDL_net-1.2.7-haiku.diff deleted file mode 100644 index d1d2cc748..000000000 --- a/media-libs/sdl-net/SDL_net-1.2.7-haiku.diff +++ /dev/null @@ -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="" - ;; diff --git a/media-libs/speex/speex_types.h.diff b/media-libs/speex/speex_types.h.diff deleted file mode 100644 index b9154c688..000000000 --- a/media-libs/speex/speex_types.h.diff +++ /dev/null @@ -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 -@@ -73,6 +73,15 @@ - typedef int32_t spx_int32_t; - typedef u_int32_t spx_uint32_t; - -+#elif defined(__HAIKU__) -+ -+ /* Haiku */ -+# include -+ 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 */