Skip to content
Extraits de code Groupes Projets
Vérifiée Valider 4133b0d9 rédigé par Kubat's avatar Kubat
Parcourir les fichiers

BUILD: Copy shell integrations for wayland, still not working for wayland-egl

parent 745b5b41
Aucune branche associée trouvée
Aucune étiquette associée trouvée
1 requête de fusion!197Draft: Refactor the whole code.
...@@ -24,16 +24,17 @@ function join_by() { ...@@ -24,16 +24,17 @@ function join_by() {
function get_additional_libs() { function get_additional_libs() {
case $* in case $* in
*qt*) *qt*)
for LIB in /usr/lib/x86_64-linux-gnu/libQt6OpenGLWidgets.so \ for LIB in /usr/lib/x86_64-linux-gnu/libQt6OpenGLWidgets.so \
/usr/lib/x86_64-linux-gnu/libQt6OpenGL.so \ /usr/lib/x86_64-linux-gnu/libQt6OpenGL.so \
/usr/lib/x86_64-linux-gnu/libQt6MultimediaWidgets.so \ /usr/lib/x86_64-linux-gnu/libQt6MultimediaWidgets.so \
/usr/lib/x86_64-linux-gnu/libQt6Multimedia.so \ /usr/lib/x86_64-linux-gnu/libQt6Multimedia.so \
/usr/lib/x86_64-linux-gnu/libQt6Concurrent.so \ /usr/lib/x86_64-linux-gnu/libQt6Concurrent.so \
/usr/lib/x86_64-linux-gnu/libQt6WaylandClient.so \ /usr/lib/x86_64-linux-gnu/libQt6WaylandClient.so \
/usr/lib/x86_64-linux-gnu/libQt6XcbQpa.so \ /usr/lib/x86_64-linux-gnu/libQt6XcbQpa.so \
/usr/lib/x86_64-linux-gnu/libQt6EglFSDeviceIntegration.so \ /usr/lib/x86_64-linux-gnu/libQt6WlShellIntegration.so.6 \
/usr/lib/x86_64-linux-gnu/libQt6EglFsKmsGbmSupport.so \ /usr/lib/x86_64-linux-gnu/libQt6EglFSDeviceIntegration.so \
/usr/lib/x86_64-linux-gnu/libQt6EglFsKmsSupport.so ; /usr/lib/x86_64-linux-gnu/libQt6EglFsKmsGbmSupport.so \
/usr/lib/x86_64-linux-gnu/libQt6EglFsKmsSupport.so ;
do do
for FILE in ${LIB}*; do for FILE in ${LIB}*; do
echo -n " -l${FILE} " echo -n " -l${FILE} "
...@@ -53,7 +54,7 @@ function deploy() { ...@@ -53,7 +54,7 @@ function deploy() {
local EXTRA_PLATFORM_PLUGINS="libqxcb.so;libqwayland-egl.so;libqwayland-generic.so;" local EXTRA_PLATFORM_PLUGINS="libqxcb.so;libqwayland-egl.so;libqwayland-generic.so;"
export EXTRA_PLATFORM_PLUGINS export EXTRA_PLATFORM_PLUGINS
local EXCLUDE_LIBS="libgdk_pixbuf libpango libcairo libgio libglib libgmodule libgobject libgthread" local EXCLUDE_LIBS="libgdk_pixbuf libpango libcairo libgio libglib libgmodule libgobject libgthread libX11-xcb libxcb-"
local EXCLUDE_LIBS="-name *$(join_by "* -or -name *" $EXCLUDE_LIBS)*" local EXCLUDE_LIBS="-name *$(join_by "* -or -name *" $EXCLUDE_LIBS)*"
# Will do most of the work # Will do most of the work
...@@ -67,6 +68,15 @@ function deploy() { ...@@ -67,6 +68,15 @@ function deploy() {
find ${EXEC^}/usr/lib/ -type f -and \( ${EXCLUDE_LIBS} \) -delete find ${EXEC^}/usr/lib/ -type f -and \( ${EXCLUDE_LIBS} \) -delete
cp LICENSE CHANGELOG.md CONTRIBUTING.md ${EXEC^}/ cp LICENSE CHANGELOG.md CONTRIBUTING.md ${EXEC^}/
install -Dm644 ${EXEC}/${EXEC}.appdata.xml ${EXEC^}/usr/share/metainfo/${EXEC}.appdata.xml install -Dm644 ${EXEC}/${EXEC}.appdata.xml ${EXEC^}/usr/share/metainfo/${EXEC}.appdata.xml
case ${*:2} in
*qt*)
cp -rf /usr/lib/x86_64-linux-gnu/qt6/plugins/wayland-shell-integration ${EXEC^}/usr/plugins/wayland-shell-integration
for SHELL in ${EXEC^}/usr/plugins/wayland-shell-integration/*; do
patchelf --force-rpath --set-rpath \$ORIGIN/../../lib:\$ORIGIN ${SHELL}
done
;;
*);;
esac
# Custom AppRun script! # Custom AppRun script!
unlink ${EXEC^}/AppRun \ unlink ${EXEC^}/AppRun \
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
set -e set -e
ARCH=$(arch) ARCH=$(arch)
PKG_BASE="make libmpv-dev cmake clang clang-format manpages man-db" PKG_BASE="make libmpv-dev cmake clang clang-format manpages man-db chrpath patchelf"
PKG_BACKPORT="" PKG_BACKPORT=""
PKG_BACKPORT+=" qt6-base-dev qt6-declarative-dev qt6-multimedia-dev qt6-tools-private-dev" PKG_BACKPORT+=" qt6-base-dev qt6-declarative-dev qt6-multimedia-dev qt6-tools-private-dev"
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter