]> git.sesse.net Git - vlc/commitdiff
contribs: removed BeOS support and fixed a typo which prevented proper x86_64 compila...
authorFelix Paul Kühne <fkuehne@videolan.org>
Wed, 26 Aug 2009 23:03:00 +0000 (01:03 +0200)
committerFelix Paul Kühne <fkuehne@videolan.org>
Wed, 26 Aug 2009 23:03:00 +0000 (01:03 +0200)
extras/contrib/bootstrap
extras/contrib/src/Makefile
extras/contrib/src/Patches/ffmpeg-svn-beos.patch [deleted file]
extras/contrib/src/Patches/speex-BeOS.patch [deleted file]
extras/contrib/src/Patches/twolame-BeOS.patch [deleted file]

index f329dacaa9a17cd026033cffbb6c9bf044865300..05ccc92207c9d871920d73b098f582d504474e8b 100755 (executable)
@@ -98,9 +98,6 @@ case $HOST in
     *wince*)
         echo "HAVE_WINCE = 1" >> config.mak
     ;;
-    *beos*)
-        echo "HAVE_BEOS = 1" >> config.mak
-    ;;
 esac
 
 case $HOST in
@@ -193,30 +190,6 @@ case $HOST in
             exit 1
         fi
     ;;
-    i586-pc-beos)
-        if test -f /boot/beos/system/lib/libbind.so; then
-            EXTRA_LDFLAGS=" -lbind -lsocket"
-        else
-            EXTRA_LDFLAGS=" -lnet"
-        fi
-        if test "$HOST" = "$BUILD"; then
-#           Compiling on BeOS
-            PATH=".:/boot/home/config/bin:/bin:/boot/apps"
-            PATH="${PATH}:/boot/preferences:/boot/beos/apps"
-            PATH="${PATH}:/boot/beos/preferences"
-            PATH="${PATH}:/boot/develop/tools/gnupro/bin"
-            echo "PATH = ${PATH}" >> config.mak
-            LIBRARY_PATH="${LIBRARY_PATH}:%A/lib:/boot/home/config/lib"
-            LIBRARY_PATH="${LIBRARY_PATH}:/boot/beos/system/lib"
-            echo "LIBRARY_PATH = ${LIBRARY_PATH}" >> config.mak
-        else
-#           Cross compiling from Linux
-            PATH="/opt/beos-tools/bin:/opt/cross-tools/bin"
-            PATH="${PATH}:/usr/bin:/bin"
-            echo "PATH = ${PATH}" >> config.mak
-        fi
-        cat src/Distributions/beos.mak >> distro.mak
-    ;;
     *mingw32ce)
         echo "HAVE_WINCE = 1" >> config.mak
         echo "PKG_CONFIG_PATH = \$(PREFIX)/lib/pkgconfig" >> config.mak
index 67bdb814a821cb55b7e6cb1a22ea7ba0b648a53c..fab94252e87fb41e8727d9fb288638e20e19388a 100644 (file)
@@ -139,10 +139,6 @@ else
 FFMPEGCONF+= --enable-libmp3lame --enable-libgsm
 endif
 
-ifdef HAVE_BEOS
-FFMPEGCONF+= --cpu=x86 --disable-audio-beos
-endif
-
 ifdef HAVE_DARWIN_OS_ON_INTEL
 FFMPEGCONF += --enable-memalign-hack
 endif
@@ -217,39 +213,6 @@ endef
 #      $(INSTALL_NAME)
 #      touch $@
 
-ifeq ($(HOST),i586-pc-beos)
-# We test if the file actually exists, as sometimes (but not always)
-# libtool won't accept to build the shared library
-define INSTALL_NAME
-       if test -f $(PREFIX)/lib/lib$(patsubst .%,%,$@).so ; then \
-               mkdir -p $(PREFIX)/vlc-lib ; \
-               cp $(PREFIX)/lib/lib$(patsubst .%,%,$@).so \
-                 $(PREFIX)/vlc-lib/ ; \
-       fi
-endef
-endif
-
-# ***************************************************************************
-# perl
-# ***************************************************************************
-
-ifeq ($(BUILD),i586-pc-beos)
-perl-$(PERL_VERSION).tar.gz:
-       $(WGET) $(PERL_URL)
-
-perl: perl-$(PERL_VERSION).tar.gz
-       $(EXTRACT_GZ)
-       sed -i.orig 's%prefix="/boot/home/config"%prefix="$(PREFIX)"%'  perl/hints/beos.sh
-
-.perl: perl
-       (cd $<; ./Configure -d -e && make && make install && ln -sf perl5/$(PERL_VERSION)/BePC-beos/CORE/libperl.so $(PREFIX)/lib/libperl.so)
-       touch $@
-
-CLEAN_FILE += .perl
-CLEAN_PKG += perl
-DISTCLEAN_PKG += perl-$(PERL_VERSION).tar.gz
-endif
-
 # ***************************************************************************
 # autoconf
 # ***************************************************************************
