mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-09-24 14:18:13 +03:00
Merge pull request #69070 from Anton-Latukha/drop-qt-gstreamer-legacy
qt-gstreamer{,1}: drop
This commit is contained in:
commit
fa639e71c9
@ -1,49 +0,0 @@
|
|||||||
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>
|
|
@ -1,20 +0,0 @@
|
|||||||
{ stdenv, fetchurl, gstreamer, gst-plugins-base, boost155, glib, qt4, cmake
|
|
||||||
, automoc4, flex, bison, pkgconfig }:
|
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
|
||||||
name = "${pname}-0.10.3";
|
|
||||||
pname = "qt-gstreamer";
|
|
||||||
|
|
||||||
src = fetchurl {
|
|
||||||
url = "https://gstreamer.freedesktop.org/src/${pname}/${name}.tar.bz2";
|
|
||||||
sha256 = "1pqg9sxzk8sdrf7pazb5v21hasqai9i4l203gbdqz29w2ll1ybsl";
|
|
||||||
};
|
|
||||||
|
|
||||||
buildInputs = [ gstreamer gst-plugins-base glib qt4 ];
|
|
||||||
propagatedBuildInputs = [ boost155 ];
|
|
||||||
nativeBuildInputs = [ cmake automoc4 flex bison pkgconfig ];
|
|
||||||
|
|
||||||
cmakeFlags = "-DUSE_QT_PLUGIN_DIR=OFF -DUSE_GST_PLUGIN_DIR=OFF";
|
|
||||||
|
|
||||||
patches = [ ./boost1.48.patch ];
|
|
||||||
}
|
|
@ -1,32 +0,0 @@
|
|||||||
{ stdenv, fetchurl, fetchpatch, gst_all_1, boost, glib, qt4, cmake
|
|
||||||
, automoc4, flex, bison, pkgconfig }:
|
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
|
||||||
name = "${pname}-1.2.0";
|
|
||||||
pname = "qt-gstreamer";
|
|
||||||
|
|
||||||
src = fetchurl {
|
|
||||||
url = "https://gstreamer.freedesktop.org/src/${pname}/${name}.tar.xz";
|
|
||||||
sha256 = "9f3b492b74cad9be918e4c4db96df48dab9c012f2ae5667f438b64a4d92e8fd4";
|
|
||||||
};
|
|
||||||
|
|
||||||
patches = [
|
|
||||||
(fetchpatch {
|
|
||||||
url = "https://cgit.freedesktop.org/gstreamer/qt-gstreamer/patch/?id=e2ca8094aa8d0eac1c3a98df66fe94ce0c754088";
|
|
||||||
sha256 = "1qps0nlc26d74wk8h96xl5s3d9qrdx6c0ph0zpl1dnc691lgyf6s";
|
|
||||||
})
|
|
||||||
];
|
|
||||||
|
|
||||||
outputs = [ "out" "dev" ];
|
|
||||||
|
|
||||||
buildInputs = [ gst_all_1.gstreamer gst_all_1.gst-plugins-base glib qt4 ];
|
|
||||||
propagatedBuildInputs = [ boost ];
|
|
||||||
nativeBuildInputs = [ cmake automoc4 flex bison pkgconfig ];
|
|
||||||
|
|
||||||
cmakeFlags = "-DUSE_QT_PLUGIN_DIR=OFF -DUSE_GST_PLUGIN_DIR=OFF";
|
|
||||||
|
|
||||||
meta = with stdenv.lib; {
|
|
||||||
platforms = platforms.linux;
|
|
||||||
license = licenses.lgpl21;
|
|
||||||
};
|
|
||||||
}
|
|
@ -291,8 +291,6 @@ mapAliases ({
|
|||||||
pyo3-pack = maturin;
|
pyo3-pack = maturin;
|
||||||
pulseaudioLight = pulseaudio; # added 2018-04-25
|
pulseaudioLight = pulseaudio; # added 2018-04-25
|
||||||
qca-qt5 = libsForQt5.qca-qt5; # added 2015-12-19
|
qca-qt5 = libsForQt5.qca-qt5; # added 2015-12-19
|
||||||
qt_gstreamer = qt-gstreamer; # added 2017-02
|
|
||||||
qt_gstreamer1 = qt-gstreamer1; # added 2017-02
|
|
||||||
quake3game = ioquake3; # added 2016-01-14
|
quake3game = ioquake3; # added 2016-01-14
|
||||||
qwt6 = libsForQt5.qwt; # added 2015-12-19
|
qwt6 = libsForQt5.qwt; # added 2015-12-19
|
||||||
qtpfsgui = throw "Is now luminanceHDR"; # added 2019-06-26
|
qtpfsgui = throw "Is now luminanceHDR"; # added 2019-06-26
|
||||||
@ -426,7 +424,7 @@ mapAliases ({
|
|||||||
ocamlPackages_latest;
|
ocamlPackages_latest;
|
||||||
|
|
||||||
gst_all = { # added 2018-04-25
|
gst_all = { # added 2018-04-25
|
||||||
inherit (pkgs) gstreamer gnonlin gst-python qt-gstreamer;
|
inherit (pkgs) gstreamer gnonlin gst-python;
|
||||||
gstPluginsBase = pkgs.gst-plugins-base;
|
gstPluginsBase = pkgs.gst-plugins-base;
|
||||||
gstPluginsBad = pkgs.gst-plugins-bad;
|
gstPluginsBad = pkgs.gst-plugins-bad;
|
||||||
gstPluginsGood = pkgs.gst-plugins-good;
|
gstPluginsGood = pkgs.gst-plugins-good;
|
||||||
|
@ -11082,9 +11082,6 @@ in
|
|||||||
|
|
||||||
qt-mobility = callPackage ../development/libraries/qt-mobility {};
|
qt-mobility = callPackage ../development/libraries/qt-mobility {};
|
||||||
|
|
||||||
qt-gstreamer = callPackage ../development/libraries/gstreamer/legacy/qt-gstreamer {};
|
|
||||||
|
|
||||||
qt-gstreamer1 = callPackage ../development/libraries/gstreamer/qt-gstreamer { boost = boost155; };
|
|
||||||
|
|
||||||
qtstyleplugin-kvantum-qt4 = callPackage ../development/libraries/qtstyleplugin-kvantum-qt4 { };
|
qtstyleplugin-kvantum-qt4 = callPackage ../development/libraries/qtstyleplugin-kvantum-qt4 { };
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user