Apply some patches to fix x11/qt5-qtmultimedia build on SunOS.

4 files changed, 31 insertions, 19 deletions

diff --git a/x11/qt5-qtbase/distinfo b/x11/qt5-qtbase/distinfo
index cc8b4444b61..406de2423ed 100644
--- a/x11/qt5-qtbase/distinfo
+++ b/x11/qt5-qtbase/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.10 2014/07/14 16:32:14 jperkin Exp $
+$NetBSD: distinfo,v 1.11 2014/07/24 15:51:56 jperkin Exp $
 
 SHA1 (qt-everywhere-opensource-src-5.2.1.tar.xz) = cc68265c62321670bd40e29bdd484ea881bd6af3
 RMD160 (qt-everywhere-opensource-src-5.2.1.tar.xz) = 9b716c5875a6186968392896ac8bd3261fae9b24
@@ -37,12 +37,12 @@ SHA1 (patch-qtdeclarative_src_qml_jsruntime_qv4mm.cpp) = f37900af31ed15040499d9a
 SHA1 (patch-qtdeclarative_src_qml_jsruntime_qv4stringobject.cpp) = a51bbafc307663e150da89efc29175424d733f1a
 SHA1 (patch-qtdeclarative_src_qmldevtools_qmldevtools.pro) = 6f0e65eb6c4a5bfd05a603d9cbfc6fdc22e46d3b
 SHA1 (patch-qtdeclarative_tests_auto_qml_qjsengine_tst__qjsengine.cpp) = b1cc5a386dd0f1b3651adb9babee87be84221998
-SHA1 (patch-qtmultimedia_src_gsttools_qgstreamervideoinputdevicecontrol.cpp) = 122c629340578670876571e10c5946c4f359ed04
+SHA1 (patch-qtmultimedia_src_gsttools_qgstreamervideoinputdevicecontrol.cpp) = 235140fa9d5e4ffbb954621e50b83a719c5ef636
 SHA1 (patch-qtmultimedia_src_plugins_gstreamer_audiodecoder_qgstreameraudiodecoderserviceplugin.cpp) = ac97ed7ec63e3cfc060ce7e90dfe7f053f9dd851
 SHA1 (patch-qtmultimedia_src_plugins_gstreamer_camerabin_camerabincontrol.cpp) = e2b0022da1f523324159efdcd29237f82380aed8
-SHA1 (patch-qtmultimedia_src_plugins_gstreamer_camerabin_camerabinserviceplugin.cpp) = 4c5f0d3d5a0c6b3075232272abe00b467575194f
+SHA1 (patch-qtmultimedia_src_plugins_gstreamer_camerabin_camerabinserviceplugin.cpp) = 5f79e39dba119b9c0c757268a0a13332040e36a5
 SHA1 (patch-qtmultimedia_src_plugins_gstreamer_mediacapture_qgstreamercaptureserviceplugin.cpp) = 224a3097498d12284f10a9adb5a774356092f374
-SHA1 (patch-qtmultimedia_src_plugins_gstreamer_mediacapture_qgstreamerv4l2input.cpp) = 55aee0426b057461861605dadd4687932988bd78
+SHA1 (patch-qtmultimedia_src_plugins_gstreamer_mediacapture_qgstreamerv4l2input.cpp) = 16efe4a42cf7cb2718cb03062d2d132edfc2fedc
 SHA1 (patch-qtmultimedia_src_plugins_gstreamer_mediaplayer_qgstreamerplayerserviceplugin.cpp) = 729d69245a1ab6fe9b01a63673102685b39d7add
 SHA1 (patch-qtquick1_tests_auto_declarative_qdeclarativeimage_tst__qdeclarativeimage.cpp) = b1efdea5596a76eeae37a70bd49bb7741a8b7c5f
 SHA1 (patch-qtscript_src_3rdparty_javascriptcore_JavaScriptCore_config.h) = 66dc22ee78727c84f1e82dc10bb342d514f8f9a0
