Merge commit '262b328b0bad0c4b97ed495679208e4a2eb87704'

4 files changed, 10 insertions, 104 deletions

diff --git a/nixpkgs/pkgs/development/libraries/gstreamer/legacy/qt-gstreamer/boost1.48.patch b/nixpkgs/pkgs/development/libraries/gstreamer/legacy/qt-gstreamer/boost1.48.patch
deleted file mode 100644
index c48eec68a640..000000000000
--- a/nixpkgs/pkgs/development/libraries/gstreamer/legacy/qt-gstreamer/boost1.48.patch
+++ /dev/null
@@ -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>
diff --git a/nixpkgs/pkgs/development/libraries/gstreamer/legacy/qt-gstreamer/default.nix b/nixpkgs/pkgs/development/libraries/gstreamer/legacy/qt-gstreamer/default.nix
deleted file mode 100644
index 9797f21c1685..000000000000
--- a/nixpkgs/pkgs/development/libraries/gstreamer/legacy/qt-gstreamer/default.nix
+++ /dev/null
@@ -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 ];
-}
diff --git a/nixpkgs/pkgs/development/libraries/gstreamer/qt-gstreamer/default.nix b/nixpkgs/pkgs/development/libraries/gstreamer/qt-gstreamer/default.nix
deleted file mode 100644
index a099643061a1..000000000000
--- a/nixpkgs/pkgs/development/libraries/gstreamer/qt-gstreamer/default.nix
+++ /dev/null
@@ -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;
-  };
-}
diff --git a/nixpkgs/pkgs/development/libraries/gstreamer/vaapi/default.nix b/nixpkgs/pkgs/development/libraries/gstreamer/vaapi/default.nix
index 7e64636d96d3..adb495689e33 100644
--- a/nixpkgs/pkgs/development/libraries/gstreamer/vaapi/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gstreamer/vaapi/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, meson, ninja, pkgconfig, gst-plugins-base, bzip2, libva, wayland
 , libdrm, udev, xorg, libGLU_combined, gstreamer, gst-plugins-bad, nasm
-, libvpx, python
+, libvpx, python, fetchpatch
 }:
 
 stdenv.mkDerivation rec {
@@ -12,6 +12,15 @@ stdenv.mkDerivation rec {
     sha256 = "07qpynamiz0lniqajcaijh3n7ixs4lfk9a5mfk50sng0dricwzsf";
   };
 
+  patches = [
+    # See: https://mail.gnome.org/archives/distributor-list/2019-September/msg00000.html
+    # Note that the patch has now been actually accepted upstream.
+    (fetchpatch {
+      url = "https://gitlab.freedesktop.org/gstreamer/gstreamer-vaapi/commit/a90daabb84f983d2fa05ff3159f7ad59aa648b55.patch";
+      sha256 = "0p2qygq6b5h6nxjdfnlzbsyih43hjq5c94ag8sbyyb8pmnids9rb";
+    })
+  ];
+
   outputs = [ "out" "dev" ];
 
   nativeBuildInputs = [ meson ninja pkgconfig bzip2 ];
@@ -28,8 +37,6 @@ stdenv.mkDerivation rec {
   '';
 
   mesonFlags = [
-    # Enables all features, so that we know when new dependencies are necessary.
-    "-Dauto_features=enabled"
     "-Dexamples=disabled" # requires many dependencies and probably not useful for our users
   ];