Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Florian Franzmann (e5204d9185542c5a6e0ad70e1a7ca874d0b7a0c9)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Florian Franzmann <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Florian Franzmann (e5204d9185542c5a6e0ad70e1a7ca874d0b7a0c9)
  • Date: Wed, 16 Feb 2011 15:00:59 -0600

GIT changes to master grimoire by Florian Franzmann
<siflfran AT hawo.stw.uni-erlangen.de>:

video-libs/dirac/HISTORY | 4 ++++
video-libs/dirac/PRE_BUILD | 3 +++
video-libs/dirac/gcc-4.5.diff | 21 +++++++++++++++++++++
3 files changed, 28 insertions(+)

New commits:
commit e5204d9185542c5a6e0ad70e1a7ca874d0b7a0c9
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

video-libs/dirac: fixed compile error with gcc 4.5

diff --git a/video-libs/dirac/HISTORY b/video-libs/dirac/HISTORY
index 1e5fd21..01a369f 100644
--- a/video-libs/dirac/HISTORY
+++ b/video-libs/dirac/HISTORY
@@ -1,3 +1,7 @@
+2011-02-16 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * PRE_BUILD, gcc-4.5.diff: added patch from debian to fix
+ compile error with gcc 4.5
+
2009-09-24 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
* DEPENDS: switch from tetex to texlive [auto]

diff --git a/video-libs/dirac/PRE_BUILD b/video-libs/dirac/PRE_BUILD
new file mode 100755
index 0000000..cc198a7
--- /dev/null
+++ b/video-libs/dirac/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
+patch -p1 < ${SCRIPT_DIRECTORY}/gcc-4.5.diff
diff --git a/video-libs/dirac/gcc-4.5.diff b/video-libs/dirac/gcc-4.5.diff
new file mode 100644
index 0000000..d580451
--- /dev/null
+++ b/video-libs/dirac/gcc-4.5.diff
@@ -0,0 +1,21 @@
+diff -ur dirac.old/libdirac_encoder/quant_chooser.cpp
dirac-1.0.2/libdirac_encoder/quant_chooser.cpp
+--- dirac.old/libdirac_encoder/quant_chooser.cpp 2009-01-21
05:22:05.000000000 +0000
++++ dirac-1.0.2/libdirac_encoder/quant_chooser.cpp 2010-07-03
17:40:12.000000000 +0000
+@@ -340,7 +340,7 @@
+ {
+ for (int i=cblock.Xstart(); i<cblock.Xend(); ++i )
+ {
+- if ( (std::abs(m_coeff_data[j][i])<<2) >= u_threshold )
++ if ( (std::abs(int(m_coeff_data[j][i]))<<2) >= u_threshold )
+ can_skip = false;
+ }
+ }
+@@ -355,7 +355,7 @@
+ {
+ 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 , std::abs(int(m_coeff_data[j][i])) );
+ }// i
+ }// j
+



  • [SM-Commit] GIT changes to master grimoire by Florian Franzmann (e5204d9185542c5a6e0ad70e1a7ca874d0b7a0c9), Florian Franzmann, 02/16/2011

Archive powered by MHonArc 2.6.24.

Top of Page