Skip to content

Commit 172bc2f

Browse files
authored
OpenJPH: Add version 0.24.2 (#28543)
Contains small fixes including an unitialized variable problem
1 parent 9c1aac5 commit 172bc2f

File tree

3 files changed

+6
-19
lines changed

3 files changed

+6
-19
lines changed

recipes/openjph/all/conandata.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
sources:
2-
"0.24.1":
3-
url: "https://github.com/aous72/OpenJPH/archive/0.24.1.tar.gz"
4-
sha256: "5e44a809c9ee3dad175da839feaf66746cfc114a625ec61c786de8ad3f5ab472"
2+
"0.24.2":
3+
url: "https://github.com/aous72/OpenJPH/archive/0.24.2.tar.gz"
4+
sha256: "c99218752b15b5b2afca3b0e4d4f0ddf1ac19f94dbcbe11874fe492d44ed3e2d"
55
patches:
6-
"0.24.1":
7-
- patch_file: "patches/0.24.1-cmake-cxx-standard-pic.patch"
6+
"0.24.2":
7+
- patch_file: "patches/0.24.2-cmake-cxx-standard-pic.patch"
88
patch_description: "Remove setting of CXX standard to a fixed value overriding the toolchain provided by Conan and PIC hardcoded option"
99
patch_type: "conan"

recipes/openjph/all/patches/0.24.1-cmake-cxx-standard-pic.patch renamed to recipes/openjph/all/patches/0.24.2-cmake-cxx-standard-pic.patch

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,3 @@
1-
diff --git src/apps/ojph_stream_expand/CMakeLists.txt src/apps/ojph_stream_expand/CMakeLists.txt
2-
index 61e8603..85c1d99 100644
3-
--- src/apps/ojph_stream_expand/CMakeLists.txt
4-
+++ src/apps/ojph_stream_expand/CMakeLists.txt
5-
@@ -1,7 +1,7 @@
6-
## building ojph_stream_expand
7-
##############################
8-
9-
-set(CMAKE_CXX_STANDARD 14)
10-
+#set(CMAKE_CXX_STANDARD 14)
11-
12-
file(GLOB OJPH_STREAM_EXPAND "*.cpp" "*.h")
13-
file(GLOB OJPH_SOCKETS "../others/ojph_sockets.cpp")
141
diff --git src/core/CMakeLists.txt src/core/CMakeLists.txt
152
index ea19aea..132a619 100644
163
--- src/core/CMakeLists.txt

recipes/openjph/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
versions:
2-
"0.24.1":
2+
"0.24.2":
33
folder: all

0 commit comments

Comments
 (0)