Remove obsolete components JPWL, JP3D and MJ2

CMakeLists.txt

@@ -264,20 +264,16 @@ endif()
 #-----------------------------------------------------------------------------
 # Build Applications
 option(BUILD_CODEC "Build the CODEC executables" ON)
-option(BUILD_MJ2 "Build the MJ2 executables." OFF)
-option(BUILD_JPWL "Build the JPWL library and executables" OFF)
 option(BUILD_JPIP "Build the JPIP library and executables." OFF)
 if(BUILD_JPIP)
   option(BUILD_JPIP_SERVER "Build the JPIP server." OFF)
 endif()
 option(BUILD_VIEWER "Build the OPJViewer executable (C++)" OFF)
 option(BUILD_JAVA "Build the openjpeg jar (Java)" OFF)
-option(BUILD_JP3D "Build the JP3D comp" OFF)
 mark_as_advanced(BUILD_VIEWER)
 mark_as_advanced(BUILD_JAVA)
-mark_as_advanced(BUILD_JP3D)
 
-if(BUILD_CODEC OR BUILD_MJ2)
+if(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
   option(BUILD_THIRDPARTY "Build the thirdparty executables if it is needed" OFF)
@@ -367,14 +363,6 @@ if(BUILD_PKGCONFIG_FILES)
     ${CMAKE_CURRENT_BINARY_DIR}/libopenjp2.pc @ONLY)
   install( FILES  ${CMAKE_CURRENT_BINARY_DIR}/libopenjp2.pc DESTINATION
     ${OPENJPEG_INSTALL_LIB_DIR}/pkgconfig )
-#
-  if(BUILD_JPWL)
-  # install in lib and not share (see multi-arch note above)
-  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/lib/openjpwl/libopenjpwl.pc.cmake.in
-    ${CMAKE_CURRENT_BINARY_DIR}/libopenjpwl.pc @ONLY)
-  install( FILES  ${CMAKE_CURRENT_BINARY_DIR}/libopenjpwl.pc DESTINATION
-    ${OPENJPEG_INSTALL_LIB_DIR}/pkgconfig )
-  endif()
 #
   if(BUILD_JPIP)
   # install in lib and not share (see multi-arch note above)
@@ -383,14 +371,6 @@ if(BUILD_PKGCONFIG_FILES)
   install( FILES  ${CMAKE_CURRENT_BINARY_DIR}/libopenjpip.pc DESTINATION
     ${OPENJPEG_INSTALL_LIB_DIR}/pkgconfig )
   endif()
-#
-  if(BUILD_JP3D)
-  # install in lib and not share (see multi-arch note above)
-  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/lib/openjp3d/libopenjp3d.pc.cmake.in
-    ${CMAKE_CURRENT_BINARY_DIR}/libopenjp3d.pc @ONLY)
-  install( FILES  ${CMAKE_CURRENT_BINARY_DIR}/libopenjp3d.pc DESTINATION
-    ${OPENJPEG_INSTALL_LIB_DIR}/pkgconfig )
-  endif()
 endif()
 
 #-----------------------------------------------------------------------------

README.md

@@ -29,18 +29,12 @@ The library is developed and maintained by the Image and Signal Processing Group
 * src
   * lib
     * openjp2: contains the sources of the openjp2 library (Part 1 & 2)
-    * openjpwl: contains the additional sources if you want to build a JPWL-flavoured library.
     * openjpip: complete client-server architecture for remote browsing of jpeg 2000 images.
-    * openjp3d: JP3D implementation
-    * openmj2: MJ2 implementation
   * bin: contains all applications that use the openjpeg library
     * common: common files to all applications
     * jp2: a basic codec
-    * mj2: motion jpeg 2000 executables
     * jpip: OpenJPIP applications (server and dec server)
       * java: a Java client viewer for JPIP
-    * jp3d: JP3D applications
-      * tcltk: a test tool for JP3D
     * wx
       * OPJViewer: gui for displaying j2k files (based on wxWidget)
 * wrapping
@@ -57,6 +51,12 @@ See [INSTALL](https://github.com/uclouvain/openjpeg/blob/master/INSTALL.md) for
 
 See [NEWS](https://github.com/uclouvain/openjpeg/blob/master/NEWS.md) for user visible changes in successive releases.
 
+## Deprecated components
+
+The openjpwl, openjp3d and openmj2 components have been removed after the
+2.4.0 release. Their building and working state is unknown. People interested
+in them should start from the 2.4.0 tag.
+
 ## API/ABI
 
 An API/ABI timeline is automatically updated [here][link-api-timeline].

src/bin/CMakeLists.txt

@@ -4,18 +4,9 @@ add_subdirectory(common)
 add_subdirectory(jp2)
 
 # optionals components:
-if(BUILD_JPWL)
-  add_subdirectory(jpwl)
-endif()
-if(BUILD_MJ2)
-  add_subdirectory(mj2)
-endif()
 if(BUILD_JPIP)
   add_subdirectory(jpip)
 endif()
-if(BUILD_JP3D)
-  add_subdirectory(jp3d)
-endif()
 
 # wx apps:
 add_subdirectory(wx)