Skip to content
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

Install either libqt6shadertools6-dev or qt6-shadertools-dev #14158

Merged
merged 2 commits into from
Jan 14, 2025
Merged

Install either libqt6shadertools6-dev or qt6-shadertools-dev #14158

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3cd854b
Drop special case for Bionic not using ffmpeg
daschuer Jan 10, 2025
1a787d3
Install either libqt6shadertools6-dev or qt6-shadertools-dev
daschuer Jan 10, 2025
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
6 changes: 3 additions & 3 deletions packaging/CPackDebUploadPPA.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,10 +88,10 @@ endif()

foreach(RELEASE ${CPACK_DEBIAN_DISTRIBUTION_RELEASES})

if (RELEASE STREQUAL "bionic")
set(CPACK_DEBIAN_PACKAGE_BUILD_DEPENDS_EXTRA "libmp4v2-dev,")
if (RELEASE STREQUAL "jammy")
set(CPACK_DEBIAN_PACKAGE_BUILD_DEPENDS_EXTRA "libqt6shadertools6-dev,")
else()
set(CPACK_DEBIAN_PACKAGE_BUILD_DEPENDS_EXTRA "libavformat-dev,")
set(CPACK_DEBIAN_PACKAGE_BUILD_DEPENDS_EXTRA "qt6-shadertools-dev,")
endif()

configure_file(${CPACK_TOPLEVEL_DIRECTORY}/${CPACK_PACKAGE_FILE_NAME}/packaging/debian/control.in
Expand Down
2 changes: 1 addition & 1 deletion packaging/debian/control.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ Build-Depends: debhelper (>= 11),
qml6-module-qtquick-layouts,
libqt6core5compat6-dev,
libqt6opengl6-dev,
libqt6shadertools6-dev,
libqt6sql6-sqlite,
libqt6svg6-dev,
cmake (>= 3.13),
Expand All @@ -27,6 +26,7 @@ Build-Depends: debhelper (>= 11),
libogg-dev,
libsndfile1-dev,
libasound2-dev,
libavformat-dev,
libvorbis-dev,
libfaad-dev,
libportmidi-dev,
Expand Down
11 changes: 5 additions & 6 deletions tools/debian_buildenv.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@ case "$1" in
setup)
source /etc/lsb-release 2>/dev/null
case "${DISTRIB_CODENAME}" in
bionic) # Ubuntu 18.04 LTS
focal|jammy|bullseye) # <= Ubuntu 22.04.5 LTS
PACKAGES_EXTRA=(
libmp4v2-dev
libqt6shadertools6-dev
)
;;
*) # libmp4v2 was removed from Debian 10 & Ubuntu 20.04 due to lack of maintenance, so use FFMPEG instead
*)
PACKAGES_EXTRA=(
libavformat-dev
qt6-shadertools-dev
)
esac

Expand Down Expand Up @@ -58,6 +58,7 @@ case "$1" in
fonts-ubuntu \
g++ \
lcov \
libavformat-dev \
libbenchmark-dev \
libchromaprint-dev \
libdistro-info-perl \
Expand All @@ -80,9 +81,7 @@ case "$1" in
libportmidi-dev \
libprotobuf-dev \
libqt6core5compat6-dev\
libqt6shadertools6-dev \
libqt6opengl6-dev \
libqt6shadertools6-dev \
libqt6sql6-sqlite \
libqt6svg6-dev \
librubberband-dev \
Expand Down
Loading