[Pkg-phototools-commits] [SCM] openjpeg packaging branch, master, updated. 1.3+dfsg-4-56-g5ffcebf
Mathieu Malaterre
mathieu.malaterre at gmail.com
Mon Apr 16 13:20:52 UTC 2012
The following commit has been merged in the master branch:
commit 5ffcebf6c5f721ded677c623b5904cad68ef007d
Author: Mathieu Malaterre <mathieu.malaterre at gmail.com>
Date: Mon Apr 16 15:19:20 2012 +0200
Move to cmake build system, add myself to uploaders
diff --git a/debian/control b/debian/control
index 1b8a6bc..905f3ca 100644
--- a/debian/control
+++ b/debian/control
@@ -5,10 +5,11 @@ Uploaders:
Robin Cornelius <robin.cornelius at gmail.com>
, David Bremner <bremner at debian.org>
, David Paleino <dapal at debian.org>
+ , Mathieu Malaterre <malat at debian.org>
Homepage: http://www.openjpeg.org
Build-Depends:
debhelper (>= 8)
- , autotools-dev
+ , cmake
, libtiff5-dev
, libpng-dev
, liblcms2-dev
@@ -25,30 +26,30 @@ Package: libopenjpeg-dev
Section: libdevel
Architecture: any
Depends:
- libopenjpeg2 (= ${binary:Version})
+ libopenjpeg5 (= ${binary:Version})
, ${misc:Depends}
-Description: development files for libopenjpeg2, a JPEG 2000 image library
- Libopenjpeg2 is a library for handling the JPEG 2000 image compression format.
+Description: development files for OpenJPEG, a JPEG 2000 image library
+ OpenJPEG is a library for handling the JPEG 2000 image compression format.
JPEG 2000 is a wavelet-based image compression standard and permits progressive
transmission by pixel and resolution accuracy for progressive downloads of an
encoded image. It supports lossless and lossy compression, supports higher
compression than JPEG 1991, and has resilience to errors in the image.
-Package: libopenjpeg2
+Package: libopenjpeg5
Architecture: any
Depends:
${shlibs:Depends}
, ${misc:Depends}
Description: JPEG 2000 image compression/decompression library
- Libopenjpeg2 is a library for handling the JPEG 2000 image compression format.
+ OpenJPEG is a library for handling the JPEG 2000 image compression format.
-Package: libopenjpeg2-dbg
+Package: libopenjpeg5-dbg
Section: debug
Architecture: any
-Depends: libopenjpeg2 (= ${binary:Version}), ${misc:Depends}
-Description: debug symbols for libopenjpeg2, a JPEG 2000 image library
+Depends: libopenjpeg5 (= ${binary:Version}), ${misc:Depends}
+Description: debug symbols for libopenjpeg5, a JPEG 2000 image library
This package contains the debug symbols to match the runtime component of the
- libopenjpeg2 library, allowing debugging of a program using libopenjpeg2 to
+ OpenJPEG library, allowing debugging of a program using OpenJPEG to
access debugging details within the library itself.
Package: openjpeg-tools
diff --git a/debian/libopenjpeg-dev.install b/debian/libopenjpeg-dev.install
index cb5b9b4..b67fe19 100644
--- a/debian/libopenjpeg-dev.install
+++ b/debian/libopenjpeg-dev.install
@@ -1,3 +1,3 @@
usr/include/openjpeg-1.5
usr/lib/libopenjpeg.so
-
+usr/lib/libopenjpeg_JPWL.so
diff --git a/debian/libopenjpeg2.install b/debian/libopenjpeg2.install
deleted file mode 100644
index 3ce037c..0000000
--- a/debian/libopenjpeg2.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/libopenjpeg.so.*
diff --git a/debian/libopenjpeg2.links b/debian/libopenjpeg2.links
deleted file mode 100644
index 594e7a9..0000000
--- a/debian/libopenjpeg2.links
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/libopenjpeg-2.1.3.0.so /usr/lib/libopenjpeg.so.2
diff --git a/debian/libopenjpeg2.symbols b/debian/libopenjpeg2.symbols
deleted file mode 100644
index e59510b..0000000
--- a/debian/libopenjpeg2.symbols
+++ /dev/null
@@ -1,161 +0,0 @@
-libopenjpeg.so.1 libopenjpeg1 #MINVER#
- bio_create at Base 1.3+dfsg
- bio_destroy at Base 1.3+dfsg
- bio_flush at Base 1.3+dfsg
- bio_inalign at Base 1.3+dfsg
- bio_init_dec at Base 1.3+dfsg
- bio_init_enc at Base 1.3+dfsg
- bio_numbytes at Base 1.3+dfsg
- bio_read at Base 1.3+dfsg
- bio_write at Base 1.3+dfsg
- check_EPHuse at Base 1.5.0
- cio_bytein at Base 1.3+dfsg
- cio_byteout at Base 1.3+dfsg
- cio_getbp at Base 1.3+dfsg
- cio_numbytesleft at Base 1.3+dfsg
- cio_read at Base 1.3+dfsg
- cio_seek at Base 1.3+dfsg
- cio_skip at Base 1.3+dfsg
- cio_tell at Base 1.3+dfsg
- cio_write at Base 1.3+dfsg
- dump_array16 at Base 1.5.0
- dwt_calc_explicit_stepsizes at Base 1.3+dfsg
- dwt_decode at Base 1.3+dfsg
- dwt_decode_real at Base 1.3+dfsg
- dwt_encode at Base 1.3+dfsg
- dwt_encode_real at Base 1.3+dfsg
- dwt_getgain at Base 1.3+dfsg
- dwt_getgain_real at Base 1.3+dfsg
- dwt_getnorm at Base 1.3+dfsg
- dwt_getnorm_real at Base 1.3+dfsg
- get_num_max_tile_parts at Base 1.5.0
- j2k_calculate_tp at Base 1.3+dfsg
- j2k_convert_progression_order at Base 1.3+dfsg
- j2k_create_compress at Base 1.3+dfsg
- j2k_create_decompress at Base 1.3+dfsg
- j2k_dec_mstab at Base 1.3+dfsg
- j2k_decode at Base 1.3+dfsg
- j2k_decode_jpt_stream at Base 1.3+dfsg
- j2k_destroy_compress at Base 1.3+dfsg
- j2k_destroy_decompress at Base 1.3+dfsg
-#MISSING: 1.5.0# j2k_dump_cp at Base 1.3+dfsg
-#MISSING: 1.5.0# j2k_dump_image at Base 1.3+dfsg
- j2k_encode at Base 1.3+dfsg
- j2k_prog_order_list at Base 1.3+dfsg
- j2k_setup_decoder at Base 1.3+dfsg
- j2k_setup_encoder at Base 1.3+dfsg
- jp2_create_compress at Base 1.3+dfsg
- jp2_create_decompress at Base 1.3+dfsg
-#MISSING: 1.5.0# jp2_decode at Base 1.3+dfsg
- jp2_destroy_compress at Base 1.3+dfsg
- jp2_destroy_decompress at Base 1.3+dfsg
-#MISSING: 1.5.0# jp2_encode at Base 1.3+dfsg
- jp2_read_jp2h at Base 1.3+dfsg
- jp2_setup_decoder at Base 1.3+dfsg
- jp2_setup_encoder at Base 1.3+dfsg
- jp2_write_jp2h at Base 1.3+dfsg
- jpt_init_msg_header at Base 1.3+dfsg
- jpt_read_VBAS_info at Base 1.3+dfsg
- jpt_read_msg_header at Base 1.3+dfsg
- jpt_reinit_msg_header at Base 1.3+dfsg
- main at Base 1.5.0
- mct_decode at Base 1.3+dfsg
- mct_decode_real at Base 1.3+dfsg
- mct_encode at Base 1.3+dfsg
- mct_encode_real at Base 1.3+dfsg
- mct_getnorm at Base 1.3+dfsg
- mct_getnorm_real at Base 1.3+dfsg
- mqc_bypass_enc at Base 1.3+dfsg
- mqc_bypass_flush_enc at Base 1.3+dfsg
- mqc_bypass_init_enc at Base 1.3+dfsg
- mqc_create at Base 1.3+dfsg
- mqc_decode at Base 1.3+dfsg
- mqc_destroy at Base 1.3+dfsg
- mqc_encode at Base 1.3+dfsg
- mqc_erterm_enc at Base 1.3+dfsg
- mqc_flush at Base 1.3+dfsg
- mqc_init_dec at Base 1.3+dfsg
- mqc_init_enc at Base 1.3+dfsg
- mqc_numbytes at Base 1.3+dfsg
- mqc_reset_enc at Base 1.3+dfsg
- mqc_resetstates at Base 1.3+dfsg
- mqc_restart_enc at Base 1.3+dfsg
- mqc_restart_init_enc at Base 1.3+dfsg
- mqc_segmark_enc at Base 1.3+dfsg
- mqc_setstate at Base 1.3+dfsg
- opj_cio_close at Base 1.3+dfsg
- opj_cio_open at Base 1.3+dfsg
- opj_clock at Base 1.3+dfsg
- opj_create_compress at Base 1.3+dfsg
- opj_create_decompress at Base 1.3+dfsg
- opj_decode at Base 1.3+dfsg
- opj_decode_with_info at Base 1.3+dfsg
- opj_destroy_compress at Base 1.3+dfsg
- opj_destroy_cstr_info at Base 1.3+dfsg
- opj_destroy_decompress at Base 1.3+dfsg
- opj_encode at Base 1.3+dfsg
- opj_encode_with_info at Base 1.3+dfsg
- opj_event_msg at Base 1.3+dfsg
- opj_image_create0 at Base 1.3+dfsg
- opj_image_create at Base 1.3+dfsg
- opj_image_destroy at Base 1.3+dfsg
- opj_jp2_decode at Base 1.5.0
- opj_jp2_encode at Base 1.5.0
- opj_set_default_decoder_parameters at Base 1.3+dfsg
- opj_set_default_encoder_parameters at Base 1.3+dfsg
- opj_set_event_mgr at Base 1.3+dfsg
- opj_setup_decoder at Base 1.3+dfsg
- opj_setup_encoder at Base 1.3+dfsg
- opj_version at Base 1.3+dfsg
- pi_create_decode at Base 1.3+dfsg
- pi_create_encode at Base 1.3+dfsg
- pi_destroy at Base 1.3+dfsg
- pi_initialise_encode at Base 1.3+dfsg
- pi_next at Base 1.3+dfsg
- raw_create at Base 1.3+dfsg
- raw_decode at Base 1.3+dfsg
- raw_destroy at Base 1.3+dfsg
- raw_init_dec at Base 1.3+dfsg
- raw_numbytes at Base 1.3+dfsg
- t1_create at Base 1.3+dfsg
- t1_decode_cblks at Base 1.3+dfsg
- t1_destroy at Base 1.3+dfsg
- t1_encode_cblks at Base 1.3+dfsg
- t2_create at Base 1.3+dfsg
- t2_decode_packets at Base 1.3+dfsg
- t2_destroy at Base 1.3+dfsg
- t2_encode_packets at Base 1.3+dfsg
- tcd_create at Base 1.3+dfsg
- tcd_decode_tile at Base 1.3+dfsg
- tcd_destroy at Base 1.3+dfsg
- tcd_dump at Base 1.3+dfsg
- tcd_encode_tile at Base 1.3+dfsg
- tcd_free_decode at Base 1.3+dfsg
- tcd_free_decode_tile at Base 1.3+dfsg
- tcd_free_encode at Base 1.3+dfsg
- tcd_init_encode at Base 1.3+dfsg
- tcd_makelayer at Base 1.3+dfsg
- tcd_makelayer_fixed at Base 1.3+dfsg
- tcd_malloc_decode at Base 1.3+dfsg
- tcd_malloc_decode_tile at Base 1.3+dfsg
- tcd_malloc_encode at Base 1.3+dfsg
- tcd_rateallocate at Base 1.3+dfsg
- tcd_rateallocate_fixed at Base 1.3+dfsg
- tgt_create at Base 1.3+dfsg
- tgt_decode at Base 1.3+dfsg
- tgt_destroy at Base 1.3+dfsg
- tgt_encode at Base 1.3+dfsg
- tgt_reset at Base 1.3+dfsg
- tgt_setvalue at Base 1.3+dfsg
- write_cidx at Base 1.5.0
- write_cptr at Base 1.5.0
- write_mainmhix at Base 1.5.0
- write_manf at Base 1.5.0
- write_phix at Base 1.5.0
- write_phixfaix at Base 1.5.0
- write_ppix at Base 1.5.0
- write_ppixfaix at Base 1.5.0
- write_thix at Base 1.5.0
- write_tilemhix at Base 1.5.0
- write_tpix at Base 1.5.0
- write_tpixfaix at Base 1.5.0
diff --git a/debian/libopenjpeg5.install b/debian/libopenjpeg5.install
new file mode 100644
index 0000000..9325fcc
--- /dev/null
+++ b/debian/libopenjpeg5.install
@@ -0,0 +1,2 @@
+usr/lib/libopenjpeg.so.*
+usr/lib/libopenjpeg_JPWL.so.*
diff --git a/debian/libopenjpeg5.symbols b/debian/libopenjpeg5.symbols
new file mode 100644
index 0000000..b1ae08f
--- /dev/null
+++ b/debian/libopenjpeg5.symbols
@@ -0,0 +1,350 @@
+libopenjpeg.so.5 libopenjpeg5 #MINVER#
+ bio_create at Base 1.5.0-1
+ bio_destroy at Base 1.5.0-1
+ bio_flush at Base 1.5.0-1
+ bio_inalign at Base 1.5.0-1
+ bio_init_dec at Base 1.5.0-1
+ bio_init_enc at Base 1.5.0-1
+ bio_numbytes at Base 1.5.0-1
+ bio_read at Base 1.5.0-1
+ bio_write at Base 1.5.0-1
+ check_EPHuse at Base 1.5.0-1
+ cio_bytein at Base 1.5.0-1
+ cio_byteout at Base 1.5.0-1
+ cio_getbp at Base 1.5.0-1
+ cio_numbytesleft at Base 1.5.0-1
+ cio_read at Base 1.5.0-1
+ cio_seek at Base 1.5.0-1
+ cio_skip at Base 1.5.0-1
+ cio_tell at Base 1.5.0-1
+ cio_write at Base 1.5.0-1
+ dwt_calc_explicit_stepsizes at Base 1.5.0-1
+ dwt_decode at Base 1.5.0-1
+ dwt_decode_real at Base 1.5.0-1
+ dwt_encode at Base 1.5.0-1
+ dwt_encode_real at Base 1.5.0-1
+ dwt_getgain at Base 1.5.0-1
+ dwt_getgain_real at Base 1.5.0-1
+ dwt_getnorm at Base 1.5.0-1
+ dwt_getnorm_real at Base 1.5.0-1
+ get_num_max_tile_parts at Base 1.5.0-1
+ j2k_calculate_tp at Base 1.5.0-1
+ j2k_convert_progression_order at Base 1.5.0-1
+ j2k_create_compress at Base 1.5.0-1
+ j2k_create_decompress at Base 1.5.0-1
+ j2k_dec_mstab at Base 1.5.0-1
+ j2k_decode at Base 1.5.0-1
+ j2k_decode_jpt_stream at Base 1.5.0-1
+ j2k_destroy_compress at Base 1.5.0-1
+ j2k_destroy_decompress at Base 1.5.0-1
+ j2k_encode at Base 1.5.0-1
+ j2k_prog_order_list at Base 1.5.0-1
+ j2k_setup_decoder at Base 1.5.0-1
+ j2k_setup_encoder at Base 1.5.0-1
+ jp2_create_compress at Base 1.5.0-1
+ jp2_create_decompress at Base 1.5.0-1
+ jp2_destroy_compress at Base 1.5.0-1
+ jp2_destroy_decompress at Base 1.5.0-1
+ jp2_read_jp2h at Base 1.5.0-1
+ jp2_setup_decoder at Base 1.5.0-1
+ jp2_setup_encoder at Base 1.5.0-1
+ jp2_write_jp2h at Base 1.5.0-1
+ jpt_init_msg_header at Base 1.5.0-1
+ jpt_read_VBAS_info at Base 1.5.0-1
+ jpt_read_msg_header at Base 1.5.0-1
+ jpt_reinit_msg_header at Base 1.5.0-1
+ mct_decode at Base 1.5.0-1
+ mct_decode_real at Base 1.5.0-1
+ mct_encode at Base 1.5.0-1
+ mct_encode_real at Base 1.5.0-1
+ mct_getnorm at Base 1.5.0-1
+ mct_getnorm_real at Base 1.5.0-1
+ mqc_bypass_enc at Base 1.5.0-1
+ mqc_bypass_flush_enc at Base 1.5.0-1
+ mqc_bypass_init_enc at Base 1.5.0-1
+ mqc_create at Base 1.5.0-1
+ mqc_decode at Base 1.5.0-1
+ mqc_destroy at Base 1.5.0-1
+ mqc_encode at Base 1.5.0-1
+ mqc_erterm_enc at Base 1.5.0-1
+ mqc_flush at Base 1.5.0-1
+ mqc_init_dec at Base 1.5.0-1
+ mqc_init_enc at Base 1.5.0-1
+ mqc_numbytes at Base 1.5.0-1
+ mqc_reset_enc at Base 1.5.0-1
+ mqc_resetstates at Base 1.5.0-1
+ mqc_restart_enc at Base 1.5.0-1
+ mqc_restart_init_enc at Base 1.5.0-1
+ mqc_segmark_enc at Base 1.5.0-1
+ mqc_setstate at Base 1.5.0-1
+ opj_cio_close at Base 1.5.0-1
+ opj_cio_open at Base 1.5.0-1
+ opj_clock at Base 1.5.0-1
+ opj_create_compress at Base 1.5.0-1
+ opj_create_decompress at Base 1.5.0-1
+ opj_decode at Base 1.5.0-1
+ opj_decode_with_info at Base 1.5.0-1
+ opj_destroy_compress at Base 1.5.0-1
+ opj_destroy_cstr_info at Base 1.5.0-1
+ opj_destroy_decompress at Base 1.5.0-1
+ opj_encode at Base 1.5.0-1
+ opj_encode_with_info at Base 1.5.0-1
+ opj_event_msg at Base 1.5.0-1
+ opj_image_create0 at Base 1.5.0-1
+ opj_image_create at Base 1.5.0-1
+ opj_image_destroy at Base 1.5.0-1
+ opj_jp2_decode at Base 1.5.0-1
+ opj_jp2_encode at Base 1.5.0-1
+ opj_set_default_decoder_parameters at Base 1.5.0-1
+ opj_set_default_encoder_parameters at Base 1.5.0-1
+ opj_set_event_mgr at Base 1.5.0-1
+ opj_setup_decoder at Base 1.5.0-1
+ opj_setup_encoder at Base 1.5.0-1
+ opj_version at Base 1.5.0-1
+ pi_create_decode at Base 1.5.0-1
+ pi_create_encode at Base 1.5.0-1
+ pi_destroy at Base 1.5.0-1
+ pi_initialise_encode at Base 1.5.0-1
+ pi_next at Base 1.5.0-1
+ raw_create at Base 1.5.0-1
+ raw_decode at Base 1.5.0-1
+ raw_destroy at Base 1.5.0-1
+ raw_init_dec at Base 1.5.0-1
+ raw_numbytes at Base 1.5.0-1
+ t1_create at Base 1.5.0-1
+ t1_decode_cblks at Base 1.5.0-1
+ t1_destroy at Base 1.5.0-1
+ t1_encode_cblks at Base 1.5.0-1
+ t2_create at Base 1.5.0-1
+ t2_decode_packets at Base 1.5.0-1
+ t2_destroy at Base 1.5.0-1
+ t2_encode_packets at Base 1.5.0-1
+ tcd_create at Base 1.5.0-1
+ tcd_decode_tile at Base 1.5.0-1
+ tcd_destroy at Base 1.5.0-1
+ tcd_dump at Base 1.5.0-1
+ tcd_encode_tile at Base 1.5.0-1
+ tcd_free_decode at Base 1.5.0-1
+ tcd_free_decode_tile at Base 1.5.0-1
+ tcd_free_encode at Base 1.5.0-1
+ tcd_init_encode at Base 1.5.0-1
+ tcd_makelayer at Base 1.5.0-1
+ tcd_makelayer_fixed at Base 1.5.0-1
+ tcd_malloc_decode at Base 1.5.0-1
+ tcd_malloc_decode_tile at Base 1.5.0-1
+ tcd_malloc_encode at Base 1.5.0-1
+ tcd_rateallocate at Base 1.5.0-1
+ tcd_rateallocate_fixed at Base 1.5.0-1
+ tgt_create at Base 1.5.0-1
+ tgt_decode at Base 1.5.0-1
+ tgt_destroy at Base 1.5.0-1
+ tgt_encode at Base 1.5.0-1
+ tgt_reset at Base 1.5.0-1
+ tgt_setvalue at Base 1.5.0-1
+ write_cidx at Base 1.5.0-1
+ write_cptr at Base 1.5.0-1
+ write_mainmhix at Base 1.5.0-1
+ write_manf at Base 1.5.0-1
+ write_phix at Base 1.5.0-1
+ write_phixfaix at Base 1.5.0-1
+ write_ppix at Base 1.5.0-1
+ write_ppixfaix at Base 1.5.0-1
+ write_thix at Base 1.5.0-1
+ write_tilemhix at Base 1.5.0-1
+ write_tpix at Base 1.5.0-1
+ write_tpixfaix at Base 1.5.0-1
+libopenjpeg_JPWL.so.5 libopenjpeg5 #MINVER#
+ Alpha_to at Base 1.5.0-1
+ CRC16_table at Base 1.5.0-1
+ CRC32_table at Base 1.5.0-1
+ Gg at Base 1.5.0-1
+ Index_of at Base 1.5.0-1
+ Pp at Base 1.5.0-1
+ bio_create at Base 1.5.0-1
+ bio_destroy at Base 1.5.0-1
+ bio_flush at Base 1.5.0-1
+ bio_inalign at Base 1.5.0-1
+ bio_init_dec at Base 1.5.0-1
+ bio_init_enc at Base 1.5.0-1
+ bio_numbytes at Base 1.5.0-1
+ bio_read at Base 1.5.0-1
+ bio_write at Base 1.5.0-1
+ check_EPHuse at Base 1.5.0-1
+ cio_bytein at Base 1.5.0-1
+ cio_byteout at Base 1.5.0-1
+ cio_getbp at Base 1.5.0-1
+ cio_numbytesleft at Base 1.5.0-1
+ cio_read at Base 1.5.0-1
+ cio_seek at Base 1.5.0-1
+ cio_skip at Base 1.5.0-1
+ cio_tell at Base 1.5.0-1
+ cio_write at Base 1.5.0-1
+ dwt_calc_explicit_stepsizes at Base 1.5.0-1
+ dwt_decode at Base 1.5.0-1
+ dwt_decode_real at Base 1.5.0-1
+ dwt_encode at Base 1.5.0-1
+ dwt_encode_real at Base 1.5.0-1
+ dwt_getgain at Base 1.5.0-1
+ dwt_getgain_real at Base 1.5.0-1
+ dwt_getnorm at Base 1.5.0-1
+ dwt_getnorm_real at Base 1.5.0-1
+ encode_rs at Base 1.5.0-1
+ eras_dec_rs at Base 1.5.0-1
+ gen_poly at Base 1.5.0-1
+ generate_gf at Base 1.5.0-1
+ get_num_max_tile_parts at Base 1.5.0-1
+ init_rs at Base 1.5.0-1
+ j2k_add_marker at Base 1.5.0-1
+ j2k_calculate_tp at Base 1.5.0-1
+ j2k_convert_progression_order at Base 1.5.0-1
+ j2k_create_compress at Base 1.5.0-1
+ j2k_create_decompress at Base 1.5.0-1
+ j2k_dec_mstab at Base 1.5.0-1
+ j2k_decode at Base 1.5.0-1
+ j2k_decode_jpt_stream at Base 1.5.0-1
+ j2k_destroy_compress at Base 1.5.0-1
+ j2k_destroy_decompress at Base 1.5.0-1
+ j2k_encode at Base 1.5.0-1
+ j2k_prog_order_list at Base 1.5.0-1
+ j2k_read_epb at Base 1.5.0-1
+ j2k_read_epc at Base 1.5.0-1
+ j2k_read_esd at Base 1.5.0-1
+ j2k_read_red at Base 1.5.0-1
+ j2k_setup_decoder at Base 1.5.0-1
+ j2k_setup_encoder at Base 1.5.0-1
+ j2k_write_epb at Base 1.5.0-1
+ j2k_write_epc at Base 1.5.0-1
+ jp2_create_compress at Base 1.5.0-1
+ jp2_create_decompress at Base 1.5.0-1
+ jp2_destroy_compress at Base 1.5.0-1
+ jp2_destroy_decompress at Base 1.5.0-1
+ jp2_read_jp2h at Base 1.5.0-1
+ jp2_setup_decoder at Base 1.5.0-1
+ jp2_setup_encoder at Base 1.5.0-1
+ jp2_write_jp2h at Base 1.5.0-1
+ jpt_init_msg_header at Base 1.5.0-1
+ jpt_read_VBAS_info at Base 1.5.0-1
+ jpt_read_msg_header at Base 1.5.0-1
+ jpt_reinit_msg_header at Base 1.5.0-1
+ jpwl_check_tile at Base 1.5.0-1
+ jpwl_correct at Base 1.5.0-1
+ jpwl_double_to_pfp at Base 1.5.0-1
+ jpwl_dump_marks at Base 1.5.0-1
+ jpwl_encode at Base 1.5.0-1
+ jpwl_epb_correct at Base 1.5.0-1
+ jpwl_epb_create at Base 1.5.0-1
+ jpwl_epb_fill at Base 1.5.0-1
+ jpwl_epb_write at Base 1.5.0-1
+ jpwl_epbs_add at Base 1.5.0-1
+ jpwl_epc_create at Base 1.5.0-1
+ jpwl_epc_write at Base 1.5.0-1
+ jpwl_esd_create at Base 1.5.0-1
+ jpwl_esd_fill at Base 1.5.0-1
+ jpwl_esd_write at Base 1.5.0-1
+ jpwl_esds_add at Base 1.5.0-1
+ jpwl_markcomp at Base 1.5.0-1
+ jpwl_pfp_to_double at Base 1.5.0-1
+ jpwl_prepare_marks at Base 1.5.0-1
+ jpwl_update_info at Base 1.5.0-1
+ mct_decode at Base 1.5.0-1
+ mct_decode_real at Base 1.5.0-1
+ mct_encode at Base 1.5.0-1
+ mct_encode_real at Base 1.5.0-1
+ mct_getnorm at Base 1.5.0-1
+ mct_getnorm_real at Base 1.5.0-1
+ mqc_bypass_enc at Base 1.5.0-1
+ mqc_bypass_flush_enc at Base 1.5.0-1
+ mqc_bypass_init_enc at Base 1.5.0-1
+ mqc_create at Base 1.5.0-1
+ mqc_decode at Base 1.5.0-1
+ mqc_destroy at Base 1.5.0-1
+ mqc_encode at Base 1.5.0-1
+ mqc_erterm_enc at Base 1.5.0-1
+ mqc_flush at Base 1.5.0-1
+ mqc_init_dec at Base 1.5.0-1
+ mqc_init_enc at Base 1.5.0-1
+ mqc_numbytes at Base 1.5.0-1
+ mqc_reset_enc at Base 1.5.0-1
+ mqc_resetstates at Base 1.5.0-1
+ mqc_restart_enc at Base 1.5.0-1
+ mqc_restart_init_enc at Base 1.5.0-1
+ mqc_segmark_enc at Base 1.5.0-1
+ mqc_setstate at Base 1.5.0-1
+ opj_cio_close at Base 1.5.0-1
+ opj_cio_open at Base 1.5.0-1
+ opj_clock at Base 1.5.0-1
+ opj_create_compress at Base 1.5.0-1
+ opj_create_decompress at Base 1.5.0-1
+ opj_decode at Base 1.5.0-1
+ opj_decode_with_info at Base 1.5.0-1
+ opj_destroy_compress at Base 1.5.0-1
+ opj_destroy_cstr_info at Base 1.5.0-1
+ opj_destroy_decompress at Base 1.5.0-1
+ opj_encode at Base 1.5.0-1
+ opj_encode_with_info at Base 1.5.0-1
+ opj_event_msg at Base 1.5.0-1
+ opj_image_create0 at Base 1.5.0-1
+ opj_image_create at Base 1.5.0-1
+ opj_image_destroy at Base 1.5.0-1
+ opj_jp2_decode at Base 1.5.0-1
+ opj_jp2_encode at Base 1.5.0-1
+ opj_set_default_decoder_parameters at Base 1.5.0-1
+ opj_set_default_encoder_parameters at Base 1.5.0-1
+ opj_set_event_mgr at Base 1.5.0-1
+ opj_setup_decoder at Base 1.5.0-1
+ opj_setup_encoder at Base 1.5.0-1
+ opj_version at Base 1.5.0-1
+ pi_create_decode at Base 1.5.0-1
+ pi_create_encode at Base 1.5.0-1
+ pi_destroy at Base 1.5.0-1
+ pi_initialise_encode at Base 1.5.0-1
+ pi_next at Base 1.5.0-1
+ raw_create at Base 1.5.0-1
+ raw_decode at Base 1.5.0-1
+ raw_destroy at Base 1.5.0-1
+ raw_init_dec at Base 1.5.0-1
+ raw_numbytes at Base 1.5.0-1
+ t1_create at Base 1.5.0-1
+ t1_decode_cblks at Base 1.5.0-1
+ t1_destroy at Base 1.5.0-1
+ t1_encode_cblks at Base 1.5.0-1
+ t2_create at Base 1.5.0-1
+ t2_decode_packets at Base 1.5.0-1
+ t2_destroy at Base 1.5.0-1
+ t2_encode_packets at Base 1.5.0-1
+ tcd_create at Base 1.5.0-1
+ tcd_decode_tile at Base 1.5.0-1
+ tcd_destroy at Base 1.5.0-1
+ tcd_dump at Base 1.5.0-1
+ tcd_encode_tile at Base 1.5.0-1
+ tcd_free_decode at Base 1.5.0-1
+ tcd_free_decode_tile at Base 1.5.0-1
+ tcd_free_encode at Base 1.5.0-1
+ tcd_init_encode at Base 1.5.0-1
+ tcd_makelayer at Base 1.5.0-1
+ tcd_makelayer_fixed at Base 1.5.0-1
+ tcd_malloc_decode at Base 1.5.0-1
+ tcd_malloc_decode_tile at Base 1.5.0-1
+ tcd_malloc_encode at Base 1.5.0-1
+ tcd_rateallocate at Base 1.5.0-1
+ tcd_rateallocate_fixed at Base 1.5.0-1
+ tgt_create at Base 1.5.0-1
+ tgt_decode at Base 1.5.0-1
+ tgt_destroy at Base 1.5.0-1
+ tgt_encode at Base 1.5.0-1
+ tgt_reset at Base 1.5.0-1
+ tgt_setvalue at Base 1.5.0-1
+ updateCRC16 at Base 1.5.0-1
+ updateCRC32 at Base 1.5.0-1
+ write_cidx at Base 1.5.0-1
+ write_cptr at Base 1.5.0-1
+ write_mainmhix at Base 1.5.0-1
+ write_manf at Base 1.5.0-1
+ write_phix at Base 1.5.0-1
+ write_phixfaix at Base 1.5.0-1
+ write_ppix at Base 1.5.0-1
+ write_ppixfaix at Base 1.5.0-1
+ write_thix at Base 1.5.0-1
+ write_tilemhix at Base 1.5.0-1
+ write_tpix at Base 1.5.0-1
+ write_tpixfaix at Base 1.5.0-1
diff --git a/debian/openjpeg-tools.install b/debian/openjpeg-tools.install
index 625e527..98d1583 100644
--- a/debian/openjpeg-tools.install
+++ b/debian/openjpeg-tools.install
@@ -1,3 +1,2 @@
usr/bin
usr/share/man/man1
-
diff --git a/debian/patches/addmathlib.patch b/debian/patches/addmathlib.patch
new file mode 100644
index 0000000..7f163d3
--- /dev/null
+++ b/debian/patches/addmathlib.patch
@@ -0,0 +1,17 @@
+Description: missing link to math lib
+Author: Mathieu Malaterre <malat at debian.org>
+Forwarded: http://code.google.com/p/openjpeg/source/detail?r=1628
+Last-Update: 2012-04-16
+
+Index: openjpeg/libopenjpeg/jpwl/CMakeLists.txt
+===================================================================
+--- openjpeg.orig/libopenjpeg/jpwl/CMakeLists.txt 2012-04-16 14:48:39.000000000 +0200
++++ openjpeg/libopenjpeg/jpwl/CMakeLists.txt 2012-04-16 14:49:01.000000000 +0200
+@@ -23,6 +23,7 @@
+ ENDIF(BUILD_SHARED_LIBS)
+ ENDIF(WIN32)
+ ADD_LIBRARY(${OPENJPEG_LIBRARY_NAME}_JPWL ${JPWL_SRCS} ${OPENJPEG_SRCS})
++target_link_libraries(${OPENJPEG_LIBRARY_NAME}_JPWL m)
+ SET_TARGET_PROPERTIES(${OPENJPEG_LIBRARY_NAME}_JPWL
+ PROPERTIES ${OPENJPEG_LIBRARY_PROPERTIES})
+
diff --git a/debian/patches/fixsoname.patch b/debian/patches/fixsoname.patch
new file mode 100644
index 0000000..359026f
--- /dev/null
+++ b/debian/patches/fixsoname.patch
@@ -0,0 +1,90 @@
+Description: SONAME convention was broken upstream
+ upstream quickly fix the behavior in the 1.5 branch. Import patch
+Author: Mathieu Malaterre <malat at debian.org>
+Forwarded: http://code.google.com/p/openjpeg/source/detail?r=1625
+Last-Update: 2012-04-16
+
+Index: openjpeg/CMakeLists.txt
+===================================================================
+--- openjpeg.orig/CMakeLists.txt 2012-04-16 14:52:41.000000000 +0200
++++ openjpeg/CMakeLists.txt 2012-04-16 14:54:05.000000000 +0200
+@@ -34,9 +34,26 @@
+ "${OPENJPEG_VERSION_MAJOR}.${OPENJPEG_VERSION_MINOR}.${OPENJPEG_VERSION_BUILD}")
+ SET(PACKAGE_VERSION
+ "${OPENJPEG_VERSION_MAJOR}.${OPENJPEG_VERSION_MINOR}.${OPENJPEG_VERSION_BUILD}")
++
++# Because autotools does not support X.Y notation for SOVERSION, we have to use
++# two numerorations, one for the openjpeg version and one for openjpeg soversion
++# version | soversion
++# 1.0 | 0
++# 1.1 | 1
++# 1.2 | 2
++# 1.3 | 3
++# 1.4 | 4
++# 1.5 | 5
++# 2.0 | 6
++# above is the recommendation by the OPJ team. If you really need to override this default,
++# you can specify your own OPENJPEG_SOVERSION at cmake configuration time:
++# cmake -DOPENJPEG_SOVERSION:STRING=42 /path/to/openjpeg
++if(NOT OPENJPEG_SOVERSION)
++ SET(OPENJPEG_SOVERSION 5)
++endif(NOT OPENJPEG_SOVERSION)
+ SET(OPENJPEG_LIBRARY_PROPERTIES
+ VERSION "${OPENJPEG_VERSION_MAJOR}.${OPENJPEG_VERSION_MINOR}.${OPENJPEG_VERSION_BUILD}"
+- SOVERSION "${OPENJPEG_VERSION_MAJOR}"
++ SOVERSION "${OPENJPEG_SOVERSION}"
+ )
+
+ # --------------------------------------------------------------------------
+@@ -95,7 +112,7 @@
+ ENDIF(NOT OPENJPEG_INSTALL_DATA_DIR)
+
+ IF(NOT OPENJPEG_INSTALL_INCLUDE_DIR)
+- SET(OPENJPEG_INSTALL_INCLUDE_DIR "include/")
++ SET(OPENJPEG_INSTALL_INCLUDE_DIR "include/${OPENJPEG_INSTALL_SUBDIR}")
+ ENDIF(NOT OPENJPEG_INSTALL_INCLUDE_DIR)
+
+ IF(NOT OPENJPEG_INSTALL_MAN_DIR)
+@@ -107,7 +124,10 @@
+ ENDIF(NOT OPENJPEG_INSTALL_DOC_DIR)
+
+ IF(NOT OPENJPEG_INSTALL_PACKAGE_DIR)
+- SET(OPENJPEG_INSTALL_PACKAGE_DIR "${OPENJPEG_INSTALL_SHARE_DIR}/${OPENJPEG_INSTALL_SUBDIR}")
++ # We could install *.cmake files in share/ however those files contains
++ # hardcoded path to libraries on a multi-arch system (fedora/debian) those
++ # path will be different (lib/i386-linux-gnu vs lib/x86_64-linux-gnu)
++ SET(OPENJPEG_INSTALL_PACKAGE_DIR "${OPENJPEG_INSTALL_LIB_DIR}/${OPENJPEG_INSTALL_SUBDIR}")
+ ENDIF(NOT OPENJPEG_INSTALL_PACKAGE_DIR)
+
+ #-----------------------------------------------------------------------------
+@@ -143,13 +163,14 @@
+ #-----------------------------------------------------------------------------
+ # pkgconfig support
+ IF(UNIX)
++ # install in lib and not share (see multi-arch note above)
+ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/libopenjpeg1.pc.cmake
+ ${CMAKE_CURRENT_BINARY_DIR}/libopenjpeg1.pc @ONLY)
+ INSTALL( FILES ${CMAKE_CURRENT_BINARY_DIR}/libopenjpeg1.pc DESTINATION
+- ${OPENJPEG_INSTALL_SHARE_DIR}/pkgconfig )
++ ${OPENJPEG_INSTALL_LIB_DIR}/pkgconfig )
+ INSTALL( CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink
+ \"libopenjpeg1.pc\"
+- \"\$ENV{DESTDIR}${OPENJPEG_INSTALL_LIB_DIR}/pkgconfig/libopenjpeg.pc\")")
++ \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${OPENJPEG_INSTALL_SHARE_DIR}/pkgconfig/libopenjpeg.pc\")")
+ ENDIF(UNIX)
+
+ #-----------------------------------------------------------------------------
+@@ -254,9 +275,9 @@
+
+ #-----------------------------------------------------------------------------
+ # install CHANGES and LICENSE
+-INSTALL(
+- FILES CHANGES
+- LICENSE
+- DESTINATION ${OPENJPEG_INSTALL_DOC_DIR})
++IF(EXISTS ${OPENJPEG_SOURCE_DIR}/CHANGES)
++ INSTALL(FILES CHANGES DESTINATION ${OPENJPEG_INSTALL_DOC_DIR})
++ENDIF(EXISTS ${OPENJPEG_SOURCE_DIR}/CHANGES)
++INSTALL(FILES LICENSE DESTINATION ${OPENJPEG_INSTALL_DOC_DIR})
+
+ INCLUDE (CMake/OpenJPEGCPack.cmake)
diff --git a/debian/patches/series b/debian/patches/series
index 6139c70..a378958 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
-#00-fix_build_for_debian.patch
+addmathlib.patch
+fixsoname.patch
diff --git a/debian/rules b/debian/rules
index dbf95c9..be2a812 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,31 +7,29 @@
CURVER := $(shell dpkg-parsechangelog | grep ^Version | awk '{print $$2}' | cut -d- -f1 | cut -d+ -f1)
%:
- dh $@ \
- --with autotools-dev
+ dh $@ --buildsystem=cmake --parallel
+
+CMAKE_EXTRA_FLAGS += -DCMAKE_SKIP_RPATH=ON \
+ -DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo \
+ -DBUILD_CODEC:BOOL=ON \
+ -DBUILD_JPIP:BOOL=ON \
+ -DBUILD_JPIP_SERVER:BOOL=OFF \
+ -DBUILD_JPWL:BOOL=ON \
+ -DBUILD_MJ2:BOOL=ON \
+ -DBUILD_SHARED_LIBS:BOOL=ON \
+ -DBUILD_TESTING:BOOL=OFF \
+ -DBUILD_THIRDPARTY:BOOL=OFF
override_dh_auto_configure:
- dh_auto_configure -- \
- --enable-debug \
- --enable-mj2 \
- --enable-jpwl \
- --enable-jpip \
- --enable-jpip-server
+ dh_auto_configure -- $(CMAKE_EXTRA_FLAGS)
override_dh_strip:
- dh_strip -plibopenjpeg2 --dbg-package=libopenjpeg2-dbg
+ dh_strip -plibopenjpeg5 --dbg-package=libopenjpeg5-dbg
get-orig-source:
uscan --verbose \
--force-download \
- --download-version $(CURVER) \
- --rename \
- --destdir .
- tar xf openjpeg_$(CURVER).orig.tar.gz
- rm -rf openjpeg-$(CURVER)/thirdparty/
- tar cf openjpeg_$(CURVER)+ds.orig.tar openjpeg-$(CURVER)/
- gzip -9 openjpeg_$(CURVER)+ds.orig.tar
- rm -rf openjpeg-$(CURVER)/ openjpeg_$(CURVER).orig.tar.gz
+ --download-version $(CURVER)
.PHONY: override_dh_auto_configure \
override_dh_strip \
diff --git a/debian/watch b/debian/watch
index 545e8a2..89f97a2 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,5 +1,4 @@
# Compulsory line, this is a version 3 file
version=3
-opts=dversionmangle=s/\+d.*// \
http://code.google.com/p/openjpeg/downloads/list?can=1 \
- .*/files/openjpeg-([0-9_.]+)\.tar\.gz
+ .*/openjpeg-([0-9_.]+)\.tar\.gz
--
openjpeg packaging
More information about the Pkg-phototools-commits
mailing list