@@ -332,23 +295,6 @@ CLEAN_FILE += .libtool
 
 endif
 
-ifeq ($(BUILD),i586-pc-beos)
-libtool-$(LIBTOOL_VERSION).tar.gz:
-       $(WGET) $(LIBTOOL_URL)
-
-libtool: libtool-$(LIBTOOL_VERSION).tar.gz
-       $(EXTRACT_GZ)
-
-.libtool: libtool
-       (cd $<; ./configure --prefix=$(PREFIX) && make && make install)
-       touch $@
-
-CLEAN_PKG += libtool
-DISTCLEAN_PKG += libtool-$(LIBTOOL_VERSION).tar.gz
-CLEAN_FILE += .libtool
-
-endif
-
 # ***************************************************************************
 # automake
 # ***************************************************************************
@@ -410,11 +356,6 @@ ifdef HAVE_WIN32
 else
        ( cd $< && $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-java --disable-native-java --without-emacs)
 endif
-ifeq ($(BUILD),i586-pc-beos)
-# The ugliest kludge ever - so libtool correctly links shared libraries
-# on BeOS. Sorry, I just can't figure out how libtool works
-       ( cd $< && for f in `find . -name libtool`; do  sed -e 's/ -shared / -nostart /' -e 's/^predep_objects.*/predep_objects=""/' -i  $$f; chmod +x $$f; done )
-endif
 ifneq ($(HOST),$(BUILD))
   ifndef HAVE_CYGWIN
     # We'll use the installed gettext and only need to cross-compile libintl, also build autopoint and gettextsize tools need for VLC bootstrap
@@ -813,11 +754,7 @@ THEORACONF += --disable-asm
 endif
 
 .theora: libtheora .ogg
-ifdef HAVE_BEOS
-       (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) $(THEORACONF) --disable-asm && make && make install)
-else
-       (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) $(THEORACONF)&& make && make install)
-endif
+       (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) $(THEORACONF) && make && make install)
        $(INSTALL_NAME)
        touch $@
 
@@ -893,9 +830,6 @@ speex-$(SPEEX_VERSION).tar.gz:
 speex: speex-$(SPEEX_VERSION).tar.gz
        $(EXTRACT_GZ)
        patch -p0 < Patches/speex.patch
-ifdef HAVE_BEOS
-       patch -p0 < Patches/speex-BeOS.patch
-endif
 
 .speex: speex
        (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --enable-ogg=no && make && make install)
@@ -1045,15 +979,9 @@ DISTCLEAN_PKG += amrwb-$(LIBAMR_WB_VERSION).tar.bz2
 ifdef SVN
 ffmpeg:
        $(SVN) co $(FFMPEG_SVN) ffmpeg
-ifeq ($(HOST),i586-pc-beos)
-       (cd $@; patch -p0 < ../Patches/ffmpeg-svn-beos.patch)
-endif
 ifdef HAVE_WINCE
        patch -p1 < Patches/ffmpeg-svn-wince.patch
 endif
-ifdef HAVE_BEOS
-       (cd $@; patch -p0 < ../Patches/ffmpeg-alignment.patch)
-endif
 ifdef HAVE_DARWIN_OS_ON_INTEL
        (cd $@; patch -p0 < ../Patches/ffmpeg-macosx-intel-mmx.patch)
 else
@@ -1667,9 +1595,6 @@ twolame-$(TWOLAME_VERSION).tar.gz:
 
 twolame: twolame-$(TWOLAME_VERSION).tar.gz
        $(EXTRACT_GZ)
-ifdef HAVE_BEOS
-       patch -p0 < Patches/twolame-BeOS.patch
-endif
 ifdef HAVE_WIN32
        (cd twolame/win32; $(WGET) "http://twolame.svn.sourceforge.net/viewvc/*checkout*/twolame/trunk/win32/winutil.h")
 endif
