[SCM] blender/master: debian/patches/: #0011 added to fix openjpeg transition

mfv-guest at users.alioth.debian.org mfv-guest at users.alioth.debian.org
Tue Apr 24 09:05:51 UTC 2012


The following commit has been merged in the master branch:
commit d35b8b9d35e985a87b93b18ef574f81f96664b07
Author: Matteo F. Vescovi <mfv.debian at gmail.com>
Date:   Tue Apr 24 10:59:47 2012 +0200

    debian/patches/: #0011 added to fix openjpeg transition
    
    Thanks: Mathieu Malaterre (malat) for the patch
    Closes: #670219

diff --git a/debian/patches/0011-Fix_FTBFS_on_openjpeg_transition.patch b/debian/patches/0011-Fix_FTBFS_on_openjpeg_transition.patch
new file mode 100644
index 0000000..25e0419
--- /dev/null
+++ b/debian/patches/0011-Fix_FTBFS_on_openjpeg_transition.patch
@@ -0,0 +1,27 @@
+From: "Matteo F. Vescovi" <mfv.debian at gmail.com>
+Date: Tue, 24 Apr 2012 10:57:44 +0200
+Subject: Fix_FTBFS_on_openjpeg_transition
+
+---
+Author: Mathieu Malaterre <malat at debian.org>
+Bug-Debian: http://bugs.debian.org/670219
+Forwarded: no
+Reviewed-By: Matteo F. Vescovi <mfv.debian at gmail.com>
+Last-Update: 2012-04-24
+
+ source/blender/imbuf/intern/jp2.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/source/blender/imbuf/intern/jp2.c b/source/blender/imbuf/intern/jp2.c
+index f8082c9..2e7a65a 100644
+--- a/source/blender/imbuf/intern/jp2.c
++++ b/source/blender/imbuf/intern/jp2.c
+@@ -329,7 +329,7 @@ static int initialise_4K_poc(opj_poc_t *POC, int numres)
+ 
+ static void cinema_parameters(opj_cparameters_t *parameters)
+ {
+-	parameters->tile_size_on = false;
++	parameters->tile_size_on = OPJ_FALSE;
+ 	parameters->cp_tdx=1;
+ 	parameters->cp_tdy=1;
+ 	
diff --git a/debian/patches/series b/debian/patches/series
index f02a148..32753d5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,3 +8,4 @@
 0008-do_not_use_version_number_in_the_system_path.patch
 0009-look_for_droid_ttf_with_fontconfig.patch
 0010-Fix_german_translation_of_desktop_file.patch
+0011-Fix_FTBFS_on_openjpeg_transition.patch

-- 
blender packaging



More information about the pkg-multimedia-commits mailing list