mirror of
https://github.com/qTox/qTox.git
synced 2024-03-22 14:00:36 +08:00
chore(deps): Update c-toxcore to v0.2.18
Replace msgpack-c with toxcore submodule of cmp.
This commit is contained in:
Anthony Bilinski
parent
a004243cc0
commit
3c467de9f2
|
|
@ -39,6 +39,5 @@ install_deps \
|
|||
build_vpx.sh \
|
||||
build_opus.sh \
|
||||
build_ffmpeg.sh \
|
||||
build_msgpack_c.sh \
|
||||
build_toxcore.sh \
|
||||
build_sqlcipher.sh \
|
||||
|
|
|
|||
|
|
@ -1,26 +0,0 @@
|
|||
#!/bin/bash
|
||||
|
||||
# SPDX-License-Identifier: GPL-3.0-or-later AND MIT
|
||||
# Copyright (c) 2022 by The qTox Project Contributors
|
||||
|
||||
set -euo pipefail
|
||||
|
||||
readonly SCRIPT_DIR="$(dirname "$(realpath "$0")")"
|
||||
|
||||
source "${SCRIPT_DIR}/build_utils.sh"
|
||||
|
||||
parse_arch --dep "msgpack-c" --supported "win32 win64 macos" "$@"
|
||||
|
||||
"${SCRIPT_DIR}/download/download_msgpack_c.sh"
|
||||
|
||||
cmake .\
|
||||
"-DCMAKE_INSTALL_PREFIX=${DEP_PREFIX}" \
|
||||
-DCMAKE_BUILD_TYPE=Release \
|
||||
"${CMAKE_TOOLCHAIN_FILE}" \
|
||||
-DMSGPACK_BUILD_EXAMPLES=OFF \
|
||||
-DMSGPACK_BUILD_TESTS=OFF \
|
||||
"-DCMAKE_OSX_DEPLOYMENT_TARGET=${MACOS_MINIMUM_SUPPORTED_VERSION}" \
|
||||
.
|
||||
|
||||
make -j "${MAKE_JOBS}"
|
||||
make install
|
||||
|
|
@ -37,7 +37,6 @@ RUN dnf --nodocs -y install dnf-plugins-core && \
|
|||
ffmpeg-devel \
|
||||
libexif-devel \
|
||||
qrencode-devel \
|
||||
msgpack-devel \
|
||||
openal-soft-devel \
|
||||
kf5-sonnet-devel \
|
||||
libXScrnSaver-devel \
|
||||
|
|
|
|||
|
|
@ -30,7 +30,6 @@ RUN pacman -Syu --noconfirm --needed \
|
|||
sqlcipher \
|
||||
openal \
|
||||
sonnet \
|
||||
msgpack-c \
|
||||
snorenotify \
|
||||
git \
|
||||
&& \
|
||||
|
|
|
|||
|
|
@ -40,7 +40,6 @@ RUN apt-get update && \
|
|||
libkf5sonnet-dev \
|
||||
pkg-config \
|
||||
libqrencode-dev \
|
||||
libmsgpack-dev \
|
||||
qttools5-dev && \
|
||||
apt-get clean && \
|
||||
rm -rf /var/lib/apt/lists/*
|
||||
|
|
|
|||
|
|
@ -42,7 +42,6 @@ RUN apt-get update && \
|
|||
libkf5sonnet-dev \
|
||||
pkg-config \
|
||||
libqrencode-dev \
|
||||
libmsgpack-dev \
|
||||
qt5-default \
|
||||
qttools5-dev && \
|
||||
apt-get clean && \
|
||||
|
|
|
|||
|
|
@ -39,7 +39,6 @@ RUN dnf --nodocs -y install dnf-plugins-core && \
|
|||
openal-soft-devel \
|
||||
kf5-sonnet-devel \
|
||||
libXScrnSaver-devel \
|
||||
msgpack-devel \
|
||||
patch \
|
||||
sqlite-devel \
|
||||
sqlcipher-devel && \
|
||||
|
|
|
|||
|
|
@ -39,11 +39,6 @@ RUN mkdir -p /src/libsodium && \
|
|||
cd /src/libsodium && \
|
||||
/build/download/download_sodium.sh
|
||||
|
||||
COPY download/download_msgpack_c.sh /build/download/download_msgpack_c.sh
|
||||
RUN mkdir -p /src/msgpack && \
|
||||
cd /src/msgpack && \
|
||||
/build/download/download_msgpack_c.sh
|
||||
|
||||
COPY download/download_sqlcipher.sh /build/download/download_sqlcipher.sh
|
||||
RUN mkdir -p /src/sqlcipher && \
|
||||
cd /src/sqlcipher && \
|
||||
|
|
|
|||
|
|
@ -25,7 +25,6 @@ RUN zypper install --no-recommends -y \
|
|||
libqt5-qtsvg-devel \
|
||||
libsodium-devel \
|
||||
libvpx-devel \
|
||||
msgpack-devel \
|
||||
openal-soft-devel \
|
||||
qrencode-devel \
|
||||
sqlcipher-devel \
|
||||
|
|
|
|||
|
|
@ -58,7 +58,6 @@ RUN apt-get update && \
|
|||
libinotifytools0-dev \
|
||||
liblz4-dev \
|
||||
libcairo-dev \
|
||||
libmsgpack-dev \
|
||||
desktop-file-utils \
|
||||
wget \
|
||||
xxd \
|
||||
|
|
|
|||
|
|
@ -158,13 +158,6 @@ RUN mkdir -p /src/nsisshellexecasuser && \
|
|||
/build/build_nsisshellexecasuser_windows.sh && \
|
||||
rm -fr /src/nsisshellexecasuser
|
||||
|
||||
COPY download/download_msgpack_c.sh /build/download/download_msgpack_c.sh
|
||||
COPY build_msgpack_c.sh /build/build_msgpack_c.sh
|
||||
RUN mkdir -p /src/msgpack_c && \
|
||||
cd /src/msgpack_c && \
|
||||
/build/build_msgpack_c.sh && \
|
||||
rm -fr /src/msgpack_c
|
||||
|
||||
COPY download/download_toxcore.sh /build/download/download_toxcore.sh
|
||||
COPY download/download_toxext.sh /build/download/download_toxext.sh
|
||||
COPY download/download_toxext_messages.sh /build/download/download_toxext_messages.sh
|
||||
|
|
@ -193,7 +186,6 @@ RUN mkdir /export && \
|
|||
cp /windows/lib/libqrencode.dll /export && \
|
||||
cp /windows/bin/libsodium-*.dll /export && \
|
||||
cp /windows/bin/libsqlcipher-*.dll /export && \
|
||||
cp /windows/bin/libmsgpackc.dll /export && \
|
||||
cp /windows/bin/swscale-*.dll /export && \
|
||||
cp /windows/bin/libcrypto-*.dll /export && \
|
||||
cp /windows/bin/libtoxcore.dll /export && \
|
||||
|
|
|
|||
|
|
@ -1,27 +0,0 @@
|
|||
#!/bin/bash
|
||||
|
||||
# Copyright © 2022 by The qTox Project Contributors
|
||||
#
|
||||
# This program is libre software: you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation, either version 3 of the License, or
|
||||
# (at your option) any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
set -euo pipefail
|
||||
|
||||
MSGPACK_VERSION=c-4.0.0
|
||||
MSGPACK_HASH=656ebe4566845e7bda9c097b625ba59ac72ddfd45df6017172d46d9ac7365aa3
|
||||
|
||||
source "$(dirname "$(realpath "$0")")/common.sh"
|
||||
|
||||
download_verify_extract_tarball \
|
||||
"https://github.com/msgpack/msgpack-c/archive/${MSGPACK_VERSION}.tar.gz" \
|
||||
"${MSGPACK_HASH}"
|
||||
|
|
@ -17,11 +17,11 @@
|
|||
|
||||
set -euo pipefail
|
||||
|
||||
TOXCORE_VERSION=0.2.17
|
||||
TOXCORE_HASH=d9cdf5d690fe8e217dcaba5b988fb943bbe7bda919a2fde6d9506df047e5f4cb
|
||||
TOXCORE_VERSION=0.2.18
|
||||
TOXCORE_HASH=f2940537998863593e28bc6a6b5f56f09675f6cd8a28326b7bc31b4836c08942
|
||||
|
||||
source "$(dirname "$(realpath "$0")")/common.sh"
|
||||
|
||||
download_verify_extract_tarball \
|
||||
https://github.com/TokTok/c-toxcore/archive/v$TOXCORE_VERSION.tar.gz \
|
||||
https://github.com/TokTok/c-toxcore/releases/download/v$TOXCORE_VERSION/c-toxcore-$TOXCORE_VERSION.tar.gz \
|
||||
"$TOXCORE_HASH"
|
||||
|
|
|
|||
|
|
@ -83,21 +83,6 @@
|
|||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "msgpack",
|
||||
"buildsystem": "cmake-ninja",
|
||||
"config-opts": [
|
||||
"-DCMAKE_BUILD_TYPE=Release",
|
||||
"-DMSGPACK_BUILD_EXAMPLES=OFF",
|
||||
"-DMSGPACK_BUILD_TESTS=OFF"
|
||||
],
|
||||
"sources": [
|
||||
{
|
||||
"type": "dir",
|
||||
"path": "/src/msgpack"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "c-toxcore",
|
||||
"buildsystem": "cmake-ninja",
|
||||
|
|
|
|||
|
|
@ -13,7 +13,6 @@ brew "qrencode"
|
|||
brew "qt@5"
|
||||
brew "sqlcipher"
|
||||
brew "openal-soft"
|
||||
brew "msgpack"
|
||||
# accelerate builds with ccache
|
||||
brew "ccache"
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user