Remove unmaintained JPWL, JP3D and MJ2

Since uclouvain#1350
the components JPWL, JP3d and MJ2 will not be
maintained in 2.5.0.

As win32 build was facing an issue with mj2 build and lrintf inline,
(see  uclouvain#1339), better
to remove these useles components who will be removed in v2.5.0.

meson.build

@@ -67,7 +67,7 @@ subdir('src/lib')
 #-----------------------------------------------------------------------------
 # Build Applications
 
-if get_option('build_codec') or  get_option('build_mj2')
+if get_option('build_codec')
   # OFF: It will only build 3rd party libs if they are not found on the system
   # ON: 3rd party libs will ALWAYS be build, and used
   subdir('src/bin')
@@ -110,31 +110,7 @@ endif
 #-----------------------------------------------------------------------------
 # pkgconfig support
 
-if get_option('build_pkgconfig_files')
-  pkgconfig = import('pkgconfig')
-  pkgconfig.generate(openjp2_lib, name: 'libopenjp2',
-                       description: 'JPEG2000 library (Part 1 and 2)',
-                       version: meson.project_version(),
-                       libraries: openjp2_lib)
-  if get_option('build_jpwl')
-    pkgconfig.generate(openjpwl_lib, name: 'libopenjpwl',
-                       description: 'JPEG2000 Wireless library (Part 11)',
-                       version: meson.project_version(),
-                       libraries: openjpwl_lib)
-  endif
-  if get_option('build_jpip')
-    pkgconfig.generate(openjpip_lib, name: 'libopenjpip',
-                       description: 'JPEG2000 Interactivity tools, APIs and protocols (Part 9)',
-                       version: meson.project_version(),
-                       libraries: openjpip_lib)
-  endif
-  if get_option('build_jp3d')
-      pkgconfig.generate(openjp3d_lib, name: 'libopenjp3d',
-                       description: 'JPEG2000 Extensions for three-dimensional data (Part 10)',
-                       version: meson.project_version(),
-                       libraries: openjp3d_lib)
-  endif
-endif
+
 #-----------------------------------------------------------------------------
 # build our version of astyle
 #with_astyle = ['FALSE', 'CACHE', 'BOOL', 'If you plan to contribute you should reindent with scripts/prepare-commit.sh (using 'our' astyle)']

meson_options.txt

@@ -5,13 +5,10 @@ option('opj_use_thread', type : 'boolean', value : true, description : 'Build wi
 option('build_luts_generator', type : 'boolean', value : false, description : 'Build utility to generate t1_luts.h')
 option('build_unit_tests', type : 'boolean', value : false, description : 'Build unit tests (bench_dwt, test_sparse_array, etc..)')
 option('build_codec', type : 'boolean', value : true, description : 'Build the CODEC executables')
-option('build_mj2', type : 'boolean', value : false, description : 'Build the MJ2 executables.')
-option('build_jpwl', type : 'boolean', value : false, description : 'Build the JPWL library and executables')
 option('build_jpip', type : 'boolean', value : false, description : 'Build the JPIP library and executables.')
 option('build_jpip_server', type : 'boolean', value : false, description : 'Build the JPIP server.')
 option('build_viewer', type : 'boolean', value : false, description : 'Build the OPJViewer executable (C++)')
 option('build_java', type : 'boolean', value : false, description : 'Build the openjpeg jar (Java)')
-option('build_jp3d', type : 'boolean', value : false, description : 'Build the JP3D comp')
 option('build_testing', type : 'boolean', value : false, description : 'Build the tests.')
 option('build_pkgconfig_files', type : 'boolean', value : true, description : 'Build and install pkg-config files')
 option('with_astyle', type : 'boolean', value : false, description : 'Build with astyle')

src/bin/meson.build

@@ -25,17 +25,9 @@ subdir('common')
 # Part 1 & 2:
 subdir('jp2')
 # optionals components:
-if get_option('build_jpwl')
-  subdir('jpwl')
-endif
-if get_option('build_mj2')
-  subdir('mj2')
-endif
+
 if get_option('build_jpip')
   subdir('jpip')
 endif
-if get_option('build_jp3d')
-  subdir('jp3d')
-endif
 # wx apps:
 subdir('wx')

src/lib/meson.build

@@ -1,21 +1,22 @@
 # source code for openjpeg project:
 # Part 1 & 2:
 subdir('openjp2')
-# optionals components:
-if get_option('build_jpwl')
-  subdir('openjpwl')
-  if get_option('build_mj2')
-    subdir('openmj2')
-  endif
-else
-  if get_option('build_mj2')
-    message('WARNING: you need to enable JPWL to get MJ2')
-  endif
-endif
 
+# optionals components:
 if get_option('build_jpip')
   subdir('openjpip')
 endif
-if  get_option('build_jp3d')
-  subdir('openjp3d')
+
+if get_option('build_pkgconfig_files')
+  pkgconfig = import('pkgconfig')
+  pkgconfig.generate(openjp2_lib, name: 'libopenjp2',
+                       description: 'JPEG2000 library (Part 1 and 2)',
+                       version: meson.project_version(),
+                       libraries: openjp2_lib)
+  if get_option('build_jpip')
+    pkgconfig.generate(openjpip_lib, name: 'libopenjpip',
+                       description: 'JPEG2000 Interactivity tools, APIs and protocols (Part 9)',
+                       version: meson.project_version(),
+                       libraries: openjpip_lib)
+  endif
 endif

wrapping/java/openjp2/meson.build

@@ -10,9 +10,6 @@
   # Java module should not have a SONAME:
   # set_property(['TARGET', 'openjpegjni', 'PROPERTY', 'NO_SONAME', '1'])
   # FIXME (need to use old API):
-  if get_option('build_mj2')
-    # target_link_libraries(['openjpegjni', 'openmj2'])
-  endif
   # target_link_libraries(['openjpegjni', png_libname, tiff_libname, lcms_libname, z_libname])
   if host_system == 'linux'
     # target_link_libraries(['openjpegjni', 'm'])