diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2005-02-16 13:19:27 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2005-02-16 13:19:27 +0000 |
| commit | 31c65a13a1baaad55500f1f9d125b2c87d6b5768 (patch) | |
| tree | e58875f577a3031021ebb20000e960881f7036c5 /pkgs/applications/video/mythtv | |
| parent | eeff1fcdd1a1278be0ac5f688f945d6d6e0ea519 (diff) | |
| download | nixlib-31c65a13a1baaad55500f1f9d125b2c87d6b5768.tar nixlib-31c65a13a1baaad55500f1f9d125b2c87d6b5768.tar.gz nixlib-31c65a13a1baaad55500f1f9d125b2c87d6b5768.tar.bz2 nixlib-31c65a13a1baaad55500f1f9d125b2c87d6b5768.tar.lz nixlib-31c65a13a1baaad55500f1f9d125b2c87d6b5768.tar.xz nixlib-31c65a13a1baaad55500f1f9d125b2c87d6b5768.tar.zst nixlib-31c65a13a1baaad55500f1f9d125b2c87d6b5768.zip | |
* MythTV 0.17.
svn path=/nixpkgs/trunk/; revision=2244
Diffstat (limited to 'pkgs/applications/video/mythtv')
| -rw-r--r-- | pkgs/applications/video/mythtv/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/applications/video/mythtv/settings.patch | 52 |
2 files changed, 12 insertions, 46 deletions
diff --git a/pkgs/applications/video/mythtv/default.nix b/pkgs/applications/video/mythtv/default.nix index 9cbd58b1fc41..e0c34103ec6d 100644 --- a/pkgs/applications/video/mythtv/default.nix +++ b/pkgs/applications/video/mythtv/default.nix @@ -3,12 +3,12 @@ assert qt3.mysqlSupport; stdenv.mkDerivation { - name = "mythtv-0.16"; + name = "mythtv-0.17"; builder = ./builder.sh; src = fetchurl { - url = http://catamaran.labs.cs.uu.nl/dist/tarballs/mythtv-0.16.tar.bz2; - md5 = "0eba17cf64c96ea3ead23e7e15419cc0"; + url = http://www.mythtv.org/mc/mythtv-0.17.tar.bz2; + md5 = "c996dc690d36e946396fc5cd4b715e3b"; }; patches = [./settings.patch]; diff --git a/pkgs/applications/video/mythtv/settings.patch b/pkgs/applications/video/mythtv/settings.patch index e5b8188e00d4..f56d7c35d117 100644 --- a/pkgs/applications/video/mythtv/settings.patch +++ b/pkgs/applications/video/mythtv/settings.patch @@ -1,47 +1,13 @@ -diff -rc mythtv-0.16/settings.pro mythtv-new/settings.pro -*** mythtv-0.16/settings.pro 2004-09-07 23:20:16.000000000 +0200 ---- mythtv-new/settings.pro 2005-01-20 22:28:45.219407664 +0100 +diff -rc mythtv-0.17-orig/settings.pro mythtv-0.17/settings.pro +*** mythtv-0.17-orig/settings.pro 2005-02-11 05:02:39.000000000 +0100 +--- mythtv-0.17/settings.pro 2005-02-16 13:38:46.351279092 +0100 *************** -*** 1,12 **** +*** 1,6 **** +--- 1,7 ---- #CONFIG += debug CONFIG += release -! PREFIX = /usr/local - - LIBVERSION = 0.16 - - INCLUDEPATH += $${PREFIX}/include -! INCLUDEPATH *= /usr/local/include - - DEFINES += _GNU_SOURCE - DEFINES += _FILE_OFFSET_BITS=64 ---- 1,12 ---- - #CONFIG += debug - CONFIG += release - -! PREFIX = $$(out) - - LIBVERSION = 0.16 - - INCLUDEPATH += $${PREFIX}/include -! #INCLUDEPATH *= /usr/local/include - - DEFINES += _GNU_SOURCE - DEFINES += _FILE_OFFSET_BITS=64 -*************** -*** 39,45 **** - - # Default Xv support - CONFIG += using_xv -! EXTRA_LIBS += -L/usr/X11R6/lib -lXinerama -lXv -lX11 -lXext -lXxf86vm - - # IVTV (PVR-x50) support. Disable if building on Windows. - CONFIG += using_ivtv ---- 39,45 ---- - - # Default Xv support - CONFIG += using_xv -! EXTRA_LIBS += -lXinerama -lXv -lX11 -lXext -lXxf86vm - - # IVTV (PVR-x50) support. Disable if building on Windows. - CONFIG += using_ivtv ++ PREFIX = $$(out) + isEmpty( PREFIX ) { + PREFIX = /usr/local + } |