[Pkg-phototools-commits] [openjpeg] 01/01: import change for 1.5.2
Mathieu Malaterre
malat at moszumanska.debian.org
Thu Mar 27 19:25:07 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 14810cece5493a4d7ebe9fab1bcc591c0de4f83f
Author: Mathieu Malaterre <mathieu.malaterre at gmail.com>
Date: Thu Mar 27 20:20:12 2014 +0100
import change for 1.5.2
---
debian/patches/00-fix_build_for_debian.patch | 80 ----------------------
..._encode_and_prevent_buffer_overrun_in_MCT.patch | 38 ----------
debian/patches/fixjniinstall.patch | 39 -----------
debian/patches/fixpthread.patch | 38 ----------
debian/patches/issue205.patch | 33 ---------
5 files changed, 228 deletions(-)
diff --git a/debian/patches/00-fix_build_for_debian.patch b/debian/patches/00-fix_build_for_debian.patch
deleted file mode 100755
index dfe8d55..0000000
--- a/debian/patches/00-fix_build_for_debian.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 30_fix_build_for_debian.dpatch by Robin Cornelius <robin.cornelius at gmail.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Dont apply the -s strip flag to the shared lib debian will do it for us
-## DP: where necessary
-## DP: Remove unnecessary linkage on lstdc++ and lm and add missing linkage for -lm
-
- at DPATCH@
-
-Index: ./Makefile
-===================================================================
---- ./Makefile (revision 96)
-+++ ./Makefile (working copy)
-@@ -18,8 +18,7 @@
- # Converts cr/lf to just lf
- DOS2UNIX = dos2unix
-
--COMPILERFLAGS = -Wall -O3 -ffast-math -std=c99 -fPIC
--LIBRARIES = -lstdc++
-+COMPILERFLAGS = -Wall -O3 -ffast-math -std=c99 -fPIC -g $(EXTRA_CFLAGS)
-
- MODULES = $(SRCS:.c=.o)
- CFLAGS = $(COMPILERFLAGS) $(INCLUDE)
-@@ -54,7 +53,7 @@
- $(AR) r $@ $(MODULES)
-
- $(SHAREDLIB): $(MODULES)
-- $(CC) -s -shared -Wl,-soname,$(LIBNAME) -o $@ $(MODULES) $(LIBRARIES)
-+ $(CC) -shared -Wl,-soname,$(LIBNAME) -o $@ $(MODULES) -lm
-
- install: OpenJPEG
- install -d '$(DESTDIR)$(INSTALL_LIBDIR)' '$(DESTDIR)$(INSTALL_INCLUDE)'
-
-Index: ./indexer_JPIP/Makefile
-===================================================================
---- ./indexer_JPIP/Makefile (revision 95)
-+++ ./indexer_JPIP/Makefile (working copy)
-@@ -1,7 +1,6 @@
- CC = gcc
-
--LDFLAGS = -lm
--CFLAGS = -Wall
-+CFLAGS = -Wall $(EXTRA_CFLAGS)
-
- all: index_create
-
-Index: ./codec/Makefile
-===================================================================
---- ./codec/Makefile (revision 96)
-+++ ./codec/Makefile (working copy)
-@@ -1,13 +1,13 @@
- # Makefile for the main OpenJPEG codecs: j2k_to_image and image_to_j2k
-
--CFLAGS = -O3 -lstdc++ # -g -p -pg
-+CFLAGS = $(EXTRA_CFLAGS) # -g -p -pg
-
- all: j2k_to_image image_to_j2k
-
--j2k_to_image: j2k_to_image.c ../libopenjpeg.a
-+j2k_to_image: j2k_to_image.c
- gcc $(CFLAGS) compat/getopt.c index.c convert.c j2k_to_image.c -o j2k_to_image -L.. -lopenjpeg -I ../libopenjpeg/ -lm -ltiff
-
--image_to_j2k: image_to_j2k.c ../libopenjpeg.a
-+image_to_j2k: image_to_j2k.c
- gcc $(CFLAGS) compat/getopt.c index.c convert.c image_to_j2k.c -o image_to_j2k -L.. -lopenjpeg -I ../libopenjpeg/ -lm -ltiff
-
- clean:
-Index: ./mj2/Makefile
-===================================================================
---- ./mj2/MakeFile 2008-03-10 08:50:35.000000000 +0000
-+++ ./mj2/Makefile 2009-04-21 11:47:59.000000000 +0100
-@@ -1,6 +1,6 @@
- # Makefile for the MJ2 codecs of the OpenJPEG library: frames_to_mj2, mj2_to_frames, extract_j2k_from_mj2 and wrap_j2k_in_mj2
-
--CFLAGS = -O3 -lstdc++ # -g -p -pg
-+CFLAGS = ${EXTRA_CFLAGS} # -O3 -lstdc++ # -g -p -pg
-
- all: frames_to_mj2 mj2_to_frames extract_j2k_from_mj2 wrap_j2k_in_mj2
-
diff --git a/debian/patches/04-fix_alpha_encode_and_prevent_buffer_overrun_in_MCT.patch b/debian/patches/04-fix_alpha_encode_and_prevent_buffer_overrun_in_MCT.patch
deleted file mode 100755
index 8af2cac..0000000
--- a/debian/patches/04-fix_alpha_encode_and_prevent_buffer_overrun_in_MCT.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## Fix alpha encode by preventing a buffer overrun when processing MCT tables for more that 3 components.dpatch by Robin Cornelius <robin.cornelius at gmail.com>
-
- at DPATCH@
-
---- ./libopenjpeg/t1.c 2009-08-16 09:17:53.000000000 +0100
-+++ ./libopenjpeg/t1.c 2009-08-16 09:21:42.000000000 +0100
-@@ -738,14 +738,27 @@
- double stepsize,
- int numcomps)
- {
-- double w1, w2, wmsedec;
-+ double w1 = 1, w2, wmsedec;
-+
-+ // Prevent running an MCT on more than 3 components. NB openjpeg v2.0 will support this via
-+ // custom MCT tables that can be passed as encode parameters, 1.3 cannot support this as it
-+ // uses a static table of 3 entries and there for can only cope with 3 components with out an
-+ // array overflow
-+
-+ if(numcomps==3) {
-+ if (qmfbid == 1) {
-+ w1 = (numcomps > 1) ? mct_getnorm(compno) : 1.0;
-+ } else {
-+ w1 = (numcomps > 1) ? mct_getnorm_real(compno) : 1.0;
-+ }
-+ }
-+
- if (qmfbid == 1) {
-- w1 = (numcomps > 1) ? mct_getnorm(compno) : 1.0;
- w2 = dwt_getnorm(level, orient);
- } else { /* if (qmfbid == 0) */
-- w1 = (numcomps > 1) ? mct_getnorm_real(compno) : 1.0;
- w2 = dwt_getnorm_real(level, orient);
- }
-+
- wmsedec = w1 * w2 * stepsize * (1 << bpno);
- wmsedec *= wmsedec * nmsedec / 8192.0;
-
diff --git a/debian/patches/fixjniinstall.patch b/debian/patches/fixjniinstall.patch
deleted file mode 100644
index 35bf91f..0000000
--- a/debian/patches/fixjniinstall.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-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-1) UNRELEASED; urgency=low
- .
- * New upstream. Closes: #687528, #681458, #691156
-Author: Mathieu Malaterre <malat at debian.org>
-Bug-Debian: http://bugs.debian.org/681458
-Bug-Debian: http://bugs.debian.org/687528
-Bug-Debian: http://bugs.debian.org/691156
-
----
-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/JavaOpenJPEG/CMakeLists.txt
-+++ openjpeg-1.5.1/applications/JavaOpenJPEG/CMakeLists.txt
-@@ -29,7 +29,7 @@ TARGET_LINK_LIBRARIES(openjpegjni ${OPEN
- IF(WIN32)
- SET(OPENJPEG_INSTALL_JNI_DIR ${OPENJPEG_INSTALL_BIN_DIR})
- ELSE()
-- SET(OPENJPEG_INSTALL_JNI_DIR ${OPENJPEG_INSTALL_LIB_DIR})
-+ SET(OPENJPEG_INSTALL_JNI_DIR ${OPENJPEG_INSTALL_LIB_DIR}/jni)
- ENDIF()
-
- INSTALL(TARGETS openjpegjni
diff --git a/debian/patches/fixpthread.patch b/debian/patches/fixpthread.patch
deleted file mode 100644
index 4862425..0000000
--- a/debian/patches/fixpthread.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-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
deleted file mode 100644
index 02e15a8..0000000
--- a/debian/patches/issue205.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-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));
-
--
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