[vlc-devel] commit: Contrib: fix schroedinger compile for Win32 (Jean-Baptiste Kempf )

[git version control]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Sat Jan  9 02:27:54 2010 +0100| [0179de14ddb2856cd9733a3937018fa15377c7d0] | committer: Jean-Baptiste Kempf 

Contrib: fix schroedinger compile for Win32

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

 extras/contrib/src/Distributions/win32.mak         |    4 ++--
 extras/contrib/src/Makefile                        |    3 ++-
 .../contrib/src/Patches/schroedinger-notests.patch |   10 ++++++++++
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/extras/contrib/src/Distributions/win32.mak b/extras/contrib/src/Distributions/win32.mak
index e18b5be..667a328 100644
--- a/extras/contrib/src/Distributions/win32.mak
+++ b/extras/contrib/src/Distributions/win32.mak
@@ -3,9 +3,9 @@ all: .iconv .intl .freetype .fribidi .zlib \
         .a52 .mpeg2 .id3tag .mad .ogg .vorbis .shout .vorbisenc .theora \
         .flac .speex .faad .lame .ebml  .matroska .ffmpeg .dvdcss \
         .live .pthreads .goom2k4 .caca .mod .x264  .xml .twolame \
-        .png .gpg-error .gcrypt .gnutls .mpcdec .dirac \
+        .png .gpg-error .gcrypt .gnutls .mpcdec .dirac .schroedinger \
         .dvdnav .dvbpsi .qt4_win32 .schroedinger .SDL_image \
         .dx_headers .dshow_headers .gecko-win32 .dca \
         .lua .tag .fontconfig .portaudio .kate .libass .zvbi \
         .fluid .aclocal .peflags .cddb .sqlite3 .libprojectM
-#       .daap .cddb .cdio .vcdimager
+#       .daap .cdio .vcdimager
diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 5f2f54f..9306d00 100644
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -2421,9 +2421,10 @@ schroedinger-$(SCHROED_VERSION).tar.gz:
 
 schroedinger: schroedinger-$(SCHROED_VERSION).tar.gz
 	$(EXTRACT_GZ)
+	patch -p0 < Patches/schroedinger-notests.patch
 
 .schroedinger: schroedinger .liboil
-	(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --with-thread=none --disable-gstreamer --prefix=$(PREFIX) CFLAGS="$(CFLAGS) -O3" && make -C schroedinger && make -C schroedinger 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/Patches/schroedinger-notests.patch b/extras/contrib/src/Patches/schroedinger-notests.patch
new file mode 100644
index 0000000..68d5dd6
--- /dev/null
+++ b/extras/contrib/src/Patches/schroedinger-notests.patch
@@ -0,0 +1,10 @@
+--- schroedinger/Makefile.am	2009-09-29 07:08:51.000000000 +0200
++++ schroedinger.new/Makefile.am	2010-01-09 02:18:41.000000000 +0100
+@@ -1,6 +1,6 @@
+ AUTOMAKE_OPTIONS = foreign
+ 
+-SUBDIRS = schroedinger doc tools testsuite
++SUBDIRS = schroedinger doc tools 
+ 
+ DISTCHECK_CONFIGURE_FLAGS=--enable-gtk-doc
+