Updated Miro.

3 files changed, 29 insertions, 63 deletions

diff --git a/abs/extra-testing/miro/PKGBUILD b/abs/extra-testing/miro/PKGBUILD
index 8167dc4..121304d 100644
--- a/abs/extra-testing/miro/PKGBUILD
+++ b/abs/extra-testing/miro/PKGBUILD
@@ -1,41 +1,25 @@
-# $Id: PKGBUILD 18952 2008-11-12 08:23:26Z ronald $
+# $Id: PKGBUILD 29632 2009-03-10 19:36:59Z ronald $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 
 pkgname=miro
-pkgver=1.2.8
-pkgrel=5
+pkgver=2.0.2
+pkgrel=1
 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.12' 'boost>=1.36.0' 'gnome-python-extras>=2.19.1'
+depends=('xine-lib>=1.1.16.1' 'boost>=1.37.0' 'gnome-python-extras>=2.19.1'
 	 'dbus-python>=0.82.4' 'pyrex' 'xulrunner>=1.9.0.1' 'gtk2' 'nspr')
-makedepends=('pkgconfig' 'qt3')
+makedepends=('pkgconfig' 'pm-utils' 'qt3')
+optdepends=('gstreamer0.10-python: gstreamer backend (potentially unstable)' 'gstreamer0.10: gstreamer backend (potentially unstable')
 install=miro.install
 conflicts=('democracy')
 replaces=('democracy')
 provides=('democracy')
-
-source=(http://ftp.osuosl.org/pub/pculture.org/miro/src/Miro-${pkgver}.tar.gz
-        missing-headers.patch
-	Miro-xulrunner.patch
-	boost_1.36.0_fix.patch
-	miro_python26.patch)
-
-md5sums=('b468a953014272095171303ba3f0745d'
-         'b5482eac565a26817af0105b061a8ad5'
-         '3c06b40cd13c2fb202f58dcf64d4b524'
-         '3b4e1eac01155b9de381b0744ba9d725'
-         'a913b2340136ac0fbb9034523faf667a')
+source=(http://ftp.osuosl.org/pub/pculture.org/miro/src/Miro-${pkgver}.tar.gz)
+md5sums=('ac72878d2faa0f62f96aca2e6d229cb9')
 
 build() {
-  cd ${srcdir}/Miro-${pkgver}
-  patch -Np1 -i ${srcdir}/missing-headers.patch || return 1
-  patch -Np1 -i ${srcdir}/Miro-xulrunner.patch || return 1
-  patch -Np1 -i ${srcdir}/boost_1.36.0_fix.patch || return 1
-
-  cd platform/gtk-x11
-  patch -Np0 -i ${srcdir}/miro_python26.patch || return 1
-
+  cd ${srcdir}/Miro-${pkgver}/platform/gtk-x11
   python setup.py install --root=${pkgdir} || return 1
 }
diff --git a/abs/extra-testing/miro/miro-xine.patch b/abs/extra-testing/miro/miro-xine.patch
new file mode 100644
index 0000000..5abf5f1
--- /dev/null
+++ b/abs/extra-testing/miro/miro-xine.patch
@@ -0,0 +1,12 @@
+--- usr/bin/miro.old	2009-02-22 21:49:26.332356738 +0100
++++ usr/bin/miro	2009-02-22 21:50:39.169010435 +0100
+@@ -21,7 +21,7 @@
+         exit;
+     fi
+ 
+-    LD_LIBRARY_PATH=/usr/lib/xulrunner-1.9 $GDB -ex 'set breakpoint pending on' -ex 'break gdk_x_error' -ex 'run' --args $PYTHON ./miro.real --sync "$@"
++    LD_LIBRARY_PATH=/usr/lib/xulrunner-1.9 $GDB -ex 'set breakpoint pending on' -ex 'break gdk_x_error' -ex 'run' --args $PYTHON ./miro.real --set xine-driver=opengl --sync "$@"
+ else
+-    LD_LIBRARY_PATH=/usr/lib/xulrunner-1.9 miro.real "$@"
++    LD_LIBRARY_PATH=/usr/lib/xulrunner-1.9 miro.real --set xine-driver=opengl "$@"
+ fi
diff --git a/abs/extra-testing/miro/miro.install b/abs/extra-testing/miro/miro.install
index 4ee823b..380c860 100644
--- a/abs/extra-testing/miro/miro.install
+++ b/abs/extra-testing/miro/miro.install
@@ -1,43 +1,13 @@
-# arg 1:  the new package version
 post_install() {
-  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
+  update-desktop-database -q
 }
+
+post_upgrade() {
+  post_install $1
+}
+
 post_remove() {
-	rm -fr /home/mythtv/.miro /myth/video/Miro /myth/miro /myth/democracy
+  update-desktop-database -q
 }
 
-op=$1
-shift
-$op $*
+