Skip to content

V
vlc-1.1
Commit 66ccc709 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf
Browse files
Options

Contrib: update to master contribs

parent c4460659
Show whitespace changes
Inline Side-by-side
Showing with 67 additions and 125 deletions
extras/contrib/src/Makefile
View file @ 66ccc709
...@@ -909,6 +909,35 @@ CLEAN_FILE += .faad ...@@ -909,6 +909,35 @@ CLEAN_FILE += .faad
CLEAN_PKG += faad2 CLEAN_PKG += faad2
DISTCLEAN_PKG += faad2-$(FAAD2_VERSION).tar.gz DISTCLEAN_PKG += faad2-$(FAAD2_VERSION).tar.gz
# ***************************************************************************
# libvp8
# ***************************************************************************
libvpx-$(VPX_VERSION).tar.bz2:
$(WGET) $(VPX_URL)
vpx: libvpx-$(VPX_VERSION).tar.bz2
$(EXTRACT_BZ2)
patch -p0 < Patches/libvpx-cross.patch
ifdef HAVE_WIN32
VPX_TARGET=x86-win32-gcc
else
VPX_TARGET=FIXME
endif
.vpx: vpx
(cd $<; ./configure --target=$(VPX_TARGET) --disable-install-bins --disable-install-srcs --disable-install-libs --disable-examples && XCC=$(CC) XNM=$(NM) XSTRIP=$(STRIP) make && make install)
(cd $<; cp vp8/*.h vpx_codec/*.h vpx_port/*.h $(PREFIX)/include) # Of course, why the hell would one expect it to be listed or in make install?
rm $(PREFIX)/include/config.h
(cd $<; $(RANLIB) libvpx.a && cp libvpx.a $(PREFIX)/lib) # Of course, why the hell would one expect it to be listed or in make install?
touch $@
CLEAN_FILE += .vpx
CLEAN_PKG += vpx
DISTCLEAN_PKG += libvpx-$(VPX_VERSION).tar.bz2
# *************************************************************************** # ***************************************************************************
# lame # lame
# *************************************************************************** # ***************************************************************************
...@@ -1032,7 +1061,7 @@ ffmpeg: .dshow_headers ...@@ -1032,7 +1061,7 @@ ffmpeg: .dshow_headers
else else
ffmpeg: ffmpeg:
endif endif
$(SVN) co $(FFMPEG_SVN) ffmpeg -r22960 $(SVN) co $(FFMPEG_SVN) ffmpeg
ifdef HAVE_ISA_THUMB ifdef HAVE_ISA_THUMB
patch -p0 < Patches/ffmpeg-avcodec-no-thumb.patch patch -p0 < Patches/ffmpeg-avcodec-no-thumb.patch
endif endif
...@@ -1902,46 +1931,6 @@ CLEAN_FILE += .opendaap ...@@ -1902,46 +1931,6 @@ CLEAN_FILE += .opendaap
CLEAN_PKG += libopendaap CLEAN_PKG += libopendaap
DISTCLEAN_PKG += libopendaap-$(DAAP_VERSION).tar.bz2 DISTCLEAN_PKG += libopendaap-$(DAAP_VERSION).tar.bz2
# ***************************************************************************
# glib
# ***************************************************************************
glib-$(GLIB_VERSION).tar.bz2:
$(WGET) $(GLIB_URL)
glib: glib-$(GLIB_VERSION).tar.bz2
$(EXTRACT_BZ2)
(cd $@; patch -p0 < ../Patches/glib-remove-gtkdoc.patch)
ifdef HAVE_DARWIN_64
(cd $@; patch -p0 < ../Patches/glib-Darwin64.patch)
endif
.glib: glib
(cd $<; sh autogen.sh --prefix=$(PREFIX) --host=$(HOST) && make && make install)
touch $@
CLEAN_FILE += .glib
CLEAN_PKG += glib
DISTCLEAN_PKG += glib-$(GLIB_VERSION).tar.gz
# ***************************************************************************
# libIDL
# ***************************************************************************
libIDL-$(LIBIDL_VERSION).tar.bz2:
$(WGET) $(LIBIDL_URL)
libIDL: libIDL-$(LIBIDL_VERSION).tar.bz2
$(EXTRACT_BZ2)
.IDL: libIDL
(cd $<; ./configure --prefix=$(PREFIX) --host=$(HOST) && make && make install )
touch $@
CLEAN_FILE += .IDL
CLEAN_PKG += libIDL
DISTCLEAN_PKG += libIDL-$(LIBIDL_VERSION).tar.gz
# *************************************************************************** # ***************************************************************************
# Gecko SDK # Gecko SDK
# *************************************************************************** # ***************************************************************************
...@@ -1958,60 +1947,7 @@ gecko-sdk: ...@@ -1958,60 +1947,7 @@ gecko-sdk:
CLEAN_FILE += .gecko CLEAN_FILE += .gecko
CLEAN_PKG += gecko-sdk CLEAN_PKG += gecko-sdk
DISTCLEAN_PKG += xulrunner-1.9.2.en-US.mac-i386.sdk.tar.bz2 DISTCLEAN_PKG += gecko-sdk
# ***************************************************************************
# Gecko SDK win32
# ***************************************************************************
xulrunner-1.9.2.en-US.win32.sdk.zip:
$(WGET) $(GECKO_SDK_WIN32_URL)
libIDL-0.6.3-win32-bin.zip:
$(WGET) $(LIBIDL_WIN32_BIN_URL)
glib-19990228.zip:
$(WGET) $(GLIB_WIN32_BIN_URL)
.gecko-win32: xulrunner-1.9.2.en-US.win32.sdk.zip libIDL-0.6.3-win32-bin.zip glib-19990228.zip
unzip xulrunner-1.9.2.en-US.win32.sdk.zip
rm -rf $(PREFIX)/gecko-sdk
mv xulrunner-sdk $(PREFIX)/gecko-sdk
unzip -j libIDL-0.6.3-win32-bin.zip libIDL-0.6.3-win32-bin/libIDL-0.6.dll -d $(PREFIX)/gecko-sdk/bin
unzip glib-19990228.zip glib-1.2.dll -d $(PREFIX)/gecko-sdk/bin
chmod a+x $(PREFIX)/gecko-sdk/bin/*
touch $@
CLEAN_FILE += .gecko-win32
CLEAN_PKG += gecko-sdk-win32
DISTCLEAN_PKG += xulrunner-1.9.2.en-US.win32.sdk.zip libIDL-0.6.3-win32-bin.zip glib-19990228.zip
# ***************************************************************************
# mozilla-macosx
#
# Note that this dependency needs to be compiled against the 10.4u SDK using
# using GCC-4.0. Using newer releases of one of these won't lead to a
# successful compilation! Adapt the respective variables in ../config.mak!
# ***************************************************************************
firefox-$(MOZILLA_VERSION)-source.tar.bz2:
$(WGET) $(MOZILLA_URL)
mozilla: firefox-$(MOZILLA_VERSION)-source.tar.bz2
$(EXTRACT_BZ2)
(cd $@; patch -p0 < ../Patches/firefox-darwin.patch)
.mozilla-macosx: mozilla .glib .IDL
ifneq($(SDK_TARGET),"10.4")
echo "Compiling the mozilla target requires the 10.4 SDK!"
exit -1
endif
(cd $<; ./configure --prefix=$(PREFIX)/gecko-sdk-new --enable-default-toolkit=cairo-cocoa --enable-standalone-modules=xpcom,plugin --enable-application=xulrunner && make && make install)
touch $@
CLEAN_FILE += .mozilla-macosx
CLEAN_PKG += mozilla
DISTCLEAN_PKG += firefox-source-$(MOZILLA_VERSION).tar.bz2
# *************************************************************************** # ***************************************************************************
# libjpeg # libjpeg
...@@ -2414,28 +2350,24 @@ DISTCLEAN_PKG += fluidsynth-$(FLUID_VERSION).tar.gz ...@@ -2414,28 +2350,24 @@ DISTCLEAN_PKG += fluidsynth-$(FLUID_VERSION).tar.gz
# liboil # liboil
# *************************************************************************** # ***************************************************************************
liboil-$(OIL_VERSION).tar.gz: orc-$(ORC_VERSION).tar.gz:
$(WGET) $(OIL_URL) $(WGET) $(ORC_URL)
liboil: liboil-$(OIL_VERSION).tar.gz orc: orc-$(ORC_VERSION).tar.gz
$(EXTRACT_GZ) $(EXTRACT_GZ)
patch -d liboil -p1 < Patches/liboil-noshared.patch
patch -d liboil -p1 < Patches/liboil-win64.patch
patch -d liboil -p1 < Patches/liboil-Xcompile.patch
(cd $@; autoreconf)
.liboil: liboil .orc: orc
ifdef HAVE_DARWIN_OS ifdef HAVE_DARWIN_OS
(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS)") (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS)")
else else
(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS) -O2") (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX))
endif endif
(cd $<; make && make install) (cd $<; make && make install)
touch $@ touch $@
CLEAN_FILE += .liboil CLEAN_FILE += .orc
CLEAN_PKG += liboil CLEAN_PKG += orc
DISTCLEAN_PKG += liboil-$(OIL_VERSION).tar.gz DISTCLEAN_PKG += orc-$(ORC_VERSION).tar.gz
# *************************************************************************** # ***************************************************************************
# Schroedinger library # Schroedinger library
...@@ -2449,8 +2381,14 @@ schroedinger: schroedinger-$(SCHROED_VERSION).tar.gz ...@@ -2449,8 +2381,14 @@ schroedinger: schroedinger-$(SCHROED_VERSION).tar.gz
patch -p0 < Patches/schroedinger-notests.patch patch -p0 < Patches/schroedinger-notests.patch
(cd $@; autoreconf -iv) (cd $@; autoreconf -iv)
.schroedinger: schroedinger .liboil ifdef HAVE_WIN32
(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --with-thread=none --disable-gtk-doc --prefix=$(PREFIX) CFLAGS="$(CFLAGS) -O3" && make && make install) ORCC="wine $(PREFIX)/bin/orcc.exe"
else
ORCC="orcc"
endif
.schroedinger: schroedinger .orc
(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --with-thread=none --disable-gtk-doc --prefix=$(PREFIX) CFLAGS="$(CFLAGS) -O3" && make ORCC=$(ORCC) && make install)
touch $@ touch $@
CLEAN_FILE += .schroedinger CLEAN_FILE += .schroedinger
......
extras/contrib/src/Patches/libvpx-cross.patch 0 → 100644
View file @ 66ccc709
--- vpx/build/make/Makefile 2010-05-18 17:58:33.000000000 +0200
+++ vpx.new/build/make/Makefile 2010-05-20 00:06:42.000000000 +0200
@@ -77,6 +77,10 @@
TGT_CC:=$(word 3, $(subst -, ,$(TOOLCHAIN)))
quiet:=$(if $(verbose),,yes)
qexec=$(if $(quiet),@)
+
+CC=$(XCC)
+STRIP=$(XSTRIP)
+NM=$(XNM)
# Cancel built-in implicit rules
%: %.o
extras/contrib/src/packages.mak
View file @ 66ccc709
...@@ -153,18 +153,9 @@ OPENCDK_VERSION=0.6.6 ...@@ -153,18 +153,9 @@ OPENCDK_VERSION=0.6.6
OPENCDK_URL=http://www.gnu.org/software/gnutls/releases/opencdk/opencdk-$(OPENCDK_VERSION).tar.bz2 OPENCDK_URL=http://www.gnu.org/software/gnutls/releases/opencdk/opencdk-$(OPENCDK_VERSION).tar.bz2
DAAP_VERSION=0.4.0 DAAP_VERSION=0.4.0
DAAP_URL=http://craz.net/programs/itunes/files/libopendaap-$(DAAP_VERSION).tar.bz2 DAAP_URL=http://craz.net/programs/itunes/files/libopendaap-$(DAAP_VERSION).tar.bz2
GLIB_VERSION=2.20.4
GLIB_URL=http://ftp.gnome.org/pub/gnome/sources/glib/2.20/glib-$(GLIB_VERSION).tar.bz2
LIBIDL_VERSION=0.8.12
LIBIDL_URL=http://ftp.gnome.org/pub/gnome/sources/libIDL/0.8/libIDL-$(LIBIDL_VERSION).tar.bz2
NPAPI_HEADERS_SVN_URL=http://npapi-headers.googlecode.com/svn/trunk/ NPAPI_HEADERS_SVN_URL=http://npapi-headers.googlecode.com/svn/trunk/
# NPAPI_HEADERS_SVN_REVISION can be a revision number, or just HEAD for the latest # NPAPI_HEADERS_SVN_REVISION can be a revision number, or just HEAD for the latest
NPAPI_HEADERS_SVN_REVISION=3 NPAPI_HEADERS_SVN_REVISION=3
GECKO_SDK_WIN32_URL=http://releases.mozilla.org/pub/mozilla.org/xulrunner/releases/1.9.2/sdk/xulrunner-1.9.2.en-US.win32.sdk.zip
LIBIDL_WIN32_BIN_URL=ftp://ftp.mozilla.org/pub/mozilla.org/mozilla/libraries/win32/historic/vc6/libIDL-0.6.3-win32-bin.zip
GLIB_WIN32_BIN_URL=ftp://ftp.mozilla.org/pub/mozilla.org/mozilla/libraries/win32/historic/vc6/glib-19990228.zip
MOZILLA_VERSION=3.0.11
MOZILLA_URL=http://releases.mozilla.org/pub/mozilla.org/firefox/releases/$(MOZILLA_VERSION)/source/firefox-$(MOZILLA_VERSION)-source.tar.bz2
TWOLAME_VERSION=0.3.12 TWOLAME_VERSION=0.3.12
TWOLAME_URL=$(SF)/twolame/twolame-$(TWOLAME_VERSION).tar.gz TWOLAME_URL=$(SF)/twolame/twolame-$(TWOLAME_VERSION).tar.gz
X264_VERSION=20050609 X264_VERSION=20050609
...@@ -226,14 +217,12 @@ KATE_VERSION=0.3.0 ...@@ -226,14 +217,12 @@ KATE_VERSION=0.3.0
KATE_URL=http://libkate.googlecode.com/files/libkate-$(KATE_VERSION).tar.gz KATE_URL=http://libkate.googlecode.com/files/libkate-$(KATE_VERSION).tar.gz
TIGER_VERSION=0.3.1 TIGER_VERSION=0.3.1
TIGER_URL=http://libtiger.googlecode.com/files/libtiger-$(TIGER_VERSION).tar.gz TIGER_URL=http://libtiger.googlecode.com/files/libtiger-$(TIGER_VERSION).tar.gz
OIL_VERSION=0.3.16 ORC_VERSION=0.4.4
OIL_URL=http://liboil.freedesktop.org/download/liboil-$(OIL_VERSION).tar.gz ORC_URL=http://code.entropywave.com/download/orc/orc-$(ORC_VERSION).tar.gz
SCHROED_VERSION=1.0.8 SCHROED_VERSION=1.0.9
SCHROED_URL=$(CONTRIB_VIDEOLAN)/schroedinger-$(SCHROED_VERSION).tar.gz SCHROED_URL=http://diracvideo.org/download/schroedinger/schroedinger-$(SCHROED_VERSION).tar.gz
#SCHROED_URL=http://www.diracvideo.org/download/schroedinger/schroedinger-$(SCHROED_VERSION).tar.gz
ASS_VERSION=0.9.9 ASS_VERSION=0.9.9
ASS_URL=http://libass.googlecode.com/files/libass-$(ASS_VERSION).tar.bz2 ASS_URL=http://libass.googlecode.com/files/libass-$(ASS_VERSION).tar.bz2
#ASS_GIT=git://repo.or.cz/libass.git
GSM_VERSION=1.0.12 GSM_VERSION=1.0.12
#GSM_URL=http://user.cs.tu-berlin.de/~jutta/gsm/gsm-$(GSM_VERSION).tar.gz #GSM_URL=http://user.cs.tu-berlin.de/~jutta/gsm/gsm-$(GSM_VERSION).tar.gz
GSM_URL=$(CONTRIB_VIDEOLAN)/gsm-$(GSM_VERSION).tar.gz GSM_URL=$(CONTRIB_VIDEOLAN)/gsm-$(GSM_VERSION).tar.gz
...@@ -253,3 +242,5 @@ PEFLAGS_URL=$(CONTRIB_VIDEOLAN) ...@@ -253,3 +242,5 @@ PEFLAGS_URL=$(CONTRIB_VIDEOLAN)
SQLITE_VERSION=3.6.20 SQLITE_VERSION=3.6.20
SQLITE_URL=http://www.sqlite.org/sqlite-amalgamation-$(SQLITE_VERSION).tar.gz SQLITE_URL=http://www.sqlite.org/sqlite-amalgamation-$(SQLITE_VERSION).tar.gz
DXVA2_URL=$(CONTRIB_VIDEOLAN)/dxva2api.h DXVA2_URL=$(CONTRIB_VIDEOLAN)/dxva2api.h
VPX_VERSION=0.9.0
VPX_URL=http://webm.googlecode.com/files/libvpx-$(VPX_VERSION).tar.bz2
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