diff options
author | ryoon <ryoon> | 2013-12-30 06:37:11 +0000 |
---|---|---|
committer | ryoon <ryoon> | 2013-12-30 06:37:11 +0000 |
commit | ad955addcd7376c172ec4c1aa57693adc15a9c47 (patch) | |
tree | 0c54babca34847404a23eee2f8e1c499a0f93453 /x11/qt5-qtbase | |
parent | 5df00048da36f29b474738f69e9385d957a9ec39 (diff) | |
download | pkgsrc-ad955addcd7376c172ec4c1aa57693adc15a9c47.tar.gz |
*** empty log message ***
Diffstat (limited to 'x11/qt5-qtbase')
10 files changed, 207 insertions, 4 deletions
diff --git a/x11/qt5-qtbase/Makefile b/x11/qt5-qtbase/Makefile index acd7a5e09a3..9929bca1696 100644 --- a/x11/qt5-qtbase/Makefile +++ b/x11/qt5-qtbase/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.1 2013/12/13 14:38:35 ryoon Exp $ +# $NetBSD: Makefile,v 1.2 2013/12/30 06:37:11 ryoon Exp $ PKGNAME= qt5-qtbase-${QTVERSION} +PKGREVISION= 1 COMMENT= C++ X GUI toolkit .include "../../x11/qt5-qtbase/Makefile.common" diff --git a/x11/qt5-qtbase/Makefile.common b/x11/qt5-qtbase/Makefile.common index 53ea8aad2ce..a419ee7f6de 100644 --- a/x11/qt5-qtbase/Makefile.common +++ b/x11/qt5-qtbase/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.6 2013/12/28 09:11:24 jperkin Exp $ +# $NetBSD: Makefile.common,v 1.7 2013/12/30 06:37:11 ryoon Exp $ # used by x11/qt5-dbus/Makefile # used by x11/qt5-mysql/Makefile # used by x11/qt5-odbc/Makefile @@ -47,7 +47,7 @@ BUILDLINK_TRANSFORM+= opt:-ldl:${BUILDLINK_LDADD.dl:M*} HAS_CONFIGURE= yes USE_LANGUAGES= c c++ USE_LIBTOOL= yes -USE_TOOLS+= gmake perl:build +USE_TOOLS+= gmake perl:build pkg-config CONFIG_SHELL= ${PERL5} diff --git a/x11/qt5-qtbase/distinfo b/x11/qt5-qtbase/distinfo index f4943155b59..ca04b13fa13 100644 --- a/x11/qt5-qtbase/distinfo +++ b/x11/qt5-qtbase/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.4 2013/12/17 23:22:35 joerg Exp $ +$NetBSD: distinfo,v 1.5 2013/12/30 06:37:11 ryoon Exp $ SHA1 (qt-everywhere-opensource-src-5.2.0.tar.xz) = 7d9d8cad4434bc200d9ed87b3c7cb39654a2f1b4 RMD160 (qt-everywhere-opensource-src-5.2.0.tar.xz) = b2dd68f622fa7ff271ef621a7c7f17f2ecf7be9d @@ -30,6 +30,13 @@ SHA1 (patch-qtdeclarative_examples_quick_customitems_painteditem_painteditem.pro SHA1 (patch-qtdeclarative_src_qml_jsruntime_qv4alloca__p.h) = 9a1a4bb03776e3e6331120933accd0cf46503533 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) = 9281d212f28dab5fece2f7a0cc9bddf0e58922dc +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_mediacapture_qgstreamercaptureserviceplugin.cpp) = 224a3097498d12284f10a9adb5a774356092f374 +SHA1 (patch-qtmultimedia_src_plugins_gstreamer_mediacapture_qgstreamerv4l2input.cpp) = 55aee0426b057461861605dadd4687932988bd78 +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 SHA1 (patch-qtscript_src_3rdparty_javascriptcore_JavaScriptCore_runtime_JSValue.h) = ee35790f58ec9cf4d1a370f5549d92b5a680f557 diff --git a/x11/qt5-qtbase/patches/patch-qtmultimedia_src_gsttools_qgstreamervideoinputdevicecontrol.cpp b/x11/qt5-qtbase/patches/patch-qtmultimedia_src_gsttools_qgstreamervideoinputdevicecontrol.cpp new file mode 100644 index 00000000000..f51f05d4fb1 --- /dev/null +++ b/x11/qt5-qtbase/patches/patch-qtmultimedia_src_gsttools_qgstreamervideoinputdevicecontrol.cpp @@ -0,0 +1,25 @@ +$NetBSD: patch-qtmultimedia_src_gsttools_qgstreamervideoinputdevicecontrol.cpp,v 1.1 2013/12/30 06:37:11 ryoon Exp $ + +--- qtmultimedia/src/gsttools/qgstreamervideoinputdevicecontrol.cpp.orig 2013-12-20 09:05:17.000000000 +0000 ++++ qtmultimedia/src/gsttools/qgstreamervideoinputdevicecontrol.cpp +@@ -44,7 +44,12 @@ + #include <QtCore/QDir> + #include <QtCore/QDebug> + ++#ifdef __linux__ + #include <linux/types.h> ++#include <linux/videodev2.h> ++#elif defined(__NetBSD__) ++#include <sys/videoio.h> ++#endif + #include <sys/time.h> + #include <sys/ioctl.h> + #include <sys/poll.h> +@@ -54,7 +59,6 @@ + #include <string.h> + #include <stdlib.h> + #include <sys/mman.h> +-#include <linux/videodev2.h> + + QGstreamerVideoInputDeviceControl::QGstreamerVideoInputDeviceControl(QObject *parent) + :QVideoDeviceSelectorControl(parent), m_selectedDevice(0) diff --git a/x11/qt5-qtbase/patches/patch-qtmultimedia_src_plugins_gstreamer_audiodecoder_qgstreameraudiodecoderserviceplugin.cpp b/x11/qt5-qtbase/patches/patch-qtmultimedia_src_plugins_gstreamer_audiodecoder_qgstreameraudiodecoderserviceplugin.cpp new file mode 100644 index 00000000000..fdadafab893 --- /dev/null +++ b/x11/qt5-qtbase/patches/patch-qtmultimedia_src_plugins_gstreamer_audiodecoder_qgstreameraudiodecoderserviceplugin.cpp @@ -0,0 +1,25 @@ +$NetBSD: patch-qtmultimedia_src_plugins_gstreamer_audiodecoder_qgstreameraudiodecoderserviceplugin.cpp,v 1.1 2013/12/30 06:37:11 ryoon Exp $ + +--- qtmultimedia/src/plugins/gstreamer/audiodecoder/qgstreameraudiodecoderserviceplugin.cpp.orig 2013-12-20 09:09:03.000000000 +0000 ++++ qtmultimedia/src/plugins/gstreamer/audiodecoder/qgstreameraudiodecoderserviceplugin.cpp +@@ -49,7 +49,12 @@ + #include <QtCore/QDir> + #include <QtCore/QDebug> + ++#if defined(__linux__) + #include <linux/types.h> ++#include <linux/videodev2.h> ++#elif defined(__NetBSD__) ++#include <sys/videoio.h> ++#endif + #include <sys/time.h> + #include <sys/ioctl.h> + #include <sys/poll.h> +@@ -59,7 +64,6 @@ + #include <string.h> + #include <stdlib.h> + #include <sys/mman.h> +-#include <linux/videodev2.h> + #include <gst/gst.h> + + // #define QT_SUPPORTEDMIMETYPES_DEBUG diff --git a/x11/qt5-qtbase/patches/patch-qtmultimedia_src_plugins_gstreamer_camerabin_camerabincontrol.cpp b/x11/qt5-qtbase/patches/patch-qtmultimedia_src_plugins_gstreamer_camerabin_camerabincontrol.cpp new file mode 100644 index 00000000000..20b6615f1be --- /dev/null +++ b/x11/qt5-qtbase/patches/patch-qtmultimedia_src_plugins_gstreamer_camerabin_camerabincontrol.cpp @@ -0,0 +1,25 @@ +$NetBSD: patch-qtmultimedia_src_plugins_gstreamer_camerabin_camerabincontrol.cpp,v 1.1 2013/12/30 06:37:11 ryoon Exp $ + +--- qtmultimedia/src/plugins/gstreamer/camerabin/camerabincontrol.cpp.orig 2013-12-20 09:31:52.000000000 +0000 ++++ qtmultimedia/src/plugins/gstreamer/camerabin/camerabincontrol.cpp +@@ -50,7 +50,12 @@ + #include <QtCore/qfile.h> + #include <QtCore/qmetaobject.h> + ++#ifdef __linux__ + #include <linux/types.h> ++#include <linux/videodev2.h> ++#elif defined(__NetBSD__) ++#include <sys/videoio.h> ++#endif + #include <sys/time.h> + #include <sys/ioctl.h> + #include <sys/poll.h> +@@ -60,7 +65,6 @@ + #include <string.h> + #include <stdlib.h> + #include <sys/mman.h> +-#include <linux/videodev2.h> + + QT_BEGIN_NAMESPACE + 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 new file mode 100644 index 00000000000..11045691ea5 --- /dev/null +++ b/x11/qt5-qtbase/patches/patch-qtmultimedia_src_plugins_gstreamer_camerabin_camerabinserviceplugin.cpp @@ -0,0 +1,25 @@ +$NetBSD: patch-qtmultimedia_src_plugins_gstreamer_camerabin_camerabinserviceplugin.cpp,v 1.1 2013/12/30 06:37:11 ryoon Exp $ + +--- qtmultimedia/src/plugins/gstreamer/camerabin/camerabinserviceplugin.cpp.orig 2013-12-20 09:28:04.000000000 +0000 ++++ qtmultimedia/src/plugins/gstreamer/camerabin/camerabinserviceplugin.cpp +@@ -50,7 +50,12 @@ + #include "camerabinservice.h" + #include <private/qgstutils_p.h> + ++#ifdef __linux__ + #include <linux/types.h> ++#include <linux/videodev2.h> ++#elif defined(__NetBSD__) ++#include <sys/videoio.h> ++#endif + #include <sys/time.h> + #include <sys/ioctl.h> + #include <sys/poll.h> +@@ -60,7 +65,6 @@ + #include <string.h> + #include <stdlib.h> + #include <sys/mman.h> +-#include <linux/videodev2.h> + #include <gst/gst.h> + + QT_BEGIN_NAMESPACE diff --git a/x11/qt5-qtbase/patches/patch-qtmultimedia_src_plugins_gstreamer_mediacapture_qgstreamercaptureserviceplugin.cpp b/x11/qt5-qtbase/patches/patch-qtmultimedia_src_plugins_gstreamer_mediacapture_qgstreamercaptureserviceplugin.cpp new file mode 100644 index 00000000000..c9c73f5fd34 --- /dev/null +++ b/x11/qt5-qtbase/patches/patch-qtmultimedia_src_plugins_gstreamer_mediacapture_qgstreamercaptureserviceplugin.cpp @@ -0,0 +1,25 @@ +$NetBSD: patch-qtmultimedia_src_plugins_gstreamer_mediacapture_qgstreamercaptureserviceplugin.cpp,v 1.1 2013/12/30 06:37:11 ryoon Exp $ + +--- qtmultimedia/src/plugins/gstreamer/mediacapture/qgstreamercaptureserviceplugin.cpp.orig 2013-12-20 09:17:00.000000000 +0000 ++++ qtmultimedia/src/plugins/gstreamer/mediacapture/qgstreamercaptureserviceplugin.cpp +@@ -51,7 +51,12 @@ + #include "qgstreamercaptureservice.h" + #include <private/qgstutils_p.h> + ++#ifdef __linux__ + #include <linux/types.h> ++#include <linux/videodev2.h> ++#elif defined(__NetBSD__) ++#include <sys/videoio.h> ++#endif + #include <sys/time.h> + #include <sys/ioctl.h> + #include <sys/poll.h> +@@ -61,7 +66,6 @@ + #include <string.h> + #include <stdlib.h> + #include <sys/mman.h> +-#include <linux/videodev2.h> + #include <gst/gst.h> + + QMediaService* QGstreamerCaptureServicePlugin::create(const QString &key) 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 new file mode 100644 index 00000000000..de9e15057c7 --- /dev/null +++ b/x11/qt5-qtbase/patches/patch-qtmultimedia_src_plugins_gstreamer_mediacapture_qgstreamerv4l2input.cpp @@ -0,0 +1,45 @@ +$NetBSD: patch-qtmultimedia_src_plugins_gstreamer_mediacapture_qgstreamerv4l2input.cpp,v 1.1 2013/12/30 06:37:11 ryoon Exp $ + +NetBSD doesn'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 ++++ qtmultimedia/src/plugins/gstreamer/mediacapture/qgstreamerv4l2input.cpp +@@ -44,7 +44,12 @@ + #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> ++#endif + #include <sys/time.h> + #include <sys/ioctl.h> + #include <sys/poll.h> +@@ -54,7 +59,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 +158,7 @@ void QGstreamerV4L2Input::updateSupporte + + + //get the list of resolutions: +- ++#if !defined(__NetBSD__) + foreach (quint32 format, supportedFormats) { + struct v4l2_frmsizeenum formatSize; + memset(&formatSize, 0, sizeof(formatSize)); +@@ -256,6 +260,7 @@ void QGstreamerV4L2Input::updateSupporte + m_ratesByResolution[s].unite(frameRates.toSet()); + } + } ++#endif + + f.close(); + diff --git a/x11/qt5-qtbase/patches/patch-qtmultimedia_src_plugins_gstreamer_mediaplayer_qgstreamerplayerserviceplugin.cpp b/x11/qt5-qtbase/patches/patch-qtmultimedia_src_plugins_gstreamer_mediaplayer_qgstreamerplayerserviceplugin.cpp new file mode 100644 index 00000000000..879c704df15 --- /dev/null +++ b/x11/qt5-qtbase/patches/patch-qtmultimedia_src_plugins_gstreamer_mediaplayer_qgstreamerplayerserviceplugin.cpp @@ -0,0 +1,25 @@ +$NetBSD: patch-qtmultimedia_src_plugins_gstreamer_mediaplayer_qgstreamerplayerserviceplugin.cpp,v 1.1 2013/12/30 06:37:11 ryoon Exp $ + +--- qtmultimedia/src/plugins/gstreamer/mediaplayer/qgstreamerplayerserviceplugin.cpp.orig 2013-12-20 09:21:00.000000000 +0000 ++++ qtmultimedia/src/plugins/gstreamer/mediaplayer/qgstreamerplayerserviceplugin.cpp +@@ -51,7 +51,12 @@ + #include "qgstreamerplayerservice.h" + #include <private/qgstutils_p.h> + ++#ifdef __linux__ + #include <linux/types.h> ++#include <linux/videodev2.h> ++#elif defined(__NetBSD__) ++#include <sys/videoio.h> ++#endif + #include <sys/time.h> + #include <sys/ioctl.h> + #include <sys/poll.h> +@@ -61,7 +66,6 @@ + #include <string.h> + #include <stdlib.h> + #include <sys/mman.h> +-#include <linux/videodev2.h> + #include <gst/gst.h> + + |