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
This commit is contained in:
OBS User autobuild 2010-05-12 16:22:49 +00:00 committed by Git OBS Bridge
parent 9831a1792e
commit 40a98416f1
3 changed files with 33 additions and 4 deletions

22
dirac-1.0.2-gcc45.patch Normal file
View File

@ -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

View File

@ -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

View File

@ -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