From 7563f891c676dadce78fd46cdfb2743cc07b553b Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Tue, 16 Oct 2018 21:39:25 -0400 Subject: [PATCH 01/14] gst_all_1.gstreamer: 1.14.2 -> 1.14.4 --- pkgs/development/libraries/gstreamer/core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gstreamer/core/default.nix b/pkgs/development/libraries/gstreamer/core/default.nix index b4a324d68d9..c1f2b2f006c 100644 --- a/pkgs/development/libraries/gstreamer/core/default.nix +++ b/pkgs/development/libraries/gstreamer/core/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { name = "gstreamer-${version}"; - version = "1.14.2"; + version = "1.14.4"; meta = with lib ;{ description = "Open source multimedia framework"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gstreamer/${name}.tar.xz"; - sha256 = "029fi3v0vrravysgfwhfkrb3ndg64sjmigbb0iwr7wpkk5r15mjb"; + sha256 = "1izzhnlsy83rgr4zl3jcl1sryxqbbigrrqw3j4x3nnphqnb6ckzr"; }; patches = [ From 09cb8c3c18019ae4b8da06c56f6b6b9152fd8fb7 Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Tue, 16 Oct 2018 21:40:12 -0400 Subject: [PATCH 02/14] gst_all_1.gst-plugins-base: 1.14.2 -> 1.14.4 --- pkgs/development/libraries/gstreamer/base/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gstreamer/base/default.nix b/pkgs/development/libraries/gstreamer/base/default.nix index a5f8e340642..30a0f9e58d4 100644 --- a/pkgs/development/libraries/gstreamer/base/default.nix +++ b/pkgs/development/libraries/gstreamer/base/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { name = "gst-plugins-base-${version}"; - version = "1.14.2"; + version = "1.14.4"; meta = with lib; { description = "Base plugins and helper libraries"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gst-plugins-base/${name}.tar.xz"; - sha256 = "0z0wy0p0nxxqhsis3n517d6ykldm02g7rca9fhq9kxb9m05yidx4"; + sha256 = "0qbllw4kphchwhy4p7ivdysigx69i97gyw6q0rvkx1j81r4kjqfa"; }; outputs = [ "out" "dev" ]; From 19e8b8d2973852b348cbbcbe8b8031f9c49773b7 Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Tue, 16 Oct 2018 21:40:40 -0400 Subject: [PATCH 03/14] gst_all_1.gst-plugins-good: 1.14.2 -> 1.14.4 --- pkgs/development/libraries/gstreamer/good/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix index 45f700e158a..d4e7b8c5da4 100644 --- a/pkgs/development/libraries/gstreamer/good/default.nix +++ b/pkgs/development/libraries/gstreamer/good/default.nix @@ -16,7 +16,7 @@ let in stdenv.mkDerivation rec { name = "gst-plugins-good-${version}"; - version = "1.14.2"; + version = "1.14.4"; meta = with stdenv.lib; { description = "Gstreamer Good Plugins"; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gst-plugins-good/${name}.tar.xz"; - sha256 = "1bfa4n6xhr4v4wga8pv1y00rm1aka498snw6kgszy2w624l5wmy0"; + sha256 = "0y89qynb4b6fry3h43z1r99qslmi3m8xhlq0i5baq2nbc0r5b2sz"; }; outputs = [ "out" "dev" ]; From 171259dce3460b91354f38158c652105f2884918 Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Tue, 16 Oct 2018 21:40:54 -0400 Subject: [PATCH 04/14] gst_all_1.gst-plugins-bad: 1.14.2 -> 1.14.4 --- pkgs/development/libraries/gstreamer/bad/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix index 3f030b7469e..2140351068b 100644 --- a/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/pkgs/development/libraries/gstreamer/bad/default.nix @@ -18,7 +18,7 @@ let in stdenv.mkDerivation rec { name = "gst-plugins-bad-${version}"; - version = "1.14.2"; + version = "1.14.4"; meta = with stdenv.lib; { description = "Gstreamer Bad Plugins"; @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gst-plugins-bad/${name}.tar.xz"; - sha256 = "1bqy3dn7q4kdkd4lqznyly8fv854d0hhncv88jk6ai4rf3dbgyil"; + sha256 = "1r8dma3x127rbx42yab7kwq7q1bhkmvz2ykn0rnqnzl95q74w2wi"; }; outputs = [ "out" "dev" ]; From d85c5797e499c25a90764fc94dbf47b47f1bbaaf Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Tue, 16 Oct 2018 21:41:06 -0400 Subject: [PATCH 05/14] gst_all_1.gst-plugins-ugly: 1.14.2 -> 1.14.4 --- pkgs/development/libraries/gstreamer/ugly/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gstreamer/ugly/default.nix b/pkgs/development/libraries/gstreamer/ugly/default.nix index b5256bf4b4c..6bc2ea8af89 100644 --- a/pkgs/development/libraries/gstreamer/ugly/default.nix +++ b/pkgs/development/libraries/gstreamer/ugly/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { name = "gst-plugins-ugly-${version}"; - version = "1.14.2"; + version = "1.14.4"; meta = with lib; { description = "Gstreamer Ugly Plugins"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gst-plugins-ugly/${name}.tar.xz"; - sha256 = "0s9xrz8knfv06fj1nbv3iq4xj7dj4cnzj3xvgb7zs89rv7crgq2m"; + sha256 = "08vd1xgwmapnviah47zv5h2r02qdd20y4f07rvv5zhv6y4vxh0mc"; }; outputs = [ "out" "dev" ]; From 71258d8369d7187621a9ac7fd38338c4e7aebeb6 Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Tue, 16 Oct 2018 21:41:30 -0400 Subject: [PATCH 06/14] gst_all_1.gst-editing-services: 1.14.2 -> 1.14.4 --- pkgs/development/libraries/gstreamer/ges/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gstreamer/ges/default.nix b/pkgs/development/libraries/gstreamer/ges/default.nix index d2c3cbcc6ac..56d17b49cbb 100644 --- a/pkgs/development/libraries/gstreamer/ges/default.nix +++ b/pkgs/development/libraries/gstreamer/ges/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "gstreamer-editing-services-${version}"; - version = "1.14.2"; + version = "1.14.4"; meta = with stdenv.lib; { description = "Library for creation of audio/video non-linear editors"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gstreamer-editing-services/${name}.tar.xz"; - sha256 = "0d0zqvgxp51mmffz5vvscsdzqqw9mjsv6bnk6ivg2dxnkv8q1ch5"; + sha256 = "0pxk65jib3mqszjkyvlzklwia4kbdj6j2b6jw1d502b06mdx5lak"; }; outputs = [ "out" "dev" ]; From d3bad96fea3c65d12169c5fc254cc251ac8802ed Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Tue, 16 Oct 2018 21:41:47 -0400 Subject: [PATCH 07/14] gst_all_1.gst-vaapi: 1.14.2 -> 1.14.4 --- pkgs/development/libraries/gstreamer/vaapi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gstreamer/vaapi/default.nix b/pkgs/development/libraries/gstreamer/vaapi/default.nix index be7ee8f1278..e84f8dce912 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.14.2"; + version = "1.14.4"; src = fetchurl { url = "${meta.homepage}/src/gstreamer-vaapi/gstreamer-vaapi-${version}.tar.xz"; - sha256 = "12hdyfma2lnfj38dj6y891vsxnxrlbqjbd36xx13mgasgzi6843z"; + sha256 = "18yha6119v7mwz47idv2vykzfssqfmh6hc824wqqsshwjvzdn66f"; }; outputs = [ "out" "dev" ]; From a1da3555b63a5eb0a4f4f3c5b68eb607720b0c6c Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Tue, 16 Oct 2018 21:42:01 -0400 Subject: [PATCH 08/14] gst_all_1.gst-rtsp-server: 1.14.2 -> 1.14.4 --- pkgs/development/libraries/gstreamer/rtsp-server/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gstreamer/rtsp-server/default.nix b/pkgs/development/libraries/gstreamer/rtsp-server/default.nix index 4166f357cda..624b967765c 100644 --- a/pkgs/development/libraries/gstreamer/rtsp-server/default.nix +++ b/pkgs/development/libraries/gstreamer/rtsp-server/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "gst-rtsp-server-${version}"; - version = "1.14.2"; + version = "1.14.4"; meta = with stdenv.lib; { description = "Gstreamer RTSP server"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gst-rtsp-server/${name}.tar.xz"; - sha256 = "161c49hg21xpkdw5ppc7ljbg6kyslxd1y3v1shsg7ibarxapff7p"; + sha256 = "1wc4d0y57hpfvv9sykjg8mxj86dw60mf696fbqbiqq6dzlmcw3ix"; }; outputs = [ "out" "dev" ]; From 0d53d4e5f428c07bc5868ca59c6354d79e4e9b95 Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Tue, 16 Oct 2018 21:42:17 -0400 Subject: [PATCH 09/14] gst_all_1.gst-validate: 1.14.2 -> 1.14.4 --- pkgs/development/libraries/gstreamer/validate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gstreamer/validate/default.nix b/pkgs/development/libraries/gstreamer/validate/default.nix index 63893bbc523..abcdd0b9305 100644 --- a/pkgs/development/libraries/gstreamer/validate/default.nix +++ b/pkgs/development/libraries/gstreamer/validate/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "gst-validate-${version}"; - version = "1.14.2"; + version = "1.14.4"; meta = { description = "Integration testing infrastructure for the GStreamer framework"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gst-validate/${name}.tar.xz"; - sha256 = "17zilvmwv13l6rbj0a7dnbg4kz5bwwa1gshaibpqbvvhahz457pa"; + sha256 = "1ismv4i7ldi04swq76pcpd5apxqd52yify5hvlyan2yw9flwrp0q"; }; outputs = [ "out" "dev" ]; From e6d0bd05514247e6f17b2d89dd30634eece1aed1 Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Tue, 16 Oct 2018 21:42:28 -0400 Subject: [PATCH 10/14] gst_all_1.gst-libav: 1.14.2 -> 1.14.4 --- pkgs/development/libraries/gstreamer/libav/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gstreamer/libav/default.nix b/pkgs/development/libraries/gstreamer/libav/default.nix index f78015704fc..7f7393bba28 100644 --- a/pkgs/development/libraries/gstreamer/libav/default.nix +++ b/pkgs/development/libraries/gstreamer/libav/default.nix @@ -10,7 +10,7 @@ assert withSystemLibav -> libav != null; stdenv.mkDerivation rec { name = "gst-libav-${version}"; - version = "1.14.2"; + version = "1.14.4"; meta = { homepage = https://gstreamer.freedesktop.org; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gst-libav/${name}.tar.xz"; - sha256 = "1pknqpjxq1l3vlprdsmxxwk0lwqa555fqd543k9vphngqlwiqdca"; + sha256 = "1nk5g24z2xx5kaw5cg8dv8skdc516inahmkymcz8bxqxj28qbmyz"; }; outputs = [ "out" "dev" ]; From d5011408b5677c5ffbdbc3d31b7005feef3443ab Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Tue, 16 Oct 2018 21:42:48 -0400 Subject: [PATCH 11/14] pythonPackages.gst-python: 1.14.2 -> 1.14.4 --- pkgs/development/python-modules/gst-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gst-python/default.nix b/pkgs/development/python-modules/gst-python/default.nix index 49f44bb16e4..057c24f79c3 100644 --- a/pkgs/development/python-modules/gst-python/default.nix +++ b/pkgs/development/python-modules/gst-python/default.nix @@ -4,7 +4,7 @@ let pname = "gst-python"; - version = "1.14.2"; + version = "1.14.4"; name = "${pname}-${version}"; in buildPythonPackage rec { inherit pname version; @@ -15,7 +15,7 @@ in buildPythonPackage rec { "${meta.homepage}/src/gst-python/${name}.tar.xz" "mirror://gentoo/distfiles/${name}.tar.xz" ]; - sha256 = "08nb011acyvlz48fqh8c084k0dlssz9b7wha7zzk797inidbwh6w"; + sha256 = "06ssx19fs6pg4d32p9ph9w4f0xwmxaw2dxfj17rqkn5njd7v5zfh"; }; outputs = [ "out" "dev" ]; From 0d2f06ae3a1f8347dc09cd0dfe6d12b757368e4d Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 5 Sep 2018 14:12:02 +0200 Subject: [PATCH 12/14] python2.pkgs.gst-python: fix build --- .../python-modules/gst-python/default.nix | 40 +++++++++++++------ .../different-path-with-pygobject.patch | 20 ---------- 2 files changed, 27 insertions(+), 33 deletions(-) delete mode 100644 pkgs/development/python-modules/gst-python/different-path-with-pygobject.patch diff --git a/pkgs/development/python-modules/gst-python/default.nix b/pkgs/development/python-modules/gst-python/default.nix index 057c24f79c3..8cbc08dbbfd 100644 --- a/pkgs/development/python-modules/gst-python/default.nix +++ b/pkgs/development/python-modules/gst-python/default.nix @@ -1,5 +1,5 @@ -{ buildPythonPackage, fetchurl, stdenv, meson, ninja, pkgconfig, python, pygobject3 -, gst-plugins-base, ncurses +{ buildPythonPackage, fetchurl, meson, ninja, stdenv, pkgconfig, python, pygobject3 +, gobjectIntrospection, gst-plugins-base, isPy3k }: let @@ -10,6 +10,8 @@ in buildPythonPackage rec { inherit pname version; format = "other"; + outputs = [ "out" "dev" ]; + src = fetchurl { urls = [ "${meta.homepage}/src/gst-python/${name}.tar.xz" @@ -18,22 +20,34 @@ in buildPythonPackage rec { sha256 = "06ssx19fs6pg4d32p9ph9w4f0xwmxaw2dxfj17rqkn5njd7v5zfh"; }; - outputs = [ "out" "dev" ]; - - nativeBuildInputs = [ meson ninja pkgconfig python ]; - - # XXX: in the Libs.private field of python3.pc - buildInputs = [ ncurses ]; - - mesonFlags = [ - "-Dpygi-overrides-dir=${python.sitePackages}/gi/overrides" + patches = [ + # Meson build does not support Python 2 at the moment + # https://bugzilla.gnome.org/show_bug.cgi?id=796092 + (fetchurl { + name = "0002-meson-use-new-python-module.patch"; + url = https://bugzilla.gnome.org/attachment.cgi?id=371989; + sha256 = "1k46nvw175c1wvkqnx783i9d4w9vn431spcl48jb3y224jj3va08"; + }) ]; + # TODO: First python_dep in meson.build needs to be removed postPatch = '' - chmod +x scripts/pythondetector # patchShebangs requires executable file - patchShebangs scripts/pythondetector + substituteInPlace meson.build --replace python3 python${if isPy3k then "3" else "2"} ''; + nativeBuildInputs = [ meson ninja pkgconfig python gobjectIntrospection ]; + + mesonFlags = [ + "-Dpython=python${if isPy3k then "3" else "2"}" + "-Dpygi-overrides-dir=${placeholder "out"}/${python.sitePackages}/gi/overrides" + ]; + + doCheck = true; + + # TODO: Meson setup hook does not like buildPythonPackage + # https://github.com/NixOS/nixpkgs/issues/47390 + installCheckPhase = "meson test --print-errorlogs"; + propagatedBuildInputs = [ gst-plugins-base pygobject3 ]; meta = { diff --git a/pkgs/development/python-modules/gst-python/different-path-with-pygobject.patch b/pkgs/development/python-modules/gst-python/different-path-with-pygobject.patch deleted file mode 100644 index 7326b3630f7..00000000000 --- a/pkgs/development/python-modules/gst-python/different-path-with-pygobject.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -Nru gst-python-1.2.0-orig/gi/overrides/Makefile.in gst-python-1.2.0/gi/overrides/Makefile.in ---- gst-python-1.2.0-orig/gi/overrides/Makefile.in 2014-03-22 21:47:56.235364405 +0800 -+++ gst-python-1.2.0/gi/overrides/Makefile.in 2014-03-22 21:48:28.737958066 +0800 -@@ -356,7 +356,7 @@ - - # We install everything in the gi/overrides folder - pygioverridesdir = $(PYGI_OVERRIDES_DIR) --pygioverrides_PYTHON = Gst.py GstPbutils.py -+pygioverrides_PYTHON = Gst.py GstPbutils.py __init__.py - pygioverridesexecdir = $(PYGI_OVERRIDES_DIR) - EXTRA_DIST = Gst.py - INCLUDES = $(PYTHON_INCLUDES) -diff -Nru gst-python-1.2.0-orig/gi/overrides/__init__.py gst-python-1.2.0/gi/overrides/__init__.py ---- gst-python-1.2.0-orig/gi/overrides/__init__.py 1970-01-01 08:00:00.000000000 +0800 -+++ gst-python-1.2.0/gi/overrides/__init__.py 2014-03-22 21:48:15.442124287 +0800 -@@ -0,0 +1,4 @@ -+from pkgutil import extend_path -+ -+__path__ = extend_path(__path__, __name__) -+print(__path__, __name__) From 3a0e193520708bb4890e2c3d3bd65d385ed0d602 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 3 Sep 2018 22:43:55 +0200 Subject: [PATCH 13/14] gst_all_1.gst-plugins-base: add python3 for install script Meson no longer propagates it so we need to re-add it. --- pkgs/development/libraries/gstreamer/base/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gstreamer/base/default.nix b/pkgs/development/libraries/gstreamer/base/default.nix index 30a0f9e58d4..c67526fb712 100644 --- a/pkgs/development/libraries/gstreamer/base/default.nix +++ b/pkgs/development/libraries/gstreamer/base/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fetchpatch, lib , pkgconfig, meson, ninja, gettext, gobjectIntrospection -, python, gstreamer, orc, pango, libtheora +, python3, gstreamer, orc, pango, libtheora , libintl, libopus , enableX11 ? stdenv.isLinux, libXv , enableWayland ? stdenv.isLinux, wayland @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ pkgconfig python gettext gobjectIntrospection ] + nativeBuildInputs = [ pkgconfig python3 gettext gobjectIntrospection ] # Broken meson with Darwin. Should hopefully be fixed soon. Tracking # in https://bugzilla.gnome.org/show_bug.cgi?id=781148. From dc1963594ea716a27bcac1a6714b492372638c56 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 3 Sep 2018 23:09:17 +0200 Subject: [PATCH 14/14] gst_all_1.gst-plugins-bad: add python3 for install script Meson no longer propagates it so we need to re-add it. --- pkgs/development/libraries/gstreamer/bad/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix index 2140351068b..5d9c03b1919 100644 --- a/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/pkgs/development/libraries/gstreamer/bad/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchpatch, meson, ninja, gettext -, pkgconfig, python, gst-plugins-base, orc +, pkgconfig, python3, gst-plugins-base, orc , faacSupport ? false, faac ? null , faad2, libass, libkate, libmms, librdf, ladspaH , libnice, webrtc-audio-processing, lilv, lv2, serd, sord, sratom @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ meson ninja pkgconfig python gettext ]; + nativeBuildInputs = [ meson ninja pkgconfig python3 gettext ]; buildInputs = [ gst-plugins-base orc