mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-09-11 15:08:33 +01:00
Add qt-gstreamer
svn path=/nixpkgs/trunk/; revision=33076
This commit is contained in:
parent
635d1d9bec
commit
6d2a78fc40
|
@ -17,6 +17,8 @@ rec {
|
||||||
|
|
||||||
gst_python = callPackage ./gst-python {};
|
gst_python = callPackage ./gst-python {};
|
||||||
|
|
||||||
|
qt_gstreamer = callPackage ./qt-gstreamer {};
|
||||||
|
|
||||||
# Header files are in include/${prefix}/
|
# Header files are in include/${prefix}/
|
||||||
prefix = "gstreamer-0.10";
|
prefix = "gstreamer-0.10";
|
||||||
}
|
}
|
||||||
|
|
|
@ -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>
|
|
@ -0,0 +1,17 @@
|
||||||
|
{ stdenv, fetchurl, gstreamer, gstPluginsBase, boost, glib, qt4, cmake
|
||||||
|
, automoc4, flex, bison, pkgconfig }:
|
||||||
|
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
|
name = "${pname}-0.10.1";
|
||||||
|
pname = "qt-gstreamer";
|
||||||
|
|
||||||
|
src = fetchurl {
|
||||||
|
url = "http://gstreamer.freedesktop.org/src/${pname}/${name}.tar.bz2";
|
||||||
|
sha256 = "0g377jlzlwgywgk7nbv9fd0aimv8wpzrymwzdiaffczxv5xvip5h";
|
||||||
|
};
|
||||||
|
|
||||||
|
buildInputs = [ gstreamer gstPluginsBase boost glib qt4 ];
|
||||||
|
buildNativeInputs = [ cmake automoc4 flex bison pkgconfig ];
|
||||||
|
|
||||||
|
patches = [ ./boost1.48.patch ];
|
||||||
|
}
|
Loading…
Reference in a new issue