From 38eb5e8ffc8b697792c8fe168c31ca93af198dc3 Mon Sep 17 00:00:00 2001 From: fake Date: Tue, 21 Dec 2004 04:52:13 +0000 Subject: [PATCH] fake: mythtv/myth*: update to 2004-12-14 now supports passing PREFIX, update DVB patch to v 3.1. [2004121722005805740] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@5277 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/fake/mythbrowser/mythbrowser.conf | 4 +--- package/fake/mythbrowser/mythbrowser.desc | 4 ++-- package/fake/mythdvd/mythdvd.conf | 3 +-- package/fake/mythdvd/mythdvd.desc | 4 ++-- package/fake/mythgallery/mythgallery.conf | 8 +------- package/fake/mythgallery/mythgallery.desc | 4 ++-- package/fake/mythgame/mythgame.conf | 8 +------- package/fake/mythgame/mythgame.desc | 4 ++-- package/fake/mythmusic/mythmusic.conf | 7 +------ package/fake/mythmusic/mythmusic.desc | 4 ++-- package/fake/mythnews/mythnews.conf | 8 +------- package/fake/mythphone/mythphone.conf | 5 ++--- package/fake/mythphone/mythphone.desc | 4 ++-- package/fake/mythtv/mythtv.conf | 18 ++++++++---------- package/fake/mythtv/mythtv.desc | 8 +++----- package/fake/mythvideo/mythvideo.conf | 7 +------ package/fake/mythvideo/mythvideo.desc | 4 ++-- package/fake/mythweather/mythweather.conf | 8 +------- package/fake/mythweather/mythweather.desc | 4 ++-- 19 files changed, 37 insertions(+), 79 deletions(-) diff --git a/package/fake/mythbrowser/mythbrowser.conf b/package/fake/mythbrowser/mythbrowser.conf index 66f0147c4..f02ca6c63 100644 --- a/package/fake/mythbrowser/mythbrowser.conf +++ b/package/fake/mythbrowser/mythbrowser.conf @@ -28,13 +28,11 @@ else fi mythbrws_premake() { - sed -i -e "s,^PREFIX = /usr/local\$,PREFIX = $root/$prefix," settings.pro - # it's a little konqueror, i guess echo "INCLUDEPATH += $root/$ROCKCFG_PKG_KDE3_CORE_PREFIX/include" >> settings.pro echo "LIBS += -L$root/$ROCKCFG_PKG_KDE3_CORE_PREFIX/lib" >> settings.pro - qmake mythbrowser.pro + qmake PREFIX=$root/$prefix mythbrowser.pro } hook_add premake 1 mythbrws_premake diff --git a/package/fake/mythbrowser/mythbrowser.desc b/package/fake/mythbrowser/mythbrowser.desc index 62188af56..f565100f3 100644 --- a/package/fake/mythbrowser/mythbrowser.desc +++ b/package/fake/mythbrowser/mythbrowser.desc @@ -37,9 +37,9 @@ [L] GPL [S] Stable -[V] 2004-11-14 +[V] 2004-12-14 [P] X -?---5---9 180.000 -[D] X mythbrowser-2004-11-14.tar.bz2 cvs://pserver:mythtv:mythtv@cvs.mythtv.org:/var/lib/mythcvs::mythbrowser/!2004-11-14 +[D] X mythbrowser-2004-12-14.tar.bz2 cvs://pserver:mythtv:mythtv@cvs.mythtv.org:/var/lib/mythcvs::mythbrowser/!2004-12-14 # [D] 849512459 mythbrowser-0.16.tar.bz2 http://www.mythtv.org/mc/ diff --git a/package/fake/mythdvd/mythdvd.conf b/package/fake/mythdvd/mythdvd.conf index 2b29b2fb7..12946c97f 100644 --- a/package/fake/mythdvd/mythdvd.conf +++ b/package/fake/mythdvd/mythdvd.conf @@ -28,8 +28,7 @@ else fi mythdvd_premake() { - sed -i -e "s,^PREFIX = /usr/local\$,PREFIX = $root/$prefix," settings.pro - qmake mythdvd.pro + qmake PREFIX=$root/$prefix mythdvd.pro } # the 'real' configure is on a vacation, far away from the mythtv world. diff --git a/package/fake/mythdvd/mythdvd.desc b/package/fake/mythdvd/mythdvd.desc index b3d84fec0..899f930de 100644 --- a/package/fake/mythdvd/mythdvd.desc +++ b/package/fake/mythdvd/mythdvd.desc @@ -33,9 +33,9 @@ [L] GPL [S] Stable -[V] 2004-11-14 +[V] 2004-12-14 [P] X -?---5---9 128.200 -[D] X mythdvd-2004-11-14.tar.bz2 cvs://pserver:mythtv:mythtv@cvs.mythtv.org:/var/lib/mythcvs::mythdvd/!2004-11-14 +[D] X mythdvd-2004-12-14.tar.bz2 cvs://pserver:mythtv:mythtv@cvs.mythtv.org:/var/lib/mythcvs::mythdvd/!2004-12-14 # [D] 3127701505 mythdvd-0.16.tar.bz2 http://www.mythtv.org/mc/ diff --git a/package/fake/mythgallery/mythgallery.conf b/package/fake/mythgallery/mythgallery.conf index 158225145..0140718ce 100644 --- a/package/fake/mythgallery/mythgallery.conf +++ b/package/fake/mythgallery/mythgallery.conf @@ -27,15 +27,9 @@ else prefix=$ROCKCFG_PKG_MYTHTV_PREFIX fi -mythgal_premake() { - sed -i -e "s,^PREFIX = /usr/local\$,PREFIX = $root/$prefix," settings.pro - - qmake mythgallery.pro -} - # this segfaults for me, too - but this time, it is runtime-configurably-default-off. confopt="--enable-opengl" extraconfopt="" -hook_add premake 1 mythgal_premake +hook_add premake 1 "qmake PREFIX=$root/$prefix mythgallery.pro" diff --git a/package/fake/mythgallery/mythgallery.desc b/package/fake/mythgallery/mythgallery.desc index 39088bd1c..7aae8c760 100644 --- a/package/fake/mythgallery/mythgallery.desc +++ b/package/fake/mythgallery/mythgallery.desc @@ -34,9 +34,9 @@ [L] GPL [S] Stable -[V] 2004-11-14 +[V] 2004-12-14 [P] X -?---5---9 164.800 -[D] X mythgallery-2004-11-14.tar.bz2 cvs://pserver:mythtv:mythtv@cvs.mythtv.org:/var/lib/mythcvs::mythgallery/!2004-11-14 +[D] X mythgallery-2004-12-14.tar.bz2 cvs://pserver:mythtv:mythtv@cvs.mythtv.org:/var/lib/mythcvs::mythgallery/!2004-12-14 # [D] 3777925049 mythgallery-0.16.tar.bz2 http://www.mythtv.org/mc/ diff --git a/package/fake/mythgame/mythgame.conf b/package/fake/mythgame/mythgame.conf index aabf4ef13..382f637c6 100644 --- a/package/fake/mythgame/mythgame.conf +++ b/package/fake/mythgame/mythgame.conf @@ -27,11 +27,5 @@ else prefix=$ROCKCFG_PKG_MYTHTV_PREFIX fi -mythgame_premake() { - sed -i -e "s,^PREFIX = /usr/local\$,PREFIX = $root/$prefix," settings.pro - - qmake mythgame.pro -} - -hook_add premake 1 mythgame_premake +hook_add premake 1 "qmake PREFIX=$root/$prefix mythgame.pro" diff --git a/package/fake/mythgame/mythgame.desc b/package/fake/mythgame/mythgame.desc index 0a651028d..4d8033ed9 100644 --- a/package/fake/mythgame/mythgame.desc +++ b/package/fake/mythgame/mythgame.desc @@ -34,9 +34,9 @@ [L] GPL [S] Stable -[V] 2004-11-14 +[V] 2004-12-14 [P] X -?---5---9 128.200 -[D] X mythgame-2004-11-14.tar.bz2 cvs://pserver:mythtv:mythtv@cvs.mythtv.org:/var/lib/mythcvs::mythgame/!2004-11-14 +[D] X mythgame-2004-12-14.tar.bz2 cvs://pserver:mythtv:mythtv@cvs.mythtv.org:/var/lib/mythcvs::mythgame/!2004-12-14 # [D] 2655836649 mythgame-0.16.tar.bz2 http://www.mythtv.org/mc/ diff --git a/package/fake/mythmusic/mythmusic.conf b/package/fake/mythmusic/mythmusic.conf index 7a0114734..18b5c6366 100644 --- a/package/fake/mythmusic/mythmusic.conf +++ b/package/fake/mythmusic/mythmusic.conf @@ -27,11 +27,6 @@ else prefix=$ROCKCFG_PKG_MYTHTV_PREFIX fi -mythmusic_premake() { - sed -i -e "s,^PREFIX = /usr/local\$,PREFIX = $root/$prefix," settings.pro - qmake mythmusic.pro -} - # their 'configure' is not what we'd expect. # additionally, enabling opengl it segfaults for me... #confopt="--enable-opengl" @@ -41,5 +36,5 @@ extraconfopt="" pkginstalled fftw && confopt="$confopt --enable-fftw" pkginstalled libsdl && confopt="$confopt --enable-sdl" -hook_add premake 1 mythmusic_premake +hook_add premake 1 "qmake PREFIX=$root/$prefix mythmusic.pro" diff --git a/package/fake/mythmusic/mythmusic.desc b/package/fake/mythmusic/mythmusic.desc index c684e5a63..3257fe709 100644 --- a/package/fake/mythmusic/mythmusic.desc +++ b/package/fake/mythmusic/mythmusic.desc @@ -34,9 +34,9 @@ [L] GPL [S] Stable -[V] 2004-11-14 +[V] 2004-12-14 [P] X -?---5---9 175.800 -[D] X mythmusic-2004-11-14.tar.bz2 cvs://pserver:mythtv:mythtv@cvs.mythtv.org:/var/lib/mythcvs::mythmusic/!2004-11-14 +[D] X mythmusic-2004-12-14.tar.bz2 cvs://pserver:mythtv:mythtv@cvs.mythtv.org:/var/lib/mythcvs::mythmusic/!2004-12-14 #[D] 2093975099 mythmusic-0.16.tar.bz2 http://www.mythtv.org/mc/ diff --git a/package/fake/mythnews/mythnews.conf b/package/fake/mythnews/mythnews.conf index 3178ce1ff..d8f8f4184 100644 --- a/package/fake/mythnews/mythnews.conf +++ b/package/fake/mythnews/mythnews.conf @@ -27,11 +27,5 @@ else prefix=$ROCKCFG_PKG_MYTHTV_PREFIX fi -mythgame_premake() { - sed -i -e "s,^PREFIX = /usr/local\$,PREFIX = $root/$prefix," settings.pro - - qmake mythnews.pro -} - -hook_add premake 1 mythgame_premake +hook_add premake 1 "qmake PREFIX=$root/$prefix mythnews.pro" diff --git a/package/fake/mythphone/mythphone.conf b/package/fake/mythphone/mythphone.conf index 3636e2158..834f142eb 100644 --- a/package/fake/mythphone/mythphone.conf +++ b/package/fake/mythphone/mythphone.conf @@ -28,10 +28,9 @@ else fi mythphone_premake() { - sed -i -e "s,^PREFIX = /usr/local\$,PREFIX = $root/$prefix," settings.pro - # tries to get libavcodec/avformat.h from here - let's set it to something more appropiate + # tries to get libavcodec/avformat.h from here - let's set it to something appropiate sed -i -e "s,^MYTHLIBDIR = ../../mythtv/libs/\$,MYTHLIBDIR = $root/$prefix/lib/mythtv/libs," settings.pro - qmake mythphone.pro + qmake PREFIX=$root/$prefix mythphone.pro } # no 'traditional' festival in rock diff --git a/package/fake/mythphone/mythphone.desc b/package/fake/mythphone/mythphone.desc index d094669ce..7510c9bf1 100644 --- a/package/fake/mythphone/mythphone.desc +++ b/package/fake/mythphone/mythphone.desc @@ -47,9 +47,9 @@ [L] GPL [S] Stable -[V] 2004-11-28 +[V] 2004-12-14 [P] X -?---5---9 142.600 -[D] X mythphone-2004-11-28.tar.bz2 cvs://pserver:mythtv:mythtv@cvs.mythtv.org:/var/lib/mythcvs::mythphone/!2004-11-28 +[D] X mythphone-2004-12-14.tar.bz2 cvs://pserver:mythtv:mythtv@cvs.mythtv.org:/var/lib/mythcvs::mythphone/!2004-12-14 # [D] 2805903290 mythphone-0.16.tar.bz2 http://www.mythtv.org/mc/ diff --git a/package/fake/mythtv/mythtv.conf b/package/fake/mythtv/mythtv.conf index d939cb219..345eefe6e 100644 --- a/package/fake/mythtv/mythtv.conf +++ b/package/fake/mythtv/mythtv.conf @@ -29,11 +29,9 @@ fi mythtv_prepatch() { # apply the dvb patches to enable channel scanning, etc. - bzcat $archdir/dvb_patch_v2.1-fake.diff.bz2 | patch -p0 - # .. and extract the additional files into the mythtv dir. - tar --use-compress-program=bzip2 -xf $archdir/dvb_patch_v2.1_files.tar.bz2 - # the mythscan utility is in another tarball... - tar --use-compress-program=bzip2 -xf $archdir/mythscan-v2.1-fake.tar.bz2 + tar $taropt $archdir/DVB_PATCH_V3.1.tar.bz2 + patch -p0 < mythtv_dvb_patch_v3.1/dvb_patch_v3.1.diff + tar $taropt mythtv_dvb_patch_v3.1/dvb_patch_v3.1_files.tar.bz2 } mythtv_premake() { @@ -73,11 +71,11 @@ mythtv_premake() { mythtv_postmake() { # build mythscan - cd mythscan - qmake mythscan2.pro - make - cp mythscan2 $root/$prefix/bin - cd .. + # cd mythscan + # qmake mythscan2.pro + # make + # cp mythscan2 $root/$prefix/bin + # cd .. cp setup/setup $root/$prefix/bin/mythsetup cp -r configfiles $docdir/examples diff --git a/package/fake/mythtv/mythtv.desc b/package/fake/mythtv/mythtv.desc index eda4c6cea..b89a028c7 100644 --- a/package/fake/mythtv/mythtv.desc +++ b/package/fake/mythtv/mythtv.desc @@ -41,14 +41,12 @@ [L] GPL [S] Stable -[V] 2004-11-14 +[V] 2004-12-14 [P] X -?---5---9 128.100 [SRC] mythtv -[D] X mythtv-2004-11-14.tar.bz2 cvs://pserver:mythtv:mythtv@cvs.mythtv.org:/var/lib/mythcvs::mythtv/!2004-11-14 +[D] X mythtv-2004-12-14.tar.bz2 cvs://pserver:mythtv:mythtv@cvs.mythtv.org:/var/lib/mythcvs::mythtv/!2004-12-14 # [D] 2139657 mythtv-0.16.tar.bz2 http://www.mythtv.org/mc/ -[D] 1863291052 dvb_patch_v2.1-fake.diff.bz2 http://www.rocklinux.net/people/fake/mythtv/ -[D] 2714057758 dvb_patch_v2.1_files.tar.bz2 http://www.rocklinux.net/people/fake/mythtv/ -[D] 1358422148 mythscan-v2.1-fake.tar.bz2 http://www.rocklinux.net/people/fake/mythtv/ +[D] 2473684999 DVB_PATCH_V3.1.tar.bz2 http://www.digitalregime.com/mythdvb/patches/ diff --git a/package/fake/mythvideo/mythvideo.conf b/package/fake/mythvideo/mythvideo.conf index 11f8ff11e..72220d768 100644 --- a/package/fake/mythvideo/mythvideo.conf +++ b/package/fake/mythvideo/mythvideo.conf @@ -27,10 +27,5 @@ else prefix=$ROCKCFG_PKG_MYTHTV_PREFIX fi -mythvideo_premake() { - sed -i -e "s,^PREFIX = /usr/local\$,PREFIX = $root/$prefix," settings.pro - qmake mythvideo.pro -} - -hook_add premake 1 mythvideo_premake +hook_add premake 1 "qmake PREFIX=$root/$prefix mythvideo.pro" diff --git a/package/fake/mythvideo/mythvideo.desc b/package/fake/mythvideo/mythvideo.desc index 1a3614b6b..58b80b0ae 100644 --- a/package/fake/mythvideo/mythvideo.desc +++ b/package/fake/mythvideo/mythvideo.desc @@ -34,9 +34,9 @@ [L] GPL [S] Stable -[V] 2004-11-14 +[V] 2004-12-14 [P] X -?---5---9 128.200 -[D] X mythvideo-2004-11-14.tar.bz2 cvs://pserver:mythtv:mythtv@cvs.mythtv.org:/var/lib/mythcvs::mythvideo/!2004-11-14 +[D] X mythvideo-2004-12-14.tar.bz2 cvs://pserver:mythtv:mythtv@cvs.mythtv.org:/var/lib/mythcvs::mythvideo/!2004-12-14 # [D] 274146445 mythvideo-0.16.tar.bz2 http://www.mythtv.org/mc/ diff --git a/package/fake/mythweather/mythweather.conf b/package/fake/mythweather/mythweather.conf index 8a8dfabf9..c918c2c29 100644 --- a/package/fake/mythweather/mythweather.conf +++ b/package/fake/mythweather/mythweather.conf @@ -27,11 +27,5 @@ else prefix=$ROCKCFG_PKG_MYTHTV_PREFIX fi -mythwea_premake() { - sed -i -e "s,^PREFIX = /usr/local\$,PREFIX = $root/$prefix," settings.pro - - qmake mythweather.pro -} - -hook_add premake 1 mythwea_premake +hook_add premake 1 "qmake PREFIX=$root/$prefix mythweather.pro" diff --git a/package/fake/mythweather/mythweather.desc b/package/fake/mythweather/mythweather.desc index c8eb6030a..c1959575b 100644 --- a/package/fake/mythweather/mythweather.desc +++ b/package/fake/mythweather/mythweather.desc @@ -35,9 +35,9 @@ [L] GPL [S] Stable -[V] 2004-11-14 +[V] 2004-12-14 [P] X -?---5---9 128.200 -[D] X mythweather-2004-11-14.tar.bz2 cvs://pserver:mythtv:mythtv@cvs.mythtv.org:/var/lib/mythcvs::mythweather/!2004-11-14 +[D] X mythweather-2004-12-14.tar.bz2 cvs://pserver:mythtv:mythtv@cvs.mythtv.org:/var/lib/mythcvs::mythweather/!2004-12-14 # [D] 67097242 mythweather-0.16.tar.bz2 http://www.mythtv.org/mc/