[Pkg-phototools-commits] [SCM] openjpeg packaging branch, master, updated. 1.3+dfsg-4-67-g73a4249

Mathieu Malaterre mathieu.malaterre at gmail.com
Fri Apr 20 11:24:32 UTC 2012 

The following commit has been merged in the master branch:
commit 73a4249ac357fac603e70e4ca513c619dd080fbf
Author: Mathieu Malaterre <mathieu.malaterre at gmail.com>
Date:   Fri Apr 20 11:51:05 2012 +0200

    Update d/changelog with changes
    
    Use DEP3 for patches

diff --git a/debian/changelog b/debian/changelog
index c1cf37f..8c1a469 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,13 +1,18 @@
-openjpeg (1.5.0-2) UNRELEASED; urgency=low
+openjpeg (1.5.0-2) experimental; urgency=low
 
   * Adding libopenjpeg-java. Closes: #510443
+  * Update d/control so that it is easier to backport to stable
   * Provide a fix for cmake commit a2be068c
+  * Provide a symlinks openjpeg.h -> openjpeg-1.5/openjpeg.h for easier
+    transition
   * Add openjpip-server package: openjpip-server
-  * Add openjpip java based clients packages
+   - Add init script
+   - Fix default location of tempfile to be in /tmp
+  * Add openjpip java based clients packages:
    - openjpip-viewer
    - openjpip-viewer-xerces
 
- -- Mathieu Malaterre <malat at debian.org>  Thu, 19 Apr 2012 13:05:06 +0200
+ -- Mathieu Malaterre <malat at debian.org>  Fri, 20 Apr 2012 11:45:07 +0200
 
 openjpeg (1.5.0-1) experimental; urgency=low
 
diff --git a/debian/control b/debian/control
index be67046..7f243c7 100644
--- a/debian/control
+++ b/debian/control
@@ -104,7 +104,7 @@ Description: JPEG 2000 java based viewer for basic remote JPIP access
 Package: openjpip-server
 Section: graphics
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libwww-perl
+Depends: ${shlibs:Depends}, ${misc:Depends}, libwww-perl, apache2.2-bin, spawn-fcgi (>= 1.6.1)
 Description: JPIP server for JPEG 2000 files
  OpenJPIP software is an implementation of JPEG 2000 Part9: Interactivity tools,
  APIs and protocols (JPIP). For more info about JPIP, check the website:
diff --git a/debian/openjpip-dec-server.README.Debian b/debian/openjpip-dec-server.README.Debian
new file mode 100644
index 0000000..1e98f90
--- /dev/null
+++ b/debian/openjpip-dec-server.README.Debian
@@ -0,0 +1,33 @@
+openjpip-server will likely crash in some obscure way if you provide improper JP2 file.
+To produce proper JPIP compatible JP2 file, simply use:
+
+$ image_to_j2k -i copenhague1.tif -o copenhague1.jp2 -p RPCL -c [64,64] -t 640,480 -jpip -TP R
+
+Note:
+-jpip Embed index table box into the output JP2 file (compulsory for JPIP)
+-TP R Partition a tile into tile parts of different resolution levels (compulsory for JPT-stream)
+
+Warning: -jpip option is really important it adds the cidx/fidx superbox to the
+file. Without this information, openjpip server will simply crash on your input
+file. Make sure all file accessible from within openjpip server have cidx/fidx
+superbox. At the time of writing, kakadu does not support generating cidx/fidx
+superbox
+
+See also Annex I Indexing JPEG 2000 files for JPIP, p90:
+http://www.jpeg.org/public/fcd15444-9v2.pdf
+
+(Optional) Embed metadata into JP2 file
+
+$ addXMLinJP2 copenhague1.jp2 copenhague1.xml
+
+Input metadata file "copenhague1.xml" looks like:
+
+    <xmlbox>
+      <roi name="island" x="1890" y="1950" w="770" h="310"/>
+      <roi name="ship" x="750" y="330" w="100" h="60"/>
+      <roi name="airport" x="650" y="1800" w="650" h="800"/>
+      <roi name="harbor" x="4200" y="1650" w="130" h="130"/>
+      <irt refimg="name1.jp2" m1="0.50" m2="-0.50" m3="0" m4="0.80" m5="-0.80" m6="0" m7="500" m8="1000" m9="0"/>
+    </xmlbox>
+
+ -- Mathieu Malaterre <malat at debian.org>  Fri, 20 Apr 2012 11:45:07 +0200
diff --git a/debian/openjpip-server.README.Debian b/debian/openjpip-server.README.Debian
index 5d612c0..b614ee8 100644
--- a/debian/openjpip-server.README.Debian
+++ b/debian/openjpip-server.README.Debian
@@ -11,4 +11,9 @@ In yet another shell you can start a viewer:
 
 $ opj_viewer http://localhost/openjpip 16.jp2
 
