From 9901537209a0366132ef973c8312d418a08bfbbd Mon Sep 17 00:00:00 2001 From: devhell <^@regexmail.net> Date: Wed, 17 Dec 2014 01:24:18 +0100 Subject: [PATCH 1/4] mediainfo: Add package and dependencies Includes only the CLI version and the following dependencies: * libzen * libmediainfo --- pkgs/applications/misc/mediainfo/default.nix | 29 +++++++++++++++++++ .../libraries/libmediainfo/default.nix | 29 +++++++++++++++++++ pkgs/development/libraries/libzen/default.nix | 24 +++++++++++++++ pkgs/top-level/all-packages.nix | 6 ++++ 4 files changed, 88 insertions(+) create mode 100644 pkgs/applications/misc/mediainfo/default.nix create mode 100644 pkgs/development/libraries/libmediainfo/default.nix create mode 100644 pkgs/development/libraries/libzen/default.nix diff --git a/pkgs/applications/misc/mediainfo/default.nix b/pkgs/applications/misc/mediainfo/default.nix new file mode 100644 index 00000000000..6b676974659 --- /dev/null +++ b/pkgs/applications/misc/mediainfo/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, automake, autoconf, libtool, pkgconfig, libzen, libmediainfo, zlib }: + +let version = "0.7.71"; in + +stdenv.mkDerivation { + name = "mediainfo-${version}"; + src = fetchurl { + url = "http://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.bz2"; + sha256 = "0sf0ym0v5ds5w4bxk66712adybr1prxxqwvrf9clm57ibs602jfq"; + }; + + buildInputs = [ automake autoconf libtool pkgconfig libzen libmediainfo zlib ]; + + sourceRoot = "./MediaInfo/Project/GNU/CLI/"; + + configureFlags = [ "--with-libmediainfo=${libmediainfo}" ]; + preConfigure = "sh autogen"; + + meta = { + description = "Supplies technical and tag information about a video or audio file"; + longDescription = '' + MediaInfo is a convenient unified display of the most relevant technical + and tag data for video and audio files. + ''; + homepage = http://mediaarena.net/; + license = stdenv.lib.licenses.bsd2; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/development/libraries/libmediainfo/default.nix b/pkgs/development/libraries/libmediainfo/default.nix new file mode 100644 index 00000000000..070f7c9e60c --- /dev/null +++ b/pkgs/development/libraries/libmediainfo/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, automake, autoconf, libtool, pkgconfig, libzen, zlib }: + +let version = "0.7.71"; in + +stdenv.mkDerivation { + name = "libmediainfo-${version}"; + src = fetchurl { + url = "http://mediaarea.net/download/source/libmediainfo/${version}/libmediainfo_${version}.tar.bz2"; + sha256 = "088v7qsn7d5pijr88fx4azwb31g6d7bp5ykrzgwhskmj80y3rlp2"; + }; + + buildInputs = [ automake autoconf libtool pkgconfig libzen zlib ]; + + sourceRoot = "./MediaInfoLib/Project/GNU/Library/"; + + configureFlags = [ "--enable-shared" ]; + preConfigure = "sh autogen"; + + postInstall = '' + install -vD -m 644 libmediainfo.pc "$out/lib/pkgconfig/libmediainfo.pc" + ''; + + meta = { + description = "Shared library for mediainfo"; + homepage = http://mediaarena.net/; + license = stdenv.lib.licenses.bsd2; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/development/libraries/libzen/default.nix b/pkgs/development/libraries/libzen/default.nix new file mode 100644 index 00000000000..9d3633eb755 --- /dev/null +++ b/pkgs/development/libraries/libzen/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, automake, autoconf, libtool, pkgconfig }: + +let version = "0.4.30"; in + +stdenv.mkDerivation { + name = "libzen-${version}"; + src = fetchurl { + url = "http://mediaarea.net/download/source/libzen/${version}/libzen_${version}.tar.bz2"; + sha256 = "1ripvyzz2lw9nx2j8mkjgjfpabrz6knwxri52asqf1abnszbry64"; + }; + + buildInputs = [ automake autoconf libtool pkgconfig ]; + + sourceRoot = "./ZenLib/Project/GNU/Library/"; + + preConfigure = "sh autogen"; + + meta = { + description = "Shared library for libmediainfo and mediainfo"; + homepage = http://mediaarena.net/; + license = stdenv.lib.licenses.bsd2; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c7813320b14..3ab1eae073e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5911,6 +5911,8 @@ let libmcrypt = callPackage ../development/libraries/libmcrypt {}; + libmediainfo = callPackage ../development/libraries/libmediainfo { }; + libmhash = callPackage ../development/libraries/libmhash {}; libmodbus = callPackage ../development/libraries/libmodbus {}; @@ -6319,6 +6321,8 @@ let libyubikey = callPackage ../development/libraries/libyubikey { }; + libzen = callPackage ../development/libraries/libzen { }; + libzip = callPackage ../development/libraries/libzip { }; libzdb = callPackage ../development/libraries/libzdb { }; @@ -10179,6 +10183,8 @@ let mda_lv2 = callPackage ../applications/audio/mda-lv2 { }; + mediainfo = callPackage ../applications/misc/mediainfo { }; + meld = callPackage ../applications/version-management/meld { inherit (gnome) scrollkeeper; pygtk = pyGtkGlade; From 858b5e54c7be9bfefd72b34297f8022869a6b8bc Mon Sep 17 00:00:00 2001 From: devhell <^@regexmail.net> Date: Thu, 18 Dec 2014 20:52:37 +0100 Subject: [PATCH 2/4] mediainfo: Add myself to meta.maintainers. --- lib/maintainers.nix | 1 + pkgs/applications/misc/mediainfo/default.nix | 1 + pkgs/development/libraries/libmediainfo/default.nix | 1 + pkgs/development/libraries/libzen/default.nix | 1 + 4 files changed, 4 insertions(+) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index c948de91cd7..b4f82822d13 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -50,6 +50,7 @@ davidrusu = "David Rusu "; dbohdan = "Danyil Bohdan "; DerGuteMoritz = "Moritz Heidkamp "; + devhell = "devhell <\"^\"@regexmail.net>"; dmalikov = "Dmitry Malikov "; doublec = "Chris Double "; ederoyd46 = "Matthew Brown "; diff --git a/pkgs/applications/misc/mediainfo/default.nix b/pkgs/applications/misc/mediainfo/default.nix index 6b676974659..cad5aa1951e 100644 --- a/pkgs/applications/misc/mediainfo/default.nix +++ b/pkgs/applications/misc/mediainfo/default.nix @@ -25,5 +25,6 @@ stdenv.mkDerivation { homepage = http://mediaarena.net/; license = stdenv.lib.licenses.bsd2; platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.devhell ]; }; } diff --git a/pkgs/development/libraries/libmediainfo/default.nix b/pkgs/development/libraries/libmediainfo/default.nix index 070f7c9e60c..0dd42bb093e 100644 --- a/pkgs/development/libraries/libmediainfo/default.nix +++ b/pkgs/development/libraries/libmediainfo/default.nix @@ -25,5 +25,6 @@ stdenv.mkDerivation { homepage = http://mediaarena.net/; license = stdenv.lib.licenses.bsd2; platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.devhell ]; }; } diff --git a/pkgs/development/libraries/libzen/default.nix b/pkgs/development/libraries/libzen/default.nix index 9d3633eb755..79649a02457 100644 --- a/pkgs/development/libraries/libzen/default.nix +++ b/pkgs/development/libraries/libzen/default.nix @@ -20,5 +20,6 @@ stdenv.mkDerivation { homepage = http://mediaarena.net/; license = stdenv.lib.licenses.bsd2; platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.devhell ]; }; } From 162c9a5455486c90caca105071a365bf66d12f6e Mon Sep 17 00:00:00 2001 From: devhell <^@regexmail.net> Date: Thu, 18 Dec 2014 21:06:09 +0100 Subject: [PATCH 3/4] mediainfo-gui: Add package --- .../misc/mediainfo-gui/default.nix | 29 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/applications/misc/mediainfo-gui/default.nix diff --git a/pkgs/applications/misc/mediainfo-gui/default.nix b/pkgs/applications/misc/mediainfo-gui/default.nix new file mode 100644 index 00000000000..8013cbe3669 --- /dev/null +++ b/pkgs/applications/misc/mediainfo-gui/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, automake, autoconf, libtool, pkgconfig, libzen, libmediainfo, wxGTK, desktop_file_utils, libSM, imagemagick }: + +let version = "0.7.71"; in + +stdenv.mkDerivation { + name = "mediainfo-gui-${version}"; + src = fetchurl { + url = "http://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.bz2"; + sha256 = "0sf0ym0v5ds5w4bxk66712adybr1prxxqwvrf9clm57ibs602jfq"; + }; + + buildInputs = [ automake autoconf libtool pkgconfig libzen libmediainfo wxGTK desktop_file_utils libSM imagemagick ]; + + sourceRoot = "./MediaInfo/Project/GNU/GUI/"; + + preConfigure = "sh autogen"; + + meta = { + description = "Supplies technical and tag information about a video or audio file (GUI version)"; + longDescription = '' + MediaInfo is a convenient unified display of the most relevant technical + and tag data for video and audio files. + ''; + homepage = http://mediaarea.net/; + license = stdenv.lib.licenses.bsd2; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.devhell ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3ab1eae073e..65586f9695b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10185,6 +10185,8 @@ let mediainfo = callPackage ../applications/misc/mediainfo { }; + mediainfo-gui = callPackage ../applications/misc/mediainfo-gui { }; + meld = callPackage ../applications/version-management/meld { inherit (gnome) scrollkeeper; pygtk = pyGtkGlade; From b16cb9dda903e1a2c743baff638078d7f75beae6 Mon Sep 17 00:00:00 2001 From: aszlig Date: Fri, 19 Dec 2014 00:11:55 +0100 Subject: [PATCH 4/4] libzen: Add --enable-shared to configureFlags. Signed-off-by: aszlig --- pkgs/development/libraries/libzen/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/libzen/default.nix b/pkgs/development/libraries/libzen/default.nix index 79649a02457..8d1e3297213 100644 --- a/pkgs/development/libraries/libzen/default.nix +++ b/pkgs/development/libraries/libzen/default.nix @@ -10,6 +10,7 @@ stdenv.mkDerivation { }; buildInputs = [ automake autoconf libtool pkgconfig ]; + configureFlags = [ "--enable-shared" ]; sourceRoot = "./ZenLib/Project/GNU/Library/";