Thu Jul 24 15:51:56 2014 UTC ()
Apply some patches to fix x11/qt5-qtmultimedia build on SunOS.


(jperkin)
diff -r1.10 -r1.11 pkgsrc/x11/qt5-qtbase/distinfo
diff -r1.2 -r1.3 pkgsrc/x11/qt5-qtbase/patches/patch-qtmultimedia_src_gsttools_qgstreamervideoinputdevicecontrol.cpp
diff -r1.1 -r1.2 pkgsrc/x11/qt5-qtbase/patches/patch-qtmultimedia_src_plugins_gstreamer_camerabin_camerabinserviceplugin.cpp
diff -r1.1 -r1.2 pkgsrc/x11/qt5-qtbase/patches/patch-qtmultimedia_src_plugins_gstreamer_mediacapture_qgstreamerv4l2input.cpp
cvs diff -r1.10 -r1.11 pkgsrc/x11/qt5-qtbase/distinfo (expand / switch to unified diff)

--- pkgsrc/x11/qt5-qtbase/distinfo 2014/07/14 16:32:14 1.10
+++ pkgsrc/x11/qt5-qtbase/distinfo 2014/07/24 15:51:56 1.11
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.10 2014/07/14 16:32:14 jperkin Exp $ 1$NetBSD: distinfo,v 1.11 2014/07/24 15:51:56 jperkin Exp $
2 2
3SHA1 (qt-everywhere-opensource-src-5.2.1.tar.xz) = cc68265c62321670bd40e29bdd484ea881bd6af3 3SHA1 (qt-everywhere-opensource-src-5.2.1.tar.xz) = cc68265c62321670bd40e29bdd484ea881bd6af3
4RMD160 (qt-everywhere-opensource-src-5.2.1.tar.xz) = 9b716c5875a6186968392896ac8bd3261fae9b24 4RMD160 (qt-everywhere-opensource-src-5.2.1.tar.xz) = 9b716c5875a6186968392896ac8bd3261fae9b24
5Size (qt-everywhere-opensource-src-5.2.1.tar.xz) = 174004404 bytes 5Size (qt-everywhere-opensource-src-5.2.1.tar.xz) = 174004404 bytes
6SHA1 (patch-qtbase_config.tests_unix_iconv_iconv.cpp) = bd7d0440b9c7022a71ccc6fe71415e1846c50e57 6SHA1 (patch-qtbase_config.tests_unix_iconv_iconv.cpp) = bd7d0440b9c7022a71ccc6fe71415e1846c50e57
7SHA1 (patch-qtbase_configure) = bc00f5f7ea40c7304b9cf836748e1bad6f98526a 7SHA1 (patch-qtbase_configure) = bc00f5f7ea40c7304b9cf836748e1bad6f98526a
8SHA1 (patch-qtbase_mkspecs_features_mac_objective__c.prf) = 40d56c675deabea27cdb9eae91d1e90b0f8348ad 8SHA1 (patch-qtbase_mkspecs_features_mac_objective__c.prf) = 40d56c675deabea27cdb9eae91d1e90b0f8348ad
9SHA1 (patch-qtbase_mkspecs_features_qt__module__pris.prf) = b58b4a9e1a0a76cfa99c8b2c540514159707043b 9SHA1 (patch-qtbase_mkspecs_features_qt__module__pris.prf) = b58b4a9e1a0a76cfa99c8b2c540514159707043b
10SHA1 (patch-qtbase_qmake_Makefile.unix) = cdde195c16f55bc5f22ff095c20a59b7c2cdc883 10SHA1 (patch-qtbase_qmake_Makefile.unix) = cdde195c16f55bc5f22ff095c20a59b7c2cdc883
11SHA1 (patch-qtbase_qmake_generators_makefile.cpp) = 18831f38df9d4abf61dbd0a1f780bffc0b1cabf4 11SHA1 (patch-qtbase_qmake_generators_makefile.cpp) = 18831f38df9d4abf61dbd0a1f780bffc0b1cabf4
12SHA1 (patch-qtbase_qmake_generators_unix_unixmake.cpp) = df77053e3f98e5be682bb7b4440c13d542556798 12SHA1 (patch-qtbase_qmake_generators_unix_unixmake.cpp) = df77053e3f98e5be682bb7b4440c13d542556798
13SHA1 (patch-qtbase_qmake_generators_unix_unixmake2.cpp) = 77f9e4114c48398676dbda1a564ba004a33c2a0b 13SHA1 (patch-qtbase_qmake_generators_unix_unixmake2.cpp) = 77f9e4114c48398676dbda1a564ba004a33c2a0b
14SHA1 (patch-qtbase_src_concurrent_qtconcurrentiteratekernel.cpp) = 9a00bc1538136c29992e15b60bc23f9b40db900a 14SHA1 (patch-qtbase_src_concurrent_qtconcurrentiteratekernel.cpp) = 9a00bc1538136c29992e15b60bc23f9b40db900a
@@ -27,32 +27,32 @@ SHA1 (patch-qtbase_src_tools_bootstrap_b @@ -27,32 +27,32 @@ SHA1 (patch-qtbase_src_tools_bootstrap_b
27SHA1 (patch-qtbase_src_tools_moc_main.cpp) = 31f42b1625ec7a978e21ad3fdde67ce3328df425 27SHA1 (patch-qtbase_src_tools_moc_main.cpp) = 31f42b1625ec7a978e21ad3fdde67ce3328df425
28SHA1 (patch-qtbase_src_widgets_graphicsview_qgraphicsitem__p.h) = a30402585f0b7efd9fc0dcd256e410a92dffff2c 28SHA1 (patch-qtbase_src_widgets_graphicsview_qgraphicsitem__p.h) = a30402585f0b7efd9fc0dcd256e410a92dffff2c
29SHA1 (patch-qtbase_tests_auto_corelib_io_qprocess_qprocess.pro) = 729e57819a0477c2bb06015b3bd106e1f972eb51 29SHA1 (patch-qtbase_tests_auto_corelib_io_qprocess_qprocess.pro) = 729e57819a0477c2bb06015b3bd106e1f972eb51
30SHA1 (patch-qtbase_tests_auto_widgets_itemviews_qtreewidgetitemiterator_qtreewidgetitemiterator.pro) = ec68f41ccdc622eb5457ea7a3c37c1f54058b595 30SHA1 (patch-qtbase_tests_auto_widgets_itemviews_qtreewidgetitemiterator_qtreewidgetitemiterator.pro) = ec68f41ccdc622eb5457ea7a3c37c1f54058b595
31SHA1 (patch-qtdeclarative_examples_quick_customitems_painteditem_painteditem.pro) = 4eb38df598145da3bb8272dfc4c34649d54cf9fe 31SHA1 (patch-qtdeclarative_examples_quick_customitems_painteditem_painteditem.pro) = 4eb38df598145da3bb8272dfc4c34649d54cf9fe
32SHA1 (patch-qtdeclarative_src_3rdparty_masm_wtf_MathExtras.h) = 5cef3ed89e333f3386bd61cbf5af6632ad400499 32SHA1 (patch-qtdeclarative_src_3rdparty_masm_wtf_MathExtras.h) = 5cef3ed89e333f3386bd61cbf5af6632ad400499
33SHA1 (patch-qtdeclarative_src_qml_jsruntime_qv4alloca__p.h) = 5eb9eba79d6564b9375910dd7ed6ad406c8b0c8e 33SHA1 (patch-qtdeclarative_src_qml_jsruntime_qv4alloca__p.h) = 5eb9eba79d6564b9375910dd7ed6ad406c8b0c8e
34SHA1 (patch-qtdeclarative_src_qml_jsruntime_qv4engine.cpp) = 1447ade56250f2645d13669c5cab85cd299dfdf5 34SHA1 (patch-qtdeclarative_src_qml_jsruntime_qv4engine.cpp) = 1447ade56250f2645d13669c5cab85cd299dfdf5
35SHA1 (patch-qtdeclarative_src_qml_jsruntime_qv4globalobject.cpp) = d0c1b5b190d350a30dee609c37be9ec467fce02f 35SHA1 (patch-qtdeclarative_src_qml_jsruntime_qv4globalobject.cpp) = d0c1b5b190d350a30dee609c37be9ec467fce02f
36SHA1 (patch-qtdeclarative_src_qml_jsruntime_qv4mm.cpp) = f37900af31ed15040499d9a28125ad32909a393c 36SHA1 (patch-qtdeclarative_src_qml_jsruntime_qv4mm.cpp) = f37900af31ed15040499d9a28125ad32909a393c
37SHA1 (patch-qtdeclarative_src_qml_jsruntime_qv4stringobject.cpp) = a51bbafc307663e150da89efc29175424d733f1a 37SHA1 (patch-qtdeclarative_src_qml_jsruntime_qv4stringobject.cpp) = a51bbafc307663e150da89efc29175424d733f1a
38SHA1 (patch-qtdeclarative_src_qmldevtools_qmldevtools.pro) = 6f0e65eb6c4a5bfd05a603d9cbfc6fdc22e46d3b 38SHA1 (patch-qtdeclarative_src_qmldevtools_qmldevtools.pro) = 6f0e65eb6c4a5bfd05a603d9cbfc6fdc22e46d3b
39SHA1 (patch-qtdeclarative_tests_auto_qml_qjsengine_tst__qjsengine.cpp) = b1cc5a386dd0f1b3651adb9babee87be84221998 39SHA1 (patch-qtdeclarative_tests_auto_qml_qjsengine_tst__qjsengine.cpp) = b1cc5a386dd0f1b3651adb9babee87be84221998
40SHA1 (patch-qtmultimedia_src_gsttools_qgstreamervideoinputdevicecontrol.cpp) = 122c629340578670876571e10c5946c4f359ed04 40SHA1 (patch-qtmultimedia_src_gsttools_qgstreamervideoinputdevicecontrol.cpp) = 235140fa9d5e4ffbb954621e50b83a719c5ef636
41SHA1 (patch-qtmultimedia_src_plugins_gstreamer_audiodecoder_qgstreameraudiodecoderserviceplugin.cpp) = ac97ed7ec63e3cfc060ce7e90dfe7f053f9dd851 41SHA1 (patch-qtmultimedia_src_plugins_gstreamer_audiodecoder_qgstreameraudiodecoderserviceplugin.cpp) = ac97ed7ec63e3cfc060ce7e90dfe7f053f9dd851
42SHA1 (patch-qtmultimedia_src_plugins_gstreamer_camerabin_camerabincontrol.cpp) = e2b0022da1f523324159efdcd29237f82380aed8 42SHA1 (patch-qtmultimedia_src_plugins_gstreamer_camerabin_camerabincontrol.cpp) = e2b0022da1f523324159efdcd29237f82380aed8
43SHA1 (patch-qtmultimedia_src_plugins_gstreamer_camerabin_camerabinserviceplugin.cpp) = 4c5f0d3d5a0c6b3075232272abe00b467575194f 43SHA1 (patch-qtmultimedia_src_plugins_gstreamer_camerabin_camerabinserviceplugin.cpp) = 5f79e39dba119b9c0c757268a0a13332040e36a5
44SHA1 (patch-qtmultimedia_src_plugins_gstreamer_mediacapture_qgstreamercaptureserviceplugin.cpp) = 224a3097498d12284f10a9adb5a774356092f374 44SHA1 (patch-qtmultimedia_src_plugins_gstreamer_mediacapture_qgstreamercaptureserviceplugin.cpp) = 224a3097498d12284f10a9adb5a774356092f374
45SHA1 (patch-qtmultimedia_src_plugins_gstreamer_mediacapture_qgstreamerv4l2input.cpp) = 55aee0426b057461861605dadd4687932988bd78 45SHA1 (patch-qtmultimedia_src_plugins_gstreamer_mediacapture_qgstreamerv4l2input.cpp) = 16efe4a42cf7cb2718cb03062d2d132edfc2fedc
46SHA1 (patch-qtmultimedia_src_plugins_gstreamer_mediaplayer_qgstreamerplayerserviceplugin.cpp) = 729d69245a1ab6fe9b01a63673102685b39d7add 46SHA1 (patch-qtmultimedia_src_plugins_gstreamer_mediaplayer_qgstreamerplayerserviceplugin.cpp) = 729d69245a1ab6fe9b01a63673102685b39d7add
47SHA1 (patch-qtquick1_tests_auto_declarative_qdeclarativeimage_tst__qdeclarativeimage.cpp) = b1efdea5596a76eeae37a70bd49bb7741a8b7c5f 47SHA1 (patch-qtquick1_tests_auto_declarative_qdeclarativeimage_tst__qdeclarativeimage.cpp) = b1efdea5596a76eeae37a70bd49bb7741a8b7c5f
48SHA1 (patch-qtscript_src_3rdparty_javascriptcore_JavaScriptCore_config.h) = 66dc22ee78727c84f1e82dc10bb342d514f8f9a0 48SHA1 (patch-qtscript_src_3rdparty_javascriptcore_JavaScriptCore_config.h) = 66dc22ee78727c84f1e82dc10bb342d514f8f9a0
49SHA1 (patch-qtscript_src_3rdparty_javascriptcore_JavaScriptCore_runtime_JSValue.h) = ee35790f58ec9cf4d1a370f5549d92b5a680f557 49SHA1 (patch-qtscript_src_3rdparty_javascriptcore_JavaScriptCore_runtime_JSValue.h) = ee35790f58ec9cf4d1a370f5549d92b5a680f557
50SHA1 (patch-qtscript_src_3rdparty_javascriptcore_JavaScriptCore_wtf_Platform.h) = ea5d9249aaa6e00b2111e0ba5bd8337f2e0f345a 50SHA1 (patch-qtscript_src_3rdparty_javascriptcore_JavaScriptCore_wtf_Platform.h) = ea5d9249aaa6e00b2111e0ba5bd8337f2e0f345a
51SHA1 (patch-qtserialport_src_serialport_qserialport__unix.cpp) = 27ff0bdedda6099f11ebb3eb4c377052bb605ddd 51SHA1 (patch-qtserialport_src_serialport_qserialport__unix.cpp) = 27ff0bdedda6099f11ebb3eb4c377052bb605ddd
52SHA1 (patch-qttools_src_assistant_3rdparty_clucene_src_CLucene_index_SegmentMerger.cpp) = 67c3422f65338ea29d03e45f51bb0f40274760d1 52SHA1 (patch-qttools_src_assistant_3rdparty_clucene_src_CLucene_index_SegmentMerger.cpp) = 67c3422f65338ea29d03e45f51bb0f40274760d1
53SHA1 (patch-qttools_src_assistant_3rdparty_clucene_src_CLucene_search_FieldCacheImpl.cpp) = 5dc1139b4dbfd464bfecd9eac86090064e5ae816 53SHA1 (patch-qttools_src_assistant_3rdparty_clucene_src_CLucene_search_FieldCacheImpl.cpp) = 5dc1139b4dbfd464bfecd9eac86090064e5ae816
54SHA1 (patch-qttools_src_assistant_3rdparty_clucene_src_CLucene_util_Arrays.h) = 30562da15ccfd3034b6db5430e7abdab2fd5cb94 54SHA1 (patch-qttools_src_assistant_3rdparty_clucene_src_CLucene_util_Arrays.h) = 30562da15ccfd3034b6db5430e7abdab2fd5cb94
55SHA1 (patch-qttools_src_assistant_clucene_qclucene-config__p.h) = 000e1c5e6bba4e59738ec539d4f22530dc84cd98 55SHA1 (patch-qttools_src_assistant_clucene_qclucene-config__p.h) = 000e1c5e6bba4e59738ec539d4f22530dc84cd98
56SHA1 (patch-qttools_src_designer_src_uitools_uitools.pro) = 61e72ba527d1209daa3672c749e25413d0ac595e 56SHA1 (patch-qttools_src_designer_src_uitools_uitools.pro) = 61e72ba527d1209daa3672c749e25413d0ac595e
57SHA1 (patch-qtwebkit_Source_JavaScriptCore_API_ObjCCallbackFunction.h) = 80862b28ebbb2182be96da16853903a48c0bc610 57SHA1 (patch-qtwebkit_Source_JavaScriptCore_API_ObjCCallbackFunction.h) = 80862b28ebbb2182be96da16853903a48c0bc610
58SHA1 (patch-qtwebkit_Source_JavaScriptCore_DerivedSources.pri) = 196feeeaf0ce0e3a4f8c9541bb3ea67b0892f79c 58SHA1 (patch-qtwebkit_Source_JavaScriptCore_DerivedSources.pri) = 196feeeaf0ce0e3a4f8c9541bb3ea67b0892f79c
cvs diff -r1.2 -r1.3 pkgsrc/x11/qt5-qtbase/patches/Attic/patch-qtmultimedia_src_gsttools_qgstreamervideoinputdevicecontrol.cpp (expand / switch to unified diff)

--- pkgsrc/x11/qt5-qtbase/patches/Attic/patch-qtmultimedia_src_gsttools_qgstreamervideoinputdevicecontrol.cpp 2014/04/23 07:05:31 1.2
+++ pkgsrc/x11/qt5-qtbase/patches/Attic/patch-qtmultimedia_src_gsttools_qgstreamervideoinputdevicecontrol.cpp 2014/07/24 15:51:56 1.3
@@ -1,25 +1,29 @@ @@ -1,25 +1,29 @@
1$NetBSD: patch-qtmultimedia_src_gsttools_qgstreamervideoinputdevicecontrol.cpp,v 1.2 2014/04/23 07:05:31 adam Exp $ 1$NetBSD: patch-qtmultimedia_src_gsttools_qgstreamervideoinputdevicecontrol.cpp,v 1.3 2014/07/24 15:51:56 jperkin Exp $
 2
 3Pull in correct includes on NetBSD and SunOS.
2 4
3--- qtmultimedia/src/gsttools/qgstreamervideoinputdevicecontrol.cpp.orig 2014-02-01 20:37:58.000000000 +0000 5--- qtmultimedia/src/gsttools/qgstreamervideoinputdevicecontrol.cpp.orig 2014-02-01 20:37:58.000000000 +0000
4+++ qtmultimedia/src/gsttools/qgstreamervideoinputdevicecontrol.cpp 6+++ qtmultimedia/src/gsttools/qgstreamervideoinputdevicecontrol.cpp
5@@ -44,7 +44,12 @@ 7@@ -44,7 +44,14 @@
6 #include <QtCore/QDir> 8 #include <QtCore/QDir>
7 #include <QtCore/QDebug> 9 #include <QtCore/QDebug>
8  10
9+#ifdef __linux__ 11+#ifdef __linux__
10 #include <linux/types.h> 12 #include <linux/types.h>
11+#include <linux/videodev2.h> 13+#include <linux/videodev2.h>
12+#elif defined(__NetBSD__) 14+#elif defined(__NetBSD__)
13+#include <sys/videoio.h> 15+#include <sys/videoio.h>
 16+#elif defined(__sun)
 17+#include <sys/videodev2.h>
14+#endif 18+#endif
15 #include <sys/time.h> 19 #include <sys/time.h>
16 #include <sys/ioctl.h> 20 #include <sys/ioctl.h>
17 #include <sys/poll.h> 21 #include <sys/poll.h>
18@@ -54,7 +59,6 @@ 22@@ -54,7 +61,6 @@
19 #include <string.h> 23 #include <string.h>
20 #include <stdlib.h> 24 #include <stdlib.h>
21 #include <sys/mman.h> 25 #include <sys/mman.h>
22-#include <linux/videodev2.h> 26-#include <linux/videodev2.h>
23  27
24 QGstreamerVideoInputDeviceControl::QGstreamerVideoInputDeviceControl(QObject *parent) 28 QGstreamerVideoInputDeviceControl::QGstreamerVideoInputDeviceControl(QObject *parent)
25 :QVideoDeviceSelectorControl(parent), m_source(0), m_selectedDevice(0) 29 :QVideoDeviceSelectorControl(parent), m_source(0), m_selectedDevice(0)
cvs diff -r1.1 -r1.2 pkgsrc/x11/qt5-qtbase/patches/Attic/patch-qtmultimedia_src_plugins_gstreamer_camerabin_camerabinserviceplugin.cpp (expand / switch to unified diff)

--- pkgsrc/x11/qt5-qtbase/patches/Attic/patch-qtmultimedia_src_plugins_gstreamer_camerabin_camerabinserviceplugin.cpp 2013/12/30 06:37:11 1.1
+++ pkgsrc/x11/qt5-qtbase/patches/Attic/patch-qtmultimedia_src_plugins_gstreamer_camerabin_camerabinserviceplugin.cpp 2014/07/24 15:51:56 1.2
@@ -1,25 +1,29 @@ @@ -1,25 +1,29 @@
1$NetBSD: patch-qtmultimedia_src_plugins_gstreamer_camerabin_camerabinserviceplugin.cpp,v 1.1 2013/12/30 06:37:11 ryoon Exp $ 1$NetBSD: patch-qtmultimedia_src_plugins_gstreamer_camerabin_camerabinserviceplugin.cpp,v 1.2 2014/07/24 15:51:56 jperkin Exp $
2 2
3--- qtmultimedia/src/plugins/gstreamer/camerabin/camerabinserviceplugin.cpp.orig 2013-12-20 09:28:04.000000000 +0000 3Pull in correct includes on NetBSD and SunOS.
 4
 5--- qtmultimedia/src/plugins/gstreamer/camerabin/camerabinserviceplugin.cpp.orig 2014-02-01 20:37:59.000000000 +0000
4+++ qtmultimedia/src/plugins/gstreamer/camerabin/camerabinserviceplugin.cpp 6+++ qtmultimedia/src/plugins/gstreamer/camerabin/camerabinserviceplugin.cpp
5@@ -50,7 +50,12 @@ 7@@ -50,7 +50,14 @@
6 #include "camerabinservice.h" 8 #include "camerabinservice.h"
7 #include <private/qgstutils_p.h> 9 #include <private/qgstutils_p.h>
8  10
9+#ifdef __linux__ 11+#ifdef __linux__
10 #include <linux/types.h> 12 #include <linux/types.h>
11+#include <linux/videodev2.h> 13+#include <linux/videodev2.h>
12+#elif defined(__NetBSD__) 14+#elif defined(__NetBSD__)
13+#include <sys/videoio.h> 15+#include <sys/videoio.h>
 16+#elif defined(__sun)
 17+#include <sys/videodev2.h>
14+#endif 18+#endif
15 #include <sys/time.h> 19 #include <sys/time.h>
16 #include <sys/ioctl.h> 20 #include <sys/ioctl.h>
17 #include <sys/poll.h> 21 #include <sys/poll.h>
18@@ -60,7 +65,6 @@ 22@@ -60,7 +67,6 @@
19 #include <string.h> 23 #include <string.h>
20 #include <stdlib.h> 24 #include <stdlib.h>
21 #include <sys/mman.h> 25 #include <sys/mman.h>
22-#include <linux/videodev2.h> 26-#include <linux/videodev2.h>
23 #include <gst/gst.h> 27 #include <gst/gst.h>
24  28
25 QT_BEGIN_NAMESPACE 29 QT_BEGIN_NAMESPACE
cvs diff -r1.1 -r1.2 pkgsrc/x11/qt5-qtbase/patches/Attic/patch-qtmultimedia_src_plugins_gstreamer_mediacapture_qgstreamerv4l2input.cpp (expand / switch to unified diff)

--- pkgsrc/x11/qt5-qtbase/patches/Attic/patch-qtmultimedia_src_plugins_gstreamer_mediacapture_qgstreamerv4l2input.cpp 2013/12/30 06:37:11 1.1
+++ pkgsrc/x11/qt5-qtbase/patches/Attic/patch-qtmultimedia_src_plugins_gstreamer_mediacapture_qgstreamerv4l2input.cpp 2014/07/24 15:51:56 1.2
@@ -1,45 +1,49 @@ @@ -1,45 +1,49 @@
1$NetBSD: patch-qtmultimedia_src_plugins_gstreamer_mediacapture_qgstreamerv4l2input.cpp,v 1.1 2013/12/30 06:37:11 ryoon Exp $ 1$NetBSD: patch-qtmultimedia_src_plugins_gstreamer_mediacapture_qgstreamerv4l2input.cpp,v 1.2 2014/07/24 15:51:56 jperkin Exp $
2 2
3NetBSD doesn't have support for v4l2_frmsizeenum and related logic. 3NetBSD and SunOS don't have support for v4l2_frmsizeenum and related logic.
4Should be fixed properly. 4Should be fixed properly.
5 5
6--- qtmultimedia/src/plugins/gstreamer/mediacapture/qgstreamerv4l2input.cpp.orig 2013-12-20 09:12:19.000000000 +0000 6Pull in correct includes on NetBSD and SunOS.
 7
 8--- qtmultimedia/src/plugins/gstreamer/mediacapture/qgstreamerv4l2input.cpp.orig 2014-02-01 20:37:59.000000000 +0000
7+++ qtmultimedia/src/plugins/gstreamer/mediacapture/qgstreamerv4l2input.cpp 9+++ qtmultimedia/src/plugins/gstreamer/mediacapture/qgstreamerv4l2input.cpp
8@@ -44,7 +44,12 @@ 10@@ -44,7 +44,14 @@
9 #include <QtCore/qdebug.h> 11 #include <QtCore/qdebug.h>
10 #include <QtCore/qfile.h> 12 #include <QtCore/qfile.h>
11  13
12+#if defined(__linux__) 14+#if defined(__linux__)
13+#include <linux/videodev2.h> 15+#include <linux/videodev2.h>
14 #include <linux/types.h> 16 #include <linux/types.h>
15+#elif defined(__NetBSD__) 17+#elif defined(__NetBSD__)
16+#include <sys/videoio.h> 18+#include <sys/videoio.h>
 19+#elif defined(__sun)
 20+#include <sys/videodev2.h>
17+#endif 21+#endif
18 #include <sys/time.h> 22 #include <sys/time.h>
19 #include <sys/ioctl.h> 23 #include <sys/ioctl.h>
20 #include <sys/poll.h> 24 #include <sys/poll.h>
21@@ -54,7 +59,6 @@ 25@@ -54,7 +61,6 @@
22 #include <string.h> 26 #include <string.h>
23 #include <stdlib.h> 27 #include <stdlib.h>
24 #include <sys/mman.h> 28 #include <sys/mman.h>
25-#include <linux/videodev2.h> 29-#include <linux/videodev2.h>
26  30
27 QT_BEGIN_NAMESPACE 31 QT_BEGIN_NAMESPACE
28 static inline uint qHash(const QSize& key) { return uint(key.width()*256+key.height()); } 32 static inline uint qHash(const QSize& key) { return uint(key.width()*256+key.height()); }
29@@ -154,7 +158,7 @@ void QGstreamerV4L2Input::updateSupporte 33@@ -154,7 +160,7 @@ void QGstreamerV4L2Input::updateSupporte
30  34
31  35
32 //get the list of resolutions: 36 //get the list of resolutions:
33- 37-
34+#if !defined(__NetBSD__) 38+#if !defined(__NetBSD__) && !defined(__sun)
35 foreach (quint32 format, supportedFormats) { 39 foreach (quint32 format, supportedFormats) {
36 struct v4l2_frmsizeenum formatSize; 40 struct v4l2_frmsizeenum formatSize;
37 memset(&formatSize, 0, sizeof(formatSize)); 41 memset(&formatSize, 0, sizeof(formatSize));
38@@ -256,6 +260,7 @@ void QGstreamerV4L2Input::updateSupporte 42@@ -256,6 +262,7 @@ void QGstreamerV4L2Input::updateSupporte
39 m_ratesByResolution[s].unite(frameRates.toSet()); 43 m_ratesByResolution[s].unite(frameRates.toSet());
40 } 44 }
41 } 45 }
42+#endif 46+#endif
43  47
44 f.close(); 48 f.close();
45  49