+
+WARNING: openjpip server requires that JP2 file are proper JPIP compatible
+files. See openjpip-dec-server package for more information on how to produces
+such files.
+
  -- Mathieu Malaterre <malat at debian.org>  Thu, 19 Apr 2012 13:05:06 +0200
diff --git a/debian/openjpip-server.install b/debian/openjpip-server.install
index 7041d2e..77e3817 100644
--- a/debian/openjpip-server.install
+++ b/debian/openjpip-server.install
@@ -1 +1,3 @@
 usr/bin/opj_server usr/lib/openjpip-server
+debian/openjpip.load /etc/apache2/mods-available
+debian/openjpip.conf /etc/apache2/mods-available
diff --git a/debian/openjpip-server.openjpip.init b/debian/openjpip-server.openjpip.init
index 8b56961..32acffd 100644
--- a/debian/openjpip-server.openjpip.init
+++ b/debian/openjpip-server.openjpip.init
@@ -1,14 +1,12 @@
 #!/bin/sh
 ### BEGIN INIT INFO
 # Provides:          openjpip
-# Required-Start:    $network $local_fs
-# Required-Stop:
+# Required-Start:    $network $local_fs $remote_fs
+# Required-Stop:     $remote_fs
 # Default-Start:     2 3 4 5
 # Default-Stop:      0 1 6
 # Short-Description: openjpip server
 # Description:       JPIP server for OpenJPEG
-#                    <...>
-#                    <...>
 ### END INIT INFO
 
 # Author: Mathieu Malaterre <malat at debian.org>
