ALL: BeOS fixes

 There's a new stable gcc out for BeOS, now we can re-enable 3DNow/SEE
 and build matroska support

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 53587ce027a60e2675524b7377caa773e8b1b686..aa0438e6625eb69612df14569a60b1c336b85f55 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -59,8 +59,8 @@ endif
 ifeq ($(SYS),BEOS)
 all: .perl .autoconf .libtool .automake .iconv .intl .freetype .fribidi \
        .a52 .mpeg2 .id3tag .mad .ogg .vorbis .vorbisenc .theora \
-       .FLAC .speex .faad .faac .lame .ffmpeg .dvdcss .dvdread .dvdnav \
-       .dvbpsi .dts
+       .FLAC .speex .faad .faac .lame .ebml .matroska .ffmpeg .dvdcss \
+       .dvdread .dvdnav .dvbpsi .dts
 endif
 
 FORCE:
@@ -353,7 +353,7 @@ mpeg2dec-$(MPEG2DEC_VERSION).tar.gz:
 
 mpeg2dec: mpeg2dec-$(MPEG2DEC_VERSION).tar.gz
        $(EXTRACT_GZ)
-       patch -p 0 < Patches/mpeg2dec.patch
+#      patch -p 0 < Patches/mpeg2dec.patch
 
 .mpeg2: mpeg2dec
        (cd $<; ./configure --prefix=$(PREFIX) --without-x --disable-dsl && make && make install)
@@ -587,6 +587,7 @@ libebml-$(LIBEBML_VERSION).tar.gz:
 
 libebml: libebml-$(LIBEBML_VERSION).tar.gz
        $(EXTRACT_GZ)
+       patch -p 0 < Patches/ebml.patch
        -rm -rf $@/CVS
 
 .ebml: libebml
@@ -607,6 +608,7 @@ libmatroska-$(LIBMATROSKA_VERSION).tar.gz:
 
 libmatroska: libmatroska-$(LIBMATROSKA_VERSION).tar.gz
        $(EXTRACT_GZ)
+       patch -p 0 < Patches/matroska.patch
        -rm -rf $@/CVS
 
 .matroska: libmatroska
@@ -636,7 +638,7 @@ ffmpeg-$(FFMPEG_VERSION).tar.gz:
 #      patch -p 0 < Patches/ffmpeg.patch
 
 .ffmpeg: ffmpeg
-       (cd $<; ./configure --prefix=$(PREFIX) --extra-cflags="$(CFLAGS)" --extra-ldflags="$(LDFLAGS)" --enable-gpl --enable-mp3lame --enable-faac --enable-pp --disable-vhook --disable-audio-beos --disable-ffserver --disable-vorbis --disable-faad --disable-a52 --enable-mp3lame --disable-zlib --enable-a52 && make && make -C libavcodec/libpostproc install && make -C libavcodec installlib && make -C libavformat installlib)
+       (cd $<; ./configure --prefix=$(PREFIX) --extra-cflags="$(CFLAGS)" --extra-ldflags="$(LDFLAGS)" --enable-gpl --enable-mp3lame --enable-faac --enable-pp --disable-vhook --disable-audio-beos --disable-ffserver --disable-vorbis --disable-faad --enable-mp3lame --disable-zlib --enable-a52 && make && make -C libavcodec/libpostproc install && make -C libavcodec installlib && make -C libavformat installlib)
        touch $@
 
 CLEAN_FILE += .ffmpeg

diff --git a/extras/contrib/src/Patches/ebml.patch b/extras/contrib/src/Patches/ebml.patch
new file mode 100644 (file)
index 0000000..f27ca33
--- /dev/null
+++ b/extras/contrib/src/Patches/ebml.patch
@@ -0,0 +1,12 @@
+diff -ru libebml-original/ebml/c/libebml_t.h libebml/ebml/c/libebml_t.h
+--- libebml-original/ebml/c/libebml_t.h        Thu Apr 15 01:16:31 2004
++++ libebml/ebml/c/libebml_t.h Mon Aug 16 14:29:14 2004
+@@ -72,6 +72,8 @@
+     typedef uint16_t uint16;
+     typedef uint8_t uint8;
+ #endif // __GNUC__
++#elif defined(__BEOS__)
++#include <SupportDefs.h>
+ #else
+ #ifdef DJGPP                          /* SL : DJGPP doesn't support POSIX types ???? */
+     typedef signed long long int64;

