diff options
Diffstat (limited to 'pkgs/development/libraries/gstreamer/legacy/qt-gstreamer')
-rw-r--r-- | pkgs/development/libraries/gstreamer/legacy/qt-gstreamer/boost1.48.patch | 49 | ||||
-rw-r--r-- | pkgs/development/libraries/gstreamer/legacy/qt-gstreamer/default.nix | 20 |
2 files changed, 69 insertions, 0 deletions
diff --git a/pkgs/development/libraries/gstreamer/legacy/qt-gstreamer/boost1.48.patch b/pkgs/development/libraries/gstreamer/legacy/qt-gstreamer/boost1.48.patch new file mode 100644 index 000000000000..c48eec68a640 --- /dev/null +++ b/pkgs/development/libraries/gstreamer/legacy/qt-gstreamer/boost1.48.patch @@ -0,0 +1,49 @@ +Description: Work around moc limitations + Some parts of Boost, introduced in Boost 1.48 are not + understood by the limited C++ parser of moc. This + patch defines header guards that prevent the troublesome boost + headers from being processed. +Bug-Debian: #653796 +Author: Tobias Frost <tobi@coldtobi.de> +Reviewed-By: Steve Robbins <smr@debian.org> + +--- a/src/QGlib/connect.h ++++ b/src/QGlib/connect.h +@@ -19,6 +19,11 @@ + #ifndef QGLIB_CONNECT_H + #define QGLIB_CONNECT_H + ++#ifdef Q_MOC_RUN ++#define BOOST_TT_HAS_OPERATOR_HPP_INCLUDED ++#endif ++ ++ + #include "global.h" + #include "quark.h" + #include <QtCore/QObject> +--- a/src/QGst/bin.h ++++ b/src/QGst/bin.h +@@ -19,6 +19,10 @@ + #ifndef QGST_BIN_H + #define QGST_BIN_H + ++#ifdef Q_MOC_RUN ++#define BOOST_TT_HAS_OPERATOR_HPP_INCLUDED ++#endif ++ + #include "element.h" + #include "childproxy.h" + +--- a/src/QGst/Ui/videowidget.h ++++ b/src/QGst/Ui/videowidget.h +@@ -19,6 +19,10 @@ + #ifndef QGST_UI_VIDEOWIDGET_H + #define QGST_UI_VIDEOWIDGET_H + ++#ifdef Q_MOC_RUN ++#define BOOST_TT_HAS_OPERATOR_HPP_INCLUDED ++#endif ++ + #include "global.h" + #include "../element.h" + #include <QtGui/QWidget> diff --git a/pkgs/development/libraries/gstreamer/legacy/qt-gstreamer/default.nix b/pkgs/development/libraries/gstreamer/legacy/qt-gstreamer/default.nix new file mode 100644 index 000000000000..c3510a69a123 --- /dev/null +++ b/pkgs/development/libraries/gstreamer/legacy/qt-gstreamer/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, gstreamer, gst_plugins_base, boost, glib, qt4, cmake +, automoc4, flex, bison, pkgconfig }: + +stdenv.mkDerivation rec { + name = "${pname}-0.10.2"; + pname = "qt-gstreamer"; + + src = fetchurl { + url = "http://gstreamer.freedesktop.org/src/${pname}/${name}.tar.bz2"; + sha256 = "1laryg5vgc3prdi7dmpfwa71nsrc3ngv27sgax44c4qfrgpsgwbf"; + }; + + buildInputs = [ gstreamer gst_plugins_base glib qt4 ]; + propagatedBuildInputs = [ boost ]; + nativeBuildInputs = [ cmake automoc4 flex bison pkgconfig ]; + + cmakeFlags = "-DUSE_QT_PLUGIN_DIR=OFF -DUSE_GST_PLUGIN_DIR=OFF"; + + patches = [ ./boost1.48.patch ]; +} |