Fixed libebml patch. The .bep file is not building a package since DESTDIR isn't supported, so a DESTDIR hack to the makefile may be needed as well.

This commit is contained in:
Scott McCreary
2010-06-30 16:15:36 +00:00
parent 2e8ca5b9cb
commit b464dc52ae
2 changed files with 42 additions and 8 deletions

View File

@@ -6,18 +6,18 @@ STATUS_HAIKU="stable"
DEPEND=""
CHECKSUM_MD5="6d438f03d8928d83a2d120ed02705f03"
BUILD {
cd libebml-1.0.0
cd make
cd linux
cd libebml-1.0.0/make/linux
make
}
INSTALL {
cd libebml-1.0.0
cd make
cd linux
make install
cd libebml-1.0.0/make/linux
if [ -n ${DESTDIR} ];then
make install DESTDIR="${DESTDIR}"
else
make install
fi
}
LICENSE="GNU LGPL v2.1"
COPYRIGHT="2005-2009 CoreCodec, Inc."
COPYRIGHT="2005-2009 CoreCodec, Inc."

View File

@@ -0,0 +1,34 @@
diff -urN libebml-1.0.0/ebml/c/libebml_t.h libebml-1.0.0-haiku/ebml/c/libebml_t.h
--- libebml-1.0.0/ebml/c/libebml_t.h 2010-03-23 11:58:36.007077888 +0000
+++ libebml-1.0.0-haiku/ebml/c/libebml_t.h 2010-06-30 15:54:51.796131328 +0000
@@ -72,7 +72,7 @@
typedef uint16_t uint16;
typedef uint8_t uint8;
# endif // __GNUC__
-#elif defined(__BEOS__)
+#elif defined(__BEOS__) || defined(__HAIKU__)
#include <SupportDefs.h>
#elif defined(DJGPP) /* SL : DJGPP doesn't support POSIX types ???? */
typedef signed long long int64;
@@ -98,7 +98,7 @@
typedef uint32_t uint32;
typedef uint16_t uint16;
typedef uint8_t uint8;
-#elif defined(__BEOS__)
+#elif defined(__BEOS__) || defined (__HAIKU__)
# include <support/SupportDefs.h>
#else // anything else (Linux, BSD, ...)
# include <inttypes.h>
diff -urN libebml-1.0.0/make/linux/Makefile libebml-1.0.0-haiku/make/linux/Makefile
--- libebml-1.0.0/make/linux/Makefile 2010-06-04 08:44:54.013107200 +0000
+++ libebml-1.0.0-haiku/make/linux/Makefile 2010-06-30 15:56:44.801374208 +0000
@@ -13,6 +13,9 @@
# BeOS wants the libs and headers in /boot/home/config
ifeq (BeOS,$(shell uname -s))
prefix=/boot/home/config
+# Haiku wants the libs and headers in /boot/common
+else ifeq (Haiku,$(shell uname -s))
+prefix=/boot/common
else
prefix=/usr/local
endif