Hello community, here is the log from the commit of package blender for openSUSE:Factory checked in at 2012-04-17 21:57:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/blender (Old) and /work/SRC/openSUSE:Factory/.blender.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "blender", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/blender/blender.changes 2011-09-23 01:52:34.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.blender.new/blender.changes 2012-04-17 21:57:33.000000000 +0200 @@ -1,0 +2,10 @@ +Wed Apr 11 18:56:09 UTC 2012 - [email protected] + +- Add blender-collada858.patch: openCOLLADA >= svn 858 installs + the headers to /usr/include/COLLADA* instead of + /usr/include/COLLADA*/include, thus messing up the build of + blender. +- Add blender-gcc47.patch: Fix build with gcc 4.7. Taken from + upstream svn, r44000. + +------------------------------------------------------------------- New: ---- blender-collada858.patch blender-gcc47.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ blender.spec ++++++ --- /var/tmp/diff_new_pack.VubRdq/_old 2012-04-17 21:57:35.000000000 +0200 +++ /var/tmp/diff_new_pack.VubRdq/_new 2012-04-17 21:57:35.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package blender # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -15,7 +15,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild %global __python3 /usr/bin/python3 #%%global py3_ver %%(python3 -c "import sys; v=sys.version_info[:2]; print('%%d.%%d'%%v)" 2>/dev/null || echo PYTHON-NOT-FOUND) @@ -38,29 +37,77 @@ %define DISTRIBUTABLE 1 %if 0%{?fedora} -BuildRequires: gettext libX11-devel libXi-devel mesa-libGLw-devel pkgconfig xorg-x11-proto-devel -BuildRequires: expat-devel fftw-devel freetype-devel gcc-c++ libstdc++-devel python3-devel +BuildRequires: expat-devel +BuildRequires: fftw-devel +BuildRequires: freetype-devel +BuildRequires: gcc-c++ +BuildRequires: gettext +BuildRequires: libX11-devel +BuildRequires: libXi-devel +BuildRequires: libstdc++-devel +BuildRequires: mesa-libGLw-devel +BuildRequires: pkgconfig +BuildRequires: python3-devel +BuildRequires: xorg-x11-proto-devel %else Recommends: blender-doc +BuildRequires: MesaGLw-devel +BuildRequires: gettext-tools +BuildRequires: libexpat-devel +BuildRequires: pkg-config BuildRequires: python3-devel -BuildRequires: MesaGLw-devel pkg-config xorg-x11 -BuildRequires: gettext-tools libexpat-devel update-desktop-files +BuildRequires: update-desktop-files +BuildRequires: xorg-x11 %endif # libquicktime-devel -BuildRequires: hicolor-icon-theme libao-devel libdrm-devel libpng-devel libtiff-devel libvorbis-devel ruby-devel -BuildRequires: fftw3-devel gcc-c++ glew-devel libtool openssl-devel pcre-devel xorg-x11-devel -BuildRequires: desktop-file-utils libsamplerate-devel libsndfile-devel libxml2-devel shared-mime-info yasm yasm-devel -BuildRequires: OpenEXR-devel cmake epydoc fdupes graphviz jack-audio-connection-kit-devel liblcms-devel openssl-devel -BuildRequires: SDL-devel doxygen help2man lzo-devel openal-soft-devel perl-Text-Iconv ruby xz xz-devel +BuildRequires: OpenEXR-devel +BuildRequires: SDL-devel +BuildRequires: cmake +BuildRequires: desktop-file-utils +BuildRequires: doxygen +BuildRequires: epydoc +BuildRequires: fdupes +BuildRequires: fftw3-devel +BuildRequires: gcc-c++ +BuildRequires: glew-devel +BuildRequires: graphviz +BuildRequires: help2man +BuildRequires: hicolor-icon-theme +BuildRequires: jack-audio-connection-kit-devel +BuildRequires: libao-devel +BuildRequires: libdrm-devel +BuildRequires: liblcms-devel +BuildRequires: libpng-devel +BuildRequires: libsamplerate-devel +BuildRequires: libsndfile-devel +BuildRequires: libtiff-devel +BuildRequires: libtool +BuildRequires: libvorbis-devel +BuildRequires: libxml2-devel +BuildRequires: lzo-devel +BuildRequires: openal-soft-devel +BuildRequires: openssl-devel +BuildRequires: openssl-devel +BuildRequires: pcre-devel +BuildRequires: perl-Text-Iconv +BuildRequires: ruby +BuildRequires: ruby-devel +BuildRequires: shared-mime-info +BuildRequires: xorg-x11-devel +BuildRequires: xz +BuildRequires: xz-devel +BuildRequires: yasm +BuildRequires: yasm-devel %if 0%{?fedora} >= 14 || 0%{suse_version} >= 1140 BuildRequires: libjpeg62-devel %else BuildRequires: libjpeg-devel %endif %if 0%{?collada} == 1 -BuildRequires: openCOLLADA-devel >= svn838 +BuildRequires: openCOLLADA-devel >= svn840 %endif -BuildRequires: graphviz liblcms-devel +BuildRequires: graphviz +BuildRequires: liblcms-devel %if %DISTRIBUTABLE <= 0 BuildRequires: ffmpeg-devel %endif @@ -68,11 +115,11 @@ Requires: python3-xml Name: blender +Summary: A 3D Modelling And Rendering Package License: GPL-2.0+ Group: Productivity/Graphics/3D Editors -Summary: A 3D Modelling And Rendering Package Version: 2.59 -Release: 1 +Release: 0 Url: http://www.blender.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: %{name}-%{version}.tar.bz2 @@ -98,6 +145,7 @@ Patch6: blender-2.56-svn35386.patch Patch7: blender-2.56-svn35395.patch Patch8: blender-2.57b-PYC_INTERPRETER_ACTIVE.patch +# PATCH-FIX-UPSTREAM blender-collada858.patch [email protected] -- Starting with svn858 of openCOLLADA, the headers are installed 'more normally' in /usr/include/COLLADA* instead of /usr/include/COLLADA*/include. Requires: python(abi) = 3.1 %else Requires: python(abi) = 3.2 @@ -106,6 +154,8 @@ # Patch is needed due to the purging of everything mpeg Patch10: blender-2.55-blenkernel.patch %endif +Patch11: blender-collada858.patch +Patch12: blender-gcc47.patch %description Blender is a 3D modelling and rendering package. It is the in-house @@ -128,7 +178,6 @@ %package doc Summary: Documentation for blender -License: GPL-2.0+ Group: Documentation/HTML BuildArch: noarch @@ -143,7 +192,6 @@ %package devel Summary: Include files for blender plugin development -License: GPL-2.0+ Group: Development/Libraries/C and C++ Requires: %{name} = %{version} %if 0%{?suse_version} @@ -157,6 +205,7 @@ %prep %setup -q +%global collada_ver %(rpm -q openCOLLADA-devel --qf "%%{version}" | cut -b4-) # This removes the error with python 3.1 python3-config --abiflags #%%if 0%%{?nodot3_ver} <= 031 #%%global py3_abi_kind $NULL @@ -175,6 +224,10 @@ %patch7 %patch8 %endif +%if %{collada_ver} >= 858 +%patch11 -p1 +%endif +%patch12 %if %DISTRIBUTABLE == 1 %patch10 ++++++ blender-collada858.patch ++++++ Index: blender-2.59/source/blender/collada/CMakeLists.txt =================================================================== --- blender-2.59.orig/source/blender/collada/CMakeLists.txt +++ blender-2.59/source/blender/collada/CMakeLists.txt @@ -52,11 +52,11 @@ if(APPLE) ) else() list(APPEND INC_SYS - ${OPENCOLLADA_INCLUDE_DIR}/COLLADAStreamWriter/include - ${OPENCOLLADA_INCLUDE_DIR}/COLLADABaseUtils/include - ${OPENCOLLADA_INCLUDE_DIR}/COLLADAFramework/include - ${OPENCOLLADA_INCLUDE_DIR}/COLLADASaxFrameworkLoader/include - ${OPENCOLLADA_INCLUDE_DIR}/GeneratedSaxParser/include + ${OPENCOLLADA_INCLUDE_DIR}/COLLADAStreamWriter/ + ${OPENCOLLADA_INCLUDE_DIR}/COLLADABaseUtils/ + ${OPENCOLLADA_INCLUDE_DIR}/COLLADAFramework/ + ${OPENCOLLADA_INCLUDE_DIR}/COLLADASaxFrameworkLoader/ + ${OPENCOLLADA_INCLUDE_DIR}/GeneratedSaxParser/ ) endif() ++++++ blender-gcc47.patch ++++++ Index: intern/elbeem/intern/ntl_vector3dim.h =================================================================== --- intern/elbeem/intern/ntl_vector3dim.h (revision 43999) +++ intern/elbeem/intern/ntl_vector3dim.h (revision 44000) @@ -27,6 +27,12 @@ #include <stdio.h> #include <stdlib.h> +/* absolute value */ +template < class T > +inline T +ABS( T a ) +{ return (0 < a) ? a : -a ; } + // hack for MSVC6.0 compiler #ifdef _MSC_VER #if _MSC_VER < 1300 Index: intern/elbeem/intern/utilities.h =================================================================== --- intern/elbeem/intern/utilities.h (revision 43999) +++ intern/elbeem/intern/utilities.h (revision 44000) @@ -177,12 +177,6 @@ MAX( T a, T b ) { return (a < b) ? b : a ; } -/* absolute value */ -template < class T > -inline T -ABS( T a ) -{ return (0 < a) ? a : -a ; } - /* sign of the value */ template < class T > inline T -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
