[Pkg-phototools-commits] [SCM] openjpeg packaging branch, master, updated. 1.3+dfsg-4-63-g70722e0
Mathieu Malaterre
mathieu.malaterre at gmail.com
Thu Apr 19 13:01:06 UTC 2012
The following commit has been merged in the master branch:
commit 70722e0377ce556484f815949aeae7076d521639
Author: Mathieu Malaterre <mathieu.malaterre at gmail.com>
Date: Thu Apr 19 14:58:11 2012 +0200
Add OpenJPIP packaging
diff --git a/debian/changelog b/debian/changelog
index 39b1b27..c1cf37f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,10 @@ openjpeg (1.5.0-2) UNRELEASED; urgency=low
* Adding libopenjpeg-java. Closes: #510443
* Provide a fix for cmake commit a2be068c
+ * Add openjpip-server package: openjpip-server
+ * 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
diff --git a/debian/control b/debian/control
index 4b77dff..c1cb170 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Homepage: http://www.openjpeg.org
Build-Depends:
debhelper (>= 9)
, cmake
- , default-jdk
+ , default-jdk, libxerces2-java,
, libtiff5-dev
, libpng-dev
, liblcms2-dev
@@ -62,12 +62,67 @@ Description: debug symbols for libopenjpeg5, a JPEG 2000 image library
OpenJPEG library, allowing debugging of a program using OpenJPEG to
access debugging details within the library itself.
+Package: openjpip-dec-server
+Section: graphics
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: tool to allow caching of JPEG 2000 files using JPIP protocol
+ This is client side application for caching remote JPEG 2000 using the JPIP
+ protocol. This command line application needs to run on the client side to
+ allow application such as opj_viewer or opj_viewer_xerces to view images.
+
+Package: openjpip-viewer-xerces
+Section: graphics
+Architecture: any
+Depends: ${misc:Depends}, ${java:Depends}, openjpip-dec-server
+Description: JPEG 2000 java based viewer for advanced remote JPIP access
+ Java based client to view remote JPEG 2000 using JPIP protocol.
+ This is a simple java viewer to allow:
+ .
+ - Scale up request: Enlarge the window
+ - ROI request: Select a region by mouse click and drag, then click inside the
+ red frame of the selected region
+ - Annotate image with ROI information in XML metadata: Click button "Region
+ Of Interest"
+ - Open a new window presenting an aligned image with a locally stored image:
+ Click button "Image Registration" (Under Construction)
+
+Package: openjpip-viewer
+Section: graphics
+Architecture: any
+Depends: ${misc:Depends}, ${java:Depends}, openjpip-dec-server
+Description: JPEG 2000 java based viewer for basic remote JPIP access
+ Java based client to view remote JPEG 2000 using JPIP protocol.
+ This is a simple java viewer to allow:
+ .
+ - Scale up request: Enlarge the window
+ - ROI request: Select a region by mouse click and drag, then click inside the
+ red frame of the selected region
+
+Package: openjpip-server
+Section: graphics
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+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:
+ http://www.jpeg.org/jpeg2000/j2kpart9.html. The current implementation uses
+ some results from the 2KAN project (http://www.2kan.org).
+ .
+ First Version 1.0 covers:
+ .
+ - JPT-stream (Tile based) and JPP-stream (Precinct based) media types
+ - Session, channels, cache model managements
+ - JPIP over HTTP
+ - Indexing JPEG 2000 files
+ - Embedding XML formatted metadata
+ - Region Of Interest (ROI) requests
+
+
Package: openjpeg-tools
Section: graphics
Architecture: any
-Depends:
- ${shlibs:Depends}
- , ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
Description: command-line tools using the JPEG 2000 library
This package provides with command-line tools allowing for conversions between
several formats and also provides tools for encoding and decoding
diff --git a/debian/openjpeg-tools.install b/debian/openjpeg-tools.install
index 98d1583..8d15601 100644
--- a/debian/openjpeg-tools.install
+++ b/debian/openjpeg-tools.install
@@ -1,2 +1,11 @@
-usr/bin
+usr/bin/j2k_to_image
+usr/bin/image_to_j2k
+usr/bin/j2k_dump
+usr/bin/JPWL_image_to_j2k
+usr/bin/JPWL_j2k_to_image
+usr/bin/frames_to_mj2
+usr/bin/mj2_to_frames
+usr/bin/extract_j2k_from_mj2
+usr/bin/wrap_j2k_in_mj2
+usr/bin/test_index
usr/share/man/man1
diff --git a/debian/openjpip-dec-server.install b/debian/openjpip-dec-server.install
new file mode 100644
index 0000000..912b160
--- /dev/null
+++ b/debian/openjpip-dec-server.install
@@ -0,0 +1,3 @@
+usr/bin/opj_dec_server
+usr/bin/jpip_to_jp2
+usr/bin/jpip_to_j2k
diff --git a/debian/openjpip-server.install b/debian/openjpip-server.install
new file mode 100644
index 0000000..7041d2e
--- /dev/null
+++ b/debian/openjpip-server.install
@@ -0,0 +1 @@
+usr/bin/opj_server usr/lib/openjpip-server
diff --git a/debian/openjpip-viewer-xerces.install b/debian/openjpip-viewer-xerces.install
new file mode 100644
index 0000000..65f2145
--- /dev/null
+++ b/debian/openjpip-viewer-xerces.install
@@ -0,0 +1 @@
+usr/share/opj_viewer_xerces.jar
diff --git a/debian/openjpip-viewer.install b/debian/openjpip-viewer.install
new file mode 100644
index 0000000..3271c6b
--- /dev/null
+++ b/debian/openjpip-viewer.install
@@ -0,0 +1 @@
+usr/share/opj_viewer.jar
diff --git a/debian/patches/installjava.patch b/debian/patches/installjava.patch
index 14fe16f..796f819 100644
--- a/debian/patches/installjava.patch
+++ b/debian/patches/installjava.patch
@@ -1,7 +1,7 @@
-Index: openjpeg/applications/JavaOpenJPEG/CMakeLists.txt
+Index: openjpeg-1.5.0/applications/JavaOpenJPEG/CMakeLists.txt
===================================================================
---- openjpeg.orig/applications/JavaOpenJPEG/CMakeLists.txt 2012-04-19 13:39:11.000000000 +0200
-+++ openjpeg/applications/JavaOpenJPEG/CMakeLists.txt 2012-04-19 13:44:48.859653460 +0200
+--- openjpeg-1.5.0.orig/applications/JavaOpenJPEG/CMakeLists.txt 2012-04-19 14:27:17.013900193 +0200
++++ openjpeg-1.5.0/applications/JavaOpenJPEG/CMakeLists.txt 2012-04-19 14:27:26.569937384 +0200
@@ -4,6 +4,9 @@
SET(openjpegjni_SRCS
JavaOpenJPEGDecoder.c
@@ -37,5 +37,172 @@ Index: openjpeg/applications/JavaOpenJPEG/CMakeLists.txt
)
+
+INSTALL(FILES ${LIBRARY_OUTPUT_PATH}/openjpeg.jar
-+ DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT JavaModule
++ DESTINATION ${OPENJPEG_INSTALL_SHARE_DIR} COMPONENT JavaModule
+)
+Index: openjpeg-1.5.0/applications/jpip/util/CMakeLists.txt
+===================================================================
+--- openjpeg-1.5.0.orig/applications/jpip/util/CMakeLists.txt 2012-04-19 14:29:10.737939774 +0200
++++ openjpeg-1.5.0/applications/jpip/util/CMakeLists.txt 2012-04-19 14:29:14.089441659 +0200
+@@ -47,81 +47,95 @@
+ ENDFOREACH(exe)
+
+ # Build the two java clients:
+-FIND_PACKAGE(Java 1.5 REQUIRED) # javac, jar
++FIND_PACKAGE(Java 1.5 COMPONENTS Development) # javac, jar
+
+-# 1. opj_viewer
+-# build dep list:
+-file(GLOB java1_srcs "opj_viewer/src/*.java")
+-
+-# make sure target javac dir exists:
+-file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/classes1)
+-# Build java
+-ADD_CUSTOM_COMMAND(
+- OUTPUT ${LIBRARY_OUTPUT_PATH}/opj_viewer.jar
+- COMMAND ${Java_JAVAC_EXECUTABLE}
+- ${java1_srcs} -d ${CMAKE_CURRENT_BINARY_DIR}/classes1
+- COMMAND ${Java_JAR_EXECUTABLE} cfm ${LIBRARY_OUTPUT_PATH}/opj_viewer.jar
+- ${CMAKE_CURRENT_SOURCE_DIR}/opj_viewer/dist/manifest.txt -C
+- ${CMAKE_CURRENT_BINARY_DIR}/classes1 .
+- DEPENDS ${java1_srcs}
+- ${CMAKE_CURRENT_SOURCE_DIR}/opj_viewer/dist/manifest.txt
+- COMMENT "javac *.java; jar cvf -> opj_viewer.jar"
+-)
+-
+-# name the target
+-ADD_CUSTOM_TARGET(OPJViewerJar ALL
+- DEPENDS ${LIBRARY_OUTPUT_PATH}/opj_viewer.jar
+- COMMENT "building opj_viewer.jar"
+-)
+-
+-# 2. opj_viewer_xerces
+-# search for package org.apache.xerces.parsers
+-find_file(APACHE_XERCES_JAR
+- NAMES xerces-j2.jar xercesImpl.jar
+- PATHS /usr/share/java/
+- NO_DEFAULT_PATH
+- )
+-mark_as_advanced(APACHE_XERCES_JAR)
+-
+-if(EXISTS ${APACHE_XERCES_JAR})
+- configure_file(
+- ${CMAKE_CURRENT_SOURCE_DIR}/opj_viewer_xerces/dist/manifest.txt.in
+- ${CMAKE_CURRENT_BINARY_DIR}/opj_viewer_xerces/dist/manifest.txt
+- @ONLY
+- )
++# Only build the java viewer if dev is found:
++if(Java_Development_FOUND AND Java_JAVAC_EXECUTABLE)
++ set(jflags $ENV{JFLAGS})
++ # 1. opj_viewer
+ # build dep list:
+- file(GLOB java2_srcs "opj_viewer_xerces/src/*.java")
+-
+- # Need some common files:
+- list(APPEND java2_srcs
+- ${CMAKE_CURRENT_SOURCE_DIR}/opj_viewer/src/ImageManager.java
+- ${CMAKE_CURRENT_SOURCE_DIR}/opj_viewer/src/ImgdecClient.java
+- ${CMAKE_CURRENT_SOURCE_DIR}/opj_viewer/src/JPIPHttpClient.java
+- ${CMAKE_CURRENT_SOURCE_DIR}/opj_viewer/src/MML.java
+- ${CMAKE_CURRENT_SOURCE_DIR}/opj_viewer/src/PnmImage.java
+- ${CMAKE_CURRENT_SOURCE_DIR}/opj_viewer/src/RegimViewer.java
+- ${CMAKE_CURRENT_SOURCE_DIR}/opj_viewer/src/ResizeListener.java
+- )
++ file(GLOB java1_srcs "opj_viewer/src/*.java")
+
+ # make sure target javac dir exists:
+- file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/classes2)
++ file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/classes1)
+ # Build java
+ ADD_CUSTOM_COMMAND(
+- OUTPUT ${LIBRARY_OUTPUT_PATH}/opj_viewer_xerces.jar
+- COMMAND ${Java_JAVAC_EXECUTABLE}
+- -classpath ${APACHE_XERCES_JAR}
+- ${java2_srcs} -d ${CMAKE_CURRENT_BINARY_DIR}/classes2
+- COMMAND ${Java_JAR_EXECUTABLE} cfm ${LIBRARY_OUTPUT_PATH}/opj_viewer_xerces.jar
+- ${CMAKE_CURRENT_BINARY_DIR}/opj_viewer_xerces/dist/manifest.txt
+- -C ${CMAKE_CURRENT_BINARY_DIR}/classes2 .
+- DEPENDS ${java2_srcs}
+- ${CMAKE_CURRENT_SOURCE_DIR}/opj_viewer_xerces/dist/manifest.txt.in
+- COMMENT "javac *.java; jar cvf -> opj_viewer_xerces.jar"
++ OUTPUT ${LIBRARY_OUTPUT_PATH}/opj_viewer.jar
++ COMMAND ${Java_JAVAC_EXECUTABLE} ${jflags}
++ ${java1_srcs} -d ${CMAKE_CURRENT_BINARY_DIR}/classes1
++ COMMAND ${Java_JAR_EXECUTABLE} cfm ${LIBRARY_OUTPUT_PATH}/opj_viewer.jar
++ ${CMAKE_CURRENT_SOURCE_DIR}/opj_viewer/dist/manifest.txt -C
++ ${CMAKE_CURRENT_BINARY_DIR}/classes1 .
++ DEPENDS ${java1_srcs}
++ ${CMAKE_CURRENT_SOURCE_DIR}/opj_viewer/dist/manifest.txt
++ COMMENT "javac *.java; jar cvf -> opj_viewer.jar"
+ )
+
+ # name the target
+- ADD_CUSTOM_TARGET(OPJViewerXercesJar ALL
+- DEPENDS ${LIBRARY_OUTPUT_PATH}/opj_viewer_xerces.jar
+- COMMENT "building opj_viewer_xerces.jar"
++ ADD_CUSTOM_TARGET(OPJViewerJar ALL
++ DEPENDS ${LIBRARY_OUTPUT_PATH}/opj_viewer.jar
++ COMMENT "building opj_viewer.jar"
++ )
++
++ INSTALL(FILES ${LIBRARY_OUTPUT_PATH}/opj_viewer.jar
++ DESTINATION ${OPENJPEG_INSTALL_SHARE_DIR} COMPONENT JavaModule
++ )
++
++ # 2. opj_viewer_xerces
++ # search for package org.apache.xerces.parsers
++ find_file(APACHE_XERCES_JAR
++ NAMES xerces-j2.jar xercesImpl.jar
++ PATHS /usr/share/java/
++ NO_DEFAULT_PATH
+ )
++ mark_as_advanced(APACHE_XERCES_JAR)
++
++ if(EXISTS ${APACHE_XERCES_JAR})
++ configure_file(
++ ${CMAKE_CURRENT_SOURCE_DIR}/opj_viewer_xerces/dist/manifest.txt.in
++ ${CMAKE_CURRENT_BINARY_DIR}/opj_viewer_xerces/dist/manifest.txt
++ @ONLY
++ )
++ # build dep list:
++ file(GLOB java2_srcs "opj_viewer_xerces/src/*.java")
++
++ # Need some common files:
++ list(APPEND java2_srcs
++ ${CMAKE_CURRENT_SOURCE_DIR}/opj_viewer/src/ImageManager.java
++ ${CMAKE_CURRENT_SOURCE_DIR}/opj_viewer/src/ImgdecClient.java
++ ${CMAKE_CURRENT_SOURCE_DIR}/opj_viewer/src/JPIPHttpClient.java
++ ${CMAKE_CURRENT_SOURCE_DIR}/opj_viewer/src/MML.java
++ ${CMAKE_CURRENT_SOURCE_DIR}/opj_viewer/src/PnmImage.java
++ ${CMAKE_CURRENT_SOURCE_DIR}/opj_viewer/src/RegimViewer.java
++ ${CMAKE_CURRENT_SOURCE_DIR}/opj_viewer/src/ResizeListener.java
++ )
++
++ # make sure target javac dir exists:
++ file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/classes2)
++ # Build java
++ ADD_CUSTOM_COMMAND(
++ OUTPUT ${LIBRARY_OUTPUT_PATH}/opj_viewer_xerces.jar
++ COMMAND ${Java_JAVAC_EXECUTABLE} ${jflags}
++ -classpath ${APACHE_XERCES_JAR}
++ ${java2_srcs} -d ${CMAKE_CURRENT_BINARY_DIR}/classes2
++ COMMAND ${Java_JAR_EXECUTABLE} cfm ${LIBRARY_OUTPUT_PATH}/opj_viewer_xerces.jar
++ ${CMAKE_CURRENT_BINARY_DIR}/opj_viewer_xerces/dist/manifest.txt
++ -C ${CMAKE_CURRENT_BINARY_DIR}/classes2 .
++ DEPENDS ${java2_srcs}
++ ${CMAKE_CURRENT_SOURCE_DIR}/opj_viewer_xerces/dist/manifest.txt.in
++ COMMENT "javac *.java; jar cvf -> opj_viewer_xerces.jar"
++ )
++
++ # name the target
++ ADD_CUSTOM_TARGET(OPJViewerXercesJar ALL
++ DEPENDS ${LIBRARY_OUTPUT_PATH}/opj_viewer_xerces.jar
++ COMMENT "building opj_viewer_xerces.jar"
++ )
++
++ INSTALL(FILES ${LIBRARY_OUTPUT_PATH}/opj_viewer_xerces.jar
++ DESTINATION ${OPENJPEG_INSTALL_SHARE_DIR} COMPONENT JavaModule
++ )
++ endif()
++else(Java_Development_FOUND)
++ message(WARNING "No java compiler found. Wont be able to build java viewer")
+ endif()
diff --git a/debian/patches/series b/debian/patches/series
index 397640a..293ba54 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,4 @@
addmathlib.patch
fixsoname.patch
-installjava.patch
relativeincludepath.patch
+installjava.patch
diff --git a/debian/rules b/debian/rules
index 6941dc2..6cb38c0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,7 +16,7 @@ CMAKE_EXTRA_FLAGS += -DCMAKE_SKIP_RPATH=ON \
-DOPENJPEG_INSTALL_LIB_DIR:STRING=lib/$(DEB_HOST_MULTIARCH) \
-DBUILD_CODEC:BOOL=ON \
-DBUILD_JPIP:BOOL=ON \
- -DBUILD_JPIP_SERVER:BOOL=OFF \
+ -DBUILD_JPIP_SERVER:BOOL=ON \
-DBUILD_JPWL:BOOL=ON \
-DBUILD_JAVA:BOOL=ON \
-DBUILD_MJ2:BOOL=ON \
--
openjpeg packaging
More information about the Pkg-phototools-commits
mailing list