- up to 2.76

diff --git a/blender-2.67b-rna.patch b/blender-2.67b-rna.patch
new file mode 100644 (file)
index 0000000..9915720
--- /dev/null
+++ b/blender-2.67b-rna.patch
@@ -0,0 +1,23 @@
+diff -up blender-2.67b/source/blender/makesrna/intern/rna_access.c.rna blender-2.67b/source/blender/makesrna/intern/rna_access.c
+--- blender-2.67b/source/blender/makesrna/intern/rna_access.c.rna      2013-05-16 12:43:18.000000000 +0200
++++ blender-2.67b/source/blender/makesrna/intern/rna_access.c  2013-06-14 16:35:39.263926932 +0200
+@@ -1273,13 +1273,15 @@ void RNA_property_enum_items_gettexted(b
+                       int totitem = 0;
+ 
+                       /* count */
+-                      for (i = 0; (*item)[i].identifier; i++)
+-                              totitem++;
++                      if (*item)
++                        for (i = 0; (*item)[i].identifier; i++)
++                          totitem++;
+ 
+                       nitem = MEM_callocN(sizeof(EnumPropertyItem) * (totitem + 1), "enum_items_gettexted");
+ 
+-                      for (i = 0; (*item)[i].identifier; i++)
+-                              nitem[i] = (*item)[i];
++                      if (*item)
++                        for (i = 0; (*item)[i].identifier; i++)
++                          nitem[i] = (*item)[i];
+ 
+                       *free = TRUE;
+               }

