[vlc-devel] commit: Contrib: dirac update! (Jean-Baptiste Kempf )

[xxcv]

git version control wrote:
> vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Fri Apr  3 12:20:14 2009 +0200| [c0706bdd6a26e669ded7418dd1071c3b2fb5c747] | committer: Jean-Baptiste Kempf 
>
> Contrib: dirac update!
>
>   
>> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=c0706bdd6a26e669ded7418dd1071c3b2fb5c747
>>     
> ---
>   
Hi
 Dirac-1.0.2 is broken on Windows build.

>  extras/contrib/src/Makefile                  |    1 -
>  extras/contrib/src/Patches/dirac-cross.patch |   13 -------------
>  extras/contrib/src/packages.mak              |    2 +-
>  3 files changed, 1 insertions(+), 15 deletions(-)
>
> diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
> index 796be8a..2f8e47b 100644
> --- 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
> 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 591ea01..0b1f26a 100644
> --- 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
>
> _______________________________________________
> vlc-devel mailing list
> To unsubscribe or modify your subscription options:
> http://mailman.videolan.org/listinfo/vlc-devel
>
>   

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mailman.videolan.org/pipermail/vlc-devel/attachments/20090407/d77fc719/attachment.html>