CVS commit: pkgsrc/x11/qt5-qtmultimedia

["Mark Davies" <markd%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   markd
Date:           Sat Jul 16 00:37:45 UTC 2016

Modified Files:
        pkgsrc/x11/qt5-qtmultimedia: distinfo
Added Files:
        pkgsrc/x11/qt5-qtmultimedia/patches:
            patch-config.tests_alsa_alsatest.cpp

Log Message:
Allow newer Alsa versions.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/x11/qt5-qtmultimedia/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/x11/qt5-qtmultimedia/patches/patch-config.tests_alsa_alsatest.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/x11/qt5-qtmultimedia/distinfo
diff -u pkgsrc/x11/qt5-qtmultimedia/distinfo:1.2 pkgsrc/x11/qt5-qtmultimedia/distinfo:1.3
--- pkgsrc/x11/qt5-qtmultimedia/distinfo:1.2    Mon Oct 26 19:04:00 2015
+++ pkgsrc/x11/qt5-qtmultimedia/distinfo        Sat Jul 16 00:37:44 2016
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.2 2015/10/26 19:04:00 adam Exp $
+$NetBSD: distinfo,v 1.3 2016/07/16 00:37:44 markd Exp $
 
 SHA1 (qtmultimedia-opensource-src-5.5.1.tar.xz) = 734cdbd0c365ccdf958ad8957e2a8f86492425b7
 RMD160 (qtmultimedia-opensource-src-5.5.1.tar.xz) = 68049da5e203e484de766c17d683a34a888e0603
 SHA512 (qtmultimedia-opensource-src-5.5.1.tar.xz) = e38a3bc0ed77ab6fe7f3a68e2b0dcfebe3fb29c860a1ca48391a1519ebc4c564f25469082b4e9ef78e31093724df24b33aa83158fa9211221fa2c6d9154ce0d0
 Size (qtmultimedia-opensource-src-5.5.1.tar.xz) = 3464340 bytes
+SHA1 (patch-config.tests_alsa_alsatest.cpp) = 8215d32c1bf08610507aea9878a96dfdcbb568b4
 SHA1 (patch-qtmultimedia.pro) = 70ef4ab962f117a7539c352bc5467ae057524a8a

Added files:

Index: pkgsrc/x11/qt5-qtmultimedia/patches/patch-config.tests_alsa_alsatest.cpp
diff -u /dev/null pkgsrc/x11/qt5-qtmultimedia/patches/patch-config.tests_alsa_alsatest.cpp:1.1
--- /dev/null   Sat Jul 16 00:37:45 2016
+++ pkgsrc/x11/qt5-qtmultimedia/patches/patch-config.tests_alsa_alsatest.cpp    Sat Jul 16 00:37:45 2016
@@ -0,0 +1,15 @@
+$NetBSD: patch-config.tests_alsa_alsatest.cpp,v 1.1 2016/07/16 00:37:45 markd Exp $
+
+Allow newer Alsa versions.
+
+--- config.tests/alsa/alsatest.cpp.orig        2015-10-13 04:35:43.000000000 +0000
++++ config.tests/alsa/alsatest.cpp
+@@ -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_SUBMINOR >= 10) && !(SND_LIB_MAJOR == 1 && SND_LIB_MINOR >= 1))
+ #error "Alsa version found too old, require >= 1.0.10"
+ #endif
+