diff --git a/extras/contrib/src/Patches/ffmpeg-svn-beos.patch b/extras/contrib/src/Patches/ffmpeg-svn-beos.patch
deleted file mode 100644 (file)
index b8bce7f..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-Index: configure
-===================================================================
-RCS file: /cvsroot/ffmpeg/ffmpeg/configure,v
-retrieving revision 1.248
-diff -u -r1.248 configure
---- configure  11 Feb 2006 20:37:12 -0000      1.248
-+++ configure  12 Feb 2006 15:57:44 -0000
-@@ -634,6 +634,18 @@
-   esac
- done
-+if [ "$cross_prefix" = "i586-pc-beos-" ]; then
-+  CFLAGS="$CFLAGS -DPIC -fomit-frame-pointer -fno-expensive-optimizations"
-+  SHFLAGS=-nostart
-+  audio_oss="no"
-+  v4l="no"
-+  v4l2="no"
-+  dv1394="no"
-+  netserver="yes"
-+  need_inet_aton="yes"
-+  extralibs="-lnet"
-+fi
-+
- # we need to build at least one lib type
- if test "$lstatic" = "no" && test "$lshared" = "no" ; then
-     cat <<EOF
-Index: libavformat/movenc.c
-===================================================================
-RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/movenc.c,v
-retrieving revision 1.52
-diff -u -r1.52 movenc.c
---- libavformat/movenc.c       11 Feb 2006 18:27:57 -0000      1.52
-+++ libavformat/movenc.c       12 Feb 2006 15:57:44 -0000
-@@ -25,6 +25,10 @@
- #undef NDEBUG
- #include <assert.h>
-+#ifndef UINT32_MAX
-+#define UINT32_MAX 4294967295U
-+#endif
-+
- #define MOV_INDEX_CLUSTER_SIZE 16384
- #define globalTimescale 1000
diff --git a/extras/contrib/src/Patches/speex-BeOS.patch b/extras/contrib/src/Patches/speex-BeOS.patch
deleted file mode 100644 (file)
index 340d852..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -ruN speex/libspeex/testecho.c speex-2/libspeex/testecho.c
---- speex/libspeex/testecho.c  2006-02-11 22:39:51.000000000 +0000
-+++ speex-2/libspeex/testecho.c        2006-08-01 12:00:22.000000000 +0000
-@@ -22,6 +22,7 @@
-    short echo_buf[NN], ref_buf[NN], e_buf[NN];
-    SpeexEchoState *st;
-    SpeexPreprocessState *den;
-+   int tmp = 8000;
-    if (argc != 4)
-    {
-@@ -34,7 +35,6 @@
-    st = speex_echo_state_init(NN, TAIL);
-    den = speex_preprocess_state_init(NN, 8000);
--   int tmp = 8000;
-    speex_echo_ctl(st, SPEEX_ECHO_SET_SAMPLING_RATE, &tmp);
-    while (read(ref_fd, ref_buf, NN*2))
diff --git a/extras/contrib/src/Patches/twolame-BeOS.patch b/extras/contrib/src/Patches/twolame-BeOS.patch
deleted file mode 100644 (file)
index 39a4d8c..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -ruN twolame/configure twolame-2/configure
---- twolame/configure  2006-07-03 18:50:30.000000000 +0000
-+++ twolame/configure  2006-08-01 11:47:41.000000000 +0000
-@@ -21068,7 +21068,7 @@
--CFLAGS="$CFLAGS -std=c99 -Wunused -Wall"
-+CFLAGS="$CFLAGS -Wunused -Wall"
- LDFLAGS="$LDFLAGS"
- # If debugging is enabled then make warnings errors
-diff -ruN twolame/configure.ac twolame-2/configure.ac
---- twolame/configure.ac       2006-07-03 18:50:04.000000000 +0000
-+++ twolame/configure.ac       2006-08-01 11:47:32.000000000 +0000
-@@ -113,7 +113,7 @@
- dnl ############## Compiler and Linker Flags
--CFLAGS="$CFLAGS -std=c99 -Wunused -Wall"
-+CFLAGS="$CFLAGS -Wunused -Wall"
- LDFLAGS="$LDFLAGS"
- # If debugging is enabled then make warnings errors