summaryrefslogtreecommitdiff
path: root/extra
diff options
context:
space:
mode:
Diffstat (limited to 'extra')
-rw-r--r--extra/clutter/PKGBUILD11
-rw-r--r--extra/clutter/fix_buffer_age.patch34
-rw-r--r--extra/libkpeople/PKGBUILD4
-rw-r--r--extra/mercurial/PKGBUILD10
-rw-r--r--extra/mesa/PKGBUILD43
-rw-r--r--extra/oxygen-gtk2/PKGBUILD6
-rw-r--r--extra/oxygen-gtk3/PKGBUILD6
-rw-r--r--extra/php-apcu/PKGBUILD6
-rw-r--r--extra/qtcreator/PKGBUILD8
-rw-r--r--extra/rosegarden/PKGBUILD8
-rw-r--r--extra/sdl2/PKGBUILD6
-rw-r--r--extra/sdl2_mixer/PKGBUILD11
12 files changed, 105 insertions, 48 deletions
diff --git a/extra/clutter/PKGBUILD b/extra/clutter/PKGBUILD
index 7642bc7a2..9c4766f0a 100644
--- a/extra/clutter/PKGBUILD
+++ b/extra/clutter/PKGBUILD
@@ -1,22 +1,25 @@
-# $Id: PKGBUILD 204685 2014-01-24 23:21:57Z heftig $
+# $Id: PKGBUILD 207401 2014-03-08 16:24:07Z ioni $
# Maintainer: Jan de Groot <jgc@archlinux.org>
# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: William Rea <sillywilly@gmail.com>
pkgname=clutter
pkgver=1.16.4
-pkgrel=1
+pkgrel=2
pkgdesc="A GObject based library for creating fast, visually rich graphical user interfaces"
arch=('i686' 'x86_64')
url="http://clutter-project.org/"
license=('LGPL')
depends=('cogl' 'mesa' 'json-glib' 'atk' 'libxi' 'libxkbcommon' 'libevdev')
makedepends=('gobject-introspection')
-source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('cf50836ec5503577b73f75f984577610881b3e2ff7a327bb5b6918b431b51b65')
+source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
+ fix_buffer_age.patch)
+sha256sums=('cf50836ec5503577b73f75f984577610881b3e2ff7a327bb5b6918b431b51b65'
+ 'e254b26663c88dfba756934f011451c0551e52bb70e2de037835aea267ed7bda')
build() {
cd "$pkgname-$pkgver"
+ patch -Np1 -i ../fix_buffer_age.patch
./configure --prefix=/usr --enable-introspection \
--enable-wayland-backend --enable-egl-backend --enable-evdev-input \
--enable-wayland-compositor
diff --git a/extra/clutter/fix_buffer_age.patch b/extra/clutter/fix_buffer_age.patch
new file mode 100644
index 000000000..c42101e00
--- /dev/null
+++ b/extra/clutter/fix_buffer_age.patch
@@ -0,0 +1,34 @@
+From 6665f47d66a871b6e1a5f4200282f42da043a0e8 Mon Sep 17 00:00:00 2001
+From: Adel Gadllah <adel.gadllah@gmail.com>
+Date: Sun, 16 Feb 2014 21:07:43 +0000
+Subject: stage-cogl: Fix buffer_age code path
+
+Currently we where checking whether the damage_history list contains
+more or equal then buffer_age entries. This is wrong because we prepend
+our current clip to the list just before the check.
+
+Fix that to check whether we have more entries instead of more or equal.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=724788
+---
+diff --git a/clutter/cogl/clutter-stage-cogl.c b/clutter/cogl/clutter-stage-cogl.c
+index 86546b1..cff8444 100644
+--- a/clutter/cogl/clutter-stage-cogl.c
++++ b/clutter/cogl/clutter-stage-cogl.c
+@@ -483,11 +483,12 @@ clutter_stage_cogl_redraw (ClutterStageWindow *stage_window)
+
+ stage_cogl->damage_history = g_slist_prepend (stage_cogl->damage_history, current_damage);
+
+- if (age != 0 && !stage_cogl->dirty_backbuffer && g_slist_length (stage_cogl->damage_history) >= age)
++ if (age != 0 && !stage_cogl->dirty_backbuffer && g_slist_length (stage_cogl->damage_history) > age)
+ {
+ int i = 0;
+ GSList *tmp = NULL;
+- for (tmp = stage_cogl->damage_history; tmp; tmp = tmp->next)
++ /* We skip the first entry because it is the clip_region itself */
++ for (tmp = stage_cogl->damage_history->next; tmp; tmp = tmp->next)
+ {
+ _clutter_util_rectangle_union (clip_region, tmp->data, clip_region);
+ i++;
+--
+cgit v0.9.2
diff --git a/extra/libkpeople/PKGBUILD b/extra/libkpeople/PKGBUILD
index 544b62054..321a1cab4 100644
--- a/extra/libkpeople/PKGBUILD
+++ b/extra/libkpeople/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 197593 2013-10-27 13:36:10Z andrea $
+# $Id: PKGBUILD 207357 2014-03-08 10:30:08Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Antonio Rojas <nqn1976 @ gmail.com>
@@ -11,7 +11,7 @@ url='http://community.kde.org/KTp/libkpeople'
license=('LGPL')
depends=('nepomuk-core')
makedepends=('cmake' 'automoc4')
-source=("http://download.kde.org/unstable/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2")
+source=("http://download.kde.org/unstable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
sha1sums=('6ab54b3ba203ff06d17f101060ed277696dfbaad')
prepare() {
diff --git a/extra/mercurial/PKGBUILD b/extra/mercurial/PKGBUILD
index 8c9d82e51..6a3c5043a 100644
--- a/extra/mercurial/PKGBUILD
+++ b/extra/mercurial/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 206155 2014-02-20 12:01:46Z giovanni $
+# $Id: PKGBUILD 207413 2014-03-08 17:09:21Z giovanni $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
pkgname=mercurial
-pkgver=2.9
-pkgrel=2
+pkgver=2.9.1
+pkgrel=1
pkgdesc="A scalable distributed SCM tool"
arch=('i686' 'x86_64')
url="http://mercurial.selenic.com/"
@@ -14,7 +14,7 @@ optdepends=('tk: for the hgk GUI')
backup=('etc/mercurial/hgrc')
source=("http://mercurial.selenic.com/release/${pkgname}-${pkgver}.tar.gz"
'mercurial.profile')
-md5sums=('de902a5300beb16c778bc88949832e94'
+md5sums=('56b3732f0f558f3cc986c9323ca8d17f'
'43e1d36564d4c7fbe9a091d3ea370a44')
package() {
@@ -46,5 +46,5 @@ package() {
install -m644 contrib/sample.hgrc "${pkgdir}/etc/mercurial/hgrc"
# FS#38825 - Add certs config to package
- echo -e "\n[web]\ncacerts = /etc/ssl/certs/ca-certificates.crt" >> "${pkgdir}/etc/mercurial/hgrc"
+ echo -e "\n[web]\ncacerts = /etc/ssl/certs/ca-certificates.crt\n" >> "${pkgdir}/etc/mercurial/hgrc"
}
diff --git a/extra/mesa/PKGBUILD b/extra/mesa/PKGBUILD
index ac0faa5f2..5d48b4865 100644
--- a/extra/mesa/PKGBUILD
+++ b/extra/mesa/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 205069 2014-02-04 11:01:18Z andyrtr $
+# $Id: PKGBUILD 207418 2014-03-08 18:51:10Z lcarlier $
# Maintainer: Jan de Groot <jgc@archlinux.org>
# Maintainer: Andreas Radke <andyrtr@archlinux.org>
pkgbase=mesa
pkgname=('ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri' 'mesa' 'mesa-libgl')
-pkgver=10.0.3
-pkgrel=1
+pkgver=10.1.0
+pkgrel=2
arch=('i686' 'x86_64')
-makedepends=('python2' 'libxml2' 'libx11' 'glproto' 'libdrm' 'dri2proto' 'libxxf86vm' 'libxdamage'
- 'libvdpau' 'wayland' 'elfutils' 'llvm' 'systemd')
+makedepends=('python2' 'libxml2' 'libx11' 'glproto' 'libdrm' 'dri2proto' 'dri3proto' 'presentproto'
+ 'libxshmfence' 'libxxf86vm' 'libxdamage' 'libvdpau' 'wayland' 'elfutils' 'llvm' 'systemd')
url="http://mesa3d.sourceforge.net"
license=('custom')
-source=(ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2
+source=(ftp://ftp.freedesktop.org/pub/mesa/10.1/MesaLib-${pkgver}.tar.bz2
LICENSE)
-md5sums=('5f9f463ef08129f6762106b434910adb'
+md5sums=('3ec43f79dbcd9aa2a4a27bf1f51655b6'
'5c65a0fe315dd347e09b1f2826a1df5a')
build() {
@@ -42,6 +42,7 @@ build() {
--enable-texture-float \
--enable-xa \
--enable-vdpau \
+ --enable-dri3
# --help
make
@@ -113,17 +114,20 @@ package_svga-dri() {
package_mesa() {
pkgdesc="an open-source implementation of the OpenGL specification"
- depends=('libdrm' 'libvdpau' 'wayland' 'libxxf86vm' 'libxdamage' 'systemd' 'elfutils' 'llvm-libs')
+ depends=('libdrm' 'libvdpau' 'wayland' 'libxxf86vm' 'libxdamage' 'libxshmfence' 'systemd' 'elfutils' 'llvm-libs')
optdepends=('opengl-man-pages: for the OpenGL API man pages')
provides=('libglapi' 'osmesa' 'libgbm' 'libgles' 'libegl' 'khrplatform-devel')
conflicts=('libglapi' 'osmesa' 'libgbm' 'libgles' 'libegl' 'khrplatform-devel')
replaces=('libglapi' 'osmesa' 'libgbm' 'libgles' 'libegl' 'khrplatform-devel')
mv -v ${srcdir}/fakeinstall/* ${pkgdir}
- # rename libgl.so to not conflict with blobs - may break gl.pc ?
- mv ${pkgdir}/usr/lib/libGL.so.1.2.0 ${pkgdir}/usr/lib/mesa-libGL.so.1.2.0
- ln -s mesa-libGL.so.1.2.0 ${pkgdir}/usr/lib/mesa-libGL.so.1
- rm ${pkgdir}/usr/lib/libGL.so{,.1}
+ # rename libgl/EGL/glesv*.so to not conflict with blobs - may break .pc files ?
+ mv ${pkgdir}/usr/lib/libGL.so.1.2.0 ${pkgdir}/usr/lib/mesa-libGL.so.1.2.0
+ mv ${pkgdir}/usr/lib/libEGL.so.1.0.0 ${pkgdir}/usr/lib/mesa-libEGL.so.1.0.0
+ mv ${pkgdir}/usr/lib/libGLESv1_CM.so.1.1.0 ${pkgdir}/usr/lib/mesa-libGLESv1_CM.so.1.1.0
+ mv ${pkgdir}/usr/lib/libGLESv2.so.2.0.0 ${pkgdir}/usr/lib/mesa-libGLESv2.so.2.0.0
+
+ rm ${pkgdir}/usr/lib/lib{GL,EGL,GLESv1_CM,GLESv2}.so*
install -m755 -d "${pkgdir}/usr/share/licenses/mesa"
install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa/"
@@ -139,9 +143,18 @@ package_mesa-libgl() {
install -m755 -d "${pkgdir}/usr/lib/xorg/modules/extensions"
ln -s libglx.xorg "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so"
- ln -s mesa-libGL.so.1.2.0 ${pkgdir}/usr/lib/libGL.so
- ln -s mesa-libGL.so.1.2.0 ${pkgdir}/usr/lib/libGL.so.1
- ln -s mesa-libGL.so.1.2.0 ${pkgdir}/usr/lib/libGL.so.1.2.0
+ ln -s mesa-libGL.so.1.2.0 ${pkgdir}/usr/lib/libGL.so
+ ln -s mesa-libGL.so.1.2.0 ${pkgdir}/usr/lib/libGL.so.1
+ ln -s mesa-libGL.so.1.2.0 ${pkgdir}/usr/lib/libGL.so.1.2.0
+ ln -s mesa-libEGL.so.1.0.0 ${pkgdir}/usr/lib/libEGL.so
+ ln -s mesa-libEGL.so.1.0.0 ${pkgdir}/usr/lib/libEGL.so.1
+ ln -s mesa-libEGL.so.1.0.0 ${pkgdir}/usr/lib/libEGL.so.1.0.0
+ ln -s mesa-libGLESv1_CM.so.1.1.0 ${pkgdir}/usr/lib/libGLESv1_CM.so
+ ln -s mesa-libGLESv1_CM.so.1.1.0 ${pkgdir}/usr/lib/libGLESv1_CM.so.1
+ ln -s mesa-libGLESv1_CM.so.1.1.0 ${pkgdir}/usr/lib/libGLESv1_CM.so.1.1.0
+ ln -s mesa-libGLESv2.so.2.0.0 ${pkgdir}/usr/lib/libGLESv2.so
+ ln -s mesa-libGLESv2.so.2.0.0 ${pkgdir}/usr/lib/libGLESv2.so.2
+ ln -s mesa-libGLESv2.so.2.0.0 ${pkgdir}/usr/lib/libGLESv2.so.2.0.0
install -m755 -d "${pkgdir}/usr/share/licenses/mesa-libgl"
install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa-libgl/"
diff --git a/extra/oxygen-gtk2/PKGBUILD b/extra/oxygen-gtk2/PKGBUILD
index 47b958936..093ad6025 100644
--- a/extra/oxygen-gtk2/PKGBUILD
+++ b/extra/oxygen-gtk2/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 204679 2014-01-24 21:31:40Z andrea $
+# $Id: PKGBUILD 207334 2014-03-08 08:57:14Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: birdflesh <antkoul at gmail dot com>
pkgname=oxygen-gtk2
-pkgver=1.4.3
+pkgver=1.4.4
pkgrel=1
pkgdesc="Port of the default KDE widget theme (Oxygen) to GTK2"
arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@ conflicts=('oxygen-gtk')
replaces=('oxygen-gtk')
makedepends=('cmake')
source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('822cedb3ae46907fd262487150a195d4')
+md5sums=('dd55d704f97e0c9e2fcc0d4d88d2eb1d')
prepare() {
mkdir build
diff --git a/extra/oxygen-gtk3/PKGBUILD b/extra/oxygen-gtk3/PKGBUILD
index 4f8d2bd60..ca4662176 100644
--- a/extra/oxygen-gtk3/PKGBUILD
+++ b/extra/oxygen-gtk3/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 204681 2014-01-24 21:32:34Z andrea $
+# $Id: PKGBUILD 207336 2014-03-08 08:57:31Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=oxygen-gtk3
-pkgver=1.3.3
+pkgver=1.3.4
pkgrel=1
pkgdesc="Port of the default KDE widget theme (Oxygen) to GTK3"
arch=('i686' 'x86_64')
@@ -11,7 +11,7 @@ license=('LGPL')
depends=('gtk3')
makedepends=('cmake')
source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('c849ca9ef925b2d967538b1b83b6e72a')
+md5sums=('0299012f736444230bfdef0aaeb27a2f')
prepare() {
mkdir build
diff --git a/extra/php-apcu/PKGBUILD b/extra/php-apcu/PKGBUILD
index cd4cb9f08..aeb0286ba 100644
--- a/extra/php-apcu/PKGBUILD
+++ b/extra/php-apcu/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 205511 2014-02-06 14:49:36Z pierre $
+# $Id: PKGBUILD 207394 2014-03-08 15:50:15Z pierre $
# Maintainer: Pierre Schmitz <pierre@archlinux.de>
pkgname=php-apcu
-pkgver=4.0.3
+pkgver=4.0.4
pkgrel=1
arch=('i686' 'x86_64')
pkgdesc='A userland caching module for PHP'
@@ -14,7 +14,7 @@ provides=("php-apc=${pkgver}")
license=('PHP')
source=("http://pecl.php.net/get/apcu-$pkgver.tgz")
backup=('etc/php/conf.d/apcu.ini')
-md5sums=('4db3d1ed48c447d9adebec13a8846d48')
+md5sums=('a7696b1c351d9bd1592b7840701f5bf7')
build() {
cd $srcdir/apcu-$pkgver
diff --git a/extra/qtcreator/PKGBUILD b/extra/qtcreator/PKGBUILD
index a334b1380..9ce520127 100644
--- a/extra/qtcreator/PKGBUILD
+++ b/extra/qtcreator/PKGBUILD
@@ -7,9 +7,9 @@
# Contributor: delor <bartekpiech gmail com>
pkgname=qtcreator
-pkgver=3.0.1
-_pkgver=3.0.1
-pkgrel=1
+pkgver=3.0.1.git
+_pkgver=3.0
+pkgrel=2
pkgdesc='Lightweight, cross-platform integrated development environment'
arch=('i686' 'x86_64')
url='http://qt-project.org'
@@ -26,7 +26,7 @@ optdepends=('qt5-doc: for the integrated Qt documentation'
'bzr: for bazaar support'
'valgrind: for analyze support')
install=qtcreator.install
-source=("git://gitorious.org/qt-creator/qt-creator.git#tag=v${_pkgver}"
+source=("git://gitorious.org/qt-creator/qt-creator.git#branch=${_pkgver}"
"git://gitorious.org/qt-labs/qbs.git"
'qtcreator.desktop')
md5sums=('SKIP'
diff --git a/extra/rosegarden/PKGBUILD b/extra/rosegarden/PKGBUILD
index bb8dcf6bd..a649b47a5 100644
--- a/extra/rosegarden/PKGBUILD
+++ b/extra/rosegarden/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 205867 2014-02-12 07:12:35Z schiv $
+# $Id: PKGBUILD 207424 2014-03-08 20:13:20Z schiv $
# Maintainer: Ray Rashif <schiv@archlinux.org>
# Contributor: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: damir <damir@archlinux.org>
# Contributor: Robert Emil Berge <robert@rebi.no>
pkgname=rosegarden
-pkgver=13.10
-pkgrel=2
+pkgver=14.02
+pkgrel=1
pkgdesc="MIDI/audio sequencer and notation editor"
arch=('i686' 'x86_64')
url="http://www.rosegardenmusic.com/"
@@ -23,7 +23,7 @@ optdepends=('lilypond: notation display'
[ "$CARCH" = "i686" ] && optdepends+=('dssi-vst: win32 VST support')
install=$pkgname.install
source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2")
-md5sums=('730a830da4d3b60fa8b15716d8dcd8a4')
+md5sums=('f649556e5149650211d88684b1168ab4')
build() {
cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/sdl2/PKGBUILD b/extra/sdl2/PKGBUILD
index 49d13c490..d7e49817f 100644
--- a/extra/sdl2/PKGBUILD
+++ b/extra/sdl2/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
pkgname=sdl2
-pkgver=2.0.1
-pkgrel=3
+pkgver=2.0.2
+pkgrel=1
pkgdesc="A library for portable low-level access to a video framebuffer, audio output, mouse, and keyboard (Version 2)"
arch=('i686' 'x86_64')
url="http://www.libsdl.org"
@@ -11,7 +11,7 @@ makedepends=('alsa-lib' 'mesa' 'libpulse' 'libxrandr' 'libxinerama')
optdepends=('alsa-lib: ALSA audio driver'
'libpulse: PulseAudio audio driver')
source=("http://www.libsdl.org/release/SDL2-${pkgver}.tar.gz")
-md5sums=('0eb97039488bf463e775295f7b18b227')
+md5sums=('e8070e8b6335def073a80cee78f3a7f0')
prepare() {
mkdir build
diff --git a/extra/sdl2_mixer/PKGBUILD b/extra/sdl2_mixer/PKGBUILD
index 7d43335b5..a2dd95fb3 100644
--- a/extra/sdl2_mixer/PKGBUILD
+++ b/extra/sdl2_mixer/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 198415 2013-10-30 14:44:04Z allan $
+# $Id: PKGBUILD 207160 2014-03-08 04:43:32Z svenstaro $
# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
pkgname=sdl2_mixer
pkgver=2.0.0
-pkgrel=2
+pkgrel=3
pkgdesc="A simple multi-channel audio mixer (Version 2)"
arch=('i686' 'x86_64')
url="http://www.libsdl.org/projects/SDL_mixer"
@@ -14,6 +14,13 @@ optdepends=('fluidsynth: MIDI software synth, replaces built-in timidity')
source=("$url/release/SDL2_mixer-${pkgver}.tar.gz")
md5sums=('65f6d80df073a1fb3bb537fbda031b50')
+prepare() {
+ cd "${srcdir}/SDL2_mixer-${pkgver}/"
+
+ sed -i "s|/etc/timidity|/etc/timidity++|g" timidity/config.h
+ sed -i "s|/etc/timidity++.cfg|/etc/timidity++/timidity.cfg|g" timidity/config.h
+}
+
build() {
cd "${srcdir}/SDL2_mixer-${pkgver}/"