Skip to content

V
vlc
Commit 0a5027d1 authored by Christophe Mutricy's avatar Christophe Mutricy
Browse files
Options

ALL: Merge the win32-contrib branch. 

Todo:
	Fix FLAC
	SDL patch by Meuh
parent 77609b74
Hide whitespace changes
Inline Side-by-side
Showing with 2874 additions and 3772 deletions
configure.ac
View file @ 0a5027d1
......@@ -87,6 +87,8 @@ AC_ARG_WITH(contrib,
if test -d ${topdir}/extras/contrib/lib; then
export PATH=${topdir}/extras/contrib/bin:$PATH
dnl kludge because only the debian package provides a ffmpeg-config
with_ffmpeg_config_path=${topdir}/extras/contrib/bin
CPPFLAGS="${CPPFLAGS} -I${topdir}/extras/contrib/include"
CPPFLAGS_save="${CPPFLAGS_save} -I${topdir}/extras/contrib/include"
CFLAGS="${CFLAGS} -I${topdir}/extras/contrib/include"
......@@ -95,6 +97,11 @@ AC_ARG_WITH(contrib,
CXXFLAGS_save="${CXXFLAGS_save} -I${topdir}/extras/contrib/include"
OBJCFLAGS="${OBJCFLAGS} -I${topdir}/extras/contrib/include"
OBJCFLAGS_save="${OBJCFLAGS_save} -I${topdir}/extras/contrib/include"
if test $BUILD = $HOST; then
export PKG_CONFIG_PATH=${topdir}/extras/contrib/bin:$PKG_CONFIG_PATH
else
export PKG_CONFIG_LIBDIR=${topdir}/extras/contrib/bin
fi
if test -d ${topdir}/extras/contrib/vlc-lib; then
LDFLAGS="${LDFLAGS} -L${topdir}/extras/contrib/vlc-lib"
LDFLAGS_save="${LDFLAGS_save} -L${topdir}/extras/contrib/vlc-lib"
......
extras/contrib/src/Makefile
View file @ 0a5027d1
......@@ -54,6 +54,18 @@ export PATH = $(PREFIX)/bin:/opt/beos-tools/bin:/opt/cross-tools/bin:/usr/bin:/b
endif
endif
ifeq ($(HOST),i586-mingw32msvc)
HAVE_WIN32=1
endif
ifeq ($(HOST),cygwin)
HAVE_WIN32=1
endif
ifdef HAVE_WIN32
export PATH := $(PREFIX)/bin:$(PATH)
#EXTRA_CPPFLAGS = /usr/win32/include
#EXTRA_LDFLAGS = /usr/win32/lib
endif
export CFLAGS = -I$(PREFIX)/include $(EXTRA_CFLAGS) $(EXTRA_CPPFLAGS)
export CPPFLAGS = -I$(PREFIX)/include $(EXTRA_CFLAGS) $(EXTRA_CPPFLAGS)
export CXXFLAGS = -I$(PREFIX)/include $(EXTRA_CFLAGS) $(EXTRA_CPPFLAGS)
......@@ -68,11 +80,13 @@ export LDFLAGS = -L$(PREFIX)/lib $(EXTRA_LDFLAGS)
ifneq ($(BUILD),$(HOST))
# We are cross compiling
HOSTCONF=--host=$(HOST)
HOSTCONF=--host=$(HOST) --build=$(BUILD)
HOSTCC=CC=$(HOST)-gcc CXX=$(HOST)-g++ AR=$(HOST)-ar RANLIB=$(HOST)-ranlib
# For libebml/libmatroska. Grrr.
HOSTCC2=CC=$(HOST)-gcc CXX=$(HOST)-g++ "AR=$(HOST)-ar rcvu" RANLIB=$(HOST)-ranlib
HOSTCC2=CC=$(HOST)-gcc CXX=$(HOST)-g++ AR="$(HOST)-ar rcvu" RANLIB=$(HOST)-ranlib
FFMPEGCONF=--cross-prefix=$(HOST)-
X264CONF=--cross-prefix=$(HOST)
LIVECC=C_COMPILER=$(HOST)-gcc CPP=$(HOST)-cpp CPLUSPLUS_COMPILER=$(HOST)-g++ LINK="$(HOST)-g++ -o" LIBRARY_LINK="$(HOST)-ld -o"
RANLIB=$(HOST)-ranlib
else
# Building natively
......@@ -82,6 +96,13 @@ ifeq ($(HOST),i586-pc-beos)
FFMPEGCONF+=--cpu=x86
endif
# Special target-dependant options
#win
ifdef HAVE_WIN32
HOSTCONF+= --without-pic --disable-shared --enable-msw --with-included-opencdk --with-included-libtasn1 --disable-depedency-tracking
FFMPEGCONF+= --enable-mingw32 --enable-memalign-hack --cpu=x86
endif
# ***************************************************************************
# Standard rules
# ***************************************************************************
......@@ -112,12 +133,28 @@ else
.dvdread .dvdnav .dvbpsi .aclocal
endif
else
ifdef HAVE_WIN32
all: .iconv .intl .freetype .fribidi .zlib\
.a52 .mpeg2 .id3tag .mad .ogg .vorbis .vorbisenc .theora \
.FLAC .speex .faad .faac .lame .ebml .dts .matroska .ffmpeg .dvdcss \
.live .goom2k4 .caca .mod .x264 .xml .twolame\
.png .gpg-error .gcrypt .gnutls \
.gnutls .dvdread .dvdnav .dvbpsi .wxwidgets .dirac \
.dx_headers .dshow_headers .aclocal .gecko-win32
# .SDL_image .daap .cddb .cdio .vcdimager
else
# Standard Linux or other UNIX-like systems
all: .iconv .intl .freetype .fribidi \
.a52 .mpeg2 .id3tag .mad .ogg .vorbis .vorbisenc .x264 .theora \
.FLAC .speex .faad .faac .lame .ebml .matroska .ffmpeg .dvdcss \
.dvdread .dvdnav .dvbpsi .live .aclocal
endif
all: .iconv .intl .freetype .fribidi .zlib\
.a52 .mpeg2 .id3tag .mad .ogg .vorbis .vorbisenc .theora \
.FLAC .speex .faad .faac .lame .ebml .dts .matroska .ffmpeg .dvdcss \
.live .goom2k4 .caca .mod .x264 .xml .twolame\
.png .gpg-error .gcrypt .gnutls \
.gnutls .dvdread .dvdnav .dvbpsi .wxwidgets .dirac \
.aclocal
# .SDL_image .daap .cddb .cdio .vcdimager
endif
endif
endif
FORCE:
......@@ -302,10 +339,16 @@ gettext-$(GETTEXT_VERSION).tar.gz:
gettext: gettext-$(GETTEXT_VERSION).tar.gz
$(EXTRACT_GZ)
ifdef HAVE_DARWIN_OS
patch -p 0 < Patches/gettext.patch
endif
.intl: gettext .iconv
ifdef HAVE_WIN32
( cd $< && ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-relocatable --with-iconv-prefix=$(PREFIX))
else
( cd $< && ./configure $(HOSTCONF) --prefix=$(PREFIX) )
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
......@@ -317,6 +360,10 @@ ifneq ($(HOST),$(BUILD))
else
# Build and install the whole gettext
( cd $< && make && make install )
endif
# Work around another non-sense of autoconf.
ifdef HAVE_WIN32
(cd ../include; sed -i.bak '283 c #if !1' libintl.h)
endif
$(INSTALL_NAME)
touch $@
......@@ -334,10 +381,12 @@ libiconv-$(LIBICONV_VERSION).tar.gz:
libiconv: libiconv-$(LIBICONV_VERSION).tar.gz
$(EXTRACT_GZ)
ifdef HAVE_DARWIN_OS
patch -p 0 < Patches/libiconv.patch
endif
.iconv: libiconv
(cd libiconv; ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-nls && make && make install)
(cd libiconv; CPPFLAGS="-Dssize_t=long" ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-nls && make && make install)
$(INSTALL_NAME)
touch $@
......@@ -374,9 +423,11 @@ fribidi-$(FRIBIDI_VERSION).tar.gz:
fribidi: fribidi-$(FRIBIDI_VERSION).tar.gz
$(EXTRACT_GZ)
patch -p 0 < Patches/fribidi.patch.real
.fribidi: fribidi
(cd $<; ./bootstrap && ./configure $(HOSTCONF) --prefix=$(PREFIX) && make && make install)
ifdef HAVE_WIN32
patch -p 0 <Patches/fribidi-win32.patch
endif
.fribidi: fribidi .iconv
(cd $<; ./bootstrap && ./configure $(HOSTCONF) --prefix=$(PREFIX) && make && make install)
$(INSTALL_NAME)
touch $@
......@@ -487,6 +538,9 @@ libogg-$(OGG_VERSION).tar.gz:
libogg: libogg-$(OGG_VERSION).tar.gz
$(EXTRACT_GZ)
patch -p 0 < Patches/ogg.patch
#ifdef HAVE_WIN32
# (cd libogg;patch -p 0 <../Patches/libogg-1.1-win32.patch)
#endiF
.ogg: libogg
(cd $<; ./configure $(HOSTCONF) --prefix=$(PREFIX) && make && make install)
......@@ -517,7 +571,7 @@ libvorbis: libvorbis-$(VORBIS_VERSION).tar.gz
.vorbis: libvorbis .ogg
# FIXME: shared libs disabled for now because of linking errors
# -- titer 2005/09/16
(cd $<; ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-shared && make && make install)
(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-shared && make && make install)
# $(INSTALL_NAME)
touch $@
......@@ -578,8 +632,9 @@ flac-$(FLAC_VERSION).tar.gz:
flac: flac-$(FLAC_VERSION).tar.gz
$(EXTRACT_GZ)
.FLAC: flac
(cd $<; ./configure $(HOSTCONF) --prefix=$(PREFIX) && make && make install)
.FLAC: flac .ogg
(cd $<; ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-oggtest && cd src&& make -C libFLAC&& make -C libFLAC install && cd .. && make -C include install)
# (cd $<; ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-oggtest && cd src&& make -C libFLAC&& make -C libFLAC install && make -C libOggFLAC &&make -C libOggFLAC install && cd .. && make -C include install)
$(INSTALL_NAME)
touch $@
......@@ -623,9 +678,11 @@ faad2-$(FAAD2_VERSION).tar.bz2:
faad2: faad2-$(FAAD2_VERSION).tar.bz2
$(EXTRACT_BZ2)
ifdef HAVE_WIN32
(cd faad2;patch -p 0 < ../Patches/faad2-20050513-win32.patch)
endif
.faad: faad2
(cd $<; ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="-O3" && make -C libfaad && make -C libfaad install)
(cd $<; ./bootstrap && ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="-O3" && make -C libfaad && make -C libfaad install)
$(INSTALL_NAME)
touch $@
......@@ -663,7 +720,7 @@ lame: lame-$(LAME_VERSION).tar.gz
$(EXTRACT_GZ)
.lame: lame
(cd $<; ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-shared && make && make install)
(cd $<; ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-analyser-hooks --disable-decoder --disable-shared --disable-gtktest --disable-frontend && make && make install)
touch $@
CLEAN_FILE += .lame
......@@ -674,20 +731,27 @@ DISTCLEAN_PKG += lame-$(LAME_VERSION).tar.gz
# libebml
# ***************************************************************************
ifdef SVN
libebml:
$(SVN) co http://svn.matroska.org/svn/matroska/trunk/libebml libebml
else
#ifdef SVN
#libebml:
# $(SVN) co http://svn.matroska.org/svn/matroska/trunk/libebml libebml
#else
libebml-$(LIBEBML_VERSION).tar.bz2:
$(WGET) $(LIBEBML_URL)
libebml: libebml-$(LIBEBML_VERSION).tar.bz2
$(EXTRACT_BZ2)
ifdef HAVE_WIN32
(cd $@; patch -p 0 < ../Patches/libebml-svn-win32.patch)
endif
#endif
.ebml: libebml
ifdef HAVE_WIN32
(cd $<; make -C make/mingw32 prefix=$(PREFIX) $(HOSTCC2) CFLAGS="$(CFLAGS) -DWIN32" SHARED=no && make -C make/linux install_staticlib install_headers prefix=$(PREFIX) $(HOSTCC2))
else
(cd $<; make -C make/linux prefix=$(PREFIX) $(HOSTCC2) staticlib && make -C make/linux install_staticlib install_headers prefix=$(PREFIX))
$(RANLIB) $(PREFIX)/lib/libebml.a
endif
touch $@
CLEAN_FILE += .ebml
......@@ -698,20 +762,27 @@ DISTCLEAN_PKG += libebml-$(LIBEBML_VERSION).tar.bz2
# libmatroska
# ***************************************************************************
ifdef SVN
libmatroska:
$(SVN) co http://svn.matroska.org/svn/matroska/trunk/libmatroska libmatroska
else
#ifdef SVN
#libmatroska:
# $(SVN) co http://svn.matroska.org/svn/matroska/trunk/libmatroska libmatroska
#else
libmatroska-$(LIBMATROSKA_VERSION).tar.bz2:
$(WGET) $(LIBMATROSKA_URL)
libmatroska: libmatroska-$(LIBMATROSKA_VERSION).tar.bz2
$(EXTRACT_BZ2)
ifdef HAVE_WIN32
(cd $@; patch -p 0 < ../Patches/libmatroska-win32.patch)
endif
#endif
.matroska: libmatroska
.matroska: libmatroska .ebml
ifdef HAVE_WIN32
(cd $<; make -C make/mingw32 prefix=$(PREFIX) $(HOSTCC2) CPPFLAGS=$(CFLAGS) libmatroska.a && make -C make/linux install_staticlib install_headers prefix=$(PREFIX) $(HOSTCC2))
else
(cd $<; make -C make/linux prefix=$(PREFIX) $(HOSTCC2) staticlib && make -C make/linux install_staticlib install_headers prefix=$(PREFIX))
$(RANLIB) $(PREFIX)/lib/libmatroska.a
endif
touch $@
CLEAN_FILE += .matroska
......@@ -722,15 +793,14 @@ DISTCLEAN_PKG += libmatroska-$(LIBMATROSKA_VERSION).tar.bz2
# ffmpeg
# ***************************************************************************
# Note: we are using this cvs-snapshot of ffmpeg now, because this one
# compiles finely on 10.2 and is used in the win32-port as well, so we
# experience the same bugs in both ports ;)
ffmpeg:
echo $(FFMPEG_CVSROOT) A > ./ffmpeg.cvs
CVS_PASSFILE=./ffmpeg.cvs cvs -z3 -d $(FFMPEG_CVSROOT) co ffmpeg
patch -p 0 < Patches/ffmpeg.patch.cvs
# (cd $@; ./bootstrap)
(cd $@;patch -p 0 <../Patches/ffmpeg-cvs.patch)
ifeq ($(HOST),i586-pc-beos)
patch -p 0 < Patches/ffmpeg-beos.patch.cvs
(cd $@; ./bootstrap)
endif
ffmpeg-$(FFMPEG_VERSION).tar.gz:
$(WGET) $(FFMPEG_URL)
......@@ -739,8 +809,8 @@ ffmpeg-$(FFMPEG_VERSION).tar.gz:
# $(EXTRACT_GZ)
# patch -p 0 < Patches/ffmpeg.patch
.ffmpeg: ffmpeg
(cd $<; ./configure $(FFMPEGCONF) --prefix=$(PREFIX) --extra-cflags="$(CFLAGS) -DRUNTIME_CPUDETECT" --extra-ldflags="$(LDFLAGS)" --enable-gpl --enable-mp3lame --enable-faac --enable-pp --disable-vhook --disable-audio-beos --disable-ffserver --enable-mp3lame --enable-a52 --disable-ffplay && echo -e "#define HAVE_LRINTF 1" >> config.h && make && make -C libavcodec/libpostproc install && make -C libavcodec installlib && make -C libavformat installlib && make -C libavutil installlib)
.ffmpeg: ffmpeg .faac .lame .zlib
(cd $<; ./configure $(FFMPEGCONF) --prefix=$(PREFIX) --extra-cflags="$(CFLAGS) -DRUNTIME_CPUDETECT" --extra-ldflags="$(LDFLAGS)" --enable-gpl --enable-mp3lame --enable-faac --enable-pp --disable-vhook --disable-audio-beos --disable-ffserver --enable-a52 --disable-ffplay && for dir in libavcodec/libpostproc libavcodec libavformat libavutil; do make -C $$dir && make -C $$dir installlib; done)
touch $@
CLEAN_FILE += .ffmpeg
......@@ -759,7 +829,7 @@ openslp: openslp-$(OPENSLP_VERSION).tar.gz
patch -p 0 < Patches/openslp.patch
.openslp: openslp
(cd $<; ./configure --prefix=$(PREFIX) && make SUBDIRS="common libslpattr slpd libslp slptool" && make install SUBDIRS="common libslpattr slpd libslp slptool")
(cd $<; ./configure $(HOSTCONF) --prefix=$(PREFIX) && make SUBDIRS="common libslpattr slpd libslp slptool" && make install SUBDIRS="common libslpattr slpd libslp slptool")
touch $@
CLEAN_FILE += .openslp
......@@ -795,32 +865,44 @@ DISTCLEAN_PKG += libdvdcss-$(LIBDVDCSS_VERSION).tar.gz
# libdvdread
# ***************************************************************************
libdvdread-$(LIBDVDREAD_VERSION).tar.gz:
libdvdread-$(LIBDVDREAD_VERSION).tar.bz2:
$(WGET) $(LIBDVDREAD_URL)
libdvdread: libdvdread-$(LIBDVDREAD_VERSION).tar.gz
$(EXTRACT_GZ)
patch -p 0 < Patches/libdvdread.patch
libdvdread: libdvdread-$(LIBDVDREAD_VERSION).tar.bz2
$(EXTRACT_BZ2)
patch -p 0 < Patches/libdvdread.patch
ifdef HAVE_WIN32
if automake-1.4 --version >/dev/null 2>&1; then \
echo "Please get rid of your automake 1.4"; \
rm -rf $@ \
exit 1; \
fi
(cd libdvdread;patch -p 0 < ../Patches/libdvdread-20041028-win32.patch; ./bootstrap)
endif
.dvdread: libdvdread .dvdcss
(cd $<; ./configure $(HOSTCONF) --prefix=$(PREFIX) --with-libdvdcss=$(PREFIX) && make && make install)
(cd libdvdread; ./configure $(HOSTCONF) --prefix=$(PREFIX) --with-libdvdcss=$(PREFIX) && make && make install)
$(INSTALL_NAME)
touch $@
CLEAN_FILE += .dvdread
CLEAN_PKG += libdvdread
DISTCLEAN_PKG += libdvdread-$(LIBDVDREAD_VERSION).tar.gz
DISTCLEAN_PKG += libdvdread-$(LIBDVDREAD_VERSION).tar.bz2
# ***************************************************************************
# libdvdnav
# ***************************************************************************
libdvdnav-$(LIBDVDNAV_VERSION).tar.gz:
libdvdnav-$(LIBDVDNAV_VERSION).tar.bz2:
$(WGET) $(LIBDVDNAV_URL)
libdvdnav: libdvdnav-$(LIBDVDNAV_VERSION).tar.gz
$(EXTRACT_GZ)
patch -p 0 < Patches/dvdnav.patch
libdvdnav: libdvdnav-$(LIBDVDNAV_VERSION).tar.bz2
$(EXTRACT_BZ2)
# patch -p 0 < Patches/dvdnav.patch
ifdef HAVE_WIN32
(cd $@; patch -p 0 < ../Patches/libdvdnav-20050211-win32.patch)
endif
ifdef HAVE_DARWIN_OS
(cd $@; autoconf)
else
......@@ -828,13 +910,17 @@ else
endif
.dvdnav: libdvdnav .dvdread
ifdef HAVE_WIN32
(cd $<; ./configure $(HOSTCONF) --enable-static --prefix=$(PREFIX) --with-libdvdcss=$(PREFIX) --disable-builtin-dvdread CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS) -DNDEBUG -Dssize_t=long" && make && make install)
else
(cd $<; ./configure $(HOSTCONF) --enable-static --prefix=$(PREFIX) --with-libdvdcss=$(PREFIX) CFLAGS="$(CFLAGS) -Dlseek64=lseek -Doff64_t=off_t" && make && make install)
endif
$(INSTALL_NAME)
touch $@
CLEAN_FILE += .dvdnav
CLEAN_PKG += libdvdnav
DISTCLEAN_PKG += libdvdnav-$(LIBDVDNAV_VERSION).tar.gz
DISTCLEAN_PKG += libdvdnav-$(LIBDVDNAV_VERSION).tar.bz2
# ***************************************************************************
# libdvbpsi
......@@ -865,13 +951,18 @@ live555-$(LIVEDOTCOM_VERSION).tar.gz:
live: live555-$(LIVEDOTCOM_VERSION).tar.gz
$(EXTRACT_GZ)
patch -p 0 < Patches/live.patch
patch -p 0 < Patches/livedotcom-win32.patch
patch -p 0 < Patches/livedotcom-osx.patch
.live: live
ifeq ($(HOST),ppc-darwin)
(cd $<; ./genMakefiles macosx-before-version-10.4 && make )
else
ifdef HAVE_WIN32
(cd $<;./genMakefiles mingw && make)
else
(cd $<; ./genMakefiles macosx && make )
endif
endif
touch $@
......@@ -907,10 +998,15 @@ goom$(GOOM2k4_VERSION).tar.gz:
goom: goom$(GOOM2k4_VERSION).tar.gz
$(EXTRACT_GZ)
ifdef HAVE_DARWIN_OS
patch -p 0 < Patches/goom.patch
endif
ifdef HAVE_WIN32
patch -p 0 <Patches/goom2k4-0-win32.patch
endif
.goom2k4: goom
(cd $<; ./configure --prefix=$(PREFIX) --disable-shared --enable-static && make && make install )
(cd $<&& autoconf configure.in >|configure &&./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-shared --enable-static --disable-glibtest --disable-gtktest && make && make install )
touch $@
CLEAN_FILE += .goom2k4
......@@ -928,7 +1024,7 @@ libcaca: libcaca-$(LIBCACA_VERSION).tar.gz
$(EXTRACT_GZ)
.caca: libcaca
(cd $<; ./configure --prefix=$(PREFIX) --disable-imlib2 --disable-doc && make && make install)
(cd $<; ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-imlib2 --disable-doc && make && make install)
touch $@
CLEAN_FILE += .caca
......@@ -953,7 +1049,7 @@ libdts: libdts-$(LIBDTS_VERSION).tar.gz
endif
.dts: libdts
(cd $<; ./configure --prefix=$(PREFIX) && make && make install)
(cd $<; ./configure $(HOSTCONF) --prefix=$(PREFIX) && make && make install)
touch $@
CLEAN_FILE += .dts
......@@ -967,20 +1063,28 @@ DISTCLEAN_PKG += libdts-$(LIBDTS_VERSION).tar.gz
ifdef SVN
x264:
$(SVN) co svn://svn.videolan.org/x264/trunk/ x264
ifdef HAVE_WIN32
(cd x264; patch -p 0 <../Patches/x264-svn-win32.patch )
else
cd x264 && patch -p 0 < ../Patches/x264_svn.patch
rm x264/x264.c
endif
else
x264-$(X264_VERSION).tar.gz:
$(WGET) $(X264_URL)
x264: x264-$(X264_VERSION).tar.gz
$(EXTRACT_GZ)
ifdef HAVE_WIN32
(cd x264;patch -p 0 <../Patches/x264-20050624-win32.patch)
else
patch -p 0 < Patches/x264.patch
rm x264/x264.c
endif
endif
.x264: x264
(cd $<; ./configure --enable-pthread --prefix=$(PREFIX) && make && make install)
(cd $<; ./configure $(X264CONF) --prefix=$(PREFIX) && make && make install)
touch $@
CLEAN_FILE += .x264
......@@ -998,7 +1102,7 @@ libmodplug: libmodplug-$(MODPLUG_VERSION).tar.gz
$(EXTRACT_GZ)
.mod: libmodplug
(cd $<; ./configure --prefix=$(PREFIX) --disable-shared --enable-static && make && make install)
(cd $<; ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-shared --enable-static && make && make install)
touch $@
CLEAN_FILE += .mod
......@@ -1009,20 +1113,20 @@ DISTCLEAN_PKG += libmodplug-$(MODPLUG_VERSION).tar.gz
# libcddb
# ***************************************************************************
libcddb-$(CDDB_VERSION).tar.gz:
libcddb-$(CDDB_VERSION).tar.bz2:
$(WGET) $(CDDB_URL)
libcddb: libcddb-$(CDDB_VERSION).tar.gz
$(EXTRACT_GZ)
libcddb: libcddb-$(CDDB_VERSION).tar.bz2
$(EXTRACT_BZ2)
patch -p 0 < Patches/libcddb.patch
.cddb: libcddb
(cd $<; ./configure --prefix=$(PREFIX) --disable-shared --enable-static CFLAGS="$(CFLAGS) -D_BSD_SOCKLEN_T_=int" LDFLAGS="$(LDFLAGS) -liconv" && make && make install)
(cd $<; ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-shared --enable-static CFLAGS="$(CFLAGS) -D_BSD_SOCKLEN_T_=int" LDFLAGS="$(LDFLAGS) -liconv" && make && make install)
touch $@
CLEAN_FILE += .cddb
CLEAN_PKG += libcddb
DISTCLEAN_PKG += libcddb-$(CDDB_VERSION).tar.gz
DISTCLEAN_PKG += libcddb-$(CDDB_VERSION).tar.bz2
# ***************************************************************************
# vcdimager
......@@ -1084,6 +1188,71 @@ CLEAN_FILE += .mash
CLEAN_PKG += mash-code
DISTCLEAN_PKG += mash-src-$(MASH_VERSION).tar.gz
# ***************************************************************************
# wxWidgets
# ***************************************************************************
wxWidgets-$(WXWIDGETS_VERSION).tar.gz:
$(WGET) $(WXWIDGETS_URL)
wxwidgets: wxWidgets-$(WXWIDGETS_VERSION).tar.gz
$(EXTRACT_GZ)
# (cd wxwidgets; patch -p1 <../Patches/wxMSW-win32.patch)
.wxwidgets: wxwidgets
(cd wxwidgets; ./configure $(HOSTCONF) --prefix=$(PREFIX) --enable-optimise --disable-debug --disable-threads --disable-gif --disable-pcx --disable-iff --disable-pnm --without-zlib --without-libpng --without-libjpeg --without-libtiff --without-regex --disable-zipstream --disable-fs_zip --enable-no_rtti --enable-no_exceptions --disable-exceptions --disable-stl --disable-html --without-expat --disable-protocols --disable-protocol --disable-xrc --disable-sound --disable-dialupman --disable-mediactrl --disable-joystick --disable-grid --disable-datepick --disable-postscript--disable-filesystem --disable-fileproto --disable-ipc --disable-sockets && make && make install)
$(INSTALL_NAME)
touch $@
CLEAN_FILE += .wxwidgets
CLEAN_PKG += wxwidgets
DISTCLEAN_PKG += wxWidgets-$(WXWIDGETS_VERSION).tar.gz
# ***************************************************************************
# zlib
# ***************************************************************************
zlib-$(ZLIB_VERSION).tar.gz:
$(WGET) $(ZLIB_URL)
zlib: zlib-$(ZLIB_VERSION).tar.gz
$(EXTRACT_GZ)
.zlib: zlib
(cd zlib; $(HOSTCC2) ./configure --prefix=$(PREFIX) && make && make install)
$(INSTALL_NAME)
touch $@
CLEAN_FILE += .zlib
CLEAN_PKG += zlib
DISTCLEAN_PKG += zlib-$(ZLIB_VERSION).tar.gz
# ***************************************************************************
# xml
# ***************************************************************************
libxml2-$(XML_VERSION).tar.gz:
$(WGET) $(XML_URL)
xml: libxml2-$(XML_VERSION).tar.gz
$(EXTRACT_GZ)
ifdef HAVE_WIN32
patch -p 0 < Patches/xml2-win32.patch
rm -f xml/aclocal.m4
endif
.xml: xml
(cd xml; ./configure $(HOSTCONF) --prefix=$(PREFIX) --with-minimal --with-catalog --with-reader --with-tree --with-push --with-xptr --with-valid --with-writer --with-output --with-xpath --with-xinclude --with-sax1 --without-zlib --without-iconv --without-http --without-ftp && make && make install)
$(INSTALL_NAME)
touch $@
CLEAN_FILE += .xml
CLEAN_PKG += xml
DISTCLEAN_PKG += libxml2-$(XML_VERSION).tar.gz
# ***************************************************************************
# twolame
# ***************************************************************************
......@@ -1113,9 +1282,20 @@ libpng-$(PNG_VERSION).tar.bz2:
libpng: libpng-$(PNG_VERSION).tar.bz2
$(EXTRACT_BZ2)
cat Patches/libpng.patch | sed s,PREFIX,$(PREFIX), | patch -p0
.png: libpng
ifdef HAVE_WIN32
(cd $@; cat ../Patches/libpng-1.2.5-win32.patch | sed s,PREFIX,$(PREFIX), | patch -p0)
endif
.png: libpng .zlib
ifdef HAVE_DARWIN_OS
(cd $<; cp scripts/makefile.macosx Makefile && make && make install)
else
ifdef HAVE_WIN32
(cd $<; cp scripts/makefile.cygwin Makefile && make && make install)
else
(cd $<;./configure $(HOSTCONF) --prefix=$(PREFIX) && make && make install)
endif
endif
$(INSTALL_NAME)
touch $@
CLEAN_FILE += .png
......@@ -1138,7 +1318,7 @@ zvbi: zvbi-$(ZVBI_VERSION).tar.bz2
CLEAN_FILE += .zvbi
CLEAN_PKG += zvbi
DISTCLEAN_PKG += zvbi-$(ZVBI_VERSION).tar.bz2
#DISTCLEAN_PKG += zvbi-$(ZVBI_VERSION).tar.bz2
# ***************************************************************************
# gpg-error
......@@ -1151,7 +1331,7 @@ libgpg-error: libgpg-error-$(GPGERROR_VERSION).tar.gz
$(EXTRACT_GZ)
.gpg-error: libgpg-error
(cd $<; ./configure --prefix=$(PREFIX) --disable-nls && make && make install)
(cd $<; ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-nls && make && make install)
$(INSTALL_NAME)
touch $@
......@@ -1163,21 +1343,22 @@ DISTCLEAN_PKG += libgpg-error-$(GPGERROR_VERSION).tar.gz
# libgcrypt
# ***************************************************************************
libgcrypt-$(GCRYPT_VERSION).tar.gz:
libgcrypt-$(GCRYPT_VERSION).tar.bz2:
$(WGET) $(GCRYPT_URL)
libgcrypt: libgcrypt-$(GCRYPT_VERSION).tar.gz
$(EXTRACT_GZ)
patch -p 0 < Patches/gcrypt.patch
libgcrypt: libgcrypt-$(GCRYPT_VERSION).tar.bz2
$(EXTRACT_BZ2)
# patch -p 0 < Patches/gcrypt.patch
.gcrypt: libgcrypt .gpg-error
(cd $<; ./configure --prefix=$(PREFIX) CFLAGS="$(CFLAGS) -D_BSD_SOCKLEN_T_=int" && make && make install)
(cd $<; ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" && make && make install)
# (cd $<; ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS) -D_BSD_SOCKLEN_T_=int" && make && make install)
$(INSTALL_NAME)
touch $@
CLEAN_FILE += .gcrypt
CLEAN_PKG += libgcrypt
DISTCLEAN_PKG += libgcrypt-$(GCRYPT_VERSION).tar.gz
DISTCLEAN_PKG += libgcrypt-$(GCRYPT_VERSION).tar.bz2
# ***************************************************************************
# gnutls
......@@ -1188,9 +1369,14 @@ gnutls-$(GNUTLS_VERSION).tar.bz2:
gnutls: gnutls-$(GNUTLS_VERSION).tar.bz2
$(EXTRACT_BZ2)
(cd gnutls/gl ;ln -s alloca_.h alloca.h)
.gnutls: gnutls .gcrypt .gpg-error
(cd $<; ./configure --prefix=$(PREFIX) && make && make install)
ifdef HAVE_WIN32
(cd $<; ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" && cd crypto && make && cd ../gl && make && cd ../lib &&make && make install && cd ../includes && make install)
else
(cd $<; ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" && cd lib &&make && make install)
endif
$(INSTALL_NAME)
touch $@
......@@ -1272,6 +1458,37 @@ CLEAN_FILE += .gecko
CLEAN_PKG += gecko-sdk
DISTCLEAN_PKG += gecko-sdk-ppc-macosx10.2-1.7.5.tar.gz
# ***************************************************************************
# Gecko SDK win32
# ***************************************************************************
gecko-sdk-i586-pc-msvc-1.7.5.zip:
$(WGET) $(GECKO_SDK_WIN32_URL)
libIDL-0.6.3-win32-bin.zip:
$(WGET) $(LIBIDL_WIN32_BIN_URL)
vc71-glib-1.2.10-bin.zip:
$(WGET) $(VC71_GLIB_WIN32_BIN_URL)
gecko-sdk-win32: gecko-sdk-i586-pc-msvc-1.7.5.zip libIDL-0.6.3-win32-bin.zip vc71-glib-1.2.10-bin.zip
unzip gecko-sdk-i586-pc-msvc-1.7.5.zip
rm -rf ../gecko-sdk
mv gecko-sdk ..
unzip libIDL-0.6.3-win32-bin.zip
unzip vc71-glib-1.2.10-bin.zip
mv libIDL-0.6.3-win32-bin/libIDL-0.6.dll ../gecko-sdk/bin
rm -rf libIDL-0.6.3-win32-bin
mv vc71/bin/glib-1.2.dll ../gecko-sdk/bin
rm -rf vc71
.gecko-win32: gecko-sdk-win32
touch $@
CLEAN_FILE += .gecko-win32
CLEAN_PKG += gecko-sdk-win32
DISTCLEAN_PKG += gecko-sdk-i586-pc-msvc-1.7.5.zip libIDL-0.6.3-win32-bin.zip vc71-glib-1.2.10-bin.zip
# ***************************************************************************
# mozilla
# ***************************************************************************
......@@ -1301,7 +1518,7 @@ jpeg: jpeg-$(JPEG_VERSION).tar.gz
$(EXTRACT_GZ)
.jpeg: jpeg
(cd $<; ./configure --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" && make && make install-lib)
(cd $<; ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" $(HOSTCC) && make && make install-lib)
$(RANLIB) $(PREFIX)/lib/libjpeg.a
touch $@
......@@ -1320,9 +1537,12 @@ tiff-$(TIFF_VERSION).tar.gz:
tiff: tiff-$(TIFF_VERSION).tar.gz
$(EXTRACT_GZ)
patch -p 0 < Patches/tiff.patch
ifneq ($(HOST),$(BUILD))
patch -p 0 < Patches/tiff-cross.patch
endif
.tiff: tiff
(cd $<; ./configure --noninteractive --with-DIR_BIN=$(PREFIX)/bin --with-DIR_LIB=$(PREFIX)/lib --with-DIR_INC=$(PREFIX)/include --with-CFLAGS="$(CFLAGS)" --with-JPEG=no --with-ZIP=no && make -C libtiff && make -C libtiff install)
(cd $<; ./configure --noninteractive --target=$(HOST) --with-CC=$(HOST)-gcc --with-DIR_BIN=$(PREFIX)/bin --with-DIR_LIB=$(PREFIX)/lib --with-DIR_INC=$(PREFIX)/include --with-CFLAGS="$(CFLAGS)" --with-JPEG=no --with-ZIP=no && make -C libtiff && make -C libtiff install)
touch $@
CLEAN_FILE += .tiff
......@@ -1341,7 +1561,7 @@ SDL: SDL-$(SDL_VERSION).tar.gz
patch -p 0 < Patches/SDL.patch
.SDL: SDL
(cd $<; ./configure --prefix=$(PREFIX) --disable-audio --disable-video-x11 --disable-video-aalib --disable-video-dga --disable-video-fbcon --disable-video-directfb --disable-video-ggi --disable-video-svga --disable-directx --disable-joystick --disable-cdrom --disable-threads --disable-sdl-dlopen CFLAGS="$(CFLAGS)" && make && make install)
(cd $<; ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-audio --disable-video-x11 --disable-video-aalib --disable-video-dga --disable-video-fbcon --disable-video-directfb --disable-video-ggi --disable-video-svga --disable-directx --disable-joystick --disable-cdrom --disable-threads --disable-sdl-dlopen CFLAGS="$(CFLAGS)" && make && make install)
$(INSTALL_NAME)
touch $@
......@@ -1361,7 +1581,7 @@ SDL_image: SDL_image-$(SDL_IMAGE_VERSION).tar.gz
patch -p 0 < Patches/SDL_image.patch
.SDL_image: SDL_image .SDL .png .jpeg .tiff
(cd $<; ./configure --prefix=$(PREFIX) --enable-tif CFLAGS="$(CFLAGS)" && make && make install)
(cd $<; ./configure $(HOSTCONF) --prefix=$(PREFIX) --enable-tif CFLAGS="$(CFLAGS)" && make && make install)
$(INSTALL_NAME)
touch $@
......@@ -1387,6 +1607,54 @@ CLEAN_FILE += .libmpcdec
CLEAN_PKG += libmpcdec
DISTCLEAN_PKG += libmpcdec-$(MUSE_VERSION).tar.bz2
# ***************************************************************************
# Dirac
# ***************************************************************************
dirac-$(DIRAC_VERSION).tar.gz:
$(WGET) $(DIRAC_URL)
dirac: dirac-$(DIRAC_VERSION).tar.gz
$(EXTRACT_GZ)
ifneq ($(HOST),$(BUILD))
patch -p 0 <Patches/dirac-cross.patch
(cd $@; autoconf && automake)
endif
.dirac: dirac
(cd $<; aclocal && ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" && DOC_DIR="" make && DOC_DIR="" make install)
$(INSTALL_NAME)
touch $@
CLEAN_FILE += .dirac
CLEAN_PKG += dirac
DISTCLEAN_PKG += dirac-$(DIRAC_VERSION).tar.gz
# *************************************************************************
# DirectX headers
# *************************************************************************
win32-dx7headers.tgz:
$(WGET) $(DX_HEADERS_URL)
.dx_headers: win32-dx7headers.tgz
(cd ../include ; tar xzf ../src/$<)
touch $@
CLEAN_FILE += .dx_headers
DISTCLEAN_PKG += win32-dx7headers.tgz
# *************************************************************************
# DirectShow headers
# *************************************************************************
dshow-headers.tgz:
$(WGET) $(DSHOW_HEADERS_URL)
.dshow_headers: dshow-headers.tgz
(cd ../include ; tar xzf ../src/$<)
touch $@
CLEAN_FILE += .dshow_headers
DISTCLEAN_PKG += dshow-headers.tgz
# ***************************************************************************
# Copy aclocal files
# This is necessary for --missing aclocal to succeed after a
......
extras/contrib/src/Patches/dirac-cross.patch 0 → 100644
View file @ 0a5027d1
--- dirac/Makefile.am 2005-05-20 15:05:25.000000000 +0200
+++ dirac-new/Makefile.am 2005-09-16 18:43:26.000000000 +0200
@@ -2,18 +2,12 @@
#
SUBDIRS = libdirac_common libdirac_motionest libdirac_encoder libdirac_decoder \
-encoder decoder util $(CPPUNITTESTS_DIR) tests $(DOC_DIR) win32
+encoder decoder util $(CPPUNITTESTS_DIR) win32
.PHONY: valgrind-check
valgrind-check:
cd tests && $(MAKE) $(AM_MAKEFLAGS) $@
-if HAVE_DOXYGEN
-DOC_DIR = doc
-else
-DOC_DIR =
-endif
-
if HAVE_LATEX
DOC_DIR = doc
endif
--- dirac/configure.ac 2005-08-22 14:51:34.000000000 +0200
+++ dirac-new/configure.ac 2005-09-05 16:18:00.000000000 +0200
@@ -143,7 +143,7 @@
dnl algorithm documentation is not distributed in
dnl the release. It is available only from CVS
dnl -----------------------------------------------
-AC_CHECK_FILE($srcdir/doc/documentation/algorithm/algorithm/index.htm,[HAVE_ALGO="true"], [HAVE_ALGO="false"])
+dnl AC_CHECK_FILE($srcdir/doc/documentation/algorithm/algorithm/index.htm,[HAVE_ALGO="true"], [HAVE_ALGO="false"])
AM_CONDITIONAL(HAVE_ALGO, $HAVE_ALGO)
dnl -----------------------------------------------
@@ -151,7 +151,7 @@
dnl Enhancements is not distributed in
dnl the release. It is available only from CVS
dnl -----------------------------------------------
-AC_CHECK_FILE($srcdir/doc/documentation/algorithm/enhancements/index.htm,[HAVE_ENHANCE="true"], [HAVE_ENHANCE="false"])
+dnl AC_CHECK_FILE($srcdir/doc/documentation/algorithm/enhancements/index.htm,[HAVE_ENHANCE="true"], [HAVE_ENHANCE="false"])
AM_CONDITIONAL(HAVE_ENHANCE, $HAVE_ENHANCE)
dnl -----------------------------------------------
@@ -159,7 +159,7 @@
dnl Global Motion documentation is not distributed in
dnl the release. It is available only from CVS
dnl -----------------------------------------------
-AC_CHECK_FILE($srcdir/doc/documentation/algorithm/global_motion/index.htm,[HAVE_GM="true"], [HAVE_GM="false"])
+dnl AC_CHECK_FILE($srcdir/doc/documentation/algorithm/global_motion/index.htm,[HAVE_GM="true"], [HAVE_GM="false"])
AM_CONDITIONAL(HAVE_GM, $HAVE_GM)
dnl -----------------------------------------------
@@ -167,7 +167,7 @@
dnl Upconversion doc is not distributed in
dnl the release. It is available only from CVS
dnl -----------------------------------------------
-AC_CHECK_FILE($srcdir/doc/documentation/algorithm/upconversion/index.htm,[HAVE_UPCONV="true"], [HAVE_UPCONV="false"])
+dnl AC_CHECK_FILE($srcdir/doc/documentation/algorithm/upconversion/index.htm,[HAVE_UPCONV="true"], [HAVE_UPCONV="false"])
AM_CONDITIONAL(HAVE_UPCONV, $HAVE_UPCONV)
dnl -----------------------------------------------
@@ -175,7 +175,7 @@
dnl programmer's guide is not distributed in
dnl the release. It is available only from CVS
dnl -----------------------------------------------
-AC_CHECK_FILE($srcdir/doc/documentation/code/programmers_guide/index.htm,[HAVE_PROG="true"], [HAVE_PROG="false"])
+dnl AC_CHECK_FILE($srcdir/doc/documentation/code/programmers_guide/index.htm,[HAVE_PROG="true"], [HAVE_PROG="false"])
AM_CONDITIONAL(HAVE_PROG, $HAVE_PROG)
dnl -----------------------------------------------
@@ -183,7 +183,7 @@
dnl Diagnostics tools docs are is not distributed in
dnl the release. It is available only from CVS
dnl -----------------------------------------------
-AC_CHECK_FILE($srcdir/doc/documentation/tools/diagnostics/index.htm,[HAVE_DIAG="true"], [HAVE_DIAG="false"])
+dnl AC_CHECK_FILE($srcdir/doc/documentation/tools/diagnostics/index.htm,[HAVE_DIAG="true"], [HAVE_DIAG="false"])
AM_CONDITIONAL(HAVE_DIAG, $HAVE_DIAG)
dnl -----------------------------------------------
extras/contrib/src/Patches/faad2-20050513-win32.patch 0 → 100644
View file @ 0a5027d1
+codebook/hcb_9.h codebook/hcb_10.h codebook/hcb_11.h codebook/hcb_sf.h
Index: libfaad/common.h
===================================================================
RCS file: /cvsroot/faac/faad2/libfaad/common.h,v
retrieving revision 1.66
diff -u -r1.66 common.h
--- libfaad/common.h 1 Feb 2005 13:23:35 -0000 1.66
+++ libfaad/common.h 13 May 2005 09:07:19 -0000
@@ -309,8 +309,10 @@
}
- #if defined(_WIN32) && !defined(__MINGW32__)
+ #ifdef __MINGW32__
#define HAS_LRINTF
+ #elif defined(_WIN32)
+ #define HAS_LRINTF
static INLINE int lrintf(float f)
{
int i;
extras/contrib/src/Patches/ffmpeg-20050513-win32.patch 0 → 100644
View file @ 0a5027d1
? win-ffmpeg.sh
Index: libavcodec/libpostproc/postprocess.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/libpostproc/postprocess.c,v
retrieving revision 1.110
diff -u -r1.110 postprocess.c
--- libavcodec/libpostproc/postprocess.c 11 May 2005 23:51:44 -0000 1.110
+++ libavcodec/libpostproc/postprocess.c 13 May 2005 09:22:27 -0000
@@ -92,6 +92,8 @@
#include "mangle.h" //FIXME should be supressed
+#define RUNTIME_CPUDETECT 1
+
#ifdef HAVE_ALTIVEC_H
#include <altivec.h>
#endif
extras/contrib/src/Patches/ffmpeg-cvs.patch 0 → 100644
View file @ 0a5027d1
Index: libavcodec/libpostproc/Makefile
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/libpostproc/Makefile,v
retrieving revision 1.26
diff -u -r1.26 Makefile
--- libavcodec/libpostproc/Makefile 26 Sep 2005 10:05:13 -0000 1.26
+++ libavcodec/libpostproc/Makefile 31 Oct 2005 20:23:34 -0000
@@ -56,7 +56,7 @@
$(AR) rc $@ $(PPOBJS)
$(RANLIB) $@
-install: all
+installlib: all
ifeq ($(SHARED_PP),yes)
ifeq ($(CONFIG_WIN32),yes)
install $(INSTALLSTRIP) -m 755 $(SPPLIBNAME) "$(prefix)"
extras/contrib/src/Patches/ffmpeg.patch deleted 100644 → 0
View file @ 77609b74
diff -ru ffmpeg.old/configure ffmpeg/configure
--- ffmpeg.old/configure Sun Sep 28 17:26:39 2003
+++ ffmpeg/configure Tue Nov 11 17:17:59 2003
@@ -172,18 +172,18 @@
extralibs=""
darwin="yes"
strip="strip -x"
-LDFLAGS="-d"
+LDFLAGS="$LDFLAGS -d"
FFSLDFLAGS=-Wl,-bind_at_load
gcc_version="$($cc -v 2>&1 | grep version | cut -d ' ' -f3-)"
case "$gcc_version" in
*2.95*)
-CFLAGS="-no-cpp-precomp -pipe -fomit-frame-pointer"
+CFLAGS="$CFLAGS -no-cpp-precomp -pipe -fomit-frame-pointer"
;;
*3.3*)
-CFLAGS="-no-cpp-precomp -pipe -fomit-frame-pointer -mdynamic-no-pic -force_cpusubtype_ALL"
+CFLAGS="$CFLAGS -no-cpp-precomp -pipe -fomit-frame-pointer -mdynamic-no-pic -force_cpusubtype_ALL"
;;
*)
-CFLAGS="-no-cpp-precomp -pipe -fomit-frame-pointer -mdynamic-no-pic"
+CFLAGS="$CFLAGS -no-cpp-precomp -pipe -fomit-frame-pointer -mdynamic-no-pic"
;;
esac
;;
diff -ru ffmpeg.old/libavcodec/dsputil.h ffmpeg/libavcodec/dsputil.h
--- ffmpeg.old/libavcodec/dsputil.h Sun Sep 28 17:26:39 2003
+++ ffmpeg/libavcodec/dsputil.h Tue Nov 11 17:16:28 2003
@@ -477,6 +477,8 @@
+name8(s, dst+8+8*stride, src+8+8*stride, stride);\
}
+/* Meuuh power */
+#undef HAVE_LRINTF
#ifndef HAVE_LRINTF
/* XXX: add ISOC specific test to avoid specific BSD testing. */
/* better than nothing implementation. */
diff -ru ffmpeg.old/libavcodec/eval.c ffmpeg/libavcodec/eval.c
--- ffmpeg.old/libavcodec/eval.c Sun Sep 28 17:26:39 2003
+++ ffmpeg/libavcodec/eval.c Tue Nov 11 17:16:28 2003
@@ -34,6 +34,8 @@
#include <string.h>
#include <math.h>
+/* Meuuh power */
+#undef NAN
#ifndef NAN
#define NAN 0
#endif
diff -ru ffmpeg.old/libavcodec/libpostproc/Makefile ffmpeg/libavcodec/libpostproc/Makefile
--- ffmpeg.old/libavcodec/libpostproc/Makefile Sun Sep 28 17:26:40 2003
+++ ffmpeg/libavcodec/libpostproc/Makefile Tue Nov 11 17:16:28 2003
@@ -55,6 +55,9 @@
ldconfig || true
mkdir -p $(prefix)/include/postproc
install -m 644 postprocess.h $(prefix)/include/postproc/postprocess.h
+else
+ mkdir -p $(prefix)/include/libpostproc
+ install -m 644 postprocess.h $(prefix)/include/libpostproc/postprocess.h
endif
diff -ru ffmpeg.old/libavcodec/resample.c ffmpeg/libavcodec/resample.c
--- ffmpeg.old/libavcodec/resample.c Sun Sep 28 17:26:39 2003
+++ ffmpeg/libavcodec/resample.c Tue Nov 11 17:16:28 2003
@@ -49,7 +49,7 @@
static void init_mono_resample(ReSampleChannelContext *s, float ratio)
{
ratio = 1.0 / ratio;
- s->iratio = (int)floorf(ratio);
+ s->iratio = (int)floor(ratio);
if (s->iratio == 0)
s->iratio = 1;
s->incr = (int)((ratio / s->iratio) * FRAC);
diff -ru ffmpeg.old/libavformat/rtsp.c ffmpeg/libavformat/rtsp.c
--- ffmpeg.old/libavformat/rtsp.c Sun Sep 28 17:26:40 2003
+++ ffmpeg/libavformat/rtsp.c Tue Nov 11 17:16:28 2003
@@ -20,6 +20,7 @@
#include <unistd.h> /* for select() prototype */
#include <sys/time.h>
+#include <unistd.h>
#include <netinet/in.h>
#include <sys/socket.h>
#ifndef __BEOS__
diff -ru ffmpeg.old/libavformat/tcp.c ffmpeg/libavformat/tcp.c
--- ffmpeg.old/libavformat/tcp.c Sun Sep 28 17:26:40 2003
+++ ffmpeg/libavformat/tcp.c Tue Nov 11 17:16:28 2003
@@ -32,6 +32,7 @@
#include <netdb.h>
#include <sys/time.h>
#include <fcntl.h>
+#define socklen_t int
typedef struct TCPContext {
int fd;
extras/contrib/src/Patches/ffmpeg.patch.cvs deleted 100644 → 0
View file @ 77609b74
diff -ru ffmpeg-orig/configure ffmpeg/configure
--- ffmpeg-orig/configure 2005-10-23 16:00:23.000000000 +0200
+++ ffmpeg/configure 2005-10-23 16:05:03.000000000 +0200
@@ -254,7 +254,7 @@
2.9-beos-991026*|2.9-beos-000224*) echo "R5/GG gcc"
mmx="no"
;;
-*20010315*) echo "BeBits gcc"
+*20010315*|2.95.3*) echo "BeBits gcc"
CFLAGS="$CFLAGS -fno-expensive-optimizations"
;;
esac
@@ -448,7 +448,7 @@
;;
--extra-ldflags=*) LDFLAGS="$LDFLAGS ${opt#--extra-ldflags=}"
;;
- --extra-libs=*) extralibs=${opt#--extra-libs=}
+ --extra-libs=*) extralibs="$extralibs ${opt#--extra-libs=}"
;;
--build-suffix=*) BUILDSUF=${opt#--build-suffix=}
;;
@@ -473,7 +473,6 @@
--disable-audio-oss) audio_oss="no"
;;
--disable-audio-beos) audio_beos="no"
- extralibs="$extralibs -lbe -lmedia"
;;
--disable-dv1394) dv1394="no"
;;
@@ -867,6 +866,18 @@
ranlib="${cross_prefix}${ranlib}"
strip="${cross_prefix}${strip}"
+if test "${cross_prefix}" = "i586-pc-beos-"; then
+ # Cross-compiling from Linux for BeOS
+ CFLAGS="$CFLAGS -DPIC -fomit-frame-pointer -fno-expensive-optimizations"
+ SHFLAGS=-nostart
+ audio_oss="no"
+ v4l="no"
+ dv1394="no"
+ netserver="yes"
+ need_inet_aton="yes"
+ extralibs="-lnet"
+fi
+
if test -z "$cross_prefix" ; then
# ---
@@ -985,6 +996,7 @@
EOF
have_lrintf="no"
+if test "${cross_prefix}" != "i586-pc-beos-"; then
if $cc $CFLAGS $LDFLAGS $extralibs -o $TMPE $TMPC 2> /dev/null ; then
have_lrintf="yes"
# allanc@chickenandporn.com: cannot execute cross-compiled
@@ -993,6 +1005,7 @@
$TMPE 2> /dev/null > /dev/null || have_lrintf="no"
fi
fi
+fi
_restrict=
for restrict_keyword in restrict __restrict__ __restrict; do
diff -ru ffmpeg-orig/libavcodec/eval.c ffmpeg/libavcodec/eval.c
--- ffmpeg-orig/libavcodec/eval.c 2005-10-23 16:00:22.000000000 +0200
+++ ffmpeg/libavcodec/eval.c 2005-10-23 16:05:34.000000000 +0200
@@ -34,6 +34,8 @@
#include <string.h>
#include <math.h>
+/* Meuuh power */
+#undef NAN
#ifndef NAN
#define NAN 0
#endif
diff -ru ffmpeg-orig/libavformat/tcp.c ffmpeg/libavformat/tcp.c
--- ffmpeg-orig/libavformat/tcp.c 2005-10-23 16:00:22.000000000 +0200
+++ ffmpeg/libavformat/tcp.c 2005-10-23 16:06:19.000000000 +0200
@@ -32,6 +32,7 @@
#include <netdb.h>
#include <sys/time.h>
#include <fcntl.h>
+#define socklen_t int
typedef struct TCPContext {
int fd;
@@ -112,11 +113,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/fribidi-win32.patch 0 → 100644
View file @ 0a5027d1
diff -Naur fribidi-orig/Makefile.am fribidi/Makefile.am
--- fribidi-orig/Makefile.am 2002-05-16 12:25:37.000000000 +0200
+++ fribidi/Makefile.am 2005-08-26 15:20:26.000000000 +0200
@@ -1,7 +1,7 @@
AUTOMAKE_OPTIONS = gnu
-noinst_PROGRAMS = fribidi_benchmark \
+noinst_PROGRAMS = \
fribidi_create_char_types \
fribidi_create_mirroring
@@ -103,8 +103,6 @@
$(OTHER_FILES) \
$(EXTRA_HEADERS)
-fribidi_benchmark_SOURCES = fribidi_benchmark.c $(GETOPT_SRC)
-fribidi_benchmark_LDADD = libfribidi.la
fribidi_create_char_types_SOURCES = fribidi_create_char_types.c packtab.c
extras/contrib/src/Patches/gettext.patch deleted 100644 → 0
View file @ 77609b74
diff -ru gettext-original/gettext-runtime/intl/libgnuintl.h.in gettext/gettext-runtime/intl/libgnuintl.h.in
--- gettext-original/gettext-runtime/intl/libgnuintl.h.in Sun Nov 16 16:27:58 2003
+++ gettext/gettext-runtime/intl/libgnuintl.h.in Fri Aug 20 12:34:40 2004
@@ -280,7 +280,7 @@
or gettext() but for which the format string could be the return value
of _() or gettext() need to add this #include. Oh well. */
-#if !@HAVE_POSIX_PRINTF@
+#if !@HAVE_POSIX_PRINTF@ && !defined(__BEOS__)
#include <stdio.h>
#include <stddef.h>
diff -ru gettext-original/gettext-runtime/intl/printf.c gettext/gettext-runtime/intl/printf.c
--- gettext-original/gettext-runtime/intl/printf.c Wed Sep 17 18:09:12 2003
+++ gettext/gettext-runtime/intl/printf.c Fri Aug 20 12:34:40 2004
@@ -45,7 +45,7 @@
#include <stdio.h>
-#if !HAVE_POSIX_PRINTF
+#if !HAVE_POSIX_PRINTF && !defined(__BEOS__)
#include <stdlib.h>
#include <string.h>
diff -ru gettext-original/gettext-runtime/libasprintf/autosprintf.cc gettext/gettext-runtime/libasprintf/autosprintf.cc
--- gettext-original/gettext-runtime/libasprintf/autosprintf.cc Mon Oct 28 20:44:32 2002
+++ gettext/gettext-runtime/libasprintf/autosprintf.cc Fri Aug 20 13:09:56 2004
@@ -32,6 +32,51 @@
#include <string.h>
#include "lib-asprintf.h"
+#ifdef __BEOS__
+/* vasprintf emulation (borrowed from VLC) */
+#define vasprintf beossux_vasprintf
+int beossux_vasprintf(char **strp, const char *fmt, va_list ap)
+{
+ /* Guess we need no more than 100 bytes. */
+ int i_size = 100;
+ char *p = (char *) malloc( i_size );
+ int n;
+
+ if( p == NULL )
+ {
+ *strp = NULL;
+ return -1;
+ }
+
+ for( ;; )
+ {
+ /* Try to print in the allocated space. */
+ n = vsnprintf( p, i_size, fmt, ap );
+
+ /* If that worked, return the string. */
+ if (n > -1 && n < i_size)
+ {
+ *strp = p;
+ return strlen( p );
+ }
+ /* Else try again with more space. */
+ if (n > -1) /* glibc 2.1 */
+ {
+ i_size = n+1; /* precisely what is needed */
+ }
+ else /* glibc 2.0 */
+ {
+ i_size *= 2; /* twice the old size */
+ }
+ if( (p = (char *) realloc( p, i_size ) ) == NULL)
+ {
+ *strp = NULL;
+ return -1;
+ }
+ }
+}
+#endif
+
namespace gnu
{
diff -ru gettext-original/gettext-runtime/libasprintf/lib-asprintf.c gettext/gettext-runtime/libasprintf/lib-asprintf.c
--- gettext-original/gettext-runtime/libasprintf/lib-asprintf.c Fri Jun 20 14:52:05 2003
+++ gettext/gettext-runtime/libasprintf/lib-asprintf.c Fri Aug 20 12:34:40 2004
@@ -21,7 +21,7 @@
# include <config.h>
#endif
-#if !(HAVE_VASPRINTF && HAVE_POSIX_PRINTF)
+#if !(HAVE_VASPRINTF && HAVE_POSIX_PRINTF) && !defined(__BEOS__)
#define STATIC static
diff -ru gettext-original/gettext-runtime/libasprintf/lib-asprintf.h gettext/gettext-runtime/libasprintf/lib-asprintf.h
--- gettext-original/gettext-runtime/libasprintf/lib-asprintf.h Fri Jun 20 14:56:51 2003
+++ gettext/gettext-runtime/libasprintf/lib-asprintf.h Fri Aug 20 12:34:40 2004
@@ -21,7 +21,7 @@
# include <config.h>
#endif
-#if HAVE_VASPRINTF && HAVE_POSIX_PRINTF
+#if ( HAVE_VASPRINTF && HAVE_POSIX_PRINTF ) || defined(__BEOS__)
/* Get asprintf(), vasprintf() declarations. */
#include <stdio.h>
extras/contrib/src/Patches/goom2k4-0-win32.patch 0 → 100644
View file @ 0a5027d1
diff -Naur goom-orig/configure.in goom/configure.in
--- goom-orig/configure.in 2005-02-07 14:46:41.000000000 +0100
+++ goom/configure.in 2005-08-26 16:37:03.000000000 +0200
@@ -1,6 +1,5 @@
AC_INIT(README)
-AM_DISABLE_STATIC
AM_INIT_AUTOMAKE(SDL_Goom, 2k4)
ACLOCAL="$ACLOCAL -I m4"
@@ -76,24 +75,7 @@
AM_CONDITIONAL(MACTARGET,test "x$MACTARGET" = "xyes")
-AC_CHECK_HEADER(pthread.h,,AC_MSG_ERROR([*** POSIX thread support not installed - please install first ***]))
-
-PTHREAD_LIBS=error
-AC_CHECK_LIB(pthread, pthread_attr_init, PTHREAD_LIBS="-lpthread")
-
-if test "x$PTHREAD_LIBS" = xerror; then
- AC_CHECK_LIB(pthreads, pthread_attr_init, PTHREAD_LIBS="-lpthreads")
-fi
-
-if test "x$PTHREAD_LIBS" = xerror; then
- AC_CHECK_LIB(c_r, pthread_attr_init, PTHREAD_LIBS="-lc_r")
-fi
-
-if test "x$PTHREAD_LIBS" = xerror; then
- AC_CHECK_FUNC(pthread_attr_init, PTHREAD_LIBS="")
-fi
-
-AC_SUBST(PTHREAD_LIBS)
+dnl AC_SUBST(PTHREAD_LIBS)
dnl rm -f mmx_zoom.s
dnl echo -n checking for nasm...
diff -Naur goom-orig/src/filters.c goom/src/filters.c
--- goom-orig/src/filters.c 2005-02-07 14:46:41.000000000 +0100
+++ goom/src/filters.c 2005-08-26 16:31:17.000000000 +0200
@@ -201,8 +201,8 @@
/* Noise */
if (data->noisify)
{
- vx += (((float)random()) / ((float)RAND_MAX) - 0.5f) / 50.0f;
- vy += (((float)random()) / ((float)RAND_MAX) - 0.5f) / 50.0f;
+ vx += (((float)rand()) / ((float)RAND_MAX) - 0.5f) / 50.0f;
+ vy += (((float)rand()) / ((float)RAND_MAX) - 0.5f) / 50.0f;
}
/* Hypercos */
diff -Naur goom-orig/src/goom_core.c goom/src/goom_core.c
--- goom-orig/src/goom_core.c 2005-02-07 14:46:41.000000000 +0100
+++ goom/src/goom_core.c 2005-08-26 16:33:01.000000000 +0200
@@ -40,11 +40,11 @@
static void init_buffers(PluginInfo *goomInfo, int buffsize)
{
goomInfo->pixel = (guint32 *) malloc (buffsize * sizeof (guint32) + 128);
- bzero (goomInfo->pixel, buffsize * sizeof (guint32) + 128);
+ memset (goomInfo->pixel, 0, buffsize * sizeof (guint32) + 128);
goomInfo->back = (guint32 *) malloc (buffsize * sizeof (guint32) + 128);
- bzero (goomInfo->back, buffsize * sizeof (guint32) + 128);
+ memset (goomInfo->back, 0, buffsize * sizeof (guint32) + 128);
goomInfo->conv = (Pixel *) malloc (buffsize * sizeof (guint32) + 128);
- bzero (goomInfo->conv, buffsize * sizeof (guint32) + 128);
+ memset (goomInfo->conv, 0, buffsize * sizeof (guint32) + 128);
goomInfo->outputBuf = goomInfo->conv;
extras/contrib/src/Patches/goom2k4-0-win32.patch.bak 0 → 100644
View file @ 0a5027d1
--- /tmp/goom2k4-dev15-pre/configure.in 2004-03-27 18:15:05.000000000 +0100
+++ configure.in 2004-05-08 21:35:25.000000000 +0200
@@ -1,6 +1,5 @@
AC_INIT(README)
-AM_DISABLE_STATIC
AM_INIT_AUTOMAKE(SDL_Goom, 2k4)
AM_PROG_LIBTOOL
@@ -9,69 +8,11 @@
AC_C_BIGENDIAN
-dnl AM_PATH_XMMS(0.9.5.1,LIBS=$XMMS_LIBS, [
-dnl echo "*** ^^^ IGNORE THE ABOVE WARNING MESSAGE IF YOU HAVE NOT PATCHED XMMS"
-dnl echo "*** ^^^ WITH THE xmms-config patch!"
-dnl echo "*** xmms-config was not found in your path; guessing values for CFLAGS"
-dnl echo "*** and libs."
-
- AM_PATH_GLIB(1.2.2,,AC_MSG_ERROR([*** GLIB >= 1.2.2 not installed - please install first ***]))
- AM_PATH_GTK(1.2.2,,AC_MSG_ERROR([*** GTK+ >= 1.2.2 not installed - please install first ***]),gthread)
-
- LIBS="$GTK_LIBS -lxmms"
- CFLAGS="$GTK_CFLAGS -I$prefix/include/xmms"
-
- AC_TRY_COMPILE(xmms/plugin.h, , AC_MSG_ERROR([*** XMMS header files (xmms-devel) not installed - please install first ***]))
- AC_PREFIX_PROGRAM(xmms)
-
- if test "$prefix" = "/usr/bin"; then # happens if xmms is in /usr/bin/X11
- prefix=/usr
- fi
-
- if test "$prefix" = "/usr/X11R6"; then # happens if xmms is in /usr/X11R6/bin
- prefix=/usr
- fi
-
- echo "prefix set to $prefix"
-
- XMMS_LIBS="$GTK_LIBS -lxmms"
- XMMS_CFLAGS="$GTK_CFLAGS -I$prefix/include/xmms"
- XMMS_PLUGIN_DIR="$prefix/lib/xmms"
- XMMS_VISUALIZATION_PLUGIN_DIR="$XMMS_PLUGIN_DIR/Visualization"
- XMMS_DATA_DIR="$prefix/share/xmms"
-
- AC_SUBST(XMMS_LIBS)
- AC_SUBST(XMMS_CFLAGS)
- AC_SUBST(XMMS_PLUGIN_DIR)
- AC_SUBST(XMMS_VISUALIZATION_PLUGIN_DIR)
- AC_SUBST(XMMS_DATA_DIR)
-dnl ])
-
-CFLAGS="$CFLAGS $GTK_CFLAGS"
-AC_SUBST(GTK_LIBS)
+dnl AC_SUBST(GTK_LIBS)
-AC_CHECK_HEADER(pthread.h,,AC_MSG_ERROR([*** POSIX thread support not installed - please install first ***]))
-
-PTHREAD_LIBS=error
-AC_CHECK_LIB(pthread, pthread_attr_init, PTHREAD_LIBS="-lpthread")
-
-dnl SDL_LIBS=error
-dnl AC_CHECK_LIB(SDL, main, SDL_LIBS=-lSDL)
dnl AC_SUBST(SDL_LIBS)
-if test "x$PTHREAD_LIBS" = xerror; then
- AC_CHECK_LIB(pthreads, pthread_attr_init, PTHREAD_LIBS="-lpthreads")
-fi
-
-if test "x$PTHREAD_LIBS" = xerror; then
- AC_CHECK_LIB(c_r, pthread_attr_init, PTHREAD_LIBS="-lc_r")
-fi
-
-if test "x$PTHREAD_LIBS" = xerror; then
- AC_CHECK_FUNC(pthread_attr_init, PTHREAD_LIBS="")
-fi
-
-AC_SUBST(PTHREAD_LIBS)
+dnl AC_SUBST(PTHREAD_LIBS)
dnl rm -f mmx_zoom.s
case "$host" in
--- /tmp/goom2k4-dev15-pre/src/Makefile.am 2004-03-27 19:07:40.000000000 +0100
+++ src/Makefile.am 2004-05-08 20:58:43.000000000 +0200
@@ -1,18 +1,3 @@
-# the xmms plugin
-xmms_lib_LTLIBRARIES = libxmmsgoom2.la
-
-xmms_libdir = @XMMS_PLUGIN_DIR@/Visualization
-
-libxmmsgoom2_la_LDFLAGS = -module -avoid-version
-xmms_LIBS = -L. -L$(prefix)/lib @XMMS_LIBS@
-
-xmms_INCLUDES = $(all_includes)\
- -I$(top_srcdir)
-
-xmms_CFLAGS = -O9 -g -DDATADIR=\"@XMMS_DATA_DIR@\" @XMMS_CFLAGS@ -Wall
-
-libxmmsgoom2_la_SOURCES = xmms_goom.c
-
# libgoom2
goom2_lib_LTLIBRARIES = libgoom2.la
@@ -31,17 +16,3 @@
libgoom2_la_SOURCES = \
goom_tools.c mmx.c xmmx.c config_param.c convolve_fx.c filters.c flying_stars_fx.c gfontlib.c gfontrle.c goom_core.c graphic.c ifs.c lines.c mathtools.c sound_tester.c surf3d.c surface.c tentacle3d.c plugin_info.c v3d.c drawmethods.c goom_script.c goom_hash.c goom_script_scanner.c goom_script_scanner.tab.c cpu_info.c
-# the goom2 stand alone program
-bin_PROGRAMS = goom2
-
-LIBS = -L. -L$(prefix)/lib `sdl-config --libs` @XMMS_LIBS@
-
-INCLUDES = $(all_includes)\
- -I$(top_srcdir)
-
-CFLAGS = -O9 -g `sdl-config --cflags` @XMMS_CFLAGS@ -Wall
-
-# FIXME, link to libgoom
-goom2_SOURCES = \
-config_param.c convolve_fx.c filters.c flying_stars_fx.c frame_rate_tester.c gfontlib.c gfontrle.c gmtimer.c goom_core.c graphic.c gtk-callbacks.c gtk-interface.c gtk-support.c ifs.c lines.c mathtools.c pixeldoubler.c readme.c sdl_goom.c sdl_pixeldoubler.c sound_tester.c surf3d.c surface.c tentacle3d.c xmms_goom.c mmx.c xmmx.c goom_tools.c plugin_info.c v3d.c drawmethods.c goom_script.c goom_hash.c goom_script_scanner.c goom_script_scanner.tab.c cpu_info.c
-
--- /tmp/goom2k4-dev15-pre/src/filters.c 2004-03-27 18:15:05.000000000 +0100
+++ src/filters.c 2004-05-09 11:57:07.000000000 +0200
@@ -199,8 +199,8 @@
/* Noise */
if (data->noisify)
{
- vx += (((float)random()) / ((float)RAND_MAX) - 0.5f) / 50.0f;
- vy += (((float)random()) / ((float)RAND_MAX) - 0.5f) / 50.0f;
+ vx += (((float)rand()) / ((float)RAND_MAX) - 0.5f) / 50.0f;
+ vy += (((float)rand()) / ((float)RAND_MAX) - 0.5f) / 50.0f;
}
/* Hypercos */
--- /tmp/goom2k4-dev15-pre/src/goom_core.c 2004-03-27 18:15:05.000000000 +0100
+++ src/goom_core.c 2004-05-09 11:50:23.000000000 +0200
@@ -39,11 +39,11 @@
static void init_buffers(PluginInfo *goomInfo, int buffsize)
{
goomInfo->pixel = (guint32 *) malloc (buffsize * sizeof (guint32) + 128);
- bzero (goomInfo->pixel, buffsize * sizeof (guint32) + 128);
+ memset (goomInfo->pixel, 0, buffsize * sizeof (guint32) + 128);
goomInfo->back = (guint32 *) malloc (buffsize * sizeof (guint32) + 128);
- bzero (goomInfo->back, buffsize * sizeof (guint32) + 128);
+ memset (goomInfo->back, 0, buffsize * sizeof (guint32) + 128);
goomInfo->conv = (Pixel *) malloc (buffsize * sizeof (guint32) + 128);
- bzero (goomInfo->conv, buffsize * sizeof (guint32) + 128);
+ memset (goomInfo->conv, 0, buffsize * sizeof (guint32) + 128);
goomInfo->p1 = (Pixel *) ((1 + ((unsigned int) (goomInfo->pixel)) / 128) * 128);
goomInfo->p2 = (Pixel *) ((1 + ((unsigned int) (goomInfo->back)) / 128) * 128);
extras/contrib/src/Patches/libdvdnav-20050211-win32.patch 0 → 100644
View file @ 0a5027d1
Index: configure.ac
===================================================================
RCS file: /cvsroot/dvd/libdvdnav/configure.ac,v
retrieving revision 1.22
diff -u -r1.22 configure.ac
--- configure.ac 3 Jan 2005 20:24:21 -0000 1.22
+++ configure.ac 11 Feb 2005 11:08:09 -0000
@@ -171,6 +171,12 @@
esac
dnl ---------------------------------------------
+dnl enable builtin libdvdread
+dnl ---------------------------------------------
+AC_ARG_ENABLE(builtin-dvdread,
+[ --disable-builtin-dvdread use external libdvdread (default builtin)])
+
+dnl ---------------------------------------------
dnl cflags
dnl ---------------------------------------------
dnl Common cflags for all platforms
@@ -218,13 +224,20 @@
fi
AC_SUBST(DEPCOMP)
+if test "${enable_builtin_dvdread}" != "no"; then
+ BUILTIN_DVDREAD=dvdread
+ BUILTIN_DVDREAD_LIB='$(top_builddir)/src/dvdread/libdvdread.la'
+ AC_SUBST(BUILTIN_DVDREAD)
+ AC_SUBST(BUILTIN_DVDREAD_LIB)
+ AC_OUTPUT([src/dvdread/Makefile])
+fi
+
dnl ---------------------------------------------
dnl Output configuration files
dnl ---------------------------------------------
AC_OUTPUT([
Makefile
src/Makefile
-src/dvdread/Makefile
src/vm/Makefile
misc/Makefile
misc/dvdnav-config
Index: src/Makefile.am
===================================================================
RCS file: /cvsroot/dvd/libdvdnav/src/Makefile.am,v
retrieving revision 1.28
diff -u -r1.28 Makefile.am
--- src/Makefile.am 3 Jan 2005 20:24:21 -0000 1.28
+++ src/Makefile.am 11 Feb 2005 11:08:09 -0000
@@ -1,6 +1,6 @@
include $(top_srcdir)/misc/Makefile.common
-SUBDIRS = dvdread vm
+SUBDIRS = $(BUILTIN_DVDREAD) vm
includedir = ${prefix}/include/dvdnav
@@ -17,7 +17,7 @@
dvdnav_internal.h read_cache.h remap.h
libdvdnav_la_LIBADD = $(THREAD_LIBS) \
- $(top_builddir)/src/dvdread/libdvdread.la \
+ $(BUILTIN_DVDREAD_LIB) \
$(top_builddir)/src/vm/libdvdvm.la
libdvdnav_la_LDFLAGS = \
Index: src/dvdnav.c
===================================================================
RCS file: /cvsroot/dvd/libdvdnav/src/dvdnav.c,v
retrieving revision 1.65
diff -u -r1.65 dvdnav.c
--- src/dvdnav.c 15 Dec 2004 21:16:58 -0000 1.65
+++ src/dvdnav.c 11 Feb 2005 11:08:09 -0000
@@ -31,7 +31,6 @@
#include "dvdnav_internal.h"
#include "read_cache.h"
-#include "nav_read.h"
#include <stdlib.h>
#include <stdio.h>
Index: src/dvdnav.h
===================================================================
RCS file: /cvsroot/dvd/libdvdnav/src/dvdnav.h,v
retrieving revision 1.31
diff -u -r1.31 dvdnav.h
--- src/dvdnav.h 9 Jun 2003 15:17:44 -0000 1.31
+++ src/dvdnav.h 11 Feb 2005 11:08:10 -0000
@@ -33,16 +33,19 @@
extern "C" {
#endif
+#include <inttypes.h>
+
+#include <dvdread/dvd_reader.h>
+#include <dvdread/nav_types.h>
+#include <dvdread/nav_read.h>
+#include <dvdread/ifo_types.h> /* For vm_cmd_t */
+
#ifdef DVDNAV_COMPILE
# include "dvdnav_events.h"
# include "dvd_types.h"
-# include "dvd_reader.h"
-# include "ifo_types.h" /* For vm_cmd_t */
#else
# include <dvdnav/dvdnav_events.h>
# include <dvdnav/dvd_types.h>
-# include <dvdnav/dvd_reader.h>
-# include <dvdnav/ifo_types.h> /* For vm_cmd_t */
#endif
Index: src/dvdnav_events.h
===================================================================
RCS file: /cvsroot/dvd/libdvdnav/src/dvdnav_events.h,v
retrieving revision 1.12
diff -u -r1.12 dvdnav_events.h
--- src/dvdnav_events.h 27 Apr 2003 01:26:18 -0000 1.12
+++ src/dvdnav_events.h 11 Feb 2005 11:08:10 -0000
@@ -28,10 +28,6 @@
#ifndef DVDNAV_EVENTS_H_INCLUDED
#define DVDNAV_EVENTS_H_INCLUDED
-#include "ifo_types.h"
-#include "dvd_reader.h"
-#include "nav_types.h"
-
/*
* DVDNAV_BLOCK_OK
Index: src/highlight.c
===================================================================
RCS file: /cvsroot/dvd/libdvdnav/src/highlight.c,v
retrieving revision 1.32
diff -u -r1.32 highlight.c
--- src/highlight.c 20 Jan 2004 01:22:24 -0000 1.32
+++ src/highlight.c 11 Feb 2005 11:08:10 -0000
@@ -26,7 +26,6 @@
#endif
#include <assert.h>
-#include "nav_types.h"
#include "dvdnav_internal.h"
/*
Index: src/remap.c
===================================================================
RCS file: /cvsroot/dvd/libdvdnav/src/remap.c,v
retrieving revision 1.4
diff -u -r1.4 remap.c
--- src/remap.c 27 Aug 2003 13:54:19 -0000 1.4
+++ src/remap.c 11 Feb 2005 11:08:10 -0000
@@ -189,7 +189,11 @@
remap_t *map;
/* Build the map filename */
- home = getenv("HOME"); assert(home);
+ home = getenv("HOME");
+ if (!home) {
+ fprintf(MSG_OUT, "libdvdnav: Unable to find map for title '%s'\n", title);
+ return NULL;
+ }
strncpy(fname, home, sizeof(fname));
strncat(fname, "/.dvdnav/", sizeof(fname));
strncat(fname, title, sizeof(fname));
Index: src/vm/decoder.c
===================================================================
RCS file: /cvsroot/dvd/libdvdnav/src/vm/decoder.c,v
retrieving revision 1.2
diff -u -r1.2 decoder.c
--- src/vm/decoder.c 3 Mar 2004 16:50:42 -0000 1.2
+++ src/vm/decoder.c 11 Feb 2005 11:08:10 -0000
@@ -31,7 +31,6 @@
#include <stdlib.h>
#include <inttypes.h>
#include <string.h> /* For memset */
-#include "ifo_types.h" /* vm_cmd_t */
#include "dvdnav_internal.h"
Index: src/vm/decoder.h
===================================================================
RCS file: /cvsroot/dvd/libdvdnav/src/vm/decoder.h,v
retrieving revision 1.1
diff -u -r1.1 decoder.h
--- src/vm/decoder.h 11 Jan 2004 21:43:13 -0000 1.1
+++ src/vm/decoder.h 11 Feb 2005 11:08:10 -0000
@@ -28,7 +28,7 @@
#include <inttypes.h>
#include <sys/time.h>
-#include "ifo_types.h" /* vm_cmd_t */
+#include <dvdread/ifo_types.h> /* vm_cmd_t */
#include "dvdnav_internal.h"
/* link command types */
Index: src/vm/vm.c
===================================================================
RCS file: /cvsroot/dvd/libdvdnav/src/vm/vm.c,v
retrieving revision 1.11
diff -u -r1.11 vm.c
--- src/vm/vm.c 16 Jan 2005 16:47:05 -0000 1.11
+++ src/vm/vm.c 11 Feb 2005 11:08:11 -0000
@@ -38,13 +38,17 @@
#include <sys/stat.h>
#include <fcntl.h>
-#include "ifo_types.h"
-#include "ifo_read.h"
+/* from dvdread */
+#include <dvdread/ifo_types.h>
+#include <dvdread/ifo_read.h>
#include "dvdnav_internal.h"
#ifdef _MSC_VER
#include <io.h> /* read() */
+#elif defined(WIN32)
+# define lseek _lseeki64
+# define off_t int64_t
#endif /* _MSC_VER */
/*
diff -Naur Makefile.am Makefile.am
--- Makefile.am 2004-10-26 19:26:07.000000000 +0200
+++ Makefile.am 2005-09-02 15:05:20.000000000 +0200
@@ -2,7 +2,7 @@
AUTOMAKE_OPTIONS = 1.3
-SUBDIRS = src examples doc misc m4
+SUBDIRS = src misc m4
EXTRA_DIST = autogen.sh \
AUTHORS \
--- misc/dvdnav-config.in 2003-04-27 03:26:17.000000000 +0200
+++ misc/dvdnav-config.in 2005-09-21 20:27:06.000000000 +0200
@@ -76,5 +76,5 @@
fi
if test "$echo_libs" = "yes"; then
- echo -L@libdir@ -ldvdnav @THREAD_LIBS@
+ echo -L@libdir@ -ldvdnav @THREAD_LIBS@ -ldvdread -ldvdcss
fi
extras/contrib/src/Patches/libdvdread-20041028-win32.patch 0 → 100644
View file @ 0a5027d1
? winwx.sh
Index: configure.in
===================================================================
RCS file: /cvsroot/ogle/libdvdread/configure.in,v
retrieving revision 1.24
diff -u -r1.24 configure.in
--- configure.in 5 Jul 2003 18:30:25 -0000 1.24
+++ configure.in 2 Sep 2004 13:43:23 -0000
@@ -77,6 +77,11 @@
[ ],
AC_MSG_ERROR(You need libdvdcss (dvdcss.h))
)
+ case "x${host}" in
+ x*mingw32* | x*cygwin*)
+ CSS_LIBS=-ldvdcss
+ ;;
+ x*)
AC_MSG_CHECKING([for dvdcss_interface_2 in -ldvdcss])
saved_LDFLAGS=$LDFLAGS
LDFLAGS="$LDFLAGS -ldvdcss"
@@ -88,6 +93,8 @@
] )
LDFLAGS=$saved_LDFLAGS
AC_MSG_RESULT([yes])
+ ;;
+ esac
else
dnl -w added to shutup GCC3.1's cpp warning about -I/usr/local
saved_CPPFLAGS=$CPPFLAGS
@@ -99,6 +106,12 @@
CPPFLAGS=$saved_CPPFLAGS
saved_CFLAGS=$CFLAGS
CFLAGS="$CFLAGS -I$dvdcss_path/include -L$dvdcss_path/lib -ldvdcss"
+ case "x${host}" in
+ x*mingw32* | x*cygwin*)
+ CSS_LIBS="-L$dvdcss_path/lib -R$dvdcss_path/lib -ldvdcss"
+ CSS_CFLAGS=-I$dvdcss_path/include
+ ;;
+ x*)
AC_MSG_CHECKING([for dvdcss_interface_2 in -ldvdcss])
AC_TRY_LINK([#include <dvdcss/dvdcss.h>],
[if(!dvdcss_interface_2) { return 1; }],
@@ -109,6 +122,8 @@
] )
CFLAGS=$saved_CFLAGS
AC_MSG_RESULT([yes])
+ ;;
+ esac
fi
fi
Index: dvdread/bswap.h
===================================================================
RCS file: /cvsroot/ogle/libdvdread/dvdread/bswap.h,v
retrieving revision 1.10
diff -u -r1.10 bswap.h
--- dvdread/bswap.h 18 Jun 2003 13:35:03 -0000 1.10
+++ dvdread/bswap.h 2 Sep 2004 13:43:25 -0000
@@ -85,14 +85,14 @@
(((x) & 0x0000ff00) << 8) | \
(((x) & 0x000000ff) << 24))
#define B2N_64(x) \
- x = ((((x) & 0xff00000000000000) >> 56) | \
- (((x) & 0x00ff000000000000) >> 40) | \
- (((x) & 0x0000ff0000000000) >> 24) | \
- (((x) & 0x000000ff00000000) >> 8) | \
- (((x) & 0x00000000ff000000) << 8) | \
- (((x) & 0x0000000000ff0000) << 24) | \
- (((x) & 0x000000000000ff00) << 40) | \
- (((x) & 0x00000000000000ff) << 56))
+ x = ((((x) & 0xff00000000000000LL) >> 56) | \
+ (((x) & 0x00ff000000000000LL) >> 40) | \
+ (((x) & 0x0000ff0000000000LL) >> 24) | \
+ (((x) & 0x000000ff00000000LL) >> 8) | \
+ (((x) & 0x00000000ff000000LL) << 8) | \
+ (((x) & 0x0000000000ff0000LL) << 24) | \
+ (((x) & 0x000000000000ff00LL) << 40) | \
+ (((x) & 0x00000000000000ffLL) << 56))
#else
Index: dvdread/dvd_input.c
===================================================================
RCS file: /cvsroot/ogle/libdvdread/dvdread/dvd_input.c,v
retrieving revision 1.8
diff -u -r1.8 dvd_input.c
--- dvdread/dvd_input.c 4 Apr 2004 20:02:27 -0000 1.8
+++ dvdread/dvd_input.c 2 Sep 2004 13:43:25 -0000
@@ -21,11 +21,23 @@
#include <stdio.h>
#include <stdlib.h>
+
+#if defined(HAVE_INTTYPES_H)
+#include <inttypes.h>
+#elif defined(HAVE_STDINT_H)
+#include <stdint.h>
+#endif
+
#include <fcntl.h>
#include <unistd.h>
#include "dvd_reader.h"
#include "dvd_input.h"
+
+#ifdef WIN32
+# define lseek _lseeki64
+# define off_t int64_t
+#endif
/* The function pointers that is the exported interface of this file. */
dvd_input_t (*dvdinput_open) (const char *);
extras/contrib/src/Patches/libdvdread-win32.patch 0 → 100644
View file @ 0a5027d1
Index: dvdread/bswap.h
===================================================================
RCS file: /cvsroot/ogle/libdvdread/dvdread/bswap.h,v
retrieving revision 1.10
diff -u -r1.10 bswap.h
--- dvdread/bswap.h 18 Jun 2003 13:35:03 -0000 1.10
+++ dvdread/bswap.h 2 Sep 2004 13:43:25 -0000
@@ -85,14 +85,14 @@
(((x) & 0x0000ff00) << 8) | \
(((x) & 0x000000ff) << 24))
#define B2N_64(x) \
- x = ((((x) & 0xff00000000000000) >> 56) | \
- (((x) & 0x00ff000000000000) >> 40) | \
- (((x) & 0x0000ff0000000000) >> 24) | \
- (((x) & 0x000000ff00000000) >> 8) | \
- (((x) & 0x00000000ff000000) << 8) | \
- (((x) & 0x0000000000ff0000) << 24) | \
- (((x) & 0x000000000000ff00) << 40) | \
- (((x) & 0x00000000000000ff) << 56))
+ x = ((((x) & 0xff00000000000000LL) >> 56) | \
+ (((x) & 0x00ff000000000000LL) >> 40) | \
+ (((x) & 0x0000ff0000000000LL) >> 24) | \
+ (((x) & 0x000000ff00000000LL) >> 8) | \
+ (((x) & 0x00000000ff000000LL) << 8) | \
+ (((x) & 0x0000000000ff0000LL) << 24) | \
+ (((x) & 0x000000000000ff00LL) << 40) | \
+ (((x) & 0x00000000000000ffLL) << 56))
#else
Index: dvdread/dvd_input.c
===================================================================
RCS file: /cvsroot/ogle/libdvdread/dvdread/dvd_input.c,v
retrieving revision 1.8
diff -u -r1.8 dvd_input.c
--- dvdread/dvd_input.c 4 Apr 2004 20:02:27 -0000 1.8
+++ dvdread/dvd_input.c 2 Sep 2004 13:43:25 -0000
@@ -21,11 +21,23 @@
#include <stdio.h>
#include <stdlib.h>
+
+#if defined(HAVE_INTTYPES_H)
+#include <inttypes.h>
+#elif defined(HAVE_STDINT_H)
+#include <stdint.h>
+#endif
+
#include <fcntl.h>
#include <unistd.h>
#include "dvd_reader.h"
#include "dvd_input.h"
+
+#ifdef WIN32
+# define lseek _lseeki64
+# define off_t int64_t
+#endif
/* The function pointers that is the exported interface of this file. */
dvd_input_t (*dvdinput_open) (const char *);
extras/contrib/src/Patches/libdvdread.patch
View file @ 0a5027d1
Only in libdvdread/dvdread: .dvd_input.c.swp
diff -ru libdvdread-0.9.4/dvdread/bswap.h libdvdread/dvdread/bswap.h
--- libdvdread-0.9.4/dvdread/bswap.h 2002-12-15 01:09:12.000000000 +0100
+++ libdvdread/dvdread/bswap.h 2005-08-31 19:24:57.000000000 +0200
......@@ -6,24 +5,24 @@ diff -ru libdvdread-0.9.4/dvdread/bswap.h libdvdread/dvdread/bswap.h
* functionality!
*/
-#elif defined(__FreeBSD__) || defined(__sun) || defined(__bsdi__)
+#elif defined(__FreeBSD__) || defined(__sun) || defined(__bsdi__) || defined( __BEOS__ )
-#elif defined(__FreeBSD__) || defined(__sun) || defined(__bsdi__) || defined(WIN32)
+#elif defined(__FreeBSD__) || defined(__sun) || defined(__bsdi__) || defined(WIN32) || defined( __BEOS__ )
#define B2N_16(x) \
x = ((((x) & 0xff00) >> 8) | \
(((x) & 0x00ff) << 8))
diff -ru libdvdread-0.9.4/dvdread/dvd_reader.c libdvdread/dvdread/dvd_reader.c
--- libdvdread-0.9.4/dvdread/dvd_reader.c 2003-02-13 23:31:21.000000000 +0100
+++ libdvdread/dvdread/dvd_reader.c 2005-08-31 19:24:57.000000000 +0200
@@ -303,8 +303,7 @@
if( path == NULL )
return 0;
- ret = stat( path, &fileinfo );
- if( ret < 0 ) {
+ if( *path && (ret = stat( path, &fileinfo ) < 0) ) {
/* If we can't stat the file, give up */
fprintf( stderr, "libdvdread: Can't stat %s\n", path );
perror("");
@@ -324,8 +324,7 @@
else
#endif
{
- ret = stat( path, &fileinfo );
- if( ret < 0 ) {
+ if( *path && (ret = stat( path, &fileinfo ) < 0) ) {
/* If we can't stat the file, give up */
fprintf( stderr, "libdvdread: Can't stat %s\n", path );
perror("");
@@ -315,7 +314,7 @@
have_css = dvdinput_setup();
......@@ -68,4 +67,3 @@ diff -ru libdvdread-0.9.4/dvdread/dvd_reader.c libdvdread/dvdread/dvd_reader.c
return -1;
}
Only in libdvdread/dvdread: dvd_reader.c.orig
extras/contrib/src/Patches/libebml-svn-win32.patch 0 → 100644
View file @ 0a5027d1
Index: make/linux/Makefile
===================================================================
--- make/linux/Makefile (revision 1206)
+++ make/linux/Makefile (working copy)
@@ -36,9 +36,9 @@
DEBUGFLAGS=-g -DDEBUG
endif
-ifneq (,$(shell $(CXX) -v 2>&1 | tail -n 1 | grep -i mingw))
-$(error Please use the Makefile in ../mingw32)
-endif
+#ifneq (,$(shell $(CXX) -v 2>&1 | tail -n 1 | grep -i mingw))
+#$(error Please use the Makefile in ../mingw32)
+#endif
CWD=$(shell pwd)
Index: make/mingw32/Makefile
===================================================================
--- make/mingw32/Makefile (revision 1206)
+++ make/mingw32/Makefile (working copy)
@@ -19,6 +19,8 @@
CXX = g++.exe
CC = gcc.exe
WINDRES = windres.exe
+AR = ar rcvu
+RANLIB = ranlib
RES =
SRC = $(wildcard ../../src/*.cpp)
OBJ = $(patsubst %.cpp,%.o,$(SRC))
@@ -47,8 +49,8 @@
rm -f .depend
libebml.a: $(OBJ)
- ar r $@ $(OBJ)
- ranlib $@
+ $(AR) $@ $(OBJ)
+ $(RANLIB) $@
libebml.dll: $(OBJ)
$(CXX) -shared -Wl,--export-all -Wl,--out-implib=$@.a -o $@ $(OBJ)
extras/contrib/src/Patches/libiconv.patch
View file @ 0a5027d1
This source diff could not be displayed because it is too large. You can view the blob instead.
extras/contrib/src/Patches/libmatroska-win32.patch 0 → 100644
View file @ 0a5027d1
Index: make/linux/Makefile
===================================================================
--- make/linux/Makefile (revision 1206)
+++ make/linux/Makefile (working copy)
@@ -29,9 +29,9 @@
INSTALL_OPTS_LIB = -m 644
INSTALL_DIR_OPTS = -m 755
-ifneq (,$(shell $(CXX) -v 2>&1 | tail -n 1 | grep -i mingw))
-$(error Please use the Makefile in ../mingw32)
-endif
+#ifneq (,$(shell $(CXX) -v 2>&1 | tail -n 1 | grep -i mingw))
+#$(error Please use the Makefile in ../mingw32)
+#endif
CWD=$(shell pwd)
extras/contrib/src/Patches/libogg-1.1-win32.patch 0 → 100644
View file @ 0a5027d1
Index: include/ogg/os_types.h
===================================================================
RCS file: /usr/local/cvsroot/ogg/include/ogg/os_types.h,v
retrieving revision 1.12
diff -u -r1.12 os_types.h
--- include/ogg/os_types.h 18 Sep 2002 04:42:09 -0000 1.12
+++ include/ogg/os_types.h 18 Apr 2003 13:48:18 -0000
@@ -24,7 +24,7 @@
#define _ogg_realloc realloc
#define _ogg_free free
-#ifdef _WIN32
+#if defined(_WIN32) && !defined(__MINGW32__)
# ifndef __GNUC__
/* MSVC/Borland */
extras/contrib/src/Patches/libpng-1.2.5-win32.patch 0 → 100644
View file @ 0a5027d1
diff -ur scripts/makefile.cygwin scripts/makefile.cygwin
--- scripts/makefile.cygwin 2002-10-03 12:32:34.000000000 +0100
+++ scripts/makefile.cygwin 2003-07-25 11:03:42.000000000 +0100
@@ -35,7 +35,7 @@
# $CFLAGS, and include pnggccrd.o in $OBJS, below, and in the dependency
# list at the bottom of this makefile.
-CC=gcc
+CC=i586-mingw32msvc-gcc
ifdef MINGW
MINGW_CCFLAGS=-mno-cygwin -I/usr/include/mingw
MINGW_LDFLAGS=-mno-cygwin -L/usr/lib/mingw
@@ -43,13 +43,12 @@
# Where "make install" puts libpng*.a, *png*.dll, png.h, and pngconf.h
ifndef prefix
-prefix=/usr
-$(warning You haven't specified a 'prefix=' location. Defaulting to "/usr")
+prefix=PREFIX
endif
# Where the zlib library and include files are located
-ZLIBLIB= /usr/lib
-ZLIBINC=
+ZLIBLIB= PREFIX/lib
+ZLIBINC= PREFIX/include
#ZLIBLIB=../zlib
#ZLIBINC=../zlib
@@ -94,7 +94,7 @@
LDEXTRA=-Wl,--out-implib=$(IMPLIB) $(addprefix -L,$(ZLIBLIB)) -lz
MKDIR=/bin/mkdir -pv
-RANLIB=ranlib
+RANLIB=i586-mingw32msvc-ranlib
#RANLIB=echo
INCPATH=$(prefix)/include
@@ -173,7 +173,7 @@
$(CC) -c $(CFLAGS) -DPNG_BUILD_DLL -o $@ $<
$(STATLIB): $(OBJS)
- ar rc $@ $(OBJS)
+ i586-mingw32msvc-ar rc $@ $(OBJS)
$(RANLIB) $@
$(SHAREDDEF): projects/msvc/png32ms.def
extras/contrib/src/Patches/livedotcom-win32.patch 0 → 100644
View file @ 0a5027d1
diff -ru live.orig/config.mingw live/config.mingw
--- live.orig/config.mingw 2005-10-23 08:50:31.000000000 +0200
+++ live/config.mingw 2005-10-23 17:09:35.000000000 +0200
@@ -1,15 +1,15 @@
COMPILE_OPTS = $(INCLUDES) -I. -O -DSOCKLEN_T=int
C = c
-C_COMPILER = gcc
-C_FLAGS = $(COMPILE_OPTS) -DUSE_OUR_BZERO=1 -D__MINGW32__
+C_COMPILER = i586-mingw32msvc-gcc
+C_FLAGS = $(COMPILE_OPTS) -DUSE_OUR_BZERO=1 -D__MINGW32__ -DUSE_LOCALE
CPP = cpp
-CPLUSPLUS_COMPILER = c++
-CPLUSPLUS_FLAGS = $(COMPILE_OPTS) -D__MINGW32__ -Wall -Wno-deprecated
+CPLUSPLUS_COMPILER = i586-mingw32msvc-g++
+CPLUSPLUS_FLAGS = $(COMPILE_OPTS) -D__MINGW32__ -DUSE_LOCALE -Wall -Wno-deprecated
OBJ = o
-LINK = c++ -o
+LINK = i586-mingw32msvc-g++ -o
LINK_OPTS = -L.
CONSOLE_LINK_OPTS = $(LINK_OPTS)
-LIBRARY_LINK = ld -o
+LIBRARY_LINK = i586-mingw32msvc-ld -o
LIBRARY_LINK_OPTS = $(LINK_OPTS) -r -Bstatic
LIB_SUFFIX = a
LIBS_FOR_CONSOLE_APPLICATION = -lws2_32
extras/contrib/src/Patches/tiff-cross.patch 0 → 100644
View file @ 0a5027d1
diff -Naur tiff/libtiff/Makefile.in tiff-new/libtiff/Makefile.in
--- tiff/libtiff/Makefile.in 1996-04-30 00:16:21.000000000 +0200
+++ tiff-new/libtiff/Makefile.in 2005-08-31 20:06:07.000000000 +0200
@@ -206,9 +206,9 @@
ALPHA = @ALPHAFILE@
VERSION = @VERSIONFILE@
-
+# Gruick hard code gcc if we crosscompile
version.h: ${VERSION} ${ALPHA} ${SRCDIR}/mkversion.c
- ${CC} -o mkversion ${CFLAGS} ${SRCDIR}/mkversion.c
+ gcc -o mkversion ${CFLAGS} ${SRCDIR}/mkversion.c
rm -f version.h; ./mkversion -v ${VERSION} -a ${ALPHA} version.h
tif_version.o: version.h
@@ -217,8 +217,10 @@
# are generated by the mkg3states program. On systems without
# make these rules have to be manually carried out.
#
+#Gruikk. hard code gcc when we cross-compile
+#
tif_fax3sm.c: ${SRCDIR}/mkg3states.c ${SRCDIR}/tif_fax3.h
- ${CC} -o mkg3states ${CFLAGS} ${SRCDIR}/mkg3states.c
+ gcc -o mkg3states ${CFLAGS} ${SRCDIR}/mkg3states.c
rm -f tif_fax3sm.c; ./mkg3states -c const tif_fax3sm.c
tif_aux.o: ${SRCDIR}/tif_aux.c
extras/contrib/src/Patches/wx-cvs-2005-02-09-patch.diff 0 → 100644
View file @ 0a5027d1
diff -u -r1.49 init.cpp
--- src/common/init.cpp 2004/10/19 13:38:15 1.49
+++ src/common/init.cpp 2005/02/09 12:46:59
@@ -332,7 +332,7 @@
{
wxModule::CleanUpModules();
- wxClassInfo::CleanUp();
+ //wxClassInfo::CleanUp();
// we can't do this in wxApp itself because it doesn't know if argv had
// been allocated
extras/contrib/src/Patches/wxMSW-win32.patch 0 → 100644
View file @ 0a5027d1
# This patch was done from wxWidgets-2.6.1-Patch01.zip
# found on the download page of wxwidgets
# 24/08/05 -- Xtophe
diff -Naur wxwidgets-orig/include/wx/msw/listbox.h wxwidgets/include/wx/msw/listbox.h
--- wxwidgets-orig/include/wx/msw/listbox.h 2005-04-11 20:18:36.000000000 +0000
+++ wxwidgets/include/wx/msw/listbox.h 2005-08-24 16:47:00.000000000 +0000
@@ -4,7 +4,7 @@
// Author: Julian Smart
// Modified by:
// Created: 01/02/97
-// RCS-ID: $Id: listbox.h,v 1.42 2005/04/10 15:22:57 VZ Exp $
+// RCS-ID: $Id: listbox.h,v 1.43 2005/06/16 15:36:42 JS Exp $
// Copyright: (c) Julian Smart
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
@@ -151,6 +151,13 @@
virtual wxSize DoGetBestSize() const;
+ // under XP when using "transition effect for menus and tooltips" if we
+ // return true for WM_PRINTCLIENT here then it causes noticable slowdown
+ virtual bool MSWShouldPropagatePrintChild()
+ {
+ return false;
+ }
+
#if wxUSE_OWNER_DRAWN
// control items
wxListBoxItemsArray m_aItems;
diff -Naur wxwidgets-orig/include/wx/msw/uxthemep.h wxwidgets/include/wx/msw/uxthemep.h
--- wxwidgets-orig/include/wx/msw/uxthemep.h 2005-05-14 16:57:49.000000000 +0000
+++ wxwidgets/include/wx/msw/uxthemep.h 2005-08-24 16:47:00.000000000 +0000
@@ -12,7 +12,7 @@
#ifndef __WINE_UXTHEME_H
#define __WINE_UXTHEME_H
-#include <commctrl.h>
+#include "wx/msw/wrapcctl.h"
typedef HANDLE HTHEME;
diff -Naur wxwidgets-orig/include/wx/msw/window.h wxwidgets/include/wx/msw/window.h
--- wxwidgets-orig/include/wx/msw/window.h 2005-05-31 20:47:32.000000000 +0000
+++ wxwidgets/include/wx/msw/window.h 2005-08-24 16:47:00.000000000 +0000
@@ -5,7 +5,7 @@
// Modified by: Vadim Zeitlin on 13.05.99: complete refont of message handling,
// elimination of Default(), ...
// Created: 01/02/97
-// RCS-ID: $Id: window.h,v 1.146 2005/05/19 22:17:01 RD Exp $
+// RCS-ID: $Id: window.h,v 1.147 2005/06/16 15:36:42 JS Exp $
// Copyright: (c) Julian Smart
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
@@ -391,6 +391,14 @@
return false;
}
+ // some controls (e.g. wxListBox) need to set the return value themselves
+ //
+ // return true to let parent handle it if we don't, false otherwise
+ virtual bool MSWShouldPropagatePrintChild()
+ {
+ return true;
+ }
+
// Responds to colour changes: passes event on to children.
void OnSysColourChanged(wxSysColourChangedEvent& event);
diff -Naur wxwidgets-orig/src/generic/grid.cpp wxwidgets/src/generic/grid.cpp
--- wxwidgets-orig/src/generic/grid.cpp 2005-06-02 15:19:48.000000000 +0000
+++ wxwidgets/src/generic/grid.cpp 2005-08-24 16:47:00.000000000 +0000
@@ -4,7 +4,7 @@
// Author: Michael Bedward (based on code by Julian Smart, Robin Dunn)
// Modified by: Robin Dunn, Vadim Zeitlin
// Created: 1/08/1999
-// RCS-ID: $Id: grid.cpp,v 1.339 2005/06/02 11:38:16 VZ Exp $
+// RCS-ID: $Id: grid.cpp,v 1.341 2005/06/09 14:49:54 JS Exp $
// Copyright: (c) Michael Bedward (mbedward@ozemail.com.au)
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
@@ -242,7 +242,8 @@
public:
wxGridCellEditorEvtHandler(wxGrid* grid, wxGridCellEditor* editor)
: m_grid(grid),
- m_editor(editor)
+ m_editor(editor),
+ m_inSetFocus(false)
{
}
@@ -250,10 +251,16 @@
void OnKeyDown(wxKeyEvent& event);
void OnChar(wxKeyEvent& event);
+ void SetInSetFocus(bool inSetFocus) { m_inSetFocus = inSetFocus; }
+
private:
wxGrid* m_grid;
wxGridCellEditor* m_editor;
+ // Work around the fact that a focus kill event can be sent to
+ // a combobox within a set focus event.
+ bool m_inSetFocus;
+
DECLARE_EVENT_TABLE()
DECLARE_DYNAMIC_CLASS(wxGridCellEditorEvtHandler)
DECLARE_NO_COPY_CLASS(wxGridCellEditorEvtHandler)
@@ -571,7 +578,7 @@
// through in that case.
if ((ctrl || alt) && !(ctrl && alt))
return false;
-
+
#if wxUSE_UNICODE
int key = event.GetUnicodeKey();
bool keyOk = true;
@@ -588,7 +595,7 @@
return keyOk;
#else // !wxUSE_UNICODE
int key = event.GetKeyCode();
- if (key <= 255)
+ if (key <= 255)
return true;
return false;
#endif // wxUSE_UNICODE/!wxUSE_UNICODE
@@ -752,7 +759,7 @@
wxTextCtrl* tc = Text();
wxChar ch;
long pos;
-
+
#if wxUSE_UNICODE
ch = event.GetUnicodeKey();
if (ch <= 127)
@@ -1106,7 +1113,7 @@
tmpbuf[0] = (char) keycode;
tmpbuf[1] = '\0';
wxString strbuf(tmpbuf, *wxConvCurrent);
-#if wxUSE_INTL
+#if wxUSE_INTL
bool is_decimal_point = ( strbuf ==
wxLocale::GetInfo(wxLOCALE_DECIMAL_POINT, wxLOCALE_CAT_NUMBER) );
#else
@@ -1184,14 +1191,14 @@
tmpbuf[0] = (char) keycode;
tmpbuf[1] = '\0';
wxString strbuf(tmpbuf, *wxConvCurrent);
-#if wxUSE_INTL
+#if wxUSE_INTL
bool is_decimal_point =
( strbuf == wxLocale::GetInfo(wxLOCALE_DECIMAL_POINT,
wxLOCALE_CAT_NUMBER) );
#else
bool is_decimal_point = ( strbuf == _T(".") );
#endif
- if ( (keycode < 128) &&
+ if ( (keycode < 128) &&
(wxIsdigit(keycode) || tolower(keycode) == 'e' ||
is_decimal_point || keycode == '+' || keycode == '-') )
return true;
@@ -1375,11 +1382,11 @@
case WXK_SPACE:
CBox()->SetValue(!CBox()->GetValue());
break;
-
+
case '+':
CBox()->SetValue(true);
break;
-
+
case '-':
CBox()->SetValue(false);
break;
@@ -1460,6 +1467,14 @@
wxASSERT_MSG(m_control,
wxT("The wxGridCellEditor must be Created first!"));
+ wxGridCellEditorEvtHandler* evtHandler = NULL;
+ if (m_control)
+ evtHandler = wxDynamicCast(m_control->GetEventHandler(), wxGridCellEditorEvtHandler);
+
+ // Don't immediately end if we get a kill focus event within BeginEdit
+ if (evtHandler)
+ evtHandler->SetInSetFocus(true);
+
m_startValue = grid->GetTable()->GetValue(row, col);
if (m_allowOthers)
@@ -1468,12 +1483,15 @@
{
// find the right position, or default to the first if not found
int pos = Combo()->FindString(m_startValue);
- if (pos == -1)
+ if (pos == wxNOT_FOUND)
pos = 0;
Combo()->SetSelection(pos);
}
Combo()->SetInsertionPointEnd();
Combo()->SetFocus();
+
+ if (evtHandler)
+ evtHandler->SetInSetFocus(false);
}
bool wxGridCellChoiceEditor::EndEdit(int row, int col,
@@ -1525,6 +1543,10 @@
void wxGridCellEditorEvtHandler::OnKillFocus(wxFocusEvent& event)
{
+ // Don't disable the cell if we're just starting to edit it
+ if (m_inSetFocus)
+ return;
+
// accept changes
m_grid->DisableCellEditControl();
@@ -3783,7 +3805,7 @@
{
if (event.ButtonDown(wxMOUSE_BTN_LEFT) && FindFocus() != this)
SetFocus();
-
+
m_owner->ProcessGridCellMouseEvent( event );
}
@@ -4905,6 +4927,7 @@
break;
case WXGRID_CURSOR_SELECT_ROW:
+ {
if ( (row = YToRow( y )) >= 0 )
{
if ( m_selection )
@@ -4916,6 +4939,8 @@
event.MetaDown() );
}
}
+ }
+ break;
// default label to suppress warnings about "enumeration value
// 'xxx' not handled in switch
@@ -5127,6 +5152,7 @@
break;
case WXGRID_CURSOR_SELECT_COL:
+ {
if ( (col = XToCol( x )) >= 0 )
{
if ( m_selection )
@@ -5138,6 +5164,8 @@
event.MetaDown() );
}
}
+ }
+ break;
// default label to suppress warnings about "enumeration value
// 'xxx' not handled in switch
diff -Naur wxwidgets-orig/src/generic/splitter.cpp wxwidgets/src/generic/splitter.cpp
--- wxwidgets-orig/src/generic/splitter.cpp 2005-03-29 12:22:43.000000000 +0000
+++ wxwidgets/src/generic/splitter.cpp 2005-08-24 16:47:00.000000000 +0000
@@ -4,7 +4,7 @@
// Author: Julian Smart
// Modified by:
// Created: 01/02/97
-// RCS-ID: $Id: splitter.cpp,v 1.114 2005/03/29 12:22:43 JS Exp $
+// RCS-ID: $Id: splitter.cpp,v 1.115 2005/06/21 16:08:22 JS Exp $
// Copyright: (c) Julian Smart
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
@@ -94,6 +94,11 @@
if ( !wxWindow::Create(parent, id, pos, size, style, name) )
return false;
+ if (size.x >= 0)
+ m_lastSize.x = size.x;
+ if (size.y >= 0)
+ m_lastSize.y = size.y;
+
m_permitUnsplitAlways = (style & wxSP_PERMIT_UNSPLIT) != 0;
// FIXME: with this line the background is not erased at all under GTK1,
@@ -700,8 +705,8 @@
y2 = size2;
}
- GetWindow1()->SetSize(border, border, w1, h1);
GetWindow2()->SetSize(x2, y2, w2, h2);
+ GetWindow1()->SetSize(border, border, w1, h1);
}
wxClientDC dc(this);
diff -Naur wxwidgets-orig/src/msw/helpchm.cpp wxwidgets/src/msw/helpchm.cpp
--- wxwidgets-orig/src/msw/helpchm.cpp 2005-05-31 20:49:53.000000000 +0000
+++ wxwidgets/src/msw/helpchm.cpp 2005-08-24 16:47:00.000000000 +0000
@@ -4,7 +4,7 @@
// Author: Julian Smart
// Modified by:
// Created: 16/04/2000
-// RCS-ID: $Id: helpchm.cpp,v 1.23 2005/05/24 08:53:32 CE Exp $
+// RCS-ID: $Id: helpchm.cpp,v 1.24 2005/06/20 14:02:35 JS Exp $
// Copyright: (c) Julian Smart
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
@@ -243,7 +243,6 @@
wxCHMHelpController::~wxCHMHelpController()
{
- gs_htmlHelp(GetSuitableHWND(), 0, HH_CLOSE_ALL, 0L);
UnloadHtmlHelpLibrary();
}
diff -Naur wxwidgets-orig/src/msw/notebook.cpp wxwidgets/src/msw/notebook.cpp
--- wxwidgets-orig/src/msw/notebook.cpp 2005-05-31 20:49:55.000000000 +0000
+++ wxwidgets/src/msw/notebook.cpp 2005-08-24 16:47:00.000000000 +0000
@@ -4,7 +4,7 @@
// Author: Vadim Zeitlin
// Modified by:
// Created: 11.06.98
-// RCS-ID: $Id: notebook.cpp,v 1.155 2005/05/30 11:23:27 JS Exp $
+// RCS-ID: $Id: notebook.cpp,v 1.158 2005/06/19 19:11:11 JS Exp $
// Copyright: (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
// Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
@@ -93,6 +93,14 @@
// the pointer to standard spin button wnd proc
static WXFARPROC gs_wndprocNotebookSpinBtn = (WXFARPROC)NULL;
+// the pointer to standard tab control wnd proc
+static WXFARPROC gs_wndprocNotebook = (WXFARPROC)NULL;
+
+LRESULT APIENTRY _EXPORT wxNotebookWndProc(HWND hwnd,
+ UINT message,
+ WPARAM wParam,
+ LPARAM lParam);
+
#endif // USE_NOTEBOOK_ANTIFLICKER
// ----------------------------------------------------------------------------
@@ -285,6 +293,7 @@
LPCTSTR className = WC_TABCONTROL;
+#if USE_NOTEBOOK_ANTIFLICKER
// SysTabCtl32 class has natively CS_HREDRAW and CS_VREDRAW enabled and it
// causes horrible flicker when resizing notebook, so get rid of it by
// using a class without these styles (but otherwise identical to it)
@@ -296,11 +305,14 @@
// get a copy of standard class and modify it
WNDCLASS wc;
- if ( ::GetClassInfo(::GetModuleHandle(NULL), WC_TABCONTROL, &wc) )
+ if ( ::GetClassInfo(NULL, WC_TABCONTROL, &wc) )
{
+ gs_wndprocNotebook =
+ wx_reinterpret_cast(WXFARPROC, wc.lpfnWndProc);
wc.lpszClassName = wxT("_wx_SysTabCtl32");
wc.style &= ~(CS_HREDRAW | CS_VREDRAW);
-
+ wc.hInstance = wxGetInstance();
+ wc.lpfnWndProc = wxNotebookWndProc;
s_clsNotebook.Register(wc);
}
else
@@ -318,6 +330,7 @@
className = s_clsNotebook.GetName().c_str();
}
}
+#endif // USE_NOTEBOOK_ANTIFLICKER
if ( !CreateControl(parent, id, pos, size, style | wxTAB_TRAVERSAL,
wxDefaultValidator, name) )
@@ -789,6 +802,16 @@
hwnd, message, wParam, lParam);
}
+LRESULT APIENTRY _EXPORT wxNotebookWndProc(HWND hwnd,
+ UINT message,
+ WPARAM wParam,
+ LPARAM lParam)
+{
+ return ::CallWindowProc(CASTWNDPROC gs_wndprocNotebook,
+ hwnd, message, wParam, lParam);
+}
+
+
void wxNotebook::OnEraseBackground(wxEraseEvent& WXUNUSED(event))
{
@@ -918,7 +941,7 @@
RefreshRect(wxRect(0, rc.top, rc.left, height), false);
RefreshRect(wxRect(0, rc.bottom, widthNbook, heightNbook - rc.bottom),
false);
- RefreshRect(wxRect(rc.right, rc.top, widthNbook - rc.bottom, height),
+ RefreshRect(wxRect(rc.right, rc.top, widthNbook - rc.right, height),
false);
}
@@ -967,7 +990,7 @@
{
wxNotebookPage *pPage = m_pages[sel];
pPage->Show(true);
-
+
// As per bug report:
// http://sourceforge.net/tracker/index.php?func=detail&aid=1150659&group_id=9863&atid=109863,
// we should not set the page focus (and thereby the focus for
@@ -1102,17 +1125,17 @@
if ( child )
::MapWindowPoints(GetHwnd(), GetHwndOf(child), (POINT *)&rc, 2);
-
- // apparently DrawThemeBackground() modifies the rect passed to it and if we
- // don't do these adjustments, there are some drawing artifacts which are
- // only visible with some non default themes; so modify the rect here using
- // the magic numbers below so that it still paints the correct area
- rc.left -= 2;
- rc.top -= 2;
- rc.right += 4;
- rc.bottom += 5;
-
-
+ // we have the content area (page size), but we need to draw all of the
+ // background for it to be aligned correctly
+ wxUxThemeEngine::Get()->GetThemeBackgroundExtent
+ (
+ theme,
+ (HDC) hDC,
+ 9 /* TABP_PANE */,
+ 0,
+ &rc,
+ &rc
+ );
wxUxThemeEngine::Get()->DrawThemeBackground
(
theme,
diff -Naur wxwidgets-orig/src/msw/tbar95.cpp wxwidgets/src/msw/tbar95.cpp
--- wxwidgets-orig/src/msw/tbar95.cpp 2005-05-31 20:49:56.000000000 +0000
+++ wxwidgets/src/msw/tbar95.cpp 2005-08-24 16:47:00.000000000 +0000
@@ -4,7 +4,7 @@
// Author: Julian Smart
// Modified by:
// Created: 04/01/98
-// RCS-ID: $Id: tbar95.cpp,v 1.153 2005/05/27 09:14:58 JS Exp $
+// RCS-ID: $Id: tbar95.cpp,v 1.156 2005/06/09 20:18:24 VZ Exp $
// Copyright: (c) Julian Smart
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
@@ -93,9 +93,6 @@
// these values correspond to those used by comctl32.dll
#define DEFAULTBITMAPX 16
#define DEFAULTBITMAPY 15
-#define DEFAULTBUTTONX 24
-#define DEFAULTBUTTONY 24
-#define DEFAULTBARHEIGHT 27
// ----------------------------------------------------------------------------
// wxWin macros
@@ -245,31 +242,20 @@
SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE));
SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
- // workaround for flat toolbar on Windows XP classic style
+ // workaround for flat toolbar on Windows XP classic style: we have to set
+ // the style after creating the control, doing it at creation time doesn't
+ // work
#if wxUSE_UXTHEME
if ( style & wxTB_FLAT )
{
- // Testing for an active theme appears to be unnecessary (see comments in patch 1204217).
- // Disabling the test brings back separator lines.
- // However, the separators can look ugly and distracting, especially between controls,
- // so I'm restoring the test and removing the separators again - JACS
-#if 1
- wxUxThemeEngine *p = wxUxThemeEngine::Get();
- if ( !p || !p->IsThemeActive() )
-#endif
- {
- DWORD dwToolbarStyle;
-
- dwToolbarStyle = (DWORD)::SendMessage(GetHwnd(), TB_GETSTYLE, 0, 0L );
+ LRESULT style = ::SendMessage(GetHwnd(), TB_GETSTYLE, 0, 0L);
- if ((dwToolbarStyle & TBSTYLE_FLAT) == 0)
- {
- dwToolbarStyle |= TBSTYLE_FLAT;
- ::SendMessage(GetHwnd(), TB_SETSTYLE, 0, (LPARAM)dwToolbarStyle );
- }
+ if ( !(style & TBSTYLE_FLAT) )
+ {
+ ::SendMessage(GetHwnd(), TB_SETSTYLE, 0, style | TBSTYLE_FLAT);
}
}
-#endif
+#endif // wxUSE_UXTHEME
return true;
}
@@ -897,7 +883,7 @@
wxToolBarToolBase *tool = nodePrev->GetData();
if ( !tool->IsButton() || tool->GetKind() != wxITEM_RADIO )
break;
-
+
if ( tool->Toggle(false) )
{
DoToggleTool(tool, false);
@@ -905,7 +891,7 @@
prevButton.fsState = TBSTATE_ENABLED;
nodePrev = nodePrev->GetPrevious();
prevIndex--;
- }
+ }
}
isRadio = true;
@@ -1249,14 +1235,15 @@
return (wxToolBarToolBase *)NULL;
}
- // if comctl32 version < 4.71 wxToolBar95 adds dummy spacers
-#if defined(_WIN32_IE) && (_WIN32_IE >= 0x400 )
+ // when TB_SETBUTTONINFO is available (both during compile- and run-time),
+ // we don't use the dummy separators hack
+#ifdef TB_SETBUTTONINFO
if ( wxApp::GetComCtl32Version() >= 471 )
{
return m_tools.Item((size_t)index)->GetData();
}
else
-#endif
+#endif // TB_SETBUTTONINFO
{
return GetItemSkippingDummySpacers( m_tools, (size_t) index );
}
diff -Naur wxwidgets-orig/src/msw/window.cpp wxwidgets/src/msw/window.cpp
--- wxwidgets-orig/src/msw/window.cpp 2005-05-31 20:49:58.000000000 +0000
+++ wxwidgets/src/msw/window.cpp 2005-08-24 16:47:00.000000000 +0000
@@ -4,7 +4,7 @@
// Author: Julian Smart
// Modified by: VZ on 13.05.99: no more Default(), MSWOnXXX() reorganisation
// Created: 04/01/98
-// RCS-ID: $Id: window.cpp,v 1.619 2005/05/31 09:20:34 JS Exp $
+// RCS-ID: $Id: window.cpp,v 1.622 2005/06/21 16:06:45 JS Exp $
// Copyright: (c) Julian Smart
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
@@ -2353,6 +2353,7 @@
break;
#endif // !__WXWINCE__
+#if !(defined(_WIN32_WCE) && _WIN32_WCE < 400)
case WM_WINDOWPOSCHANGED:
{
WINDOWPOS *lpPos = (WINDOWPOS *)lParam;
@@ -2365,19 +2366,15 @@
AutoHRGN hrgnClient(::CreateRectRgnIndirect(&rc));
AutoHRGN hrgnNew(::CreateRectRgn(lpPos->x, lpPos->y,
lpPos->cx, lpPos->cy));
- AutoHRGN hrgn(::CreateRectRgn(0, 0, 0, 0));
// we need to invalidate any new exposed areas here
// to force them to repaint
- if ( ::CombineRgn(hrgn, hrgnNew, hrgnClient, RGN_DIFF) != NULLREGION )
- ::InvalidateRgn(GetHwnd(), hrgn, TRUE);
- if ( ::CombineRgn(hrgn, hrgnClient, hrgnNew, RGN_DIFF) != NULLREGION )
- ::InvalidateRgn(GetHwnd(), hrgn, TRUE);
-
+ if ( ::CombineRgn(hrgnNew, hrgnNew, hrgnClient, RGN_DIFF) != NULLREGION )
+ ::InvalidateRgn(GetHwnd(), hrgnNew, TRUE);
}
}
break;
-
+#endif
#if !defined(__WXMICROWIN__) && !defined(__WXWINCE__)
case WM_ACTIVATEAPP:
// This implicitly sends a wxEVT_ACTIVATE_APP event
@@ -4150,6 +4147,11 @@
if ( IsTopLevel() || InheritsBackgroundColour() )
return false;
+ // sometimes we don't want the parent to handle it at all, instead
+ // return whatever value this window wants
+ if ( !MSWShouldPropagatePrintChild() )
+ return MSWPrintChild(hDC, (wxWindow *)this);
+
for ( wxWindow *win = GetParent(); win; win = win->GetParent() )
{
if ( win->MSWPrintChild(hDC, (wxWindow *)this) )
extras/contrib/src/Patches/x264-20050624-win32.patch 0 → 100644
View file @ 0a5027d1
Index: common/i386/dct-a.asm
===================================================================
--- common/i386/dct-a.asm (revision 270)
+++ common/i386/dct-a.asm (working copy)
@@ -125,27 +125,6 @@
;%endmacro
;=============================================================================
-; Local Data (Read Only)
-;=============================================================================
-
-%ifdef FORMAT_COFF
-SECTION .rodata data
-%else
-SECTION .rodata data align=16
-%endif
-
-;-----------------------------------------------------------------------------
-; Various memory constants (trigonometric values or rounding values)
-;-----------------------------------------------------------------------------
-
-ALIGN 16
-x264_mmx_1:
- dw 1, 1, 1, 1
-
-x264_mmx_32:
- dw 32, 32, 32, 32
-
-;=============================================================================
; Code
;=============================================================================
@@ -311,3 +290,23 @@
ret
+;=============================================================================
+; Local Data (Read Only)
+;=============================================================================
+
+%ifdef FORMAT_COFF
+SECTION .rodata data
+%else
+SECTION .rodata data align=16
+%endif
+
+;-----------------------------------------------------------------------------
+; Various memory constants (trigonometric values or rounding values)
+;-----------------------------------------------------------------------------
+
+ALIGN 16
+x264_mmx_1:
+ dw 1, 1, 1, 1
+
+x264_mmx_32:
+ dw 32, 32, 32, 32
Index: common/i386/mc-a.asm
===================================================================
--- common/i386/mc-a.asm (revision 270)
+++ common/i386/mc-a.asm (working copy)
@@ -46,22 +46,6 @@
%endmacro
;=============================================================================
-; Local Data (Read Only)
-;=============================================================================
-
-%ifdef FORMAT_COFF
-SECTION .rodata data
-%else
-SECTION .rodata data align=16
-%endif
-
-;-----------------------------------------------------------------------------
-; Various memory constants (trigonometric values or rounding values)
-;-----------------------------------------------------------------------------
-
-ALIGN 16
-
-;=============================================================================
; Code
;=============================================================================
@@ -487,3 +471,20 @@
.finish
pop edi
ret
+
+;=============================================================================
+; Local Data (Read Only)
+;=============================================================================
+
+%ifdef FORMAT_COFF
+SECTION .rodata data
+%else
+SECTION .rodata data align=16
+%endif
+
+;-----------------------------------------------------------------------------
+; Various memory constants (trigonometric values or rounding values)
+;-----------------------------------------------------------------------------
+
+ALIGN 16
+
Index: common/i386/mc-a2.asm
===================================================================
--- common/i386/mc-a2.asm (revision 270)
+++ common/i386/mc-a2.asm (working copy)
@@ -33,22 +33,6 @@
%endif
%endmacro
-;=============================================================================
-; Read only data
-;=============================================================================
-
-SECTION .rodata data align=16
-
-ALIGN 16
-mmx_dw_one:
- times 4 dw 16
-mmx_dd_one:
- times 2 dd 512
-mmx_dw_20:
- times 4 dw 20
-mmx_dw_5:
- times 4 dw -5
-
%assign twidth 0
%assign theight 4
%assign tdstp1 8
@@ -60,7 +44,6 @@
%assign toffset 32
%assign tbuffer 36
-
;=============================================================================
; Macros
;=============================================================================
@@ -375,3 +358,23 @@
pop edi
ret
+
+;=============================================================================
+; Read only data
+;=============================================================================
+
+%ifdef FORMAT_COFF
+SECTION .rodata data
+%else
+SECTION .rodata data align=16
+%endif
+
+ALIGN 16
+mmx_dw_one:
+ times 4 dw 16
+mmx_dd_one:
+ times 2 dd 512
+mmx_dw_20:
+ times 4 dw 20
+mmx_dw_5:
+ times 4 dw -5
Index: build/cygwin/Makefile
===================================================================
--- build/cygwin/Makefile (revision 270)
+++ build/cygwin/Makefile (working copy)
@@ -7,6 +7,8 @@
# $Id: Makefile,v 1.4 2004/06/18 02:00:40 chenm001 Exp $
##############################################################################
+CC=i586-mingw32msvc-gcc
+
# Current dir
DIR_CUR=$(shell pwd)
@@ -18,7 +20,7 @@
# Sources
SRC_C= common/mc.c common/predict.c common/pixel.c common/macroblock.c \
common/frame.c common/dct.c common/cpu.c common/cabac.c \
- common/common.c common/mdate.c common/csp.c \
+ common/common.c common/mdate.c common/csp.c common/set.c \
encoder/analyse.c encoder/me.c encoder/ratecontrol.c \
encoder/set.c encoder/macroblock.c encoder/cabac.c encoder/cavlc.c \
encoder/encoder.c encoder/eval.c \
@@ -33,7 +35,7 @@
##############################################################################
# PFLAGS
##############################################################################
-PFLAGS=-DARCH_X86 -DHAVE_MMXEXT -UHAVE_SSE2
+PFLAGS=-DHAVE_PTHREAD -DARCH_X86 -DHAVE_MMXEXT -UHAVE_SSE2
##############################################################################
# CFLAGS
@@ -107,7 +109,7 @@
libx264.a: $(DIR_BUILD) $(OBJECTS)
@echo " L: $(@F)"
@cd $(DIR_BUILD) && \
- ar rc libx264.a $(OBJECTS) && \
+ i586-mingw32msvc-ar rc libx264.a $(OBJECTS) && \
cp -f libx264.a $(DIR_SRC)
x264.exe: $(DIR_BUILD) $(OBJECTS) x264.obj
extras/contrib/src/Patches/x264-svn-win32.patch 0 → 100644
View file @ 0a5027d1
Index: common/i386/mc-a.asm
===================================================================
--- common/i386/mc-a.asm (revision 346)
+++ common/i386/mc-a.asm (working copy)
@@ -46,22 +46,6 @@
%endmacro
;=============================================================================
-; Constants
-;=============================================================================
-
-%ifdef FORMAT_COFF
-SECTION .rodata data
-%else
-SECTION .rodata data align=16
-%endif
-
-ALIGN 16
-pw_4: times 4 dw 4
-pw_8: times 4 dw 8
-pw_32: times 4 dw 32
-pw_64: times 4 dw 64
-
-;=============================================================================
; Code
;=============================================================================
@@ -589,3 +573,20 @@
.finish
pop edi
ret
+
+;=============================================================================
+; Constants
+;=============================================================================
+
+%ifdef FORMAT_COFF
+SECTION .rodata data
+%else
+SECTION .rodata data align=16
+%endif
+
+ALIGN 16
+pw_4: times 4 dw 4
+pw_8: times 4 dw 8
+pw_32: times 4 dw 32
+pw_64: times 4 dw 64
+
Index: common/i386/deblock-a.asm
===================================================================
--- common/i386/deblock-a.asm (revision 346)
+++ common/i386/deblock-a.asm (working copy)
@@ -31,11 +31,6 @@
%endif
%endmacro
-SECTION .rodata align=16
-pb_01: times 16 db 0x01
-pb_3f: times 16 db 0x3f
-pb_ff: times 16 db 0xff
-
SECTION .text
cglobal x264_deblock_v8_luma_mmxext
cglobal x264_deblock_h_luma_mmxext
@@ -525,3 +520,11 @@
pop ebp
CHROMA_END
+;=============================================================================
+; Local Data (Read Only)
+;=============================================================================
+SECTION .rodata align=16
+pb_01: times 16 db 0x01
+pb_3f: times 16 db 0x3f
+pb_ff: times 16 db 0xff
+
Index: common/i386/dct-a.asm
===================================================================
--- common/i386/dct-a.asm (revision 346)
+++ common/i386/dct-a.asm (working copy)
@@ -124,31 +124,6 @@
%endmacro
;=============================================================================
-; Local Data (Read Only)
-;=============================================================================
-
-%ifdef FORMAT_COFF
-SECTION .rodata data
-%else
-SECTION .rodata data align=16
-%endif
-
-;-----------------------------------------------------------------------------
-; Various memory constants (trigonometric values or rounding values)
-;-----------------------------------------------------------------------------
-
-ALIGN 16
-x264_mmx_1: dw 1, 1, 1, 1
-x264_mmx_32: dw 32, 32, 32, 32
-x264_mmx_PPNN: dw 1, 1, -1, -1
-x264_mmx_PNPN: dw 1, -1, 1, -1
-x264_mmx_PNNP: dw 1, -1, -1, 1
-x264_mmx_PPPN: dw 1, 1, 1, -1
-x264_mmx_PPNP: dw 1, 1, -1, 1
-x264_mmx_2121: dw 2, 1, 2, 1
-x264_mmx_p2n2p1p1: dw 2, -2, 1, 1
-
-;=============================================================================
; Code
;=============================================================================
@@ -729,3 +704,28 @@
%endrep
ret
+;=============================================================================
+; Local Data (Read Only)
+;=============================================================================
+
+%ifdef FORMAT_COFF
+SECTION .rodata data
+%else
+SECTION .rodata data align=16
+%endif
+
+;-----------------------------------------------------------------------------
+; Various memory constants (trigonometric values or rounding values)
+;-----------------------------------------------------------------------------
+
+ALIGN 16
+x264_mmx_1: dw 1, 1, 1, 1
+x264_mmx_32: dw 32, 32, 32, 32
+x264_mmx_PPNN: dw 1, 1, -1, -1
+x264_mmx_PNPN: dw 1, -1, 1, -1
+x264_mmx_PNNP: dw 1, -1, -1, 1
+x264_mmx_PPPN: dw 1, 1, 1, -1
+x264_mmx_PPNP: dw 1, 1, -1, 1
+x264_mmx_2121: dw 2, 1, 2, 1
+x264_mmx_p2n2p1p1: dw 2, -2, 1, 1
+
Index: common/i386/pixel-sse2.asm
===================================================================
--- common/i386/pixel-sse2.asm (revision 346)
+++ common/i386/pixel-sse2.asm (working copy)
@@ -36,15 +36,6 @@
%endmacro
-%ifdef FORMAT_COFF
-SECTION .rodata data
-%else
-SECTION .rodata data align=16
-%endif
-
-pd_0000ffff: times 4 dd 0x0000ffff
-
-
SECTION .text
@@ -531,3 +522,15 @@
SATD_END
+;=============================================================================
+; Local Data (Read Only)
+;=============================================================================
+%ifdef FORMAT_COFF
+SECTION .rodata data
+%else
+SECTION .rodata data align=16
+%endif
+
+pd_0000ffff: times 4 dd 0x0000ffff
+
+
Index: common/i386/mc-a2.asm
===================================================================
--- common/i386/mc-a2.asm (revision 346)
+++ common/i386/mc-a2.asm (working copy)
@@ -33,22 +33,6 @@
%endif
%endmacro
-;=============================================================================
-; Read only data
-;=============================================================================
-
-SECTION .rodata data align=16
-
-ALIGN 16
-mmx_dw_one:
- times 4 dw 16
-mmx_dd_one:
- times 2 dd 512
-mmx_dw_20:
- times 4 dw 20
-mmx_dw_5:
- times 4 dw -5
-
%assign twidth 0
%assign theight 4
%assign tdstp1 8
@@ -374,3 +358,20 @@
pop edi
ret
+
+;=============================================================================
+; Read only data
+;=============================================================================
+
+SECTION .rodata data align=16
+
+ALIGN 16
+mmx_dw_one:
+ times 4 dw 16
+mmx_dd_one:
+ times 2 dd 512
+mmx_dw_20:
+ times 4 dw 20
+mmx_dw_5:
+ times 4 dw -5
+
--- configure.crosscompile~ 2005-10-23 14:48:21.000000000 +0200
+++ configure 2005-10-27 17:04:09.000000000 +0200
@@ -7,6 +7,7 @@
echo "available options:"
echo ""
echo " --help print this message"
+echo " --crosscompile=ARCH crosscompile for ARCH"
echo " --enable-avis-input enables avisynth input (win32 only)"
echo " --enable-mp4-output enables mp4 output (using gpac)"
echo " --enable-vfw compiles the VfW frontend"
@@ -45,43 +46,138 @@
EXE=""
-UNAMES="`uname -s`"
+AR="ar"
+AROPTS="rc"
+RANLIB="ranlib"
+
+UNAMES="`uname -s |tr A-Z a-z`"
+UNAMEM="`uname -m |tr A-Z a-z`"
+
+# parse options
+
+for opt do
+ optarg="${opt#*=}"
+ case "$opt" in
+ --crosscompile=*)
+ CROSS="$optarg"
+ CC="$CROSS-gcc"
+ AR="$CROSS-ar"
+ RANLIB="$CROSS-ranlib"
+ UNAMES="`echo $CROSS | cut -d- -f3`"
+ UNAMEM="`echo $CROSS | cut -d- -f1`"
+ ;;
+ --prefix=*)
+ prefix="$optarg"
+ ;;
+ --exec-prefix=*)
+ eprefix="$optarg"
+ ;;
+ --bindir=*)
+ bindir="$optarg"
+ ;;
+ --libdir=*)
+ libdir="$optarg"
+ ;;
+ --includedir=*)
+ includedir="$optarg"
+ ;;
+ --enable-avis-input)
+ if [ $SYS = CYGWIN -o $SYS = MINGW ]; then
+ CFLAGS="$CFLAGS -DAVIS_INPUT"
+ LDFLAGS="$LDFLAGS -lvfw32"
+ avis_input="yes"
+ fi
+ ;;
+ --enable-mp4-output)
+ CFLAGS="$CFLAGS -DMP4_OUTPUT"
+ LDFLAGS="$LDFLAGS -lgpac_static"
+ if [ $SYS = CYGWIN -o $SYS = MINGW ]; then
+ LDFLAGS="$LDFLAGS -lwinmm"
+ fi
+ mp4_output="yes"
+ ;;
+ --extra-asflags=*)
+ ASFLAGS="$ASFLAGS ${opt#--extra-asflags=}"
+ ;;
+ --extra-cflags=*)
+ CFLAGS="$CFLAGS ${opt#--extra-cflags=}"
+ VFW_CFLAGS="${opt#--extra-cflags=}"
+ ;;
+ --extra-ldflags=*)
+ LDFLAGS="$LDFLAGS ${opt#--extra-ldflags=}"
+ VFW_LDFLAGS="${opt#--extra-ldflags=}"
+ ;;
+ --enable-pthread)
+ CFLAGS="$CFLAGS -DHAVE_PTHREAD=1"
+ pthread="yes"
+ case $SYS in
+ MINGW|CYGWIN|BEOS)
+ ;;
+ *)
+ LDFLAGS="$LDFLAGS -lpthread"
+ ;;
+ esac
+ ;;
+ --enable-debug)
+ CFLAGS="$CFLAGS -g"
+ debug="yes"
+ ;;
+ --enable-gprof)
+ CFLAGS="$CFLAGS -pg"
+ LDFLAGS="$LDFLAGS -pg"
+ gprof="yes"
+ ;;
+ --enable-vfw)
+ vfw="yes"
+ ;;
+ --enable-visualize)
+ LDFLAGS="$LDFLAGS -L/usr/X11R6/lib -lX11"
+ CFLAGS="$CFLAGS -DVISUALIZE=1"
+ vis="yes"
+ ;;
+ *)
+ echo "Unknown option $opt, ignored"
+ ;;
+ esac
+done
+
+
case "$UNAMES" in
- BeOS)
+ beos)
SYS="BEOS"
CFLAGS="$CFLAGS -DHAVE_MALLOC_H"
;;
- Darwin)
+ darwin)
SYS="MACOSX"
CFLAGS="$CFLAGS -falign-loops=16"
LDFLAGS="$LDFLAGS -lm -lmx"
;;
- FreeBSD)
+ freebsd)
SYS="FREEBSD"
LDFLAGS="$LDFLAGS -lm"
;;
- NetBSD)
+ netbsd)
SYS="NETBSD"
LDFLAGS="$LDFLAGS -lm"
;;
- Linux)
+ linux)
SYS="LINUX"
CFLAGS="$CFLAGS -DHAVE_MALLOC_H"
LDFLAGS="$LDFLAGS -lm"
;;
- CYGWIN*)
+ cygwin*)
SYS="CYGWIN"
CFLAGS="$CFLAGS -mno-cygwin"
LDFLAGS="$LDFLAGS -mno-cygwin"
ASFLAGS="-f win32 -DPREFIX"
EXE=".exe"
;;
- MINGW*)
+ mingw*)
SYS="MINGW"
ASFLAGS="-f win32 -DPREFIX"
EXE=".exe"
;;
- SunOS)
+ sunos)
SYS="SunOS"
CFLAGS="$CFLAGS -DHAVE_MALLOC_H"
LDFLAGS="$LDFLAGS -lm"
@@ -93,9 +189,8 @@
;;
esac
-UNAMEM="`uname -m`"
case "$UNAMEM" in
- i386|i486|i586|i686|BePC)
+ i386|i486|i586|i686|bepc)
ARCH="X86"
CFLAGS="$CFLAGS -DHAVE_MMXEXT -DHAVE_SSE2"
;;
@@ -105,7 +200,7 @@
AS="yasm"
ASFLAGS="-f elf -m amd64"
;;
- "Power Macintosh"|ppc)
+ "power macintosh"|ppc)
ARCH="PPC"
if [ $SYS = MACOSX ]
then
@@ -150,86 +245,6 @@
CFLAGS="$CFLAGS -DARCH_$ARCH -DSYS_$SYS"
-# parse options
-
-for opt do
- optarg="${opt#*=}"
- case "$opt" in
- --prefix=*)
- prefix="$optarg"
- ;;
- --exec-prefix=*)
- eprefix="$optarg"
- ;;
- --bindir=*)
- bindir="$optarg"
- ;;
- --libdir=*)
- libdir="$optarg"
- ;;
- --includedir=*)
- includedir="$optarg"
- ;;
- --enable-avis-input)
- if [ $SYS = CYGWIN -o $SYS = MINGW ]; then
- CFLAGS="$CFLAGS -DAVIS_INPUT"
- LDFLAGS="$LDFLAGS -lvfw32"
- avis_input="yes"
- fi
- ;;
- --enable-mp4-output)
- CFLAGS="$CFLAGS -DMP4_OUTPUT"
- LDFLAGS="$LDFLAGS -lgpac_static"
- if [ $SYS = CYGWIN -o $SYS = MINGW ]; then
- LDFLAGS="$LDFLAGS -lwinmm"
- fi
- mp4_output="yes"
- ;;
- --extra-asflags=*)
- ASFLAGS="$ASFLAGS ${opt#--extra-asflags=}"
- ;;
- --extra-cflags=*)
- CFLAGS="$CFLAGS ${opt#--extra-cflags=}"
- VFW_CFLAGS="${opt#--extra-cflags=}"
- ;;
- --extra-ldflags=*)
- LDFLAGS="$LDFLAGS ${opt#--extra-ldflags=}"
- VFW_LDFLAGS="${opt#--extra-ldflags=}"
- ;;
- --enable-pthread)
- CFLAGS="$CFLAGS -DHAVE_PTHREAD=1"
- pthread="yes"
- case $SYS in
- MINGW|CYGWIN|BEOS)
- ;;
- *)
- LDFLAGS="$LDFLAGS -lpthread"
- ;;
- esac
- ;;
- --enable-debug)
- CFLAGS="$CFLAGS -g"
- debug="yes"
- ;;
- --enable-gprof)
- CFLAGS="$CFLAGS -pg"
- LDFLAGS="$LDFLAGS -pg"
- gprof="yes"
- ;;
- --enable-vfw)
- vfw="yes"
- ;;
- --enable-visualize)
- LDFLAGS="$LDFLAGS -L/usr/X11R6/lib -lX11"
- CFLAGS="$CFLAGS -DVISUALIZE=1"
- vis="yes"
- ;;
- *)
- echo "Unknown option $opt, ignored"
- ;;
- esac
-done
-
VFWFLAGS=
if [ "$debug" != "yes" -a "$gprof" != "yes" ]; then
CFLAGS="$CFLAGS -s -fomit-frame-pointer"
@@ -253,6 +268,9 @@
ASFLAGS=$ASFLAGS
VFW=$vfw
EXE=$EXE
+AR=$AR
+AROPTS=$AROPTS
+RANLIB=$RANLIB
VIS=$vis
HAVE_GETOPT_LONG=$HAVE_GETOPT_LONG
EOF
--- x264/Makefile.crosscompile~ 2005-10-27 17:01:35.000000000 +0200
+++ x264/Makefile 2005-10-27 17:02:51.000000000 +0200
@@ -62,8 +62,8 @@
default: $(DEP) x264$(EXE)
libx264.a: .depend $(OBJS) $(OBJASM)
- ar rc libx264.a $(OBJS) $(OBJASM)
- ranlib libx264.a
+ $(AR) $(AROPTS) libx264.a $(OBJS) $(OBJASM)
+ $(RANLIB) libx264.a
x264$(EXE): libx264.a x264.o matroska.o
$(CC) -o $@ x264.o matroska.o libx264.a $(LDFLAGS)
@@ -100,12 +100,12 @@
distclean: clean
rm -f config.mak vfw/build/cygwin/config.mak
-install: x264
+install: x264$(EXE)
install -d $(DESTDIR)$(bindir) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir)
install -m 644 x264.h $(DESTDIR)$(includedir)
install -m 644 libx264.a $(DESTDIR)$(libdir)
- install x264 $(DESTDIR)$(bindir)
- ranlib $(DESTDIR)$(libdir)/libx264.a
+ install x264$(EXE) $(DESTDIR)$(bindir)
+ $(RANLIB) $(DESTDIR)$(libdir)/libx264.a
etags: TAGS
extras/contrib/src/Patches/xml2-win32.patch 0 → 100644
View file @ 0a5027d1
# Get rid of the test programs. -- Xtophe
--- xml/Makefile.am 2005-07-11 00:53:13.000000000 +0200
+++ xml-new/Makefile.am 2005-08-30 21:36:51.000000000 +0200
@@ -1,16 +1,16 @@
## Process this file with automake to produce Makefile.in
-SUBDIRS = include . doc example xstc @PYTHON_SUBDIR@
+SUBDIRS = include .
-DIST_SUBDIRS = include . doc example python xstc
+DIST_SUBDIRS = include .
INCLUDES = -I$(top_builddir)/include -I@srcdir@/include @THREAD_CFLAGS@ @Z_CFLAGS@
-noinst_PROGRAMS=testSchemas testRelax testSAX testHTML testXPath testURI \
- testThreads testC14N testAutomata testRegexp \
- testReader testapi testModule runtest runsuite
+#noinst_PROGRAMS=testSchemas testRelax testSAX testHTML testXPath testURI \
+# testThreads testC14N testAutomata testRegexp \
+# testReader testapi testModule runtest runsuite
-bin_PROGRAMS = xmllint xmlcatalog
+#bin_PROGRAMS = xmllint xmlcatalog
bin_SCRIPTS=xml2-config
@@ -49,86 +49,86 @@
m4datadir = $(datadir)/aclocal
m4data_DATA = libxml.m4
-runtest_SOURCES=runtest.c
-runtest_LDFLAGS =
-runtest_DEPENDENCIES = $(DEPS)
-runtest_LDADD= @BASE_THREAD_LIBS@ @RDL_LIBS@ $(LDADDS)
-
-runsuite_SOURCES=runsuite.c
-runsuite_LDFLAGS =
-runsuite_DEPENDENCIES = $(DEPS)
-runsuite_LDADD= @RDL_LIBS@ $(LDADDS)
-
-xmllint_SOURCES=xmllint.c
-xmllint_LDFLAGS =
-xmllint_DEPENDENCIES = $(DEPS)
-xmllint_LDADD= @RDL_LIBS@ $(LDADDS)
-
-testSAX_SOURCES=testSAX.c
-testSAX_LDFLAGS =
-testSAX_DEPENDENCIES = $(DEPS)
-testSAX_LDADD= $(LDADDS)
-
-testHTML_SOURCES=testHTML.c
-testHTML_LDFLAGS =
-testHTML_DEPENDENCIES = $(DEPS)
-testHTML_LDADD= $(LDADDS)
-
-xmlcatalog_SOURCES=xmlcatalog.c
-xmlcatalog_LDFLAGS =
-xmlcatalog_DEPENDENCIES = $(DEPS)
-xmlcatalog_LDADD= @RDL_LIBS@ $(LDADDS)
-
-testXPath_SOURCES=testXPath.c
-testXPath_LDFLAGS =
-testXPath_DEPENDENCIES = $(DEPS)
-testXPath_LDADD= $(LDADDS)
-
-testC14N_SOURCES=testC14N.c
-testC14N_LDFLAGS =
-testC14N_DEPENDENCIES = $(DEPS)
-testC14N_LDADD= $(LDADDS)
-
-testThreads_SOURCES=testThreads@THREADS_W32@.c
-testThreads_LDFLAGS =
-testThreads_DEPENDENCIES = $(DEPS)
-testThreads_LDADD= @BASE_THREAD_LIBS@ $(LDADDS)
-
-testURI_SOURCES=testURI.c
-testURI_LDFLAGS =
-testURI_DEPENDENCIES = $(DEPS)
-testURI_LDADD= $(LDADDS)
-
-testRegexp_SOURCES=testRegexp.c
-testRegexp_LDFLAGS =
-testRegexp_DEPENDENCIES = $(DEPS)
-testRegexp_LDADD= $(LDADDS)
-
-testAutomata_SOURCES=testAutomata.c
-testAutomata_LDFLAGS =
-testAutomata_DEPENDENCIES = $(DEPS)
-testAutomata_LDADD= $(LDADDS)
-
-testSchemas_SOURCES=testSchemas.c
-testSchemas_LDFLAGS =
-testSchemas_DEPENDENCIES = $(DEPS)
-testSchemas_LDADD= $(LDADDS)
-
-testRelax_SOURCES=testRelax.c
-testRelax_LDFLAGS =
-testRelax_DEPENDENCIES = $(DEPS)
-testRelax_LDADD= $(LDADDS)
-
-testReader_SOURCES=testReader.c
-testReader_LDFLAGS =
-testReader_DEPENDENCIES = $(DEPS)
-testReader_LDADD= $(LDADDS)
-
-testModule_SOURCES=testModule.c
-testModule_LDFLAGS =
-testModule_DEPENDENCIES = $(DEPS)
-testModule_LDADD= $(LDADDS)
-
+#runtest_SOURCES=runtest.c
+#runtest_LDFLAGS =
+#runtest_DEPENDENCIES = $(DEPS)
+#runtest_LDADD= @BASE_THREAD_LIBS@ @RDL_LIBS@ $(LDADDS)
+#
+#runsuite_SOURCES=runsuite.c
+#runsuite_LDFLAGS =
+#runsuite_DEPENDENCIES = $(DEPS)
+#runsuite_LDADD= @RDL_LIBS@ $(LDADDS)
+#
+##xmllint_SOURCES=xmllint.c
+##xmllint_LDFLAGS =
+##xmllint_DEPENDENCIES = $(DEPS)
+##xmllint_LDADD= @RDL_LIBS@ $(LDADDS)
+##
+#testSAX_SOURCES=testSAX.c
+#testSAX_LDFLAGS =
+#testSAX_DEPENDENCIES = $(DEPS)
+#testSAX_LDADD= $(LDADDS)
+#
+#testHTML_SOURCES=testHTML.c
+#testHTML_LDFLAGS =
+#testHTML_DEPENDENCIES = $(DEPS)
+#testHTML_LDADD= $(LDADDS)
+#
+##xmlcatalog_SOURCES=xmlcatalog.c
+##xmlcatalog_LDFLAGS =
+##xmlcatalog_DEPENDENCIES = $(DEPS)
+##xmlcatalog_LDADD= @RDL_LIBS@ $(LDADDS)
+##
+#testXPath_SOURCES=testXPath.c
+#testXPath_LDFLAGS =
+#testXPath_DEPENDENCIES = $(DEPS)
+#testXPath_LDADD= $(LDADDS)
+#
+#testC14N_SOURCES=testC14N.c
+#testC14N_LDFLAGS =
+#testC14N_DEPENDENCIES = $(DEPS)
+#testC14N_LDADD= $(LDADDS)
+#
+#testThreads_SOURCES=testThreads@THREADS_W32@.c
+#testThreads_LDFLAGS =
+#testThreads_DEPENDENCIES = $(DEPS)
+#testThreads_LDADD= @BASE_THREAD_LIBS@ $(LDADDS)
+#
+#testURI_SOURCES=testURI.c
+#testURI_LDFLAGS =
+#testURI_DEPENDENCIES = $(DEPS)
+#testURI_LDADD= $(LDADDS)
+#
+#testRegexp_SOURCES=testRegexp.c
+#testRegexp_LDFLAGS =
+#testRegexp_DEPENDENCIES = $(DEPS)
+#testRegexp_LDADD= $(LDADDS)
+#
+#testAutomata_SOURCES=testAutomata.c
+#testAutomata_LDFLAGS =
+#testAutomata_DEPENDENCIES = $(DEPS)
+#testAutomata_LDADD= $(LDADDS)
+#
+#testSchemas_SOURCES=testSchemas.c
+#testSchemas_LDFLAGS =
+#testSchemas_DEPENDENCIES = $(DEPS)
+#testSchemas_LDADD= $(LDADDS)
+#
+#testRelax_SOURCES=testRelax.c
+#testRelax_LDFLAGS =
+#testRelax_DEPENDENCIES = $(DEPS)
+#testRelax_LDADD= $(LDADDS)
+#
+#testReader_SOURCES=testReader.c
+#testReader_LDFLAGS =
+#testReader_DEPENDENCIES = $(DEPS)
+#testReader_LDADD= $(LDADDS)
+#
+#testModule_SOURCES=testModule.c
+#testModule_LDFLAGS =
+#testModule_DEPENDENCIES = $(DEPS)
+#testModule_LDADD= $(LDADDS)
+#
noinst_LTLIBRARIES = testdso.la
testdso_la_SOURCES = testdso.c
testdso_la_LDFLAGS = -module -rpath $(libdir)
extras/contrib/src/packages.mak
View file @ 0a5027d1
......@@ -74,7 +74,7 @@ FAAD2_URL=$(VIDEOLAN)/testing/contrib/faad2-$(FAAD2_VERSION).tar.bz2
FAAD2_CVSROOT=:pserver:anonymous@cvs.audiocoding.com:/cvsroot/faac
FAAC_VERSION=1.24
FAAC_URL=$(VIDEOLAN)/testing/contrib/faac-$(FAAC_VERSION).tar.bz2
LAME_VERSION=3.93.1
LAME_VERSION=3.96.1
LAME_URL=$(SF)/lame/lame-$(LAME_VERSION).tar.gz
LIBEBML_VERSION=0.7.6
LIBEBML_URL=http://dl.matroska.org/downloads/libebml/libebml-$(LIBEBML_VERSION).tar.bz2
......@@ -87,10 +87,10 @@ OPENSLP_VERSION=1.0.11
OPENSLP_URL=$(SF)/openslp/openslp-$(OPENSLP_VERSION).tar.gz
LIBDVDCSS_VERSION=1.2.8
LIBDVDCSS_URL=$(VIDEOLAN)/libdvdcss/$(LIBDVDCSS_VERSION)/libdvdcss-$(LIBDVDCSS_VERSION).tar.gz
LIBDVDREAD_VERSION=0.9.4
LIBDVDREAD_URL=http://download.videolan.org/pub/videolan/libdvdread/$(LIBDVDREAD_VERSION)/libdvdread-$(LIBDVDREAD_VERSION).tar.gz
LIBDVDNAV_VERSION=0.1.10
LIBDVDNAV_URL=$(VIDEOLAN)/testing/contrib/libdvdnav-$(LIBDVDNAV_VERSION).tar.gz
LIBDVDREAD_VERSION=20041028
LIBDVDREAD_URL=$(VIDEOLAN)/contrib/libdvdread-$(LIBDVDREAD_VERSION).tar.bz2
LIBDVDNAV_VERSION=20050211
LIBDVDNAV_URL=$(VIDEOLAN)/testing/contrib/libdvdnav-$(LIBDVDNAV_VERSION).tar.bz2
LIBDVBPSI_VERSION=0.1.5
LIBDVBPSI_URL=$(VIDEOLAN)/contrib/libdvbpsi3-$(LIBDVBPSI_VERSION).tar.gz
LIVEDOTCOM_VERSION=latest
......@@ -101,7 +101,7 @@ GOOM2k4_URL=$(SF)/goom/goom-$(GOOM2k4_VERSION)-src.tar.gz
LIBCACA_VERSION=0.9
LIBCACA_URL=http://sam.zoy.org/libcaca/libcaca-$(LIBCACA_VERSION).tar.gz
LIBDTS_VERSION=0.0.2
LIBDTS_URL=$(VIDEOLAN)/libdts/$(LIBDTS_VERSION)/libdts-$(LIBDTS_VERSION).tar.gz
LIBDTS_URL=http://debian.unnet.nl/pub/videolan/libdts/$(LIBDTS_VERSION)/libdts-$(LIBDTS_VERSION).tar.gz
MODPLUG_VERSION=0.7
MODPLUG_URL=$(VIDEOLAN)/testing/contrib/libmodplug-$(MODPLUG_VERSION).tar.gz
MASH_VERSION=5.2
......@@ -116,10 +116,10 @@ PNG_VERSION=1.2.5
PNG_URL=$(VIDEOLAN)/testing/contrib/libpng-$(PNG_VERSION).tar.bz2
GPGERROR_VERSION=1.0
GPGERROR_URL=$(VIDEOLAN)/testing/contrib/libgpg-error-$(GPGERROR_VERSION).tar.gz
GCRYPT_VERSION=1.2.0
GCRYPT_URL=$(VIDEOLAN)/testing/contrib/libgcrypt-$(GCRYPT_VERSION).tar.gz
GNUTLS_VERSION=1.2.6
GNUTLS_URL=ftp://ftp.gnutls.org/pub/gnutls/gnutls-$(GNUTLS_VERSION).tar.bz2
GCRYPT_VERSION=1.2.1
GCRYPT_URL=$(VIDEOLAN)/testing/contrib/libgcrypt-$(GCRYPT_VERSION).tar.bz2
GNUTLS_VERSION=1.2.7
GNUTLS_URL=http://ftp.gnupg.org/gcrypt/gnutls/gnutls-$(GNUTLS_VERSION).tar.bz2
DAAP_VERSION=0.4.0
DAAP_URL=http://craz.net/programs/itunes/files/libopendaap-$(DAAP_VERSION).tar.bz2
GLIB_VERSION=1.2.8
......@@ -127,6 +127,9 @@ GLIB_URL=ftp://ftp.gtk.org/pub/gtk/v1.2/glib-1.2.8.tar.gz
LIBIDL_VERSION=0.6.8
LIBIDL_URL=http://andrewtv.org/libIDL/libIDL-$(LIBIDL_VERSION).tar.gz
GECKO_SDK_MAC_URL=$(VIDEOLAN)/testing/contrib/gecko-sdk-ppc-macosx10.2-1.7.5.tar.gz
GECKO_SDK_WIN32_URL=ftp://ftp.mozilla.org/pub/mozilla.org/mozilla/releases/mozilla1.7.5/gecko-sdk-i586-pc-msvc-1.7.5.zip
LIBIDL_WIN32_BIN_URL=ftp://ftp.mozilla.org/pub/mozilla.org/mozilla/libraries/win32/libIDL-0.6.3-win32-bin.zip
VC71_GLIB_WIN32_BIN_URL=ftp://ftp.mozilla.org/pub/mozilla.org/mozilla/libraries/win32/vc71-glib-1.2.10-bin.zip
MOZILLA_VERSION=1.7.5
MOZILLA_URL=http://ftp.mozilla.org/pub/mozilla.org/mozilla/releases/mozilla$(MOZILLA_VERSION)/source/mozilla-source-$(MOZILLA_VERSION).tar.bz2
TWOLAME_VERSION=0.3.2
......@@ -143,3 +146,13 @@ SDL_IMAGE_VERSION=1.2.4
SDL_IMAGE_URL=http://www.libsdl.org/projects/SDL_image/release/SDL_image-$(SDL_IMAGE_VERSION).tar.gz
MUSE_VERSION=1.2.1
MUSE_URL=http://files.musepack.net/source/libmpcdec-$(MUSE_VERSION).tar.bz2
WXWIDGETS_VERSION=2.6.2
WXWIDGETS_URL=$(SF)/wxwindows/wxWidgets-$(WXWIDGETS_VERSION).tar.gz
ZLIB_VERSION=1.2.3
ZLIB_URL=$(SF)/libpng/zlib-$(ZLIB_VERSION).tar.gz
XML_VERSION=2.6.20
XML_URL=http://xmlsoft.org/sources/libxml2-$(XML_VERSION).tar.gz
DIRAC_VERSION=0.5.3
DIRAC_URL=$(SF)/dirac/dirac-$(DIRAC_VERSION).tar.gz
DX_HEADERS_URL=$(VIDEOLAN)/testing/contrib/win32-dx7headers.tgz
DSHOW_HEADERS_URL=$(VIDEOLAN)/contrib/dshow-headers.tgz
m4/vlc.m4
View file @ 0a5027d1
......@@ -3,6 +3,8 @@ dnl $Id$
dnl ===========================================================================
dnl Macros to add plugins or builtins and handle their flags
m4_pattern_allow([^PKG_CONFIG(_LIBDIR)?$])
AC_DEFUN([VLC_ADD_BUILTINS], [
BUILTINS="${BUILTINS} $1"
......
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