[Pkg-phototools-commits] [openjpeg] 01/01: Import changes from last packages
Mathieu Malaterre
malat at moszumanska.debian.org
Thu Mar 27 19:02:08 UTC 2014
This is an automated email from the git hooks/post-receive script.
malat pushed a commit to branch master
in repository openjpeg.
commit 869a8189a5bed3f5d8fc952e2acca0e116ea4d8a
Author: Mathieu Malaterre <mathieu.malaterre at gmail.com>
Date: Thu Mar 27 19:58:23 2014 +0100
Import changes from last packages
---
debian/changelog | 16 ++++++++++++++++
debian/control | 4 ++--
debian/patches/fixpthread.patch | 38 ++++++++++++++++++++++++++++++++++++++
debian/patches/issue205.patch | 33 +++++++++++++++++++++++++++++++++
debian/patches/series | 2 ++
debian/rules | 5 +++--
6 files changed, 94 insertions(+), 4 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index c7ed8aa..ca2dd86 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+openjpeg (1.5.1-3) unstable; urgency=low
+
+ * Fix cmake monolithic export.
+ * Prefer build type of None
+ * B-D on libtiff-dev. Closes: #736034
+
+ -- Mathieu Malaterre <malat at debian.org> Mon, 17 Mar 2014 18:45:54 +0100
+
+openjpeg (1.5.1-2) unstable; urgency=low
+
+ * Upload to sid
+ * Import patch from upstream to prevent regression from 1.5.0:
+ d/p/issue205.patch
+
+ -- Mathieu Malaterre <malat at debian.org> Mon, 17 Mar 2014 09:28:46 +0100
+
openjpeg (1.5.1-1) experimental; urgency=low
* New upstream. Closes: #687528, #681458, #691156
diff --git a/debian/control b/debian/control
index 7f17708..ed12721 100644
--- a/debian/control
+++ b/debian/control
@@ -12,14 +12,14 @@ Build-Depends:
, javahelper (>= 0.37~)
, default-jdk
, libxerces2-java
- , libtiff5-dev | libtiff-dev
+ , libtiff-dev
, libpng-dev
, liblcms2-dev
, zlib1g-dev
, libfcgi-dev
, libcurl4-gnutls-dev | libcurl-ssl-dev
, doxygen
-Standards-Version: 3.9.3
+Standards-Version: 3.9.5
Section: libs
Vcs-Browser: http://git.debian.org/?p=pkg-phototools/openjpeg.git
Vcs-Git: git://git.debian.org/git/pkg-phototools/openjpeg.git
diff --git a/debian/patches/fixpthread.patch b/debian/patches/fixpthread.patch
new file mode 100644
index 0000000..4862425
--- /dev/null
+++ b/debian/patches/fixpthread.patch
@@ -0,0 +1,38 @@
+Description: <short summary of the patch>
+ TODO: Put a short summary on the line above and replace this paragraph
+ with a longer explanation of this change. Complete the meta-information
+ with other relevant fields (see below for details). To make it easier, the
+ information below has been extracted from the changelog. Adjust it or drop
+ it.
+ .
+ openjpeg (1.5.1-2) unstable; urgency=low
+ .
+ * Upload to sid
+ * Import patch from upstream to prevent regression from 1.5.0:
+ d/p/issue205.patch
+Author: Mathieu Malaterre <malat at debian.org>
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: http://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- openjpeg-1.5.1.orig/applications/jpip/libopenjpip/CMakeLists.txt
++++ openjpeg-1.5.1/applications/jpip/libopenjpip/CMakeLists.txt
+@@ -62,7 +62,7 @@ INSTALL(TARGETS openjpip_local
+
+ IF(BUILD_JPIP_SERVER)
+ ADD_LIBRARY(openjpip_server STATIC ${OPENJPIP_SRCS} ${SERVER_SRCS})
+- TARGET_LINK_LIBRARIES(openjpip_server ${FCGI_LIBRARIES} ${CURL_LIBRARIES} ${CMAKE_THREAD_LIBS})
++ TARGET_LINK_LIBRARIES(openjpip_server ${FCGI_LIBRARIES} ${CURL_LIBRARIES} ${CMAKE_THREAD_LIBS} pthread)
+ SET_TARGET_PROPERTIES(openjpip_server
+ PROPERTIES COMPILE_FLAGS "-DSERVER")
+ INSTALL(TARGETS openjpip_server
diff --git a/debian/patches/issue205.patch b/debian/patches/issue205.patch
new file mode 100644
index 0000000..02e15a8
--- /dev/null
+++ b/debian/patches/issue205.patch
@@ -0,0 +1,33 @@
+Description: Import patch from upstream (1.5.1 regression from 1.5.0)
+Author: Mathieu Malaterre <malat at debian.org>
+Forwarded: not-needed, http://code.google.com/p/openjpeg/source/detail?spec=svn2423&r=2423
+
+Index: openjpeg-1.5.1/libopenjpeg/j2k.c
+===================================================================
+--- openjpeg-1.5.1.orig/libopenjpeg/j2k.c 2012-09-13 09:58:39.000000000 +0200
++++ openjpeg-1.5.1/libopenjpeg/j2k.c 2014-03-17 09:26:49.919939351 +0100
+@@ -1513,24 +1513,6 @@
+ truncate = 1; /* Case of a truncate codestream */
+ }
+
+- {/* chop padding bytes: */
+- unsigned char *s, *e;
+-
+- s = cio_getbp(cio);
+- e = s + len;
+-
+- if(len > 8) s = e - 8;
+-
+- if(e[-2] == 0x00 && e[-1] == 0x00) /* padding bytes */
+- {
+- while(e > s)
+- {
+- if(e[-2] == 0xff && e[-1] == 0xd9) break;
+- --len; --e; truncate = 1;
+- }
+- }
+- }
+-
+ data = j2k->tile_data[curtileno];
+ data = (unsigned char*) opj_realloc(data, (j2k->tile_len[curtileno] + len) * sizeof(unsigned char));
+
diff --git a/debian/patches/series b/debian/patches/series
index 22cf2bd..5f8c705 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,5 @@
defaulttmpfile.patch
fixjniinstall.patch
fixjnisoname.patch
+issue205.patch
+fixpthread.patch
diff --git a/debian/rules b/debian/rules
index 733983f..cdf3a02 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,7 +12,7 @@ JAVA_HOME=/usr/lib/jvm/default-java
dh $@ --buildsystem=cmake --parallel --with javahelper
CMAKE_EXTRA_FLAGS += -DCMAKE_SKIP_RPATH=ON \
- -DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo \
+ -DCMAKE_BUILD_TYPE:STRING=None \
-DOPENJPEG_INSTALL_LIB_DIR:STRING=lib/$(DEB_HOST_MULTIARCH) \
-DBUILD_CODEC:BOOL=ON \
-DBUILD_JPIP:BOOL=ON \
@@ -38,7 +38,8 @@ override_dh_installinit:
# http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a2be068c
override_dh_auto_install:
- sed -i -e "s/FATAL_ERROR/STATUS/g" ./obj-*/CMakeFiles/Export/lib/*/openjpeg-1.5/OpenJPEGTargets-relwithdebinfo.cmake
+ sed -i -e "s/FATAL_ERROR/STATUS/g" ./obj-*/CMakeFiles/Export/lib/*/openjpeg-1.5/OpenJPEGTargets-none.cmake
+ sed -i -e "s/FATAL_ERROR/STATUS/g" ./obj-*/CMakeFiles/Export/lib/*/openjpeg-1.5/OpenJPEGTargets.cmake
dh_auto_install
get-orig-source:
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-phototools/openjpeg.git
More information about the Pkg-phototools-commits
mailing list