Accepting request 39695 from multimedia:libs

checked in (request 39695)

OBS-URL: https://build.opensuse.org/request/show/39695
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/dirac?expand=0&rev=12

dirac-1.0.2-gcc45.patch

@@ -1,22 +0,0 @@
-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
- 

dirac.changes

@@ -3,11 +3,6 @@ Tue May 11 09:00:33 UTC 2010 - davejplater@gmail.com
 
 - Added Conflicts: for conflicting packman packages
 
--------------------------------------------------------------------
-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
 

dirac.spec

@@ -23,14 +23,13 @@ Version:        1.0.2
 Release:        3
 Url:            http://diracvideo.org/
 Group:          Productivity/Multimedia/Video/Editors and Convertors
-License:        MPL
-Summary:        The dirac Video Codec
+License:        MPL ..
+Summary:        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 pkg-config
+BuildRequires:  valgrind-devel
 %endif
 BuildRequires:  doxygen fdupes graphviz-gd texlive-latex
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -212,7 +211,6 @@ Authors:
 
 %prep
 %setup -q
-%patch0 -p1
 # Code is not mature enough for -Werror (unused results)
 sed -i 's/-Werror//' configure.ac