Hello community,

here is the log from the commit of package frei0r-plugins for openSUSE:Factory
checked in at Thu Oct 13 12:19:09 CEST 2011.



--------
--- openSUSE:Factory/frei0r-plugins/frei0r-plugins.changes      2011-10-07 
00:46:54.000000000 +0200
+++ frei0r-plugins/frei0r-plugins.changes       2011-10-05 17:58:49.000000000 
+0200
@@ -1,0 +2,9 @@
+Wed Oct  5 15:49:12 UTC 2011 - dims...@opensuse.org
+
+- Add pkgconfig(gavl) BuildRequires to enable the remaining
+  filters: rgbparade, scale0tilt, vectorscope.
+- Add frei0r-plugins-compiler-warnings.patch: Fix compiler warning
+  on undefined operation. Patch taken from upstream git, commit
+  id 8f8090.
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


New:
----
  frei0r-plugins-compiler-warnings.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ frei0r-plugins.spec ++++++
--- /var/tmp/diff_new_pack.w4MN2I/_old  2011-10-13 12:19:02.000000000 +0200
+++ /var/tmp/diff_new_pack.w4MN2I/_new  2011-10-13 12:19:02.000000000 +0200
@@ -1,7 +1,7 @@
 #
-# spec file for package
+# spec file for package frei0r-plugins
 #
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2011 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
@@ -16,10 +16,10 @@
 #
 
 
+
 Name:           frei0r-plugins
 Version:        1.3
 Release:        1
-# FIXME: uncomment pkgconfig(gavl) BuildRequires once gavl is in Factory
 License:        GPL-2+
 Summary:        Collection of video sources and filters plugins
 Url:            http://www.piksel.org/frei0r
@@ -27,12 +27,12 @@
 Source:         http://www.piksel.no/frei0r/releases/%{name}-%{version}.tar.gz
 # PATCH-FIX-UPSTREAM frei0r-missing-return.patch vu...@opensuse.org -- Add 
missing return value, sent upstream by mail on 2011-09-28
 Patch0:         frei0r-missing-return.patch
+# PATCH-FIX-UPSTREAM frei0r-plugins-compiler-warnings.patch 
dims...@opensuse.org -- Fix compiler warning on underfined operation. Taken 
from git.
+Patch1:         frei0r-plugins-compiler-warnings.patch
 BuildRequires:  gcc-c++
 # For the automatic pkgconfig() Provides
 BuildRequires:  pkg-config
-# GAVL not yet to exist in Factory - Offers those plugins:
-# Filters: rgbparade, scale0tilt, vectorscope
-#BuildRequires:  pkgconfig(gavl) >= 0.2.3
+BuildRequires:  pkgconfig(gavl) >= 0.2.3
 BuildRequires:  pkgconfig(opencv) >= 1.0.0
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
@@ -55,6 +55,7 @@
 %prep
 %setup -q -n frei0r-%{version}
 %patch0 -p1
+%patch1 -p1
 
 %build
 %configure

++++++ frei0r-plugins-compiler-warnings.patch ++++++
>From 8f809085bf1ca0f3d4a7b5bade3afe2367c3e9b2 Mon Sep 17 00:00:00 2001
From: Dan Dennedy <d...@dennedy.org>
Date: Thu, 29  Sep  2011  02:24:56  +0000
Subject: Fix compile warning on undefined operation.

---
diff --git a/src/filter/curves/curves.c b/src/filter/curves/curves.c
index 76ce144..021accc 100644
--- a/src/filter/curves/curves.c
+++ b/src/filter/curves/curves.c
@@ -875,9 +875,12 @@ void f0r_update(f0r_instance_t instance, double time,
                for(int j = 0; j < scale; j++) {
                  if (j % cellSize > lineWidth) { //point doesn't aly on the 
grid
                        int offset = ((maxYvalue - i + graphYOffset) * stride + 
j + graphXOffset) * 4;
-                       dst[offset] = (dst[offset++] >> 1) + 0x7F;
-                       dst[offset] = (dst[offset++] >> 1) + 0x7F;
-                       dst[offset] = (dst[offset++] >> 1) + 0x7F;
+                       dst[offset] = (dst[offset] >> 1) + 0x7F;
+                       offset++;
+                       dst[offset] = (dst[offset] >> 1) + 0x7F;
+                       offset++;
+                       dst[offset] = (dst[offset] >> 1) + 0x7F;
+                       offset++;
                  }
                }
        }
diff --git a/src/filter/three_point_balance/three_point_balance.c 
b/src/filter/three_point_balance/three_point_balance.c
index f847e31..c578a8c 100644
--- a/src/filter/three_point_balance/three_point_balance.c
+++ b/src/filter/three_point_balance/three_point_balance.c
@@ -263,15 +263,22 @@ void f0r_update(f0r_instance_t instance, double time,
        for(int i = 0; i < inst->height; i++) {
          int offset = (i * inst->width + j) * 4;
          if (copyPixel) {
-               dst[offset] = src[offset++];
-               dst[offset] = src[offset++];
-               dst[offset] = src[offset++];
+               dst[offset] = src[offset];
+               offset++;
+               dst[offset] = src[offset];
+               offset++;
+               dst[offset] = src[offset];
+               offset++;
          } else {
-               dst[offset] = mapRed[src[offset++]];
-               dst[offset] = mapGreen[src[offset++]];
-               dst[offset] = mapBlue[src[offset++]];
+               dst[offset] = mapRed[src[offset]];
+               offset++;
+               dst[offset] = mapGreen[src[offset]];
+               offset++;
+               dst[offset] = mapBlue[src[offset]];
+               offset++;
          }
-         dst[offset] = src[offset++]; // copy alpha
+         dst[offset] = src[offset]; // copy alpha
+         offset++;
        }
   }
   
--
cgit v0.7.2-83-g9ec5

continue with "q"...



Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

Reply via email to