Merge branch '2.3' into 'master'

[openjpeg] Convert to submodule, contributes to MER#1912. See merge request mer-core/openjpeg!1
sailfishos · Jun 4, 2018 · 83c23e6 · 83c23e6
2 parents e74ec00 + f9c3c4c
commit 83c23e6
Show file tree

Hide file tree

Showing 23 changed files with 149 additions and 1,132 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "upstream"]
+	path = upstream
+	url = https://git.merproject.org/mirror/openjpeg
diff --git a/OpenJPEG_v1_3.tar.gz b/OpenJPEG_v1_3.tar.gz
diff --git a/openjpeg-1.3-fix-type-error.patch b/openjpeg-1.3-fix-type-error.patch
diff --git a/openjpeg-1.3-reverse-bogus-aligned-malloc.patch b/openjpeg-1.3-reverse-bogus-aligned-malloc.patch
diff --git a/openjpeg-1.3-tcd_init_encode-alloc-fix.patch b/openjpeg-1.3-tcd_init_encode-alloc-fix.patch
diff --git a/openjpeg-20070717svn-codec-libtiff.patch b/openjpeg-20070717svn-codec-libtiff.patch
diff --git a/openjpeg-20070717svn-mqc-optimize.patch b/openjpeg-20070717svn-mqc-optimize.patch
diff --git a/openjpeg-20070719svn-mqc-more-optimize.patch b/openjpeg-20070719svn-mqc-more-optimize.patch
diff --git a/openjpeg-20070719svn-t1-t1_dec_sigpass_step-optimize.patch b/openjpeg-20070719svn-t1-t1_dec_sigpass_step-optimize.patch
diff --git a/openjpeg-20070719svn-t1-x86_64-flags-branchless.patch b/openjpeg-20070719svn-t1-x86_64-flags-branchless.patch