jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

qt5: fix alsa detection + add tslib

Browse source
This commit is contained in:
Jürgen Buchmüller 2016-04-24 11:27:09 +02:00
parent 976f231655
commit 4e72fc02b4
2 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
srcpkgs/qt5/patches/fix-alsa-lib-detection.patch Normal file
View file

@ -0,0 +1,11 @@
--- qtbase/config.tests/unix/alsa/alsatest.cpp 2016-03-03 12:35:22.000000000 +0100
+++ qtbase/config.tests/unix/alsa/alsatest.cpp 2016-04-24 11:21:33.168021766 +0200
@@ -32,7 +32,7 @@
****************************************************************************/
#include <alsa/asoundlib.h>
-#if(!(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 10))
+#if(!(SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0) || (SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 10)))
#error "Alsa version found too old, require >= 1.0.10"
#endif

4
srcpkgs/qt5/template
View file

@ -23,7 +23,7 @@ makedepends="
mtdev-devel freetds-devel libmysqlclient-devel postgresql-libs-devel
pulseaudio-devel libbluetooth-devel gst-plugins-base1-devel libxslt-devel
pciutils-devel nss-devel libcap-devel libinput-devel libproxy-devel
libxcb-devel libxkbcommon-devel wayland-devel"
libxcb-devel libxkbcommon-devel tslib-devel wayland-devel"
depends="qtchooser"
replaces="qt5-doc<5.6.0 qt5-quick1<5.6.0 qt5-quick1-devel<5.6.0 qt5-webkit<5.6.0 qt5-webkit-devel<5.6.0"
@ -108,7 +108,7 @@ do_configure() {
-openssl-linked -dbus-linked \
-silent -no-pch -no-strip -optimized-qmake \
-system-libjpeg -system-libpng -system-zlib \
-system-sqlite -system-harfbuzz"
-system-sqlite -system-harfbuzz -v"
case "$XBPS_TARGET_MACHINE" in
arm*|*-musl) # -reduce-relocations is experimental; may cause linker errors
;;