[SCM] blender/master.mfv: debian/patches: fix_FTBFS_with_libmv + cleanup
kiniou-guest at users.alioth.debian.org
kiniou-guest at users.alioth.debian.org
Mon Jan 23 12:15:02 UTC 2012
The following commit has been merged in the master.mfv branch:
commit 591ea78a25030f5806dcb419062d60f0d885c7aa
Author: Kevin Roy <kiniou at gmail.com>
Date: Mon Jan 23 13:13:43 2012 +0100
debian/patches: fix_FTBFS_with_libmv + cleanup
Closes: #654428
diff --git a/debian/patches/0005-install_in_usr_lib.patch b/debian/patches/0005-install_in_usr_lib.patch
index 309e753..ae52185 100644
--- a/debian/patches/0005-install_in_usr_lib.patch
+++ b/debian/patches/0005-install_in_usr_lib.patch
@@ -1,4 +1,4 @@
-From: "Matteo F. Vescovi" <mfv.debian at gmail.com>
+From: Matteo F. Vescovi <mfv.debian at gmail.com>
Date: Thu, 5 Jan 2012 09:50:48 +0100
Subject: install_in_usr_lib
diff --git a/debian/patches/0006-filter_docs_to_install.patch b/debian/patches/0006-filter_docs_to_install.patch
index dc26d87..4d8d3c9 100644
--- a/debian/patches/0006-filter_docs_to_install.patch
+++ b/debian/patches/0006-filter_docs_to_install.patch
@@ -1,4 +1,4 @@
-From: "Matteo F. Vescovi" <m.vescovi at revese.it>
+From: Matteo F. Vescovi <m.vescovi at revese.it>
Date: Thu, 22 Dec 2011 18:13:03 +0100
Subject: filter_docs_to_install
diff --git a/debian/patches/0007-locales_directory_install.patch b/debian/patches/0007-locales_directory_install.patch
index d649a97..0647f22 100644
--- a/debian/patches/0007-locales_directory_install.patch
+++ b/debian/patches/0007-locales_directory_install.patch
@@ -1,4 +1,4 @@
-From: "Matteo F. Vescovi" <m.vescovi at revese.it>
+From: Matteo F. Vescovi <m.vescovi at revese.it>
Date: Thu, 22 Dec 2011 18:17:18 +0100
Subject: locales_directory_install
diff --git a/debian/patches/0008-update_manpages.patch b/debian/patches/0008-update_manpages.patch
index de0e7cc..cce7831 100644
--- a/debian/patches/0008-update_manpages.patch
+++ b/debian/patches/0008-update_manpages.patch
@@ -1,4 +1,4 @@
-From: "Matteo F. Vescovi" <m.vescovi at revese.it>
+From: Matteo F. Vescovi <m.vescovi at revese.it>
Date: Thu, 22 Dec 2011 18:24:53 +0100
Subject: update_manpages
diff --git a/debian/patches/0009-Make-blender-compile-with-FFmpeg-from-Debian.patch b/debian/patches/0009-fix_FTBFS_with_ffmpeg_from_debian.patch
similarity index 73%
rename from debian/patches/0009-Make-blender-compile-with-FFmpeg-from-Debian.patch
rename to debian/patches/0009-fix_FTBFS_with_ffmpeg_from_debian.patch
index 081bcc4..9f5ba81 100644
--- a/debian/patches/0009-Make-blender-compile-with-FFmpeg-from-Debian.patch
+++ b/debian/patches/0009-fix_FTBFS_with_ffmpeg_from_debian.patch
@@ -1,20 +1,29 @@
From: Antonio Ospite <ospite at studenti.unina.it>
Date: Sat, 17 Dec 2011 15:45:16 +0100
-Subject: Make blender compile with FFmpeg from Debian.
+Subject: fix_FTBFS_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.
Signed-off-by: Antonio Ospite <ospite at studenti.unina.it>
---
- intern/ffmpeg/ffmpeg_compat.h | 61 +++++++++++++++++++++++++++++++++++++++++
- 1 files changed, 61 insertions(+), 0 deletions(-)
+ intern/ffmpeg/ffmpeg_compat.h | 62 ++++++++++++++++++++++++
+ source/blender/blenkernel/intern/writeffmpeg.c | 1 +
+ 2 files changed, 63 insertions(+), 0 deletions(-)
diff --git a/intern/ffmpeg/ffmpeg_compat.h b/intern/ffmpeg/ffmpeg_compat.h
-index dfdad22..e7cb1fe 100644
+index dfdad22..bb07576 100644
--- a/intern/ffmpeg/ffmpeg_compat.h
+++ b/intern/ffmpeg/ffmpeg_compat.h
-@@ -48,6 +48,67 @@
+@@ -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
+@@ -48,6 +49,67 @@
#define FFMPEG_HAVE_AVIO 1
#endif
@@ -82,4 +91,16 @@ index dfdad22..e7cb1fe 100644
#if (LIBAVCODEC_VERSION_MAJOR > 53) || ((LIBAVCODEC_VERSION_MAJOR == 53) && (LIBAVCODEC_VERSION_MINOR > 1)) || ((LIBAVCODEC_VERSION_MAJOR == 53) && (LIBAVCODEC_VERSION_MINOR == 1) && (LIBAVCODEC_VERSION_MICRO >= 1)) || ((LIBAVCODEC_VERSION_MAJOR == 52) && (LIBAVCODEC_VERSION_MINOR >= 121))
#define FFMPEG_HAVE_DEFAULT_VAL_UNION 1
#endif
+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/0010-Don-t-use-version-number-in-the-system_path.patch b/debian/patches/0010-do_not_use_version_number_in_the_system_path.patch
similarity index 95%
rename from debian/patches/0010-Don-t-use-version-number-in-the-system_path.patch
rename to debian/patches/0010-do_not_use_version_number_in_the_system_path.patch
index 2540bbf..1194d2b 100644
--- a/debian/patches/0010-Don-t-use-version-number-in-the-system_path.patch
+++ b/debian/patches/0010-do_not_use_version_number_in_the_system_path.patch
@@ -1,6 +1,6 @@
From: Antonio Ospite <ospite at studenti.unina.it>
Date: Fri, 6 Jan 2012 14:31:50 +0100
-Subject: Don't use version number in the system_path.
+Subject: do_not_use_version_number_in_the_system_path
Global installation expects system patch to be something like
/usr/lib/blender/scripts/ without version numbers.
diff --git a/debian/patches/0011-Adapt-to-libavutil-API-changes.patch b/debian/patches/0011-Adapt-to-libavutil-API-changes.patch
deleted file mode 100644
index 20e9d89..0000000
--- a/debian/patches/0011-Adapt-to-libavutil-API-changes.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-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-fix_FTBFS_with_libmv.patch b/debian/patches/0011-fix_FTBFS_with_libmv.patch
new file mode 100644
index 0000000..22356fe
--- /dev/null
+++ b/debian/patches/0011-fix_FTBFS_with_libmv.patch
@@ -0,0 +1,52 @@
+From: Kevin Roy <kiniou at gmail.com>
+Date: Wed, 11 Jan 2012 23:15:16 +0100
+Subject: fix_FTBFS_with_libmv
+
+This must fix build on debian ports that differs from generic i386/x86_64
+like kFreeBSD
+---
+ extern/libmv/third_party/glog/src/config.h | 10 +++++-----
+ extern/libmv/third_party/glog/src/config_linux.h | 4 +++-
+ 2 files changed, 8 insertions(+), 6 deletions(-)
+
+diff --git a/extern/libmv/third_party/glog/src/config.h b/extern/libmv/third_party/glog/src/config.h
+index 49c0d89..102bf9e 100644
+--- a/extern/libmv/third_party/glog/src/config.h
++++ b/extern/libmv/third_party/glog/src/config.h
+@@ -2,14 +2,14 @@
+ /* src/config.h.in. Generated from configure.ac by autoheader. */
+
+ /* Namespace for Google classes */
+-#ifdef __APPLE__
++#if defined(__APPLE__)
+ #include "config_mac.h"
+-#elif __FreeBSD__
++#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+ #include "config_freebsd.h"
+-#elif __MINGW32__
++#elif defined(__MINGW32__)
+ #include "windows/config.h"
+-#elif __GNUC__
++#elif defined(__linux__)
+ #include "config_linux.h"
+-#elif _MSC_VER
++#elif defined(_MSC_VER)
+ #include "windows/config.h"
+ #endif
+diff --git a/extern/libmv/third_party/glog/src/config_linux.h b/extern/libmv/third_party/glog/src/config_linux.h
+index ffd4e77..faf0329 100644
+--- a/extern/libmv/third_party/glog/src/config_linux.h
++++ b/extern/libmv/third_party/glog/src/config_linux.h
+@@ -133,8 +133,10 @@
+ /* How to access the PC from a struct ucontext */
+ #if defined(_M_X64) || defined(__amd64__) || defined(__x86_64__)
+ #define PC_FROM_UCONTEXT uc_mcontext.gregs[REG_RIP]
+-#else
++#elif defined(_M_IX86) || defined(__i386__) || defined(__i486__) || defined(__i586__) || defined(__i686__)
+ #define PC_FROM_UCONTEXT uc_mcontext.gregs[REG_EIP]
++#else
++ #undef PC_FROM_UCONTEXT
+ #endif
+
+ /* Define to necessary symbol if this constant uses a non-standard name on
+--
diff --git a/debian/patches/series b/debian/patches/series
index 9439b79..97232c9 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-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
+0009-fix_FTBFS_with_ffmpeg_from_debian.patch
+0010-do_not_use_version_number_in_the_system_path.patch
+0011-fix_FTBFS_with_libmv.patch
--
blender packaging
More information about the pkg-multimedia-commits
mailing list