From 9d48cb846b4490f0d38dede9b0cf3aa3cee066f9 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 23 Jun 2008 09:01:04 +0000 Subject: [PATCH] * MythTV 0.21. svn path=/nixpkgs/trunk/; revision=12177 --- pkgs/applications/video/mythtv/builder.sh | 3 +-- pkgs/applications/video/mythtv/default.nix | 22 ++++++++++------- pkgs/applications/video/mythtv/purity.patch | 26 ++++++++++----------- pkgs/top-level/all-packages.nix | 12 ++++++++-- 4 files changed, 37 insertions(+), 26 deletions(-) diff --git a/pkgs/applications/video/mythtv/builder.sh b/pkgs/applications/video/mythtv/builder.sh index ec1eea3b38b5..6acf49a52e88 100644 --- a/pkgs/applications/video/mythtv/builder.sh +++ b/pkgs/applications/video/mythtv/builder.sh @@ -9,8 +9,7 @@ done echo $LD_LIBRARY_PATH -buildPhase=myBuilder -myBuilder() { +buildPhase() { qmake mythtv.pro make } diff --git a/pkgs/applications/video/mythtv/default.nix b/pkgs/applications/video/mythtv/default.nix index fbec28a78312..02c637dd842f 100644 --- a/pkgs/applications/video/mythtv/default.nix +++ b/pkgs/applications/video/mythtv/default.nix @@ -1,25 +1,29 @@ -{ stdenv, fetchurl, which, qt3, x11 -, libX11, libXinerama, libXv, libXxf86vm, libXrandr, libXmu +{ stdenv, fetchurl, which, qt3, x11, xlibs , lame, zlib, mesa +, freetype, perl }: assert qt3.mysqlSupport; stdenv.mkDerivation { - name = "mythtv-0.20"; + name = "mythtv-0.21"; builder = ./builder.sh; + src = fetchurl { - url = http://ftp.osuosl.org/pub/mythtv/mythtv-0.20.tar.bz2; - md5 = "52bec1e0fadf7d24d6dcac3f773ddf74"; + url = http://ftp.osuosl.org/pub/mythtv/mythtv-0.21.tar.bz2; + sha256 = "1r654fvklpsf6h9iqckb8fhd7abgs71lx6xh352xgz9yzjl7ia1k"; }; - configureFlags = "--disable-joystick-menu --x11-path=/no-such-path --dvb-path=/no-such-path"; + #configureFlags = "--x11-path=/no-such-path --dvb-path=/no-such-path"; + + configureFlags = '' + --disable-joystick-menu --disable-dvb + ''; buildInputs = [ - which qt3 x11 - libX11 libXinerama libXv libXxf86vm libXrandr libXmu - lame zlib mesa + freetype qt3 lame zlib x11 mesa perl + xlibs.libXv xlibs.libXrandr xlibs.libXvMC xlibs.libXmu ]; patches = [ diff --git a/pkgs/applications/video/mythtv/purity.patch b/pkgs/applications/video/mythtv/purity.patch index 3636ccd570ec..abbd1daac323 100644 --- a/pkgs/applications/video/mythtv/purity.patch +++ b/pkgs/applications/video/mythtv/purity.patch @@ -1,8 +1,8 @@ -diff -rc mythtv-0.20-orig/configure mythtv-0.20/configure -*** mythtv-0.20-orig/configure 2006-08-28 18:18:08.000000000 +0200 ---- mythtv-0.20/configure 2006-09-14 17:05:12.000000000 +0200 +diff -rc mythtv-0.21-orig/configure mythtv-0.21/configure +*** mythtv-0.21-orig/configure 2008-03-04 22:23:23.000000000 +0100 +--- mythtv-0.21/configure 2008-06-23 11:00:09.000000000 +0200 *************** -*** 1225,1231 **** +*** 1687,1693 **** has_library() { @@ -10,7 +10,7 @@ diff -rc mythtv-0.20-orig/configure mythtv-0.20/configure LIBPATHS=`cat /etc/ld.so.conf | grep -v "#" | grep -v "include"` else LIBPATHS='' ---- 1225,1231 ---- +--- 1687,1693 ---- has_library() { @@ -19,7 +19,7 @@ diff -rc mythtv-0.20-orig/configure mythtv-0.20/configure else LIBPATHS='' *************** -*** 1235,1241 **** +*** 1698,1704 **** LIBPATHS="$LIBPATHS `echo $DYLD_LIBRARY_PATH | sed s/':'/' '/g` " # recurse down just one level, should be enough in most cases @@ -27,7 +27,7 @@ diff -rc mythtv-0.20-orig/configure mythtv-0.20/configure INCL=`cat /etc/ld.so.conf | grep -v "#" | grep "^include"` SRCH=`echo "$INCL" | sed '{ s/^include \//\//; s/^include /\/etc\//}'` for x in $SRCH ; do ---- 1235,1241 ---- +--- 1698,1704 ---- LIBPATHS="$LIBPATHS `echo $DYLD_LIBRARY_PATH | sed s/':'/' '/g` " # recurse down just one level, should be enough in most cases @@ -36,7 +36,7 @@ diff -rc mythtv-0.20-orig/configure mythtv-0.20/configure SRCH=`echo "$INCL" | sed '{ s/^include \//\//; s/^include /\/etc\//}'` for x in $SRCH ; do *************** -*** 1244,1250 **** +*** 1707,1713 **** done fi @@ -44,7 +44,7 @@ diff -rc mythtv-0.20-orig/configure mythtv-0.20/configure HAS_IT="no" for LIBPATH in $LIBPATHS ; do ---- 1244,1250 ---- +--- 1707,1713 ---- done fi @@ -53,23 +53,23 @@ diff -rc mythtv-0.20-orig/configure mythtv-0.20/configure HAS_IT="no" for LIBPATH in $LIBPATHS ; do *************** -*** 1257,1265 **** +*** 1720,1728 **** has_header() { ! HPATHS="/usr/local/include /usr/include /usr/include/g++-v3 /usr/X11R6/include" INCL=`echo $DYLD_LIBRARY_PATH $LD_LIBRARY_PATH | sed s/':'/' '/g` -! HPATHS="$HPATHS `echo $INCL | sed s/$libdir_name/include/g` " +! HPATHS="$HPATHS "$(echo $INCL | sed "s/$libdir_name/include/g") HAS_IT="no" for HPATH in $HPATHS ; do ---- 1257,1265 ---- +--- 1720,1728 ---- has_header() { ! HPATHS="" INCL=`echo $DYLD_LIBRARY_PATH $LD_LIBRARY_PATH | sed s/':'/' '/g` -! HPATHS="$HPATHS `echo $INCL | sed "s/$libdir_name\($\|[\/ ]\)/include\1/g"` " +! HPATHS="$HPATHS "$(echo $INCL | sed "s/$libdir_name\($\|[\/ ]\)/include\1/g") HAS_IT="no" for HPATH in $HPATHS ; do diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f820acd52fb0..11354614b5b6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3224,6 +3224,14 @@ let pkgs = rec { mysqlSupport = getConfig ["qt" "mysql"] false; }; + qt3mysql = import ../development/libraries/qt-3 { + inherit fetchurl stdenv x11 zlib libjpeg libpng which mysql mesa; + inherit (xlibs) xextproto libXft libXrender libXrandr randrproto + libXmu libXinerama xineramaproto libXcursor; + openglSupport = mesaSupported; + mysqlSupport = true; + }; + qt4 = import ../development/libraries/qt-4 { inherit fetchurl stdenv fetchsvn zlib libjpeg libpng which mysql mesa openssl cups dbus fontconfig freetype pkgconfig libtiff; @@ -6121,8 +6129,8 @@ let pkgs = rec { }; mythtv = import ../applications/video/mythtv { - inherit fetchurl stdenv which qt3 x11 lame zlib mesa; - inherit (xlibs) libX11 libXinerama libXv libXxf86vm libXrandr libXmu; + inherit fetchurl stdenv which x11 xlibs lame zlib mesa freetype perl; + qt3 = qt3mysql; }; nano = import ../applications/editors/nano {