From db2977ad517b3e5be5dcf1f9c45bd516652b438f Mon Sep 17 00:00:00 2001
From: Bastian Köcher <git@kchr.de>
Date: Fri, 30 Mar 2018 21:08:33 +0200
Subject: gstreamer: 1.12.3 -> 1.14.0

---
 pkgs/development/libraries/gstreamer/core/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/development/libraries/gstreamer/core/default.nix b/pkgs/development/libraries/gstreamer/core/default.nix
index ee9438d3c29b..74791bb66599 100644
--- a/pkgs/development/libraries/gstreamer/core/default.nix
+++ b/pkgs/development/libraries/gstreamer/core/default.nix
@@ -4,7 +4,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "gstreamer-1.12.3";
+  name = "gstreamer-1.14.0";
 
   meta = {
     description = "Open source multimedia framework";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "${meta.homepage}/src/gstreamer/${name}.tar.xz";
-    sha256 = "0vi1g8rmmsnd630ds3jwv2iph46ll8y07fzf04mz15q88j9g926k";
+    sha256 = "0vj6k01lp2yva6rfd95fkyng9jdr62gkz0x8d2l81dyly1ki6dpw";
   };
 
   outputs = [ "out" "dev" ];
-- 
cgit 1.4.1


From 346ab3dc2942c9600a3a4a4b819c908e2089b9d8 Mon Sep 17 00:00:00 2001
From: Bastian Köcher <git@kchr.de>
Date: Fri, 30 Mar 2018 21:09:07 +0200
Subject: gst-plugins-base: 1.12.3 -> 1.14.0

---
 pkgs/development/libraries/gstreamer/base/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/development/libraries/gstreamer/base/default.nix b/pkgs/development/libraries/gstreamer/base/default.nix
index 2cd0c14c1f34..b5edd7cb93bc 100644
--- a/pkgs/development/libraries/gstreamer/base/default.nix
+++ b/pkgs/development/libraries/gstreamer/base/default.nix
@@ -4,7 +4,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "gst-plugins-base-1.12.3";
+  name = "gst-plugins-base-1.14.0";
 
   meta = {
     description = "Base plugins and helper libraries";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "${meta.homepage}/src/gst-plugins-base/${name}.tar.xz";
-    sha256 = "19ffwdch7m777ragmwpy6prqmfb742ym1n3ki40s0zyki627plyk";
+    sha256 = "0h39bcp7fcd9kgb189lxr8l0hm0almvzpzgpdh1jpq2nzxh4d43y";
   };
 
   outputs = [ "out" "dev" ];
-- 
cgit 1.4.1


From d18d0c2f304c9b28596b59f8211c379347d41a2d Mon Sep 17 00:00:00 2001
From: Bastian Köcher <git@kchr.de>
Date: Fri, 30 Mar 2018 21:09:57 +0200
Subject: gst-plugins-good: 1.12.3 -> 1.14.0

---
 pkgs/development/libraries/gstreamer/good/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix
