From 57c6fba882b7b01881760bd7cde110b36097862f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Fri, 17 Feb 2023 22:46:56 +0700 Subject: [PATCH] qt6-multimedia: update to 6.4.2. --- .../qt6-multimedia/patches/musl-timeval.patch | 10 ++++++++++ srcpkgs/qt6-multimedia/template | 16 ++++++++++------ 2 files changed, 20 insertions(+), 6 deletions(-) create mode 100644 srcpkgs/qt6-multimedia/patches/musl-timeval.patch diff --git a/srcpkgs/qt6-multimedia/patches/musl-timeval.patch b/srcpkgs/qt6-multimedia/patches/musl-timeval.patch new file mode 100644 index 00000000000..af7b4dd7fb5 --- /dev/null +++ b/srcpkgs/qt6-multimedia/patches/musl-timeval.patch @@ -0,0 +1,10 @@ +--- qt6-multimedia-6.4.2.orig/src/plugins/multimedia/ffmpeg/qv4l2camera_p.h ++++ qt6-multimedia-6.4.2/src/plugins/multimedia/ffmpeg/qv4l2camera_p.h +@@ -22,6 +22,7 @@ + #include + #include + #include ++#include + + QT_BEGIN_NAMESPACE + diff --git a/srcpkgs/qt6-multimedia/template b/srcpkgs/qt6-multimedia/template index f6d37be9ca5..d89e7d54eb5 100644 --- a/srcpkgs/qt6-multimedia/template +++ b/srcpkgs/qt6-multimedia/template @@ -1,19 +1,18 @@ # Template file for 'qt6-multimedia' pkgname=qt6-multimedia -version=6.4.0 +version=6.4.2 revision=1 build_style=cmake configure_args="-DQT_FEATURE_gstreamer=ON" -hostmakedepends="perl qt6-declarative-devel pkg-config - qt6-shadertools-devel" -makedepends="qt6-declarative-devel - qt6-shadertools-devel libglib-devel gst-plugins-base1-devel" +hostmakedepends="perl qt6-declarative-host-tools pkg-config qt6-shadertools" +makedepends="qt6-declarative-devel pulseaudio-devel ffmpeg-devel libva-devel + qt6-shadertools-devel libglib-devel gst-plugins-base1-devel qt6-quick3d-devel" short_desc="Cross-platform application and UI framework - multimedia" maintainer="John " license="(LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only) AND GPL-3.0-only with Qt-GPL-exception-1.0" homepage="https://qt.io/" distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtmultimedia-everywhere-src-${version}.tar.xz" -checksum=e82e8e847cae2a951a11db05b6d10a22b21e3a1d72e06a7781cce4bd197e796f +checksum=7f2b70deeada911c8e660e2801286657f297a5d1d543d1f6bfa856f28972c776 if [ "$XBPS_MACHINE" = "i686" ]; then CXXFLAGS="-DPFFFT_SIMD_DISABLE=1" @@ -30,6 +29,10 @@ do_check() { ctest -E "($broken)" } +post_install() { + rm -rf ${DESTDIR}/usr/tests +} + qt6-multimedia-devel_package() { depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1" short_desc+=" - development files" @@ -42,6 +45,7 @@ qt6-multimedia-devel_package() { vmove usr/lib/qt6/qml/QtMultimedia/plugins.qmltypes vmove usr/lib/qt6/qml/QtMultimedia/qmldir vmove "usr/lib/*.so" + vmove "usr/lib/*.a" vmove "usr/lib/*.prl" } }