head	1.3;
access;
symbols
	pkgsrc-2014Q4:1.2.0.4
	pkgsrc-2014Q4-base:1.2
	pkgsrc-2014Q3:1.2.0.2
	pkgsrc-2014Q3-base:1.2
	pkgsrc-2014Q2:1.1.0.6
	pkgsrc-2014Q2-base:1.1
	pkgsrc-2014Q1:1.1.0.4
	pkgsrc-2014Q1-base:1.1
	pkgsrc-2013Q4:1.1.0.2
	pkgsrc-2013Q4-base:1.1;
locks; strict;
comment	@// @;


1.3
date	2014.12.30.17.23.46;	author adam;	state dead;
branches;
next	1.2;
commitid	1jIE5UF7705yw54y;

1.2
date	2014.07.24.15.51.56;	author jperkin;	state Exp;
branches;
next	1.1;
commitid	p0vgEajm0mo28EJx;

1.1
date	2013.12.30.06.37.11;	author ryoon;	state Exp;
branches;
next	;
commitid	YZoLPNJHaOeDF7jx;


desc
@@


1.3
log
@Changes 5.4.0:
Chromium-based browser engine Qt WebEngine
Qt WebView for showing web content using the native OS web engine on mobile
Full support on Qt for Windows Store Apps, including WinRT and Windows Phone 8.1
Improved Compliance with iOS 8 and Xcode 6
Improved OS X 10.10 ‘Yosemite’ support and new Mac AppStore signing
High-DPI support for Windows and OS X
Dynamic GL switching between OpenGL and ANGLE on Windows
Mix OpenGL and Qt Quick with QOpenGLWidget
Android Look-and-Feel for Qt Quick Controls
Qt Creator 3.3 with new Qt Quick Designer
Bluetooth now supports BlueZ5 with tech preview on Bluetooth LE
@
text
@$NetBSD: patch-qtmultimedia_src_plugins_gstreamer_mediacapture_qgstreamerv4l2input.cpp,v 1.2 2014/07/24 15:51:56 jperkin Exp $

NetBSD and SunOS don't have support for v4l2_frmsizeenum and related logic.
Should be fixed properly.

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,14 @@@@
 #include <QtCore/qdebug.h>
 #include <QtCore/qfile.h>
 
+#if defined(__linux__)
+#include <linux/videodev2.h>
 #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 +61,6 @@@@
 #include <string.h>
 #include <stdlib.h>
 #include <sys/mman.h>
-#include <linux/videodev2.h>
 
 QT_BEGIN_NAMESPACE
 static inline uint qHash(const QSize& key) { return uint(key.width()*256+key.height()); }
@@@@ -154,7 +160,7 @@@@ void QGstreamerV4L2Input::updateSupporte
 
 
     //get the list of resolutions:
-
+#if !defined(__NetBSD__) && !defined(__sun)
     foreach (quint32 format, supportedFormats) {
         struct v4l2_frmsizeenum formatSize;
         memset(&formatSize, 0, sizeof(formatSize));
@@@@ -256,6 +262,7 @@@@ void QGstreamerV4L2Input::updateSupporte
             m_ratesByResolution[s].unite(frameRates.toSet());
         }
     }
+#endif
 
     f.close();
 
@


1.2
log
@Apply some patches to fix x11/qt5-qtmultimedia build on SunOS.
@
text
@d1 1
a1 1
$NetBSD: patch-qtmultimedia_src_plugins_gstreamer_mediacapture_qgstreamerv4l2input.cpp,v 1.1 2013/12/30 06:37:11 ryoon Exp $
@


1.1
log
@*** empty log message ***
@
text
@d1 1
a1 1
$NetBSD$
d3 1
a3 1
NetBSD doesn't have support for v4l2_frmsizeenum and related logic.
d6 3
a8 1
--- qtmultimedia/src/plugins/gstreamer/mediacapture/qgstreamerv4l2input.cpp.orig	2013-12-20 09:12:19.000000000 +0000
d10 1
a10 1
@@@@ -44,7 +44,12 @@@@
d19 2
d25 1
a25 1
@@@@ -54,7 +59,6 @@@@
d33 1
a33 1
@@@@ -154,7 +158,7 @@@@ void QGstreamerV4L2Input::updateSupporte
d38 1
a38 1
+#if !defined(__NetBSD__)
d42 1
a42 1
@@@@ -256,6 +260,7 @@@@ void QGstreamerV4L2Input::updateSupporte
@