diff --git a/srcpkgs/qt6-multimedia-private-devel b/srcpkgs/qt6-multimedia-private-devel new file mode 120000 index 00000000000..9343446502d --- /dev/null +++ b/srcpkgs/qt6-multimedia-private-devel @@ -0,0 +1 @@ +qt6-multimedia \ No newline at end of file diff --git a/srcpkgs/qt6-multimedia/patches/musl-timeval.patch b/srcpkgs/qt6-multimedia/patches/musl-timeval.patch deleted file mode 100644 index af7b4dd7fb5..00000000000 --- a/srcpkgs/qt6-multimedia/patches/musl-timeval.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- 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 67a577e1300..046cc0b486c 100644 --- a/srcpkgs/qt6-multimedia/template +++ b/srcpkgs/qt6-multimedia/template @@ -1,24 +1,28 @@ # Template file for 'qt6-multimedia' pkgname=qt6-multimedia -version=6.6.0 -revision=2 +version=6.7.2 +revision=1 build_style=cmake configure_args="-DQT_FEATURE_gstreamer=ON" 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" +makedepends="qt6-base-private-devel qt6-declarative-private-devel + qt6-quick3d-private-devel + pulseaudio-devel ffmpeg-devel libva-devel + qt6-shadertools-devel libglib-devel gst-plugins-base1-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=ba4b236ca3ec118841b7f5ba87797e24a8c5cbef9ba973fe219fbfc310d38782 +checksum=8ef835115acb9a1d3d2c9f23cfacb43f2c537e3786a8ab822299a2a7765651d3 if [ "$XBPS_MACHINE" = "i686" ]; then CXXFLAGS="-DPFFFT_SIMD_DISABLE=1" CFLAGS="-DPFFFT_SIMD_DISABLE=1" fi +subpackages="qt6-multimedia-private-devel qt6-multimedia-devel" + do_check() { cd build local broken="tst_qmediaformat|tst_qaudiodecoderbackend" @@ -33,6 +37,20 @@ post_install() { rm -rf ${DESTDIR}/usr/tests } +qt6-multimedia-private-devel_package() { + depends="qt6-multimedia-devel>=${version}_${revision}" + short_desc+=" - private development files" + pkg_install() { + for dir in $(cd ${DESTDIR} && find usr/include -type d -name private); do + vmove "$dir" + done + vmove "usr/lib/cmake/*Private" + vmove "usr/lib/qt6/metatypes/*private_*_metatypes.json" + vmove "usr/lib/qt6/mkspecs/modules/*_private.pri" + vmove "usr/lib/qt6/modules/*Private.json" + } +} + qt6-multimedia-devel_package() { depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1" short_desc+=" - development files"