From 707bf75144d6c3478f41ae071d80b5ccd1fd098c Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Fri, 16 Mar 2012 22:26:26 +0000 Subject: [PATCH] mythth-0.24.2 New dependencies: * Qt4 * Pulseaudio (optional but I've hardcoded it) * fftw (single precision) svn path=/nixpkgs/trunk/; revision=33180 --- pkgs/applications/video/mythtv/builder.sh | 25 ------- pkgs/applications/video/mythtv/default.nix | 40 ++++------ pkgs/applications/video/mythtv/purity.patch | 75 ------------------- pkgs/applications/video/mythtv/settings.patch | 21 +++--- 4 files changed, 25 insertions(+), 136 deletions(-) delete mode 100644 pkgs/applications/video/mythtv/builder.sh delete mode 100644 pkgs/applications/video/mythtv/purity.patch diff --git a/pkgs/applications/video/mythtv/builder.sh b/pkgs/applications/video/mythtv/builder.sh deleted file mode 100644 index 31edf87641bb..000000000000 --- a/pkgs/applications/video/mythtv/builder.sh +++ /dev/null @@ -1,25 +0,0 @@ -source $stdenv/setup - - -# Hack - MythTV's configure searches LD_LIBRARY_PATH for its -# dependencies. -for i in $pkgs; do - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH${LD_LIBRARY_PATH:+:}$i/lib -done -echo $LD_LIBRARY_PATH - - -buildPhase() { - qmake mythtv.pro - make -} - - -postInstall() { - sqlDir="$out/share/mythtv/sql" - mkdir -p $sqlDir - cp -p ./database/mc.sql $sqlDir/ -} - - -genericBuild diff --git a/pkgs/applications/video/mythtv/default.nix b/pkgs/applications/video/mythtv/default.nix index 821c37d9c518..59a2519edb45 100644 --- a/pkgs/applications/video/mythtv/default.nix +++ b/pkgs/applications/video/mythtv/default.nix @@ -1,36 +1,22 @@ -a@{ stdenv, fetchurl, which, qt3, x11, xlibs -, lame, zlib, mesa, alsaLib -, freetype, perl +{ stdenv, fetchurl, which, qt4, x11, pulseaudio, fftwSinglePrec +, lame, zlib, mesa, alsaLib, freetype, perl, pkgconfig +, libX11, libXv, libXrandr, libXvMC, libXinerama, libXxf86vm, libXmu }: -let - qt3 = a.qt3.override { mysqlSupport = true; }; -in +stdenv.mkDerivation rec { + name = "mythtv-0.24.2"; -stdenv.mkDerivation { - name = "mythtv-0.21"; - - builder = ./builder.sh; - src = fetchurl { - url = http://ftp.osuosl.org/pub/mythtv/mythtv-0.21.tar.bz2; - sha256 = "1r654fvklpsf6h9iqckb8fhd7abgs71lx6xh352xgz9yzjl7ia1k"; + url = "http://ftp.osuosl.org/pub/mythtv/${name}.tar.bz2"; + sha256 = "14mkyf2b26pc9spx6lg15mml0nqyg1r3qnq8m9dz3110h771y2db"; }; - #configureFlags = "--x11-path=/no-such-path --dvb-path=/no-such-path"; - - configureFlags = '' - --disable-joystick-menu --disable-dvb - ''; - buildInputs = [ - freetype qt3 lame zlib x11 mesa perl alsaLib - xlibs.libX11 xlibs.libXv xlibs.libXrandr xlibs.libXvMC xlibs.libXmu - xlibs.libXinerama xlibs.libXxf86vm xlibs.libXmu - ]; - - patches = [ - ./settings.patch - ./purity.patch # don't search in /usr/include etc. + freetype qt4 lame zlib x11 mesa perl alsaLib pulseaudio fftwSinglePrec + libX11 libXv libXrandr libXvMC libXmu libXinerama libXxf86vm libXmu ]; + + buildNativeInputs = [ pkgconfig which ]; + + patches = [ ./settings.patch ]; } diff --git a/pkgs/applications/video/mythtv/purity.patch b/pkgs/applications/video/mythtv/purity.patch deleted file mode 100644 index abbd1daac323..000000000000 --- a/pkgs/applications/video/mythtv/purity.patch +++ /dev/null @@ -1,75 +0,0 @@ -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 -*************** -*** 1687,1693 **** - - has_library() - { -! if test -f /etc/ld.so.conf ; then - LIBPATHS=`cat /etc/ld.so.conf | grep -v "#" | grep -v "include"` - else - LIBPATHS='' ---- 1687,1693 ---- - - has_library() - { -! if false ; then - LIBPATHS=`cat /etc/ld.so.conf | grep -v "#" | grep -v "include"` - else - LIBPATHS='' -*************** -*** 1698,1704 **** - LIBPATHS="$LIBPATHS `echo $DYLD_LIBRARY_PATH | sed s/':'/' '/g` " - - # recurse down just one level, should be enough in most cases -! if test -f /etc/ld.so.conf ; then - INCL=`cat /etc/ld.so.conf | grep -v "#" | grep "^include"` - SRCH=`echo "$INCL" | sed '{ s/^include \//\//; s/^include /\/etc\//}'` - for x in $SRCH ; do ---- 1698,1704 ---- - LIBPATHS="$LIBPATHS `echo $DYLD_LIBRARY_PATH | sed s/':'/' '/g` " - - # recurse down just one level, should be enough in most cases -! if false ; then - INCL=`cat /etc/ld.so.conf | grep -v "#" | grep "^include"` - SRCH=`echo "$INCL" | sed '{ s/^include \//\//; s/^include /\/etc\//}'` - for x in $SRCH ; do -*************** -*** 1707,1713 **** - done - fi - -! LIBPATHS="`echo $LIBPATHS /$libdir_name /usr/$libdir_name /usr/local/$libdir_name /usr/X11R6/$libdir_name | sed s/'\/ '/' '/g` " - - HAS_IT="no" - for LIBPATH in $LIBPATHS ; do ---- 1707,1713 ---- - done - fi - -! LIBPATHS="`echo $LIBPATHS | sed s/'\/ '/' '/g` " - - HAS_IT="no" - for LIBPATH in $LIBPATHS ; do -*************** -*** 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") - - HAS_IT="no" - for HPATH in $HPATHS ; do ---- 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") - - HAS_IT="no" - for HPATH in $HPATHS ; do diff --git a/pkgs/applications/video/mythtv/settings.patch b/pkgs/applications/video/mythtv/settings.patch index bd3824eba904..ec1e70097921 100644 --- a/pkgs/applications/video/mythtv/settings.patch +++ b/pkgs/applications/video/mythtv/settings.patch @@ -1,10 +1,13 @@ -diff -urN mythtv-0.18.1-orig/settings.pro mythtv-0.18.1/settings.pro ---- mythtv-0.18.1-orig/settings.pro 2005-10-22 15:32:48.000000000 +0200 -+++ mythtv-0.18.1/settings.pro 2005-10-22 15:35:01.000000000 +0200 -@@ -1,5 +1,6 @@ - CONFIG += $$CCONFIG +diff --git a/Makefile b/Makefile +index 05db819..383036d 100644 +--- a/Makefile ++++ b/Makefile +@@ -53,7 +53,7 @@ i18n/Makefile: i18n/i18n.pro + locales/Makefile: locales/locales.pro -+PREFIX = $$(out) - isEmpty( PREFIX ) { - PREFIX = /usr/local - } + $(addsuffix /Makefile,$(QT_SUBDIRS)): %/Makefile : +- cd $*; $(QMAKE) QMAKE=$(QMAKE) -o $(@F) $(