Contrib: dirac update!

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 796be8adeaa85ed5924953b9c7ba9f96d00fcef0..2f8e47b7792f887b7f1be9eb56cba95ec7c67cc3 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -2204,7 +2204,6 @@ dirac-$(DIRAC_VERSION).tar.gz:
 
 dirac: dirac-$(DIRAC_VERSION).tar.gz
        $(EXTRACT_GZ)
-       patch -p1 -d dirac <Patches/dirac-cross.patch
 ifdef HAVE_CYGWIN
        # incorrect compile warning with cygwin compiler 3.4.4
        patch -p0 <Patches/dirac-cygwin.patch

diff --git a/extras/contrib/src/Patches/dirac-cross.patch b/extras/contrib/src/Patches/dirac-cross.patch
deleted file mode 100644 (file)
index 79b056d..0000000
--- a/extras/contrib/src/Patches/dirac-cross.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/libdirac_common/band_codec.cpp b/libdirac_common/band_codec.cpp
-index f750906..bfe6e75 100644
---- a/libdirac_common/band_codec.cpp
-+++ b/libdirac_common/band_codec.cpp
-@@ -433,7 +433,7 @@ inline int BandCodec::ChooseFollowContext( const int bin_number ) const
-         }
- 
-     }
--
-+    return 0; // avoid warning
- }
- 
- inline int BandCodec::ChooseInfoContext() const

diff --git a/extras/contrib/src/packages.mak b/extras/contrib/src/packages.mak
index 591ea01d9627690d89fdc82aad5f345d9e637bcf..0b1f26aaaf9a5827245a0035162f12b81f73f342 100644 (file)
--- a/extras/contrib/src/packages.mak
+++ b/extras/contrib/src/packages.mak
@@ -188,7 +188,7 @@ ZLIB_URL=$(SF)/libpng/zlib-$(ZLIB_VERSION).tar.gz
 XML_VERSION=2.7.2
 #XML_URL=$(VIDEOLAN)/testing/contrib/libxml2-$(XML_VERSION).tar.gz
 XML_URL=http://xmlsoft.org/sources/libxml2-$(XML_VERSION).tar.gz
-DIRAC_VERSION=1.0.0
+DIRAC_VERSION=1.0.2
 DIRAC_URL=$(SF)/dirac/dirac-$(DIRAC_VERSION).tar.gz
 DX_HEADERS_URL=$(VIDEOLAN)/testing/contrib/win32-dx7headers.tgz
 DSHOW_HEADERS_URL=$(VIDEOLAN)/contrib/dshow-headers.tgz