openjph: Add version 0.21.2 (#26504)

* OpenJPH: Add version 0.21.2

* add newest release of OpenJPH
* remove version 0.17.0

* Remove cmake exports from package

Author: irieger

recipes/openjph/all/conandata.yml

@@ -1,19 +1,19 @@
 sources:
+  "0.21.2":
+    url: "https://github.com/aous72/OpenJPH/archive/0.21.2.tar.gz"
+    sha256: "5c25f5fe820ccb4fee3b7a0d3246bf836508e313708f0b57f3654dbe8b0c4a01"
   "0.18.0":
     url: "https://github.com/aous72/OpenJPH/archive/0.18.0.tar.gz"
     sha256: "2484908bf5a171cda957643d9bc85c39d58ef939016e2d1a00122b1cefbbd4f8"
-  "0.17.0":
-    url: "https://github.com/aous72/OpenJPH/archive/0.17.0.tar.gz"
-    sha256: "9cd09a5f3a8046b10bded787212afd2410836f9c266964a36f61dc4b63f99b6c"
   "0.16.0":
     url: "https://github.com/aous72/OpenJPH/archive/0.16.0.tar.gz"
     sha256: "94bea4d7057f7a5dcb3f8eee3f854955ce153d98dad99602dd0ba50a560d7cf6"
 patches:
-  "0.18.0":
-    - patch_file: "patches/0.15.0_cmake-cxx-standard.patch"
+  "0.21.2":
+    - patch_file: "patches/0.21.2_cmake-cxx-standard.patch"
       patch_description: "Remove setting of CXX standard to a fixed value overriding the toolchain provided by Conan"
       patch_type: "conan"
-  "0.17.0":
+  "0.18.0":
     - patch_file: "patches/0.15.0_cmake-cxx-standard.patch"
       patch_description: "Remove setting of CXX standard to a fixed value overriding the toolchain provided by Conan"
       patch_type: "conan"

recipes/openjph/all/conanfile.py

@@ -2,7 +2,7 @@
 from conan.errors import ConanInvalidConfiguration
 from conan.tools.build import check_min_cppstd
 from conan.tools.cmake import CMake, CMakeDeps, CMakeToolchain, cmake_layout
-from conan.tools.files import apply_conandata_patches, copy, export_conandata_patches, get, rmdir
+from conan.tools.files import apply_conandata_patches, copy, export_conandata_patches, get, rm, rmdir
 from conan.tools.microsoft import is_msvc
 from conan.tools.scm import Version
 
@@ -100,6 +100,12 @@ def package(self):
         cm = CMake(self)
         cm.install()
 
+        if Version(self.version) >= "0.21.2":
+            # Introduced with version 0.21.*, there is now cmake exports added upstream.
+            rm(self, "*.cmake", os.path.join(self.package_folder, "lib", "cmake"), recursive=True)
+            rmdir(self, os.path.join(self.package_folder, "lib", "cmake", "openjph"))
+            rmdir(self, os.path.join(self.package_folder, "lib", "cmake"))
+
         # Cleanup package own pkgconfig
         rmdir(self, os.path.join(self.package_folder, "lib", "pkgconfig"))
 

recipes/openjph/all/patches/0.21.2_cmake-cxx-standard.patch

@@ -0,0 +1,26 @@
+diff --git CMakeLists.txt CMakeLists.txt
+index 716d5ad..9949c27 100644
+--- CMakeLists.txt
++++ CMakeLists.txt
+@@ -103,7 +103,7 @@ message(STATUS "Building ${CMAKE_BUILD_TYPE}")
+ 
+ ## C++ version and flags
+ # C++14 is needed for gtest, otherwise, C++11 is sufficient for the library
+-set(CMAKE_CXX_STANDARD 14)
++#set(CMAKE_CXX_STANDARD 14)
+ if (MSVC)
+   add_compile_definitions(_CRT_SECURE_NO_WARNINGS)
+ endif()
+diff --git src/apps/ojph_stream_expand/CMakeLists.txt src/apps/ojph_stream_expand/CMakeLists.txt
+index 24bc2d1..9b0d4c0 100644
+--- src/apps/ojph_stream_expand/CMakeLists.txt
++++ src/apps/ojph_stream_expand/CMakeLists.txt
+@@ -1,7 +1,7 @@
+ ## building ojph_stream_expand
+ ##############################
+ 
+-set(CMAKE_CXX_STANDARD 14)
++#set(CMAKE_CXX_STANDARD 14)
+ 
+ file(GLOB OJPH_STREAM_EXPAND  "*.cpp" "*.h")
+ file(GLOB OJPH_SOCKETS         "../others/ojph_sockets.cpp")

recipes/openjph/config.yml

@@ -1,7 +1,7 @@
 versions:
-  "0.18.0":
+  "0.21.2":
     folder: all
-  "0.17.0":
+  "0.18.0":
     folder: all
   "0.16.0":
     folder: all