diff --git a/x11/qt5-qtbase/patches/patch-qtmultimedia_src_gsttools_qgstreamervideoinputdevicecontrol.cpp b/x11/qt5-qtbase/patches/patch-qtmultimedia_src_gsttools_qgstreamervideoinputdevicecontrol.cpp
index e4753c5bf68..f6508377da9 100644
--- a/x11/qt5-qtbase/patches/patch-qtmultimedia_src_gsttools_qgstreamervideoinputdevicecontrol.cpp
+++ b/x11/qt5-qtbase/patches/patch-qtmultimedia_src_gsttools_qgstreamervideoinputdevicecontrol.cpp
@@ -1,8 +1,10 @@
-$NetBSD: patch-qtmultimedia_src_gsttools_qgstreamervideoinputdevicecontrol.cpp,v 1.2 2014/04/23 07:05:31 adam Exp $
+$NetBSD: patch-qtmultimedia_src_gsttools_qgstreamervideoinputdevicecontrol.cpp,v 1.3 2014/07/24 15:51:56 jperkin Exp $
+
+Pull in correct includes on NetBSD and SunOS.
 
 --- qtmultimedia/src/gsttools/qgstreamervideoinputdevicecontrol.cpp.orig	2014-02-01 20:37:58.000000000 +0000
 +++ qtmultimedia/src/gsttools/qgstreamervideoinputdevicecontrol.cpp
-@@ -44,7 +44,12 @@
+@@ -44,7 +44,14 @@
  #include <QtCore/QDir>
  #include <QtCore/QDebug>
  
@@ -11,11 +13,13 @@ $NetBSD: patch-qtmultimedia_src_gsttools_qgstreamervideoinputdevicecontrol.cpp,v
 +#include <linux/videodev2.h>
 +#elif defined(__NetBSD__)
 +#include <sys/videoio.h>
++#elif defined(__sun)
++#include <sys/videodev2.h>
 +#endif
  #include <sys/time.h>
  #include <sys/ioctl.h>
  #include <sys/poll.h>
-@@ -54,7 +59,6 @@
+@@ -54,7 +61,6 @@
  #include <string.h>
  #include <stdlib.h>
  #include <sys/mman.h>
diff --git a/x11/qt5-qtbase/patches/patch-qtmultimedia_src_plugins_gstreamer_camerabin_camerabinserviceplugin.cpp b/x11/qt5-qtbase/patches/patch-qtmultimedia_src_plugins_gstreamer_camerabin_camerabinserviceplugin.cpp
index 11045691ea5..233a2dac95e 100644
--- a/x11/qt5-qtbase/patches/patch-qtmultimedia_src_plugins_gstreamer_camerabin_camerabinserviceplugin.cpp
+++ b/x11/qt5-qtbase/patches/patch-qtmultimedia_src_plugins_gstreamer_camerabin_camerabinserviceplugin.cpp
@@ -1,8 +1,10 @@
-$NetBSD: patch-qtmultimedia_src_plugins_gstreamer_camerabin_camerabinserviceplugin.cpp,v 1.1 2013/12/30 06:37:11 ryoon Exp $
+$NetBSD: patch-qtmultimedia_src_plugins_gstreamer_camerabin_camerabinserviceplugin.cpp,v 1.2 2014/07/24 15:51:56 jperkin Exp $
 
---- qtmultimedia/src/plugins/gstreamer/camerabin/camerabinserviceplugin.cpp.orig	2013-12-20 09:28:04.000000000 +0000
+Pull in correct includes on NetBSD and SunOS.
+
+--- qtmultimedia/src/plugins/gstreamer/camerabin/camerabinserviceplugin.cpp.orig	2014-02-01 20:37:59.000000000 +0000
 +++ qtmultimedia/src/plugins/gstreamer/camerabin/camerabinserviceplugin.cpp
-@@ -50,7 +50,12 @@
+@@ -50,7 +50,14 @@
  #include "camerabinservice.h"
  #include <private/qgstutils_p.h>
  
@@ -11,11 +13,13 @@ $NetBSD: patch-qtmultimedia_src_plugins_gstreamer_camerabin_camerabinserviceplug
 +#include <linux/videodev2.h>
 +#elif defined(__NetBSD__)
 +#include <sys/videoio.h>
