Remove unmaintained BeOS support

INSTALL

@@ -1,6 +1,6 @@
 INSTALL file for the VLC media player
 
-More extensive information for *nix, Windows, Mac OS X and BeOS users can be
+More extensive information for *nix, Windows and Mac OS X users can be
 found here: http://developers.videolan.org/vlc/
 
 Bootstrapping VLC
@@ -25,8 +25,8 @@ symbols:
 
 We recommend using GCC to build VLC, though some people reported success
 with the Intel C compiler (version 8) as well. GCC version 3.3 or higher is
-required. On older systems (e.g. FreeBSD 4.x, BeOS), please select a more
-recent version manually by setting the CC and CXX environment variables
+required. On older systems (e.g. FreeBSD 4.x), please select a more recent
+version manually by setting the CC and CXX environment variables
 appropriately while running the ./configure shell script.
 
 

Makefile.am

@@ -352,32 +352,6 @@ doc:
 
 .PHONY: libvlc core doc
 
-if HAVE_BEOS
-noinst_DATA = vlc-bundle
-vlc-bundle: vlc
-	rm -Rf $(top_builddir)/vlc-bundle ; mkdir -p $(top_builddir)/vlc-bundle
-	cp $(top_builddir)/vlc $(top_builddir)/vlc-bundle/
-	xres -o $(top_builddir)/vlc-bundle/vlc $(srcdir)/share/vlc_beos.rsrc
-	for i in "" `$(VLC_CONFIG) --target plugin` ; do \
-	  if test -n "$$i" ; then \
-	    mkdir -p $(top_builddir)/vlc-bundle/plugins ; \
-	    cp "$$i$(LIBEXT)" $(top_builddir)/vlc-bundle/plugins/ ; \
-	  fi ; \
-	done
-	if test -d $(CONTRIB_DIR)/vlc-lib ; then \
-	  mkdir -p $(top_builddir)/vlc-bundle/lib ; \
-	  for i in $(CONTRIB_DIR)/vlc-lib/*.so ; do \
-	    cp $$i $(top_builddir)/vlc-bundle/lib/ ; \
-	  done ; \
-	fi
-	cat $(top_srcdir)/po/LINGUAS | while read i; do \
-	  mkdir -p "$(top_builddir)/vlc-bundle/share/locale/$$i/LC_MESSAGES" ; \
-	  cp "$(top_builddir)/po/$$i.gmo" \
-	    "$(top_builddir)/vlc-bundle/share/locale/$$i/LC_MESSAGES/vlc.mo" || true ; \
-	done
-	find $(top_builddir)/vlc-bundle -type f -exec mimeset -f "{}" \;
-endif
-
 ###############################################################################
 # Building aliases
 ###############################################################################

bootstrap

@@ -41,11 +41,6 @@ if test -d extras/contrib/build/bin; then
     DYLD_LIBRARY_PATH=./extras/contrib/build/lib:$DYLD_LIBRARY_PATH
     export LD_LIBRARY_PATH
     export DYLD_LIBRARY_PATH
-  elif test ".`uname -s`" = ".BeOS"; then
-    LIBRARY_PATH=./extras/contrib/build/lib:$LIBRARY_PATH
-    BELIBRARIES=./extras/contrib/build/lib:$BELIBRARIES
-    export LIBRARY_PATH
-    export BELIBRARIES
   fi
 elif test ".`uname -s`" = ".Darwin"; then
   set +x

configure.ac

@@ -138,9 +138,6 @@ AS_IF([test "${with_contrib}" != "no"],[
     if test "${SYS}" = "darwin"; then
       export LD_LIBRARY_PATH="${CONTRIB_DIR}/lib:$LD_LIBRARY_PATH"
       export DYLD_LIBRARY_PATH="${CONTRIB_DIR}/lib:$DYLD_LIBRARY_PATH"
-    elif test "${SYS}" = "beos"; then
-      export LIBRARY_PATH="${CONTRIB_DIR}/lib:$LIBRARY_PATH"
-      export BELIBRARIES="${CONTRIB_DIR}/lib:$BELIBRARIES"
     fi
   ],[
     AC_MSG_RESULT([no])
@@ -362,27 +359,10 @@ case "${host_os}" in
   hpux*)
     SYS=hpux
     ;;
-  beos)
-    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],[-ldl])
-    VLC_ADD_LIBS([filesystem],[-lpoll])
-    LDFLAGS_save="${LDFLAGS_save} -lintl"; LDFLAGS="${LDFLAGS_save}"
-    dnl Check for BONE
-    if test -f /boot/beos/system/lib/libbind.so; then
-        VLC_ADD_LIBS([filesystem access_ftp access_mms access_output_udp netsync sap libvlccore growl_udp],[-lbind -lsocket])
-    else
-        VLC_ADD_LIBS([filesystem access_ftp access_mms access_output_udp netsync sap libvlccore growl_udp],[-lnet])
-    fi
-    ;;
   *)
     SYS="${host_os}"
     ;;
 esac
-AM_CONDITIONAL(HAVE_BEOS, test "${SYS}" = "beos")
 AM_CONDITIONAL(HAVE_DARWIN, test "${SYS}" = "darwin")
 AM_CONDITIONAL(HAVE_LINUX, [test "${SYS}" = "linux"])
 AM_CONDITIONAL(HAVE_WIN32, test "${SYS}" = "mingw32")
@@ -722,14 +702,6 @@ if test "${ac_cv_have_plugins}" = "no"; then
   fi
 fi
 
-# BeOS style
-if test "${ac_cv_have_plugins}" = "no"; then
-  AC_CHECK_HEADERS(image.h)
-  AC_CHECK_FUNCS(load_add_on,
-   [AC_DEFINE(HAVE_DL_BEOS, 1, [Define if you have the BeOS dl])
-    ac_cv_have_plugins=yes])
-fi
-
 # Only test for dlopen() if the others didn't work
 LIBDL=""
 if test "${ac_cv_have_plugins}" = "no" -o "${SYS}" = "darwin"; then
@@ -1043,16 +1015,12 @@ if test "${ac_cv_c_fast_math}" != "no"; then
 fi
 
 dnl Check for -funroll-loops
-dnl Disabled on BeOS because BeOS' gcc is buggy and may crash with it
-if test "${SYS}" != "beos"
-then
-  AC_CACHE_CHECK([if \$CC accepts -funroll-loops],
-      [ac_cv_c_unroll_loops],
-      [CFLAGS="${CFLAGS_save} -funroll-loops"
-       AC_TRY_COMPILE([],,ac_cv_c_unroll_loops=yes, ac_cv_c_unroll_loops=no)])
-  if test "${ac_cv_c_unroll_loops}" != "no"; then
-      CFLAGS_OPTIM_SPEED="${CFLAGS_OPTIM_SPEED} -funroll-loops"
-  fi
+AC_CACHE_CHECK([if \$CC accepts -funroll-loops],
+    [ac_cv_c_unroll_loops],
+    [CFLAGS="${CFLAGS_save} -funroll-loops"
+     AC_TRY_COMPILE([],,ac_cv_c_unroll_loops=yes, ac_cv_c_unroll_loops=no)])
+if test "${ac_cv_c_unroll_loops}" != "no"; then
+    CFLAGS_OPTIM_SPEED="${CFLAGS_OPTIM_SPEED} -funroll-loops"
 fi
 
 dnl Check for -fomit-frame-pointer
@@ -1859,7 +1827,7 @@ dnl
 dnl dvdread module: check for libdvdread
 dnl
 dnl prepend -ldvdcss on OS that need it
-AS_CASE(["${SYS}"], [mingw32|darwin|beos], [VLC_ADD_LIBS([dvdread], [-ldvdcss])])
+AS_CASE(["${SYS}"], [mingw32|darwin], [VLC_ADD_LIBS([dvdread], [-ldvdcss])])
 PKG_ENABLE_MODULES_VLC([DVDREAD], [], [dvdread], [dvdread input module], [auto])
 
 dnl
@@ -1870,7 +1838,7 @@ AC_ARG_ENABLE(dvdnav,
 if test "${enable_dvdnav}" != "no"
 then
   dnl prepend -ldvdcss on OS that need it
-  AS_CASE(["${SYS}"], [mingw32|darwin|beos], [VLC_ADD_LIBS([dvdnav], [-ldvdcss])])
+  AS_CASE(["${SYS}"], [mingw32|darwin], [VLC_ADD_LIBS([dvdnav], [-ldvdcss])])
 
   DVDNAV_PATH="${PATH}"
   AC_ARG_WITH(dvdnav-config-path,
@@ -2295,10 +2263,6 @@ if test "${enable_screen}" != "no"; then
     VLC_ADD_LIBS([screen],[-lgdi32])
   elif test "${SYS}" = "mingwce"; then
     CPPFLAGS="${CPPFLAGS_save}"
-  elif test "${SYS}" = "beos"; then
-    VLC_ADD_PLUGIN([screen])
-    VLC_ADD_CXXFLAGS([screen],[])
-    VLC_ADD_LIBS([screen],[-lbe])
   fi
 fi
 
@@ -3681,9 +3645,9 @@ dnl Skins2 module
 dnl
 AC_ARG_ENABLE(skins2,
   [AS_HELP_STRING([--enable-skins2],[Skins2 interface module (default
-   enabled except on MacOSX, BeOS and WinCE)])])
+   enabled except on MacOSX and WinCE)])])
 if test "${enable_skins2}" != "no" ||
-  (test "${SYS}" != "darwin" && test "${SYS}" != "beos" &&
+  (test "${SYS}" != "darwin" &&
    test "${SYS}" != "mingwce" && test "${enable_skins2}" == "yes"); then
 
   dnl test for the required libraries
@@ -3721,7 +3685,7 @@ if test "${enable_skins2}" != "no" ||
   fi fi fi
 fi
 AM_CONDITIONAL(BUILD_SKINS, [test "${enable_skins2}" = "yes" ||
-	 (test "${SYS}" != "darwin" && test "${SYS}" != "beos" &&
+	 (test "${SYS}" != "darwin" &&
 	  test "${SYS}" != "mingwce" && test "${enable_skins2}" != "no")])
 
 dnl

doc/release-howto.txt

@@ -32,14 +32,6 @@
   - Put the relevant win32 contrib package
   - Update developers.v.o/vlc and www.v.o/vlc/download-sources.html
 
- * BeOS Packages
-    Information on building: http://developers.videolan.org/vlc/beos-compile.html
-    Configure with --enable-update-check
-    Build in the "buildbeos" chroot on altair.
-    # add the .zip files to /opt/ftp/pub/videolan/testing/vlc-X.X.X/beos/
-    generate md5 plus SHA1 hashes and gpg signature of these files
-    (c.f. Tarballs)
-
  * Win32 Packages
     make the packages using the nightly builds configure/options/... , don't
      forget --enable-update-check

extras/contrib/README

@@ -1,13 +1,13 @@
 This is the contrib build system for VLC Media Player. It has been
-primarily developed for Mac, it has been adapted for BeOs and win32.
+primarily developed for Mac, it has been adapted for Win32.
 It would be not too difficult to extend it to other sytem.
 
 To use it, first in the contrib directory, type :
 	./bootstrap
 
 You can specify an argument to cross compile, for example:
-    ./bootstrap i586-pc-beos
-This will look for a i586-pc-beos-gcc cross compiler. Default is to
+    ./bootstrap i586-mingw32msvc
+This will look for a i586-mingw32msvc-gcc cross compiler. Default is to
 build natively.
 
 Bootstrap generates your default contrib configuration and puts it in a file

include/vlc_network.h

@@ -70,8 +70,6 @@ struct msghdr
 #   endif
 #   ifdef HAVE_ARPA_INET_H
 #      include <arpa/inet.h>
-#   elif defined( SYS_BEOS )
-#      include <net/netdb.h>
 #   endif
 #   include <netdb.h>
 #   define net_errno errno

modules/access/screen/Modules.am

@@ -1,14 +1,10 @@
 if HAVE_WIN32
 screen_extra = win32.c
 else
-if HAVE_BEOS
-screen_extra = beos.cpp
-else
 if HAVE_DARWIN
 screen_extra = mac.c
 endif
 endif
-endif
 SOURCES_screen = \
         screen.c \
         screen.h \

modules/access/screen/screen.h

@@ -26,7 +26,7 @@
 #include <vlc_access.h>
 #include <vlc_demux.h>
 
-#if !defined( HAVE_BEOS ) && !defined( HAVE_DARWIN )
+#if !defined( HAVE_DARWIN )
 #   define SCREEN_SUBSCREEN
 #   define SCREEN_MOUSE
 #endif

modules/misc/freetype.c

@@ -57,9 +57,6 @@
 #ifdef __APPLE__
 #define DEFAULT_FONT "/Library/Fonts/Arial Black.ttf"
 #define FC_DEFAULT_FONT "Arial Black"
-#elif defined( SYS_BEOS )
-#define DEFAULT_FONT "/boot/beos/etc/fonts/ttfonts/Swiss721.ttf"
-#define FC_DEFAULT_FONT "Swiss"
 #elif defined( WIN32 )
 #define DEFAULT_FONT "" /* Default font found at run-time */
 #define FC_DEFAULT_FONT "Arial"