From 40a98416f1b7d16feb2ff2d8db67c661872676fee804774e9f0a15775fbd20e8 Mon Sep 17 00:00:00 2001
From: OBS User autobuild <null@suse.de>
Date: Wed, 12 May 2010 16:22:49 +0000
Subject: [PATCH] Accepting request 39695 from multimedia:libs

Copy from multimedia:libs/dirac based on submit request 39695 from user plater

OBS-URL: https://build.opensuse.org/request/show/39695
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/dirac?expand=0&rev=8
---
 dirac-1.0.2-gcc45.patch | 22 ++++++++++++++++++++++
 dirac.changes           |  5 +++++
 dirac.spec              | 10 ++++++----
 3 files changed, 33 insertions(+), 4 deletions(-)
 create mode 100644 dirac-1.0.2-gcc45.patch

diff --git a/dirac-1.0.2-gcc45.patch b/dirac-1.0.2-gcc45.patch
new file mode 100644
index 0000000..7ae1b85
--- /dev/null
+++ b/dirac-1.0.2-gcc45.patch
@@ -0,0 +1,22 @@
+Index: dirac-1.0.2/libdirac_encoder/quant_chooser.cpp
+===================================================================
+--- dirac-1.0.2.orig/libdirac_encoder/quant_chooser.cpp
++++ dirac-1.0.2/libdirac_encoder/quant_chooser.cpp
+@@ -340,7 +340,7 @@ void QuantChooser::SetSkip( CodeBlock& c
+     {
+         for (int i=cblock.Xstart(); i<cblock.Xend(); ++i )
+         {
+-            if ( (std::abs(m_coeff_data[j][i])<<2) >= u_threshold )
++            if ( (static_cast<int>(std::abs(m_coeff_data[j][i]))<<2) >= u_threshold )
+                 can_skip = false;
+         }   
+     }
+@@ -355,7 +355,7 @@ CoeffType QuantChooser::BlockAbsMax( con
+     {
+         for (int i=node.Xp() ; i<node.Xp()+node.Xl(); ++i)
+         {    
+-            val = std::max( val , std::abs(m_coeff_data[j][i]) );
++            val = std::max( val , static_cast<int>(std::abs(m_coeff_data[j][i])) );
+         }// i
+     }// j
+ 
diff --git a/dirac.changes b/dirac.changes
index 1e79549..65278f8 100644
--- a/dirac.changes
+++ b/dirac.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sun May  9 08:49:10 UTC 2010 - davejplater@gmail.com
+
+- Fixed factory build with patch from git dirac-1.0.2-gcc45.patch
+
 -------------------------------------------------------------------
 Fri Dec 18 22:46:01 CET 2009 - jengelh@medozas.de
 
diff --git a/dirac.spec b/dirac.spec
index 750197d..c96879b 100644
--- a/dirac.spec
+++ b/dirac.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package dirac (Version 1.0.2)
 #
-# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -20,16 +20,17 @@
 
 Name:           dirac
 Version:        1.0.2
-Release:        3
+Release:        4
 Url:            http://diracvideo.org/
 Group:          Productivity/Multimedia/Video/Editors and Convertors
 License:        MPL ..
-Summary:        Dirac Video Codec
+Summary:        The dirac Video Codec
 Source:         %{name}-%{version}.tar.bz2
+Patch0:         %{name}-%{version}-gcc45.patch
 BuildRequires:  gcc-c++ libstdc++-devel
 BuildRequires:  libcppunit-devel
 %ifnarch ia64 s390 s390x %sparc
-BuildRequires:  valgrind-devel
+BuildRequires:  pkg-config valgrind-devel
 %endif
 BuildRequires:  doxygen fdupes graphviz-gd texlive-latex
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -209,6 +210,7 @@ Authors:
 
 %prep
 %setup -q
+%patch0 -p1
 # Code is not mature enough for -Werror (unused results)
 sed -i 's/-Werror//' configure.ac