[arch-commits] Commit in miro/repos (3 files)
Ronald van Haren
ronald at archlinux.org
Wed Dec 9 10:12:50 UTC 2009
Date: Wednesday, December 9, 2009 @ 05:12:50
Author: ronald
Revision: 60907
Merged revisions 60906 via svnmerge from
svn+ssh://gerolde.archlinux.org/srv/svn-packages/miro/trunk
........
r60906 | ronald | 2009-12-09 11:12:23 +0100 (Wed, 09 Dec 2009) | 2 lines
upgpkg: miro 2.5.4-2
fix xine backend FS#17085; xine backend will most likely be removed upstream starting with the 2.6 series
........
Added:
miro/repos/testing-x86_64/xine.pyx.patch
(from rev 60906, miro/trunk/xine.pyx.patch)
Modified:
miro/repos/testing-x86_64/ (properties)
miro/repos/testing-x86_64/PKGBUILD
----------------+
PKGBUILD | 11 ++++++++---
xine.pyx.patch | 11 +++++++++++
2 files changed, 19 insertions(+), 3 deletions(-)
Property changes on: miro/repos/testing-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
- /miro/trunk:1-60840
+ /miro/trunk:1-60906
Modified: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD 2009-12-09 10:12:23 UTC (rev 60906)
+++ testing-x86_64/PKGBUILD 2009-12-09 10:12:50 UTC (rev 60907)
@@ -3,7 +3,7 @@
pkgname=miro
pkgver=2.5.4
-pkgrel=1
+pkgrel=2
pkgdesc="The free and open source internet TV platform"
arch=('i686' 'x86_64')
url="http://www.getmiro.com"
@@ -15,10 +15,15 @@
'hicolor-icon-theme')
makedepends=('pkgconfig' 'pm-utils' 'qt3')
install=miro.install
-source=(http://ftp.osuosl.org/pub/pculture.org/miro/src/miro-${pkgver}.tar.gz)
-md5sums=('d0ae2bf0463201c6b6dc7367f1fa8b3c')
+source=(http://ftp.osuosl.org/pub/pculture.org/miro/src/miro-${pkgver}.tar.gz
+ 'xine.pyx.patch')
+md5sums=('d0ae2bf0463201c6b6dc7367f1fa8b3c'
+ '3b30e1247b86e0f6bb8da9e2bdd2530e')
build() {
cd ${srcdir}/miro-${pkgver}/platform/gtk-x11
+
+ patch -Np3 -i ${srcdir}/xine.pyx.patch || return 1 #fix xine backend FS#17085
+
python setup.py install --root=${pkgdir} || return 1
}
Copied: miro/repos/testing-x86_64/xine.pyx.patch (from rev 60906, miro/trunk/xine.pyx.patch)
===================================================================
--- testing-x86_64/xine.pyx.patch (rev 0)
+++ testing-x86_64/xine.pyx.patch 2009-12-09 10:12:50 UTC (rev 60907)
@@ -0,0 +1,11 @@
+--- miro-2.5.4/platform/gtk-x11/xine/xine.pyx.old 2009-12-09 10:52:56.233879313 +0100
++++ miro-2.5.4/platform/gtk-x11/xine/xine.pyx 2009-12-09 10:53:07.930529960 +0100
+@@ -37,6 +37,8 @@
+
+ cdef extern from "X11/Xlib.h":
+ ctypedef unsigned long Drawable
++ ctypedef struct Display
++ Display *XOpenDisplay(char* display_name)
+
+ cdef extern from "Python.h":
+ ctypedef int PyGILState_STATE
More information about the arch-commits
mailing list