diff --git a/extras/contrib/src/Patches/ffmpeg.patch.cvs b/extras/contrib/src/Patches/ffmpeg.patch.cvs
index 0b9ff775d74b2ede1898e50add4aaca8033410da..2cb00b4316fabf0f00a136774079fb8fd2ef0907 100644 (file)
--- a/extras/contrib/src/Patches/ffmpeg.patch.cvs
+++ b/extras/contrib/src/Patches/ffmpeg.patch.cvs
@@ -1,6 +1,24 @@
+diff -ru ffmpeg-original/configure ffmpeg/configure
+--- ffmpeg-original/configure  Fri Aug 13 02:59:48 2004
++++ ffmpeg/configure   Mon Aug 16 12:54:10 2004
+@@ -351,11 +351,11 @@
+   ;;
+   --make=*) make=`echo $opt | cut -d '=' -f 2`
+   ;;
+-  --extra-cflags=*) CFLAGS="${opt#--extra-cflags=}"
++  --extra-cflags=*) CFLAGS="$CFLAGS ${opt#--extra-cflags=}"
+   ;;
+-  --extra-ldflags=*) LDFLAGS=${opt#--extra-ldflags=}
++  --extra-ldflags=*) LDFLAGS="$LDFLAGS ${opt#--extra-ldflags=}"
+   ;;
+-  --extra-libs=*) extralibs=${opt#--extra-libs=}
++  --extra-libs=*) extralibs="$extralibs ${opt#--extra-libs=}"
+   ;;
+   --cpu=*) cpu=`echo $opt | cut -d '=' -f 2`
+   ;;
 diff -ru ffmpeg-original/libavcodec/eval.c ffmpeg/libavcodec/eval.c
---- ffmpeg-original/libavcodec/eval.c  Wed Feb 18 12:49:30 2004
-+++ ffmpeg/libavcodec/eval.c   Fri Jul 23 11:39:29 2004
+--- ffmpeg-original/libavcodec/eval.c  Wed Feb 18 13:49:30 2004
++++ ffmpeg/libavcodec/eval.c   Mon Aug 16 12:46:02 2004
 @@ -34,6 +34,8 @@
  #include <string.h>
  #include <math.h>
@@ -10,21 +28,9 @@ diff -ru ffmpeg-original/libavcodec/eval.c ffmpeg/libavcodec/eval.c
  #ifndef NAN
    #define NAN 0
  #endif
-diff -ru ffmpeg-original/libavcodec/msmpeg4.c ffmpeg/libavcodec/msmpeg4.c
---- ffmpeg-original/libavcodec/msmpeg4.c       Tue May 25 18:07:24 2004
-+++ ffmpeg/libavcodec/msmpeg4.c        Fri Jul 23 11:49:38 2004
-@@ -716,7 +716,7 @@
-        necessitate to modify mpegvideo.c. The problem comes from the
-        fact they decided to store the quantized DC (which would lead
-        to problems if Q could vary !) */
--#if defined ARCH_X86 && !defined PIC
-+#if defined ARCH_X86 && !defined PIC && !defined __PIC__
-     asm volatile(
-         "movl %3, %%eax               \n\t"
-       "shrl $1, %%eax         \n\t"
 diff -ru ffmpeg-original/libavformat/tcp.c ffmpeg/libavformat/tcp.c
---- ffmpeg-original/libavformat/tcp.c  Sat Jun 19 03:59:34 2004
-+++ ffmpeg/libavformat/tcp.c   Fri Jul 23 11:52:23 2004
+--- ffmpeg-original/libavformat/tcp.c  Thu Aug 12 02:09:32 2004
++++ ffmpeg/libavformat/tcp.c   Mon Aug 16 12:46:02 2004
 @@ -32,6 +32,7 @@
  #include <netdb.h>
  #include <sys/time.h>
@@ -33,7 +39,7 @@ diff -ru ffmpeg-original/libavformat/tcp.c ffmpeg/libavformat/tcp.c
  
  typedef struct TCPContext {
      int fd;
-@@ -120,11 +121,13 @@
+@@ -113,11 +114,13 @@
                  break;
          }
          

diff --git a/extras/contrib/src/Patches/matroska.patch b/extras/contrib/src/Patches/matroska.patch
new file mode 100644 (file)
index 0000000..a79d236
--- /dev/null
+++ b/extras/contrib/src/Patches/matroska.patch
@@ -0,0 +1,12 @@
+diff -ru libmatroska-original/make/linux/Makefile libmatroska/make/linux/Makefile
+--- libmatroska-original/make/linux/Makefile   Mon Jan  5 12:28:43 2004
++++ libmatroska/make/linux/Makefile    Mon Aug 16 11:56:22 2004
+@@ -93,7 +93,7 @@
+ depend: $(sources)
+       $(DEPEND) $(DEPENDFLAGS) $(sources)
+ 
+-test: test6 test8 test9
++test: test6 test9
+ 
+ test6:        test6.o $(LIBRARY)
+       $(LD) -o $@ $(LDFLAGS) $< $(MUX_LIBS)

diff --git a/modules/demux/mkv.cpp b/modules/demux/mkv.cpp
index ab2011ce6d60dfa6b6555c96ebac5c8ea6fcf756..e1b47756453f746b864e80cf56d9e3d40067cb06 100644 (file)
--- a/modules/demux/mkv.cpp
+++ b/modules/demux/mkv.cpp
@@ -116,10 +116,10 @@ class vlc_stream_io_callback: public IOCallback
   public:
     vlc_stream_io_callback( stream_t * );
 
-    virtual uint32_t read            ( void *p_buffer, size_t i_size);
+    virtual uint32   read            ( void *p_buffer, size_t i_size);
     virtual void     setFilePointer  ( int64_t i_offset, seek_mode mode = seek_beginning );
     virtual size_t   write           ( const void *p_buffer, size_t i_size);
-    virtual uint64_t getFilePointer  ( void );
+    virtual uint64   getFilePointer  ( void );
     virtual void     close           ( void );
 };
 
