summaryrefslogtreecommitdiff
path: root/extra
diff options
context:
space:
mode:
Diffstat (limited to 'extra')
-rw-r--r--extra/alsa-utils/PKGBUILD11
-rw-r--r--extra/alsa-utils/arecord-1.0.27.patch24
-rw-r--r--extra/apr-util/PKGBUILD6
-rw-r--r--extra/at/PKGBUILD36
-rw-r--r--extra/at/atd35
-rw-r--r--extra/at/atd.service9
-rw-r--r--extra/cairo-perl/PKGBUILD13
-rw-r--r--extra/chkrootkit/PKGBUILD42
-rw-r--r--extra/chkrootkit/backslashes.patch22
-rw-r--r--extra/chkrootkit/chkrootkit.cron2
-rw-r--r--extra/chkrootkit/fix-tools-path.patch11
-rw-r--r--extra/chkrootkit/kallsyms.patch30
-rw-r--r--extra/gob2/PKGBUILD6
-rw-r--r--extra/icedtea-web-java7/PKGBUILD15
-rw-r--r--extra/libkdcraw/PKGBUILD7
-rw-r--r--extra/libplist/PKGBUILD9
-rw-r--r--extra/libpst/PKGBUILD14
-rw-r--r--extra/mediastreamer/PKGBUILD37
-rw-r--r--extra/mediastreamer/mediastreamer-ffmpeg.patch57
-rw-r--r--extra/telepathy-kde-accounts-kcm/PKGBUILD8
-rw-r--r--extra/telepathy-kde-approver/PKGBUILD6
-rw-r--r--extra/telepathy-kde-auth-handler/PKGBUILD6
-rw-r--r--extra/telepathy-kde-common-internals/PKGBUILD10
-rw-r--r--extra/telepathy-kde-contact-list/PKGBUILD8
-rw-r--r--extra/telepathy-kde-contact-runner/PKGBUILD6
-rw-r--r--extra/telepathy-kde-desktop-applets/PKGBUILD6
-rw-r--r--extra/telepathy-kde-filetransfer-handler/PKGBUILD6
-rw-r--r--extra/telepathy-kde-integration-module/PKGBUILD6
-rw-r--r--extra/telepathy-kde-send-file/PKGBUILD6
-rw-r--r--extra/telepathy-kde-text-ui/PKGBUILD6
-rw-r--r--extra/xf86-video-vmware/PKGBUILD12
-rw-r--r--extra/xf86-video-vmware/git-fixes.patch89
-rw-r--r--extra/xorg-server/PKGBUILD8
33 files changed, 205 insertions, 364 deletions
diff --git a/extra/alsa-utils/PKGBUILD b/extra/alsa-utils/PKGBUILD
index e63024bb2..ff0ae1a20 100644
--- a/extra/alsa-utils/PKGBUILD
+++ b/extra/alsa-utils/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 182805 2013-04-15 13:03:31Z tpowa $
+# $Id: PKGBUILD 183071 2013-04-17 07:11:00Z tpowa $
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
# Contributor: judd <jvinet@zeroflux.org>
pkgname=alsa-utils
pkgver=1.0.27
-pkgrel=3
+pkgrel=4
pkgdesc="An alternative implementation of Linux sound support"
arch=('i686' 'x86_64')
url="http://www.alsa-project.org"
@@ -15,13 +15,15 @@ license=('GPL')
source=(ftp://ftp.alsa-project.org/pub/utils/$pkgname-${pkgver}.tar.bz2
90alsa
alsa-restore-1.0.27.service.patch
- alsactl-fix-buffer-overflow-1.0.27.patch)
+ alsactl-fix-buffer-overflow-1.0.27.patch
+ arecord-1.0.27.patch)
backup=(etc/conf.d/alsa)
prepare() {
cd ${srcdir}/${pkgname}-${pkgver}
patch -Np1 -i ${srcdir}/alsa-restore-1.0.27.service.patch
patch -Np1 -i ${srcdir}/alsactl-fix-buffer-overflow-1.0.27.patch
+ patch -Np1 -i ${srcdir}/arecord-1.0.27.patch
}
build() {
@@ -43,4 +45,5 @@ package() {
md5sums=('cbfb21a24f63fb052b3392195639ce48'
'529216f6a46e61a546640e08ea7a0879'
'0a27f7b80351d6baa274c32d859bf037'
- 'cd577445636542f9f60b420e4ffe3f0f')
+ 'cd577445636542f9f60b420e4ffe3f0f'
+ 'cecb38f03bd245d0584bfd63370e9a05')
diff --git a/extra/alsa-utils/arecord-1.0.27.patch b/extra/alsa-utils/arecord-1.0.27.patch
new file mode 100644
index 000000000..f9edb2d21
--- /dev/null
+++ b/extra/alsa-utils/arecord-1.0.27.patch
@@ -0,0 +1,24 @@
+From: Jaroslav Kysela <perex@perex.cz>
+Date: Wed, 17 Apr 2013 06:34:34 +0000 (+0200)
+Subject: arecord: add a missing break to the capture loop
+X-Git-Url: http://git.alsa-project.org/?p=alsa-utils.git;a=commitdiff_plain;h=b4f34ac26037c10ac51c4bb29203500165848977
+
+arecord: add a missing break to the capture loop
+
+Signed-off-by: Jaroslav Kysela <perex@perex.cz>
+---
+
+diff --git a/aplay/aplay.c b/aplay/aplay.c
+index 5bdc39c..000d25b 100644
+--- a/aplay/aplay.c
++++ b/aplay/aplay.c
+@@ -3021,6 +3021,9 @@ static void capture(char *orig_name)
+ fd = -1;
+ }
+
++ if (in_aborting)
++ break;
++
+ /* repeat the loop when format is raw without timelimit or
+ * requested counts of data are recorded
+ */
diff --git a/extra/apr-util/PKGBUILD b/extra/apr-util/PKGBUILD
index 377e14c69..13be5ebf5 100644
--- a/extra/apr-util/PKGBUILD
+++ b/extra/apr-util/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 172058 2012-11-27 12:16:31Z jgc $
+# $Id: PKGBUILD 183103 2013-04-17 15:00:29Z jgc $
# Maintainer: Jan de Groot <jgc@archlinux.org>
# Maintainer: Pierre Schmitz <pierre@archlinux.de>
pkgname=apr-util
-pkgver=1.5.1
+pkgver=1.5.2
pkgrel=1
pkgdesc="The Apache Portable Runtime"
arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@ depends=('apr' 'gdbm' 'expat' 'db' 'libldap' 'unixodbc')
options=('!libtool')
license=('APACHE')
source=("http://www.apache.org/dist/apr/apr-util-${pkgver}.tar.bz2")
-md5sums=('9c1db8606e520f201c451ec9a0b095f6')
+md5sums=('89c1348aa79e898d7c34a6206311c9c2')
build() {
cd "${srcdir}/apr-util-${pkgver}"
diff --git a/extra/at/PKGBUILD b/extra/at/PKGBUILD
deleted file mode 100644
index 19267a906..000000000
--- a/extra/at/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 168299 2012-10-08 05:32:58Z eric $
-# Maintainer: Judd Vinet <jvinet@zeroflux.org>
-# Contributor: Todd Musall <tmusall@comcast.net>
-
-pkgname=at
-pkgver=3.1.13
-pkgrel=2
-pkgdesc="AT and batch delayed command scheduling utility and daemon"
-arch=('i686' 'x86_64')
-url="http://packages.qa.debian.org/a/at.html"
-license=('GPL')
-depends=('pam')
-makedepends=('ssmtp')
-backup=('etc/at.deny')
-options=('!makeflags')
-source=(http://ftp.debian.org/debian/pool/main/a/at/at_${pkgver}.orig.tar.gz
- atd atd.service)
-md5sums=('1da61af6c29e323abaaf13ee1a8dad79'
- '35574e34829e7df07a3269d4ab646a29'
- '33976a813f4fe7f5659354601044c6f8')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- ./configure --prefix=/usr \
- --mandir=/usr/share/man \
- --with-jobdir=/var/spool/atd \
- --with-atspool=/var/spool/atd
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make IROOT="${pkgdir}" docdir=/usr/share/doc install
- install -D -m755 "${srcdir}/atd" "${pkgdir}/etc/rc.d/atd"
- install -D -m644 "${srcdir}/atd.service" "${pkgdir}/usr/lib/systemd/system/atd.service"
-}
diff --git a/extra/at/atd b/extra/at/atd
deleted file mode 100644
index d10a46a3b..000000000
--- a/extra/at/atd
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/atd`
-case "$1" in
- start)
- stat_busy "Starting ATD Daemon"
- [ -z "$PID" ] && /usr/sbin/atd
- if [ $? -gt 0 ]; then
- stat_fail
- else
- add_daemon atd
- stat_done
- fi
- ;;
- stop)
- stat_busy "Stopping ATD Daemon"
- [ ! -z "$PID" ] && kill $PID &> /dev/null
- if [ $? -gt 0 ]; then
- stat_fail
- else
- rm_daemon atd
- stat_done
- fi
- ;;
- restart)
- $0 stop
- $0 start
- ;;
- *)
- echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/extra/at/atd.service b/extra/at/atd.service
deleted file mode 100644
index ba359878c..000000000
--- a/extra/at/atd.service
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=ATD daemon
-
-[Service]
-Type=forking
-ExecStart=/usr/sbin/atd
-
-[Install]
-WantedBy=multi-user.target
diff --git a/extra/cairo-perl/PKGBUILD b/extra/cairo-perl/PKGBUILD
index 17cae72ed..710f42b82 100644
--- a/extra/cairo-perl/PKGBUILD
+++ b/extra/cairo-perl/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 160461 2012-06-02 10:25:40Z bluewind $
+# $Id: PKGBUILD 183105 2013-04-17 15:04:54Z jgc $
# Maintainer: Jan de Groot <jgc@archlinux.org>
pkgname=cairo-perl
-pkgver=1.082
-pkgrel=2
+pkgver=1.103
+pkgrel=1
pkgdesc="Perl wrappers for cairo"
arch=(i686 x86_64)
license=('LGPL')
@@ -11,14 +11,11 @@ url="http://gtk2-perl.sourceforge.net/"
options=('!emptydirs')
depends=('cairo' 'perl')
makedepends=('perl-extutils-depends' 'perl-extutils-pkgconfig')
-source=(http://downloads.sourceforge.net/sourceforge/gtk2-perl/Cairo-${pkgver}.tar.gz
- testsuite.patch)
-md5sums=('cfd61e519ff20023979c255d4040fe06'
- '6a3ceac304a5a53f8fdd5652d98f6855')
+source=(http://downloads.sourceforge.net/sourceforge/gtk2-perl/Cairo-${pkgver}.tar.gz)
+md5sums=('c693e5535ed60283c068d92120412f98')
build() {
cd "${srcdir}/Cairo-${pkgver}"
- patch -Np1 -i "${srcdir}/testsuite.patch"
perl Makefile.PL INSTALLDIRS=vendor
make
}
diff --git a/extra/chkrootkit/PKGBUILD b/extra/chkrootkit/PKGBUILD
deleted file mode 100644
index 2b950dc9c..000000000
--- a/extra/chkrootkit/PKGBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# $Id: PKGBUILD 143673 2011-11-28 09:58:36Z eric $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=chkrootkit
-pkgver=0.49
-pkgrel=3
-pkgdesc="Locally checks for signs of a rootkit"
-arch=('i686' 'x86_64')
-url="http://www.chkrootkit.org"
-depends=('sh' 'net-tools')
-license=('BSD')
-source=(http://www.reznor.com/tools/chkrootkit.tar.gz chkrootkit.cron \
- fix-tools-path.patch backslashes.patch kallsyms.patch)
-md5sums=('304d840d52840689e0ab0af56d6d3a18'
- 'f4b6494270f708bf016e087104681739'
- '3e5f2d5e2f4fa7a0d780baec9039c07f'
- '758f892dcf73e8a2a4694662fba366d4'
- 'd087f3aad8a9e97fea496ef83e4f1d48')
-sha1sums=('cec1a3c482b95b20d3a946b07fffb23290abc4a6'
- '6dda90abf779b6f5c3bacd638e1231f34635575d'
- '7fcad8117a064f0a6910134e8bb3a55de110650f'
- 'e22546f445c145cf05dbc1a10f7b196fcd1c8202'
- 'dc5b402ee69a7a5ae622ecfd733682516df54e88')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- sed -i 's|/var/adm|/var/log|' check_wtmpx.c chklastlog.c chkutmp.c chkwtmp.c
- patch -p0 -i "${srcdir}/fix-tools-path.patch"
- patch -p1 -i "${srcdir}/backslashes.patch"
- patch -p1 -i "${srcdir}/kallsyms.patch"
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- for i in check_wtmpx chkdirs chklastlog chkproc chkrootkit \
- chkutmp chkwtmp ifpromisc strings-static ; do
- install -D -m755 $i "${pkgdir}/usr/sbin/$i"
- done
- install -D -m744 "${srcdir}/chkrootkit.cron" "${pkgdir}/etc/cron.weekly/chkrootkit"
- install -D -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
diff --git a/extra/chkrootkit/backslashes.patch b/extra/chkrootkit/backslashes.patch
deleted file mode 100644
index 6ac981441..000000000
--- a/extra/chkrootkit/backslashes.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Author: James R. Van Zandt <jrv@debian.org>
-Description: Two of the chkrootkit messages have unnecessary backslashes (#498063)
---- a/chkrootkit
-+++ b/chkrootkit
-@@ -672,7 +672,7 @@ etc/ld.so.hash sbin/init.zk usr/lib/in.h
- if [ "`find ${LIBS} -name libproc.a 2> /dev/null`" != "" -a \
- "$SYSTEM" != "FreeBSD" ]
- then
-- echo "Possible t0rn v8 \(or variation\) rootkit installed"
-+ echo "Possible t0rn v8 (or variation) rootkit installed"
- else
- if [ "${QUIET}" != "t" ]; then echo "nothing found"; fi
- fi
-@@ -726,7 +726,7 @@ etc/ld.so.hash sbin/init.zk usr/lib/in.h
-
- if [ -d ${ROOTDIR}dev/ptyxx -o -r "${ROOTDIR}usr/lib/.ark?" -o \
- -d ${ROOTDIR}usr/doc/"... " ]; then
-- echo "Possible Ambient's rootkit \(ark\) installed"
-+ echo "Possible Ambient's rootkit (ark) installed"
- else
- if [ "${QUIET}" != "t" ]; then echo "nothing found"; fi
- fi
diff --git a/extra/chkrootkit/chkrootkit.cron b/extra/chkrootkit/chkrootkit.cron
deleted file mode 100644
index 0fc84ded8..000000000
--- a/extra/chkrootkit/chkrootkit.cron
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-/usr/sbin/chkrootkit -q
diff --git a/extra/chkrootkit/fix-tools-path.patch b/extra/chkrootkit/fix-tools-path.patch
deleted file mode 100644
index d45f07901..000000000
--- a/extra/chkrootkit/fix-tools-path.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- chkrootkit
-+++ chkrootkit
-@@ -17,6 +17,8 @@ unalias netstat > /dev/null 2>&1
- unalias ps > /dev/null 2>&1
- unalias dirname > /dev/null 2>&1
-
-+cd /usr/sbin
-+
- # Workaround for recent GNU coreutils
- _POSIX2_VERSION=199209
- export _POSIX2_VERSION
diff --git a/extra/chkrootkit/kallsyms.patch b/extra/chkrootkit/kallsyms.patch
deleted file mode 100644
index 4e3694aad..000000000
--- a/extra/chkrootkit/kallsyms.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- a/chkrootkit
-+++ b/chkrootkit
-@@ -308,7 +316,7 @@ lkm ()
- fi
-
- if [ "${EXPERT}" = "t" ]; then
-- [ -r /proc/ksyms ] && ${egrep} -i "adore|sebek" < /proc/ksyms 2>/dev/null
-+ [ -r /proc/kallsyms ] && ${egrep} -i "adore|sebek" < /proc/kallsyms 2>/dev/null
- [ -d /proc/knark ] && ${ls} -la /proc/knark 2> /dev/null
- PV=`$ps -V 2>/dev/null| $cut -d " " -f 3 |${awk} -F . '{ print $1 "." $2 $3 }' | ${awk} '{ if ($0 > 3.19) print 3; else if ($0 < 2.015) print 1; else print 2 }'`
- [ "$PV" = "" ] && PV=2
-@@ -318,14 +326,14 @@ lkm ()
- fi
-
- ### adore LKM
-- [ -r /proc/ksyms ] && \
-- if `${egrep} -i adore < /proc/ksyms >/dev/null 2>&1`; then
-+ [ -r /proc/kallsyms ] && \
-+ if `${egrep} -i adore < /proc/kallsyms >/dev/null 2>&1`; then
- echo "Warning: Adore LKM installed"
- fi
-
- ### sebek LKM (Adore based)
-- [ -r /proc/ksyms ] && \
-- if `${egrep} -i sebek < /proc/ksyms >/dev/null 2>&1`; then
-+ [ -r /proc/kallsyms ] && \
-+ if `${egrep} -i sebek < /proc/kallsyms >/dev/null 2>&1`; then
- echo "Warning: Sebek LKM installed"
- fi
-
diff --git a/extra/gob2/PKGBUILD b/extra/gob2/PKGBUILD
index 061325a4b..b2f85a97f 100644
--- a/extra/gob2/PKGBUILD
+++ b/extra/gob2/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 145709 2011-12-28 14:25:19Z jgc $
+# $Id: PKGBUILD 183109 2013-04-17 15:27:46Z jgc $
# Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
# Maintainer: Kevin Piche <kevin@archlinux.org>
pkgname=gob2
-pkgver=2.0.18
+pkgver=2.0.19
pkgrel=1
pkgdesc="GTK Object Builder (GOB) is a simple preprocessor for easily creating GTK objects"
arch=(i686 x86_64)
@@ -11,7 +11,7 @@ license=('GPL')
depends=('glib2')
url="http://www.5z.com/jirka/gob.html"
source=(http://ftp.5z.com/pub/gob/${pkgname}-${pkgver}.tar.xz)
-md5sums=('cd08248762962aec88100ddaaff4f9e0')
+md5sums=('d7f2e7b96c33458d69b6381e28e4ac69')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/icedtea-web-java7/PKGBUILD b/extra/icedtea-web-java7/PKGBUILD
index d304aa9e8..64ad7fd10 100644
--- a/extra/icedtea-web-java7/PKGBUILD
+++ b/extra/icedtea-web-java7/PKGBUILD
@@ -3,15 +3,15 @@
pkgbase=icedtea-web-java7
pkgname=('icedtea-web-java7' 'icedtea-web-java7-doc')
-pkgver=1.3.1
-pkgrel=2
+pkgver=1.3.2
+pkgrel=1
arch=('i686' 'x86_64')
url="http://icedtea.classpath.org/wiki/IcedTea-Web"
license=('GPL2')
-makedepends=('jdk7-openjdk' 'zip' 'gtk2' 'libxtst' 'npapi-sdk' 'rhino' 'junit' 'firefox' 'chromium' 'epiphany')
+makedepends=('jdk7-openjdk' 'zip' 'libxtst' 'npapi-sdk' 'rhino' 'junit' 'firefox' 'chromium' 'epiphany')
noextract=${pkgbase/-java7/}-$pkgver.tar.gz # due to broken path names in the tarball that fails with LANG=C in our chroot
source=(http://icedtea.classpath.org/download/source/${pkgbase/-java7/}-$pkgver.tar.gz)
-sha256sums=('20c7fd1eef6c79cbc6478bb01236a3eb2f0af6184eaed24baca59a3c37eafb56')
+md5sums=('94ce02c42c1e4d1411357fb3c1014f67')
_javaver=7
_jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk
@@ -28,9 +28,8 @@ build() {
--with-browser-tests \
--with-firefox=/usr/bin/firefox \
--with-chromium=/usr/bin/chromium \
- --with-epiphany=/usr/bin/epiphany \
- --with-gtk=2
- make
+ --with-epiphany=/usr/bin/epiphany
+ make
}
check() {
@@ -44,7 +43,7 @@ check() {
package_icedtea-web-java7() {
pkgdesc="provides a Free Software web browser plugin running applets written in the Java programming language and an implementation of Java Web Start, originally based on the NetX project"
- depends=('jre7-openjdk' 'gtk2' 'desktop-file-utils')
+ depends=('jre7-openjdk' 'desktop-file-utils')
provides=('java-web-start=7')
replaces=('icedtea-web')
install=${pkgname}.install
diff --git a/extra/libkdcraw/PKGBUILD b/extra/libkdcraw/PKGBUILD
index f3d91846b..44aadff7a 100644
--- a/extra/libkdcraw/PKGBUILD
+++ b/extra/libkdcraw/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 181892 2013-04-05 08:54:36Z svenstaro $
+# $Id: PKGBUILD 183096 2013-04-17 14:16:08Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=libkdcraw
pkgver=4.10.2
-pkgrel=1
+pkgrel=2
pkgdesc="A C++ interface used to decode RAW picture"
url="https://projects.kde.org/projects/kde/kdegraphics/libs/libkdcraw"
arch=('i686' 'x86_64')
@@ -22,7 +22,8 @@ build() {
cmake ../${pkgname}-${pkgver} \
-DCMAKE_BUILD_TYPE=Release \
-DKDE4_BUILD_TESTS=OFF \
- -DCMAKE_INSTALL_PREFIX=/usr
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DENABLE_LCMS2=ON
make
}
diff --git a/extra/libplist/PKGBUILD b/extra/libplist/PKGBUILD
index ebf732b69..542980296 100644
--- a/extra/libplist/PKGBUILD
+++ b/extra/libplist/PKGBUILD
@@ -1,10 +1,11 @@
-# $Id: PKGBUILD 156914 2012-04-23 09:08:57Z ibiru $
+# $Id: PKGBUILD 183073 2013-04-17 10:22:07Z tomegun $
+# Maintainer : Tom Gundersen <teg@jklm.no>
# Maintainer : Ionut Biru <ibiru@archlinux.org>
# Contributor: Gabriel Martinez < reitaka at gmail dot com >
pkgname=libplist
-pkgver=1.8
-pkgrel=2
+pkgver=1.10
+pkgrel=1
pkgdesc="A library to handle Apple Property List format whereas it's binary or XML"
url="http://libimobiledevice.org/"
arch=('i686' 'x86_64')
@@ -12,7 +13,6 @@ license=('GPL2' 'LGPL2.1')
depends=('glib2' 'libxml2' 'python2')
makedepends=('cmake' 'swig')
source=(http://www.libimobiledevice.org/downloads/$pkgname-$pkgver.tar.bz2)
-sha256sums=('a418da3880308199b74766deef2a760a9b169b81a868a6a9032f7614e20500ec')
build() {
mkdir build
@@ -28,3 +28,4 @@ package() {
cd build
make DESTDIR="$pkgdir" install
}
+md5sums=('fe642d0c8602d70c408994555c330dd1')
diff --git a/extra/libpst/PKGBUILD b/extra/libpst/PKGBUILD
index c54ba288a..dc851c80a 100644
--- a/extra/libpst/PKGBUILD
+++ b/extra/libpst/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 181123 2013-03-31 19:16:47Z stephane $
+# $Id: PKGBUILD 183115 2013-04-17 16:05:23Z jgc $
# Maintainer: Jan de Groot <jgc@archlinux.org>
pkgbase=libpst
pkgname=('libpst' 'libpst-docs')
-pkgver=0.6.54
-pkgrel=4
+pkgver=0.6.58
+pkgrel=1
arch=('i686' 'x86_64')
url="http://www.five-ten-sg.com/libpst/"
license=('GPL')
-makedepends=('python2' 'boost')
+makedepends=('python2' 'boost' 'libgsf')
source=(http://www.five-ten-sg.com/libpst/packages/${pkgbase}-${pkgver}.tar.gz)
-sha1sums=('a4713b87e330556acb0786b4efa975a3c739cd84')
+sha1sums=('c398d58b8b5106725f1659c900305c6385c0773e')
build() {
cd "${srcdir}/${pkgbase}-${pkgver}"
@@ -21,7 +21,7 @@ build() {
package_libpst() {
pkgdesc="Outlook .pst file converter"
- depends=('gcc-libs')
+ depends=('gcc-libs' 'libgsf')
optdepends=('boost-libs: for libpst python interface')
options=('!libtool' '!docs')
@@ -31,7 +31,7 @@ package_libpst() {
package_libpst-docs() {
pkgdesc="Documentation for Outlook .pst file converter"
- options=('!libtool')
+ options=('!libtool' 'docs')
cd "${srcdir}/${pkgbase}-${pkgver}"
make DESTDIR="${pkgdir}" install-htmlDATA
diff --git a/extra/mediastreamer/PKGBUILD b/extra/mediastreamer/PKGBUILD
new file mode 100644
index 000000000..1c3a15fa7
--- /dev/null
+++ b/extra/mediastreamer/PKGBUILD
@@ -0,0 +1,37 @@
+# $Id: PKGBUILD 183011 2013-04-16 22:29:29Z eric $
+# Maintainer:
+# Contributor: Andrea Scarpino <andrea@archlinux.org>
+# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor: Adrià Arrufat <swiftscythe@gmail.com>
+
+pkgname=mediastreamer
+pkgver=2.8.2
+pkgrel=5
+pkgdesc="A library written in C that allows you to create and run audio and video streams"
+arch=('i686' 'x86_64')
+url="http://www.linphone.org/"
+license=('GPL')
+depends=('ortp' 'speex' 'ffmpeg' 'v4l-utils' 'libxv' 'libpulse')
+makedepends=('intltool')
+options=('!libtool')
+source=("http://download-mirror.savannah.gnu.org/releases/linphone/${pkgname}/${pkgname}-${pkgver}.tar.gz"{,.sig}
+ mediastreamer-ffmpeg.patch)
+md5sums=('e51ea9d5fce1396b374d10473dfbadec'
+ '805da7def98f367e621363fa0c951fe8'
+ '553d5d47ea4a8c8dfeabdc0281849d5f')
+
+prepare() {
+ cd $pkgname-$pkgver
+ patch -p1 -i "${srcdir}"/mediastreamer-ffmpeg.patch
+}
+
+build() {
+ cd $pkgname-$pkgver
+ ./configure --prefix=/usr
+ make
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/mediastreamer/mediastreamer-ffmpeg.patch b/extra/mediastreamer/mediastreamer-ffmpeg.patch
new file mode 100644
index 000000000..3304e9f56
--- /dev/null
+++ b/extra/mediastreamer/mediastreamer-ffmpeg.patch
@@ -0,0 +1,57 @@
+commit f586917ea4d66f9ba8910f0967a8830e54d50784
+Author: Yann Diorcet <yann.diorcet@belledonne-communications.com>
+Date: Tue Jun 5 11:07:48 2012 +0200
+
+ Fixes for new versions of ffmpeg
+
+diff --git a/src/h264dec.c b/src/h264dec.c
+index c4a84ee..5229b5e 100644
+--- a/src/h264dec.c
++++ b/src/h264dec.c
+@@ -45,7 +45,9 @@ typedef struct _DecData{
+ static void ffmpeg_init(){
+ static bool_t done=FALSE;
+ if (!done){
++#ifdef FF_API_AVCODEC_INIT
+ avcodec_init();
++#endif
+ avcodec_register_all();
+ done=TRUE;
+ }
+diff --git a/src/videoenc.c b/src/videoenc.c
+index 21d016f..fb35760 100644
+--- a/src/videoenc.c
++++ b/src/videoenc.c
+@@ -39,6 +39,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+ static bool_t avcodec_initialized=FALSE;
+
++#ifndef FF_I_TYPE
++#define FF_I_TYPE AV_PICTURE_TYPE_I
++#endif
++
+ #ifdef ENABLE_LOG_FFMPEG
+
+ void ms_ffmpeg_log_callback(void* ptr, int level, const char* fmt, va_list vl)
+@@ -53,7 +57,9 @@ void ms_ffmpeg_log_callback(void* ptr, int level, const char* fmt, va_list vl)
+
+ void ms_ffmpeg_check_init(){
+ if(!avcodec_initialized){
++#ifdef FF_API_AVCODEC_INIT
+ avcodec_init();
++#endif
+ avcodec_register_all();
+ avcodec_initialized=TRUE;
+ #ifdef ENABLE_LOG_FFMPEG
+@@ -300,10 +306,10 @@ static void prepare_h263(EncState *s){
+ if (s->profile==0){
+ s->codec=CODEC_ID_H263;
+ }else{
++ /*
+ c->flags|=CODEC_FLAG_H263P_UMV;
+ c->flags|=CODEC_FLAG_AC_PRED;
+ c->flags|=CODEC_FLAG_H263P_SLICE_STRUCT;
+- /*
+ c->flags|=CODEC_FLAG_OBMC;
+ c->flags|=CODEC_FLAG_AC_PRED;
+ */
diff --git a/extra/telepathy-kde-accounts-kcm/PKGBUILD b/extra/telepathy-kde-accounts-kcm/PKGBUILD
index e5baa2980..6ec245c68 100644
--- a/extra/telepathy-kde-accounts-kcm/PKGBUILD
+++ b/extra/telepathy-kde-accounts-kcm/PKGBUILD
@@ -1,24 +1,24 @@
-# $Id: PKGBUILD 182124 2013-04-08 00:32:17Z eric $
+# $Id: PKGBUILD 183062 2013-04-17 06:09:00Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Laurent Carlier <lordheavym@gmail.com>
pkgname=telepathy-kde-accounts-kcm
_pkgname=ktp-accounts-kcm
-pkgver=0.6.0
+pkgver=0.6.1
pkgrel=1
pkgdesc="KCM Module for configuring Telepathy Instant Messaging Accounts"
arch=('i686' 'x86_64')
url="http://community.kde.org/Real-Time_Communication_and_Collaboration"
license=('GPL')
depends=('telepathy-kde-common-internals' 'telepathy-kde-contact-list')
-makedepends=('cmake' 'automoc4')
+makedepends=('cmake' 'automoc4' 'boost')
optdepends=('telepathy-gabble: XMPP/Jabber/GTalk support'
'telepathy-haze: all protocols supported by libpurple')
groups=('kde-telepathy')
conflicts=('telepathy-kde-accounts-kcm-plugins')
replaces=('telepathy-kde-accounts-kcm-plugins')
source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2")
-sha1sums=('8951573b54d5d940687c3c2b7b77fb441b0fddd9')
+sha1sums=('a6ba149da9a52423a41fe99704e57344d384b1cc')
build() {
mkdir build
diff --git a/extra/telepathy-kde-approver/PKGBUILD b/extra/telepathy-kde-approver/PKGBUILD
index 0797a87af..294b9af44 100644
--- a/extra/telepathy-kde-approver/PKGBUILD
+++ b/extra/telepathy-kde-approver/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 182126 2013-04-08 00:43:14Z eric $
+# $Id: PKGBUILD 183131 2013-04-17 17:57:15Z eric $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Laurent Carlier <lordheavym@gmail.com>
pkgname=telepathy-kde-approver
_pkgname=ktp-approver
-pkgver=0.6.0
+pkgver=0.6.1
pkgrel=1
pkgdesc="KDE Channel Approver for Telepathy"
arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@ depends=('telepathy-kde-common-internals' 'telepathy-kde-contact-list')
makedepends=('cmake' 'automoc4')
groups=('kde-telepathy')
source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2")
-sha1sums=('340cd26c37297540c0f70e75adbb43bcab0889c7')
+sha1sums=('1ccb773a14fa480e7e4c14611bc6d8a95e970e8e')
build() {
mkdir build
diff --git a/extra/telepathy-kde-auth-handler/PKGBUILD b/extra/telepathy-kde-auth-handler/PKGBUILD
index f499a624f..b4bbdfc43 100644
--- a/extra/telepathy-kde-auth-handler/PKGBUILD
+++ b/extra/telepathy-kde-auth-handler/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 182128 2013-04-08 00:45:51Z eric $
+# $Id: PKGBUILD 183133 2013-04-17 18:23:20Z eric $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=telepathy-kde-auth-handler
_pkgname=ktp-auth-handler
-pkgver=0.6.0
+pkgver=0.6.1
pkgrel=1
pkgdesc="Provide UI/KWallet Integration For Passwords and SSL Errors on Account Connect"
arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ depends=('telepathy-kde-common-internals' 'qjson')
makedepends=('cmake' 'automoc4')
groups=('kde-telepathy')
source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2")
-sha1sums=('392ee2e0146e445950ecad1b0cae27ece77b7a3e')
+sha1sums=('c3cc980dced0a7d63b287c382cec05fb9ef0348a')
build() {
mkdir build
diff --git a/extra/telepathy-kde-common-internals/PKGBUILD b/extra/telepathy-kde-common-internals/PKGBUILD
index acc3dc578..381f9c610 100644
--- a/extra/telepathy-kde-common-internals/PKGBUILD
+++ b/extra/telepathy-kde-common-internals/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 182129 2013-04-08 00:46:52Z eric $
+# $Id: PKGBUILD 183068 2013-04-17 06:14:39Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=telepathy-kde-common-internals
_pkgname=ktp-common-internals
-pkgver=0.6.0
+pkgver=0.6.1
pkgrel=1
pkgdesc="Common components for KDE-Telepathy"
arch=('i686' 'x86_64')
url="http://community.kde.org/Real-Time_Communication_and_Collaboration"
license=('GPL')
-depends=('kdelibs' 'telepathy-qt' 'telepathy-mission-control')
-makedepends=('cmake' 'automoc4')
+depends=('kdelibs' 'telepathy-logger-qt' 'telepathy-mission-control')
+makedepends=('cmake' 'automoc4' 'boost' 'doxygen')
install=${pkgname}.install
source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2")
-sha1sums=('93ef0f8498c44b86dc25539f0b4f55354dc566ec')
+sha1sums=('47f99b56e2faa6ef7c760f2112a7b10445f9c709')
build() {
mkdir build
diff --git a/extra/telepathy-kde-contact-list/PKGBUILD b/extra/telepathy-kde-contact-list/PKGBUILD
index 92aa1fcd1..d698242bd 100644
--- a/extra/telepathy-kde-contact-list/PKGBUILD
+++ b/extra/telepathy-kde-contact-list/PKGBUILD
@@ -1,21 +1,21 @@
-# $Id: PKGBUILD 182131 2013-04-08 00:47:59Z eric $
+# $Id: PKGBUILD 183065 2013-04-17 06:12:27Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Laurent Carlier <lordheavym@gmail.com>
pkgname=telepathy-kde-contact-list
_pkgname=ktp-contact-list
-pkgver=0.6.0
+pkgver=0.6.1
pkgrel=1
pkgdesc="Telepathy contact list application"
arch=('i686' 'x86_64')
url="http://community.kde.org/Real-Time_Communication_and_Collaboration"
license=('GPL')
depends=('telepathy-kde-common-internals' 'kdebase-runtime')
-makedepends=('cmake' 'automoc4')
+makedepends=('cmake' 'automoc4' 'boost')
groups=('kde-telepathy')
install=${pkgname}.install
source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2")
-sha1sums=('2cb4bf8f7b5df1660027eab606d513b9cccebad5')
+sha1sums=('0fb7888effd4e9a8f584dfbdcce31e088fbe71de')
build() {
mkdir build
diff --git a/extra/telepathy-kde-contact-runner/PKGBUILD b/extra/telepathy-kde-contact-runner/PKGBUILD
index f6902403d..2adaa1652 100644
--- a/extra/telepathy-kde-contact-runner/PKGBUILD
+++ b/extra/telepathy-kde-contact-runner/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 182133 2013-04-08 00:48:26Z eric $
+# $Id: PKGBUILD 183135 2013-04-17 18:25:34Z eric $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=telepathy-kde-contact-runner
_pkgname=ktp-contact-runner
-pkgver=0.6.0
+pkgver=0.6.1
pkgrel=1
pkgdesc="KRunner plugin for KDE Telepathy"
arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ depends=('telepathy-kde-common-internals')
makedepends=('cmake' 'automoc4')
groups=('kde-telepathy')
source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2")
-sha1sums=('576642c35f2d03b7859e15a004590ed6cc321ebd')
+sha1sums=('1acb3f1371008040abf3a75d39a61fbe9f580821')
build() {
mkdir build
diff --git a/extra/telepathy-kde-desktop-applets/PKGBUILD b/extra/telepathy-kde-desktop-applets/PKGBUILD
index 904250ff9..cd38cc095 100644
--- a/extra/telepathy-kde-desktop-applets/PKGBUILD
+++ b/extra/telepathy-kde-desktop-applets/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 182019 2013-04-05 09:11:00Z andrea $
+# $Id: PKGBUILD 183137 2013-04-17 18:33:27Z eric $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=telepathy-kde-desktop-applets
_pkgname=ktp-desktop-applets
-pkgver=0.6.0
+pkgver=0.6.1
pkgrel=1
pkgdesc="The KDE-Telepathy Plasma desktop applets"
arch=('i686' 'x86_64')
@@ -15,7 +15,7 @@ groups=('kde-telepathy')
conflicts=('telepathy-kde-contact-applet' 'telepathy-kde-presence-applet')
replaces=('telepathy-kde-contact-applet' 'telepathy-kde-presence-applet')
source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2")
-sha1sums=('890ea9e21b56d794c079e6437ef8a3d356eeb4af')
+sha1sums=('78cf1e37fbaf2af2b3c14df81dde7417a5bd7c07')
build() {
mkdir build
diff --git a/extra/telepathy-kde-filetransfer-handler/PKGBUILD b/extra/telepathy-kde-filetransfer-handler/PKGBUILD
index d7546bc42..62eb1109f 100644
--- a/extra/telepathy-kde-filetransfer-handler/PKGBUILD
+++ b/extra/telepathy-kde-filetransfer-handler/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 182135 2013-04-08 00:49:01Z eric $
+# $Id: PKGBUILD 183140 2013-04-17 18:34:04Z eric $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=telepathy-kde-filetransfer-handler
_pkgname=ktp-filetransfer-handler
-pkgver=0.6.0
+pkgver=0.6.1
pkgrel=1
pkgdesc="Telepathy file transfer handler"
arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ depends=('telepathy-kde-common-internals')
makedepends=('cmake' 'automoc4')
groups=('kde-telepathy')
source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2")
-sha1sums=('6c061a13f483fd14d3ef184d1008e4f8002e46a8')
+sha1sums=('66e365cf5ec60233d04869570cc89ad70eacb214')
build() {
mkdir build
diff --git a/extra/telepathy-kde-integration-module/PKGBUILD b/extra/telepathy-kde-integration-module/PKGBUILD
index 363064114..397e4b620 100644
--- a/extra/telepathy-kde-integration-module/PKGBUILD
+++ b/extra/telepathy-kde-integration-module/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 182137 2013-04-08 00:49:44Z eric $
+# $Id: PKGBUILD 183141 2013-04-17 18:34:18Z eric $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=telepathy-kde-integration-module
_pkgname=ktp-kded-integration-module
-pkgver=0.6.0
+pkgver=0.6.1
pkgrel=1
pkgdesc="Sits in KDED and takes care of various bits of system integration like setting user to auto-away or handling connection errors"
arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ depends=('telepathy-kde-common-internals')
makedepends=('cmake' 'automoc4')
groups=('kde-telepathy')
source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2")
-sha1sums=('eb1fc514199587b018036bc307d385766fc40094')
+sha1sums=('c5121ed5ba4f7ea0e7885b0aa7a42008c3ec6930')
build() {
mkdir build
diff --git a/extra/telepathy-kde-send-file/PKGBUILD b/extra/telepathy-kde-send-file/PKGBUILD
index 2e3edb768..99a821e8d 100644
--- a/extra/telepathy-kde-send-file/PKGBUILD
+++ b/extra/telepathy-kde-send-file/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 182139 2013-04-08 00:50:17Z eric $
+# $Id: PKGBUILD 183143 2013-04-17 18:35:12Z eric $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=telepathy-kde-send-file
_pkgname=ktp-send-file
-pkgver=0.6.0
+pkgver=0.6.1
pkgrel=1
pkgdesc="A File manager plugin to launch a file transfer job with a specified contact"
arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4')
groups=('kde-telepathy')
install=${pkgname}.install
source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2")
-sha1sums=('bc3b7832c88a866b396d5358c20c3a1f3a0048d2')
+sha1sums=('48ece90d7f2614aa133b8304d4891e0151d26f00')
build() {
mkdir build
diff --git a/extra/telepathy-kde-text-ui/PKGBUILD b/extra/telepathy-kde-text-ui/PKGBUILD
index 268eb3b86..74cddc43f 100644
--- a/extra/telepathy-kde-text-ui/PKGBUILD
+++ b/extra/telepathy-kde-text-ui/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 182141 2013-04-08 00:51:21Z eric $
+# $Id: PKGBUILD 183145 2013-04-17 18:35:36Z eric $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Laurent Carlier <lordheavym@gmail.com>
pkgname=telepathy-kde-text-ui
_pkgname=ktp-text-ui
-pkgver=0.6.0
+pkgver=0.6.1
pkgrel=1
pkgdesc="Telepathy handler for Text Chats"
arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@ depends=('telepathy-kde-contact-list' 'telepathy-logger-qt')
makedepends=('cmake' 'automoc4' 'boost')
groups=('kde-telepathy')
source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2")
-sha1sums=('87a519f132cc338b7f1f47aa8997e89f9f566bfd')
+sha1sums=('6dd32df14da326bcaeed8b68a25634b2731f0b6b')
build() {
mkdir build
diff --git a/extra/xf86-video-vmware/PKGBUILD b/extra/xf86-video-vmware/PKGBUILD
index ade9eedff..2ce3dc6ab 100644
--- a/extra/xf86-video-vmware/PKGBUILD
+++ b/extra/xf86-video-vmware/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 182671 2013-04-12 14:13:36Z andyrtr $
+# $Id: PKGBUILD 183093 2013-04-17 14:08:02Z jgc $
# Maintainer: Jan de Groot <jgc@archlinux.org>
pkgname=xf86-video-vmware
-pkgver=13.0.0
-pkgrel=3
+pkgver=13.0.1
+pkgrel=1
pkgdesc="X.org vmware video driver"
arch=(i686 x86_64)
url="http://xorg.freedesktop.org/"
@@ -13,13 +13,11 @@ makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=14' 'resourceproto' 'sc
conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERSION>=15')
groups=('xorg-drivers' 'xorg')
options=('!libtool' '!emptydirs')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 git-fixes.patch)
-sha256sums=('44919ecd88654f2ab40a1732b5ea6a1dbd1c696b4b0748e68e8b5f1a3486bca6'
- '9322d467d2111be4049e8649b1d2729a2a2ab35cc9769cfee5be63f18e176938')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
+sha256sums=('802dda415c22412edad6c3df44fe18a06e91d0f8456d9a58bac0d340fdf8fe3d')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
- patch -Np1 -i ${srcdir}/git-fixes.patch
./configure --prefix=/usr --enable-vmwarectrl-client
make
}
diff --git a/extra/xf86-video-vmware/git-fixes.patch b/extra/xf86-video-vmware/git-fixes.patch
deleted file mode 100644
index f1cde34aa..000000000
--- a/extra/xf86-video-vmware/git-fixes.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-From 23d87c92b7211cc5249eefe4ab3a2c7f370e279e Mon Sep 17 00:00:00 2001
-From: Zack Rusin <zackr@vmware.com>
-Date: Thu, 14 Feb 2013 22:33:01 +0000
-Subject: Kill mibstore
-
-It was a noop for at least 5 years and it has been removed.
-
-Signed-off-by: Zack Rusin <zackr@vmware.com>
----
-diff --git a/saa/saa_priv.h b/saa/saa_priv.h
-index 6652054..5d81453 100644
---- a/saa/saa_priv.h
-+++ b/saa/saa_priv.h
-@@ -48,7 +48,6 @@
- #include "pixmapstr.h"
- #include "windowstr.h"
- #include "servermd.h"
--#include "mibstore.h"
- #include "colormapst.h"
- #include "gcstruct.h"
- #include "input.h"
-diff --git a/src/vmware.c b/src/vmware.c
-index 41201f1..6b74e14 100644
---- a/src/vmware.c
-+++ b/src/vmware.c
-@@ -23,7 +23,6 @@ char rcsId_vmware[] =
- #include "xf86Pci.h" /* pci */
-
- #include "mipointer.h" /* sw cursor */
--#include "mibstore.h" /* backing store */
- #include "micmap.h" /* mi color map */
- #include "vgaHW.h" /* VGA hardware */
- #include "fb.h"
-@@ -1483,7 +1482,6 @@ VMWAREScreenInit(SCREEN_INIT_ARGS_DECL)
- * If backing store is to be supported (as is usually the case),
- * initialise it.
- */
-- miInitializeBackingStore(pScreen);
- xf86SetBackingStore(pScreen);
- xf86SetSilkenMouse(pScreen);
-
-diff --git a/vmwgfx/vmwgfx_driver.c b/vmwgfx/vmwgfx_driver.c
-index 9959ffb..7863ba2 100644
---- a/vmwgfx/vmwgfx_driver.c
-+++ b/vmwgfx/vmwgfx_driver.c
-@@ -1036,7 +1036,6 @@ drv_screen_init(SCREEN_INIT_ARGS_DECL)
- (ms->only_hw_presents) ? "enabled" : "disabled");
- }
-
-- miInitializeBackingStore(pScreen);
- xf86SetBackingStore(pScreen);
- xf86SetSilkenMouse(pScreen);
- miDCInitialize(pScreen, xf86GetPointerScreenFuncs());
---
-cgit v0.9.0.2-2-gbebe
-From d13a6334fe76f4e869b2cb8c0a6a13c185b1bedd Mon Sep 17 00:00:00 2001
-From: Loïc Yhuel <loic.yhuel@gmail.com>
-Date: Thu, 11 Apr 2013 09:29:10 +0000
-Subject: vmwgfx: Use myGlyphs to fix crashes
-
-Tested-by: Christian Hesse <mail@eworm.de>
-Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
-Signed-off-by: Loïc Yhuel <loic.yhuel@gmail.com>
-Signed-off-by: Jakob Bornecrantz <jakob@vmware.com>
----
-diff --git a/saa/saa_render.c b/saa/saa_render.c
-index c69f2c9..c6ce68c 100644
---- a/saa/saa_render.c
-+++ b/saa/saa_render.c
-@@ -406,6 +406,8 @@ saa_render_setup(ScreenPtr pScreen)
- saa_wrap(sscreen, ps, Trapezoids, saa_trapezoids);
- saa_wrap(sscreen, ps, Triangles, saa_triangles);
- saa_wrap(sscreen, ps, Composite, saa_composite);
-+ saa_wrap(sscreen, ps, Glyphs, miGlyphs);
-+ saa_wrap(sscreen, ps, UnrealizeGlyph, miUnrealizeGlyph);
- }
- }
-
-@@ -419,6 +421,8 @@ saa_render_takedown(ScreenPtr pScreen)
- saa_unwrap(sscreen, ps, Trapezoids);
- saa_unwrap(sscreen, ps, Triangles);
- saa_unwrap(sscreen, ps, Composite);
-+ saa_unwrap(sscreen, ps, Glyphs);
-+ saa_unwrap(sscreen, ps, UnrealizeGlyph);
- }
- }
- #endif
---
-cgit v0.9.0.2-2-gbebe
diff --git a/extra/xorg-server/PKGBUILD b/extra/xorg-server/PKGBUILD
index 4a9e967e4..77ce16d88 100644
--- a/extra/xorg-server/PKGBUILD
+++ b/extra/xorg-server/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 180178 2013-03-18 16:08:50Z andyrtr $
+# $Id: PKGBUILD 183085 2013-04-17 12:51:32Z andyrtr $
# Maintainer: AndyRTR <andyrtr@archlinux.org>
# Maintainer: Jan de Groot <jgc@archlinux.org>
pkgbase=xorg-server
pkgname=('xorg-server' 'xorg-server-xephyr' 'xorg-server-xdmx' 'xorg-server-xvfb' 'xorg-server-xnest' 'xorg-server-common' 'xorg-server-devel')
-pkgver=1.14.0
-pkgrel=2
+pkgver=1.14.1
+pkgrel=1
arch=('i686' 'x86_64')
license=('custom')
url="http://xorg.freedesktop.org"
@@ -23,7 +23,7 @@ source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2
xvfb-run.1
10-quirks.conf
git-fixes.patch)
-sha256sums=('1f5107573252c26439fdd165481765a2c0964e02a2e9fab36e02414d08f30630'
+sha256sums=('a5adb02571efb7d7459dde83286a3adb77dfd1a52a7348e75d2dc72d6f8d28aa'
'66e25f76a7496c429e0aff4b0670f168719bb0ceaeb88c6f2272f2bf3ed21162'
'd027776fac1f7675b0a9ee817502290b1c45f9c09b0f0a6bb058c35f92361e84'
'e033f9bcc21980f7f0428e6ed6c362a3d55ad293b05fd6e6c6c1933b86f9e63a'