Merge pull request #7847 from spwhitt/libdvdnav

libdvdnav: 4.2.1 -> 5.0.3
This commit is contained in:
Wout Mertens 2015-05-15 13:21:35 +02:00
commit ebedf814ce
6 changed files with 74 additions and 19 deletions

View file

@ -43,6 +43,7 @@ stdenv.mkDerivation rec {
"--enable-dc1394"
"--enable-ncurses"
"--enable-vdpau"
"--enable-dvdnav"
]
++ optional onlyLibVLC "--disable-vlc";

View file

@ -0,0 +1,31 @@
{stdenv, fetchurl, pkgconfig, libdvdread}:
stdenv.mkDerivation {
name = "libdvdnav-4.2.1";
src = fetchurl {
url = http://dvdnav.mplayerhq.hu/releases/libdvdnav-4.2.1.tar.xz;
sha256 = "7fca272ecc3241b6de41bbbf7ac9a303ba25cb9e0c82aa23901d3104887f2372";
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [libdvdread];
configureScript = "./configure2"; # wtf?
preConfigure = ''
mkdir -p $out
'';
# From Handbrake
patches = [ ./A08-dvdnav-dup.patch ./P00-mingw-no-examples.patch ];
meta = {
homepage = http://dvdnav.mplayerhq.hu/;
description = "A library that implements DVD navigation features such as DVD menus";
license = stdenv.lib.licenses.gpl2;
maintainers = [ stdenv.lib.maintainers.wmertens ];
};
passthru = { inherit libdvdread; };
}

View file

@ -1,25 +1,17 @@
{stdenv, fetchurl, pkgconfig, libdvdread}:
stdenv.mkDerivation {
name = "libdvdnav-4.2.1";
stdenv.mkDerivation rec {
name = "libdvdnav-${version}";
version = "5.0.3";
src = fetchurl {
url = http://dvdnav.mplayerhq.hu/releases/libdvdnav-4.2.1.tar.xz;
sha256 = "7fca272ecc3241b6de41bbbf7ac9a303ba25cb9e0c82aa23901d3104887f2372";
url = "http://download.videolan.org/pub/videolan/libdvdnav/${version}/libdvdnav-${version}.tar.bz2";
sha256 = "5097023e3d2b36944c763f1df707ee06b19dc639b2b68fb30113a5f2cbf60b6d";
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [libdvdread];
configureScript = "./configure2"; # wtf?
preConfigure = ''
mkdir -p $out
'';
# From Handbrake
patches = [ ./A08-dvdnav-dup.patch ./P00-mingw-no-examples.patch ];
meta = {
homepage = http://dvdnav.mplayerhq.hu/;
description = "A library that implements DVD navigation features such as DVD menus";

View file

@ -0,0 +1,25 @@
{stdenv, fetchurl, libdvdcss}:
stdenv.mkDerivation {
name = "libdvdread-4.9.9";
src = fetchurl {
url = http://dvdnav.mplayerhq.hu/releases/libdvdread-4.9.9.tar.xz;
sha256 = "d91275471ef69d488b05cf15c60e1cd65e17648bfc692b405787419f47ca424a";
};
buildInputs = [libdvdcss];
NIX_LDFLAGS = "-ldvdcss";
postInstall = ''
ln -s dvdread $out/include/libdvdread
'';
meta = {
homepage = http://dvdnav.mplayerhq.hu/;
description = "A library for reading DVDs";
license = stdenv.lib.licenses.gpl2;
maintainers = [ stdenv.lib.maintainers.wmertens ];
};
}

View file

@ -1,11 +1,12 @@
{stdenv, fetchurl, libdvdcss}:
stdenv.mkDerivation {
name = "libdvdread-4.9.9";
stdenv.mkDerivation rec {
name = "libdvdread-${version}";
version = "5.0.2";
src = fetchurl {
url = http://dvdnav.mplayerhq.hu/releases/libdvdread-4.9.9.tar.xz;
sha256 = "d91275471ef69d488b05cf15c60e1cd65e17648bfc692b405787419f47ca424a";
url = "http://download.videolan.org/pub/videolan/libdvdread/${version}/libdvdread-${version}.tar.bz2";
sha256 = "82cbe693f2a3971671e7428790b5498392db32185b8dc8622f7b9cd307d3cfbf";
};
buildInputs = [libdvdcss];

View file

@ -6535,8 +6535,12 @@ let
libdvdcss = callPackage ../development/libraries/libdvdcss { };
libdvdnav = callPackage ../development/libraries/libdvdnav { };
libdvdnav_4_2_1 = callPackage ../development/libraries/libdvdnav/4.2.1.nix {
libdvdread = libdvdread_4_9_9;
};
libdvdread = callPackage ../development/libraries/libdvdread { };
libdvdread_4_9_9 = callPackage ../development/libraries/libdvdread/4.9.9.nix { };
libdwarf = callPackage ../development/libraries/libdwarf { };
@ -11625,6 +11629,7 @@ let
mplayer = callPackage ../applications/video/mplayer ({
pulseSupport = config.pulseaudio or false;
libdvdnav = libdvdnav_4_2_1;
} // (config.mplayer or {}));
MPlayerPlugin = browser: