+--- vlc-2.0.3-orig/configure.ac	2012-07-03 22:55:34.062652416 +0000
++++ vlc-2.0.3/configure.ac	2012-08-04 15:57:48.747110400 +0000
+@@ -279,11 +279,18 @@
+     SYS=os2
+     LDFLAGS_save="${LDFLAGS_save} -Zomf -Zbin-files -Zargs-wild"; LDFLAGS="${LDFLAGS_save}"
+     ;;
++  *haiku*)
++  	SYS=haiku
++  	VLC_ADD_LIBS([libvlccore libvlc vlc],[-lnetwork])
++	VLC_ADD_PLUGIN([haiku_aout])  	
++	VLC_ADD_LIBS([haiku_aout],[-lmedia])
++  	;;
+   *)
+     SYS="${host_os}"
+     ;;
+ esac
+ AM_CONDITIONAL(HAVE_DARWIN,  test "${SYS}" = "darwin")
++AM_CONDITIONAL(HAVE_HAIKU,	 test "${SYS}" = "haiku")
+ AM_CONDITIONAL(HAVE_LINUX,   test "${SYS}" = "linux")
+ AM_CONDITIONAL(HAVE_OS2,     test "${SYS}" = "os2")
+ AM_CONDITIONAL(HAVE_WIN32,   test "${SYS}" = "mingw32")
+@@ -513,10 +520,13 @@
+ dnl Check for system libs needed
+ need_libc=false
+ 
++#this fails to detect that we have if_nameindex and if_nametoindex on haiku
++#and then it dails to detect that we don't have tdestroy...
++
+ dnl Check for usual libc functions
+ AC_CHECK_DECLS([nanosleep],,,[#include <time.h>])
+ AC_CHECK_FUNCS([daemon fcntl fstatvfs fork getenv getpwuid_r if_nameindex if_nametoindex isatty lstat memalign mmap openat pread posix_fadvise posix_madvise setlocale stricmp strnicmp strptime uselocale])
+-AC_REPLACE_FUNCS([atof atoll dirfd fdopendir flockfile fsync getdelim getpid gmtime_r inet_pton lldiv localtime_r nrand48 rewind setenv strcasecmp strcasestr strdup strlcpy strncasecmp strndup strnlen strsep strtof strtok_r strtoll swab tdestroy])
++AC_REPLACE_FUNCS([atof atoll dirfd fdopendir flockfile fsync getdelim getpid gmtime_r inet_pton lldiv localtime_r nrand48 rewind setenv strcasecmp strcasestr strdup strlcpy strncasecmp strndup strnlen strsep strtof strtok_r strtoll swab])
+ AC_CHECK_FUNCS(fdatasync,,
+   [AC_DEFINE(fdatasync, fsync, [Alias fdatasync() to fsync() if missing.])
+ ])
+@@ -578,6 +588,9 @@
+   AS_IF([test "${SYS}" = "mingwce"], [
+     SOCKET_LIBS="-lws2"
+   ])
++  AS_IF([test "${SYS}" = "haiku"], [
++    SOCKET_LIBS="-lnetwork"
++  ])
+ ])
+ LIBS="$LIBS_save"
+ AS_IF([test -n "$SOCKET_LIBS"], [
+@@ -4162,7 +4175,7 @@
+ dnl  Stuff used by the program
+ dnl
+ VERSION_MESSAGE="${VERSION} ${CODENAME}"
+-COPYRIGHT_MESSAGE="Copyright © ${COPYRIGHT_YEARS} VLC authors and VideoLAN"
++COPYRIGHT_MESSAGE="Copyright (C) ${COPYRIGHT_YEARS} VLC authors and VideoLAN"
+ AC_DEFINE_UNQUOTED(VERSION_MESSAGE, "${VERSION_MESSAGE}", [Simple version string])
+ AC_DEFINE_UNQUOTED(COPYRIGHT_MESSAGE, "${COPYRIGHT_MESSAGE}", [Copyright string])
+ AC_DEFINE_UNQUOTED(COPYRIGHT_YEARS, "${COPYRIGHT_YEARS}", [The copyright years])
+
 --- vlc-2.0.3-orig/src/modules/bank.c	2011-12-08 18:00:28.032243712 +0000
 +++ vlc-2.0.3/src/modules/bank.c	2012-07-30 22:00:12.285736960 +0000
 @@ -71,28 +71,30 @@

 #else
 # define DEFAULT_FONT_FILE "/usr/share/fonts/truetype/freefont/FreeSerifBold.ttf"
 # define DEFAULT_FAMILY "Serif Bold"

 int setenv (const char *name, const char *value, int overwrite)
 {
     if (override)
--- vlc-2.0.3-orig/modules/text_renderer/freetype.c	2012-06-20 18:07:49.059244544 +0000
+++ vlc-2.0.3/modules/text_renderer/freetype.c	2012-08-04 15:22:01.509870080 +0000
@@ -58,6 +58,9 @@