diff --git a/debian/openjpip-server.prerm b/debian/openjpip-server.prerm
new file mode 100644
index 0000000..7cfde35
--- /dev/null
+++ b/debian/openjpip-server.prerm
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+set -e
+
+#DEBHELPER#
+
+if [ "$1" != "remove" -a "$1" != "purge" ]; then
+	exit 0
+fi
+
+if [ -e /etc/apache2/apache2.conf ]; then
+	a2dismod openjpip || true
+fi
+
+exit 0
diff --git a/debian/openjpip.conf b/debian/openjpip.conf
new file mode 100644
index 0000000..796a360
--- /dev/null
+++ b/debian/openjpip.conf
@@ -0,0 +1,4 @@
+# This is the config file for openjpip-server
+<IfModule mod_fastcgi.c>
+FastCGIExternalServer /var/www/openjpip -host localhost:3000
+</IfModule>
diff --git a/debian/openjpip.load b/debian/openjpip.load
new file mode 100644
index 0000000..e69de29
diff --git a/debian/patches/addxml2.patch b/debian/patches/addxml2.patch
new file mode 100644
index 0000000..82947d2
--- /dev/null
+++ b/debian/patches/addxml2.patch
@@ -0,0 +1,24 @@
+Description: missing rules for addXMLinJP2
+Author: Mathieu Malaterre <malat at debian.org>
+Forwarded: http://code.google.com/p/openjpeg/source/detail?r=1637
+Last-Update: 2012-04-20
+
+Index: openjpeg/applications/jpip/util/CMakeLists.txt
+===================================================================
+--- openjpeg.orig/applications/jpip/util/CMakeLists.txt	2012-04-20 13:13:26.905937928 +0200
++++ openjpeg/applications/jpip/util/CMakeLists.txt	2012-04-20 13:14:18.869452228 +0200
+@@ -4,6 +4,14 @@
+   ${FCGI_INCLUDE_DIRS}
+ )
+ 
++# Tool to embed metadata into JP2 file
++ADD_EXECUTABLE(addXMLinJP2 addXMLinJP2.c)
++# Install exe
++INSTALL(TARGETS addXMLinJP2
++  EXPORT OpenJPEGTargets
++  DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications
++  )
++
+ IF(BUILD_JPIP_SERVER)
+   
+   SET(OPJ_SERVER_SRCS
diff --git a/debian/patches/defaulttmpfile.patch b/debian/patches/defaulttmpfile.patch
new file mode 100644
index 0000000..a818471
--- /dev/null
+++ b/debian/patches/defaulttmpfile.patch
@@ -0,0 +1,18 @@
+Description: tmp file is supposed to be writable
+Author: Mathieu Malaterre <malat at debian.org>
+Forwarded: not-needed
+Last-Update: 2012-04-20
+
+Index: openjpeg/applications/jpip/libopenjpip/openjpip.c
+===================================================================
+--- openjpeg.orig/applications/jpip/libopenjpip/openjpip.c	2012-04-20 11:41:15.093920674 +0200
++++ openjpeg/applications/jpip/libopenjpip/openjpip.c	2012-04-20 11:41:27.837453425 +0200
+@@ -127,7 +127,7 @@
+ void send_responsedata( server_record_t *rec, QR_t *qr)
+ {
+   int fd;
+-  char tmpfname[] = "tmpjpipstream.jpp";
++  const char tmpfname[] = "/tmp/tmpjpipstream.jpp";
+   Byte_t *jpipstream;
+   Byte8_t len_of_jpipstream;
+ 
diff --git a/debian/patches/installjava.patch b/debian/patches/installjava.patch
index 796f819..3268a5a 100644
--- a/debian/patches/installjava.patch
+++ b/debian/patches/installjava.patch
@@ -1,3 +1,8 @@
+Description: missing java installation rules
+Author: Mathieu Malaterre <malat at debian.org>
+Forwarded: http://code.google.com/p/openjpeg/source/detail?r=1636
+Last-Update: 2012-04-20
+
 Index: openjpeg-1.5.0/applications/JavaOpenJPEG/CMakeLists.txt
 ===================================================================
 --- openjpeg-1.5.0.orig/applications/JavaOpenJPEG/CMakeLists.txt	2012-04-19 14:27:17.013900193 +0200
diff --git a/debian/patches/relativeincludepath.patch b/debian/patches/relativeincludepath.patch
index bee04db..2ebe4b4 100644
--- a/debian/patches/relativeincludepath.patch
+++ b/debian/patches/relativeincludepath.patch
@@ -1,3 +1,8 @@
+Description: fix relative installation in multiarch system
+Author: Mathieu Malaterre <malat at debian.org>
+Forwarded: http://code.google.com/p/openjpeg/source/detail?r=1630
+Last-Update: 2012-04-20
+
 Index: openjpeg-1.5.0/CMake/OpenJPEGConfig.cmake.in
 ===================================================================
 --- openjpeg-1.5.0.orig/CMake/OpenJPEGConfig.cmake.in	2012-04-19 12:38:27.933915198 +0200
diff --git a/debian/patches/series b/debian/patches/series
index 293ba54..b1640cd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,5 @@ addmathlib.patch
 fixsoname.patch
 relativeincludepath.patch
 installjava.patch
+defaulttmpfile.patch
+addxml2.patch

-- 
openjpeg packaging

More information about the Pkg-phototools-commits mailing list