[arch-commits] Commit in miro/repos (4 files)

[Ronald van Haren]

    Date: Sunday, February 22, 2009 @ 16:31:20
  Author: ronald
Revision: 27564

Merged revisions 27563 via svnmerge from 
svn+ssh://archlinux.org/srv/svn-packages/miro/trunk

........
  r27563 | ronald | 2009-02-22 22:30:38 +0100 (Sun, 22 Feb 2009) | 1 line
  
  upgpkg: miro 2.0.1-1
........

Added:
  miro/repos/extra-x86_64/miro-xine.patch
    (from rev 27563, miro/trunk/miro-xine.patch)
Modified:
  miro/repos/extra-x86_64/	(properties)
  miro/repos/extra-x86_64/PKGBUILD
  miro/repos/extra-x86_64/miro.install

-----------------+
 PKGBUILD        |   36 +++++++++++++-----------------------
 miro-xine.patch |   12 ++++++++++++
 miro.install    |    4 ----
 3 files changed, 25 insertions(+), 27 deletions(-)


Property changes on: miro/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /miro/trunk:1-18950
   + /miro/trunk:1-27563

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-02-22 21:30:38 UTC (rev 27563)
+++ extra-x86_64/PKGBUILD	2009-02-22 21:31:20 UTC (rev 27564)
@@ -2,40 +2,30 @@
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 
 pkgname=miro
-pkgver=1.2.8
-pkgrel=2
+pkgver=2.0.1
+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' 'gstreamer0.10: gstreamer backend')
 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)
+	'miro-xine.patch')
+md5sums=('9f180474f97f179e78d919e92b66e3e4'
+         'e337440bd665e6c3c8da95f4b11dc447')
 
-md5sums=('b468a953014272095171303ba3f0745d'
-         'b5482eac565a26817af0105b061a8ad5'
-         '3c06b40cd13c2fb202f58dcf64d4b524'
-         '3b4e1eac01155b9de381b0744ba9d725'
-         'a913b2340136ac0fbb9034523faf667a')
-
 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
+  
+  # ugly hack to fix crashing when xine engine is used
+  cd ${pkgdir}
+  patch -Np0 -i ${srcdir}/miro-xine.patch || return 1
 }

Copied: miro/repos/extra-x86_64/miro-xine.patch (from rev 27563, miro/trunk/miro-xine.patch)
===================================================================
--- extra-x86_64/miro-xine.patch	                        (rev 0)
+++ extra-x86_64/miro-xine.patch	2009-02-22 21:31:20 UTC (rev 27564)
@@ -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

Modified: extra-x86_64/miro.install
===================================================================
--- extra-x86_64/miro.install	2009-02-22 21:30:38 UTC (rev 27563)
+++ extra-x86_64/miro.install	2009-02-22 21:31:20 UTC (rev 27564)
@@ -10,8 +10,4 @@
   update-desktop-database -q
 }
 
-op=$1
-shift
 
-$op $*
-