- up to 2.49b

Changed files:
    blender-ffmpeg.patch -> 1.2
    blender-po_and_locale_names.patch -> 1.8
    blender.spec -> 1.93

diff --git a/blender-ffmpeg.patch b/blender-ffmpeg.patch
deleted file mode 100644 (file)
index 7d9cd5b..0000000
--- a/blender-ffmpeg.patch
+++ /dev/null
@@ -1,112 +0,0 @@
---- source/blender/blenkernel/intern/writeffmpeg.c~    2008-10-14 19:44:53.000000000 +0200
-+++ source/blender/blenkernel/intern/writeffmpeg.c     2008-10-18 22:08:01.532780779 +0200
-@@ -29,11 +29,11 @@
- 
- #include <stdlib.h>
- 
--#include <ffmpeg/avformat.h>
--#include <ffmpeg/avcodec.h>
--#include <ffmpeg/rational.h>
--#include <ffmpeg/swscale.h>
--#include <ffmpeg/opt.h>
-+#include <libavformat/avformat.h>
-+#include <libavcodec/avcodec.h>
-+#include <libavutil/rational.h>
-+#include <libswscale/swscale.h>
-+#include <libavcodec/opt.h>
- 
- #if LIBAVFORMAT_VERSION_INT < (49 << 16)
- #define FFMPEG_OLD_FRAME_RATE 1
---- source/blender/imbuf/intern/IMB_anim.h.org 2008-10-18 22:19:31.826461817 +0200
-+++ source/blender/imbuf/intern/IMB_anim.h     2008-10-18 22:20:00.836042614 +0200
-@@ -76,9 +76,9 @@
- #endif /* WITH_QUICKTIME */
- 
- #ifdef WITH_FFMPEG
--#include <ffmpeg/avformat.h>
--#include <ffmpeg/avcodec.h>
--#include <ffmpeg/swscale.h>
-+#include <libavformat/avformat.h>
-+#include <libavcodec/avcodec.h>
-+#include <libswscale/swscale.h>
- #endif
- 
- #ifdef WITH_REDCODE
---- source/blender/imbuf/intern/util.c.org     2008-10-18 22:35:38.951948174 +0200
-+++ source/blender/imbuf/intern/util.c 2008-10-18 22:35:56.658612921 +0200
-@@ -62,8 +62,8 @@
- #endif
- 
- #ifdef WITH_FFMPEG
--#include <ffmpeg/avcodec.h>
--#include <ffmpeg/avformat.h>
-+#include <libavcodec/avcodec.h>
-+#include <libavformat/avformat.h>
- 
- #if LIBAVFORMAT_VERSION_INT < (49 << 16)
- #define FFMPEG_OLD_FRAME_RATE 1
---- source/blender/imbuf/intern/anim.c.org     2008-10-18 22:43:53.181485966 +0200
-+++ source/blender/imbuf/intern/anim.c 2008-10-18 22:44:25.228770272 +0200
-@@ -83,10 +83,10 @@
- #include "IMB_anim5.h"
- 
- #ifdef WITH_FFMPEG
--#include <ffmpeg/avformat.h>
--#include <ffmpeg/avcodec.h>
--#include <ffmpeg/rational.h>
--#include <ffmpeg/swscale.h>
-+#include <libavformat/avformat.h>
-+#include <libavcodec/avcodec.h>
-+#include <libavutil/rational.h>
-+#include <libswscale/swscale.h>
- 
- #if LIBAVFORMAT_VERSION_INT < (49 << 16)
- #define FFMPEG_OLD_FRAME_RATE 1
---- source/blender/src/hddaudio.c.org  2008-10-18 22:50:45.531440517 +0200
-+++ source/blender/src/hddaudio.c      2008-10-18 22:51:09.511439978 +0200
-@@ -33,9 +33,9 @@
- #endif
- 
- #ifdef WITH_FFMPEG
--#include <ffmpeg/avformat.h>
--#include <ffmpeg/avcodec.h>
--#include <ffmpeg/rational.h>
-+#include <libavformat/avformat.h>
-+#include <libavcodec/avcodec.h>
-+#include <libavutil/rational.h>
- #if LIBAVFORMAT_VERSION_INT < (49 << 16)
- #define FFMPEG_OLD_FRAME_RATE 1
- #else
-@@ -311,7 +311,7 @@
-                               audio_pkt_size = packet.size;
- 
-                               while (audio_pkt_size > 0) {
--                                      len = avcodec_decode_audio(
-+                                      len = avcodec_decode_audio2(
-                                               hdaudio->pCodecCtx, 
-                                               hdaudio->decode_cache 
-                                               + decode_pos, 
-@@ -478,7 +478,7 @@
-                       }
- 
-                       while (audio_pkt_size > 0) {
--                              len = avcodec_decode_audio(
-+                              len = avcodec_decode_audio2(
-                                       hdaudio->pCodecCtx, 
-                                       hdaudio->decode_cache 
-                                       + decode_pos, 
---- source/blender/src/buttons_scene.c.org     2008-10-18 22:59:08.335140431 +0200
-+++ source/blender/src/buttons_scene.c 2008-10-18 22:59:45.185099794 +0200
-@@ -109,9 +109,9 @@
- 
- #ifdef WITH_FFMPEG
- 
--#include <ffmpeg/avcodec.h> /* for PIX_FMT_* and CODEC_ID_* */
--#include <ffmpeg/avformat.h>
--#include <ffmpeg/opt.h>
-+#include <libavcodec/avcodec.h> /* for PIX_FMT_* and CODEC_ID_* */
-+#include <libavformat/avformat.h>
-+#include <libavcodec/opt.h>
- 
- static int ffmpeg_preset_sel = 0;
- 

diff --git a/blender-po_and_locale_names.patch b/blender-po_and_locale_names.patch
index fbbc618d1f6d913103dd0ef0f93369a7cbc3b4b5..adfa7761044e1b55e30696e00c81a954a283a155 100644 (file)
--- a/blender-po_and_locale_names.patch
+++ b/blender-po_and_locale_names.patch
@@ -18,27 +18,6 @@ diff -urN blender-2.46/po/ca.po blender-2.46.new/po/ca.po
 +"Content-Transfer-Encoding: 8bit\n"
 +
  
- ###########################################################
- ###
-diff -urN blender-2.46/po/de.po blender-2.46.new/po/de.po
---- blender-2.46/po/de.po      2008-05-19 16:40:14.000000000 +0200
-+++ blender-2.46.new/po/de.po  2008-05-30 22:11:28.000000000 +0200
-@@ -1,6 +1,16 @@
- # Copyright (C) 2003 Free Software Foundation, Inc.
- # snts <snutlix@hotmail.com>, 2003.
--#
-+# translation to German
-+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: German\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
@@ -190,11 +169,7 @@ diff -urN blender-2.46/po/it.po blender-2.46.new/po/it.po
 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,7 +1,18 @@
- # blender ja.po
- # Copyright (C) 2003 Free Software Foundation, Inc.
- # snts <snutlix@hotmail.com>, 2003.
--#
+@@ -1,3 +1,15 @@
 +# translation to Japanese
 +msgid ""
 +msgstr ""
@@ -207,9 +182,9 @@ diff -urN blender-2.46/po/ja.po blender-2.46.new/po/ja.po
 +"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

diff --git a/blender.spec b/blender.spec
index f2ffdabbe3e0614077b99680b6490855d7a7d268..83d30e1d9aa3bbf5b05d48d9944ed67658a2eee1 100644 (file)
--- a/blender.spec
+++ b/blender.spec
@@ -4,19 +4,18 @@
 Summary:       3D modeling, rendering, animation and game creation package
 Summary(pl.UTF-8):     Pakiet do tworzenia animacji 3D oraz gier
 Name:          blender
-Version:       2.48a
-Release:       4
+Version:       2.49b
+Release:       1
 License:       GPL
 Group:         X11/Applications/Graphics
 Source0:       http://download.blender.org/source/%{name}-%{version}.tar.gz
-# Source0-md5: 055d68d244458e9e429e4e492fc9b4ad
+# Source0-md5: 718eef6a4ff377989e829b92a886cc5b
 Source1:       %{name}.desktop
 Source2:       %{name}.png
 Source4:       %{name}-wrapper
 Source5:       %{name}.manpage
 Patch0:                %{name}-po_and_locale_names.patch
 Patch1:                %{name}-noxml-yafray.patch
-Patch2:                %{name}-ffmpeg.patch
 URL:           http://www.blender.org/
 BuildRequires: OpenAL-devel
 BuildRequires: OpenEXR-devel
@@ -63,7 +62,6 @@ Blender to darmowy i w pełni funkcjonalny pakiet do tworzenia animacji
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p0
 
 rm -f missing
 rm -f user-config.py
@@ -84,7 +82,7 @@ BF_PYTHON_VERSION = '%{py_ver}'
 BF_FFMPEG         = '%{_prefix}'
 BF_FFMPEG_INC     = '%{_includedir}/ffmpeg'
 BF_FFMPEG_LIBPATH = '%{_libdir}'
-BF_FFMPEG_LIB     = 'avformat avcodec swscale avutil'
+BF_FFMPEG_LIB     = 'avformat avcodec avdevice swscale avutil'
 
 LCGDIR            = 'lib/linux2'
 BF_BUILDDIR       = 'build/linux2'
@@ -93,7 +91,10 @@ END
 
 %build
 %scons BF_OPENGL_LIBPATH=%{_x_libraries}
-%{__make} -C po OCGDIR=..
+%{__make} -C po \
+       OCGDIR=.. \
+       SRCHOME=$(pwd)/source \
+       NANBLENDERHOME=$(pwd)
 
 install -d release/plugins/include
 install source/blender/blenpluginapi/*.h release/plugins/include