public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* MythTV 0.21.

Browse Source 
svn path=/nixpkgs/trunk/; revision=12177
This commit is contained in:
Eelco Dolstra 2008-06-23 09:01:04 +00:00
parent ca0a14c0f8
commit 9d48cb846b
4 changed files with 37 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/applications/video/mythtv/builder.sh
View File

@ -9,8 +9,7 @@ done
echo $LD_LIBRARY_PATH echo $LD_LIBRARY_PATH
buildPhase=myBuilder buildPhase() {
myBuilder() {
qmake mythtv.pro qmake mythtv.pro
make make
} }

22
pkgs/applications/video/mythtv/default.nix
View File

@ -1,25 +1,29 @@
{ stdenv, fetchurl, which, qt3, x11 { stdenv, fetchurl, which, qt3, x11, xlibs
, libX11, libXinerama, libXv, libXxf86vm, libXrandr, libXmu
, lame, zlib, mesa , lame, zlib, mesa
, freetype, perl
}: }:
assert qt3.mysqlSupport; assert qt3.mysqlSupport;
stdenv.mkDerivation { stdenv.mkDerivation {
name = "mythtv-0.20"; name = "mythtv-0.21";
builder = ./builder.sh; builder = ./builder.sh;
src = fetchurl { src = fetchurl {
url = http://ftp.osuosl.org/pub/mythtv/mythtv-0.20.tar.bz2; url = http://ftp.osuosl.org/pub/mythtv/mythtv-0.21.tar.bz2;
md5 = "52bec1e0fadf7d24d6dcac3f773ddf74"; 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 = [ buildInputs = [
which qt3 x11 freetype qt3 lame zlib x11 mesa perl
libX11 libXinerama libXv libXxf86vm libXrandr libXmu xlibs.libXv xlibs.libXrandr xlibs.libXvMC xlibs.libXmu
lame zlib mesa
]; ];
patches = [ patches = [

26
pkgs/applications/video/mythtv/purity.patch
View File

@ -1,8 +1,8 @@
diff -rc mythtv-0.20-orig/configure mythtv-0.20/configure diff -rc mythtv-0.21-orig/configure mythtv-0.21/configure
*** mythtv-0.20-orig/configure 2006-08-28 18:18:08.000000000 +0200 *** mythtv-0.21-orig/configure 2008-03-04 22:23:23.000000000 +0100
--- mythtv-0.20/configure 2006-09-14 17:05:12.000000000 +0200 --- mythtv-0.21/configure 2008-06-23 11:00:09.000000000 +0200
*************** ***************
*** 1225,1231 **** *** 1687,1693 ****
has_library() 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"` LIBPATHS=`cat /etc/ld.so.conf | grep -v "#" | grep -v "include"`
else else
LIBPATHS='' LIBPATHS=''
--- 1225,1231 ---- --- 1687,1693 ----
has_library() has_library()
{ {
@ -19,7 +19,7 @@ diff -rc mythtv-0.20-orig/configure mythtv-0.20/configure
else else
LIBPATHS='' LIBPATHS=''
*************** ***************
*** 1235,1241 **** *** 1698,1704 ****
LIBPATHS="$LIBPATHS `echo $DYLD_LIBRARY_PATH | sed s/':'/' '/g` " LIBPATHS="$LIBPATHS `echo $DYLD_LIBRARY_PATH | sed s/':'/' '/g` "
# recurse down just one level, should be enough in most cases # 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"` INCL=`cat /etc/ld.so.conf | grep -v "#" | grep "^include"`
SRCH=`echo "$INCL" | sed '{ s/^include \//\//; s/^include /\/etc\//}'` SRCH=`echo "$INCL" | sed '{ s/^include \//\//; s/^include /\/etc\//}'`
for x in $SRCH ; do for x in $SRCH ; do
--- 1235,1241 ---- --- 1698,1704 ----
LIBPATHS="$LIBPATHS `echo $DYLD_LIBRARY_PATH | sed s/':'/' '/g` " LIBPATHS="$LIBPATHS `echo $DYLD_LIBRARY_PATH | sed s/':'/' '/g` "
# recurse down just one level, should be enough in most cases # 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\//}'` SRCH=`echo "$INCL" | sed '{ s/^include \//\//; s/^include /\/etc\//}'`
for x in $SRCH ; do for x in $SRCH ; do
*************** ***************
*** 1244,1250 **** *** 1707,1713 ****
done done
fi fi
@ -44,7 +44,7 @@ diff -rc mythtv-0.20-orig/configure mythtv-0.20/configure
HAS_IT="no" HAS_IT="no"
for LIBPATH in $LIBPATHS ; do for LIBPATH in $LIBPATHS ; do
--- 1244,1250 ---- --- 1707,1713 ----
done done
fi fi
@ -53,23 +53,23 @@ diff -rc mythtv-0.20-orig/configure mythtv-0.20/configure
HAS_IT="no" HAS_IT="no"
for LIBPATH in $LIBPATHS ; do for LIBPATH in $LIBPATHS ; do
*************** ***************
*** 1257,1265 **** *** 1720,1728 ****
has_header() has_header()
{ {
! HPATHS="/usr/local/include /usr/include /usr/include/g++-v3 /usr/X11R6/include" ! HPATHS="/usr/local/include /usr/include /usr/include/g++-v3 /usr/X11R6/include"
INCL=`echo $DYLD_LIBRARY_PATH $LD_LIBRARY_PATH | sed s/':'/' '/g` 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" HAS_IT="no"
for HPATH in $HPATHS ; do for HPATH in $HPATHS ; do
--- 1257,1265 ---- --- 1720,1728 ----
has_header() has_header()
{ {
! HPATHS="" ! HPATHS=""
INCL=`echo $DYLD_LIBRARY_PATH $LD_LIBRARY_PATH | sed s/':'/' '/g` 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" HAS_IT="no"
for HPATH in $HPATHS ; do for HPATH in $HPATHS ; do

12
pkgs/top-level/all-packages.nix
View File

@ -3224,6 +3224,14 @@ let pkgs = rec {
mysqlSupport = getConfig ["qt" "mysql"] false; 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 { qt4 = import ../development/libraries/qt-4 {
inherit fetchurl stdenv fetchsvn zlib libjpeg libpng which mysql mesa openssl cups dbus inherit fetchurl stdenv fetchsvn zlib libjpeg libpng which mysql mesa openssl cups dbus
fontconfig freetype pkgconfig libtiff; fontconfig freetype pkgconfig libtiff;
@ -6121,8 +6129,8 @@ let pkgs = rec {
}; };
mythtv = import ../applications/video/mythtv { mythtv = import ../applications/video/mythtv {
inherit fetchurl stdenv which qt3 x11 lame zlib mesa; inherit fetchurl stdenv which x11 xlibs lame zlib mesa freetype perl;
inherit (xlibs) libX11 libXinerama libXv libXxf86vm libXrandr libXmu; qt3 = qt3mysql;
}; };
nano = import ../applications/editors/nano { nano = import ../applications/editors/nano {