summaryrefslogtreecommitdiffstats
path: root/abs/extra-testing
diff options
context:
space:
mode:
authorCecil Hugh Watson <knoppmyth@gmail.com>2009-04-30 17:21:06 (GMT)
committerCecil Hugh Watson <knoppmyth@gmail.com>2009-04-30 17:21:06 (GMT)
commite0366c16c6cc3833daffc4fc0c24c642bff870e2 (patch)
treeee00ff76c534a843cc0c72944cdd0364d6467535 /abs/extra-testing
parenta1e995a84b1f462b26608f12d6ff3a20031f2579 (diff)
downloadlinhes_pkgbuild-e0366c16c6cc3833daffc4fc0c24c642bff870e2.zip
linhes_pkgbuild-e0366c16c6cc3833daffc4fc0c24c642bff870e2.tar.gz
linhes_pkgbuild-e0366c16c6cc3833daffc4fc0c24c642bff870e2.tar.bz2
Latest Miro.
Diffstat (limited to 'abs/extra-testing')
-rw-r--r--abs/extra-testing/miro/Changelog2
-rw-r--r--abs/extra-testing/miro/PKGBUILD18
-rw-r--r--abs/extra-testing/miro/miro.exec.patch9
-rw-r--r--abs/extra-testing/miro/miro.install43
4 files changed, 63 insertions, 9 deletions
diff --git a/abs/extra-testing/miro/Changelog b/abs/extra-testing/miro/Changelog
new file mode 100644
index 0000000..40505f2
--- /dev/null
+++ b/abs/extra-testing/miro/Changelog
@@ -0,0 +1,2 @@
+Miro 2.0.4-3 4/30/09
+Upgrade miro.install to add remove miro from is.xml.
diff --git a/abs/extra-testing/miro/PKGBUILD b/abs/extra-testing/miro/PKGBUILD
index 121304d..b882d51 100644
--- a/abs/extra-testing/miro/PKGBUILD
+++ b/abs/extra-testing/miro/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 29632 2009-03-10 19:36:59Z ronald $
+# $Id: PKGBUILD 35621 2009-04-14 18:07:17Z ronald $
# Maintainer: Ronald van Haren <ronald.archlinux.org>
pkgname=miro
-pkgver=2.0.2
-pkgrel=1
+pkgver=2.0.4
+pkgrel=3
pkgdesc="The free and open source internet TV platform"
arch=('i686' 'x86_64')
url="http://www.getmiro.com"
license=('GPL2')
-depends=('xine-lib>=1.1.16.1' 'boost>=1.37.0' 'gnome-python-extras>=2.19.1'
+depends=('xine-lib>=1.1.16.1' 'boost>=1.37.0' 'gnome-python-extras>=2.25.3'
'dbus-python>=0.82.4' 'pyrex' 'xulrunner>=1.9.0.1' 'gtk2' 'nspr')
makedepends=('pkgconfig' 'pm-utils' 'qt3')
optdepends=('gstreamer0.10-python: gstreamer backend (potentially unstable)' 'gstreamer0.10: gstreamer backend (potentially unstable')
@@ -16,10 +16,16 @@ install=miro.install
conflicts=('democracy')
replaces=('democracy')
provides=('democracy')
-source=(http://ftp.osuosl.org/pub/pculture.org/miro/src/Miro-${pkgver}.tar.gz)
-md5sums=('ac72878d2faa0f62f96aca2e6d229cb9')
+source=(http://ftp.osuosl.org/pub/pculture.org/miro/src/Miro-${pkgver}.tar.gz
+ miro.exec.patch)
+md5sums=('e6cf48252496b2bddd290f375fc0ca33'
+ '355648eac790d52c51ccb014736f90fc')
build() {
cd ${srcdir}/Miro-${pkgver}/platform/gtk-x11
python setup.py install --root=${pkgdir} || return 1
+
+ # Fix FS#14196
+ cd ${pkgdir}
+ patch -Np0 -i ${srcdir}/miro.exec.patch || return 1
}
diff --git a/abs/extra-testing/miro/miro.exec.patch b/abs/extra-testing/miro/miro.exec.patch
new file mode 100644
index 0000000..4b012af
--- /dev/null
+++ b/abs/extra-testing/miro/miro.exec.patch
@@ -0,0 +1,9 @@
+--- usr/bin/miro.old 2009-04-14 19:40:09.578785938 +0200
++++ usr/bin/miro 2009-04-14 19:40:34.445435006 +0200
+@@ -23,5 +23,5 @@
+
+ LD_LIBRARY_PATH=/usr/lib/xulrunner-1.9 $GDB -ex 'set breakpoint pending on' -ex 'run' --args $PYTHON ./miro.real --sync "$@"
+ else
+- LD_LIBRARY_PATH=/usr/lib/xulrunner-1.9 miro.real "$@"
++ MOZILLA_FIVE_HOME="/usr/lib/xulrunner-1.9/" LD_LIBRARY_PATH=/usr/lib/xulrunner-1.9 miro.real "$@"
+ fi
diff --git a/abs/extra-testing/miro/miro.install b/abs/extra-testing/miro/miro.install
index 380c860..9294898 100644
--- a/abs/extra-testing/miro/miro.install
+++ b/abs/extra-testing/miro/miro.install
@@ -1,13 +1,50 @@
+# arg 1: the new package version
post_install() {
update-desktop-database -q
+ mv /usr/share/mythtv/is.xml /tmp
+ grep -v -e /mythmenu /tmp/is.xml > /tmp/is.xml.tmp
+ echo "<!--#Miro-->" >> /tmp/is.xml.tmp
+ echo " <button>" >> /tmp/is.xml.tmp
+ echo " <type>STREAM</type>" >> /tmp/is.xml.tmp
+ echo " <text>Miro Player</text>" >> /tmp/is.xml.tmp
+ echo " <action>EXEC /usr/bin/miro</action>" >> /tmp/is.xml.tmp
+ echo " </button>" >> /tmp/is.xml.tmp
+ echo "<!--#Miro-->" >> /tmp/is.xml.tmp
+ echo "" >> /tmp/is.xml.tmp
+ echo "</mythmenu>" >> /tmp/is.xml.tmp
+ mv /tmp/is.xml.tmp /usr/share/mythtv/is.xml
+ if [ -d /myth/democracy ]
+ then
+ ln -s /myth/democracy /home/mythtv/.miro
+ ln -s /myth/miro/Movies /myth/video/Miro
+ exit 1
+ else
+ if [ -d /myth/miro ]
+ then
+ ln -s /myth/miro /home/mythtv/.miro
+ ln -s /myth/miro/Movies /myth/video/Miro
+ exit 1
+ else
+ if [ ! -d /myth/miro -o /myth/democracy ]
+ then
+ mkdir -p /myth/miro/Movies
+ ln -s /myth/miro /home/mythtv/.miro
+ ln -s /myth/miro/Movies /home/mythtv/Movies
+ ln -s /myth/miro/Movies /myth/video/Miro
+ fi
+ fi
+ fi
}
post_upgrade() {
- post_install $1
+ post_instal $1
}
post_remove() {
- update-desktop-database -q
+ update-desktop-database -q
+ rm -fr /home/mythtv/.miro /myth/video/Miro /myth/miro /myth/democracy
}
-
+op=$1
+shift
+$op $*