Contrib: Force schroedinger to be mono-threaded, until it is fixed for win32.

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 36df3cb84b011f47396a3f77b695b2edd3c2c453..33ed69b518accf19c81101eb8abb9c92a2ff8585 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -2517,7 +2517,7 @@ schroedinger: schroedinger-$(SCHROED_VERSION).tar.gz
        patch -d schroedinger -p1 < Patches/schroedinger-1.0.6-fixes.patch
 
 .schroedinger: schroedinger .liboil
-       (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS) -O3" && make && make install)
+       (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --with-thread=none --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 0b9f5e1f9441fd5df54f570307a94742dfb3b4ae..fc959fe2d43b2fcb1dcc28f3f1da475f392e9efd 100644 (file)
--- a/extras/contrib/src/packages.mak
+++ b/extras/contrib/src/packages.mak
@@ -131,7 +131,7 @@ LIBDTS_URL=http://debian.unnet.nl/pub/videolan/libdts/$(LIBDTS_VERSION)/libdts-$
 LIBDCA_SVN=svn://svn.videolan.org/libdca/trunk
 MODPLUG_VERSION=0.8.4
 MODPLUG_URL=$(SF)/modplug-xmms/libmodplug-$(MODPLUG_VERSION).tar.gz
-CDDB_VERSION=1.3.0
+CDDB_VERSION=1.3.2
 CDDB_URL=$(SF)/libcddb/libcddb-$(CDDB_VERSION).tar.bz2
 VCDIMAGER_VERSION=0.7.23
 VCDIMAGER_URL=$(GNU)/vcdimager/vcdimager-$(VCDIMAGER_VERSION).tar.gz