Skip to content
This repository was archived by the owner on Aug 22, 2024. It is now read-only.

Support ubuntu 22.04 #1941

Open
wants to merge 7 commits into
base: develop
Choose a base branch
from
Open

Support ubuntu 22.04 #1941

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b3d658b
Update azure_c_shared
asukiaaa Jul 28, 2023
3b36a38
Update libebml to latest version
asukiaaa Jul 28, 2023
5d79287
Update libmatroska to latest
asukiaaa Jul 29, 2023
b68e654
Update library name for EBML and Matroska
asukiaaa Jul 29, 2023
2bb63f0
Use UINT8_MAX
asukiaaa Jul 29, 2023
5c0ad33
Change to size_t for returning value of LargeFileIOCallback::read
asukiaaa Jul 29, 2023
db0baa9
Update Dockerfile and setup-ubuntu script for ubuntu22.04
asukiaaa Jul 30, 2023
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
Prev Previous commit
Next Next commit
Update library name for EBML and Matroska
  • Loading branch information
@asukiaaa
asukiaaa committed Jul 29, 2023
commit b68e654f61c87342e9644bef7b570bbbd45c9436
2 changes: 1 addition & 1 deletion extern/libebml/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ else()
message(STATUS "ebml is already a target. Skipping adding it twice")
endif()

add_library(ebml::ebml ALIAS ebml)
add_library(EBML::ebml ALIAS ebml)
4 changes: 2 additions & 2 deletions extern/libmatroska/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ if (NOT TARGET matroska)
# This is a hack to trick libmatroska into thinking there is an installed
# version of ebml. In reality, ebml is already a target since its source is
# part of the build graph.
set(Ebml_DIR "${CMAKE_CURRENT_LIST_DIR}")
set(EBML_DIR "${CMAKE_CURRENT_LIST_DIR}")

add_subdirectory(src EXCLUDE_FROM_ALL)
else()
message(STATUS "matroska is already a target. Skipping adding it twice")
endif()

add_library(matroska::matroska ALIAS matroska)
add_library(Matroska::matroska ALIAS matroska)
0 extern/libmatroska/EbmlConfig.cmake → extern/libmatroska/EBMLConfig.cmake
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion extern/libmatroska/EbmlConfigVersion.cmake → extern/libmatroska/EBMLConfigVersion.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
# version of ebml. In reality, ebml is already a target since its source is
# part of the build graph.

set(PACKAGE_VERSION 1.3.5)
set(PACKAGE_VERSION 1.4.4)
set(PACKAGE_VERSION_EXACT YES)
set(PACKAGE_VERSION_EXACT YES)
8 changes: 4 additions & 4 deletions src/record/internal/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,15 @@ target_include_directories(k4a_playback PUBLIC
target_link_libraries(k4a_record PUBLIC
k4a::k4a
k4ainternal::logging
ebml::ebml
matroska::matroska
EBML::ebml
Matroska::matroska
)

target_link_libraries(k4a_playback PUBLIC
k4a::k4a
k4ainternal::logging
ebml::ebml
matroska::matroska
EBML::ebml
Matroska::matroska
libyuv::libyuv
libjpeg-turbo::libjpeg-turbo
)
Expand Down
4 changes: 2 additions & 2 deletions src/record/sdk/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ target_link_libraries(k4arecord PRIVATE
k4ainternal::record
k4ainternal::playback
k4ainternal::logging
ebml::ebml
matroska::matroska
EBML::ebml
Matroska::matroska
)

target_link_libraries(k4arecord PUBLIC
Expand Down