Commit a64f014a authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf
Browse files

Contribs: move to schroedinger 1.0.9 and add ORC

And patch the whole mess, because it seems they don't understand what Cross-Compilation is.
parent c35705e5
......@@ -2320,28 +2320,24 @@ DISTCLEAN_PKG += fluidsynth-$(FLUID_VERSION).tar.gz
# liboil
# ***************************************************************************
liboil-$(OIL_VERSION).tar.gz:
$(WGET) $(OIL_URL)
orc-$(ORC_VERSION).tar.gz:
$(WGET) $(ORC_URL)
liboil: liboil-$(OIL_VERSION).tar.gz
orc: orc-$(ORC_VERSION).tar.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
(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS)")
else
(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS) -O2")
(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX))
endif
(cd $<; make && make install)
touch $@
CLEAN_FILE += .liboil
CLEAN_PKG += liboil
DISTCLEAN_PKG += liboil-$(OIL_VERSION).tar.gz
CLEAN_FILE += .orc
CLEAN_PKG += orc
DISTCLEAN_PKG += orc-$(ORC_VERSION).tar.gz
# ***************************************************************************
# Schroedinger library
......@@ -2355,8 +2351,14 @@ schroedinger: schroedinger-$(SCHROED_VERSION).tar.gz
patch -p0 < Patches/schroedinger-notests.patch
(cd $@; autoreconf -iv)
.schroedinger: schroedinger .liboil
(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --with-thread=none --disable-gtk-doc --prefix=$(PREFIX) CFLAGS="$(CFLAGS) -O3" && make && make install)
ifdef HAVE_WIN32
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 $@
CLEAN_FILE += .schroedinger
......
......@@ -8,3 +8,14 @@
DISTCHECK_CONFIGURE_FLAGS=--enable-gtk-doc
--- schroedinger/tools/Makefile.am 2010-01-04 03:52:01.000000000 +0100
+++ schroedinger.new/tools/Makefile.am 2010-05-08 20:50:30.000000000 +0200
@@ -5,7 +5,7 @@
AM_CFLAGS = $(SCHRO_CFLAGS) $(ERROR_CFLAGS) \
- $(ORC_CFLAGS) \
+ -L$(PREFIX)/lib $(ORC_CFLAGS) \
-DSCHRO_ENABLE_UNSTABLE_API
LDADD = $(SCHRO_LIBS)
......@@ -219,8 +219,10 @@ TIGER_VERSION=0.3.1
TIGER_URL=http://libtiger.googlecode.com/files/libtiger-$(TIGER_VERSION).tar.gz
OIL_VERSION=0.3.16
OIL_URL=http://liboil.freedesktop.org/download/liboil-$(OIL_VERSION).tar.gz
SCHROED_VERSION=1.0.8
SCHROED_URL=$(CONTRIB_VIDEOLAN)/schroedinger-$(SCHROED_VERSION).tar.gz
ORC_VERSION=0.4.4
ORC_URL=http://code.entropywave.com/download/orc/orc-$(ORC_VERSION).tar.gz
SCHROED_VERSION=1.0.9
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_URL=http://libass.googlecode.com/files/libass-$(ASS_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