dev
This commit is contained in:
@@ -0,0 +1,41 @@
|
||||
ARG DOCKER_PREFIX=wapmobil/
|
||||
FROM ${DOCKER_PREFIX}debian-base
|
||||
ARG JOBS_COUNT=8
|
||||
ARG JOBS_QT_COUNT=8
|
||||
|
||||
# versions
|
||||
ENV CUR_CMAKE_VERSION=4.3.2
|
||||
ENV CUR_SODIUM_VERSION=1.0.22
|
||||
ENV CUR_FFTW_VERSION=3.3.11
|
||||
ENV CUR_ASSIMP_VERSION=5.4.3
|
||||
ENV CUR_DISCOUNT_VERSION=3.0.1.2
|
||||
ENV CUR_MICROHTTPD_VERSION=1.0.1
|
||||
ENV CUR_OPENSSL_VERSION=1_1_1w
|
||||
ENV CUR_OPENCV_VERSION=4.13.0
|
||||
ENV CUR_CURL_VERSION=8_20_0
|
||||
ENV CUR_QT_VERSION_MAJOR=5.15
|
||||
ENV CUR_QT_VERSION=5.15.18
|
||||
ENV QT_SELECT=5
|
||||
ENV MINGW_VERSION=14 # provided by Debian
|
||||
|
||||
COPY *.zip /soft/
|
||||
COPY *.cmake /soft/
|
||||
COPY *.patch /soft/
|
||||
|
||||
# dev soft for our SDK
|
||||
RUN apt-get update && apt-get install -y cpio libglu1-mesa-dev libgl1-mesa-dev libwayland-dev libncurses-dev flex bison gperf \
|
||||
python3 python3-pip python3-setuptools python3-serial python3-click python3-cryptography python3-pyparsing python3-pyelftools \
|
||||
ccache libffi-dev libssl-dev doxygen graphviz libx11-dev libxkbcommon-dev libpkgconfig-perl libfreetype6-dev libfontconfig1-dev \
|
||||
liblzma-dev libxml2-dev libbz2-dev libmpc-dev libmpfr-dev libgmp-dev libicu-dev libusb-1.0-0-dev libreadline-dev \
|
||||
ninja-build mingw-w64 libz-mingw-w64-dev wine64 \
|
||||
&& rm -rf /var/cache/apt/archives/*
|
||||
|
||||
WORKDIR /soft
|
||||
RUN wget -nv https://github.com/Kitware/CMake/releases/download/v${CUR_CMAKE_VERSION}/cmake-${CUR_CMAKE_VERSION}-Linux-x86_64.sh \
|
||||
&& rm -rf /opt/cmake \
|
||||
&& mkdir -p /opt/cmake \
|
||||
&& bash ./cmake-${CUR_CMAKE_VERSION}-Linux-x86_64.sh --skip-license --prefix=/opt/cmake \
|
||||
&& rm -rf /soft/cmake-${CUR_CMAKE_VERSION}-Linux-x86_64.sh
|
||||
|
||||
# Remove invalid FindGtest.cmake
|
||||
RUN cd "$(find /opt/cmake/share -name FindGTest.cmake -type f -printf '%h' -quit)" && rm FindGTest.cmake
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -0,0 +1,8 @@
|
||||
--- CMakeLists.txt 2025-09-08 16:51:18.000000000 +0000
|
||||
+++ CMakeLists_new.txt 2026-05-05 20:28:40.480444592 +0000
|
||||
@@ -1,4 +1,4 @@
|
||||
-cmake_minimum_required(VERSION 2.8.12)
|
||||
+cmake_minimum_required(VERSION 3.13)
|
||||
|
||||
project(DISCOUNT C)
|
||||
|
||||
@@ -0,0 +1,9 @@
|
||||
--- CMakeLists.txt 2026-04-18 10:17:59.000000000 +0000
|
||||
+++ CMakeLists_new.txt 2026-05-06 08:33:16.061429892 +0000
|
||||
@@ -1,4 +1,4 @@
|
||||
-cmake_minimum_required (VERSION 3.0)
|
||||
+cmake_minimum_required (VERSION 3.13)
|
||||
|
||||
if (NOT DEFINED CMAKE_BUILD_TYPE)
|
||||
set (CMAKE_BUILD_TYPE Release CACHE STRING "Build type")
|
||||
|
||||
Binary file not shown.
@@ -0,0 +1,13 @@
|
||||
set(HAVE_IOEO_EXITCODE 0 CACHE BOOL "")
|
||||
set(H5_LDOUBLE_TO_LONG_SPECIAL_RUN 1 CACHE BOOL "")
|
||||
set(H5_LONG_TO_LDOUBLE_SPECIAL_RUN 1 CACHE BOOL "")
|
||||
set(H5_LDOUBLE_TO_LLONG_ACCURATE_RUN 0 CACHE BOOL "")
|
||||
set(H5_LLONG_TO_LDOUBLE_CORRECT_RUN 0 CACHE BOOL "")
|
||||
set(H5_DISABLE_SOME_LDOUBLE_CONV_RUN 1 CACHE BOOL "")
|
||||
|
||||
set(HAVE_IOEO_EXITCODE__TRYRUN_OUTPUT 0 CACHE BOOL "")
|
||||
set(H5_LDOUBLE_TO_LONG_SPECIAL_RUN__TRYRUN_OUTPUT 1 CACHE BOOL "")
|
||||
set(H5_LONG_TO_LDOUBLE_SPECIAL_RUN__TRYRUN_OUTPUT 1 CACHE BOOL "")
|
||||
set(H5_LDOUBLE_TO_LLONG_ACCURATE_RUN__TRYRUN_OUTPUT 0 CACHE BOOL "")
|
||||
set(H5_LLONG_TO_LDOUBLE_CORRECT_RUN__TRYRUN_OUTPUT 0 CACHE BOOL "")
|
||||
set(H5_DISABLE_SOME_LDOUBLE_CONV_RUN__TRYRUN_OUTPUT 1 CACHE BOOL "")
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -0,0 +1,11 @@
|
||||
--- qbluetoothservicediscoveryagent_win.cpp 2025-03-30 11:49:36.000000000 +0000
|
||||
+++ qbluetoothservicediscoveryagent_win.cpp.new 2026-05-06 11:18:55.546127656 +0000
|
||||
@@ -211,7 +211,7 @@
|
||||
#else
|
||||
# define SDP_CALLBACK QT_WIN_CALLBACK
|
||||
#endif
|
||||
-static BOOL SDP_CALLBACK bluetoothSdpCallback(ULONG attributeId, LPBYTE valueStream, ULONG streamSize, LPVOID param)
|
||||
+static BOOL SDP_CALLBACK __attribute__((stdcall)) bluetoothSdpCallback(ULONG attributeId, LPBYTE valueStream, ULONG streamSize, LPVOID param)
|
||||
{
|
||||
QBluetoothServiceInfo *result = static_cast<QBluetoothServiceInfo*>(param);
|
||||
|
||||
@@ -0,0 +1,10 @@
|
||||
--- variant.hpp 2025-03-30 14:49:42.000000000 +0300
|
||||
+++ variant.hpp.new 2026-05-06 15:20:14.230916400 +0300
|
||||
@@ -11,6 +11,7 @@
|
||||
#include <typeinfo>
|
||||
#include <utility>
|
||||
#include <functional>
|
||||
+#include <cstdint>
|
||||
|
||||
#include <mapbox/recursive_wrapper.hpp>
|
||||
#include <mapbox/variant_visitor.hpp>
|
||||
@@ -0,0 +1,11 @@
|
||||
--- document.h 2025-03-30 14:49:42.000000000 +0300
|
||||
+++ document.h.new 2026-05-06 15:15:34.964280900 +0300
|
||||
@@ -316,7 +316,7 @@
|
||||
|
||||
GenericStringRef(const GenericStringRef& rhs) : s(rhs.s), length(rhs.length) {}
|
||||
|
||||
- GenericStringRef& operator=(const GenericStringRef& rhs) { s = rhs.s; length = rhs.length; }
|
||||
+ GenericStringRef& operator=(const GenericStringRef& rhs) { s = rhs.s; const_cast<SizeType&>(length) = rhs.length; }
|
||||
|
||||
//! implicit conversion to plain CharType pointer
|
||||
operator const Ch *() const { return s; }
|
||||
@@ -0,0 +1,10 @@
|
||||
--- string.hpp 2025-03-30 14:49:42.000000000 +0300
|
||||
+++ string.hpp.new 2026-05-06 15:14:40.188710700 +0300
|
||||
@@ -5,6 +5,7 @@
|
||||
#include <cassert>
|
||||
#include <cstdlib>
|
||||
#include <exception>
|
||||
+#include <cstdint>
|
||||
|
||||
// Polyfill needed by Qt when building for Android with GCC
|
||||
#if defined(__ANDROID__) && defined(__GLIBCXX__)
|
||||
@@ -0,0 +1,11 @@
|
||||
--- main.c 2025-03-30 14:49:56.000000000 +0300
|
||||
+++ main.c.new 2026-05-06 15:35:17.502272400 +0300
|
||||
@@ -98,7 +98,7 @@
|
||||
|
||||
argv[0] = newPath;
|
||||
#ifdef _WIN32
|
||||
- const intptr_t ret = _spawnvp(_P_WAIT, newPath, argv);
|
||||
+ const intptr_t ret = _spawnvp(_P_WAIT, newPath, (const char * const*)argv);
|
||||
if (ret == -1) {
|
||||
fprintf(stderr, "Error while executing \"%s\" tool.\n", newPath);
|
||||
return 3;
|
||||
@@ -0,0 +1,11 @@
|
||||
--- qsgd3d12engine.cpp 2026-05-04 20:08:43.659748421 +0000
|
||||
+++ qsgd3d12engine.cpp_new 2026-05-04 20:07:27.147110335 +0000
|
||||
@@ -45,6 +45,8 @@
|
||||
#include <QLoggingCategory>
|
||||
#include <qmath.h>
|
||||
#include <qalgorithms.h>
|
||||
+#include <d3d12sdklayers.h>
|
||||
+#define _uuidof __uuidof
|
||||
|
||||
// Comment out to disable DeviceLossTester functionality in order to reduce
|
||||
// code size and improve startup perf a tiny bit.
|
||||
Binary file not shown.
Binary file not shown.
@@ -0,0 +1,22 @@
|
||||
set(CMAKE_SYSTEM_NAME Windows)
|
||||
set(CMAKE_SYSTEM_PROCESSOR x86_64)
|
||||
|
||||
set(CMAKE_C_COMPILER /usr/bin/${CMAKE_SYSTEM_PROCESSOR}-w64-mingw32-gcc-posix )
|
||||
set(CMAKE_C_COMPILER_AR /usr/bin/${CMAKE_SYSTEM_PROCESSOR}-w64-mingw32-gcc-ar-posix )
|
||||
set(CMAKE_C_COMPILER_RANLIB /usr/bin/${CMAKE_SYSTEM_PROCESSOR}-w64-mingw32-gcc-ranlib-posix )
|
||||
set(CMAKE_CXX_COMPILER /usr/bin/${CMAKE_SYSTEM_PROCESSOR}-w64-mingw32-g++-posix )
|
||||
set(CMAKE_CXX_COMPILER_AR /usr/bin/${CMAKE_SYSTEM_PROCESSOR}-w64-mingw32-gcc-ar-posix )
|
||||
set(CMAKE_CXX_COMPILER_RANLIB /usr/bin/${CMAKE_SYSTEM_PROCESSOR}-w64-mingw32-gcc-ranlib-posix )
|
||||
set(CMAKE_ASM_NASM_COMPILER /usr/bin/${CMAKE_SYSTEM_PROCESSOR}-w64-mingw32-as )
|
||||
set(CMAKE_RC_COMPILER /usr/bin/${CMAKE_SYSTEM_PROCESSOR}-w64-mingw32-windres)
|
||||
set(CMAKE_OBJDUMP /usr/bin/${CMAKE_SYSTEM_PROCESSOR}-w64-mingw32-objdump)
|
||||
add_definitions(-D_WIN32_WINNT=0x600 -D_GNU_SOURCE=1 -DNOWERROR=1)
|
||||
|
||||
list(APPEND CMAKE_PREFIX_PATH "/soft/windows")
|
||||
SET(CMAKE_FIND_ROOT_PATH /usr/${CMAKE_SYSTEM_PROCESSOR}-w64-mingw32 ${CMAKE_PREFIX_PATH}/lib)
|
||||
set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
|
||||
set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY FIRST)
|
||||
set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE FIRST)
|
||||
include_directories(${CMAKE_PREFIX_PATH}/include)
|
||||
set(OpenCL_INCLUDE_DIR ${CMAKE_PREFIX_PATH}/include)
|
||||
set(OpenCL_LIBRARY ${CMAKE_PREFIX_PATH}/lib/opencl.lib)
|
||||
@@ -0,0 +1,22 @@
|
||||
set(CMAKE_SYSTEM_NAME Windows)
|
||||
set(CMAKE_SYSTEM_PROCESSOR i686)
|
||||
|
||||
set(CMAKE_C_COMPILER /usr/bin/${CMAKE_SYSTEM_PROCESSOR}-w64-mingw32-gcc-posix )
|
||||
set(CMAKE_C_COMPILER_AR /usr/bin/${CMAKE_SYSTEM_PROCESSOR}-w64-mingw32-gcc-ar-posix )
|
||||
set(CMAKE_C_COMPILER_RANLIB /usr/bin/${CMAKE_SYSTEM_PROCESSOR}-w64-mingw32-gcc-ranlib-posix )
|
||||
set(CMAKE_CXX_COMPILER /usr/bin/${CMAKE_SYSTEM_PROCESSOR}-w64-mingw32-g++-posix )
|
||||
set(CMAKE_CXX_COMPILER_AR /usr/bin/${CMAKE_SYSTEM_PROCESSOR}-w64-mingw32-gcc-ar-posix )
|
||||
set(CMAKE_CXX_COMPILER_RANLIB /usr/bin/${CMAKE_SYSTEM_PROCESSOR}-w64-mingw32-gcc-ranlib-posix )
|
||||
set(CMAKE_ASM_NASM_COMPILER /usr/bin/${CMAKE_SYSTEM_PROCESSOR}-w64-mingw32-as )
|
||||
set(CMAKE_RC_COMPILER /usr/bin/${CMAKE_SYSTEM_PROCESSOR}-w64-mingw32-windres)
|
||||
set(CMAKE_OBJDUMP /usr/bin/${CMAKE_SYSTEM_PROCESSOR}-w64-mingw32-objdump)
|
||||
add_definitions(-D_WIN32_WINNT=0x600 -D_GNU_SOURCE=1 -DNOWERROR=1)
|
||||
|
||||
list(APPEND CMAKE_PREFIX_PATH "/soft/windows32")
|
||||
set(CMAKE_FIND_ROOT_PATH /usr/${CMAKE_SYSTEM_PROCESSOR}-w64-mingw32 ${CMAKE_PREFIX_PATH}/lib)
|
||||
set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
|
||||
set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY FIRST)
|
||||
set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE FIRST)
|
||||
include_directories(${CMAKE_PREFIX_PATH}/include)
|
||||
set(OpenCL_INCLUDE_DIR ${CMAKE_PREFIX_PATH}/include)
|
||||
set(OpenCL_LIBRARY ${CMAKE_PREFIX_PATH}/lib/opencl.lib)
|
||||
Reference in New Issue
Block a user