Skip to content

Commit

Permalink
fix: turns out ubuntu 20 is not supported by qt 6.6. Ubuntu 22 is sup…
Browse files Browse the repository at this point in the history
…ported, so this version is used for testing and releasing.
  • Loading branch information
Bart-Steensma committed Feb 1, 2024
1 parent 02b28dd commit e866ffe
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 44 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:

jobs:
build-release:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04

steps:
- name: Checkout code
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
strategy:

matrix:
os: [ubuntu-20.04, ubuntu-22.04]
os: ubuntu-22.04
flag: [--static, --shared]

steps:
Expand Down
12 changes: 5 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -409,17 +409,15 @@ more information.

- [ ] Cross compile for raspberry pi

- [ ] Release v0.0.0 gives the following error on wsl arch:

```
/home/foo/Downloads/snapshot-0.0.0-Linux/./bin/snapshot: /usr/lib/libpthread.so.0: version `GLIBC_PRIVATE' not found (required by /home/foo/Downloads/snapshot-0.0.0-Linux/./lib/librt.so.1)
```


- [ ] Add to docs:

- How to build static and shared
- How to run the tar archive
- Requirements for running the app:
- Tested and released on ubuntu 22.04
- Also used on Arch linux
- Older versions of ubuntu might not work, as Qt 6.6 does not support
older versions of ubuntu.

- [ ] Add to FAQ:

Expand Down
38 changes: 6 additions & 32 deletions scripts/helpers/apt/install-vulkan
Original file line number Diff line number Diff line change
Expand Up @@ -18,35 +18,9 @@ while [[ $# -gt 0 ]]; do
esac
done

# For ubuntu 22.04
jammy() {
echo "Running jammy, installing vulkan sdk"
wget -qO- https://packages.lunarg.com/lunarg-signing-key-pub.asc | sudo tee /etc/apt/trusted.gpg.d/lunarg.asc
sudo wget -qO /etc/apt/sources.list.d/lunarg-vulkan-jammy.list http://packages.lunarg.com/vulkan/lunarg-vulkan-jammy.list
sudo apt -y update
sudo apt -y upgrade
sudo apt -y install vulkan-sdk
}

# For ubuntu 20.04
focal() {
echo "Running focal, installing vulkan sdk"
wget -qO - http://packages.lunarg.com/lunarg-signing-key-pub.asc | sudo apt-key add -
sudo wget -qO /etc/apt/sources.list.d/lunarg-vulkan-focal.list http://packages.lunarg.com/vulkan/lunarg-vulkan-focal.list
sudo apt -y update
sudo apt -y upgrade
sudo apt -y install vulkan-sdk
}

case "$(lsb_release -cs)" in
jammy)
jammy
;;
focal)
focal
;;
*)
echo "Only Ubuntu Focal (20.04) and Jammy (22.04) are supported. Aborting." >/dev/stderr
exit 1
;;
esac
echo "Adding PPA repository for vulkan sdk"
wget -qO- https://packages.lunarg.com/lunarg-signing-key-pub.asc | sudo tee /etc/apt/trusted.gpg.d/lunarg.asc
sudo wget -qO /etc/apt/sources.list.d/lunarg-vulkan-jammy.list http://packages.lunarg.com/vulkan/lunarg-vulkan-jammy.list
sudo apt -y update
sudo apt -y upgrade
sudo apt -y install vulkan-sdk
4 changes: 1 addition & 3 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,7 @@ if(QT6_LIB_TYPE STREQUAL "STATIC_LIBRARY")
list(APPEND LINK_LIBS FFmpeg::FFmpeg Qt6::QFFmpegMediaPlugin ${PLATFORM_PLUGINS})
endif()

# CMAKE_DL_LIBS is needed for building on Ubuntu 20.04
find_library(LIBDL dl)
target_link_libraries(snapshotapp PUBLIC ${LINK_LIBS} ${LIBDL})
target_link_libraries(snapshotapp PUBLIC ${LINK_LIBS})

if(QT6_LIB_TYPE STREQUAL "STATIC_LIBRARY")
qt_import_plugins(
Expand Down

0 comments on commit e866ffe

Please sign in to comment.