diff options
| -rw-r--r-- | .SRCINFO | 12 | ||||
| -rw-r--r-- | 0001-Recorder-includes-to-prevent-conflict-with-vsnprintf.patch | 6 | ||||
| -rw-r--r-- | 0002-Fix-build-with-ANGLE.patch | 4 | ||||
| -rw-r--r-- | PKGBUILD | 34 |
4 files changed, 32 insertions, 24 deletions
@@ -1,8 +1,6 @@ -# Generated by mksrcinfo v8 -# Mon Feb 19 19:15:13 UTC 2018 pkgbase = mingw-w64-qt5-multimedia pkgdesc = Classes for audio, video, radio and camera functionality (mingw-w64) - pkgver = 5.10.1 + pkgver = 5.11.0 pkgrel = 1 url = https://www.qt.io/ arch = any @@ -20,12 +18,12 @@ pkgbase = mingw-w64-qt5-multimedia options = !strip options = !buildflags options = staticlibs - source = https://download.qt.io/official_releases/qt/5.10/5.10.1/submodules/qtmultimedia-everywhere-src-5.10.1.tar.xz + source = https://download.qt.io/official_releases/qt/5.11/5.11.0/submodules/qtmultimedia-everywhere-src-5.11.0.tar.xz source = 0001-Recorder-includes-to-prevent-conflict-with-vsnprintf.patch source = 0002-Fix-build-with-ANGLE.patch - sha256sums = a1fa98015ee5a6b81f2d337abc98d8b297c6718f7714a1f13fccfd2934c23649 - sha256sums = 7bfd02c22bade3f048d4a0e12a732aaf448ab033c4a46dff0779a453be0b99e9 - sha256sums = a98e96bb005b822e0742eaf6103429dfd5c41142272957f6b8225f23be4a2289 + sha256sums = ef5328f111ed2d27eff16e50febb66d1480e99f6a6df703f2ab8c650040f9d3c + sha256sums = b574d0df6d11e4569bb2153640def0b8b40ac554c5c1a0c3dc24831d573da7a8 + sha256sums = 9a3e20370c4d9fafd4069f1257039903c6771be166e0a829c54dd8abaa4dc79f pkgname = mingw-w64-qt5-multimedia diff --git a/0001-Recorder-includes-to-prevent-conflict-with-vsnprintf.patch b/0001-Recorder-includes-to-prevent-conflict-with-vsnprintf.patch index 7f0463251601..64f43e2107b9 100644 --- a/0001-Recorder-includes-to-prevent-conflict-with-vsnprintf.patch +++ b/0001-Recorder-includes-to-prevent-conflict-with-vsnprintf.patch @@ -1,4 +1,4 @@ -From 39eaa320ff16e3a46a37515092de322898df0a3c Mon Sep 17 00:00:00 2001 +From 432d653b358ebb5bf82aa6a5b67f4331cc5b4b21 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 25 Sep 2016 21:36:56 +0200 Subject: [PATCH 1/2] Recorder includes to prevent conflict with vsnprintf @@ -13,7 +13,7 @@ a bit to prevent this situation 2 files changed, 2 insertions(+) diff --git a/src/multimedia/video/qvideosurfaceformat.h b/src/multimedia/video/qvideosurfaceformat.h -index 83785ac0..25607d08 100644 +index 1d1990c7..8ddffa03 100644 --- a/src/multimedia/video/qvideosurfaceformat.h +++ b/src/multimedia/video/qvideosurfaceformat.h @@ -44,6 +44,7 @@ @@ -37,5 +37,5 @@ index 5f391710..3ae3b8aa 100644 QT_BEGIN_NAMESPACE -- -2.16.1 +2.17.0 diff --git a/0002-Fix-build-with-ANGLE.patch b/0002-Fix-build-with-ANGLE.patch index f3c292e313c0..99c451c313fe 100644 --- a/0002-Fix-build-with-ANGLE.patch +++ b/0002-Fix-build-with-ANGLE.patch @@ -1,4 +1,4 @@ -From 53b06ae12e1673f366c16a3c9b6aeef6abf13fe3 Mon Sep 17 00:00:00 2001 +From 20ebf5798011fafc06b929ac5c4b9387e9c96115 Mon Sep 17 00:00:00 2001 From: Jose Santiago <jsantiago@haivision.com> Date: Thu, 3 Nov 2016 14:36:10 -0500 Subject: [PATCH 2/2] Fix build with ANGLE @@ -25,5 +25,5 @@ index 54403fab..9132b3d8 100644 #endif -- -2.16.1 +2.17.0 @@ -10,7 +10,7 @@ _qt_module=qtmultimedia pkgname=mingw-w64-qt5-multimedia -pkgver=5.10.1 +pkgver=5.11.0 pkgrel=1 arch=('any') pkgdesc='Classes for audio, video, radio and camera functionality (mingw-w64)' @@ -24,9 +24,9 @@ _pkgfqn="${_qt_module}-everywhere-src-${pkgver}" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz" '0001-Recorder-includes-to-prevent-conflict-with-vsnprintf.patch' '0002-Fix-build-with-ANGLE.patch') -sha256sums=('a1fa98015ee5a6b81f2d337abc98d8b297c6718f7714a1f13fccfd2934c23649' - '7bfd02c22bade3f048d4a0e12a732aaf448ab033c4a46dff0779a453be0b99e9' - 'a98e96bb005b822e0742eaf6103429dfd5c41142272957f6b8225f23be4a2289') +sha256sums=('ef5328f111ed2d27eff16e50febb66d1480e99f6a6df703f2ab8c650040f9d3c' + 'b574d0df6d11e4569bb2153640def0b8b40ac554c5c1a0c3dc24831d573da7a8' + '9a3e20370c4d9fafd4069f1257039903c6771be166e0a829c54dd8abaa4dc79f') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' [[ $NO_STATIC_LIBS ]] || \ @@ -45,7 +45,7 @@ link_header_files() { prepare() { cd "${srcdir}/${_pkgfqn}" - # Apply patches; further descriptions can be found in patch files itself + # apply patches; further descriptions can be found in patch files itself for patch in "$srcdir/"*.patch; do patch -p1 -i "$patch" done @@ -77,7 +77,7 @@ package() { make INSTALL_ROOT="$pkgdir" install - # Use prl files from build directory since installed prl files seem to have incorrect QMAKE_PRL_LIBS_FOR_CMAKE + # use prl files from build directory since installed prl files seem to have incorrect QMAKE_PRL_LIBS_FOR_CMAKE if [[ -d 'lib' ]]; then pushd 'lib' find -iname '*.static.prl' -exec cp --target-directory "${pkgdir}/usr/${_arch}/lib" --parents {} + @@ -89,19 +89,29 @@ package() { popd fi - find "${pkgdir}/usr/${_arch}/lib" -maxdepth 1 -name "*.dll" -exec rm {} \; + # replace library path in *.prl files so it points to the installed location and not the build directory + find "${pkgdir}/usr/${_arch}/lib" \( -type f -name '*.prl' -o -name '*.pc' \) -exec sed -i -e "s:$PWD/lib:/usr/$_arch/lib:g" {} \; + + # remove prl files for debug version + if ! [[ $MINGW_W64_QT_DEBUG_BUILD ]]; then + for file in $(find "${pkgdir}/usr/${_arch}" -name '*d.prl' -o -name '*d.static.prl'); do + [ -f "${file%d*}${file##*d}" ] && rm "${file}"; + done + fi + + find "${pkgdir}/usr/${_arch}/lib" -maxdepth 1 -name '*.dll' -delete [ "$NO_STATIC_EXECUTABLES" -a "${_config##*=}" = static -o "$NO_EXECUTABLES" ] && \ - find "${pkgdir}/usr/${_arch}" -name "*.exe" -exec rm {} \; || \ - find "${pkgdir}/usr/${_arch}" -name "*.exe" -exec ${_arch}-strip --strip-all {} \; - find "${pkgdir}/usr/${_arch}" -name "*.dll" -exec ${_arch}-strip --strip-unneeded {} \; - find "${pkgdir}/usr/${_arch}" -name "*.a" -exec ${_arch}-strip -g {} \; + find "${pkgdir}/usr/${_arch}" -name '*.exe' -delete || \ + find "${pkgdir}/usr/${_arch}" -name '*.exe' -exec ${_arch}-strip --strip-all {} \; + find "${pkgdir}/usr/${_arch}" -name '*.dll' -exec ${_arch}-strip --strip-unneeded {} \; + find "${pkgdir}/usr/${_arch}" \( -name '*.a' -not -name 'libQt5QmlDevTools.a' -not -name 'libQt5Bootstrap.a' \) -exec ${_arch}-strip -g {} \; [[ -d "${pkgdir}/usr/${_arch}/lib/qt/bin/" ]] && \ find "${pkgdir}/usr/${_arch}/lib/qt/bin/" -exec strip --strip-all {} \; find "${pkgdir}/usr/${_arch}/lib/" -iname "*.so.$pkgver" -exec strip --strip-unneeded {} \; popd done - # Drop QMAKE_PRL_BUILD_DIR because reference the build dir + # drop QMAKE_PRL_BUILD_DIR because reference the build dir find "${pkgdir}/usr/${_arch}/lib" -type f -name '*.prl' -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \; done } |