Ticket #466: vlc-1.1.5-20101107.patch

bin/override.c

@@ -120 +120 @@
  *
  * Some evil libraries modify the environment. We currently ignore the calls as
  * they could crash the process. This may cause funny behaviour though. */
+#if !defined(__HAIKU__)
 int putenv (char *str)
 {
     if (override)
@@ -129 +130 @@
     }
     return CALL(putenv, str);
 }
+#endif
 
 int setenv (const char *name, const char *value, int overwrite)
 {
@@ -220 +222 @@
     return SIG_DFL;
 }
 
+#ifndef SA_SIGINFO
+#define SA_SIGINFO              0x40
+#endif
+
 int sigaction (int signum, const struct sigaction *act, struct sigaction *old)
 {
     if (override && act != NULL)

configure.ac

@@ -379 +379 @@
         VLC_ADD_LIBS([filesystem access_ftp access_mms access_output_udp oldtelnet netsync sap libvlccore growl_udp],[-lnet])
     fi
     ;;
+  haiku)
+    SYS=beos
+    CFLAGS_save="${CFLAGS_save} -Wno-multichar"; CFLAGS="${CFLAGS_save}"
+    CXXFLAGS_save="${CXXFLAGS_save} -Wno-multichar"; CXXFLAGS="${CXXFLAGS_save}"
+    VLC_ADD_CXXFLAGS([beos],[])
+    VLC_ADD_LIBS([vlc libvlccore logger],[-lbe])
+    VLC_ADD_LIBS([dvdnav dvdread],[-lroot])
+    VLC_ADD_LIBS([filesystem],[-lroot])
+    VLC_ADD_LIBS([network],[-lnetwork])
+    LDFLAGS_save="${LDFLAGS_save} -lintl"; LDFLAGS="${LDFLAGS_save}"
+    VLC_ADD_LIBS([filesystem access_ftp access_mms access_output_udp oldtelnet netsync sap libvlccore growl_udp],[-lnetwork])
+    ;;
+
   *)
     SYS="${host_os}"
     ;;
@@ -4713 +4726 @@
 dnl  Stuff used by the program
 dnl
 VERSION_MESSAGE="${VERSION} ${CODENAME}"
-COPYRIGHT_MESSAGE="Copyright © ${COPYRIGHT_YEARS} the VideoLAN team"
+COPYRIGHT_MESSAGE="Copyright C ${COPYRIGHT_YEARS} the VideoLAN team"
 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])

modules/codec/avcodec/subtitle.c

@@ -66 +66 @@
 
     /* */
     switch (codec_id) {
-    case CODEC_ID_HDMV_PGS_SUBTITLE:
     case CODEC_ID_XSUB:
         break;
     default:

modules/control/signals.c

@@ -84 +84 @@
     free (p_sys);
 }
 
+#ifndef SA_SIGINFO
+#define SA_SIGINFO              0x40
+#endif
+
 static bool ignored (int signum)
 {
     struct sigaction sa;
@@ -91 +95 @@
     if (sigaction (signum, NULL, &sa))
         return false;
     return ((sa.sa_flags & SA_SIGINFO)
-            ? (void *)sa.sa_sigaction : (void *)sa.sa_handler) == SIG_IGN;
+            ? (void *)sigaction : (void *)sa.sa_handler) == SIG_IGN;
 }
 
 static void *SigThread (void *data)

src/misc/variables.c

@@ -396 +396 @@
 {
     vlc_object_internals_t *priv = vlc_internals( obj );
 
-    tdestroy( priv->var_root, CleanupVar );
+    vlc_tdestroy( priv->var_root, CleanupVar );
 }
 
 #undef var_Change

src/network/io.c

@@ -213 +213 @@
         switch (ptr->ai_socktype)
         {
             case SOCK_STREAM:
-            case SOCK_RDM:
             case SOCK_SEQPACKET:
 #ifdef SOCK_DCCP
             case SOCK_DCCP: