corsepiu pushed to k3d (f21). "Update to 0.8.0.3. (..more)"
notifications at fedoraproject.org
notifications at fedoraproject.org
Tue Apr 7 04:38:31 UTC 2015
>From 28238c37b77ba6a74dc636b5db43589cbf3fb78d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ralf=20Cors=C3=A9pius?= <corsepiu at fedoraproject.org>
Date: Sat, 7 Feb 2015 03:55:07 +0100
Subject: Update to 0.8.0.3.
- Rework patches.
diff --git a/.gitignore b/.gitignore
index a2e2b03..710844a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/k3d-source-0.8.0.2.tar.bz2
+/k3d-0.8.0.3.tar.gz
diff --git a/0001-k3d-0.8.0.2-cmake.diff.patch b/0001-k3d-0.8.0.2-cmake.diff.patch
new file mode 100644
index 0000000..340f2da
--- /dev/null
+++ b/0001-k3d-0.8.0.2-cmake.diff.patch
@@ -0,0 +1,25 @@
+From f17f3ec1b26de190455a7404fd26e3e5a1d14b66 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ralf=20Cors=C3=A9pius?= <corsepiu at fedoraproject.org>
+Date: Tue, 27 Jan 2015 10:54:55 +0100
+Subject: [PATCH 1/6] k3d-0.8.0.2-cmake.diff
+
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index a4b548e..94c5b9e 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -355,7 +355,7 @@ ENDIF()
+ # Setup output directories ...
+ SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${k3d_BINARY_DIR}/bin)
+
+-SET(K3D_LIBDIR lib) # Allows us to handle 64-bit libs if/when it becomes necessary.
++SET(K3D_LIBDIR lib${LIB_SUFFIX}) # Allows us to handle 64-bit libs if/when it becomes necessary.
+
+ IF(APPLE AND K3D_ENABLE_OSX_BUNDLE)
+ SET(K3D_BUNDLE_DIRECTORY ${k3d_BINARY_DIR}/K-3D.app/Contents)
+--
+2.1.0
+
diff --git a/0002-FIX-Boost-1.57-compilation.patch b/0002-FIX-Boost-1.57-compilation.patch
new file mode 100644
index 0000000..2deeb1a
--- /dev/null
+++ b/0002-FIX-Boost-1.57-compilation.patch
@@ -0,0 +1,24 @@
+From d11a6d89412638754db8359003abfdf8cce7a7da Mon Sep 17 00:00:00 2001
+From: Bart Janssens <bart at bartjanssens.org>
+Date: Wed, 17 Dec 2014 21:49:09 +0100
+Subject: [PATCH 2/6] FIX: Boost 1.57 compilation
+
+---
+ k3dsdk/difference.h | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/k3dsdk/difference.h b/k3dsdk/difference.h
+index 814d5fb..cb5a6fa 100644
+--- a/k3dsdk/difference.h
++++ b/k3dsdk/difference.h
+@@ -31,7 +31,6 @@
+ #include <boost/accumulators/statistics/stats.hpp>
+ #include <boost/accumulators/statistics/variance.hpp>
+ #include <boost/math/special_functions/next.hpp>
+-#include <boost/math/tools/test.hpp>
+ #include <boost/static_assert.hpp>
+
+ namespace k3d
+--
+2.1.0
+
diff --git a/0003-Suppress-Wnarrow-warnings.patch b/0003-Suppress-Wnarrow-warnings.patch
new file mode 100644
index 0000000..5bda40d
--- /dev/null
+++ b/0003-Suppress-Wnarrow-warnings.patch
@@ -0,0 +1,25 @@
+From ec721c0930208c48dd434ee8df0e4c1492e7829e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ralf=20Cors=C3=A9pius?= <corsepiu at fedoraproject.org>
+Date: Fri, 6 Feb 2015 04:56:25 +0100
+Subject: [PATCH 3/6] Suppress Wnarrow warnings.
+
+---
+ k3dsdk/utility_gl.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/k3dsdk/utility_gl.h b/k3dsdk/utility_gl.h
+index 45e7eb3..3809143 100644
+--- a/k3dsdk/utility_gl.h
++++ b/k3dsdk/utility_gl.h
+@@ -104,7 +104,7 @@ inline void color3d(const color& Color)
+ /// Passes a k3d::color to glMaterialfv()
+ inline void material(GLenum Face, GLenum PName, const color& Color, double Alpha = 1.0)
+ {
+- GLfloat color[] = { Color.red, Color.green, Color.blue, Alpha };
++ GLfloat color[] = { static_cast<GLfloat>(Color.red), static_cast<GLfloat>(Color.green), static_cast<GLfloat>(Color.blue), static_cast<GLfloat>(Alpha) };
+ glMaterialfv(Face, PName, color);
+ }
+
+--
+2.1.0
+
diff --git a/0004-Fix-permissions.patch b/0004-Fix-permissions.patch
new file mode 100644
index 0000000..6829ad7
--- /dev/null
+++ b/0004-Fix-permissions.patch
@@ -0,0 +1,126 @@
+From 0b3de82ee57d109e0f66d60afbe4628b8570cbdd Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ralf=20Cors=C3=A9pius?= <corsepiu at fedoraproject.org>
+Date: Fri, 6 Feb 2015 06:21:19 +0100
+Subject: [PATCH 4/6] Fix permissions.
+
+---
+ distribution/win32/gtkrc | 0
+ distribution/win32/nsis/headerimage.bmp | Bin
+ distribution/win32/nsis/headerimage.xcf | Bin
+ gendef/gendef.cc | 0
+ k3dsdk/gil/boost/gil/extension/numeric/affine.hpp | 0
+ k3dsdk/gil/boost/gil/extension/numeric/algorithm.hpp | 0
+ .../gil/extension/numeric/channel_numeric_operations.hpp | 0
+ k3dsdk/gil/boost/gil/extension/numeric/convolve.hpp | 0
+ k3dsdk/gil/boost/gil/extension/numeric/kernel.hpp | 0
+ .../gil/extension/numeric/pixel_numeric_operations.hpp | 0
+ k3dsdk/gil/boost/gil/extension/numeric/resample.hpp | 0
+ k3dsdk/gil/boost/gil/extension/numeric/sampler.hpp | 0
+ modules/collada_io/int_elements.cpp | 0
+ modules/collada_io/int_elements.h | 0
+ modules/collada_io/integration.cpp | 0
+ modules/collada_io/integration.h | 0
+ modules/collada_io/mesh_reader.cpp | 0
+ modules/collada_io/module.cpp | 0
+ modules/linear_curve/CMakeLists.txt | 0
+ modules/ngui_material_manager_panel/CMakeLists.txt | 0
+ share/k3d/icons/k3d.bmp | Bin
+ share/k3d/ngui/rasterized/sp_noShaderSelected.png | Bin
+ .../mesh.source.MeshSourceScript.teapots.reference.k3d | 0
+ 23 files changed, 0 insertions(+), 0 deletions(-)
+ mode change 100755 => 100644 distribution/win32/gtkrc
+ mode change 100755 => 100644 distribution/win32/nsis/headerimage.bmp
+ mode change 100755 => 100644 distribution/win32/nsis/headerimage.xcf
+ mode change 100755 => 100644 gendef/gendef.cc
+ mode change 100755 => 100644 k3dsdk/gil/boost/gil/extension/numeric/affine.hpp
+ mode change 100755 => 100644 k3dsdk/gil/boost/gil/extension/numeric/algorithm.hpp
+ mode change 100755 => 100644 k3dsdk/gil/boost/gil/extension/numeric/channel_numeric_operations.hpp
+ mode change 100755 => 100644 k3dsdk/gil/boost/gil/extension/numeric/convolve.hpp
+ mode change 100755 => 100644 k3dsdk/gil/boost/gil/extension/numeric/kernel.hpp
+ mode change 100755 => 100644 k3dsdk/gil/boost/gil/extension/numeric/pixel_numeric_operations.hpp
+ mode change 100755 => 100644 k3dsdk/gil/boost/gil/extension/numeric/resample.hpp
+ mode change 100755 => 100644 k3dsdk/gil/boost/gil/extension/numeric/sampler.hpp
+ mode change 100755 => 100644 modules/collada_io/int_elements.cpp
+ mode change 100755 => 100644 modules/collada_io/int_elements.h
+ mode change 100755 => 100644 modules/collada_io/integration.cpp
+ mode change 100755 => 100644 modules/collada_io/integration.h
+ mode change 100755 => 100644 modules/collada_io/mesh_reader.cpp
+ mode change 100755 => 100644 modules/collada_io/module.cpp
+ mode change 100755 => 100644 modules/linear_curve/CMakeLists.txt
+ mode change 100755 => 100644 modules/ngui_material_manager_panel/CMakeLists.txt
+ mode change 100755 => 100644 share/k3d/icons/k3d.bmp
+ mode change 100755 => 100644 share/k3d/ngui/rasterized/sp_noShaderSelected.png
+ mode change 100755 => 100644 tests/meshes/mesh.source.MeshSourceScript.teapots.reference.k3d
+
+diff --git a/distribution/win32/gtkrc b/distribution/win32/gtkrc
+old mode 100755
+new mode 100644
+diff --git a/distribution/win32/nsis/headerimage.bmp b/distribution/win32/nsis/headerimage.bmp
+old mode 100755
+new mode 100644
+diff --git a/distribution/win32/nsis/headerimage.xcf b/distribution/win32/nsis/headerimage.xcf
+old mode 100755
+new mode 100644
+diff --git a/gendef/gendef.cc b/gendef/gendef.cc
+old mode 100755
+new mode 100644
+diff --git a/k3dsdk/gil/boost/gil/extension/numeric/affine.hpp b/k3dsdk/gil/boost/gil/extension/numeric/affine.hpp
+old mode 100755
+new mode 100644
+diff --git a/k3dsdk/gil/boost/gil/extension/numeric/algorithm.hpp b/k3dsdk/gil/boost/gil/extension/numeric/algorithm.hpp
+old mode 100755
+new mode 100644
+diff --git a/k3dsdk/gil/boost/gil/extension/numeric/channel_numeric_operations.hpp b/k3dsdk/gil/boost/gil/extension/numeric/channel_numeric_operations.hpp
+old mode 100755
+new mode 100644
+diff --git a/k3dsdk/gil/boost/gil/extension/numeric/convolve.hpp b/k3dsdk/gil/boost/gil/extension/numeric/convolve.hpp
+old mode 100755
+new mode 100644
+diff --git a/k3dsdk/gil/boost/gil/extension/numeric/kernel.hpp b/k3dsdk/gil/boost/gil/extension/numeric/kernel.hpp
+old mode 100755
+new mode 100644
+diff --git a/k3dsdk/gil/boost/gil/extension/numeric/pixel_numeric_operations.hpp b/k3dsdk/gil/boost/gil/extension/numeric/pixel_numeric_operations.hpp
+old mode 100755
+new mode 100644
+diff --git a/k3dsdk/gil/boost/gil/extension/numeric/resample.hpp b/k3dsdk/gil/boost/gil/extension/numeric/resample.hpp
+old mode 100755
+new mode 100644
+diff --git a/k3dsdk/gil/boost/gil/extension/numeric/sampler.hpp b/k3dsdk/gil/boost/gil/extension/numeric/sampler.hpp
+old mode 100755
+new mode 100644
+diff --git a/modules/collada_io/int_elements.cpp b/modules/collada_io/int_elements.cpp
+old mode 100755
+new mode 100644
+diff --git a/modules/collada_io/int_elements.h b/modules/collada_io/int_elements.h
+old mode 100755
+new mode 100644
+diff --git a/modules/collada_io/integration.cpp b/modules/collada_io/integration.cpp
+old mode 100755
+new mode 100644
+diff --git a/modules/collada_io/integration.h b/modules/collada_io/integration.h
+old mode 100755
+new mode 100644
+diff --git a/modules/collada_io/mesh_reader.cpp b/modules/collada_io/mesh_reader.cpp
+old mode 100755
+new mode 100644
+diff --git a/modules/collada_io/module.cpp b/modules/collada_io/module.cpp
+old mode 100755
+new mode 100644
+diff --git a/modules/linear_curve/CMakeLists.txt b/modules/linear_curve/CMakeLists.txt
+old mode 100755
+new mode 100644
+diff --git a/modules/ngui_material_manager_panel/CMakeLists.txt b/modules/ngui_material_manager_panel/CMakeLists.txt
+old mode 100755
+new mode 100644
+diff --git a/share/k3d/icons/k3d.bmp b/share/k3d/icons/k3d.bmp
+old mode 100755
+new mode 100644
+diff --git a/share/k3d/ngui/rasterized/sp_noShaderSelected.png b/share/k3d/ngui/rasterized/sp_noShaderSelected.png
+old mode 100755
+new mode 100644
+diff --git a/tests/meshes/mesh.source.MeshSourceScript.teapots.reference.k3d b/tests/meshes/mesh.source.MeshSourceScript.teapots.reference.k3d
+old mode 100755
+new mode 100644
+--
+2.1.0
+
diff --git a/0005-Avoid-signed-unsigned-int-warning.patch b/0005-Avoid-signed-unsigned-int-warning.patch
new file mode 100644
index 0000000..48aa94e
--- /dev/null
+++ b/0005-Avoid-signed-unsigned-int-warning.patch
@@ -0,0 +1,25 @@
+From cee20dc15f8778cc6c85354bb8544cff29482ec9 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ralf=20Cors=C3=A9pius?= <corsepiu at fedoraproject.org>
+Date: Fri, 6 Feb 2015 07:13:52 +0100
+Subject: [PATCH 5/6] Avoid signed/unsigned int warning.
+
+---
+ k3dsdk/bitmap_modifier.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/k3dsdk/bitmap_modifier.h b/k3dsdk/bitmap_modifier.h
+index 7f4bae5..e856467 100644
+--- a/k3dsdk/bitmap_modifier.h
++++ b/k3dsdk/bitmap_modifier.h
+@@ -91,7 +91,7 @@ private:
+ bool resize_bitmap = false;
+ bool assign_pixels = false;
+
+- for(int i = 0; i != Hints.size(); ++i)
++ for(std::vector<ihint*>::size_type i = 0; i != Hints.size(); ++i)
+ {
+ // Input pixels changed, so all we have to do is reassign ours ...
+ if(dynamic_cast<hint::bitmap_pixels_changed*>(Hints[i]))
+--
+2.1.0
+
diff --git a/0006-FIX-Boost-1.56-1.57-uuid-SIMD-bug-workaround.patch b/0006-FIX-Boost-1.56-1.57-uuid-SIMD-bug-workaround.patch
new file mode 100644
index 0000000..569215d
--- /dev/null
+++ b/0006-FIX-Boost-1.56-1.57-uuid-SIMD-bug-workaround.patch
@@ -0,0 +1,24 @@
+From 9f8be299973cda77b75c78a6d49ba37dc7f44382 Mon Sep 17 00:00:00 2001
+From: Bart Janssens <bart at bartjanssens.org>
+Date: Fri, 6 Feb 2015 16:52:54 +0100
+Subject: [PATCH 6/6] FIX: Boost 1.56-1.57 uuid SIMD bug workaround
+
+---
+ k3dsdk/uuid.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/k3dsdk/uuid.h b/k3dsdk/uuid.h
+index 5ac0fb0..e85caec 100644
+--- a/k3dsdk/uuid.h
++++ b/k3dsdk/uuid.h
+@@ -25,6 +25,7 @@
+ */
+
+ #include <k3dsdk/types.h>
++#define BOOST_UUID_NO_SIMD // This can be removed again once the Boost 1.56 - 1.57 regression in the SSE2 implementation of operator< is fixed.
+ #include <boost/uuid/uuid.hpp>
+ #include <iosfwd>
+
+--
+2.1.0
+
diff --git a/k3d.spec b/k3d.spec
index 0231858..e15aa48 100644
--- a/k3d.spec
+++ b/k3d.spec
@@ -1,24 +1,24 @@
Name: k3d
-Version: 0.8.0.2
-Release: 32%{?dist}
+Version: 0.8.0.3
+Release: 1%{?dist}
Summary: A 3D Modeling, Animation and Rendering System
Group: Applications/Multimedia
License: GPLv2+
URL: http://www.k-3d.org/
-Source0: http://downloads.sourceforge.net/k3d/k3d-source-%{version}.tar.bz2
+# Github URLs suck (tarball is called k3d, content uses k3d-k3d)
+Source0: https://github.com/K-3D/k3d/archive/k3d-%{version}/k3d-%{version}.tar.gz
Source1: k3d.desktop
-Patch0: k3d-0.8.0.2-gcc-4.6.diff
-Patch1: k3d-0.8.0.2-cmake.diff
-# From http://slackbuilds.org/slackbuilds/13.37/graphics/k3d/k3d_gtkmm224.patch
-Patch2: k3d-0.8.0.2-gtkmm2.24.diff
-Patch3: k3d-0.8.0.2-libpng1.4.patch
-Patch4: k3d-0.8.0.2-gcc-4.7.patch
-# Extracted from Debian's k3d_0.8.0.3.orig.tar.xz
-Patch5: k3d-0.8.0.2-inotify.patch
-Patch6: k3d-0.8.0.2-boost157.patch
+
+Patch0: 0001-k3d-0.8.0.2-cmake.diff.patch
+Patch1: 0002-FIX-Boost-1.57-compilation.patch
+Patch2: 0003-Suppress-Wnarrow-warnings.patch
+Patch3: 0004-Fix-permissions.patch
+Patch4: 0005-Avoid-signed-unsigned-int-warning.patch
+Patch5: 0006-FIX-Boost-1.56-1.57-uuid-SIMD-bug-workaround.patch
# This list is alpha sorted.
+BuildRequires: asciidoc
BuildRequires: boost-devel
BuildRequires: bzip2-devel
BuildRequires: cairomm-devel
@@ -26,6 +26,8 @@ BuildRequires: cmake
BuildRequires: desktop-file-utils
BuildRequires: expat-devel
BuildRequires: freetype-devel
+BuildRequires: ftgl-devel
+BuildRequires: glew-devel
BuildRequires: gnome-vfs2-devel
BuildRequires: gtkglext-devel
BuildRequires: gtkmm24-devel
@@ -90,30 +92,22 @@ rendering a model written by K-3D.
%prep
-%setup -q -n k3d-source-%{version}
+%setup -q -n k3d-k3d-%{version}
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
-%patch6 -p1
-
-# binaries in source tarball
-rm tests/*.pyc
-
-find . \( -type f -a -executable \) -exec chmod -x "{}" \;
-
-sed -i -e "s,\${k3d_BINARY_DIR}/lib,\${k3d_BINARY_DIR}/%{_lib}," k3dsdk/ftgl/CMakeLists.txt
%build
mkdir BUILD
cd BUILD
-%cmake ..
+%cmake -Wno-dev ..
# Since our cmake macro disables rpath, we need to set some temp
# library paths as the build invokes some built binaries to generate
# proxy files.
-export LD_LIBRARY_PATH=%{_builddir}/k3d-source-%{version}/BUILD/%{_lib}
+export LD_LIBRARY_PATH=%{_builddir}/k3d-k3d-%{version}/BUILD/%{_lib}
make VERBOSE=1 %{?_smp_mflags}
cd ..
@@ -174,6 +168,8 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
%{_datadir}/k3d/shaders/surface
%{_datadir}/k3d/shaders/volume
%{_datadir}/k3d/textures
+%{_datadir}/k3d/guide
+%{_datadir}/k3d/qtui
%{_mandir}/man1/k3d*
%{_datadir}/applications/*.desktop
@@ -185,6 +181,10 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
%changelog
+* Fri Feb 06 2015 Ralf Corsépius <corsepiu at fedoraproject.org> - 0.8.0.3-1
+- Update to 0.8.0.3.
+- Rework patches.
+
* Thu Jan 29 2015 Petr Machata <pmachata at redhat.com> - 0.8.0.2-32
- Rebuild for boost 1.57.0
- Drop use of boost/math/tools/test.hpp, which is not shipped anymore
diff --git a/sources b/sources
index 7957eda..026eb3b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9f4808b8d5e324f69b72ef1950df45d7 k3d-source-0.8.0.2.tar.bz2
+a8f3e9f85386bb891203b749f235597b k3d-0.8.0.3.tar.gz
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/k3d.git/commit/?h=f21&id=28238c37b77ba6a74dc636b5db43589cbf3fb78d
More information about the scm-commits
mailing list