++#elif defined(__sun)
++#include <sys/videodev2.h>
 +#endif
  #include <sys/time.h>
  #include <sys/ioctl.h>
  #include <sys/poll.h>
-@@ -60,7 +65,6 @@
+@@ -60,7 +67,6 @@
  #include <string.h>
  #include <stdlib.h>
  #include <sys/mman.h>
diff --git a/x11/qt5-qtbase/patches/patch-qtmultimedia_src_plugins_gstreamer_mediacapture_qgstreamerv4l2input.cpp b/x11/qt5-qtbase/patches/patch-qtmultimedia_src_plugins_gstreamer_mediacapture_qgstreamerv4l2input.cpp
index de9e15057c7..06bc3cab22d 100644
--- a/x11/qt5-qtbase/patches/patch-qtmultimedia_src_plugins_gstreamer_mediacapture_qgstreamerv4l2input.cpp
+++ b/x11/qt5-qtbase/patches/patch-qtmultimedia_src_plugins_gstreamer_mediacapture_qgstreamerv4l2input.cpp
@@ -1,11 +1,13 @@
-$NetBSD: patch-qtmultimedia_src_plugins_gstreamer_mediacapture_qgstreamerv4l2input.cpp,v 1.1 2013/12/30 06:37:11 ryoon Exp $
+$NetBSD: patch-qtmultimedia_src_plugins_gstreamer_mediacapture_qgstreamerv4l2input.cpp,v 1.2 2014/07/24 15:51:56 jperkin Exp $
 
-NetBSD doesn't have support for v4l2_frmsizeenum and related logic.
+NetBSD and SunOS don't have support for v4l2_frmsizeenum and related logic.
 Should be fixed properly.
 
---- qtmultimedia/src/plugins/gstreamer/mediacapture/qgstreamerv4l2input.cpp.orig	2013-12-20 09:12:19.000000000 +0000
+Pull in correct includes on NetBSD and SunOS.
+
+--- qtmultimedia/src/plugins/gstreamer/mediacapture/qgstreamerv4l2input.cpp.orig	2014-02-01 20:37:59.000000000 +0000
 +++ qtmultimedia/src/plugins/gstreamer/mediacapture/qgstreamerv4l2input.cpp
-@@ -44,7 +44,12 @@
+@@ -44,7 +44,14 @@
  #include <QtCore/qdebug.h>
  #include <QtCore/qfile.h>
  
@@ -14,11 +16,13 @@ Should be fixed properly.
  #include <linux/types.h>
 +#elif defined(__NetBSD__)
 +#include <sys/videoio.h>
++#elif defined(__sun)
++#include <sys/videodev2.h>
 +#endif
  #include <sys/time.h>
  #include <sys/ioctl.h>
  #include <sys/poll.h>
-@@ -54,7 +59,6 @@
+@@ -54,7 +61,6 @@
  #include <string.h>
  #include <stdlib.h>
  #include <sys/mman.h>
@@ -26,16 +30,16 @@ Should be fixed properly.
  
  QT_BEGIN_NAMESPACE
  static inline uint qHash(const QSize& key) { return uint(key.width()*256+key.height()); }
-@@ -154,7 +158,7 @@ void QGstreamerV4L2Input::updateSupporte
+@@ -154,7 +160,7 @@ void QGstreamerV4L2Input::updateSupporte
  
  
      //get the list of resolutions:
 -
-+#if !defined(__NetBSD__)
++#if !defined(__NetBSD__) && !defined(__sun)
      foreach (quint32 format, supportedFormats) {
          struct v4l2_frmsizeenum formatSize;
          memset(&formatSize, 0, sizeof(formatSize));
-@@ -256,6 +260,7 @@ void QGstreamerV4L2Input::updateSupporte
+@@ -256,6 +262,7 @@ void QGstreamerV4L2Input::updateSupporte
              m_ratesByResolution[s].unite(frameRates.toSet());
          }
      }