[arch-commits] Commit in xvidcap/repos (3 files)

Andrea Scarpino andrea at archlinux.org
Fri Jan 15 07:29:26 EST 2010


    Date: Friday, January 15, 2010 @ 07:29:26
  Author: andrea
Revision: 63161

Merged revisions 63160 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/xvidcap/trunk

........
  r63160 | andrea | 2010-01-15 13:28:48 +0100 (Fri, 15 Jan 2010) | 2 lines
  
  upgpkg: xvidcap 1.1.7-2
      patched for the new xextproto (FS#17809)
........

Added:
  xvidcap/repos/extra-i686/xextproto-7.1.1.patch
    (from rev 63160, xvidcap/trunk/xextproto-7.1.1.patch)
Modified:
  xvidcap/repos/extra-i686/	(properties)
  xvidcap/repos/extra-i686/PKGBUILD

-----------------------+
 PKGBUILD              |   15 ++++++++++-----
 xextproto-7.1.1.patch |   11 +++++++++++
 2 files changed, 21 insertions(+), 5 deletions(-)


Property changes on: xvidcap/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /xvidcap/trunk:1-25297
   + /xvidcap/trunk:1-63160

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2010-01-15 12:28:48 UTC (rev 63160)
+++ extra-i686/PKGBUILD	2010-01-15 12:29:26 UTC (rev 63161)
@@ -1,24 +1,29 @@
 # $Id$
-# Maintainer: Andrea Scarpino <andrea at archlinux.org>
+# Maintainer:
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
 # Contributor: red_over_blue, Abaddon <kukububu at go2.pl>
 # Contributor: damir <damir at archlinux.org>
 
 pkgname=xvidcap
 pkgver=1.1.7
-pkgrel=1
+pkgrel=2
 pkgdesc="A small tool to capture things going on on an X-Windows display to either individual frames or an MPEG video"
 arch=("i686" "x86_64")
 license=('GPL')
 url="http://xvidcap.sourceforge.net/"
-depends=('dbus-glib' 'libxdamage' 'lame' 'gtk2>=2.8.15' 'libxmu' 'libglade') 
+depends=('dbus-glib' 'lame' 'libxmu' 'libglade')
 #ffmpeg not needed yet, because internal one used
 makedepends=('perlxml' 'rarian')
-source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('b39a682d3ef9fcbf424af771936780e2')
+source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
+	'xextproto-7.1.1.patch')
+md5sums=('b39a682d3ef9fcbf424af771936780e2'
+	'fbde2b076c5ea05723883b87f3ef2a65')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
 
+  patch -Np1 -i ${srcdir}/xextproto-7.1.1.patch
+
   ./configure --prefix=/usr \
     --with-x \
     --with-gtk2

Copied: xvidcap/repos/extra-i686/xextproto-7.1.1.patch (from rev 63160, xvidcap/trunk/xextproto-7.1.1.patch)
===================================================================
--- extra-i686/xextproto-7.1.1.patch	                        (rev 0)
+++ extra-i686/xextproto-7.1.1.patch	2010-01-15 12:29:26 UTC (rev 63161)
@@ -0,0 +1,11 @@
+--- xvidcap-1.1.7/src/capture.c.orig	2008-05-26 02:01:53.000000000 +0400
++++ xvidcap-1.1.7/src/capture.c	2009-12-12 00:12:31.368260518 +0300
+@@ -65,7 +65,7 @@
+ #include <sys/ipc.h>
+ #include <sys/shm.h>
+ #include <X11/extensions/XShm.h>
+-#include <X11/extensions/shmstr.h>
++#include <X11/extensions/shmproto.h>
+ #ifndef SOLARIS
+ #include <X11/extensions/extutil.h>
+ #endif     // SOLARIS



More information about the arch-commits mailing list