[SCM] blender/master: debian/patches: patches set re-worked
mfv-guest at users.alioth.debian.org
mfv-guest at users.alioth.debian.org
Tue Jan 24 10:09:05 UTC 2012
The following commit has been merged in the master branch:
commit 31737ebf8b9e27c205819a967934d252b557ac50
Author: Matteo F. Vescovi <mfv.debian at gmail.com>
Date: Sat Jan 21 15:47:41 2012 +0100
debian/patches: patches set re-worked
Closes: #656502
Closes: #654395
diff --git a/debian/patches/0002-blender_thumbnailer.patch b/debian/patches/0002-blender_thumbnailer.patch
index 9a76e53..2e35cd8 100644
--- a/debian/patches/0002-blender_thumbnailer.patch
+++ b/debian/patches/0002-blender_thumbnailer.patch
@@ -29,7 +29,7 @@ index 8b93eeb..a056852 100755
import struct
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
-index 79a7f5b..7a9a44c 100644
+index 79a7f5b..27c13d7 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -360,7 +360,7 @@ if(UNIX AND NOT APPLE)
diff --git a/debian/patches/0005-install_in_usr_lib.patch b/debian/patches/0005-install_in_usr_lib.patch
index 124aba5..309e753 100644
--- a/debian/patches/0005-install_in_usr_lib.patch
+++ b/debian/patches/0005-install_in_usr_lib.patch
@@ -1,10 +1,13 @@
From: "Matteo F. Vescovi" <mfv.debian at gmail.com>
-Date: Thu, 05 Jan 2012 09:50:48 +0100
+Date: Thu, 5 Jan 2012 09:50:48 +0100
Subject: install_in_usr_lib
* Arch-specific files go to /usr/lib rather than /usr/share
* Make blender look for systemdir into /usr/lib instead of /usr/share
---
+ intern/ghost/intern/GHOST_SystemPathsX11.cpp | 2 +-
+ source/creator/CMakeLists.txt | 4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/intern/ghost/intern/GHOST_SystemPathsX11.cpp b/intern/ghost/intern/GHOST_SystemPathsX11.cpp
index 7261491..30ff1da 100644
@@ -20,7 +23,7 @@ index 7261491..30ff1da 100644
static const char *static_path= NULL;
#endif
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
-index 7a9a44c..f6f7cc1 100644
+index 27c13d7..e09fe05 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -257,8 +257,8 @@ if(WITH_PYTHON)
diff --git a/debian/patches/0006-filter_docs_to_install.patch b/debian/patches/0006-filter_docs_to_install.patch
index a42c4e1..dc26d87 100644
--- a/debian/patches/0006-filter_docs_to_install.patch
+++ b/debian/patches/0006-filter_docs_to_install.patch
@@ -8,7 +8,7 @@ Install relevant documentation
1 files changed, 0 insertions(+), 2 deletions(-)
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
-index f6f7cc1..c8d5648 100644
+index e09fe05..033cbf0 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -206,8 +206,6 @@ else()
diff --git a/debian/patches/0007-locales_directory_install.patch b/debian/patches/0007-locales_directory_install.patch
index 9d582bc..d649a97 100644
--- a/debian/patches/0007-locales_directory_install.patch
+++ b/debian/patches/0007-locales_directory_install.patch
@@ -8,7 +8,7 @@ Change where locales are installed
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
-index c8d5648..ec77aef 100644
+index 033cbf0..4f84792 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -269,9 +269,9 @@ endif()
diff --git a/debian/patches/0008-update_manpages.patch b/debian/patches/0008-update_manpages.patch
index 8258093..de0e7cc 100644
--- a/debian/patches/0008-update_manpages.patch
+++ b/debian/patches/0008-update_manpages.patch
@@ -148,7 +148,7 @@ index 0000000..d15b0c9
+.SH AUTHORS
+This manpage was written for a Debian GNU/Linux by Kevin Roy <kiniou at gmail.com>.
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
-index ec77aef..7651027 100644
+index 4f84792..1987aa7 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -298,6 +298,7 @@ if(UNIX AND NOT APPLE)
@@ -159,7 +159,7 @@ index ec77aef..7651027 100644
DESTINATION ${TARGETDIR}
)
-@@ -361,7 +362,9 @@
+@@ -361,7 +362,9 @@ if(UNIX AND NOT APPLE)
DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/blender/scripts
)
install(
diff --git a/debian/patches/0009-fix_FTBFS_with_ffmpeg_debian.patch b/debian/patches/0009-Make-blender-compile-with-FFmpeg-from-Debian.patch
similarity index 88%
rename from debian/patches/0009-fix_FTBFS_with_ffmpeg_debian.patch
rename to debian/patches/0009-Make-blender-compile-with-FFmpeg-from-Debian.patch
index acfa75c..081bcc4 100644
--- a/debian/patches/0009-fix_FTBFS_with_ffmpeg_debian.patch
+++ b/debian/patches/0009-Make-blender-compile-with-FFmpeg-from-Debian.patch
@@ -1,10 +1,6 @@
->From 63b4c577c951245904fd59ac8c6021bab18b0de4 Mon Sep 17 00:00:00 2001
From: Antonio Ospite <ospite at studenti.unina.it>
Date: Sat, 17 Dec 2011 15:45:16 +0100
-Subject: [PATCH] Make blender compile with FFmpeg from Debian.
-X-Face: z*RaLf`X<@C75u6Ig9}{oW$H;1_\2t5)({*|jhM<pyWR#k60!#=#>/Vb;]yA5<GWI5`6u&+
- ;6b'@y|8w"wB;4/e!7wYYrcqdJFY,~%Gk_4]cq$Ei/7<j&N3ah(m`ku?pX.&+~:_/wC~dwn^)MizBG
- !pE^+iDQQ1yC6^,)YDKkxDd!T>\I~93>J<_`<4)A{':UrE
+Subject: Make blender compile with FFmpeg from Debian.
avformat_alloc_output_context2() should be in the libavformat 53.2.0 but
it isn't in Debian, re-define it.
@@ -15,7 +11,7 @@ Signed-off-by: Antonio Ospite <ospite at studenti.unina.it>
1 files changed, 61 insertions(+), 0 deletions(-)
diff --git a/intern/ffmpeg/ffmpeg_compat.h b/intern/ffmpeg/ffmpeg_compat.h
-index dfdad22..5259f69 100644
+index dfdad22..e7cb1fe 100644
--- a/intern/ffmpeg/ffmpeg_compat.h
+++ b/intern/ffmpeg/ffmpeg_compat.h
@@ -48,6 +48,67 @@
@@ -87,5 +83,3 @@ index dfdad22..5259f69 100644
#define FFMPEG_HAVE_DEFAULT_VAL_UNION 1
#endif
--
-1.7.7.3
-
diff --git a/debian/patches/0010-do_not_use_version_number_in_the_system_path.patch b/debian/patches/0010-Don-t-use-version-number-in-the-system_path.patch
similarity index 77%
rename from debian/patches/0010-do_not_use_version_number_in_the_system_path.patch
rename to debian/patches/0010-Don-t-use-version-number-in-the-system_path.patch
index 2092305..2540bbf 100644
--- a/debian/patches/0010-do_not_use_version_number_in_the_system_path.patch
+++ b/debian/patches/0010-Don-t-use-version-number-in-the-system_path.patch
@@ -1,10 +1,6 @@
-From 93a84599a36fb10588d4c93bc4c465d179b5ee6e Mon Sep 17 00:00:00 2001
From: Antonio Ospite <ospite at studenti.unina.it>
Date: Fri, 6 Jan 2012 14:31:50 +0100
-Subject: [PATCH] Don't use version number in the system_path.
-X-Face: z*RaLf`X<@C75u6Ig9}{oW$H;1_\2t5)({*|jhM<pyWR#k60!#=#>/Vb;]yA5<GWI5`6u&+
- ;6b'@y|8w"wB;4/e!7wYYrcqdJFY,~%Gk_4]cq$Ei/7<j&N3ah(m`ku?pX.&+~:_/wC~dwn^)MizBG
- !pE^+iDQQ1yC6^,)YDKkxDd!T>\I~93>J<_`<4)A{':UrE
+Subject: Don't use version number in the system_path.
Global installation expects system patch to be something like
/usr/lib/blender/scripts/ without version numbers.
@@ -35,5 +31,3 @@ index e79d850..bc6f6e6 100644
if(!system_path[0])
--
-1.7.8.2
-
diff --git a/debian/patches/0011-Adapt-to-libavutil-API-changes.patch b/debian/patches/0011-Adapt-to-libavutil-API-changes.patch
new file mode 100644
index 0000000..20e9d89
--- /dev/null
+++ b/debian/patches/0011-Adapt-to-libavutil-API-changes.patch
@@ -0,0 +1,38 @@
+From: "Matteo F. Vescovi" <mfv.debian at gmail.com>
+Date: Sat, 21 Jan 2012 15:44:52 +0100
+Subject: Adapt to libavutil API changes
+
+Add include for libavutil/mathematics.h in ffmpeg_compat.h and writeffmpeg.c
+since it is no longer included in libavutil/avutil.h
+
+Thanks: Thomas Preud'homme
+---
+ intern/ffmpeg/ffmpeg_compat.h | 1 +
+ source/blender/blenkernel/intern/writeffmpeg.c | 1 +
+ 2 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/intern/ffmpeg/ffmpeg_compat.h b/intern/ffmpeg/ffmpeg_compat.h
+index e7cb1fe..bb07576 100644
+--- a/intern/ffmpeg/ffmpeg_compat.h
++++ b/intern/ffmpeg/ffmpeg_compat.h
+@@ -35,6 +35,7 @@
+
+ #include <libavcodec/avcodec.h>
+ #include <libavutil/rational.h>
++#include <libavutil/mathematics.h>
+
+ #if (LIBAVFORMAT_VERSION_MAJOR > 52) || ((LIBAVFORMAT_VERSION_MAJOR >= 52) && (LIBAVFORMAT_VERSION_MINOR >= 101))
+ #define FFMPEG_HAVE_PARSE_UTILS 1
+diff --git a/source/blender/blenkernel/intern/writeffmpeg.c b/source/blender/blenkernel/intern/writeffmpeg.c
+index aa7d71b..2e2633b 100644
+--- a/source/blender/blenkernel/intern/writeffmpeg.c
++++ b/source/blender/blenkernel/intern/writeffmpeg.c
+@@ -36,6 +36,7 @@
+ #include <libavformat/avformat.h>
+ #include <libavcodec/avcodec.h>
+ #include <libavutil/rational.h>
++#include <libavutil/mathematics.h>
+ #include <libswscale/swscale.h>
+ #include <libavcodec/opt.h>
+
+--
diff --git a/debian/patches/0011-adapt_to_libav_API_changes.patch b/debian/patches/0011-adapt_to_libav_API_changes.patch
deleted file mode 100644
index 8d86f36..0000000
--- a/debian/patches/0011-adapt_to_libav_API_changes.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Description: Adapt to libavutil API changes
- Add include for libavutil/mathematics.h in ffmpeg_compat.h and writeffmpeg.c
- since it is no longer included in libavutil/avutil.h
-Author: Thomas Preud'homme <robotux at celest.fr>
-Origin: vendor
-Forwarded: no
-Last-Update: 2012-01-19
----
-
---- blender-2.61.orig/intern/ffmpeg/ffmpeg_compat.h
-+++ blender-2.61/intern/ffmpeg/ffmpeg_compat.h
-@@ -35,6 +35,7 @@
-
- #include <libavcodec/avcodec.h>
- #include <libavutil/rational.h>
-+#include <libavutil/mathematics.h>
-
- #if (LIBAVFORMAT_VERSION_MAJOR > 52) || ((LIBAVFORMAT_VERSION_MAJOR >= 52) && (LIBAVFORMAT_VERSION_MINOR >= 101))
- #define FFMPEG_HAVE_PARSE_UTILS 1
-
---- blender-2.61.orig/source/blender/blenkernel/intern/writeffmpeg.c
-+++ blender-2.61/source/blender/blenkernel/intern/writeffmpeg.c
-@@ -36,6 +36,7 @@
- #include <libavformat/avformat.h>
- #include <libavcodec/avcodec.h>
- #include <libavutil/rational.h>
-+#include <libavutil/mathematics.h>
- #include <libswscale/swscale.h>
- #include <libavcodec/opt.h>
-
diff --git a/debian/patches/series b/debian/patches/series
index 9ec5c9a..9439b79 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,6 +6,6 @@
0006-filter_docs_to_install.patch
0007-locales_directory_install.patch
0008-update_manpages.patch
-0009-fix_FTBFS_with_ffmpeg_debian.patch
-0010-do_not_use_version_number_in_the_system_path.patch
-0011-adapt_to_libav_API_changes.patch
+0009-Make-blender-compile-with-FFmpeg-from-Debian.patch
+0010-Don-t-use-version-number-in-the-system_path.patch
+0011-Adapt-to-libavutil-API-changes.patch
--
blender packaging
More information about the pkg-multimedia-commits
mailing list