diff --git a/blender-2.76-droid.patch b/blender-2.76-droid.patch
new file mode 100644 (file)
index 0000000..e351dbe
--- /dev/null
+++ b/blender-2.76-droid.patch
@@ -0,0 +1,21 @@
+diff -uNr blender-2.76.orig/source/blender/blenfont/intern/blf_font_i18n.c blender-2.76/source/blender/blenfont/intern/blf_font_i18n.c
+--- blender-2.76.orig/source/blender/blenfont/intern/blf_font_i18n.c   2015-10-10 10:20:56.000000000 +0200
++++ blender-2.76/source/blender/blenfont/intern/blf_font_i18n.c        2015-10-12 16:40:42.225473358 +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 *fontpath = "/usr/share/fonts/blender";
+               if (fontpath) {
+                       char unifont_path[1024];
+ 

diff --git a/blender-noxml-yafray.patch b/blender-noxml-yafray.patch
deleted file mode 100644 (file)
index 4ff4b26..0000000
--- a/blender-noxml-yafray.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN blender/source/blender/src/buttons_scene.c blender.new/source/blender/src/buttons_scene.c
---- blender/source/blender/src/buttons_scene.c 2006-01-06 13:37:45.000000000 +0100
-+++ blender.new/source/blender/src/buttons_scene.c     2006-04-13 18:11:55.000000000 +0200
-@@ -1392,7 +1392,7 @@
-       // label to force a boundbox for buttons not to be centered
-       uiDefBut(block, LABEL, 0, " ", 305,180,10,10, 0, 0, 0, 0, 0, "");
- 
--      uiDefButBitS(block, TOGN, 1, B_REDR, "xml", 5,180,75,20, &G.scene->r.YFexportxml,
-+      uiDefButBitS(block, TOG, 1, B_REDR, "xml", 5,180,75,20, &G.scene->r.YFexportxml,
-                                       0, 0, 0, 0, "Export to an xml file and call yafray instead of plugin");
- 
-       uiDefButF(block, NUMSLI, B_DIFF,"Bi ", 5,35,150,20,     &(G.scene->r.YF_raybias), 

diff --git a/blender-po_and_locale_names.patch b/blender-po_and_locale_names.patch
deleted file mode 100644 (file)
index adfa776..0000000
--- a/blender-po_and_locale_names.patch
+++ /dev/null
@@ -1,388 +0,0 @@
-diff -urN blender-2.46/po/ca.po blender-2.46.new/po/ca.po
---- blender-2.46/po/ca.po      2008-05-19 16:40:14.000000000 +0200
-+++ blender-2.46.new/po/ca.po  2008-05-30 22:10:09.000000000 +0200
-@@ -1,6 +1,17 @@
- # Copyright (C) 2003 Free Software Foundation, Inc.
- # Est. 2003.
--#
-+# translation to Catalan
-+msgid ""
-+msgstr ""
-+""
-+"Last-Translator: UNKNOWN\n"
-+"PO-Revision-Date: 2003-04-19 21:47+0200\n"
-+"Project-Id-Version: blender 2.32\n"
-+"Language-Team: Catalan\n"
-+"MIME-Version: 1.0\n"
-+"Content-Type: text/plain; charset=UTF-8\n"
-+"Content-Transfer-Encoding: 8bit\n"
-+
- 
- ###########################################################
- ###
-diff -urN blender-2.46/po/es.po blender-2.46.new/po/es.po
---- blender-2.46/po/es.po      2008-05-19 16:40:14.000000000 +0200
-+++ blender-2.46.new/po/es.po  2008-05-30 22:11:26.000000000 +0200
-@@ -1,6 +1,17 @@
- # Copyright (C) 2003 Free Software Foundation, Inc.
- # Est. 2003.
--#
-+# translation to Spanish
-+msgid ""
-+msgstr ""
-+""
-+"Last-Translator: UNKNOWN\n"
-+"PO-Revision-Date: 2003-04-19 21:47+0200\n"
-+"Project-Id-Version: blender 2.32\n"
-+"Language-Team: Spanish\n"
-+"MIME-Version: 1.0\n"
-+"Content-Type: text/plain; charset=UTF-8\n"
-+"Content-Transfer-Encoding: 8bit\n"
-+
- 
- ###########################################################
- ###
-diff -urN blender-2.46/po/fi.po blender-2.46.new/po/fi.po
---- blender-2.46/po/fi.po      2008-05-19 16:40:14.000000000 +0200
-+++ blender-2.46.new/po/fi.po  2008-05-30 22:14:24.000000000 +0200
-@@ -1,13 +1,18 @@
--#"Last-Translator: Nathan Letwory<jesterking@letwory.net>\n"
--#"PO-Revision-Date: 2003-04-18 18:30+0300\n"
--#"Language-Team: Finnish\n"
--#"Content-Type: text/plain; charset=UTF-8\n"
--#"Content-Transfer-Encoding: 8bit\n"
--#"X-Generator: KBabel 0.9.6\n"
--
- # Copyright (C) 2003 Free Software Foundation, Inc.
- # snts &lt;snutlix@hotmail.com&gt;, 2003.
- #
-+msgid ""
-+msgstr ""
-+""
-+"Last-Translator: Nathan Letwory<jesterking@letwory.net>\n"
-+"PO-Revision-Date: 2003-04-18 18:30+0300\n"
-+"Project-Id-Version: blender 2.43\n"
-+"Language-Team: Finnish\n"
-+"MIME-Version: 1.0\n"
-+"Content-Type: text/plain; charset=UTF-8\n"
-+"Content-Transfer-Encoding: 8bit\n"
-+"X-Generator: KBabel 0.9.6\n"
-+
- ###########################################################
- ###
- ###  Render Window
-diff -urN blender-2.46/po/fr.po blender-2.46.new/po/fr.po
---- blender-2.46/po/fr.po      2008-05-19 16:40:14.000000000 +0200
-+++ blender-2.46.new/po/fr.po  2008-05-30 22:31:41.000000000 +0200
-@@ -1,11 +1,16 @@
- # French UI Translation
- # eon <eon.2008@free.fr>, 2008
--#"Last-Translator: eon <eon.2008@free.fr>\n"
--#"PO-Revision-Date: 2008-09-29 01:00+0100\n"
--#"Content-Type: text/plain; charset=UTF-8\n"
--#"Content-Transfer-Encoding: 8bit\n"
--#"Language-Team: eon (eon@jabber.fr) , serialsiner , kaal / project page : http://wiki.blender.org/index.php/Interface/fr"
--#"X-Generator: Gedit 2.22.0\n"
-+msgid ""
-+msgstr ""
-+""
-+"Project-Id-Version: \n"
-+"Last-Translator: eon <eon.2008@free.fr>\n"
-+"PO-Revision-Date: 2008-09-29 01:00+0100\n"
-+"Content-Type: text/plain; charset=UTF-8\n"
-+"Content-Transfer-Encoding: 8bit\n"
-+"Language-Team: eon (eon@jabber.fr) , serialsiner , kaal / project page : http://wiki.blender.org/index.php/Interface/fr\n"
-+"MIME-Version: 1.0\n"
-+"X-Generator: Gedit 2.22.0\n"
- 
- # Copyright (C) 2005 Free Software Foundation, Inc.
- #
-diff -urN blender-2.46/po/hr.po blender-2.46.new/po/hr.po
---- blender-2.46/po/hr.po      2008-05-19 16:40:14.000000000 +0200
-+++ blender-2.46.new/po/hr.po  2008-05-30 22:14:49.000000000 +0200
-@@ -1,14 +1,18 @@
- # Croatian Translation. Version 0.1
- # tommy5  tommy555@net.hr, 2004
- # Blender version: 2.32 
--#"Project-Id-Version: \n"
--#"POT-Creation-Date: \n"
--#"PO-Revision-Date: 2004-04-21 12:39+0100\n"
--#"Last-Translator: Tomislav Čorak <tommy555@net.hr>\n"
--#"Language-Team: \n"
--#"MIME-Version: 1.0\n"
--#"Content-Type: text/plain; charset=UTF-8\n"
--#"Content-Transfer-Encoding: 8bit\n"
-+
-+msgid ""
-+msgstr ""
-+""
-+"Project-Id-Version: \n"
-+"POT-Creation-Date: \n"
-+"PO-Revision-Date: 2004-04-21 12:39+0100\n"
-+"Last-Translator: Tomislav Čorak <tommy555@net.hr>\n"
-+"Language-Team: \n"
-+"MIME-Version: 1.0\n"
-+"Content-Type: text/plain; charset=UTF-8\n"
-+"Content-Transfer-Encoding: 8bit\n"
- 
- # #########################################################
- # #
-diff -urN blender-2.46/po/it.po blender-2.46.new/po/it.po
---- blender-2.46/po/it.po      2008-05-19 16:40:14.000000000 +0200
-+++ blender-2.46.new/po/it.po  2008-05-30 22:26:38.000000000 +0200
-@@ -1,18 +1,21 @@
- # Italian translation for blender
--#
--#"Project-Id-Version: it-246\n"
--#"POT-Creation-Date: \n"
--#"PO-Revision-Date: 2008-02-29 21:39+0100\n"
--#"Last-Translator: Skynet_italy <fiott@tin.it>\n"
--#"Language-Team:  <it@li.org>\n"
--#"MIME-Version: 1.0\n"
--#"Content-Type: text/plain; charset=UTF-8\n"
--#"Content-Transfer-Encoding: 8bit\n"
--#"X-Poedit-Language: Italian\n"
--#"X-Poedit-Country: ITALY\n"
--#"X-Poedit-SourceCharset: UTF-8\n"
--#"X-Generator: KBabel 1.11.4\n"
--#"X-Poedit-Bookmarks: 221,-1,-1,-1,-1,-1,-1,-1,-1,-1\n"
-+
-+msgid ""
-+msgstr ""
-+""
-+"Project-Id-Version: it-246\n"
-+"POT-Creation-Date: \n"
-+"PO-Revision-Date: 2008-02-29 21:39+0100\n"
-+"Last-Translator: Skynet_italy <fiott@tin.it>\n"
-+"Language-Team:  <it@li.org>\n"
-+"MIME-Version: 1.0\n"
-+"Content-Type: text/plain; charset=UTF-8\n"
-+"Content-Transfer-Encoding: 8bit\n"
-+"X-Poedit-Language: Italian\n"
-+"X-Poedit-Country: ITALY\n"
-+"X-Poedit-SourceCharset: UTF-8\n"
-+"X-Generator: KBabel 1.11.4\n"
-+"X-Poedit-Bookmarks: 221,-1,-1,-1,-1,-1,-1,-1,-1,-1\n"
- 
- msgid "Global Undo History "
- msgstr "Storico Globale Annulla"
-diff -urN blender-2.46/po/ja.po blender-2.46.new/po/ja.po
---- blender-2.46/po/ja.po      2008-05-19 16:40:14.000000000 +0200
-+++ blender-2.46.new/po/ja.po  2008-05-30 22:27:57.000000000 +0200
-@@ -1,3 +1,15 @@
-+# translation to Japanese
-+msgid ""
-+msgstr ""
-+""
-+"Last-Translator: UNKNOWN\n"
-+"PO-Revision-Date: 2003-04-19 21:47+0200\n"
-+"Project-Id-Version: blender 2.32\n"
-+"Language-Team: Japanese\n"
-+"MIME-Version: 1.0\n"
-+"Content-Type: text/plain; charset=UTF-8\n"
-+"Content-Transfer-Encoding: 8bit\n"
-+
- ### System ###
- msgid " OK? "
- msgstr ""
-diff -urN blender-2.46/po/Makefile blender-2.46.new/po/Makefile
---- blender-2.46/po/Makefile   2008-05-19 16:40:14.000000000 +0200
-+++ blender-2.46.new/po/Makefile       2008-05-31 10:39:31.000000000 +0200
-@@ -31,7 +31,7 @@
- 
- SOURCEDIR = blender/po
- 
--include nan_definitions.mk
-+include ../source/nan_definitions.mk
- 
- LINGUAS = ar bg ca cs de el es fi fr hr it ja nl pl pt_BR ro ru sr sr@Latn sv uk zh_CN
- 
-Pliki blender-2.46/po/messages.mo i blender-2.46.new/po/messages.mo różnią się
-diff -urN blender-2.46/po/nl.po blender-2.46.new/po/nl.po
---- blender-2.46/po/nl.po      2008-05-19 16:40:14.000000000 +0200
-+++ blender-2.46.new/po/nl.po  2008-05-30 22:28:09.000000000 +0200
-@@ -1,6 +1,17 @@
- # blender nl.po
- # Copyright (C) 2003 Free Software Foundation, Inc.
- # phase, 2003.
-+# translation to Dutch
-+msgid ""
-+msgstr ""
-+""
-+"Last-Translator: UNKNOWN\n"
-+"PO-Revision-Date: 2003-04-19 21:47+0200\n"
-+"Project-Id-Version: blender 2.32\n"
-+"Language-Team: Dutch\n"
-+"MIME-Version: 1.0\n"
-+"Content-Type: text/plain; charset=UTF-8\n"
-+"Content-Transfer-Encoding: 8bit\n"
- 
- ###########################################################
- ###
-diff -urN blender-2.46/po/pl.po blender-2.46.new/po/pl.po
---- blender-2.46/po/pl.po      2008-05-19 16:40:14.000000000 +0200
-+++ blender-2.46.new/po/pl.po  2008-05-30 22:28:17.000000000 +0200
-@@ -1,10 +1,15 @@
- # translation of pl.po to 
- # Piotr Kieć <pk_piotr@o2.pl>, 2004.
--#"Last-Translator: Piotr Kieć <pk_piotr@o2.pl>\n"
--#"PO-Revision-Date: 2004-07-20 18:39+0200\n"
--#"Content-Type: text/plain; charset=UTF-8\n"
--#"Content-Transfer-Encoding: 8bit\n"
--#"Project-Id-Version: pl\n"
-+msgid ""
-+msgstr ""
-+""
-+"Last-Translator: Piotr Kieć <pk_piotr@o2.pl>\n"
-+"Language-Team: Polish\n"
-+"MIME-Version: 1.0\n"
-+"PO-Revision-Date: 2004-07-20 18:39+0200\n"
-+"Content-Type: text/plain; charset=UTF-8\n"
-+"Content-Transfer-Encoding: 8bit\n"
-+"Project-Id-Version: pl\n"
- 
- 
- msgid "Sets the number of samples used for AO (actual number: squared)"
-diff -urN blender-2.46/po/pt_BR.po blender-2.46.new/po/pt_BR.po
---- blender-2.46/po/pt_BR.po   2008-05-19 16:40:14.000000000 +0200
-+++ blender-2.46.new/po/pt_BR.po       2008-05-30 22:28:51.000000000 +0200
-@@ -1,6 +1,17 @@
- # Translation of pt_br.po to Brazilian Portuguese. Version 0.1a
- # Frank 2003
- # Blender version: 2.31a 
-+# translation to Portuguese (Brasil)
-+msgid ""
-+msgstr ""
-+""
-+"Last-Translator: UNKNOWN\n"
-+"PO-Revision-Date: 2003-04-19 21:47+0200\n"
-+"Project-Id-Version: blender 2.31a\n"
-+"Language-Team: Portuguese (Brasil)\n"
-+"MIME-Version: 1.0\n"
-+"Content-Type: text/plain; charset=UTF-8\n"
-+"Content-Transfer-Encoding: 8bit\n"
- 
- msgid "(De)Select All"
- msgstr "(De)Selecionar Tudo"
-diff -urN blender-2.46/po/ru.po blender-2.46.new/po/ru.po
---- blender-2.46/po/ru.po      2008-05-19 16:40:14.000000000 +0200
-+++ blender-2.46.new/po/ru.po  2008-05-30 22:29:05.000000000 +0200
-@@ -1,15 +1,17 @@
- # Translation Russian. Version 0.2
- # Yurec yureckey@mail.ru 2004
- # Blender version: 2.33 
--
--#"Project-Id-Version: blender 2.33\n"
--#"POT-Creation-Date: 2004-02-05 20:50+0900\n"
--#"PO-Revision-Date: 2004-04-28 08:38+0200\n"
--#"Last-Translator: <yureckey@mail.ru>\n"
--#"Language-Team:  <>\n"
--#"MIME-Version: 1.0\n"
--#"Content-Type: text/plain; charset=UTF-8\n"
--#"Content-Transfer-Encoding: 8bit\n"
-+msgid ""
-+msgstr ""
-+""
-+"Project-Id-Version: blender 2.33\n"
-+"POT-Creation-Date: 2004-02-05 20:50+0900\n"
-+"PO-Revision-Date: 2004-04-28 08:38+0200\n"
-+"Last-Translator: <yureckey@mail.ru>\n"
-+"Language-Team: Russian\n"
-+"MIME-Version: 1.0\n"
-+"Content-Type: text/plain; charset=UTF-8\n"
-+"Content-Transfer-Encoding: 8bit\n"
- 
- 
- 
-diff -urN blender-2.46/po/sr@Latn.po blender-2.46.new/po/sr@Latn.po
---- blender-2.46/po/sr@Latn.po 2008-05-19 16:40:14.000000000 +0200
-+++ blender-2.46.new/po/sr@Latn.po     2008-05-30 22:29:16.000000000 +0200
-@@ -1,14 +1,17 @@
- # Translation Serbian latin. Version 0.2 
- # Nikola Radovanovic nrad@eunet.yu 2004
- # Blender version: 2.33 
--#"Project-Id-Version: Blender 2.33\n"
--#"POT-Creation-Date: 2004-05-16 19:49+ZONE\n"
--#"PO-Revision-Date: 2004-05-12 02:56+0100\n"
--#"Last-Translator: Nikola Radovanovic <nrad@eunet.yu>\n"
--#"Language-Team: Blender Serbia <office@blender.co.yu>\n"
--#"MIME-Version: 1.0\n"
--#"Content-Type: text/plain; charset=iso-8859-1\n"
--#"Content-Transfer-Encoding: 8bit\n"
-+msgid ""
-+msgstr ""
-+""
-+"Project-Id-Version: Blender 2.33\n"
-+"POT-Creation-Date: 2004-05-16 19:49+ZONE\n"
-+"PO-Revision-Date: 2004-05-12 02:56+0100\n"
-+"Last-Translator: Nikola Radovanovic <nrad@eunet.yu>\n"
-+"Language-Team: Blender Serbia <office@blender.co.yu>\n"
-+"MIME-Version: 1.0\n"
-+"Content-Type: text/plain; charset=iso-8859-1\n"
-+"Content-Transfer-Encoding: 8bit\n"
- 
- msgid "\r Radiosity step %d"
- msgstr "\r Radioziti korak %d"
-diff -urN blender-2.46/po/sr.po blender-2.46.new/po/sr.po
---- blender-2.46/po/sr.po      2008-05-19 16:40:14.000000000 +0200
-+++ blender-2.46.new/po/sr.po  2008-05-30 22:29:12.000000000 +0200
-@@ -1,14 +1,17 @@
- # Translation Serbian. Version 0.2
- # Nikola Radovanovic nrad@eunet.yu 2004
- # Blender version: 2.33 
--#"Project-Id-Version: Blender 2.33\n"
--#"POT-Creation-Date: 2004-05-16 19:49+ZONE\n"
--#"PO-Revision-Date: 2004-08-20 23:29+0100\n"
--#"Last-Translator: Nikola Radovanovic <nrad@eunet.yu>\n"
--#"Language-Team: Blender Serbia <office@blender.co.yu>\n"
--#"MIME-Version: 1.0\n"
--#"Content-Type: text/plain; charset=UTF-8\n"
--#"Content-Transfer-Encoding: 8bit\n"
-+msgid ""
-+msgstr ""
-+""
-+"Project-Id-Version: Blender 2.33\n"
-+"POT-Creation-Date: 2004-05-16 19:49+ZONE\n"
-+"PO-Revision-Date: 2004-08-20 23:29+0100\n"
-+"Last-Translator: Nikola Radovanovic <nrad@eunet.yu>\n"
-+"Language-Team: Blender Serbia <office@blender.co.yu>\n"
-+"MIME-Version: 1.0\n"
-+"Content-Type: text/plain; charset=UTF-8\n"
-+"Content-Transfer-Encoding: 8bit\n"
- 
- msgid "\r Radiosity step %d"
- msgstr "\r Радиозити корак %d"
-diff -urN blender-2.46/po/sv.po blender-2.46.new/po/sv.po
---- blender-2.46/po/sv.po      2008-05-19 16:40:14.000000000 +0200
-+++ blender-2.46.new/po/sv.po  2008-05-30 22:29:25.000000000 +0200
-@@ -1,16 +1,20 @@
--# translation of sv.po to Svenska
--# sten <ztonzy@yahoo.se>, 2003
--#"Last-Translator: sten <ztonzy@yahoo.se>\n"
--#"PO-Revision-Date: 2003-04-19 21:47+0200\n"
--#"Project-Id-Version: sv\n"
--#"Language-Team: Svenska <sv@li.org>\n"
--#"Content-Type: text/plain; charset=UTF-8\n"
--#"Content-Transfer-Encoding: 8bit\n"
--#"X-Generator: KBabel 1.0\n"
--
- # Copyright (C) 2003 Free Software Foundation, Inc.
- # snts &lt;snutlix@hotmail.com&gt;, 2003.
- #
-+# translation of sv.po to Svenska
-+# sten <ztonzy@yahoo.se>, 2003
-+msgid ""
-+msgstr ""
-+""
-+"Last-Translator: sten <ztonzy@yahoo.se>\n"
-+"PO-Revision-Date: 2003-04-19 21:47+0200\n"
-+"Project-Id-Version: sv\n"
-+"Language-Team: Svenska <sv@li.org>\n"
-+"MIME-Version: 1.0\n"
-+"Content-Type: text/plain; charset=UTF-8\n"
-+"Content-Transfer-Encoding: 8bit\n"
-+"X-Generator: KBabel 1.0\n"
-+
- ###########################################################
- ###
- ###  Render Window

diff --git a/blender-wrapper b/blender-wrapper
deleted file mode 100644 (file)
index 8859b95..0000000
--- a/blender-wrapper
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/sh
-
-#
-# A wrapper script for Blender
-#
-# orginal file for Debian distribution
-
-# In case user's home directory doesn't contain ~/.blender, copy it
-# from /usr/lib/blender
-
-if [ ! -d ~/.blender ]; then
-    install -d ~/.blender
-    ln -sf /usr/share/blender/locale ~/.blender
-    ln -sf /usr/share/blender/.Blanguages ~/.blender
-    ln -sf /usr/share/blender/.bfont.ttf ~/.blender
-    cp -a /usr/share/blender/bpydata ~/.blender
-    cp -a /usr/share/blender/VERSION ~/.blender
-
-    install -d ~/.blender/scripts
-    ln -sf /usr/share/blender/scripts/* ~/.blender/scripts/
-
-    install -d ~/.blender/plugins/
-
-    if [ ! -d /usr/lib/blender ]; then
-       ln -sf /usr/lib64/blender/plugins/* ~/.blender/plugins/
-    else
-       ln -sf /usr/lib/blender/plugins/* ~/.blender/plugins/
-    fi
-    
-
-fi
-
-# 
-# In case the user's ~/.blender came from older versions, some files 
-# should be reinstalled.
-#
-
-if [ $(cat ~/.blender/VERSION) != $(cat /usr/share/blender/VERSION) ]; then
-    cp -a /usr/share/blender/bpydata ~/.blender
-    ln -sf /usr/share/blender/scripts/* ~/.blender/scripts/
-    cp -a /usr/share/blender/VERSION ~/.blender
-fi
-
-blender-bin $@
-

diff --git a/blender.spec b/blender.spec
index 2cdca554357f2cedee3d3daca6382111a6db1440..74f28ea6af25879f12e910a04701d2c7169a66d6 100644 (file)
--- a/blender.spec
+++ b/blender.spec
@@ -4,23 +4,22 @@
 Summary:       3D modeling, rendering, animation and game creation package
 Summary(pl.UTF-8):     Pakiet do tworzenia animacji 3D oraz gier
 Name:          blender
-Version:       2.49b
-Release:       9
+Version:       2.76
+Release:       1
 License:       GPL
 Group:         X11/Applications/Graphics
 Source0:       http://download.blender.org/source/%{name}-%{version}.tar.gz
-# Source0-md5: 718eef6a4ff377989e829b92a886cc5b
+# Source0-md5: 1f35ae56bb221bbeb21e89501fbd6c6a
 Source1:       %{name}.desktop
 Source2:       %{name}.png
-Source4:       %{name}-wrapper
-Source5:       %{name}.manpage
-Patch0:                %{name}-po_and_locale_names.patch
-Patch1:                %{name}-noxml-yafray.patch
+Source3:       %{name}.manpage
+Patch0:                blender-2.67b-rna.patch
+Patch1:                blender-2.76-droid.patch
 URL:           http://www.blender.org/
 BuildRequires: OpenAL-devel
 BuildRequires: OpenEXR-devel
 BuildRequires: OpenGL-devel
-BuildRequires: SDL-devel
+BuildRequires: SDL2-devel
 #BuildRequires:        esound-devel
 BuildRequires: ffmpeg-devel >= 0.4.9-4.20080930.1
 BuildRequires: freealut-devel
@@ -35,10 +34,10 @@ BuildRequires:      libtiff-devel
 BuildRequires: libtool
 BuildRequires: libvorbis-devel
 BuildRequires: openssl-devel >= 0.9.7d
-BuildRequires: python-devel >= 1:2.3
+BuildRequires: python3-devel
 BuildRequires: rpm-pythonprov
 BuildRequires: rpmbuild(macros) >= 1.385
-BuildRequires: scons
+BuildRequires: cmake
 BuildRequires: sed >= 4.0
 #BuildRequires:        smpeg-devel
 BuildRequires: xorg-lib-libXi-devel
@@ -65,71 +64,52 @@ Blender to darmowy i w pełni funkcjonalny pakiet do tworzenia animacji
 %patch0 -p1
 %patch1 -p1
 
-rm -f missing
-rm -f user-config.py
-rm -rf bin/.blender/locale
-
-sed 's/\(BUILD_REV :=\).*/\1 unknown/' -i source/Makefile
-sed 's/\(build_rev =\).*/\1 "unknown"/' -i tools/Blender.py
-
-RPMCFLAGS="\"`echo %{rpmcflags}|sed 's/ /\",\"/g'`\""
-RPMLDFLAGS="\"`echo %{rpmldflags}|sed 's/ /\",\"/g'`\""
-
-cat > user-config.py <<END
-CCFLAGS           = [$RPMCFLAGS, "-funsigned-char", "-fPIC"]
-CXXFLAGS          = [$RPMCFLAGS, "-funsigned-char", "-fPIC"]
-LDFLAGS           = [$RPMLDFLAGS]
-TARGET_CC         = '%{__cc}'
-TARGET_CXX        = '%{__cxx}'
-
-BF_PYTHON_VERSION = '%{py_ver}'
-
-BF_FFMPEG         = '%{_prefix}'
-BF_FFMPEG_INC     = '%{_includedir}/ffmpeg'
-BF_FFMPEG_LIBPATH = '%{_libdir}'
-BF_FFMPEG_LIB     = 'avformat avcodec avdevice swscale avutil'
-
-LCGDIR            = 'lib/linux2'
-BF_BUILDDIR       = 'build/linux2'
-BF_INSTALLDIR     = 'install/linux2'
-END
-
 %build
-%scons BF_OPENGL_LIBPATH=%{_x_libraries}
-%{__make} -C po \
-       OCGDIR=.. \
-       SRCHOME=$(pwd)/source \
-       NANBLENDERHOME=$(pwd)
-
-install -d release/plugins/include
-install source/blender/blenpluginapi/*.h release/plugins/include
-chmod +x release/plugins/bmake
-%{__make} -C release/plugins/
+install -d build
+cd build
+%cmake \
+       -DCMAKE_SKIP_RPATH=ON \
+       -DBUILD_SHARED_LIBS=OFF \
+       -DWITH_FFTW3:BOOL=ON \
+       -DWITH_JACK:BOOL=ON \
+       -DWITH_CODEC_SNDFILE:BOOL=ON \
+       -DWITH_IMAGE_OPENJPEG:BOOL=ON \
+       -DWITH_OPENCOLLADA:BOOL=ON \
+       -DWITH_CYCLES:BOOL=ON \
+       -DWITH_FFTW3:BOOL=ON \
+       -DWITH_MOD_OCEANSIM:BOOL=ON \
+       -DOPENCOLLADA=%{_includedir} \
+       -DWITH_PYTHON:BOOL=ON \
+       -DPYTHON_VERSION:STRING=%{py3_ver} \
+       -DWITH_PYTHON_INSTALL:BOOL=OFF \
+       -DWITH_CODEC_FFMPEG:BOOL=ON \
+       -DWITH_GAMEENGINE:BOOL=ON \
+       -DWITH_CXX_GUARDEDALLOC:BOOL=OFF \
+       -DWITH_BUILTIN_GLEW=OFF \
+       -DWITH_INSTALL_PORTABLE=OFF \
+       -DWITH_PYTHON_SAFETY=ON \
+       -DWITH_PLAYER=ON \
+       -DWITH_MEM_JEMALLOC=ON \
+       -DBOOST_ROOT=%{_prefix} \
+       -DWITH_INPUT_NDOF=ON \
+       -DWITH_SDL:BOOL=ON \
+       ..
+
+%{__make} V=1
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_datadir},%{_desktopdir},%{_pixmapsdir},%{_bindir}} \
-       $RPM_BUILD_ROOT%{_datadir}/blender/bpydata
 
-install ./install/linux2/blender $RPM_BUILD_ROOT%{_bindir}/blender-bin
-install %{SOURCE4} $RPM_BUILD_ROOT%{_bindir}/blender
-#install blenderplayer $RPM_BUILD_ROOT%{_bindir}
+install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir},%{_mandir}/man1}
+
+%{__make} -C build install \
+       DESTDIR=$RPM_BUILD_ROOT
+
 install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
 install %{SOURCE2} $RPM_BUILD_ROOT%{_pixmapsdir}
-install -d $RPM_BUILD_ROOT%{_libdir}/blender/plugins/sequence
-install -d $RPM_BUILD_ROOT%{_libdir}/blender/plugins/texture
-install ./release/plugins/sequence/*.so $RPM_BUILD_ROOT%{_libdir}/blender/plugins/sequence
-install ./release/plugins/texture/*.so $RPM_BUILD_ROOT%{_libdir}/blender/plugins/texture
-install -d $RPM_BUILD_ROOT%{_datadir}/blender
-cp -aR ./release/scripts $RPM_BUILD_ROOT%{_datadir}/blender
-install ./release/VERSION $RPM_BUILD_ROOT%{_datadir}/blender
-install ./bin/.blender/.Blanguages $RPM_BUILD_ROOT%{_datadir}/blender
-install ./bin/.blender/.bfont.ttf $RPM_BUILD_ROOT%{_datadir}/blender
-cp -a bin/.blender/locale $RPM_BUILD_ROOT%{_datadir}
-install -d $RPM_BUILD_ROOT%{_mandir}/man1
-install %{SOURCE5} $RPM_BUILD_ROOT%{_mandir}/man1/blender.1
+install %{SOURCE3} $RPM_BUILD_ROOT%{_mandir}/man1/blender.1
 
-%find_lang %{name}
+#%find_lang %{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -140,13 +120,16 @@ rm -rf $RPM_BUILD_ROOT
 %postun
 %update_desktop_database_postun
 
-%files -f %{name}.lang
+%files
+# -f %{name}.lang
 %defattr(644,root,root,755)
-%doc README doc/bf-members.txt doc/python-dev-guide.txt doc/oldbugs.txt doc/interface_API.txt
-%doc release/text/{blender.html,release*.txt}
-%attr(755,root,root) %{_bindir}/*
+%doc doc/license/bf-members.txt doc/guides/*.txt
+%attr(755,root,root) %{_bindir}/blender
+%attr(755,root,root) %{_bindir}/blender-thumbnailer.py
+%attr(755,root,root) %{_bindir}/blenderplayer
 %attr(755,root,root) %{_datadir}/%{name}
-%attr(755,root,root) %{_libdir}/%{name}
 %{_desktopdir}/*.desktop
 %{_pixmapsdir}/*.png
+%{_iconsdir}/*/*x*/apps/blender.png
+%{_iconsdir}/*/scalable/apps/blender.svg
 %{_mandir}/man1/*