Skip to content

V
vlc-1.1
Commit 5147198f authored by Eric Petit's avatar Eric Petit
Browse files
Options

BeOS contrib bla bla

parent 71445ddd
Hide whitespace changes
Inline Side-by-side
Showing with 119 additions and 22 deletions
extras/contrib/src/Makefile
View file @ 5147198f
...@@ -58,7 +58,8 @@ all: .autoconf .libtool .automake .iconv .intl .pkgcfg .freetype .fribidi \ ...@@ -58,7 +58,8 @@ all: .autoconf .libtool .automake .iconv .intl .pkgcfg .freetype .fribidi \
endif endif
ifeq ($(SYS),BEOS) ifeq ($(SYS),BEOS)
all: .perl .autoconf .libtool .automake .iconv .intl .freetype .fribidi \ all: .perl .autoconf .libtool .automake .iconv .intl .freetype .fribidi \
.a52 .mpeg2 .id3tag .mad .a52 .mpeg2 .id3tag .mad .ogg .vorbis .vorbisenc .theora \
.FLAC .speex .faad .faac .lame .ffmpeg .dvdcss .dvdread
endif endif
FORCE: FORCE:
...@@ -114,10 +115,14 @@ endef ...@@ -114,10 +115,14 @@ endef
endif endif
ifeq ($(SYS),BEOS) ifeq ($(SYS),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 define INSTALL_NAME
mkdir -p $(PREFIX)/vlc-lib ; \ if test -f $(PREFIX)/lib/lib$(patsubst .%,%,$@).so ; then \
cp $(PREFIX)/lib/lib$(patsubst .%,%,$@).so \ mkdir -p $(PREFIX)/vlc-lib ; \
$(PREFIX)/vlc-lib/lib$(patsubst .%,%,$@).so ; cp $(PREFIX)/lib/lib$(patsubst .%,%,$@).so \
$(PREFIX)/vlc-lib/ ; \
fi
endef endef
endif endif
...@@ -282,9 +287,7 @@ freetype2: freetype-$(FREETYPE2_VERSION).tar.gz ...@@ -282,9 +287,7 @@ freetype2: freetype-$(FREETYPE2_VERSION).tar.gz
.freetype: freetype2 .freetype: freetype2
(cd $<; ./configure --prefix=$(PREFIX) && make && make install) (cd $<; ./configure --prefix=$(PREFIX) && make && make install)
ifeq ($(SYS),DARWIN)
$(INSTALL_NAME) $(INSTALL_NAME)
endif
touch $@ touch $@
CLEAN_FILE += .freetype CLEAN_FILE += .freetype
...@@ -304,9 +307,7 @@ fribidi: fribidi-$(FRIBIDI_VERSION).tar.gz ...@@ -304,9 +307,7 @@ fribidi: fribidi-$(FRIBIDI_VERSION).tar.gz
.fribidi: fribidi .fribidi: fribidi
(cd $<; ./configure --prefix=$(PREFIX) && make && make install) (cd $<; ./configure --prefix=$(PREFIX) && make && make install)
ifeq ($(SYS),DARWIN)
$(INSTALL_NAME) $(INSTALL_NAME)
endif
touch $@ touch $@
CLEAN_FILE += .fribidi CLEAN_FILE += .fribidi
...@@ -360,7 +361,7 @@ mpeg2dec: mpeg2dec-$(MPEG2DEC_VERSION).tar.gz ...@@ -360,7 +361,7 @@ mpeg2dec: mpeg2dec-$(MPEG2DEC_VERSION).tar.gz
CLEAN_FILE += .mpeg2 CLEAN_FILE += .mpeg2
CLEAN_PKG += mpeg2dec CLEAN_PKG += mpeg2dec
#DISTCLEAN_PKG += mpeg2dec-$(MPEG2DEC_VERSION)-cvs.tar.gz #DISTCLEAN_PKG += mpeg2dec-$(MPEG2DEC_VERSION)-cvs.tar.gz
DISTCLEAN_PKG += mpeg2dec-$(MPEG2_DEC_VERSION).tar.gz DISTCLEAN_PKG += mpeg2dec-$(MPEG2DEC_VERSION).tar.gz
# *************************************************************************** # ***************************************************************************
# libid3tag # libid3tag
...@@ -374,9 +375,7 @@ libid3tag: libid3tag-$(LIBID3TAG_VERSION).tar.gz ...@@ -374,9 +375,7 @@ libid3tag: libid3tag-$(LIBID3TAG_VERSION).tar.gz
.id3tag: libid3tag .id3tag: libid3tag
(cd $<; ./configure --prefix=$(PREFIX) && make && make install) (cd $<; ./configure --prefix=$(PREFIX) && make && make install)
ifeq ($(SYS),DARWIN)
$(INSTALL_NAME) $(INSTALL_NAME)
endif
touch $@ touch $@
CLEAN_FILE += .id3tag CLEAN_FILE += .id3tag
...@@ -395,9 +394,7 @@ libmad: libmad-$(LIBMAD_VERSION).tar.gz ...@@ -395,9 +394,7 @@ libmad: libmad-$(LIBMAD_VERSION).tar.gz
.mad: libmad .mad: libmad
(cd $<; ./configure --prefix=$(PREFIX) CFLAGS="-O3" && make && make install) (cd $<; ./configure --prefix=$(PREFIX) CFLAGS="-O3" && make && make install)
ifeq ($(SYS),DARWIN)
$(INSTALL_NAME) $(INSTALL_NAME)
endif
touch $@ touch $@
CLEAN_FILE += .mad CLEAN_FILE += .mad
...@@ -506,6 +503,7 @@ speex-$(SPEEX_VERSION).tar.gz: ...@@ -506,6 +503,7 @@ speex-$(SPEEX_VERSION).tar.gz:
speex: speex-$(SPEEX_VERSION).tar.gz speex: speex-$(SPEEX_VERSION).tar.gz
$(EXTRACT_GZ) $(EXTRACT_GZ)
patch -p 0 < Patches/speex.patch
.speex: speex .speex: speex
(cd $<; ./configure --prefix=$(PREFIX) && make && make install) (cd $<; ./configure --prefix=$(PREFIX) && make && make install)
...@@ -540,7 +538,7 @@ faad2: faad2-$(FAAD2_VERSION).tar.bz2 ...@@ -540,7 +538,7 @@ faad2: faad2-$(FAAD2_VERSION).tar.bz2
CLEAN_FILE += .faad CLEAN_FILE += .faad
CLEAN_PKG += faad2 CLEAN_PKG += faad2
DISTCLEAN_PKG += faad2-$(FAAD2_VERSION).tar.gz DISTCLEAN_PKG += faad2-$(FAAD2_VERSION).tar.bz2
# *************************************************************************** # ***************************************************************************
# faac # faac
...@@ -625,7 +623,7 @@ DISTCLEAN_PKG += libmatroska-$(LIBMATROSKA_VERSION).tar.gz ...@@ -625,7 +623,7 @@ DISTCLEAN_PKG += libmatroska-$(LIBMATROSKA_VERSION).tar.gz
ffmpeg: ffmpeg:
echo $(FFMPEG_CVSROOT) A > ./ffmpeg.cvs echo $(FFMPEG_CVSROOT) A > ./ffmpeg.cvs
CVS_PASSFILE=./ffmpeg.cvs cvs -d $(FFMPEG_CVSROOT) co ffmpeg CVS_PASSFILE=./ffmpeg.cvs cvs -z3 -d $(FFMPEG_CVSROOT) co ffmpeg
patch -p 0 < Patches/ffmpeg.patch.cvs patch -p 0 < Patches/ffmpeg.patch.cvs
# (cd $@; ./bootstrap) # (cd $@; ./bootstrap)
...@@ -637,7 +635,7 @@ ffmpeg-$(FFMPEG_VERSION).tar.gz: ...@@ -637,7 +635,7 @@ ffmpeg-$(FFMPEG_VERSION).tar.gz:
# patch -p 0 < Patches/ffmpeg.patch # patch -p 0 < Patches/ffmpeg.patch
.ffmpeg: ffmpeg .ffmpeg: ffmpeg
(cd $<; ./configure --prefix=$(PREFIX) --extra-cflags="$(CFLAGS)" --extra-ldflags="$(LDFLAGS)" --enable-gpl --enable-mp3lame --enable-faac --enable-pp --disable-vhook --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 --disable-a52 --enable-mp3lame --disable-zlib --enable-a52 && make && make -C libavcodec/libpostproc install && make -C libavcodec installlib && make -C libavformat installlib)
touch $@ touch $@
CLEAN_FILE += .ffmpeg CLEAN_FILE += .ffmpeg
...@@ -691,6 +689,7 @@ libdvdread-$(LIBDVDREAD_VERSION).tar.gz: ...@@ -691,6 +689,7 @@ libdvdread-$(LIBDVDREAD_VERSION).tar.gz:
libdvdread: libdvdread-$(LIBDVDREAD_VERSION).tar.gz libdvdread: libdvdread-$(LIBDVDREAD_VERSION).tar.gz
$(EXTRACT_GZ) $(EXTRACT_GZ)
patch -p 0 < Patches/libdvdread.patch
.dvdread: libdvdread .dvdcss .dvdread: libdvdread .dvdcss
(cd $<; ./configure --prefix=$(PREFIX) --with-libdvdcss=$(PREFIX) && make && make install) (cd $<; ./configure --prefix=$(PREFIX) --with-libdvdcss=$(PREFIX) && make && make install)
......
extras/contrib/src/Patches/ffmpeg.patch.cvs
View file @ 5147198f
diff -ru ffmpeg.old/libavcodec/eval.c ffmpeg/libavcodec/eval.c diff -ru ffmpeg-original/libavcodec/eval.c ffmpeg/libavcodec/eval.c
--- ffmpeg.old/libavcodec/eval.c Thu Mar 6 12:32:01 2003 --- ffmpeg-original/libavcodec/eval.c Wed Feb 18 12:49:30 2004
+++ ffmpeg/libavcodec/eval.c Sun Nov 2 02:04:09 2003 +++ ffmpeg/libavcodec/eval.c Fri Jul 23 11:39:29 2004
@@ -34,6 +34,8 @@ @@ -34,6 +34,8 @@
#include <string.h> #include <string.h>
#include <math.h> #include <math.h>
...@@ -10,9 +10,38 @@ diff -ru ffmpeg.old/libavcodec/eval.c ffmpeg/libavcodec/eval.c ...@@ -10,9 +10,38 @@ diff -ru ffmpeg.old/libavcodec/eval.c ffmpeg/libavcodec/eval.c
#ifndef NAN #ifndef NAN
#define NAN 0 #define NAN 0
#endif #endif
diff -ru ffmpeg.old/libavformat/tcp.c ffmpeg/libavformat/tcp.c diff -ru ffmpeg-original/libavcodec/h261.c ffmpeg/libavcodec/h261.c
--- ffmpeg.old/libavformat/tcp.c Mon Sep 29 03:41:30 2003 --- ffmpeg-original/libavcodec/h261.c Thu Jul 22 10:23:28 2004
+++ ffmpeg/libavformat/tcp.c Sun Nov 2 02:04:09 2003 +++ ffmpeg/libavcodec/h261.c Fri Jul 23 11:47:30 2004
@@ -524,11 +524,12 @@
static int h261_decode_gob(H261Context *h){
MpegEncContext * const s = &h->s;
+ int v;
ff_set_qscale(s, s->qscale);
/* check for empty gob */
- int v= show_bits(&s->gb, 15);
+ v= show_bits(&s->gb, 15);
if(get_bits_count(&s->gb) + 15 > s->gb.size_in_bits){
v>>= get_bits_count(&s->gb) + 15 - s->gb.size_in_bits;
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
@@ -32,6 +32,7 @@ @@ -32,6 +32,7 @@
#include <netdb.h> #include <netdb.h>
#include <sys/time.h> #include <sys/time.h>
...@@ -21,3 +50,17 @@ diff -ru ffmpeg.old/libavformat/tcp.c ffmpeg/libavformat/tcp.c ...@@ -21,3 +50,17 @@ diff -ru ffmpeg.old/libavformat/tcp.c ffmpeg/libavformat/tcp.c
typedef struct TCPContext { typedef struct TCPContext {
int fd; int fd;
@@ -120,11 +121,13 @@
break;
}
+#ifndef __BEOS__
/* test error */
optlen = sizeof(ret);
getsockopt (fd, SOL_SOCKET, SO_ERROR, &ret, &optlen);
if (ret != 0)
goto fail;
+#endif
}
s->fd = fd;
return 0;
extras/contrib/src/Patches/libdvdread.patch 0 → 100644
View file @ 5147198f
diff -ru libdvdread-original/dvdread/bswap.h libdvdread/dvdread/bswap.h
--- libdvdread-original/dvdread/bswap.h Sun Dec 15 00:09:12 2002
+++ libdvdread/dvdread/bswap.h Fri Jul 23 12:06:10 2004
@@ -65,7 +65,7 @@
* functionality!
*/
-#elif defined(__FreeBSD__) || defined(__sun) || defined(__bsdi__)
+#elif defined(__FreeBSD__) || defined(__sun) || defined(__bsdi__) || defined( __BEOS__ )
#define B2N_16(x) \
x = ((((x) & 0xff00) >> 8) | \
(((x) & 0x00ff) << 8))
diff -ru libdvdread-original/dvdread/dvd_reader.c libdvdread/dvdread/dvd_reader.c
--- libdvdread-original/dvdread/dvd_reader.c Thu Feb 13 22:31:21 2003
+++ libdvdread/dvdread/dvd_reader.c Fri Jul 23 12:11:59 2004
@@ -344,14 +344,26 @@
/* Resolve any symlinks and get the absolut dir name. */
{
+#ifdef __BEOS__
+ char *current_path;
+#endif
char *new_path;
+#ifndef __BEOS__
int cdir = open( ".", O_RDONLY );
if( cdir >= 0 ) {
+#else
+ current_path = getcwd( NULL, PATH_MAX );
+ if( current_path ) {
+#endif
chdir( path_copy );
new_path = getcwd( NULL, PATH_MAX );
+#ifndef __BEOS__
fchdir( cdir );
close( cdir );
+#else
+ chdir( current_path );
+#endif
if( new_path ) {
free( path_copy );
path_copy = new_path;
extras/contrib/src/Patches/speex.patch 0 → 100644
View file @ 5147198f
diff -ru speex-original/libspeex/preprocess.c speex/libspeex/preprocess.c
--- speex-original/libspeex/preprocess.c Sat Apr 10 00:21:49 2004
+++ speex/libspeex/preprocess.c Fri Jul 23 10:11:10 2004
@@ -970,8 +970,8 @@
int speex_preprocess_ctl(SpeexPreprocessState *state, int request, void *ptr)
{
SpeexPreprocessState *st;
- st=(SpeexPreprocessState*)state;
int i;
+ st=(SpeexPreprocessState*)state;
switch(request)
{
case SPEEX_PREPROCESS_SET_DENOISE:
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment