* patch ogg because it's broken (userdefined defines in public headers are WAY evil)

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index eb98081d5d320721565a25d9ec7fb8f400b98d38..2363d6e9191fdad677d7c380529d8bd6507ffd9f 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -477,6 +477,7 @@ libogg-$(OGG_VERSION).tar.gz:
 
 libogg: libogg-$(OGG_VERSION).tar.gz
        $(EXTRACT_GZ)
+       patch -p 0 < Patches/ogg.patch
 
 .ogg: libogg
        (cd $<; ./configure $(HOSTCONF) --prefix=$(PREFIX) && make && make install)

diff --git a/extras/contrib/src/Patches/ogg.patch b/extras/contrib/src/Patches/ogg.patch
new file mode 100644 (file)
index 0000000..56dd647
--- /dev/null
+++ b/extras/contrib/src/Patches/ogg.patch
@@ -0,0 +1,16 @@
+diff -ruN libogg.orig/include/ogg/os_types.h libogg/include/ogg/os_types.h
+--- libogg.orig/include/ogg/os_types.h 2004-09-23 15:26:58.000000000 +0200
++++ libogg/include/ogg/os_types.h      2005-08-25 18:42:01.000000000 +0200
+@@ -120,6 +120,12 @@
+ #else
+ 
+ #  include <sys/types.h>
++#if defined( HAVE_INTTYPES_H )
++#  include <inttypes.h>
++#endif
++#if defined( HAVE_STDINT_H )
++#  include <stdint.h>
++#endif
+ #  include <ogg/config_types.h>
+ 
+ #endif