mirror of
https://github.com/telegramdesktop/tdesktop
synced 2025-02-01 12:44:31 +00:00
Update kwayland and move its dependencies to ThirdParty to keep them in sync
This commit is contained in:
parent
10e7bd0d6e
commit
799155279f
9
.gitmodules
vendored
9
.gitmodules
vendored
@ -94,3 +94,12 @@
|
||||
[submodule "Telegram/ThirdParty/dispatch"]
|
||||
path = Telegram/ThirdParty/dispatch
|
||||
url = https://github.com/apple/swift-corelibs-libdispatch
|
||||
[submodule "Telegram/ThirdParty/extra-cmake-modules"]
|
||||
path = Telegram/ThirdParty/extra-cmake-modules
|
||||
url = https://github.com/KDE/extra-cmake-modules.git
|
||||
[submodule "Telegram/ThirdParty/plasma-wayland-protocols"]
|
||||
path = Telegram/ThirdParty/plasma-wayland-protocols
|
||||
url = https://github.com/KDE/plasma-wayland-protocols.git
|
||||
[submodule "Telegram/ThirdParty/wayland-protocols"]
|
||||
path = Telegram/ThirdParty/wayland-protocols
|
||||
url = https://github.com/gitlab-freedesktop-mirrors/wayland-protocols.git
|
||||
|
1
Telegram/ThirdParty/extra-cmake-modules
vendored
Submodule
1
Telegram/ThirdParty/extra-cmake-modules
vendored
Submodule
@ -0,0 +1 @@
|
||||
Subproject commit 29a243a9c12e1f9fdcabcae7fb8c4ab091d1ed68
|
2
Telegram/ThirdParty/kwayland
vendored
2
Telegram/ThirdParty/kwayland
vendored
@ -1 +1 @@
|
||||
Subproject commit bc0d375055c20b43495a84bb5f90d530fc98be74
|
||||
Subproject commit 4dfc49ff85f0de23c254dd0832645e924e19c4a6
|
1
Telegram/ThirdParty/plasma-wayland-protocols
vendored
Submodule
1
Telegram/ThirdParty/plasma-wayland-protocols
vendored
Submodule
@ -0,0 +1 @@
|
||||
Subproject commit 490895c66b364ce5741b854ee4343af21547fee5
|
1
Telegram/ThirdParty/wayland-protocols
vendored
Submodule
1
Telegram/ThirdParty/wayland-protocols
vendored
Submodule
@ -0,0 +1 @@
|
||||
Subproject commit bb7b3985eded147104331830a370195dffd1cdab
|
@ -52,18 +52,6 @@ RUN rm $CMAKE_FILE
|
||||
FROM builder AS patches
|
||||
RUN git clone $GIT/desktop-app/patches.git && cd patches && git checkout 5368789dc7
|
||||
|
||||
FROM builder AS extra-cmake-modules
|
||||
|
||||
RUN git clone -b v5.89.0 --depth=1 $GIT/KDE/extra-cmake-modules.git
|
||||
|
||||
WORKDIR extra-cmake-modules
|
||||
RUN cmake -GNinja -B build . -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTING=OFF
|
||||
RUN cmake --build build --parallel
|
||||
RUN DESTDIR="$LibrariesPath/extra-cmake-modules-cache" cmake --install build
|
||||
|
||||
WORKDIR ..
|
||||
RUN rm -rf extra-cmake-modules
|
||||
|
||||
FROM builder AS libffi
|
||||
RUN git clone -b v3.4.2 --depth=1 $GIT/libffi/libffi.git
|
||||
|
||||
@ -356,36 +344,6 @@ RUN DESTDIR="$LibrariesPath/wayland-cache" meson install -C build
|
||||
WORKDIR ..
|
||||
RUN rm -rf wayland
|
||||
|
||||
FROM builder AS wayland-protocols
|
||||
COPY --from=wayland ${LibrariesPath}/wayland-cache /
|
||||
|
||||
RUN git clone -b 1.24 --depth=1 $GIT_FREEDESKTOP/wayland-protocols.git
|
||||
|
||||
WORKDIR wayland-protocols
|
||||
RUN meson build \
|
||||
--buildtype=release \
|
||||
--default-library=both \
|
||||
-Dtests=false
|
||||
|
||||
RUN meson compile -C build
|
||||
RUN DESTDIR="$LibrariesPath/wayland-protocols-cache" meson install -C build
|
||||
|
||||
WORKDIR ..
|
||||
RUN rm -rf wayland-protocols
|
||||
|
||||
FROM builder AS plasma-wayland-protocols
|
||||
COPY --from=extra-cmake-modules ${LibrariesPath}/extra-cmake-modules-cache /
|
||||
|
||||
RUN git clone -b v1.5.0 --depth=1 $GIT/KDE/plasma-wayland-protocols.git
|
||||
|
||||
WORKDIR plasma-wayland-protocols
|
||||
RUN cmake -GNinja -B build . -DCMAKE_BUILD_TYPE=Release
|
||||
RUN cmake --build build --parallel
|
||||
RUN DESTDIR="$LibrariesPath/plasma-wayland-protocols-cache" cmake --install build
|
||||
|
||||
WORKDIR ..
|
||||
RUN rm -rf plasma-wayland-protocols
|
||||
|
||||
FROM builder AS libpciaccess
|
||||
RUN git clone -b libpciaccess-0.16 --depth=1 $GIT_FREEDESKTOP/libpciaccess.git
|
||||
|
||||
@ -839,7 +797,6 @@ RUN cmake --build out --config Debug --parallel
|
||||
|
||||
FROM builder
|
||||
|
||||
COPY --from=extra-cmake-modules ${LibrariesPath}/extra-cmake-modules-cache /
|
||||
COPY --from=libffi ${LibrariesPath}/libffi-cache /
|
||||
COPY --from=zlib ${LibrariesPath}/zlib-cache /
|
||||
COPY --from=xz ${LibrariesPath}/xz-cache /
|
||||
@ -863,8 +820,6 @@ COPY --from=libXrender ${LibrariesPath}/libXrender-cache /
|
||||
COPY --from=libXdamage ${LibrariesPath}/libXdamage-cache /
|
||||
COPY --from=libXcomposite ${LibrariesPath}/libXcomposite-cache /
|
||||
COPY --from=wayland ${LibrariesPath}/wayland-cache /
|
||||
COPY --from=wayland-protocols ${LibrariesPath}/wayland-protocols-cache /
|
||||
COPY --from=plasma-wayland-protocols ${LibrariesPath}/plasma-wayland-protocols-cache /
|
||||
COPY --from=libpciaccess ${LibrariesPath}/libpciaccess-cache /
|
||||
COPY --from=drm ${LibrariesPath}/drm-cache /
|
||||
COPY --from=libva ${LibrariesPath}/libva-cache /
|
||||
|
2
cmake
2
cmake
@ -1 +1 @@
|
||||
Subproject commit b3cb911ae0f23c9e12fe8ce55c706d81680a202f
|
||||
Subproject commit 8e952639aa34dba9f3ac712979a7fcd852e1de89
|
@ -105,7 +105,6 @@ parts:
|
||||
- libxcb-keysyms1-dev
|
||||
- libxcb-record0-dev
|
||||
- libxcb-screensaver0-dev
|
||||
- wayland-protocols
|
||||
- zlib1g-dev
|
||||
stage-packages:
|
||||
- libasound2
|
||||
@ -154,11 +153,9 @@ parts:
|
||||
- -./lib/systemd
|
||||
after:
|
||||
- desktop-qt
|
||||
- extra-cmake-modules
|
||||
- ffmpeg
|
||||
- mozjpeg
|
||||
- openal
|
||||
- plasma-wayland-protocols
|
||||
- rnnoise
|
||||
- webrtc
|
||||
|
||||
@ -212,17 +209,6 @@ parts:
|
||||
after:
|
||||
- patches
|
||||
|
||||
extra-cmake-modules:
|
||||
source: https://github.com/KDE/extra-cmake-modules.git
|
||||
source-depth: 1
|
||||
source-tag: v5.89.0
|
||||
plugin: cmake
|
||||
cmake-parameters:
|
||||
- -DCMAKE_BUILD_TYPE=Release
|
||||
- -DCMAKE_INSTALL_PREFIX=/usr
|
||||
- -DBUILD_TESTING=OFF
|
||||
prime: [-./*]
|
||||
|
||||
ffmpeg:
|
||||
plugin: nil
|
||||
build-packages:
|
||||
@ -284,18 +270,6 @@ parts:
|
||||
- -./usr/lib/$SNAPCRAFT_ARCH_TRIPLET/pkgconfig
|
||||
- -./usr/lib/$SNAPCRAFT_ARCH_TRIPLET/libopenal.so
|
||||
|
||||
plasma-wayland-protocols:
|
||||
source: https://github.com/KDE/plasma-wayland-protocols.git
|
||||
source-depth: 1
|
||||
source-tag: v1.5.0
|
||||
plugin: cmake
|
||||
cmake-parameters:
|
||||
- -DCMAKE_BUILD_TYPE=Release
|
||||
- -DCMAKE_INSTALL_PREFIX=/usr
|
||||
prime: [-./*]
|
||||
after:
|
||||
- extra-cmake-modules
|
||||
|
||||
qt:
|
||||
plugin: nil
|
||||
build-packages:
|
||||
|
Loading…
Reference in New Issue
Block a user