From c90e049b989fcee91c8bb31368c62236901377a9 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 15 Jan 2005 21:49:33 +0000
Subject: [PATCH] * Xine updated to 1.0. * Xine UI updated to 0.99.3.

svn path=/nixpkgs/trunk/; revision=2046
---
 pkgs/applications/video/xine-ui/default.nix     | 7 +++----
 pkgs/development/libraries/xine-lib/builder.sh  | 4 ++++
 pkgs/development/libraries/xine-lib/default.nix | 7 ++++---
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/video/xine-ui/default.nix b/pkgs/applications/video/xine-ui/default.nix
index c51883107727..c1f376f4dc10 100644
--- a/pkgs/applications/video/xine-ui/default.nix
+++ b/pkgs/applications/video/xine-ui/default.nix
@@ -1,11 +1,10 @@
 {stdenv, fetchurl, x11, xineLib, libpng}:
 
 stdenv.mkDerivation {
-  name = "xine-ui-0.99.2";
-#  builder = ./builder.sh;
+  name = "xine-ui-0.99.3";
   src = fetchurl {
-    url = http://heanet.dl.sourceforge.net/sourceforge/xine/xine-ui-0.99.2.tar.gz;
-    md5 = "4a4cf5cc68bf65e6845f501ea87fdf94";
+    url = http://heanet.dl.sourceforge.net/sourceforge/xine/xine-ui-0.99.3.tar.gz;
+    md5 = "aa7805a93e511e3d67dc1bf09a71fcdd";
   };
   buildInputs = [x11 xineLib libpng];
   configureFlags = "--without-readline";
diff --git a/pkgs/development/libraries/xine-lib/builder.sh b/pkgs/development/libraries/xine-lib/builder.sh
index 8b499bbefcf1..484014b3cb4b 100644
--- a/pkgs/development/libraries/xine-lib/builder.sh
+++ b/pkgs/development/libraries/xine-lib/builder.sh
@@ -6,4 +6,8 @@ if test -n "$libdvdcss"; then
     export NIX_LDFLAGS="-rpath $libdvdcss/lib -L$libdvdcss/lib -ldvdcss $NIX_LDFLAGS"
 fi
 
+if test -n "$libXv"; then
+    configureFlags="--with-xv-path=$libXv/lib $configureFlags"
+fi
+
 genericBuild
\ No newline at end of file
diff --git a/pkgs/development/libraries/xine-lib/default.nix b/pkgs/development/libraries/xine-lib/default.nix
index 8539bff54bd1..2eec46bb2ddc 100644
--- a/pkgs/development/libraries/xine-lib/default.nix
+++ b/pkgs/development/libraries/xine-lib/default.nix
@@ -12,11 +12,11 @@ assert encryptedDVDSupport -> libdvdcss != null;
 assert alsaSupport -> alsaLib != null;
 
 stdenv.mkDerivation {
-  name = "xine-lib-1-pre-rc7";
+  name = "xine-lib-1.0";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://heanet.dl.sourceforge.net/sourceforge/xine/xine-lib-1-rc7.tar.gz;
-    md5 = "b3eaa0dd44fdbb8e3915399895c8414a";
+    url = http://heanet.dl.sourceforge.net/sourceforge/xine/xine-lib-1.0.tar.gz;
+    md5 = "96e5195c366064e7778af44c3e71f43a";
   };
   buildInputs = [
     x11
@@ -24,6 +24,7 @@ stdenv.mkDerivation {
     (if xineramaSupport then libXinerama else null)
     (if alsaSupport then alsaLib else null)
   ];
+  libXv = if xvideoSupport then libXv else null;
   libdvdcss = if encryptedDVDSupport then libdvdcss else null;
   propagatedBuildInputs = [zlib];
 }