[openjpeg] Convert to submodule, contributes to MER#1912.

sailfishos · Jun 4, 2018 · c4aa1c7 · c4aa1c7
1 parent e74ec00
commit c4aa1c7
Show file tree

Hide file tree

Showing 20 changed files with 5 additions and 1 deletion.
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "upstream"]
+	path = upstream
+	url = git://github.com/uclouvain/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 → rpm/openjpeg-1.3-fix-type-error.patch b/openjpeg-1.3-fix-type-error.patch → rpm/openjpeg-1.3-fix-type-error.patch
diff --git a/...eg-1.3-reverse-bogus-aligned-malloc.patch → ...eg-1.3-reverse-bogus-aligned-malloc.patch b/...eg-1.3-reverse-bogus-aligned-malloc.patch → ...eg-1.3-reverse-bogus-aligned-malloc.patch
diff --git a/openjpeg-1.3-tcd_init_encode-alloc-fix.patch → ...njpeg-1.3-tcd_init_encode-alloc-fix.patch b/openjpeg-1.3-tcd_init_encode-alloc-fix.patch → ...njpeg-1.3-tcd_init_encode-alloc-fix.patch
diff --git a/openjpeg-20070717svn-codec-libtiff.patch → rpm/openjpeg-20070717svn-codec-libtiff.patch b/openjpeg-20070717svn-codec-libtiff.patch → rpm/openjpeg-20070717svn-codec-libtiff.patch
diff --git a/openjpeg-20070717svn-mqc-optimize.patch → rpm/openjpeg-20070717svn-mqc-optimize.patch b/openjpeg-20070717svn-mqc-optimize.patch → rpm/openjpeg-20070717svn-mqc-optimize.patch
diff --git a/openjpeg-20070719svn-mqc-more-optimize.patch → ...njpeg-20070719svn-mqc-more-optimize.patch b/openjpeg-20070719svn-mqc-more-optimize.patch → ...njpeg-20070719svn-mqc-more-optimize.patch
diff --git a/...svn-t1-t1_dec_sigpass_step-optimize.patch → ...svn-t1-t1_dec_sigpass_step-optimize.patch b/...svn-t1-t1_dec_sigpass_step-optimize.patch → ...svn-t1-t1_dec_sigpass_step-optimize.patch
diff --git a/...70719svn-t1-x86_64-flags-branchless.patch → ...70719svn-t1-x86_64-flags-branchless.patch b/...70719svn-t1-x86_64-flags-branchless.patch → ...70719svn-t1-x86_64-flags-branchless.patch
diff --git a/openjpeg-20070821svn-t1-flags-stride.patch → ...penjpeg-20070821svn-t1-flags-stride.patch b/openjpeg-20070821svn-t1-flags-stride.patch → ...penjpeg-20070821svn-t1-flags-stride.patch
diff --git a/openjpeg-20070821svn-t1-remove-macro.patch → ...penjpeg-20070821svn-t1-remove-macro.patch b/openjpeg-20070821svn-t1-remove-macro.patch → ...penjpeg-20070821svn-t1-remove-macro.patch
diff --git a/...g-20070821svn-t1-updateflags-x86_64.patch → ...g-20070821svn-t1-updateflags-x86_64.patch b/...g-20070821svn-t1-updateflags-x86_64.patch → ...g-20070821svn-t1-updateflags-x86_64.patch
diff --git a/openjpeg-svn468-mj2-noscroll.patch → rpm/openjpeg-svn468-mj2-noscroll.patch b/openjpeg-svn468-mj2-noscroll.patch → rpm/openjpeg-svn468-mj2-noscroll.patch
diff --git a/openjpeg-svn470-t1-flags-mmx.patch → rpm/openjpeg-svn470-t1-flags-mmx.patch b/openjpeg-svn470-t1-flags-mmx.patch → rpm/openjpeg-svn470-t1-flags-mmx.patch
diff --git a/openjpeg-svn480-cmake.patch → rpm/openjpeg-svn480-cmake.patch b/openjpeg-svn480-cmake.patch → rpm/openjpeg-svn480-cmake.patch
diff --git a/openjpeg-svn480-use-stdbool.patch → rpm/openjpeg-svn480-use-stdbool.patch b/openjpeg-svn480-use-stdbool.patch → rpm/openjpeg-svn480-use-stdbool.patch
diff --git a/openjpeg.changes → rpm/openjpeg.changes b/openjpeg.changes → rpm/openjpeg.changes
diff --git a/openjpeg.spec → rpm/openjpeg.spec b/openjpeg.spec → rpm/openjpeg.spec
@@ -57,7 +57,7 @@ The openjpeg-devel package contains libraries and header files for
 developing applications that use OpenJPEG.
 
 %prep
-%setup -q -n OpenJPEG_v1_3
+%setup -q -n %{name}-%{version}/upstream
 # Windows stuff, delete it, it slows down patch making
 rm -rf jp3d
 # Make sure we use system libraries

diff --git a/upstream b/upstream