@@ -1245,7 +1245,7 @@ vlc_stream_io_callback::vlc_stream_io_callback( stream_t *s_ )
     mb_eof = VLC_FALSE;
 }
 
-uint32_t vlc_stream_io_callback::read( void *p_buffer, size_t i_size )
+uint32 vlc_stream_io_callback::read( void *p_buffer, size_t i_size )
 {
     if( i_size <= 0 || mb_eof )
     {
@@ -1288,7 +1288,7 @@ size_t vlc_stream_io_callback::write( const void *p_buffer, size_t i_size )
 {
     return 0;
 }
-uint64_t vlc_stream_io_callback::getFilePointer( void )
+uint64 vlc_stream_io_callback::getFilePointer( void )
 {
     return stream_Tell( s );
 }

diff --git a/modules/video_filter/deinterlace.c b/modules/video_filter/deinterlace.c
index 4cc3e3f38fcf443be564653448be2145ce9dd056..041716f3c5b23cf4b7cf08fdbe709c5fe6716f3c 100644 (file)
--- a/modules/video_filter/deinterlace.c
+++ b/modules/video_filter/deinterlace.c
@@ -66,7 +66,7 @@ static void MergeAltivec ( void *, const void *, const void *, size_t );
 #if defined(CAN_COMPILE_MMXEXT)
 static void MergeMMX     ( void *, const void *, const void *, size_t );
 #endif
-#if defined(CAN_COMPILE_SSE) && !defined(SYS_BEOS)
+#if defined(CAN_COMPILE_SSE)
 static void MergeSSE2    ( void *, const void *, const void *, size_t );
 #endif
 #if defined(CAN_COMPILE_MMXEXT) || defined(CAN_COMPILE_SSE)
@@ -176,7 +176,7 @@ static int Create( vlc_object_t *p_this )
     }
     else
 #endif
-#if defined(CAN_COMPILE_SSE) && !defined(SYS_BEOS)
+#if defined(CAN_COMPILE_SSE)
     if( p_vout->p_libvlc->i_cpu & CPU_CAPABILITY_SSE2 )
     {
         p_vout->p_sys->pf_merge = MergeSSE2;
@@ -900,7 +900,7 @@ static void MergeMMX( void *_p_dest, const void *_p_s1, const void *_p_s2,
 }
 #endif
 
-#if defined(CAN_COMPILE_SSE) && !defined(SYS_BEOS)
+#if defined(CAN_COMPILE_SSE)
 static void MergeSSE2( void *_p_dest, const void *_p_s1, const void *_p_s2,
                        size_t i_bytes )
 {

diff --git a/src/misc/cpu.c b/src/misc/cpu.c
index d08ff25f7cb153d255fe2354ca8603ae232a66b9..a0da75d6757c8411d78f2bfa5ad41c5d73343110 100644 (file)
--- a/src/misc/cpu.c
+++ b/src/misc/cpu.c
@@ -188,7 +188,7 @@ uint32_t CPUCapabilities( void )
 
     if( i_edx & 0x04000000 )
     {
-#   if defined(CAN_COMPILE_SSE) && !defined(SYS_BEOS)
+#   if defined(CAN_COMPILE_SSE)
         /* We test if OS supports the SSE instructions */
         psz_capability = "SSE2";
         i_illegal = 0;