diff --git a/.gitignore b/.gitignore index a48af9b..ee198fb 100644 --- a/.gitignore +++ b/.gitignore @@ -41,3 +41,4 @@ blender-2.49b-repack.tar.bz2 /blender-2.78b.tar.gz /blender-2.78b-amd-gpu-support.patch /blender-2.78c.tar.gz +/blender-2.79.tar.gz diff --git a/blender-2.76-droid.patch b/blender-2.76-droid.patch deleted file mode 100644 index a40cbed..0000000 --- a/blender-2.76-droid.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff -uNr blender-2.78c.orig/source/blender/blenfont/intern/blf_font_i18n.c blender-2.78c/source/blender/blenfont/intern/blf_font_i18n.c ---- blender-2.78c.orig/source/blender/blenfont/intern/blf_font_i18n.c 2017-02-13 06:08:03.000000000 -0800 -+++ blender-2.78c/source/blender/blenfont/intern/blf_font_i18n.c 2017-03-11 21:25:50.361053885 -0800 -@@ -57,7 +57,7 @@ - { - #ifdef WITH_INTERNATIONAL - if (unifont_ttf == NULL) { -- const char * const fontpath = BKE_appdir_folder_id(BLENDER_DATAFILES, "fonts"); -+ const char * const fontpath = "/usr/share/fonts/blender"; - if (fontpath) { - char unifont_path[1024]; - -@@ -92,7 +92,7 @@ - { - #ifdef WITH_INTERNATIONAL - if (unifont_mono_ttf == NULL) { -- const char *fontpath = BKE_appdir_folder_id(BLENDER_DATAFILES, "fonts"); -+ const char * const fontpath = "/usr/share/fonts/blender"; - if (fontpath) { - char unifont_path[1024]; - -diff -uNr blender-2.78c.orig/source/creator/CMakeLists.txt blender-2.78c/source/creator/CMakeLists.txt ---- blender-2.78c.orig/source/creator/CMakeLists.txt 2017-02-24 06:09:19.000000000 -0800 -+++ blender-2.78c/source/creator/CMakeLists.txt 2017-03-13 10:59:14.815315973 -0700 -@@ -370,9 +370,8 @@ - # localization - if(WITH_INTERNATIONAL) - install( -- DIRECTORY -- ${CMAKE_SOURCE_DIR}/release/datafiles/fonts -- DESTINATION ${TARGETDIR_VER}/datafiles -+ DIRECTORY ${CMAKE_SOURCE_DIR}/release/datafiles/fonts/ -+ DESTINATION ${CMAKE_INSTALL_PREFIX}/share/fonts/blender - ) - - set(_locale_dir "${CMAKE_SOURCE_DIR}/release/datafiles/locale") diff --git a/blender-2.78a-linux-definition-ppc64.patch b/blender-2.78a-linux-definition-ppc64.patch deleted file mode 100644 index e13792a..0000000 --- a/blender-2.78a-linux-definition-ppc64.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- blender-2.78a/extern/glog/src/stacktrace_powerpc-inl.h.debug 2016-10-24 23:13:56.000000000 +0900 -+++ blender-2.78a/extern/glog/src/stacktrace_powerpc-inl.h 2016-11-12 14:55:59.832015717 +0900 -@@ -111,10 +111,10 @@ - result[n++] = *(sp+2); - #elif defined(_CALL_SYSV) - result[n++] = *(sp+1); --#elif defined(__APPLE__) || (defined(__linux) && defined(__PPC64__)) -+#elif defined(__APPLE__) || (defined(__linux__) && defined(__PPC64__)) - // This check is in case the compiler doesn't define _CALL_AIX/etc. - result[n++] = *(sp+2); --#elif defined(__linux) -+#elif defined(__linux__) - // This check is in case the compiler doesn't define _CALL_SYSV. - result[n++] = *(sp+1); - #else diff --git a/blender-2.78a-locale.patch b/blender-2.78a-locale.patch deleted file mode 100644 index 1a59dbf..0000000 --- a/blender-2.78a-locale.patch +++ /dev/null @@ -1,78 +0,0 @@ -diff -Naur blender-2.78a.old/source/blender/blenkernel/BKE_appdir.h blender-2.78a/source/blender/blenkernel/BKE_appdir.h ---- blender-2.78a.old/source/blender/blenkernel/BKE_appdir.h 2017-01-29 23:04:06.554693018 +0100 -+++ blender-2.78a/source/blender/blenkernel/BKE_appdir.h 2017-01-29 23:08:38.102468829 +0100 -@@ -67,6 +67,7 @@ - BLENDER_SYSTEM_DATAFILES = 52, - BLENDER_SYSTEM_SCRIPTS = 53, - BLENDER_SYSTEM_PYTHON = 54, -+ BLENDER_SYSTEM_LOCALE = 55, - }; - - /* for BKE_appdir_folder_id_version only */ -diff -Naur blender-2.78a.old/source/blender/blenkernel/intern/appdir.c blender-2.78a/source/blender/blenkernel/intern/appdir.c ---- blender-2.78a.old/source/blender/blenkernel/intern/appdir.c 2017-01-29 23:04:06.556693053 +0100 -+++ blender-2.78a/source/blender/blenkernel/intern/appdir.c 2017-01-29 23:08:38.103468846 +0100 -@@ -398,6 +398,9 @@ - if (get_path_system(path, "python", subfolder, "BLENDER_SYSTEM_PYTHON", ver)) break; - return NULL; - -+ case BLENDER_SYSTEM_LOCALE: -+ BLI_strncpy(path, "/usr/share/locale", FILE_MAX); break; -+ - default: - BLI_assert(0); - break; -diff -Naur blender-2.78a.old/source/blender/blentranslation/intern/blt_lang.c blender-2.78a/source/blender/blentranslation/intern/blt_lang.c ---- blender-2.78a.old/source/blender/blentranslation/intern/blt_lang.c 2017-01-29 23:04:06.566693229 +0100 -+++ blender-2.78a/source/blender/blentranslation/intern/blt_lang.c 2017-01-29 23:08:38.104468864 +0100 -@@ -88,9 +88,9 @@ - num_locales = num_locales_menu = 0; - } - --static void fill_locales(void) -+static void fill_locales(char *locale_path) - { -- const char * const languages_path = BKE_appdir_folder_id(BLENDER_DATAFILES, "locale"); -+ const char * const languages_path = locale_path; - char languages[FILE_MAX]; - LinkNode *lines = NULL, *line; - char *str; -@@ -98,7 +98,7 @@ - - free_locales(); - -- BLI_join_dirfile(languages, FILE_MAX, languages_path, "languages"); -+ BLI_join_dirfile(languages, FILE_MAX, locale_path, "languages"); - line = lines = BLI_file_read_as_lines(languages); - - /* This whole "parsing" code is a bit weak, in that it expects strictly formatted input file... -@@ -198,7 +198,7 @@ - void BLT_lang_init(void) - { - #ifdef WITH_INTERNATIONAL -- const char * const messagepath = BKE_appdir_folder_id(BLENDER_DATAFILES, "locale"); -+ const char * const messagepath = BKE_appdir_folder_id(BLENDER_SYSTEM_LOCALE, NULL); - #endif - - /* Make sure LANG is correct and wouldn't cause std::rumtime_error. */ -@@ -231,7 +231,7 @@ - #ifdef WITH_INTERNATIONAL - if (messagepath) { - bl_locale_init(messagepath, TEXT_DOMAIN_NAME); -- fill_locales(); -+ fill_locales(messagepath); - } - else { - printf("%s: 'locale' data path for translations not found, continuing\n", __func__); -diff -Naur blender-2.78a.old/source/creator/CMakeLists.txt blender-2.78a/source/creator/CMakeLists.txt ---- blender-2.78a.old/source/creator/CMakeLists.txt 2017-01-29 23:08:17.342103709 +0100 -+++ blender-2.78a/source/creator/CMakeLists.txt 2017-01-29 23:09:04.788938173 +0100 -@@ -376,7 +376,7 @@ - ) - - set(_locale_dir "${CMAKE_SOURCE_DIR}/release/datafiles/locale") -- set(_locale_target_dir ${TARGETDIR_VER}/datafiles/locale) -+ set(_locale_target_dir ${CMAKE_INSTALL_PREFIX}/share/locale) - - file(GLOB _po_files "${_locale_dir}/po/*.po") - foreach(_po_file ${_po_files}) diff --git a/blender-2.78a-manpages.patch b/blender-2.78a-manpages.patch deleted file mode 100644 index f8a3b04..0000000 --- a/blender-2.78a-manpages.patch +++ /dev/null @@ -1,157 +0,0 @@ -diff -Naur blender-2.78a.old/doc/manpage/blenderplayer.1 blender-2.78a/doc/manpage/blenderplayer.1 ---- blender-2.78a.old/doc/manpage/blenderplayer.1 1970-01-01 01:00:00.000000000 +0100 -+++ blender-2.78a/doc/manpage/blenderplayer.1 2017-01-29 23:10:44.556692826 +0100 -@@ -0,0 +1,131 @@ -+.TH "BLENDERPLAYER" "1" "October 17, 2011" "Blender 2\&.60 (sub 0)" -+.SH "NAME" -+blenderplayer \- the blender game engine runner -+.SH "SYNOPSIS" -+usage: blenderplayer [\-w [w h l t]] [\-f [fw fh fb ff]] [\-g gamengineoptions] [\-s stereomode] [\-m aasamples] filename.blend -+.SH "DESCRIPTION" -+.B blenderplayer -+is the 3D and physics game engine -+.SH "OPTIONS" -+.PP -+.B -h -+: Prints this command summary -+.PP -+.B -w -+: display in a window -+ optional parameters -+ w = window width -+ h = window height -+ l = window left coordinate -+ t = window top coordinate -+ Note: If w or h is defined, both must be defined. -+ Also, if l or t is defined, all options must be used. -+.PP -+.B -f -+: start game in full screen mode -+ optional parameters -+ fw = full screen mode pixel width -+ fh = full screen mode pixel height -+ fb = full screen mode bits per pixel -+ ff = full screen mode frequency -+ Note: If fw or fh is defined, both must be defined. -+ Also, if fb is used, fw and fh must be used. ff requires all options. -+.PP -+.B -s -+: start player in stereo -+.PP -+ depending on the type of stereo you want: -+.PP -+ stereomode: hwpageflip -+ (Quad buffered shutter glasses) -+.PP -+ syncdoubling -+ (Above Below) -+.PP -+ sidebyside -+ (Left Right) -+.PP -+ anaglyph -+ (Red\-Blue glasses) -+.PP -+ vinterlace -+ (Vertical interlace for autostereo display) -+.PP -+.B -D -+: start player in dome mode -+.PP -+ Optional parameters: -+.PP -+ angle = field of view in degrees -+.PP -+ tilt = tilt angle in degrees -+.PP -+ warpdata = a file to use for warping the image (absolute path) -+.PP -+ mode = fisheye (Fisheye), truncatedfront (Front\-Truncated), -+ truncatedrear (Rear\-Truncated), cubemap(Cube Map), -+ sphericalpanoramic (Spherical Panoramic) -+.PP -+ depending on the type of dome you are using -+.PP -+.B -m -+: maximum anti-aliasing (eg. 2,4,8,16) -+.PP -+.B -i -+: parent windows ID -+.PP -+.B -d -+: turn debugging on -+.PP -+.B -g -+: game engine options -+.RS 4 -+.TP 29 -+Name -+Default Description -+.TP -+--------------------------- -+------------------------------------ -+.TP -+fixedtime -+0 "Enable all frames" -+.TP -+nomipmap -+0 Disable mipmaps -+.TP -+show_framerate -+0 Show the frame rate -+.TP -+show_properties -+0 Show debug properties -+.TP -+show_profile -+0 Show profiling information -+.TP -+blender_material -+0 Enable material settings -+.TP -+ignore_deprecation_warnings -+1 Ignore deprecation warnings -+.RE -+.PP -+.B - -+: all arguments after this are ignored, allowing python to access them from sys.argv -+.SH "EXAMPLES" -+.TP -+.B blenderplayer -w 320 200 10 10 -g noaudio //home//user//filename.blend -+Launch blenderplayer in window mode with size 320x200 at 10 pixels from left and 10 pixels -+from top of the screen without audio. -+.TP -+.B blenderplayer -g show_framerate = 0 //home//user//filename.blend -+Disable framerate reports. -+.TP -+.B blenderplayer -i 232421 -m 16 //home//user//filename.blend -+Launch blenderplayer embedded in an existing window and set antialiasing to 16. -+ -+.SH "SEE ALSO" -+.B blender(1) -+ -+.br -+.SH AUTHORS -+This manpage was written for a Debian by Kevin Roy . -diff -Naur blender-2.78a.old/source/creator/CMakeLists.txt blender-2.78a/source/creator/CMakeLists.txt ---- blender-2.78a.old/source/creator/CMakeLists.txt 2017-01-29 23:10:25.810363127 +0100 -+++ blender-2.78a/source/creator/CMakeLists.txt 2017-01-29 23:10:44.556692826 +0100 -@@ -480,6 +480,7 @@ - FILES - ${CMAKE_SOURCE_DIR}/release/freedesktop/blender.desktop - ${CMAKE_SOURCE_DIR}/release/freedesktop/icons/scalable/apps/blender.svg -+ ${CMAKE_SOURCE_DIR}/doc/manpage/blenderplayer.1 - DESTINATION "." - ) - -@@ -502,6 +503,10 @@ - FILES ${CMAKE_CURRENT_BINARY_DIR}/blender.1 - DESTINATION share/man/man1 - ) -+ install( -+ FILES ${CMAKE_SOURCE_DIR}/doc/manpage/blenderplayer.1 -+ DESTINATION share/man/man1 -+ ) - endif() - - # misc files diff --git a/blender-2.78a-scripts.patch b/blender-2.78a-scripts.patch deleted file mode 100644 index c7397c2..0000000 --- a/blender-2.78a-scripts.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -Naur blender-2.78a.old/source/creator/CMakeLists.txt blender-2.78a/source/creator/CMakeLists.txt ---- blender-2.78a.old/source/creator/CMakeLists.txt 2017-01-29 23:06:07.131813650 +0100 -+++ blender-2.78a/source/creator/CMakeLists.txt 2017-01-29 23:06:33.772282188 +0100 -@@ -353,8 +353,8 @@ - endif() - - install( -- DIRECTORY ${CMAKE_SOURCE_DIR}/release/scripts -- DESTINATION ${TARGETDIR_VER} -+ DIRECTORY ${CMAKE_SOURCE_DIR}/release/scripts/ -+ DESTINATION ${CMAKE_INSTALL_PREFIX}/share/blender/scripts/ - PATTERN ".git" EXCLUDE - PATTERN ".gitignore" EXCLUDE - PATTERN ".arcconfig" EXCLUDE diff --git a/blender-2.78a-thumbnailer.patch b/blender-2.78a-thumbnailer.patch deleted file mode 100644 index 618bb72..0000000 --- a/blender-2.78a-thumbnailer.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -Naur blender-2.78a.old/blender.thumbnailer blender-2.78a/blender.thumbnailer ---- blender-2.78a.old/blender.thumbnailer 1970-01-01 01:00:00.000000000 +0100 -+++ blender-2.78a/blender.thumbnailer 2017-01-29 23:04:47.528413638 +0100 -@@ -0,0 +1,4 @@ -+[Thumbnailer Entry] -+TryExec=/usr/share/blender/scripts/blender-thumbnailer.py -+Exec=/usr/share/blender/scripts/blender-thumbnailer.py %i %o -+MimeType=application/x-blender; -diff -Naur blender-2.78a.old/source/creator/CMakeLists.txt blender-2.78a/source/creator/CMakeLists.txt ---- blender-2.78a.old/source/creator/CMakeLists.txt 2017-01-29 23:04:25.162020270 +0100 -+++ blender-2.78a/source/creator/CMakeLists.txt 2017-01-29 23:04:47.529413656 +0100 -@@ -526,7 +526,7 @@ - ) - install( - PROGRAMS ${CMAKE_SOURCE_DIR}/release/bin/blender-thumbnailer.py -- DESTINATION bin -+ DESTINATION ${CMAKE_INSTALL_PREFIX}/share/blender/scripts - ) - set(BLENDER_TEXT_FILES_DESTINATION share/doc/blender) - endif() diff --git a/blender-2.78a-unversioned-system-path.patch b/blender-2.78a-unversioned-system-path.patch deleted file mode 100644 index c788c9d..0000000 --- a/blender-2.78a-unversioned-system-path.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -Naur blender-2.78a.old/intern/ghost/intern/GHOST_SystemPathsUnix.cpp blender-2.78a/intern/ghost/intern/GHOST_SystemPathsUnix.cpp ---- blender-2.78a.old/intern/ghost/intern/GHOST_SystemPathsUnix.cpp 2017-01-29 23:04:06.462691400 +0100 -+++ blender-2.78a/intern/ghost/intern/GHOST_SystemPathsUnix.cpp 2017-01-29 23:12:27.057495546 +0100 -@@ -61,6 +61,9 @@ - - const GHOST_TUns8 *GHOST_SystemPathsUnix::getSystemDir(int, const char *versionstr) const - { -+ /* ignore versionstr when building the system path */ -+ versionstr = ""; -+ - /* no prefix assumes a portable build which only uses bundled scripts */ - if (static_path) { - static string system_path = string(static_path) + "/blender/" + versionstr; -diff -Naur blender-2.78a.old/source/creator/CMakeLists.txt blender-2.78a/source/creator/CMakeLists.txt ---- blender-2.78a.old/source/creator/CMakeLists.txt 2017-01-29 23:12:09.267182657 +0100 -+++ blender-2.78a/source/creator/CMakeLists.txt 2017-01-29 23:12:27.058495563 +0100 -@@ -306,7 +306,7 @@ - if(WITH_INSTALL_PORTABLE) - set(TARGETDIR_VER ${BLENDER_VERSION}) - else() -- set(TARGETDIR_VER share/blender/${BLENDER_VERSION}) -+ set(TARGETDIR_VER share/blender) - endif() - endif() - diff --git a/blender-2.78b-amd-gpu-support.patch b/blender-2.78b-amd-gpu-support.patch deleted file mode 100644 index d3568cf..0000000 --- a/blender-2.78b-amd-gpu-support.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -ru blender-2.78b.orig/source/blender/gpu/intern/gpu_extensions.c blender-2.78b/source/blender/gpu/intern/gpu_extensions.c ---- blender-2.78b.orig/source/blender/gpu/intern/gpu_extensions.c 2017-02-09 01:49:32.000000000 -0800 -+++ blender-2.78b/source/blender/gpu/intern/gpu_extensions.c 2017-02-24 23:28:45.158724978 -0800 -@@ -173,7 +173,10 @@ - GG.device = GPU_DEVICE_INTEL; - GG.driver = GPU_DRIVER_OFFICIAL; - } -- else if (strstr(renderer, "Mesa DRI R") || (strstr(renderer, "Gallium ") && strstr(renderer, " on ATI "))) { -+ else if ((strstr(renderer, "Mesa DRI R")) || -+ (strstr(renderer, "Gallium ") && strstr(renderer, " on ATI ")) || -+ (strstr(renderer, "Gallium ") && strstr(renderer, " on AMD "))) -+ { - GG.device = GPU_DEVICE_ATI; - GG.driver = GPU_DRIVER_OPENSOURCE; - } diff --git a/blender-2.78c-openvdb3-abi.patch b/blender-2.78c-openvdb3-abi.patch deleted file mode 100644 index 593c75e..0000000 --- a/blender-2.78c-openvdb3-abi.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -Naur blender-2.78c.old/CMakeLists.txt blender-2.78c/CMakeLists.txt ---- blender-2.78c.old/CMakeLists.txt 2017-04-24 09:21:40.471125097 +0200 -+++ blender-2.78c/CMakeLists.txt 2017-04-24 09:26:45.583477649 +0200 -@@ -250,6 +250,10 @@ - option(WITH_OPENVDB "Enable features relying on OpenVDB" OFF) - option(WITH_OPENVDB_BLOSC "Enable blosc compression for OpenVDB, only enable if OpenVDB was built with blosc support" OFF) - -+if(WITH_OPENVDB) -+ add_definitions(-DOPENVDB_3_ABI_COMPATIBLE) -+endif() -+ - # GHOST Windowing Library Options - option(WITH_GHOST_DEBUG "Enable debugging output for the GHOST library" OFF) - mark_as_advanced(WITH_GHOST_DEBUG) diff --git a/blender-2.79-droid.patch b/blender-2.79-droid.patch new file mode 100644 index 0000000..ec5f101 --- /dev/null +++ b/blender-2.79-droid.patch @@ -0,0 +1,36 @@ +diff -Naur blender-2.79.old/source/blender/blenfont/intern/blf_font_i18n.c blender-2.79/source/blender/blenfont/intern/blf_font_i18n.c +--- blender-2.79.old/source/blender/blenfont/intern/blf_font_i18n.c 2017-09-11 06:34:59.000000000 +0200 ++++ blender-2.79/source/blender/blenfont/intern/blf_font_i18n.c 2017-09-12 14:12:51.239473283 +0200 +@@ -57,7 +57,7 @@ + { + #ifdef WITH_INTERNATIONAL + if (unifont_ttf == NULL) { +- const char * const fontpath = BKE_appdir_folder_id(BLENDER_DATAFILES, "fonts"); ++ const char * const fontpath = "/usr/share/fonts/blender"; + if (fontpath) { + char unifont_path[1024]; + +@@ -92,7 +92,7 @@ + { + #ifdef WITH_INTERNATIONAL + if (unifont_mono_ttf == NULL) { +- const char *fontpath = BKE_appdir_folder_id(BLENDER_DATAFILES, "fonts"); ++ const char * const fontpath = "/usr/share/fonts/blender"; + if (fontpath) { + char unifont_path[1024]; + +diff -Naur blender-2.79.old/source/creator/CMakeLists.txt blender-2.79/source/creator/CMakeLists.txt +--- blender-2.79.old/source/creator/CMakeLists.txt 2017-09-12 05:44:18.000000000 +0200 ++++ blender-2.79/source/creator/CMakeLists.txt 2017-09-12 14:12:51.239473283 +0200 +@@ -359,9 +359,8 @@ + # localization + if(WITH_INTERNATIONAL) + install( +- DIRECTORY +- ${CMAKE_SOURCE_DIR}/release/datafiles/fonts +- DESTINATION ${TARGETDIR_VER}/datafiles ++ DIRECTORY ${CMAKE_SOURCE_DIR}/release/datafiles/fonts/ ++ DESTINATION ${CMAKE_INSTALL_PREFIX}/share/fonts/blender + ) + + set(_locale_dir "${CMAKE_SOURCE_DIR}/release/datafiles/locale") diff --git a/blender-2.79-locale.patch b/blender-2.79-locale.patch new file mode 100644 index 0000000..a57e9f2 --- /dev/null +++ b/blender-2.79-locale.patch @@ -0,0 +1,78 @@ +diff -Naur blender-2.79.old/source/blender/blenkernel/BKE_appdir.h blender-2.79/source/blender/blenkernel/BKE_appdir.h +--- blender-2.79.old/source/blender/blenkernel/BKE_appdir.h 2017-09-12 05:44:17.000000000 +0200 ++++ blender-2.79/source/blender/blenkernel/BKE_appdir.h 2017-09-12 14:18:41.069008086 +0200 +@@ -71,6 +71,7 @@ + BLENDER_SYSTEM_DATAFILES = 52, + BLENDER_SYSTEM_SCRIPTS = 53, + BLENDER_SYSTEM_PYTHON = 54, ++ BLENDER_SYSTEM_LOCALE = 55, + }; + + /* for BKE_appdir_folder_id_version only */ +diff -Naur blender-2.79.old/source/blender/blenkernel/intern/appdir.c blender-2.79/source/blender/blenkernel/intern/appdir.c +--- blender-2.79.old/source/blender/blenkernel/intern/appdir.c 2017-09-12 05:44:17.000000000 +0200 ++++ blender-2.79/source/blender/blenkernel/intern/appdir.c 2017-09-12 14:18:41.070008105 +0200 +@@ -421,6 +421,9 @@ + if (get_path_system(path, path_len, "python", subfolder, "BLENDER_SYSTEM_PYTHON", ver)) break; + return NULL; + ++ case BLENDER_SYSTEM_LOCALE: ++ BLI_strncpy(path, "/usr/share/locale", FILE_MAX); break; ++ + default: + BLI_assert(0); + break; +diff -Naur blender-2.79.old/source/blender/blentranslation/intern/blt_lang.c blender-2.79/source/blender/blentranslation/intern/blt_lang.c +--- blender-2.79.old/source/blender/blentranslation/intern/blt_lang.c 2017-09-11 06:34:59.000000000 +0200 ++++ blender-2.79/source/blender/blentranslation/intern/blt_lang.c 2017-09-12 14:18:41.070008105 +0200 +@@ -88,9 +88,9 @@ + num_locales = num_locales_menu = 0; + } + +-static void fill_locales(void) ++static void fill_locales(char *locale_path) + { +- const char * const languages_path = BKE_appdir_folder_id(BLENDER_DATAFILES, "locale"); ++ const char * const languages_path = locale_path; + char languages[FILE_MAX]; + LinkNode *lines = NULL, *line; + char *str; +@@ -98,7 +98,7 @@ + + free_locales(); + +- BLI_join_dirfile(languages, FILE_MAX, languages_path, "languages"); ++ BLI_join_dirfile(languages, FILE_MAX, locale_path, "languages"); + line = lines = BLI_file_read_as_lines(languages); + + /* This whole "parsing" code is a bit weak, in that it expects strictly formatted input file... +@@ -198,7 +198,7 @@ + void BLT_lang_init(void) + { + #ifdef WITH_INTERNATIONAL +- const char * const messagepath = BKE_appdir_folder_id(BLENDER_DATAFILES, "locale"); ++ const char * const messagepath = BKE_appdir_folder_id(BLENDER_SYSTEM_LOCALE, NULL); + #endif + + /* Make sure LANG is correct and wouldn't cause std::rumtime_error. */ +@@ -231,7 +231,7 @@ + #ifdef WITH_INTERNATIONAL + if (messagepath) { + bl_locale_init(messagepath, TEXT_DOMAIN_NAME); +- fill_locales(); ++ fill_locales(messagepath); + } + else { + printf("%s: 'locale' data path for translations not found, continuing\n", __func__); +diff -Naur blender-2.79.old/source/creator/CMakeLists.txt blender-2.79/source/creator/CMakeLists.txt +--- blender-2.79.old/source/creator/CMakeLists.txt 2017-09-12 14:18:20.233618882 +0200 ++++ blender-2.79/source/creator/CMakeLists.txt 2017-09-12 14:18:41.070008105 +0200 +@@ -364,7 +364,7 @@ + ) + + set(_locale_dir "${CMAKE_SOURCE_DIR}/release/datafiles/locale") +- set(_locale_target_dir ${TARGETDIR_VER}/datafiles/locale) ++ set(_locale_target_dir ${CMAKE_INSTALL_PREFIX}/share/locale) + + file(GLOB _po_files "${_locale_dir}/po/*.po") + foreach(_po_file ${_po_files}) diff --git a/blender-2.79-manpages.patch b/blender-2.79-manpages.patch new file mode 100644 index 0000000..c180a8e --- /dev/null +++ b/blender-2.79-manpages.patch @@ -0,0 +1,157 @@ +diff -Naur blender-2.79.old/doc/manpage/blenderplayer.1 blender-2.79/doc/manpage/blenderplayer.1 +--- blender-2.79.old/doc/manpage/blenderplayer.1 1970-01-01 01:00:00.000000000 +0100 ++++ blender-2.79/doc/manpage/blenderplayer.1 2017-09-12 14:20:26.719981643 +0200 +@@ -0,0 +1,131 @@ ++.TH "BLENDERPLAYER" "1" "October 17, 2011" "Blender 2\&.60 (sub 0)" ++.SH "NAME" ++blenderplayer \- the blender game engine runner ++.SH "SYNOPSIS" ++usage: blenderplayer [\-w [w h l t]] [\-f [fw fh fb ff]] [\-g gamengineoptions] [\-s stereomode] [\-m aasamples] filename.blend ++.SH "DESCRIPTION" ++.B blenderplayer ++is the 3D and physics game engine ++.SH "OPTIONS" ++.PP ++.B -h ++: Prints this command summary ++.PP ++.B -w ++: display in a window ++ optional parameters ++ w = window width ++ h = window height ++ l = window left coordinate ++ t = window top coordinate ++ Note: If w or h is defined, both must be defined. ++ Also, if l or t is defined, all options must be used. ++.PP ++.B -f ++: start game in full screen mode ++ optional parameters ++ fw = full screen mode pixel width ++ fh = full screen mode pixel height ++ fb = full screen mode bits per pixel ++ ff = full screen mode frequency ++ Note: If fw or fh is defined, both must be defined. ++ Also, if fb is used, fw and fh must be used. ff requires all options. ++.PP ++.B -s ++: start player in stereo ++.PP ++ depending on the type of stereo you want: ++.PP ++ stereomode: hwpageflip ++ (Quad buffered shutter glasses) ++.PP ++ syncdoubling ++ (Above Below) ++.PP ++ sidebyside ++ (Left Right) ++.PP ++ anaglyph ++ (Red\-Blue glasses) ++.PP ++ vinterlace ++ (Vertical interlace for autostereo display) ++.PP ++.B -D ++: start player in dome mode ++.PP ++ Optional parameters: ++.PP ++ angle = field of view in degrees ++.PP ++ tilt = tilt angle in degrees ++.PP ++ warpdata = a file to use for warping the image (absolute path) ++.PP ++ mode = fisheye (Fisheye), truncatedfront (Front\-Truncated), ++ truncatedrear (Rear\-Truncated), cubemap(Cube Map), ++ sphericalpanoramic (Spherical Panoramic) ++.PP ++ depending on the type of dome you are using ++.PP ++.B -m ++: maximum anti-aliasing (eg. 2,4,8,16) ++.PP ++.B -i ++: parent windows ID ++.PP ++.B -d ++: turn debugging on ++.PP ++.B -g ++: game engine options ++.RS 4 ++.TP 29 ++Name ++Default Description ++.TP ++--------------------------- ++------------------------------------ ++.TP ++fixedtime ++0 "Enable all frames" ++.TP ++nomipmap ++0 Disable mipmaps ++.TP ++show_framerate ++0 Show the frame rate ++.TP ++show_properties ++0 Show debug properties ++.TP ++show_profile ++0 Show profiling information ++.TP ++blender_material ++0 Enable material settings ++.TP ++ignore_deprecation_warnings ++1 Ignore deprecation warnings ++.RE ++.PP ++.B - ++: all arguments after this are ignored, allowing python to access them from sys.argv ++.SH "EXAMPLES" ++.TP ++.B blenderplayer -w 320 200 10 10 -g noaudio //home//user//filename.blend ++Launch blenderplayer in window mode with size 320x200 at 10 pixels from left and 10 pixels ++from top of the screen without audio. ++.TP ++.B blenderplayer -g show_framerate = 0 //home//user//filename.blend ++Disable framerate reports. ++.TP ++.B blenderplayer -i 232421 -m 16 //home//user//filename.blend ++Launch blenderplayer embedded in an existing window and set antialiasing to 16. ++ ++.SH "SEE ALSO" ++.B blender(1) ++ ++.br ++.SH AUTHORS ++This manpage was written for a Debian by Kevin Roy . +diff -Naur blender-2.79.old/source/creator/CMakeLists.txt blender-2.79/source/creator/CMakeLists.txt +--- blender-2.79.old/source/creator/CMakeLists.txt 2017-09-12 14:20:11.165691089 +0200 ++++ blender-2.79/source/creator/CMakeLists.txt 2017-09-12 14:20:26.719981643 +0200 +@@ -468,6 +468,7 @@ + FILES + ${CMAKE_SOURCE_DIR}/release/freedesktop/blender.desktop + ${CMAKE_SOURCE_DIR}/release/freedesktop/icons/scalable/apps/blender.svg ++ ${CMAKE_SOURCE_DIR}/doc/manpage/blenderplayer.1 + DESTINATION "." + ) + +@@ -490,6 +491,10 @@ + FILES ${CMAKE_CURRENT_BINARY_DIR}/blender.1 + DESTINATION share/man/man1 + ) ++ install( ++ FILES ${CMAKE_SOURCE_DIR}/doc/manpage/blenderplayer.1 ++ DESTINATION share/man/man1 ++ ) + endif() + + # misc files diff --git a/blender-2.79-openvdb3-abi.patch b/blender-2.79-openvdb3-abi.patch new file mode 100644 index 0000000..7a6d5ea --- /dev/null +++ b/blender-2.79-openvdb3-abi.patch @@ -0,0 +1,14 @@ +diff -Naur blender-2.79.old/CMakeLists.txt blender-2.79/CMakeLists.txt +--- blender-2.79.old/CMakeLists.txt 2017-09-12 05:44:17.000000000 +0200 ++++ blender-2.79/CMakeLists.txt 2017-09-12 14:25:57.685127782 +0200 +@@ -252,6 +252,10 @@ + option(WITH_OPENVDB "Enable features relying on OpenVDB" OFF) + option(WITH_OPENVDB_BLOSC "Enable blosc compression for OpenVDB, only enable if OpenVDB was built with blosc support" OFF) + ++if(WITH_OPENVDB) ++ add_definitions(-DOPENVDB_3_ABI_COMPATIBLE) ++endif() ++ + # GHOST Windowing Library Options + option(WITH_GHOST_DEBUG "Enable debugging output for the GHOST library" OFF) + mark_as_advanced(WITH_GHOST_DEBUG) diff --git a/blender-2.79-scripts.patch b/blender-2.79-scripts.patch new file mode 100644 index 0000000..7f0aa4b --- /dev/null +++ b/blender-2.79-scripts.patch @@ -0,0 +1,14 @@ +diff -Naur blender-2.79.old/source/creator/CMakeLists.txt blender-2.79/source/creator/CMakeLists.txt +--- blender-2.79.old/source/creator/CMakeLists.txt 2017-09-12 14:17:03.361182908 +0200 ++++ blender-2.79/source/creator/CMakeLists.txt 2017-09-12 14:17:22.264536022 +0200 +@@ -342,8 +342,8 @@ + endif() + + install( +- DIRECTORY ${CMAKE_SOURCE_DIR}/release/scripts +- DESTINATION ${TARGETDIR_VER} ++ DIRECTORY ${CMAKE_SOURCE_DIR}/release/scripts/ ++ DESTINATION ${CMAKE_INSTALL_PREFIX}/share/blender/scripts/ + PATTERN ".git" EXCLUDE + PATTERN ".gitignore" EXCLUDE + PATTERN ".arcconfig" EXCLUDE diff --git a/blender-2.79-thumbnailer.patch b/blender-2.79-thumbnailer.patch new file mode 100644 index 0000000..59a71fb --- /dev/null +++ b/blender-2.79-thumbnailer.patch @@ -0,0 +1,20 @@ +diff -Naur blender-2.79.old/blender.thumbnailer blender-2.79/blender.thumbnailer +--- blender-2.79.old/blender.thumbnailer 1970-01-01 01:00:00.000000000 +0100 ++++ blender-2.79/blender.thumbnailer 2017-09-12 14:14:51.034711054 +0200 +@@ -0,0 +1,4 @@ ++[Thumbnailer Entry] ++TryExec=/usr/share/blender/scripts/blender-thumbnailer.py ++Exec=/usr/share/blender/scripts/blender-thumbnailer.py %i %o ++MimeType=application/x-blender; +diff -Naur blender-2.79.old/source/creator/CMakeLists.txt blender-2.79/source/creator/CMakeLists.txt +--- blender-2.79.old/source/creator/CMakeLists.txt 2017-09-12 14:15:10.335071584 +0200 ++++ blender-2.79/source/creator/CMakeLists.txt 2017-09-12 14:14:51.034711054 +0200 +@@ -514,7 +514,7 @@ + ) + install( + PROGRAMS ${CMAKE_SOURCE_DIR}/release/bin/blender-thumbnailer.py +- DESTINATION bin ++ DESTINATION ${CMAKE_INSTALL_PREFIX}/share/blender/scripts + ) + set(BLENDER_TEXT_FILES_DESTINATION share/doc/blender) + endif() diff --git a/blender-2.79-unversioned-system-path.patch b/blender-2.79-unversioned-system-path.patch new file mode 100644 index 0000000..0818fd2 --- /dev/null +++ b/blender-2.79-unversioned-system-path.patch @@ -0,0 +1,25 @@ +diff -Naur blender-2.79.old/intern/ghost/intern/GHOST_SystemPathsUnix.cpp blender-2.79/intern/ghost/intern/GHOST_SystemPathsUnix.cpp +--- blender-2.79.old/intern/ghost/intern/GHOST_SystemPathsUnix.cpp 2017-09-12 14:49:10.055232962 +0200 ++++ blender-2.79/intern/ghost/intern/GHOST_SystemPathsUnix.cpp 2017-09-12 14:50:46.149035501 +0200 +@@ -61,6 +61,9 @@ + + const GHOST_TUns8 *GHOST_SystemPathsUnix::getSystemDir(int, const char *versionstr) const + { ++ /* ignore versionstr when building the system path */ ++ versionstr = ""; ++ + /* no prefix assumes a portable build which only uses bundled scripts */ + if (static_path) { + static string system_path = string(static_path) + "/blender/" + versionstr; +diff -Naur blender-2.79.old/source/creator/CMakeLists.txt blender-2.79/source/creator/CMakeLists.txt +--- blender-2.79.old/source/creator/CMakeLists.txt 2017-09-12 14:49:10.243236700 +0200 ++++ blender-2.79/source/creator/CMakeLists.txt 2017-09-12 14:50:46.149035501 +0200 +@@ -295,7 +295,7 @@ + if(WITH_INSTALL_PORTABLE) + set(TARGETDIR_VER ${BLENDER_VERSION}) + else() +- set(TARGETDIR_VER share/blender/${BLENDER_VERSION}) ++ set(TARGETDIR_VER share/blender) + endif() + endif() + diff --git a/blender.spec b/blender.spec index 652d2dc..405d676 100644 --- a/blender.spec +++ b/blender.spec @@ -1,4 +1,4 @@ -%global blender_api 2.78 +%global blender_api 2.79 # 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') @@ -17,8 +17,8 @@ Name: blender Epoch: 1 -Version: %{blender_api}c -Release: 6%{?dist} +Version: %{blender_api} +Release: 1%{?dist} Summary: 3D modeling, animation, rendering and post-production License: GPLv2 @@ -30,20 +30,13 @@ Source5: %{name}.xml Source6: %{name}.appdata.xml Source10: macros.%{name} -Patch0: %{name}-2.76-droid.patch -Patch1: %{name}-2.78a-thumbnailer.patch -Patch2: %{name}-2.78a-scripts.patch -Patch3: %{name}-2.78a-locale.patch -Patch4: %{name}-2.78a-manpages.patch -Patch5: %{name}-2.78a-unversioned-system-path.patch - -# For ppc64le build, currently being discussed on -# https://lists.blender.org/pipermail/bf-committers/2016-November/047844.html -Patch6: %{name}-2.78a-linux-definition-ppc64.patch -# GPU: Consider latest Gallium driver an official ATI/AMD -# https://developer.blender.org/rB927a168b077fa5182168068315c4fb0ea998edb6 -Patch7: %{name}-2.78b-amd-gpu-support.patch -Patch8: %{name}-2.78c-openvdb3-abi.patch +Patch0: %{name}-2.79-droid.patch +Patch1: %{name}-2.79-thumbnailer.patch +Patch2: %{name}-2.79-scripts.patch +Patch3: %{name}-2.79-locale.patch +Patch4: %{name}-2.79-manpages.patch +Patch5: %{name}-2.79-unversioned-system-path.patch +Patch6: %{name}-2.79-openvdb3-abi.patch # Development stuff BuildRequires: boost-devel @@ -298,6 +291,9 @@ fi %{_fontbasedir}/%{name}/ %changelog +* Wed Sep 13 2017 Simone Caronni - 1:2.79-1 +- Update to 2.79. + * Tue Sep 12 2017 Simone Caronni - 1:2.78c-6 - Rebuild for updated OpenVDB 4.0.2 update. diff --git a/sources b/sources index 722f9c9..7f4aff7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (blender-2.78c.tar.gz) = dee09e6ac19c4eeab71d64ad9581df1bb043a3de97586206b07aeb9aa55e68ecfc3a96d39835bcec20c72fb73a5eb418b349af7abe66d906a1e660caa1e4d267 +SHA512 (blender-2.79.tar.gz) = 9b81c41882f4e150476ebda5b301b78c2d35ea918394c8a01671fc031f7cb7a34b5a3d68b6a345f6d23fd9ecedd25bc0bd24f9f9b3ec771237ac4496bbde7d2f