From e67f3a38cfc21cd65ae6c4cc8b5fdfad54be12ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= Date: Mon, 17 Mar 2014 21:31:45 +0800 Subject: [PATCH 1/6] gst-plugins-bad: add description and set license correctly --- .../libraries/gstreamer/bad/default.nix | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix index a9137ad46a7..7647c0f64db 100644 --- a/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/pkgs/development/libraries/gstreamer/bad/default.nix @@ -9,11 +9,18 @@ stdenv.mkDerivation rec { name = "gst-plugins-bad-1.2.3"; - meta = { - homepage = "http://gstreamer.freedesktop.org"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ iyzsong ]; + meta = with stdenv.lib; { + description = "Gstreamer Bad Plugins"; + homepage = "http://gstreamer.freedesktop.org"; + longDescription = '' + a set of plug-ins that aren't up to par compared to the + rest. They might be close to being good quality, but they're missing + something - be it a good code review, some documentation, a set of tests, + a real live maintainer, or some actual wide use. + ''; + license = licenses.lgpl2Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ iyzsong ]; }; src = fetchurl { From b45a29403850e056379ce2a1f09af3884d9a3797 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= Date: Mon, 17 Mar 2014 21:43:10 +0800 Subject: [PATCH 2/6] gst-plugins-good: add description and set license correctly --- .../libraries/gstreamer/good/default.nix | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix index 71151c4e559..090c84600ab 100644 --- a/pkgs/development/libraries/gstreamer/good/default.nix +++ b/pkgs/development/libraries/gstreamer/good/default.nix @@ -9,11 +9,17 @@ stdenv.mkDerivation rec { name = "gst-plugins-good-1.2.3"; - meta = { - homepage = "http://gstreamer.freedesktop.org"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ iyzsong ]; + meta = with stdenv.lib; { + description = "Gstreamer Good Plugins"; + homepage = "http://gstreamer.freedesktop.org"; + longDescription = '' + a set of plug-ins that we consider to have good quality code, + correct functionality, our preferred license (LGPL for the plug-in + code, LGPL or LGPL-compatible for the supporting library). + ''; + license = licenses.lgpl2Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ iyzsong ]; }; src = fetchurl { From 1b3899b040403df8f333bff20b85c2b366c18c56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= Date: Mon, 17 Mar 2014 21:47:58 +0800 Subject: [PATCH 3/6] gst-plugins-ugly: add description --- .../libraries/gstreamer/ugly/default.nix | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/gstreamer/ugly/default.nix b/pkgs/development/libraries/gstreamer/ugly/default.nix index 50005004135..4f16fa4259c 100644 --- a/pkgs/development/libraries/gstreamer/ugly/default.nix +++ b/pkgs/development/libraries/gstreamer/ugly/default.nix @@ -7,11 +7,18 @@ stdenv.mkDerivation rec { name = "gst-plugins-ugly-1.2.3"; - meta = { - homepage = "http://gstreamer.freedesktop.org"; - license = stdenv.lib.licenses.lgpl2Plus; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ iyzsong ]; + meta = with stdenv.lib; { + description = "Gstreamer Ugly Plugins"; + homepage = "http://gstreamer.freedesktop.org"; + longDescription = '' + a set of plug-ins that have good quality and correct functionality, + but distributing them might pose problems. The license on either + the plug-ins or the supporting libraries might not be how we'd + like. The code might be widely known to present patent problems. + ''; + license = licenses.lgpl2Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ iyzsong ]; }; src = fetchurl { From 7d3eb6307b43e8505483d919fc9d9e8db0d87289 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= Date: Mon, 17 Mar 2014 22:02:48 +0800 Subject: [PATCH 4/6] add gnonlin 1.2.0 --- .../libraries/gstreamer/default.nix | 2 ++ .../libraries/gstreamer/gnonlin/default.nix | 29 +++++++++++++++++++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/development/libraries/gstreamer/gnonlin/default.nix diff --git a/pkgs/development/libraries/gstreamer/default.nix b/pkgs/development/libraries/gstreamer/default.nix index b68de91c240..2cb1df00da6 100644 --- a/pkgs/development/libraries/gstreamer/default.nix +++ b/pkgs/development/libraries/gstreamer/default.nix @@ -14,4 +14,6 @@ rec { gst-libav = callPackage ./libav { inherit gst-plugins-base; }; gst-python = callPackage ./python { inherit gst-plugins-base gstreamer; }; + + gnonlin = callPackage ./gnonlin { inherit gst-plugins-base; }; } diff --git a/pkgs/development/libraries/gstreamer/gnonlin/default.nix b/pkgs/development/libraries/gstreamer/gnonlin/default.nix new file mode 100644 index 00000000000..c45c1469cb3 --- /dev/null +++ b/pkgs/development/libraries/gstreamer/gnonlin/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, pkgconfig +, gst-plugins-base +}: + +stdenv.mkDerivation rec { + name = "gnonlin-1.2.0"; + + meta = with stdenv.lib; { + description = "Gstreamer Non-Linear Multimedia Editing Plugins"; + homepage = "http://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.linux; + maintainers = with maintainers; [ iyzsong ]; + }; + + src = fetchurl { + url = "${meta.homepage}/src/gnonlin/${name}.tar.xz"; + sha256 = "15hyb0kg8sm92kj37cir4l3sa21b8zy4la1ccfhb358b4mf24vl7"; + }; + + nativeBuildInputs = [ pkgconfig ]; + + propagatedBuildInputs = [ gst-plugins-base ]; +} From c3ffcb1cfe36f11105f7c025b716814920cf3392 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= Date: Mon, 17 Mar 2014 22:06:32 +0800 Subject: [PATCH 5/6] add gst-editing-services 1.2.0 --- .../libraries/gstreamer/default.nix | 2 ++ .../libraries/gstreamer/ges/default.nix | 24 +++++++++++++++++++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/development/libraries/gstreamer/ges/default.nix diff --git a/pkgs/development/libraries/gstreamer/default.nix b/pkgs/development/libraries/gstreamer/default.nix index 2cb1df00da6..4796ce078df 100644 --- a/pkgs/development/libraries/gstreamer/default.nix +++ b/pkgs/development/libraries/gstreamer/default.nix @@ -16,4 +16,6 @@ rec { gst-python = callPackage ./python { inherit gst-plugins-base gstreamer; }; gnonlin = callPackage ./gnonlin { inherit gst-plugins-base; }; + + gst-editing-services = callPackage ./ges { inherit gnonlin; }; } diff --git a/pkgs/development/libraries/gstreamer/ges/default.nix b/pkgs/development/libraries/gstreamer/ges/default.nix new file mode 100644 index 00000000000..94d3688eb1c --- /dev/null +++ b/pkgs/development/libraries/gstreamer/ges/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, pkgconfig, python +, gnonlin, libxml2 +}: + +stdenv.mkDerivation rec { + name = "gstreamer-editing-services-1.2.0"; + + meta = with stdenv.lib; { + description = "Library for creation of audio/video non-linear editors"; + homepage = "http://gstreamer.freedesktop.org"; + license = licenses.lgpl2Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ iyzsong ]; + }; + + src = fetchurl { + url = "${meta.homepage}/src/gstreamer-editing-services/${name}.tar.xz"; + sha256 = "1n7nw8rqvwna9af55lggah44gdvfgld1igvgaya8glc37wpq89b0"; + }; + + nativeBuildInputs = [ pkgconfig python ]; + + propagatedBuildInputs = [ gnonlin libxml2 ]; +} From d847b5851fc1b16bee43529b0dd05a9a5028b263 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= Date: Mon, 17 Mar 2014 22:09:51 +0800 Subject: [PATCH 6/6] gst-python: update to 1.2.0 --- pkgs/development/libraries/gstreamer/python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gstreamer/python/default.nix b/pkgs/development/libraries/gstreamer/python/default.nix index eaf284e950d..843822b0748 100644 --- a/pkgs/development/libraries/gstreamer/python/default.nix +++ b/pkgs/development/libraries/gstreamer/python/default.nix @@ -3,14 +3,14 @@ }: stdenv.mkDerivation rec { - name = "gst-python-1.1.90"; + name = "gst-python-1.2.0"; src = fetchurl { urls = [ "${meta.homepage}/src/gst-python/${name}.tar.bz2" "mirror://gentoo/distfiles/${name}.tar.bz2" ]; - sha256 = "1vsykx2l5360y19c0rxspa9nf1ilml2c1ybsv8cw8p696scryb2l"; + sha256 = "09c6yls8ipbmwimdjr7xi3hvf2xa1xn1pv07855r7wfyzas1xbl1"; }; buildInputs =