Ecosystem/feather
Ecosystem/feather
1
0
Fork 0
mirror of https://github.com/feather-wallet/feather.git synced 2024-12-23 03:59:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

depends: native_qt: multimedia: remove shaders

Browse source
This commit is contained in:
tobtoht 2022-12-21 23:48:08 +01:00
parent 31ead39944
commit 0bd1699658
2 changed files with 109 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
contrib/depends/packages/native_qt.mk
View file

@ -19,6 +19,7 @@ $(package)_patches += no-statx.patch
$(package)_patches += no-renameat2.patch
$(package)_patches += no_pthread_cond_clockwait.patch
$(package)_patches += QTBUG-92199-fix.patch
$(package)_patches += remove-shaders.patch
$(package)_qttranslations_file_name=qttranslations-$($(package)_suffix)
$(package)_qttranslations_sha256_hash=7ab93a930b693eeb53ab97b038b4e6e057d06374e6f49a3814d99145a276925f
@ -184,6 +185,9 @@ define $(package)_preprocess_cmds
patch -p1 -i $($(package)_patch_dir)/no-renameat2.patch && \
patch -p1 -i $($(package)_patch_dir)/no_pthread_cond_clockwait.patch && \
patch -p1 -i $($(package)_patch_dir)/QTBUG-92199-fix.patch && \
cd qtmultimedia && \
patch -p1 -i $($(package)_patch_dir)/remove-shaders.patch && \
cd .. && \
mkdir -p qtbase/mkspecs/macx-clang-linux &&\
cp -f qtbase/mkspecs/macx-clang/qplatformdefs.h qtbase/mkspecs/macx-clang-linux/ &&\
cp -f $($(package)_patch_dir)/mac-qmake.conf qtbase/mkspecs/macx-clang-linux/qmake.conf && \

105
contrib/depends/patches/native_qt/remove-shaders.patch Normal file
View file

@ -0,0 +1,105 @@
From 779b0701b82280a319a4b11d04742fbd1a245848 Mon Sep 17 00:00:00 2001
From: tobtoht <tob@featherwallet.org>
Date: Wed, 21 Dec 2022 21:59:31 +0100
Subject: [PATCH] Remove shaders
---
src/multimedia/CMakeLists.txt | 59 ----------------------
src/multimedia/video/qvideoframeformat.cpp | 5 --
2 files changed, 64 deletions(-)
diff --git a/src/multimedia/CMakeLists.txt b/src/multimedia/CMakeLists.txt
index 651c7ee76..b386e1501 100644
--- a/src/multimedia/CMakeLists.txt
+++ b/src/multimedia/CMakeLists.txt
@@ -250,64 +250,5 @@ set(VIDEO_SHADERS
"shaders/nv12_bt2020_hlg.frag"
)
-qt_internal_add_shaders(Multimedia "shaders"
- SILENT
- BATCHABLE
- PRECOMPILE
- OPTIMIZED
- PREFIX
- "/qt-project.org/multimedia"
- FILES
- ${VIDEO_VERTEX_SHADERS}
- ${VIDEO_SHADERS}
-)
-
string(REPLACE ".frag" "_linear.frag.qsb" LINEAR_VIDEO_SHADERS "${VIDEO_SHADERS}")
-qt_internal_add_shaders(Multimedia "shaders_linear"
- SILENT
- BATCHABLE
- PRECOMPILE
- OPTIMIZED
- PREFIX
- "/qt-project.org/multimedia"
- FILES
- ${VIDEO_SHADERS}
- OUTPUTS
- ${LINEAR_VIDEO_SHADERS}
- DEFINES
- QMM_OUTPUTSURFACE_LINEAR
-)
-
-qt_internal_add_shaders(Multimedia "shaders_gl_macos"
- SILENT
- BATCHABLE
- PRECOMPILE
- OPTIMIZED
- PREFIX
- "/qt-project.org/multimedia"
- GLSL
- "120,150"
- NOHLSL
- NOMSL
- FILES
- "shaders/rectsampler.vert"
- "shaders/rectsampler_bgra.frag"
-)
-
-qt_internal_add_shaders(Multimedia "shaders_gl_macos_linear"
- SILENT
- BATCHABLE
- PRECOMPILE
- OPTIMIZED
- PREFIX
- "/qt-project.org/multimedia"
- GLSL
- "120,150"
- NOHLSL
- NOMSL
- FILES
- "shaders/rectsampler_bgra.frag"
- OUTPUTS
- "shaders/rectsampler_bgra_linear.frag.qsb"
-)
diff --git a/src/multimedia/video/qvideoframeformat.cpp b/src/multimedia/video/qvideoframeformat.cpp
index bc8fbe2e1..25bfdd5ff 100644
--- a/src/multimedia/video/qvideoframeformat.cpp
+++ b/src/multimedia/video/qvideoframeformat.cpp
@@ -11,10 +11,6 @@
#include <qvariant.h>
#include <qmatrix4x4.h>
-static void initResource() {
- Q_INIT_RESOURCE(shaders);
-}
-
QT_BEGIN_NAMESPACE
class QVideoFrameFormatPrivate : public QSharedData
@@ -348,7 +344,6 @@ QT_DEFINE_QESDP_SPECIALIZATION_DTOR(QVideoFrameFormatPrivate);
QVideoFrameFormat::QVideoFrameFormat()
: d(new QVideoFrameFormatPrivate)
{
- initResource();
}
/*!
--
2.38.1