diff options
author | Frans Meulenbroeks <fransmeulenbroeks@gmail.com> | 2010-01-14 20:39:47 +0100 |
---|---|---|
committer | Frans Meulenbroeks <fransmeulenbroeks@gmail.com> | 2010-01-14 20:39:47 +0100 |
commit | 3fd04f71ad25d5df59c636986f741b9a36ce6501 (patch) | |
tree | 995f4a15764d4196a92ecd966150e38d910d57d1 /recipes/mythtv | |
parent | b5b3d83a6f3b1c04a4ebe09f636683ef22495d09 (diff) | |
parent | e426517ed76c7532434f0687f88fca1295530000 (diff) | |
download | openembedded-3fd04f71ad25d5df59c636986f741b9a36ce6501.tar.gz |
Merge branch 'org.openembedded.dev' of git.openembedded.org:openembedded into org.openembedded.dev
Conflicts:
recipes/linux/linux-kirkwood_2.6.33-rc1.bb
Diffstat (limited to 'recipes/mythtv')
-rw-r--r-- | recipes/mythtv/mythplugins_0.22.bb | 10 | ||||
-rw-r--r-- | recipes/mythtv/myththemes_0.22.bb | 8 |
2 files changed, 11 insertions, 7 deletions
diff --git a/recipes/mythtv/mythplugins_0.22.bb b/recipes/mythtv/mythplugins_0.22.bb index b121fdfb20..c53b44816d 100644 --- a/recipes/mythtv/mythplugins_0.22.bb +++ b/recipes/mythtv/mythplugins_0.22.bb @@ -11,18 +11,20 @@ DEPENDS_mythweb_lighttpd = "mythweb" RDEPENDS_mythweb_lighttpd = "lighttpd lighttpd-module-cgi lighttpd-module-fastcgi \ lighttpd-module-rewrite php-cgi lighttpd-module-auth" +PR = "svnr${SRCPV}+r0" PV = "0.22" -PR = "r1" -QMAKE_PROFILES = "mythplugins.pro" - -SRC_URI = "ftp://ftp.osuosl.org/pub/mythtv/mythplugins-0.22.tar.bz2 \ +SRCREV = "23062" +SRC_URI = "svn://svn.mythtv.org/svn/branches/release-0-22-fixes;module=mythtvplugins;proto=http \ file://sysroot.patch;patch=1 \ file://mythplugins_wo_qtopengl.diff;patch=1 \ file://configure.patch;patch=1 \ file://mytharchive.pro.patch;patch=1 \ " + +QMAKE_PROFILES = "mythplugins.pro" + S = "${WORKDIR}/mythplugins-0.22" inherit qmake2 qt4x11 diff --git a/recipes/mythtv/myththemes_0.22.bb b/recipes/mythtv/myththemes_0.22.bb index 6f22a270d9..4e7a64d07a 100644 --- a/recipes/mythtv/myththemes_0.22.bb +++ b/recipes/mythtv/myththemes_0.22.bb @@ -1,12 +1,14 @@ DEPENDS = "mythtv" inherit qmake2 +PR = "svnr${SRCPV}+r0" PV = "0.22" -PR = "r0" -FILES_${PN} =+ "${datadir}" +SRCREV = "23062" +SRC_URI = +"svn://svn.mythtv.org/svn/branches/release-0-22-fixes;module=mythtvthemes;proto=http" -SRC_URI = "ftp://ftp.osuosl.org/pub/mythtv/myththemes-0.22.tar.bz2" +FILES_${PN} =+ "${datadir}" S = "${WORKDIR}/myththemes-0.22" |