Hello community, here is the log from the commit of package blender for openSUSE:Factory checked in at 2012-10-31 13:46:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2012-08-01 06:59:35.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.blender.new/blender.changes 2012-10-31 13:46:42.000000000 +0100 @@ -1,0 +2,18 @@ +Mon Oct 29 16:08:44 UTC 2012 - [email protected] + +- Update to version 2.64a: + + See + http://www.blender.org/development/release-logs/blender-263/ + for upstream changes. +- Update fix-locale-files-path patch for 2.64 version +- Remove unneeded fedora conditional macros +- Add python3 version option on configure cmake +- Add a patch to correct python development files on Factory +- Fix build for Factory + +------------------------------------------------------------------- +Fri Sep 21 08:44:42 UTC 2012 - [email protected] + +- Add explicit glu dependency + +------------------------------------------------------------------- Old: ---- blender-2.63a.tar.gz blender-fix-locale-files-path.patch New: ---- blender-2.58-python_include.patch blender-2.64a-fix-locale-files-path.patch blender-2.64a.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ blender.spec ++++++ --- /var/tmp/diff_new_pack.SZiK7x/_old 2012-10-31 13:46:48.000000000 +0100 +++ /var/tmp/diff_new_pack.SZiK7x/_new 2012-10-31 13:46:48.000000000 +0100 @@ -15,12 +15,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - -%global __python %{__python3} - -# [Fedora] Turn off the brp-python-bytecompile script -%global __os_install_post %(echo '%{__os_install_post}' | sed -e 's!/usr/lib[^[:space:]]*/brp-python-bytecompile[[:space:]].*$!!g') - %define collada 1 %define wplayer 1 %define documentation 0 @@ -28,12 +22,10 @@ # Use rpmbuild -D 'DISTRIBUTABLE 0' to build original code. %define DISTRIBUTABLE 1 -%global svnrev 44995 - Name: blender -Version: 2.63a +Version: 2.64a Release: 0 -%define _version 2.63 +%define _version 2.64 Summary: A 3D Modelling And Rendering Package License: GPL-2.0+ Group: Productivity/Graphics/3D Editors @@ -48,21 +40,8 @@ Source6: blender.xpm Source7: x-blend.desktop Source8: blender-getversion.py -Patch0: blender-fix-locale-files-path.patch -%if 0%{?fedora} -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 +Patch0: blender-%{version}-fix-locale-files-path.patch +Patch1: blender-2.58-python_include.patch BuildRequires: gettext-tools %if 0%{?suse_version} > 1210 BuildRequires: libGLw-devel @@ -77,7 +56,6 @@ %if %documentation == 1 Recommends: blender-doc %endif -%endif # libquicktime-devel BuildRequires: OpenEXR-devel BuildRequires: SDL-devel @@ -104,6 +82,7 @@ BuildRequires: libtool BuildRequires: libvorbis-devel BuildRequires: lzo-devel +BuildRequires: libjpeg8-devel BuildRequires: openal-soft-devel BuildRequires: openssl-devel BuildRequires: openssl-devel @@ -117,12 +96,8 @@ BuildRequires: xz-devel BuildRequires: yasm BuildRequires: yasm-devel +BuildRequires: pkgconfig(glu) BuildRequires: pkgconfig(libxml-2.0) -%if 0%{?fedora} >= 14 -BuildRequires: libjpeg62-devel -%else -BuildRequires: libjpeg-devel -%endif %if 0%{?collada} == 1 BuildRequires: openCOLLADA-devel >= svn838 %endif @@ -130,9 +105,6 @@ BuildRequires: liblcms-devel # See bnc#713346 Requires: python3-xml -%if %DISTRIBUTABLE <= 0 -BuildRequires: libffmpeg-devel -%endif %description Blender is a 3D modelling and rendering package. It is the in-house @@ -173,6 +145,7 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 %if %DISTRIBUTABLE == 1 rm -rf release/scripts/presets/ffmpeg @@ -203,20 +176,17 @@ -DWITH_PYTHON:BOOL=on \ -DWITH_PYTHON_INSTALL:BOOL=off \ -DWITH_GAMEENGINE:BOOL=ON \ -%if %DISTRIBUTABLE == 1 - -DWITH_CODEC_FFMPEG:BOOL=off \ -%else - -DWITH_CODEC_FFMPEG:BOOL=on \ -%endif - -DWITH_CXX_GUARDEDALLOC:BOOL=off \ -%if %wplayer == 1 + -DWITH_CYCLES:BOOL=OFF \ -DWITH_PLAYER:BOOL=on \ -%else - -DWITH_PLAYER:BOOL=off \ -%endif -DWITH_INSTALL_PORTABLE:BOOL=OFF \ -DWITH_BUILTIN_GLEW:BOOL=OFF \ -DWITH_MOD_OCEANSIM:BOOL=OFF \ +%if 0%{?suse_version} > 1220 + -DPYTHON_VERSION=3.3 \ + -DPYTHON_LIBPATH=/usr/lib \ + -DPYTHON_LIBRARY=python3.3m \ + -DPYTHON_INCLUDE_DIRS=/usr/include/python3.3m \ +%endif -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} make %{?_smp_mflags} ++++++ blender-2.58-python_include.patch ++++++ diff -Naur blender-2.58.orig/CMakeLists.txt blender-2.58/CMakeLists.txt --- blender-2.58.orig/CMakeLists.txt 2011-08-05 14:45:26.776618379 -0500 +++ blender-2.58/CMakeLists.txt 2011-08-05 14:47:21.562887635 -0500 @@ -307,6 +307,7 @@ # Use our own instead, since wothout py is such a rare case, # require this package find_package(PythonLibsUnix REQUIRED) + set(PYTHON_INCLUDE_DIRS ${PYTHON_INCLUDE_DIR}) endif() ++++++ blender-2.64a-fix-locale-files-path.patch ++++++ Index: blender-2.64a/source/creator/CMakeLists.txt =================================================================== --- blender-2.64a.orig/source/creator/CMakeLists.txt +++ blender-2.64a/source/creator/CMakeLists.txt @@ -294,11 +294,16 @@ if(WITH_INTERNATIONAL) install( DIRECTORY - ${CMAKE_SOURCE_DIR}/release/datafiles/locale ${CMAKE_SOURCE_DIR}/release/datafiles/fonts DESTINATION ${TARGETDIR_VER}/datafiles PATTERN ".svn" EXCLUDE ) + install( + DIRECTORY + ${CMAKE_SOURCE_DIR}/release/datafiles/locale + DESTINATION ${CMAKE_INSTALL_PREFIX}/share + PATTERN ".svn" EXCLUDE + ) endif() # color management Index: blender-2.64a/release/environment-unix =================================================================== --- blender-2.64a.orig/release/environment-unix +++ blender-2.64a/release/environment-unix @@ -11,7 +11,7 @@ BLENDER_USER_BASE=${HOME}/.blender/${BLENDER_VERSION} BLENDER_SYSTEM_BASE=${BLENDER_SHARE}/${BLENDER_VERSION} BLENDER_USER_DATAFILES=${HOME}/.blender/${BLENDER_VERSION}/datafiles -BLENDER_SYSTEM_DATAFILES=${BLENDER_SHARE}/${BLENDER_VERSION}/datafiles +BLENDER_SYSTEM_DATAFILES=/usr/share BLENDER_USER_PY=${HOME}/.blender/${BLENDER_VERSION}/py BLENDER_SYSTEM_PY=${BLENDER_SHARE}/${BLENDER_VERSION}/py BLENDER_USER_PLUGINS=${HOME}/.blender/${BLENDER_VERSION}/plugins Index: blender-2.63a/source/blender/blenfont/intern/blf_lang.c =================================================================== --- blender-2.64a.orig/source/blender/blenfont/intern/blf_lang.c +++ blender-2.64a/source/blender/blenfont/intern/blf_lang.c @@ -113,17 +113,7 @@ void BLF_lang_init(void) { - char *messagepath = BLI_get_folder(BLENDER_DATAFILES, "locale"); - - BLI_strncpy(global_encoding_name, SYSTEM_ENCODING_DEFAULT, sizeof(global_encoding_name)); - - if (messagepath) { - BLI_strncpy(global_messagepath, messagepath, sizeof(global_messagepath)); - } - else { - printf("%s: 'locale' data path for translations not found, continuing\n", __func__); - global_messagepath[0] = '\0'; - } + *global_messagepath = "/usr/share/locale/"; } /* Get LANG/LANGUAGE environment variable. */ Index: blender-2.64a/source/blender/blenlib/intern/path_util.c =================================================================== --- blender-2.64a.orig/source/blender/blenlib/intern/path_util.c +++ blender-2.64a/source/blender/blenlib/intern/path_util.c @@ -983,38 +983,6 @@ char system_path[FILE_MAX]; const char *system_base_path; - - /* first allow developer only overrides to the system path - * these are only used when running blender from source */ - char cwd[FILE_MAX]; - char relfolder[FILE_MAX]; - - if (folder_name) { - if (subfolder_name) { - BLI_join_dirfile(relfolder, sizeof(relfolder), folder_name, subfolder_name); - } - else { - BLI_strncpy(relfolder, folder_name, sizeof(relfolder)); - } - } - else { - relfolder[0] = '\0'; - } - - /* try CWD/release/folder_name */ - if (BLI_current_working_dir(cwd, sizeof(cwd))) { - if (test_path(targetpath, cwd, "release", relfolder)) { - return 1; - } - } - - /* try EXECUTABLE_DIR/release/folder_name */ - if (test_path(targetpath, bprogdir, "release", relfolder)) - return 1; - /* end developer overrides */ - - - system_path[0] = '\0'; if (test_env_path(system_path, envvar)) { ++++++ blender-2.63a.tar.gz -> blender-2.64a.tar.gz ++++++ /work/SRC/openSUSE:Factory/blender/blender-2.63a.tar.gz /work/SRC/openSUSE:Factory/.blender.new/blender-2.64a.tar.gz differ: char 5, line 1 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
