Contrib: fix dirac target

diff --git a/extras/contrib/src/Distributions/win32.mak b/extras/contrib/src/Distributions/win32.mak
index 2bc91d4624ce4ee3a10d49471ac651e8e4130f9e..e18b5be0b7427b53734920513567b1c51d0be096 100644 (file)
--- a/extras/contrib/src/Distributions/win32.mak
+++ b/extras/contrib/src/Distributions/win32.mak
@@ -3,7 +3,7 @@ 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 \
+        .png .gpg-error .gcrypt .gnutls .mpcdec .dirac \
         .dvdnav .dvbpsi .qt4_win32 .schroedinger .SDL_image \
         .dx_headers .dshow_headers .gecko-win32 .dca \
         .lua .tag .fontconfig .portaudio .kate .libass .zvbi \

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 3509c755c4482264f08b1bb10ed1cf8962984811..5f2f54f640c03c8247e5a0143f2d3e08121802b6 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -2129,13 +2129,10 @@ dirac: dirac-$(DIRAC_VERSION).tar.gz
        $(EXTRACT_GZ)
 ifdef HAVE_CYGWIN
        # incorrect compile warning with cygwin compiler 3.4.4
-       patch -p0 <Patches/dirac-cygwin.patch
+       patch -p0 < Patches/dirac-cygwin.patch
 endif
-ifndef HAVE_DARWIN_OS
-       (cd $@; aclocal -I m4 && autoconf && automake)
-else
+       patch -p0 < Patches/dirac-noutils.patch
        (cd $@; ./bootstrap)
-endif
 
 DIRAC_SUBDIRS = libdirac_byteio libdirac_common libdirac_motionest libdirac_encoder libdirac_decoder
 

diff --git a/extras/contrib/src/Patches/dirac-noutils.patch b/extras/contrib/src/Patches/dirac-noutils.patch
new file mode 100644 (file)
index 0000000..8ede6cc
--- /dev/null
+++ b/extras/contrib/src/Patches/dirac-noutils.patch
@@ -0,0 +1,11 @@
+--- dirac/Makefile.am  2008-10-01 07:33:56.000000000 +0200
++++ dirac.new/Makefile.am      2010-01-09 02:05:45.000000000 +0100
+@@ -2,7 +2,7 @@
+ #
+ 
+ SUBDIRS = libdirac_byteio libdirac_common libdirac_motionest libdirac_encoder \
+-          libdirac_decoder encoder decoder util $(CPPUNITTESTS_DIR) \
++          libdirac_decoder encoder decoder $(CPPUNITTESTS_DIR) \
+           tests $(DOC_DIR) win32
+ 
+ .PHONY: valgrind-check