index e4e4f3b394db..aba965d4c707 100644
--- a/pkgs/development/libraries/gstreamer/good/default.nix
+++ b/pkgs/development/libraries/gstreamer/good/default.nix
@@ -11,7 +11,7 @@ let
   inherit (stdenv.lib) optionals optionalString;
 in
 stdenv.mkDerivation rec {
-  name = "gst-plugins-good-1.12.3";
+  name = "gst-plugins-good-1.14.0";
 
   meta = with stdenv.lib; {
     description = "Gstreamer Good Plugins";
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "${meta.homepage}/src/gst-plugins-good/${name}.tar.xz";
-    sha256 = "00sznj1sl97fqpn6j8ngps04clvxp8h8yhw6lvszx4b855wz9rqk";
+    sha256 = "1226s30cf7pqg3fj8shd20l7sp93yw9sqplgxns3m3ajgms3byka";
   };
 
   outputs = [ "out" "dev" ];
-- 
cgit 1.4.1


From cd28a5e233fc701a4681e8d97f59131682c82cba Mon Sep 17 00:00:00 2001
From: Bastian Köcher <git@kchr.de>
Date: Fri, 30 Mar 2018 21:10:30 +0200
Subject: gst-plugins-bad: 1.12.3 -> 1.14.0

---
 pkgs/development/libraries/gstreamer/bad/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix
index d4cc2f43aaa6..aa2b55964b73 100644
--- a/pkgs/development/libraries/gstreamer/bad/default.nix
+++ b/pkgs/development/libraries/gstreamer/bad/default.nix
@@ -23,7 +23,7 @@ let
 
 in
 stdenv.mkDerivation rec {
-  name = "gst-plugins-bad-1.12.3";
+  name = "gst-plugins-bad-1.14.0";
 
   meta = with stdenv.lib; {
     description = "Gstreamer Bad Plugins";
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "${meta.homepage}/src/gst-plugins-bad/${name}.tar.xz";
-    sha256 = "1v5z3i5ha20gmbb3r9dwsaaspv5fm1jfzlzwlzqx1gjj31v5kl1n";
+    sha256 = "17sgzgx1c54k5rzz7ljyz3is0n7yj56k74vv05h8z1gjnsnjnppd";
   };
 
   outputs = [ "out" "dev" ];
-- 
cgit 1.4.1


From 1e71bcff93aebb4cf1d50aa8a65bea2028e9ae47 Mon Sep 17 00:00:00 2001
From: Bastian Köcher <git@kchr.de>
Date: Fri, 30 Mar 2018 21:10:57 +0200
Subject: gst-plugins-ugly: 1.12.3 -> 1.14.0

---
 pkgs/development/libraries/gstreamer/ugly/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/development/libraries/gstreamer/ugly/default.nix b/pkgs/development/libraries/gstreamer/ugly/default.nix
index cdaa88ce350f..811d5df6b39b 100644
--- a/pkgs/development/libraries/gstreamer/ugly/default.nix
+++ b/pkgs/development/libraries/gstreamer/ugly/default.nix
@@ -5,7 +5,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "gst-plugins-ugly-1.12.3";
+  name = "gst-plugins-ugly-1.14.0";
 
   meta = with stdenv.lib; {
     description = "Gstreamer Ugly Plugins";
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "${meta.homepage}/src/gst-plugins-ugly/${name}.tar.xz";
-    sha256 = "0lh00rg26iy5lr5al23lxsyncjqkgzph1bzkrgp8x9sfr62ab378";
+    sha256 = "1la2nny9hfw3rf3wvqggkg8ivn52qrqqs4n4mqz4ppm2r1gymf9z";
   };
 
   outputs = [ "out" "dev" ];
-- 
cgit 1.4.1


From 222883a62f4ab01fcffdc5ebd40ec2f69a1bc857 Mon Sep 17 00:00:00 2001
From: Bastian Köcher <git@kchr.de>
Date: Fri, 30 Mar 2018 21:12:06 +0200
Subject: gst-editing-services: 1.12.3 -> 1.14.0

---
 pkgs/development/libraries/gstreamer/ges/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/development/libraries/gstreamer/ges/default.nix b/pkgs/development/libraries/gstreamer/ges/default.nix
index c38ab12ec964..a92eaa33e6da 100644
--- a/pkgs/development/libraries/gstreamer/ges/default.nix
+++ b/pkgs/development/libraries/gstreamer/ges/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "gstreamer-editing-services-1.12.3";
+  name = "gstreamer-editing-services-1.14.0";
 
   meta = with stdenv.lib; {
     description = "Library for creation of audio/video non-linear editors";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "${meta.homepage}/src/gstreamer-editing-services/${name}.tar.xz";
-    sha256 = "0xjz8r0wbzc0kwi9q8akv7w71ii1n2y2dmb0q2p5k4h78382ybh3";
+    sha256 = "14cdd6y9p4k603hsnyhdjw2igg855gwpx0362jmg8k1gagmr0pwd";
   };
 
   outputs = [ "out" "dev" ];
-- 
cgit 1.4.1


From 78b59ff8e8e049b1095ad1cb802a830eb3c480c5 Mon Sep 17 00:00:00 2001
From: Bastian Köcher <git@kchr.de>
Date: Fri, 30 Mar 2018 21:13:24 +0200
Subject: gst-libav: 1.12.3 -> 1.14.0

---
 pkgs/development/libraries/gstreamer/libav/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/development/libraries/gstreamer/libav/default.nix b/pkgs/development/libraries/gstreamer/libav/default.nix
index 9969c5e604ff..489315a257b6 100644
--- a/pkgs/development/libraries/gstreamer/libav/default.nix
+++ b/pkgs/development/libraries/gstreamer/libav/default.nix
@@ -9,7 +9,7 @@
 assert withSystemLibav -> libav != null;
 
 stdenv.mkDerivation rec {
-  name = "gst-libav-1.12.3";
+  name = "gst-libav-1.14.0";
 
   meta = {
     homepage = https://gstreamer.freedesktop.org;
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "${meta.homepage}/src/gst-libav/${name}.tar.xz";
-    sha256 = "0l4nc6ikdx49l7bdrk3bd9p3pzry8a328r22zg48gyzpnv5ghph1";
+    sha256 = "12gglx6rarnxbaj0h1wivlgkv467n1bz2bwjigplciq57r6ln4zv";
   };
 
   outputs = [ "out" "dev" ];
-- 
cgit 1.4.1


From bdefa9ab7b6d983eb352e9652e7f5cb3f19dca75 Mon Sep 17 00:00:00 2001
From: Bastian Köcher <git@kchr.de>
Date: Fri, 30 Mar 2018 21:13:54 +0200
Subject: gst-vaapi: 1.12.4 -> 1.14.0

---
 pkgs/development/libraries/gstreamer/vaapi/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/development/libraries/gstreamer/vaapi/default.nix b/pkgs/development/libraries/gstreamer/vaapi/default.nix
index 8351cfd65b1e..628273982ba2 100644
--- a/pkgs/development/libraries/gstreamer/vaapi/default.nix
+++ b/pkgs/development/libraries/gstreamer/vaapi/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   name = "gst-vaapi-${version}";
-  version = "1.12.4";
+  version = "1.14.0";
 
   src = fetchurl {
     url = "${meta.homepage}/src/gstreamer-vaapi/gstreamer-vaapi-${version}.tar.xz";
-    sha256 = "1jg9nvc8000yi2bcl3wn2yh2hwl7yvlwldj6778w8c0z5qj7fb8w";
+    sha256 = "1whxk428badv8ibji00sn6hj17cp8l9n93rr948bz2gjbq41zqz4";
   };
 
   outputs = [ "out" "dev" ];
-- 
cgit 1.4.1


From 06f9b94a7c92119f4e59ed9ef0b9a6818c1e58c3 Mon Sep 17 00:00:00 2001
From: Bastian Köcher <git@kchr.de>
Date: Fri, 30 Mar 2018 21:15:11 +0200
Subject: gst-validate: 1.12.3 -> 1.14.0

---
 pkgs/development/libraries/gstreamer/validate/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/development/libraries/gstreamer/validate/default.nix b/pkgs/development/libraries/gstreamer/validate/default.nix
index 1cb5e4f968ef..bd33d9c52807 100644
--- a/pkgs/development/libraries/gstreamer/validate/default.nix
+++ b/pkgs/development/libraries/gstreamer/validate/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "gst-validate-1.12.3";
+  name = "gst-validate-1.14.0";
 
   meta = {
     description = "Integration testing infrastructure for the GStreamer framework";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "${meta.homepage}/src/gst-validate/${name}.tar.xz";
-    sha256 = "17j812pkzgbyn9ys3b305yl5mrf9nbm8whwj4iqdskr742fr8fai";
+    sha256 = "1pzzxqkv1spjrzpzpazdm2h4s2wk7gg5gag8nxj5v2gjfyzhiprk";
   };
 
   outputs = [ "out" "dev" ];
-- 
cgit 1.4.1


From 1884beb21e9ba8fdb99efd44094f30b25fa1670f Mon Sep 17 00:00:00 2001
From: Bastian Köcher <git@kchr.de>
Date: Fri, 30 Mar 2018 21:24:03 +0200
Subject: gst-rtsp-server: 1.12.3 -> 1.14.0

---
 pkgs/development/libraries/gstreamer/rtsp-server/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/development/libraries/gstreamer/rtsp-server/default.nix b/pkgs/development/libraries/gstreamer/rtsp-server/default.nix
index 813135f270d3..248c5da5297d 100644
--- a/pkgs/development/libraries/gstreamer/rtsp-server/default.nix
+++ b/pkgs/development/libraries/gstreamer/rtsp-server/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pkgconfig, gst-plugins-base }:
 
 stdenv.mkDerivation rec {
-  name = "gst-rtsp-server-1.12.3";
+  name = "gst-rtsp-server-1.14.0";
 
   meta = with stdenv.lib; {
     description = "Gstreamer RTSP server";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "${meta.homepage}/src/gst-rtsp-server/${name}.tar.xz";
-    sha256 = "1v3lghx75l05hssgwxdxsgrxpn10gxlgkfb6vq0rl0hnpdqmj9b7";
+    sha256 = "0mlp9ms5hfbyzyvmc9xgi7934g4zrh1sbgky2p9zc5fqprvs0rbb";
   };
 
   outputs = [ "out" "dev" ];
-- 
cgit 1.4.1


From 365640a6f36823d79361d6bb28bb1d522bea6446 Mon Sep 17 00:00:00 2001
From: Bastian Köcher <git@kchr.de>
Date: Sat, 31 Mar 2018 13:39:20 +0200
Subject: gstreamer: Switch to meson build system

---
 .../libraries/gstreamer/core/default.nix           | 29 ++++++++++++++--------
 .../gstreamer/core/fix_pkgconfig_includedir.patch  | 15 +++++++++++
 2 files changed, 33 insertions(+), 11 deletions(-)
 create mode 100644 pkgs/development/libraries/gstreamer/core/fix_pkgconfig_includedir.patch

(limited to 'pkgs')

diff --git a/pkgs/development/libraries/gstreamer/core/default.nix b/pkgs/development/libraries/gstreamer/core/default.nix
index 74791bb66599..ab3f78767a1c 100644
--- a/pkgs/development/libraries/gstreamer/core/default.nix
+++ b/pkgs/development/libraries/gstreamer/core/default.nix
@@ -1,6 +1,7 @@
-{ stdenv, fetchurl, pkgconfig, perl, bison, flex, python, gobjectIntrospection
-, glib, makeWrapper
-, darwin
+{ stdenv, fetchurl, fetchpatch, meson, ninja
+, pkgconfig, gettext, gobjectIntrospection
+, bison, flex, python3, glib, makeWrapper
+, libcap,libunwind, darwin
 }:
 
 stdenv.mkDerivation rec {
@@ -19,28 +20,34 @@ stdenv.mkDerivation rec {
     sha256 = "0vj6k01lp2yva6rfd95fkyng9jdr62gkz0x8d2l81dyly1ki6dpw";
   };
 
+  patches = [ 
+    (fetchpatch {
+        url = "https://bug794856.bugzilla-attachments.gnome.org/attachment.cgi?id=370411";
+        sha256 = "16plzzmkk906k4892zq68j3c9z8vdma5nxzlviq20jfv04ykhmk2";
+    })
+    ./fix_pkgconfig_includedir.patch
+  ];
+
   outputs = [ "out" "dev" ];
   outputBin = "dev";
 
   nativeBuildInputs = [
-    pkgconfig perl bison flex python gobjectIntrospection makeWrapper
+    meson ninja pkgconfig gettext bison flex python3 makeWrapper gobjectIntrospection
   ];
-  buildInputs = stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.CoreServices;
+  buildInputs = [ libcap libunwind ] ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.CoreServices;
 
   propagatedBuildInputs = [ glib ];
 
-  enableParallelBuilding = true;
-
-  preConfigure = ''
-    configureFlagsArray+=("--exec-prefix=$dev")
-  '';
-
   postInstall = ''
     for prog in "$dev/bin/"*; do
         wrapProgram "$prog" --suffix GST_PLUGIN_SYSTEM_PATH : "\$(unset _tmp; for profile in \$NIX_PROFILES; do _tmp="\$profile/lib/gstreamer-1.0''$\{_tmp:+:\}\$_tmp"; done; printf "\$_tmp")"
     done
   '';
 
+  preConfigure= ''
+    patchShebangs .
+  '';
+
   preFixup = ''
     moveToOutput "share/bash-completion" "$dev"
   '';
diff --git a/pkgs/development/libraries/gstreamer/core/fix_pkgconfig_includedir.patch b/pkgs/development/libraries/gstreamer/core/fix_pkgconfig_includedir.patch
new file mode 100644
index 000000000000..ae0dbfa36ffc
--- /dev/null
+++ b/pkgs/development/libraries/gstreamer/core/fix_pkgconfig_includedir.patch
@@ -0,0 +1,15 @@
+diff --git a/pkgconfig/meson.build b/pkgconfig/meson.build
+index edb0586c2..0325cdf4a 100644
+--- a/pkgconfig/meson.build
++++ b/pkgconfig/meson.build
+@@ -2,8 +2,8 @@ pkgconf = configuration_data()
+ 
+ pkgconf.set('prefix', join_paths(get_option('prefix')))
+ pkgconf.set('exec_prefix', '${prefix}')
+-pkgconf.set('libdir', '${prefix}/@0@'.format(get_option('libdir')))
+-pkgconf.set('includedir', '${prefix}/@0@'.format(get_option('includedir')))
++pkgconf.set('libdir', get_option('libdir'))
++pkgconf.set('includedir', get_option('includedir'))
+ pkgconf.set('GST_API_VERSION', apiversion)
+ pkgconf.set('VERSION', gst_version)
+ pkgconf.set('LIBM', mathlib.found() ? '-lm' : '')
-- 
cgit 1.4.1


From edd17a0cabefd208360e26e54d31b47f3340fe63 Mon Sep 17 00:00:00 2001
From: Bastian Köcher <git@kchr.de>
Date: Sat, 31 Mar 2018 15:16:56 +0200
Subject: gst-plugins-base: Switch to meson build system

---
 .../libraries/gstreamer/base/default.nix           | 28 ++++++++++++----------
 .../gstreamer/base/fix_pkgconfig_includedir.patch  | 15 ++++++++++++
 2 files changed, 31 insertions(+), 12 deletions(-)
 create mode 100644 pkgs/development/libraries/gstreamer/base/fix_pkgconfig_includedir.patch

(limited to 'pkgs')

diff --git a/pkgs/development/libraries/gstreamer/base/default.nix b/pkgs/development/libraries/gstreamer/base/default.nix
index b5edd7cb93bc..e2a8c36bf026 100644
--- a/pkgs/development/libraries/gstreamer/base/default.nix
+++ b/pkgs/development/libraries/gstreamer/base/default.nix
@@ -1,6 +1,7 @@
-{ stdenv, fetchurl, pkgconfig, python, gstreamer, gobjectIntrospection
-, orc, alsaLib, libXv, pango, libtheora
-, cdparanoia, libvisual, libintlOrEmpty
+{ stdenv, fetchurl, fetchpatch, pkgconfig, meson
+, ninja, gettext, gobjectIntrospection, python
+, gstreamer, orc, alsaLib, libXv, pango, libtheora
+, wayland, cdparanoia, libvisual, libintlOrEmpty
 }:
 
 stdenv.mkDerivation rec {
@@ -21,11 +22,11 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "dev" ];
 
   nativeBuildInputs = [
-    pkgconfig python gobjectIntrospection
+    pkgconfig python meson ninja gettext gobjectIntrospection
   ];
 
   buildInputs = [
-    orc libXv pango libtheora cdparanoia
+    orc libXv pango libtheora cdparanoia wayland
   ]
   ++ libintlOrEmpty
   ++ stdenv.lib.optional stdenv.isLinux alsaLib
@@ -33,14 +34,17 @@ stdenv.mkDerivation rec {
 
   propagatedBuildInputs = [ gstreamer ];
 
-  configureFlags = if stdenv.isDarwin then [
-    # Does not currently build on Darwin
-    "--disable-libvisual"
-    # Undefined symbols _cdda_identify and _cdda_identify_scsi in cdparanoia
-    "--disable-cdparanoia"
-  ] else null;
+  preConfigure = ''
+    patchShebangs .
+  '';
 
   NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null;
 
-  enableParallelBuilding = true;
+  patches = [
+    (fetchpatch {
+        url = "https://bug794856.bugzilla-attachments.gnome.org/attachment.cgi?id=370414";
+        sha256 = "07x43xis0sr0hfchf36ap0cibx0lkfpqyszb3r3w9dzz301fk04z";
+    })
+    ./fix_pkgconfig_includedir.patch
+  ];
 }
diff --git a/pkgs/development/libraries/gstreamer/base/fix_pkgconfig_includedir.patch b/pkgs/development/libraries/gstreamer/base/fix_pkgconfig_includedir.patch
new file mode 100644
index 000000000000..987cf0d87395
--- /dev/null
+++ b/pkgs/development/libraries/gstreamer/base/fix_pkgconfig_includedir.patch
@@ -0,0 +1,15 @@
+diff --git a/pkgconfig/meson.build b/pkgconfig/meson.build
+index 04abfbee5..74e3f290d 100644
+--- a/pkgconfig/meson.build
++++ b/pkgconfig/meson.build
+@@ -2,8 +2,8 @@ pkgconf = configuration_data()
+ 
+ pkgconf.set('prefix', get_option('prefix'))
+ pkgconf.set('exec_prefix', '${prefix}')
+-pkgconf.set('libdir', '${prefix}/@0@'.format(get_option('libdir')))
+-pkgconf.set('includedir', '${prefix}/@0@'.format(get_option('includedir')))
++pkgconf.set('libdir', get_option('libdir'))
++pkgconf.set('includedir', get_option('includedir'))
+ pkgconf.set('GST_API_VERSION', api_version)
+ pkgconf.set('VERSION', gst_version)
+ pkgconf.set('LIBM', libm.found() ? '-lm' : '')
-- 
cgit 1.4.1


From fd0474e6f86a578ceb9709fc2fe2a5745602b38a Mon Sep 17 00:00:00 2001
From: Bastian Köcher <git@kchr.de>
Date: Sat, 31 Mar 2018 22:37:29 +0200
Subject: gst-plugins-good: Switch to meson build system

---
 pkgs/development/libraries/gstreamer/good/default.nix     | 13 +++++--------
 .../gstreamer/good/fix_pkgconfig_includedir.patch         | 15 +++++++++++++++
 2 files changed, 20 insertions(+), 8 deletions(-)
 create mode 100644 pkgs/development/libraries/gstreamer/good/fix_pkgconfig_includedir.patch

(limited to 'pkgs')

diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix
index aba965d4c707..7f4e4d7dd095 100644
--- a/pkgs/development/libraries/gstreamer/good/default.nix
+++ b/pkgs/development/libraries/gstreamer/good/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, pkgconfig, python
-, gst-plugins-base, orc, bzip2
+{ stdenv, fetchurl, meson, ninja, pkgconfig, python
+, gst-plugins-base, orc, bzip2, gettext
 , libv4l, libdv, libavc1394, libiec61883
 , libvpx, speex, flac, taglib, libshout
 , cairo, gdk_pixbuf, aalib, libcaca
@@ -32,7 +32,9 @@ stdenv.mkDerivation rec {
 
   outputs = [ "out" "dev" ];
 
-  nativeBuildInputs = [ pkgconfig python ];
+  patches = [ ./fix_pkgconfig_includedir.patch ];
+
+  nativeBuildInputs = [ pkgconfig python meson ninja gettext ];
 
   buildInputs = [
     gst-plugins-base orc bzip2
@@ -44,10 +46,5 @@ stdenv.mkDerivation rec {
   ++ optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ]
   ++ optionals stdenv.isLinux [ libv4l libpulseaudio libavc1394 libiec61883 ];
 
-  preFixup = ''
-    mkdir -p "$dev/lib/gstreamer-1.0"
-    mv "$out/lib/gstreamer-1.0/"*.la "$dev/lib/gstreamer-1.0"
-  '';
-
   LDFLAGS = optionalString stdenv.isDarwin "-lintl";
 }
diff --git a/pkgs/development/libraries/gstreamer/good/fix_pkgconfig_includedir.patch b/pkgs/development/libraries/gstreamer/good/fix_pkgconfig_includedir.patch
new file mode 100644
index 000000000000..b506a0eda399
--- /dev/null
+++ b/pkgs/development/libraries/gstreamer/good/fix_pkgconfig_includedir.patch
@@ -0,0 +1,15 @@
+diff --git a/pkgconfig/meson.build b/pkgconfig/meson.build
+index b3bf0d4d4..fb4386cfc 100644
+--- a/pkgconfig/meson.build
++++ b/pkgconfig/meson.build
+@@ -2,8 +2,8 @@ pkgconf = configuration_data()
+ 
+ pkgconf.set('prefix', get_option('prefix'))
+ pkgconf.set('exec_prefix', '${prefix}')
+-pkgconf.set('libdir', '${prefix}/@0@'.format(get_option('libdir')))
+-pkgconf.set('includedir', '${prefix}/@0@'.format(get_option('includedir')))
++pkgconf.set('libdir', get_option('libdir'))
++pkgconf.set('includedir', get_option('includedir'))
+ pkgconf.set('GST_API_VERSION', api_version)
+ pkgconf.set('VERSION', gst_version)
+ 
-- 
cgit 1.4.1


From ac0d32b866d2df450140cdd80885d4033499ca1f Mon Sep 17 00:00:00 2001
From: Bastian Köcher <git@kchr.de>
Date: Sat, 31 Mar 2018 23:03:18 +0200
Subject: gst-plugins-bad: Switch to meson build system

---
 .../libraries/gstreamer/bad/default.nix            | 23 ++++++++++++----------
 .../gstreamer/bad/fix_pkgconfig_includedir.patch   | 15 ++++++++++++++
 2 files changed, 28 insertions(+), 10 deletions(-)
 create mode 100644 pkgs/development/libraries/gstreamer/bad/fix_pkgconfig_includedir.patch

(limited to 'pkgs')

diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix
index aa2b55964b73..c1d28e58c4e6 100644
--- a/pkgs/development/libraries/gstreamer/bad/default.nix
+++ b/pkgs/development/libraries/gstreamer/bad/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchurl, pkgconfig, python, gst-plugins-base, orc
+{ stdenv, fetchurl, fetchpatch, meson, ninja, gettext
+, pkgconfig, python, gst-plugins-base, orc
 , faacSupport ? false, faac ? null
 , gtkSupport ? false, gtk3 ? null
 , faad2, libass, libkate, libmms
@@ -38,14 +39,18 @@ stdenv.mkDerivation rec {
     platforms   = platforms.linux ++ platforms.darwin;
   };
 
-  # TODO: Fix Cocoa build. The problem was ARC, which might be related to too
-  #       old version of Apple SDK's.
-  configureFlags = optional stdenv.isDarwin "--disable-cocoa";
-
-  patchPhase = ''
-    sed -i 's/openjpeg-2.2/openjpeg-${openJpegVersion}/' ext/openjpeg/*
+  preConfigure = ''
+    patchShebangs .
   '';
 
+  patches = [
+    (fetchpatch {
+        url = "https://bug794856.bugzilla-attachments.gnome.org/attachment.cgi?id=370409";
+        sha256 = "0hy0rcn35alq65yqwri4fqjz2hf3nyyg5c7rnndk51msmqjxpprk";
+    })
+    ./fix_pkgconfig_includedir.patch
+  ];
+
   src = fetchurl {
     url = "${meta.homepage}/src/gst-plugins-bad/${name}.tar.xz";
     sha256 = "17sgzgx1c54k5rzz7ljyz3is0n7yj56k74vv05h8z1gjnsnjnppd";
@@ -53,7 +58,7 @@ stdenv.mkDerivation rec {
 
   outputs = [ "out" "dev" ];
 
-  nativeBuildInputs = [ pkgconfig python ];
+  nativeBuildInputs = [ meson ninja pkgconfig python gettext ];
 
   buildInputs = [
     gst-plugins-base orc
@@ -76,6 +81,4 @@ stdenv.mkDerivation rec {
     ++ optional (!stdenv.isDarwin) mjpegtools;
 
   LDFLAGS = optionalString stdenv.isDarwin "-lintl";
-
-  enableParallelBuilding = true;
 }
diff --git a/pkgs/development/libraries/gstreamer/bad/fix_pkgconfig_includedir.patch b/pkgs/development/libraries/gstreamer/bad/fix_pkgconfig_includedir.patch
new file mode 100644
index 000000000000..b3deb05aebd9
--- /dev/null
+++ b/pkgs/development/libraries/gstreamer/bad/fix_pkgconfig_includedir.patch
@@ -0,0 +1,15 @@
+diff --git a/pkgconfig/meson.build b/pkgconfig/meson.build
+index 271f327f3..ddc52cca8 100644
+--- a/pkgconfig/meson.build
++++ b/pkgconfig/meson.build
+@@ -2,8 +2,8 @@ pkgconf = configuration_data()
+ 
+ pkgconf.set('prefix', join_paths(get_option('prefix')))
+ pkgconf.set('exec_prefix', '${prefix}')
+-pkgconf.set('libdir', '${prefix}/@0@'.format(get_option('libdir')))
+-pkgconf.set('includedir', '${prefix}/@0@'.format(get_option('includedir')))
++pkgconf.set('libdir', get_option('libdir'))
++pkgconf.set('includedir', get_option('includedir'))
+ pkgconf.set('GST_API_VERSION', api_version)
+ pkgconf.set('VERSION', gst_version)
+ 
-- 
cgit 1.4.1


From a19a9b2b141bbc06688a45d5aa34838aa265d010 Mon Sep 17 00:00:00 2001
From: Bastian Köcher <git@kchr.de>
Date: Sat, 31 Mar 2018 23:07:04 +0200
Subject: gst-plugins-ugly: Switch to meson build system

---
 pkgs/development/libraries/gstreamer/ugly/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/development/libraries/gstreamer/ugly/default.nix b/pkgs/development/libraries/gstreamer/ugly/default.nix
index 811d5df6b39b..d49697bd5db7 100644
--- a/pkgs/development/libraries/gstreamer/ugly/default.nix
+++ b/pkgs/development/libraries/gstreamer/ugly/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, pkgconfig, python
-, gst-plugins-base, orc
+{ stdenv, fetchurl, meson, ninja, pkgconfig, python
+, gst-plugins-base, orc, gettext
 , a52dec, libcdio, libdvdread
 , lame, libmad, libmpeg2, x264, libintlOrEmpty, mpg123
 }:
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
 
   outputs = [ "out" "dev" ];
 
-  nativeBuildInputs = [ pkgconfig python ];
+  nativeBuildInputs = [ meson ninja gettext pkgconfig python ];
 
   buildInputs = [
     gst-plugins-base orc
-- 
cgit 1.4.1


From 42d3b5c846daf5cd0adf0fd2a2c6130a73e7849a Mon Sep 17 00:00:00 2001
From: Bastian Köcher <git@kchr.de>
Date: Sat, 31 Mar 2018 23:14:10 +0200
Subject: gst-rtsp-server: Switch to meson build system

---
 pkgs/development/libraries/gstreamer/rtsp-server/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/development/libraries/gstreamer/rtsp-server/default.nix b/pkgs/development/libraries/gstreamer/rtsp-server/default.nix
index 248c5da5297d..9ff799b0a27b 100644
--- a/pkgs/development/libraries/gstreamer/rtsp-server/default.nix
+++ b/pkgs/development/libraries/gstreamer/rtsp-server/default.nix
@@ -1,4 +1,6 @@
-{ stdenv, fetchurl, pkgconfig, gst-plugins-base }:
+{ stdenv, fetchurl, meson, ninja, pkgconfig
+, gst-plugins-base, gettext, gobjectIntrospection
+}:
 
 stdenv.mkDerivation rec {
   name = "gst-rtsp-server-1.14.0";
@@ -21,7 +23,7 @@ stdenv.mkDerivation rec {
 
   outputs = [ "out" "dev" ];
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ meson ninja gettext gobjectIntrospection pkgconfig ];
 
   buildInputs = [ gst-plugins-base ];
 }
-- 
cgit 1.4.1


From 2a80d83f59eeabe0140fca973e461bba7a02e48a Mon Sep 17 00:00:00 2001
From: Bastian Köcher <git@kchr.de>
Date: Sat, 31 Mar 2018 23:17:11 +0200
Subject: gst-libav: Switch to meson build system

---
 pkgs/development/libraries/gstreamer/libav/default.nix | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/development/libraries/gstreamer/libav/default.nix b/pkgs/development/libraries/gstreamer/libav/default.nix
index 489315a257b6..564b37fab794 100644
--- a/pkgs/development/libraries/gstreamer/libav/default.nix
+++ b/pkgs/development/libraries/gstreamer/libav/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, pkgconfig, python, yasm
-, gst-plugins-base, orc, bzip2
-, withSystemLibav ? true, libav ? null
+{ stdenv, fetchurl, meson, ninja, pkgconfig
+, python, yasm, gst-plugins-base, orc, bzip2
+, gettext, withSystemLibav ? true, libav ? null
 }:
 
 # Note that since gst-libav-1.6, libav is actually ffmpeg. See
@@ -24,11 +24,8 @@ stdenv.mkDerivation rec {
 
   outputs = [ "out" "dev" ];
 
-  configureFlags = stdenv.lib.optionalString withSystemLibav
-    "--with-system-libav";
-
   nativeBuildInputs = with stdenv.lib;
-    [ pkgconfig python ]
+    [ meson ninja gettext pkgconfig python ]
     ++ optional (!withSystemLibav) yasm
     ;
 
-- 
cgit 1.4.1


From 69fb4ddb6e08b969b4cae1a471975c5a4e049fef Mon Sep 17 00:00:00 2001
From: Bastian Köcher <git@kchr.de>
Date: Sat, 31 Mar 2018 23:20:34 +0200
Subject: gst-vaapi: Switch to meson build system

---
 pkgs/development/libraries/gstreamer/vaapi/default.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/development/libraries/gstreamer/vaapi/default.nix b/pkgs/development/libraries/gstreamer/vaapi/default.nix
index 628273982ba2..11b451e76fdf 100644
--- a/pkgs/development/libraries/gstreamer/vaapi/default.nix
+++ b/pkgs/development/libraries/gstreamer/vaapi/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, gst-plugins-base, bzip2, libva, wayland
+{ stdenv, fetchurl, meson, ninja, pkgconfig, gst-plugins-base, bzip2, libva, wayland
 , libdrm, udev, xorg, libGLU_combined, yasm, gstreamer, gst-plugins-bad, nasm
 , libvpx, python
 }:
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   outputs = [ "out" "dev" ];
 
-  nativeBuildInputs = [ pkgconfig bzip2 ];
+  nativeBuildInputs = [ meson ninja pkgconfig bzip2 ];
 
   buildInputs = [
     gstreamer gst-plugins-base gst-plugins-bad libva wayland libdrm udev
@@ -22,11 +22,10 @@ stdenv.mkDerivation rec {
     xorg.libICE libGLU_combined nasm libvpx python
   ];
 
-  preConfigure = "
+  preConfigure = ''
     export GST_PLUGIN_PATH_1_0=$out/lib/gstreamer-1.0
     mkdir -p $GST_PLUGIN_PATH_1_0
-    ";
-  configureFlags = "--disable-builtin-libvpx --with-gstreamer-api=1.0";
+  '';
 
   meta = {
     homepage = https://gstreamer.freedesktop.org;
-- 
cgit 1.4.1


From fd5c1f665e814acecaf1f2a93af6cf82c336aad3 Mon Sep 17 00:00:00 2001
From: Bastian Köcher <git@kchr.de>
Date: Sun, 1 Apr 2018 00:17:58 +0200
Subject: gst-editing-services: Switch to meson build system

---
 pkgs/development/libraries/gstreamer/default.nix        |  4 +---
 pkgs/development/libraries/gstreamer/ges/default.nix    | 17 +++++++++++++----
 .../gstreamer/ges/fix_pkgconfig_includedir.patch        | 15 +++++++++++++++
 3 files changed, 29 insertions(+), 7 deletions(-)
 create mode 100644 pkgs/development/libraries/gstreamer/ges/fix_pkgconfig_includedir.patch

(limited to 'pkgs')

diff --git a/pkgs/development/libraries/gstreamer/default.nix b/pkgs/development/libraries/gstreamer/default.nix
index fe67bb1b797d..a62d0e1cdb16 100644
--- a/pkgs/development/libraries/gstreamer/default.nix
+++ b/pkgs/development/libraries/gstreamer/default.nix
@@ -19,9 +19,7 @@ rec {
 
   gnonlin = callPackage ./gnonlin { inherit gst-plugins-base; };
 
-  # TODO: gnonlin is deprecated in gst-editing-services, better switch to nle
-  # (Non Linear Engine).
-  gst-editing-services = callPackage ./ges { inherit gnonlin; };
+  gst-editing-services = callPackage ./ges { inherit gst-plugins-base; };
 
   gst-vaapi = callPackage ./vaapi {
     inherit gst-plugins-base gstreamer gst-plugins-bad;
diff --git a/pkgs/development/libraries/gstreamer/ges/default.nix b/pkgs/development/libraries/gstreamer/ges/default.nix
index a92eaa33e6da..895f298c8269 100644
--- a/pkgs/development/libraries/gstreamer/ges/default.nix
+++ b/pkgs/development/libraries/gstreamer/ges/default.nix
@@ -1,5 +1,6 @@
-{ stdenv, fetchurl, pkgconfig, python, gobjectIntrospection
-, gnonlin, libxml2, flex, perl
+{ stdenv, fetchurl, fetchpatch, meson, ninja
+, pkgconfig, python, gst-plugins-base, libxml2
+, flex, perl, gettext, gobjectIntrospection
 }:
 
 stdenv.mkDerivation rec {
@@ -19,7 +20,15 @@ stdenv.mkDerivation rec {
 
   outputs = [ "out" "dev" ];
 
-  nativeBuildInputs = [ pkgconfig python gobjectIntrospection flex perl ];
+  nativeBuildInputs = [ meson ninja pkgconfig gettext gobjectIntrospection python flex perl ];
 
-  propagatedBuildInputs = [ gnonlin libxml2 ];
+  propagatedBuildInputs = [ gst-plugins-base libxml2 ];
+
+  patches = [
+    (fetchpatch {
+        url = "https://bug794856.bugzilla-attachments.gnome.org/attachment.cgi?id=370413";
+        sha256 = "1xcgbs18g6n5p7z7kqj7ffakwmkxq7ijajyvhyl7p3zvqll9dc7x";
+    })
+    ./fix_pkgconfig_includedir.patch
+  ];
 }
diff --git a/pkgs/development/libraries/gstreamer/ges/fix_pkgconfig_includedir.patch b/pkgs/development/libraries/gstreamer/ges/fix_pkgconfig_includedir.patch
new file mode 100644
index 000000000000..6dff6aae39f4
--- /dev/null
+++ b/pkgs/development/libraries/gstreamer/ges/fix_pkgconfig_includedir.patch
@@ -0,0 +1,15 @@
+diff --git a/pkgconfig/meson.build b/pkgconfig/meson.build
+index a612b21b..e19cdfe7 100644
+--- a/pkgconfig/meson.build
++++ b/pkgconfig/meson.build
+@@ -2,8 +2,8 @@ pkgconf = configuration_data()
+ 
+ pkgconf.set('prefix', get_option('prefix'))
+ pkgconf.set('exec_prefix', '${prefix}')
+-pkgconf.set('libdir', '${prefix}/@0@'.format(get_option('libdir')))
+-pkgconf.set('includedir', '${prefix}/@0@'.format(get_option('includedir')))
++pkgconf.set('libdir', get_option('libdir'))
++pkgconf.set('includedir', get_option('includedir'))
+ pkgconf.set('GST_API_VERSION', apiversion)
+ pkgconf.set('VERSION', gst_version)
+ 
-- 
cgit 1.4.1


From 3508f3058dade0098984b7e909f44d32cb896a42 Mon Sep 17 00:00:00 2001
From: Bastian Köcher <git@kchr.de>
Date: Sun, 1 Apr 2018 16:58:44 +0200
Subject: gst-gnonlin: Remove package as it is deprecated

---
 pkgs/development/libraries/gstreamer/default.nix   |  2 --
 .../libraries/gstreamer/gnonlin/default.nix        | 30 ----------------------
 2 files changed, 32 deletions(-)
 delete mode 100644 pkgs/development/libraries/gstreamer/gnonlin/default.nix

(limited to 'pkgs')

diff --git a/pkgs/development/libraries/gstreamer/default.nix b/pkgs/development/libraries/gstreamer/default.nix
index a62d0e1cdb16..ce74b2f27ff1 100644
--- a/pkgs/development/libraries/gstreamer/default.nix
+++ b/pkgs/development/libraries/gstreamer/default.nix
@@ -17,8 +17,6 @@ rec {
 
   gst-libav = callPackage ./libav { inherit gst-plugins-base; };
 
-  gnonlin = callPackage ./gnonlin { inherit gst-plugins-base; };
-
   gst-editing-services = callPackage ./ges { inherit gst-plugins-base; };
 
   gst-vaapi = callPackage ./vaapi {
diff --git a/pkgs/development/libraries/gstreamer/gnonlin/default.nix b/pkgs/development/libraries/gstreamer/gnonlin/default.nix
deleted file mode 100644
index c04b64ae3c6a..000000000000
--- a/pkgs/development/libraries/gstreamer/gnonlin/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ stdenv, fetchurl, pkgconfig
-, gst-plugins-base
-}:
-
-stdenv.mkDerivation rec {
-  name = "gnonlin-1.4.0";
-
-  meta = with stdenv.lib; {
-    description = "Gstreamer Non-Linear Multimedia Editing Plugins";
-    homepage    = "https://gstreamer.freedesktop.org";
-    longDescription = ''
-      Gnonlin is a library built on top of GStreamer which provides 
-      support for writing non-linear audio and video editing
-      applications. It introduces the concept of a timeline.
-    '';
-    license     = licenses.lgpl2Plus;
-    platforms   = platforms.unix;
-  };
-
-  src = fetchurl {
-    url = "${meta.homepage}/src/gnonlin/${name}.tar.xz";
-    sha256 = "0zv60rq2h736a6fivd3a3wp59dj1jar7b2vwzykahvl168b7wrid";
-  };
-
-  outputs = [ "out" "dev" ];
-
-  nativeBuildInputs = [ pkgconfig ];
-
-  propagatedBuildInputs = [ gst-plugins-base ];
-}
-- 
cgit 1.4.1


From 40b4b87cc43cb5f34b8391b08a852cf6b837c127 Mon Sep 17 00:00:00 2001
From: Bastian Köcher <git@kchr.de>
Date: Mon, 2 Apr 2018 18:48:48 +0200
Subject: Switch to absolute path for includedir/libdir

---
 .../libraries/gstreamer/bad/fix_pkgconfig_includedir.patch          | 6 +++---
 .../libraries/gstreamer/base/fix_pkgconfig_includedir.patch         | 6 +++---
 .../libraries/gstreamer/core/fix_pkgconfig_includedir.patch         | 6 +++---
 .../libraries/gstreamer/ges/fix_pkgconfig_includedir.patch          | 6 +++---
 .../libraries/gstreamer/good/fix_pkgconfig_includedir.patch         | 6 +++---
 5 files changed, 15 insertions(+), 15 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/development/libraries/gstreamer/bad/fix_pkgconfig_includedir.patch b/pkgs/development/libraries/gstreamer/bad/fix_pkgconfig_includedir.patch
index b3deb05aebd9..c687fffc9c08 100644
--- a/pkgs/development/libraries/gstreamer/bad/fix_pkgconfig_includedir.patch
+++ b/pkgs/development/libraries/gstreamer/bad/fix_pkgconfig_includedir.patch
@@ -1,5 +1,5 @@
 diff --git a/pkgconfig/meson.build b/pkgconfig/meson.build
-index 271f327f3..ddc52cca8 100644
+index 271f327f3..7e2afa754 100644
 --- a/pkgconfig/meson.build
 +++ b/pkgconfig/meson.build
 @@ -2,8 +2,8 @@ pkgconf = configuration_data()
@@ -8,8 +8,8 @@ index 271f327f3..ddc52cca8 100644
  pkgconf.set('exec_prefix', '${prefix}')
 -pkgconf.set('libdir', '${prefix}/@0@'.format(get_option('libdir')))
 -pkgconf.set('includedir', '${prefix}/@0@'.format(get_option('includedir')))
-+pkgconf.set('libdir', get_option('libdir'))
-+pkgconf.set('includedir', get_option('includedir'))
++pkgconf.set('libdir', join_paths(get_option('prefix'), get_option('libdir')))
++pkgconf.set('includedir', join_paths(get_option('prefix'), get_option('includedir')))
  pkgconf.set('GST_API_VERSION', api_version)
  pkgconf.set('VERSION', gst_version)
  
diff --git a/pkgs/development/libraries/gstreamer/base/fix_pkgconfig_includedir.patch b/pkgs/development/libraries/gstreamer/base/fix_pkgconfig_includedir.patch
index 987cf0d87395..04486a4647f9 100644
--- a/pkgs/development/libraries/gstreamer/base/fix_pkgconfig_includedir.patch
+++ b/pkgs/development/libraries/gstreamer/base/fix_pkgconfig_includedir.patch
@@ -1,5 +1,5 @@
 diff --git a/pkgconfig/meson.build b/pkgconfig/meson.build
-index 04abfbee5..74e3f290d 100644
+index 04abfbee5..88c86b431 100644
 --- a/pkgconfig/meson.build
 +++ b/pkgconfig/meson.build
 @@ -2,8 +2,8 @@ pkgconf = configuration_data()
@@ -8,8 +8,8 @@ index 04abfbee5..74e3f290d 100644
  pkgconf.set('exec_prefix', '${prefix}')
 -pkgconf.set('libdir', '${prefix}/@0@'.format(get_option('libdir')))
 -pkgconf.set('includedir', '${prefix}/@0@'.format(get_option('includedir')))
-+pkgconf.set('libdir', get_option('libdir'))
-+pkgconf.set('includedir', get_option('includedir'))
++pkgconf.set('libdir', join_paths(get_option('prefix'), get_option('libdir')))
++pkgconf.set('includedir', join_paths(get_option('prefix'), get_option('includedir')))
  pkgconf.set('GST_API_VERSION', api_version)
  pkgconf.set('VERSION', gst_version)
  pkgconf.set('LIBM', libm.found() ? '-lm' : '')
diff --git a/pkgs/development/libraries/gstreamer/core/fix_pkgconfig_includedir.patch b/pkgs/development/libraries/gstreamer/core/fix_pkgconfig_includedir.patch
index ae0dbfa36ffc..c388a82fa2a8 100644
--- a/pkgs/development/libraries/gstreamer/core/fix_pkgconfig_includedir.patch
+++ b/pkgs/development/libraries/gstreamer/core/fix_pkgconfig_includedir.patch
@@ -1,5 +1,5 @@
 diff --git a/pkgconfig/meson.build b/pkgconfig/meson.build
-index edb0586c2..0325cdf4a 100644
+index edb0586c2..7ed46dfce 100644
 --- a/pkgconfig/meson.build
 +++ b/pkgconfig/meson.build
 @@ -2,8 +2,8 @@ pkgconf = configuration_data()
@@ -8,8 +8,8 @@ index edb0586c2..0325cdf4a 100644
  pkgconf.set('exec_prefix', '${prefix}')
 -pkgconf.set('libdir', '${prefix}/@0@'.format(get_option('libdir')))
 -pkgconf.set('includedir', '${prefix}/@0@'.format(get_option('includedir')))
-+pkgconf.set('libdir', get_option('libdir'))
-+pkgconf.set('includedir', get_option('includedir'))
++pkgconf.set('libdir', join_paths(get_option('prefix'), get_option('libdir')))
++pkgconf.set('includedir', join_paths(get_option('prefix'), get_option('includedir')))
  pkgconf.set('GST_API_VERSION', apiversion)
  pkgconf.set('VERSION', gst_version)
  pkgconf.set('LIBM', mathlib.found() ? '-lm' : '')
diff --git a/pkgs/development/libraries/gstreamer/ges/fix_pkgconfig_includedir.patch b/pkgs/development/libraries/gstreamer/ges/fix_pkgconfig_includedir.patch
index 6dff6aae39f4..1e12f3bbfbea 100644
--- a/pkgs/development/libraries/gstreamer/ges/fix_pkgconfig_includedir.patch
+++ b/pkgs/development/libraries/gstreamer/ges/fix_pkgconfig_includedir.patch
@@ -1,5 +1,5 @@
 diff --git a/pkgconfig/meson.build b/pkgconfig/meson.build
-index a612b21b..e19cdfe7 100644
+index a612b21b..c017eaff 100644
 --- a/pkgconfig/meson.build
 +++ b/pkgconfig/meson.build
 @@ -2,8 +2,8 @@ pkgconf = configuration_data()
@@ -8,8 +8,8 @@ index a612b21b..e19cdfe7 100644
  pkgconf.set('exec_prefix', '${prefix}')
 -pkgconf.set('libdir', '${prefix}/@0@'.format(get_option('libdir')))
 -pkgconf.set('includedir', '${prefix}/@0@'.format(get_option('includedir')))
-+pkgconf.set('libdir', get_option('libdir'))
-+pkgconf.set('includedir', get_option('includedir'))
++pkgconf.set('libdir', join_paths(get_option('prefix'), get_option('libdir')))
++pkgconf.set('includedir', join_paths(get_option('prefix'), get_option('includedir')))
  pkgconf.set('GST_API_VERSION', apiversion)
  pkgconf.set('VERSION', gst_version)
  
diff --git a/pkgs/development/libraries/gstreamer/good/fix_pkgconfig_includedir.patch b/pkgs/development/libraries/gstreamer/good/fix_pkgconfig_includedir.patch
index b506a0eda399..f68ad603a37c 100644
--- a/pkgs/development/libraries/gstreamer/good/fix_pkgconfig_includedir.patch
+++ b/pkgs/development/libraries/gstreamer/good/fix_pkgconfig_includedir.patch
@@ -1,5 +1,5 @@
 diff --git a/pkgconfig/meson.build b/pkgconfig/meson.build
-index b3bf0d4d4..fb4386cfc 100644
+index b3bf0d4d4..3e6e576c0 100644
 --- a/pkgconfig/meson.build
 +++ b/pkgconfig/meson.build
 @@ -2,8 +2,8 @@ pkgconf = configuration_data()
@@ -8,8 +8,8 @@ index b3bf0d4d4..fb4386cfc 100644
  pkgconf.set('exec_prefix', '${prefix}')
 -pkgconf.set('libdir', '${prefix}/@0@'.format(get_option('libdir')))
 -pkgconf.set('includedir', '${prefix}/@0@'.format(get_option('includedir')))
-+pkgconf.set('libdir', get_option('libdir'))
-+pkgconf.set('includedir', get_option('includedir'))
++pkgconf.set('libdir', join_paths(get_option('prefix'), get_option('libdir')))
++pkgconf.set('includedir', join_paths(get_option('prefix'), get_option('includedir')))
  pkgconf.set('GST_API_VERSION', api_version)
  pkgconf.set('VERSION', gst_version)
  
-- 
cgit 1.4.1


From be5bff02143628cafaa7af3cc7d28f04e32a35a0 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 3 Apr 2018 09:36:38 +0200
Subject: pythonPackages.gst-python: 1.12.3 → 1.14.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../development/python-modules/gst-python/default.nix | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/development/python-modules/gst-python/default.nix b/pkgs/development/python-modules/gst-python/default.nix
index 393d00a8176a..b1d19e9f5091 100644
--- a/pkgs/development/python-modules/gst-python/default.nix
+++ b/pkgs/development/python-modules/gst-python/default.nix
@@ -1,10 +1,10 @@
-{ fetchurl, stdenv, pkgconfig, python, pygobject3
+{ fetchurl, stdenv, meson, ninja, pkgconfig, python, pygobject3
 , gst-plugins-base, ncurses
 }:
 
 stdenv.mkDerivation rec {
   pname = "gst-python";
-  version = "1.12.3";
+  version = "1.14.0";
   name = "${pname}-${version}";
 
   src = fetchurl {
@@ -12,22 +12,25 @@ stdenv.mkDerivation rec {
       "${meta.homepage}/src/gst-python/${name}.tar.xz"
       "mirror://gentoo/distfiles/${name}.tar.xz"
       ];
-    sha256 = "19rb06x2m7103zwfm0plxx95gb8bp01ng04h4q9k6ii9q7g2kxf3";
+    sha256 = "1rlr6gl4lg97ng4jxh3gb2ldmywm15vwsa72nvggr8qa2l8q3fg0";
   };
 
-  patches = [ ./different-path-with-pygobject.patch ];
-
   outputs = [ "out" "dev" ];
 
-  nativeBuildInputs = [ pkgconfig python ];
+  nativeBuildInputs = [ meson ninja pkgconfig python ];
 
   # XXX: in the Libs.private field of python3.pc
   buildInputs = [ ncurses ];
 
-  configureFlags = [
-    "--with-pygi-overrides-dir=$(out)/${python.sitePackages}/gi/overrides"
+  mesonFlags = [
+    "-Dpygi-overrides-dir=${python.sitePackages}/gi/overrides"
   ];
 
+  postPatch = ''
+    chmod +x scripts/pythondetector # patchShebangs requires executable file
+    patchShebangs scripts/pythondetector
+  '';
+
   propagatedBuildInputs = [ gst-plugins-base pygobject3 ];
 
   # Needed for python.buildEnv
-- 
cgit 1.4.1


From 41a4fea5de83e3bcb59cbdb6d1576a0bbca0a33e Mon Sep 17 00:00:00 2001
From: Bastian Köcher <git@kchr.de>
Date: Tue, 3 Apr 2018 19:30:24 +0200
Subject: Move dependencies from ugly to good as the code moved

See: https://bugzilla.gnome.org/show_bug.cgi?id=774252
---
 pkgs/development/libraries/gstreamer/good/default.nix | 4 ++--
 pkgs/development/libraries/gstreamer/ugly/default.nix | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix
index 7f4e4d7dd095..3e589c34a348 100644
--- a/pkgs/development/libraries/gstreamer/good/default.nix
+++ b/pkgs/development/libraries/gstreamer/good/default.nix
@@ -4,7 +4,7 @@
 , libvpx, speex, flac, taglib, libshout
 , cairo, gdk_pixbuf, aalib, libcaca
 , libsoup, libpulseaudio, libintlOrEmpty
-, darwin
+, darwin, lame, mpg123
 }:
 
 let
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
     gst-plugins-base orc bzip2
     libdv libvpx speex flac taglib
     cairo gdk_pixbuf aalib libcaca
-    libsoup libshout
+    libsoup libshout lame mpg123
   ]
   ++ libintlOrEmpty
   ++ optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ]
diff --git a/pkgs/development/libraries/gstreamer/ugly/default.nix b/pkgs/development/libraries/gstreamer/ugly/default.nix
index d49697bd5db7..90e7eab860a3 100644
--- a/pkgs/development/libraries/gstreamer/ugly/default.nix
+++ b/pkgs/development/libraries/gstreamer/ugly/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, meson, ninja, pkgconfig, python
 , gst-plugins-base, orc, gettext
 , a52dec, libcdio, libdvdread
-, lame, libmad, libmpeg2, x264, libintlOrEmpty, mpg123
+, libmad, libmpeg2, x264, libintlOrEmpty
 }:
 
 stdenv.mkDerivation rec {
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     gst-plugins-base orc
     a52dec libcdio libdvdread
-    lame libmad libmpeg2 x264 mpg123
+    libmad libmpeg2 x264
   ] ++ libintlOrEmpty;
 
   NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null;
-- 
cgit 1.4.1


From 4a945a03fd8c0ea9302dd69ce6079d377d9397f2 Mon Sep 17 00:00:00 2001
From: Bastian Köcher <git@kchr.de>
Date: Wed, 4 Apr 2018 17:34:38 +0200
Subject: gst-plugins-good: Adds twolame dependency

---
 pkgs/development/libraries/gstreamer/good/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix
index 3e589c34a348..aa826456563a 100644
--- a/pkgs/development/libraries/gstreamer/good/default.nix
+++ b/pkgs/development/libraries/gstreamer/good/default.nix
@@ -4,7 +4,7 @@
 , libvpx, speex, flac, taglib, libshout
 , cairo, gdk_pixbuf, aalib, libcaca
 , libsoup, libpulseaudio, libintlOrEmpty
-, darwin, lame, mpg123
+, darwin, lame, mpg123, twolame
 }:
 
 let
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
     gst-plugins-base orc bzip2
     libdv libvpx speex flac taglib
     cairo gdk_pixbuf aalib libcaca
-    libsoup libshout lame mpg123
+    libsoup libshout lame mpg123 twolame
   ]
   ++ libintlOrEmpty
   ++ optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ]
-- 
cgit 1.4.1


From 9ad4ca13c32b36ed86836601be384695e23305e2 Mon Sep 17 00:00:00 2001
From: Bastian Köcher <git@kchr.de>
Date: Wed, 4 Apr 2018 17:43:36 +0200
Subject: Moves gtksupport from `gst-plugins-good` to `gst-plugins-bad`

---
 pkgs/development/libraries/gstreamer/bad/default.nix  | 6 +-----
 pkgs/development/libraries/gstreamer/good/default.nix | 7 ++++++-
 2 files changed, 7 insertions(+), 6 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix
index c1d28e58c4e6..c83f0b384371 100644
--- a/pkgs/development/libraries/gstreamer/bad/default.nix
+++ b/pkgs/development/libraries/gstreamer/bad/default.nix
@@ -1,7 +1,6 @@
 { stdenv, fetchurl, fetchpatch, meson, ninja, gettext
 , pkgconfig, python, gst-plugins-base, orc
 , faacSupport ? false, faac ? null
-, gtkSupport ? false, gtk3 ? null
 , faad2, libass, libkate, libmms
 , libmodplug, mpeg2dec, mpg123
 , openjpeg, libopus, librsvg
@@ -12,7 +11,6 @@
 }:
 
 assert faacSupport -> faac != null;
-assert gtkSupport -> gtk3 != null;
 
 let
   inherit (stdenv.lib) optional optionalString;
@@ -62,7 +60,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     gst-plugins-base orc
-    faad2 gtk3 libass libkate libmms
+    faad2 libass libkate libmms
     libmodplug mpeg2dec mpg123
     openjpeg libopus librsvg
     fluidsynth libvdpau
@@ -71,8 +69,6 @@ stdenv.mkDerivation rec {
   ]
     ++ libintlOrEmpty
     ++ optional faacSupport faac
-    # for gtksink
-    ++ optional gtkSupport gtk3
     ++ optional stdenv.isLinux wayland
     # wildmidi requires apple's OpenAL
     # TODO: package apple's OpenAL, fix wildmidi, include on Darwin
diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix
index aa826456563a..960c03b52e29 100644
--- a/pkgs/development/libraries/gstreamer/good/default.nix
+++ b/pkgs/development/libraries/gstreamer/good/default.nix
@@ -5,8 +5,11 @@
 , cairo, gdk_pixbuf, aalib, libcaca
 , libsoup, libpulseaudio, libintlOrEmpty
 , darwin, lame, mpg123, twolame
+, gtkSupport ? false, gtk3 ? null
 }:
 
+assert gtkSupport -> gtk3 != null;
+
 let
   inherit (stdenv.lib) optionals optionalString;
 in
@@ -44,7 +47,9 @@ stdenv.mkDerivation rec {
   ]
   ++ libintlOrEmpty
   ++ optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ]
-  ++ optionals stdenv.isLinux [ libv4l libpulseaudio libavc1394 libiec61883 ];
+  ++ optionals stdenv.isLinux [ libv4l libpulseaudio libavc1394 libiec61883 ]
+  # for gtksink
+  ++ optionals gtkSupport [ gtk3 ];
 
   LDFLAGS = optionalString stdenv.isDarwin "-lintl";
 }
-- 
cgit 1.4.1


From e7410733f1520fcd8de57ec68e8b8ffcccbfdcfe Mon Sep 17 00:00:00 2001
From: Bastian Köcher <git@kchr.de>
Date: Wed, 4 Apr 2018 17:44:23 +0200
Subject: gst-plugins-bad: Removes unused depdency

See: https://bugzilla.gnome.org/show_bug.cgi?id=719849
---
 pkgs/development/libraries/gstreamer/bad/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix
index c83f0b384371..8caca820a57c 100644
--- a/pkgs/development/libraries/gstreamer/bad/default.nix
+++ b/pkgs/development/libraries/gstreamer/bad/default.nix
@@ -2,7 +2,7 @@
 , pkgconfig, python, gst-plugins-base, orc
 , faacSupport ? false, faac ? null
 , faad2, libass, libkate, libmms
-, libmodplug, mpeg2dec, mpg123
+, libmodplug, mpeg2dec
 , openjpeg, libopus, librsvg
 , wildmidi, fluidsynth, libvdpau, wayland
 , libwebp, xvidcore, gnutls, mjpegtools
@@ -61,7 +61,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     gst-plugins-base orc
     faad2 libass libkate libmms
-    libmodplug mpeg2dec mpg123
+    libmodplug mpeg2dec
     openjpeg libopus librsvg
     fluidsynth libvdpau
     libwebp xvidcore gnutls libGLU_combined
-- 
cgit 1.4.1


From 853a086b6a5bcc522e65405bd799649239f2ad59 Mon Sep 17 00:00:00 2001
From: Bastian Köcher <git@kchr.de>
Date: Wed, 4 Apr 2018 17:50:33 +0200
Subject: corebird: gtkSupport moved to gst-plugins-good

---
 pkgs/applications/networking/corebird/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'pkgs')

diff --git a/pkgs/applications/networking/corebird/default.nix b/pkgs/applications/networking/corebird/default.nix
index 216569cc8210..56947d6650e4 100644
--- a/pkgs/applications/networking/corebird/default.nix
+++ b/pkgs/applications/networking/corebird/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     glib gtk3 json-glib sqlite libsoup gettext gnome3.dconf gnome3.gspell glib-networking
-  ] ++ (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good (gst-plugins-bad.override { gtkSupport = true; }) gst-libav ]);
+  ] ++ (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-bad (gst-plugins-good.override { gtkSupport = true; }) gst-libav ]);
 
   postPatch = ''
     chmod +x data/meson_post_install.py # patchShebangs requires executable file
-- 
cgit 1.4.1