[vlc-commits] commit: contribs: bump orc and schroedinger ( Rafaël Carré )

[git at videolan.org]

vlc | branch: master | Rafaël Carré <rafael.carre at gmail.com> | Fri Oct  8 21:13:33 2010 +0200| [da3dc2aee0435719f18ef1843a6efd365381ab9e] | committer: Rafaël Carré 

contribs: bump orc and schroedinger

schroedinger doesn't depend on orcc anymore

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=da3dc2aee0435719f18ef1843a6efd365381ab9e
---

 extras/contrib/src/Makefile     |    8 +-------
 extras/contrib/src/packages.mak |    4 ++--
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index a309a2a..565ca40 100644
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -2347,14 +2347,8 @@ schroedinger: schroedinger-$(SCHROED_VERSION).tar.gz
 	patch -p0 < Patches/schroedinger-notests.patch
 	(cd $@; autoreconf -iv)
 
-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)
+	(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --with-thread=none --disable-gtk-doc --prefix=$(PREFIX) CFLAGS="$(CFLAGS) -O3" && make && make install)
 	touch $@
 
 CLEAN_FILE += .schroedinger
diff --git a/extras/contrib/src/packages.mak b/extras/contrib/src/packages.mak
index 0884337..6e03a09 100644
--- a/extras/contrib/src/packages.mak
+++ b/extras/contrib/src/packages.mak
@@ -215,9 +215,9 @@ KATE_VERSION=0.3.8
 KATE_URL=http://libkate.googlecode.com/files/libkate-$(KATE_VERSION).tar.gz
 TIGER_VERSION=0.3.1
 TIGER_URL=http://libtiger.googlecode.com/files/libtiger-$(TIGER_VERSION).tar.gz
-ORC_VERSION=0.4.4
+ORC_VERSION=0.4.10
 ORC_URL=http://code.entropywave.com/download/orc/orc-$(ORC_VERSION).tar.gz
-SCHROED_VERSION=1.0.9
+SCHROED_VERSION=1.0.10
 SCHROED_URL=http://diracvideo.org/download/schroedinger/schroedinger-$(SCHROED_VERSION).tar.gz
 ASS_VERSION=0.9.11
 ASS_URL=http://libass.googlecode.com/files/libass-$(ASS_VERSION).tar.bz2