Skip to content

oboe: update to 1.10.0 #28545

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+40 −0
Open

oboe: update to 1.10.0 #28545

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions recipes/oboe/all/conandata.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,18 @@
sources:
"1.10.0":
url: "https://github.com/google/oboe/archive/refs/tags/1.10.0.tar.gz"
sha256: "0e4245f8860c4287040a5d76501c588490bcc9cb57614c486c0c201a5dde3e9f"
"1.8.0":
url: "https://github.com/google/oboe/archive/refs/tags/1.8.0.tar.gz"
sha256: "1ab24ff129af6396b8a5741c12b44b922814337d1b40958ac7ada8e270eb4880"
"1.7.0":
url: "https://github.com/google/oboe/archive/refs/tags/1.7.0.tar.gz"
sha256: "b01896f9180f725a38806cfef73a29b36b2ea37f91389ed4e69d664ce83b79b6"
patches:
"1.10.0":
- patch_file: "patches/1.10.0-0001-fix-cmake.patch"
patch_description: "Fix CMakeLists"
patch_type: "conan"
"1.8.0":
- patch_file: "patches/1.8.0-0001-fix-cmake.patch"
patch_description: "Fix CMakeLists"
Expand Down
31 changes: 31 additions & 0 deletions recipes/oboe/all/patches/1.10.0-0001-fix-cmake.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index de9cd40..e6d4e44 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -96,14 +96,13 @@ target_include_directories(oboe
# Enable -Ofast
target_compile_options(oboe
PRIVATE
- -std=c++17
-Wall
-Wextra-semi
-Wshadow
-Wshadow-field
"$<$<CONFIG:RELEASE>:-Ofast>"
"$<$<CONFIG:DEBUG>:-O3>"
- "$<$<CONFIG:DEBUG>:-Werror>")
+)

target_compile_definitions(oboe PRIVATE $<$<BOOL:${OBOE_DISABLE_CONVERSION}>:DISABLE_CONVERSION=1>)

@@ -118,8 +117,8 @@ target_link_options(oboe PRIVATE "-Wl,-z,max-page-size=16384")

# When installing oboe put the libraries in the lib/<ABI> folder e.g. lib/arm64-v8a
install(TARGETS oboe
- LIBRARY DESTINATION lib/${ANDROID_ABI}
- ARCHIVE DESTINATION lib/${ANDROID_ABI})
+ LIBRARY DESTINATION lib
+ ARCHIVE DESTINATION lib)

# Also install the headers
install(DIRECTORY include/oboe DESTINATION include)
2 changes: 2 additions & 0 deletions recipes/oboe/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
versions:
"1.10.0":
folder: all
"1.8.0":
folder: all
"1.7.0":
Expand Down