summaryrefslogtreecommitdiff
path: root/extra
diff options
context:
space:
mode:
Diffstat (limited to 'extra')
-rw-r--r--extra/dovecot/PKGBUILD8
-rw-r--r--extra/kdesdk-poxml/PKGBUILD4
-rw-r--r--extra/mariadb/PKGBUILD76
-rw-r--r--extra/php-xcache/PKGBUILD6
-rw-r--r--extra/pigeonhole/PKGBUILD6
-rw-r--r--extra/ruby/0001-remove-db-support.patch35
-rw-r--r--extra/ruby/PKGBUILD15
-rw-r--r--extra/udisks2/PKGBUILD8
-rw-r--r--extra/xf86-video-fbdev/PKGBUILD16
-rw-r--r--extra/xf86-video-fbdev/git-fix.diff29
-rw-r--r--extra/xf86-video-savage/PKGBUILD18
-rw-r--r--extra/xf86-video-savage/git_fixes.diff64
12 files changed, 122 insertions, 163 deletions
diff --git a/extra/dovecot/PKGBUILD b/extra/dovecot/PKGBUILD
index 4c7da1644..faec2395f 100644
--- a/extra/dovecot/PKGBUILD
+++ b/extra/dovecot/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 192152 2013-08-06 14:10:47Z andyrtr $
+# $Id: PKGBUILD 195140 2013-09-25 15:41:44Z andyrtr $
# Maintainer: Andreas Radke <andyrtr@archlinux.org>
# Contributor: Paul Mattal <paul@mattal.com>
# Contributor: Federico Quagliata (quaqo) <quaqo@despammed.com>
@@ -8,7 +8,7 @@
# --->>> remember to rebuild/bump pigeonhole in one step <<<---
pkgname=dovecot
-pkgver=2.2.5
+pkgver=2.2.6
pkgrel=1
pkgdesc="An IMAP and POP3 server written with security primarily in mind"
arch=('i686' 'x86_64')
@@ -24,7 +24,7 @@ options=('!libtool')
install=$pkgname.install
source=(http://dovecot.org/releases/2.2/${pkgname}-${pkgver}.tar.gz{,.sig}
dovecot.tmpfilesd)
-md5sums=('0096442e2a1739b1b7997a833248a263'
+md5sums=('db65988ef2e6889dd8b49c132b21fc8f'
'SKIP'
'342a28251d40f983c98c0d1f1bf3d07d')
@@ -32,7 +32,7 @@ build() {
cd ${srcdir}/$pkgname-$pkgver
# fix build with recent clucene (FC)
- sed -i '/DEFAULT_INCLUDES *=/s|$| '"$(pkg-config --cflags libclucene-core)|" src/plugins/fts-lucene/Makefile.in
+# sed -i '/DEFAULT_INCLUDES *=/s|$| '"$(pkg-config --cflags libclucene-core)|" src/plugins/fts-lucene/Makefile.in
# fix path in helper script
sed -i 's:OPENSSLCONFIG=${OPENSSLCONFIG-dovecot-openssl.cnf}:OPENSSLCONFIG=${OPENSSLCONFIG- /etc/ssl/dovecot-openssl.cnf}:' doc/mkcert.sh
diff --git a/extra/kdesdk-poxml/PKGBUILD b/extra/kdesdk-poxml/PKGBUILD
index 70346c1a9..7ac28eecf 100644
--- a/extra/kdesdk-poxml/PKGBUILD
+++ b/extra/kdesdk-poxml/PKGBUILD
@@ -3,14 +3,14 @@
pkgname=kdesdk-poxml
pkgver=4.11.1
-pkgrel=1
+pkgrel=2
pkgdesc='Translates DocBook XML files using gettext po files'
url='https://projects.kde.org/projects/kde/kdesdk/poxml'
arch=('i686' 'x86_64')
license=('GPL' 'LGPL' 'FDL')
groups=('kde' 'kdesdk')
depends=('kdelibs')
-makedepends=('cmake' 'automoc4')
+makedepends=('cmake' 'automoc4' 'antlr2')
optdepends=('antlr2: required for po2xml and swappo tool')
source=("http://download.kde.org/stable/${pkgver}/src/poxml-${pkgver}.tar.xz")
sha1sums=('5c43a53f4106d80826865590a218ea63aa6c15c7')
diff --git a/extra/mariadb/PKGBUILD b/extra/mariadb/PKGBUILD
index 25560318d..1125dfc74 100644
--- a/extra/mariadb/PKGBUILD
+++ b/extra/mariadb/PKGBUILD
@@ -1,30 +1,35 @@
-# $Id: PKGBUILD 193074 2013-08-15 15:18:16Z bpiotrowski $
+# $Id: PKGBUILD 195113 2013-09-25 07:07:22Z bpiotrowski $
# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
pkgbase=mariadb
-pkgname=('libmariadbclient' 'mariadb-clients' 'mariadb')
-pkgver=5.5.32
-pkgrel=2
+pkgname=('libmariadbclient' 'mariadb-clients' 'mytop' 'mariadb')
+pkgver=5.5.33.a
+_pkgver=${pkgver/.a/a}
+pkgrel=1
arch=('i686' 'x86_64')
license=('GPL')
url='http://mariadb.org/'
makedepends=('cmake' 'openssl' 'zlib')
options=('!libtool')
-source=(http://mirrors.supportex.net/$pkgbase/$pkgbase-$pkgver/kvm-tarbake-jaunty-x86/$pkgbase-$pkgver.tar.gz
+source=(http://mirrors.supportex.net/$pkgbase/$pkgbase-$_pkgver/kvm-tarbake-jaunty-x86/$pkgbase-$_pkgver.tar.gz
mariadb.service
mariadb-post.sh
mariadb-tmpfile.conf)
-sha256sums=('cc76d143c60d9f24b551adaf80f694ef9beb4a6a9032c115a06f7b5c5d0ee468'
+sha256sums=('adf4d04087177fde6568082c3fee77e52e84dc3ae4eb5b994d5defaaa8c83d5b'
'a6cf5446159fff16598d0d787dd3a3c30a53a656a5f876ddb608bc60e234d334'
'368f9fd2454d80eb32abb8f29f703d1cf9553353fb9e1ae4529c4b851cb8c5dd'
'2af318c52ae0fe5428e8a9245d1b0fc3bc5ce153842d1563329ceb1edfa83ddd')
+prepare() {
+ cd $pkgbase-$_pkgver
+ sed -i '63d' storage/tokudb/ft-index/cmake_modules/TokuSetupCTest.cmake
+}
+
build() {
- cd $srcdir
mkdir build
cd build
- cmake ../$pkgbase-$pkgver \
+ cmake ../$pkgbase-$_pkgver \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=/usr \
-DSYSCONFDIR=/etc/mysql \
@@ -53,6 +58,7 @@ build() {
-DWITH_BLACKHOLE_STORAGE_ENGINE=1 \
-DWITH_INNOBASE_STORAGE_ENGINE=1 \
-DWITH_PARTITION_STORAGE_ENGINE=1 \
+ -DWITH_TOKUDB_STORAGE_ENGINE=1 \
-DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 \
-DWITHOUT_FEDERATED_STORAGE_ENGINE=1 \
-DWITHOUT_PBXT_STORAGE_ENGINE=1 \
@@ -70,16 +76,15 @@ package_libmariadbclient() {
conflicts=('libmysqlclient')
provides=("libmysqlclient=$pkgver")
- cd "$srcdir"/build
+ cd build
for dir in include libmysql libmysqld libservices; do
make -C $dir DESTDIR="$pkgdir" install
done
- install -d "$pkgdir"/usr/bin
- install -m755 scripts/mysql_config "$pkgdir"/usr/bin/
+ install -Dm755 scripts/mysql_config "$pkgdir"/usr/bin/mysql_config
install -d "$pkgdir"/usr/share/man/man1
for man in mysql_config mysql_client_test_embedded mysqltest_embedded; do
- install -m644 "$srcdir"/$pkgbase-$pkgver/man/$man.1 "$pkgdir"/usr/share/man/man1/$man.1
+ install -m644 "$srcdir"/$pkgbase-$_pkgver/man/$man.1 "$pkgdir"/usr/share/man/man1/$man.1
done
}
@@ -89,17 +94,26 @@ package_mariadb-clients() {
conflicts=('mysql-clients')
provides=("mysql-clients=$pkgver")
- cd "$srcdir"/build
+ cd build
make -C client DESTDIR="$pkgdir" install
# install man pages
install -d "$pkgdir"/usr/share/man/man1
for man in mysql mysqladmin mysqlcheck mysqldump mysqlimport mysqlshow mysqlslap; do
- install -m644 "$srcdir"/$pkgbase-$pkgver/man/$man.1 "$pkgdir"/usr/share/man/man1/$man.1
+ install -m644 "$srcdir"/$pkgbase-$_pkgver/man/$man.1 "$pkgdir"/usr/share/man/man1/$man.1
done
# provided by mariadb
rm "$pkgdir"/usr/bin/{mysql_{plugin,upgrade},mysqlbinlog,mysqltest}
+
+}
+
+package_mytop() {
+ pkgdesc='Top clone for MariaDB'
+ depends=('perl-dbd-mysql' 'perl-term-readkey')
+
+ cd build
+ install -Dm755 scripts/mytop "$pkgdir"/usr/bin/mytop
}
package_mariadb() {
@@ -107,31 +121,33 @@ package_mariadb() {
backup=('etc/mysql/my.cnf')
install=mariadb.install
depends=('mariadb-clients' 'inetutils')
- conflicts=('mysql' 'mytop')
- provides=("mysql=$pkgver" 'mytop')
- optdepends=('perl-dbd-mysql: mytop dependency'
- 'perl-term-readkey: mytop dependency')
+ conflicts=('mysql')
+ provides=("mysql=$pkgver")
options=('emptydirs')
- cd "$srcdir"/build
+ cd build
make DESTDIR="$pkgdir" install
install -Dm644 "$pkgdir"/usr/share/mysql/my-medium.cnf "$pkgdir"/etc/mysql/my.cnf
- install -Dm755 "$srcdir"/mariadb-post.sh "$pkgdir"/usr/bin/mysqld-post
- install -Dm644 "$srcdir"/mariadb.service "$pkgdir"/usr/lib/systemd/system/mysqld.service
- install -Dm644 "$srcdir"/mariadb-tmpfile.conf "$pkgdir"/usr/lib/tmpfiles.d/mysql.conf
+ install -Dm755 ../mariadb-post.sh "$pkgdir"/usr/bin/mysqld-post
+ install -Dm644 ../mariadb.service "$pkgdir"/usr/lib/systemd/system/mysqld.service
+ install -Dm644 ../mariadb-tmpfile.conf "$pkgdir"/usr/lib/tmpfiles.d/mysql.conf
# provided by libmariadbclient
- rm "$pkgdir"/usr/bin/{mysql_config,mysql_client_test_embedded,mysqltest_embedded}
- rm "$pkgdir"/usr/lib/libmysql*
- rm -r "$pkgdir"/usr/include/
- rm "$pkgdir"/usr/share/man/man1/{mysql_config,mysql_client_test_embedded,mysqltest_embedded}.1
+ cd "$pkgdir"
+ rm usr/bin/{mysql_config,mysql_client_test_embedded,mysqltest_embedded}
+ rm usr/lib/libmysql*
+ rm -r usr/include/
+ rm usr/share/man/man1/{mysql_config,mysql_client_test_embedded,mysqltest_embedded}.1
# provided by mariadb-clients
- rm "$pkgdir"/usr/bin/{mysql,mysqladmin,mysqlcheck,mysqldump,mysqlimport,mysqlshow,mysqlslap}
- rm "$pkgdir"/usr/share/man/man1/{mysql,mysqladmin,mysqlcheck,mysqldump,mysqlimport,mysqlshow,mysqlslap}.1
+ rm usr/bin/{mysql,mysqladmin,mysqlcheck,mysqldump,mysqlimport,mysqlshow,mysqlslap}
+ rm usr/share/man/man1/{mysql,mysqladmin,mysqlcheck,mysqldump,mysqlimport,mysqlshow,mysqlslap}.1
+
+ # provided by mytop
+ rm usr/bin/mytop
# not needed
- rm -r "$pkgdir"/usr/{data,mysql-test,sql-bench}
- rm "$pkgdir"/usr/share/man/man1/mysql-test-run.pl.1
+ rm -r usr/{data,mysql-test,sql-bench}
+ rm usr/share/man/man1/mysql-test-run.pl.1
}
diff --git a/extra/php-xcache/PKGBUILD b/extra/php-xcache/PKGBUILD
index 37b93da0d..a995f2197 100644
--- a/extra/php-xcache/PKGBUILD
+++ b/extra/php-xcache/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 194213 2013-09-10 15:28:33Z pierre $
+# $Id: PKGBUILD 195126 2013-09-25 11:18:14Z pierre $
# Maintainer: Pierre Schmitz <pierre@archlinux.de>
pkgname=php-xcache
pkgver=3.1.0dev
-_svnrev=1368
-pkgrel=13
+_svnrev=1394
+pkgrel=14
arch=('i686' 'x86_64')
pkgdesc='A PHP opcode cacher'
url='http://xcache.lighttpd.net/'
diff --git a/extra/pigeonhole/PKGBUILD b/extra/pigeonhole/PKGBUILD
index 34046030f..1d1fd930e 100644
--- a/extra/pigeonhole/PKGBUILD
+++ b/extra/pigeonhole/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 192153 2013-08-06 14:10:47Z andyrtr $
+# $Id: PKGBUILD 195141 2013-09-25 15:41:45Z andyrtr $
# Maintainer: Andreas Radke <andyrtr@archlinux.org>
# Contributorr: Peter Lewis <plewis@aur.archlinux.org>
@@ -7,12 +7,12 @@
# This must be built against the version of dovecot being used,
# else mail delivery will fail.
# Specify the version of dovecot to be used here:
-_dcpkgver=2.2.5
+_dcpkgver=2.2.6
# Make sure to bump pkgrel if changing this.
pkgname=pigeonhole
pkgver=0.4.1
-pkgrel=2
+pkgrel=3
pkgdesc="Sieve implementation for Dovecot"
arch=('i686' 'x86_64')
url="http://pigeonhole.dovecot.org/"
diff --git a/extra/ruby/0001-remove-db-support.patch b/extra/ruby/0001-remove-db-support.patch
new file mode 100644
index 000000000..bdd7e5871
--- /dev/null
+++ b/extra/ruby/0001-remove-db-support.patch
@@ -0,0 +1,35 @@
+From b653d6ffe9ec25c203fc0cbbbdd72e9b42546283 Mon Sep 17 00:00:00 2001
+From: Thomas Dziedzic <gostrc@gmail.com>
+Date: Sat, 10 Aug 2013 10:50:16 -0700
+Subject: [PATCH] remove db support
+
+---
+ ext/dbm/extconf.rb | 8 +-------
+ 1 file changed, 1 insertion(+), 7 deletions(-)
+
+diff --git a/ext/dbm/extconf.rb b/ext/dbm/extconf.rb
+index 32a9446..2412404 100644
+--- a/ext/dbm/extconf.rb
++++ b/ext/dbm/extconf.rb
+@@ -5,17 +5,11 @@ dir_config("dbm")
+ if dblib = with_config("dbm-type", nil)
+ dblib = dblib.split(/[ ,]+/)
+ else
+- dblib = %w(libc db db2 db1 db5 db4 db3 gdbm_compat gdbm qdbm)
++ dblib = %w(libc gdbm_compat gdbm qdbm)
+ end
+
+ headers = {
+ "libc" => ["ndbm.h"], # 4.3BSD original ndbm, Berkeley DB 1 in 4.4BSD libc.
+- "db" => ["db.h"],
+- "db1" => ["db1/ndbm.h", "db1.h", "ndbm.h"],
+- "db2" => ["db2/db.h", "db2.h", "db.h"],
+- "db3" => ["db3/db.h", "db3.h", "db.h"],
+- "db4" => ["db4/db.h", "db4.h", "db.h"],
+- "db5" => ["db5/db.h", "db5.h", "db.h"],
+ "gdbm_compat" => ["gdbm-ndbm.h", "gdbm/ndbm.h", "ndbm.h"], # GDBM since 1.8.1
+ "gdbm" => ["gdbm-ndbm.h", "gdbm/ndbm.h", "ndbm.h"], # GDBM until 1.8.0
+ "qdbm" => ["qdbm/relic.h", "relic.h"],
+--
+1.8.3.4
+
diff --git a/extra/ruby/PKGBUILD b/extra/ruby/PKGBUILD
index 2446d2a73..5737c5a6a 100644
--- a/extra/ruby/PKGBUILD
+++ b/extra/ruby/PKGBUILD
@@ -5,20 +5,25 @@
pkgname=('ruby' 'ruby-docs')
pkgver=2.0.0_p247
-pkgrel=1
+pkgrel=3
arch=('i686' 'x86_64')
url='http://www.ruby-lang.org/en/'
license=('BSD' 'custom')
-makedepends=('openssl' 'tk' 'libffi' 'doxygen' 'graphviz' 'libyaml')
+makedepends=('gdbm' 'openssl' 'tk' 'libffi' 'doxygen' 'graphviz' 'libyaml')
options=('!emptydirs' '!makeflags')
source=("ftp://ftp.ruby-lang.org/pub/ruby/${pkgver%.*}/ruby-${pkgver//_/-}.tar.bz2"
- 'gemrc')
+ 'gemrc'
+ '0001-remove-db-support.patch')
md5sums=('60913f3eec0c4071f44df42600be2604'
- '6fb8e7a09955e0f64be3158fb4a27e7a')
+ '6fb8e7a09955e0f64be3158fb4a27e7a'
+ 'b93ff50214a3da26525244cf37b71a8f')
build() {
cd ruby-${pkgver//_/-}
+ # use gdbm because db v6 changed the license to AGPL
+ patch -Np1 -i ${srcdir}/0001-remove-db-support.patch
+
PKG_CONFIG=/usr/bin/pkg-config ./configure \
--prefix=/usr \
--sysconfdir=/etc \
@@ -37,7 +42,7 @@ check() {
package_ruby() {
pkgdesc='An object-oriented language for quick and easy programming'
- depends=('openssl' 'libffi' 'libyaml')
+ depends=('gdbm' 'openssl' 'libffi' 'libyaml')
optdepends=('tk: for Ruby/TK'
'ruby-docs: Ruby documentation')
provides=('rubygems' 'rake')
diff --git a/extra/udisks2/PKGBUILD b/extra/udisks2/PKGBUILD
index 3ad4e5588..53aa1d3d4 100644
--- a/extra/udisks2/PKGBUILD
+++ b/extra/udisks2/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 194551 2013-09-18 12:53:28Z tomegun $
+# $Id: PKGBUILD 195132 2013-09-25 13:30:53Z jgc $
# Maintainer: Ionut Biru <ibiru@archlinux.org>
pkgname=udisks2
pkgver=2.1.1
-pkgrel=1
+pkgrel=3
pkgdesc="Disk Management Service, version 2"
arch=('i686' 'x86_64')
url="http://www.freedesktop.org/wiki/Software/udisks"
@@ -11,7 +11,9 @@ license=('GPL2')
depends=('glib2' 'systemd' 'polkit' 'libatasmart' 'util-linux')
makedepends=('intltool' 'docbook-xsl' 'gobject-introspection' 'python')
optdepends=('parted: partition management'
- 'gptfdisk: GUID partition table support')
+ 'gptfdisk: GUID partition table support'
+ 'ntfs-3g: NTFS filesystem management support'
+ 'dosfstools: VFAT filesystem management support')
options=(!libtool)
source=(http://udisks.freedesktop.org/releases/udisks-$pkgver.tar.bz2)
sha256sums=('013b09ff38aa256b89c01525771f4565cb088724d5c8c79b32e9f811e88086fb')
diff --git a/extra/xf86-video-fbdev/PKGBUILD b/extra/xf86-video-fbdev/PKGBUILD
index 6d7cec9fe..ec16a2fea 100644
--- a/extra/xf86-video-fbdev/PKGBUILD
+++ b/extra/xf86-video-fbdev/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 180197 2013-03-18 16:09:06Z andyrtr $
+# $Id: PKGBUILD 195144 2013-09-25 17:08:11Z andyrtr $
#Maintainer: Jan de Groot <jgc@archlinux.org>
pkgname=xf86-video-fbdev
-pkgver=0.4.3
-pkgrel=3
+pkgver=0.4.4
+pkgrel=1
pkgdesc="X.org framebuffer video driver"
arch=(i686 x86_64)
license=('custom')
@@ -13,19 +13,17 @@ 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')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 git-fix.diff)
-sha256sums=('ff7b037ad110040a4e2db5c84e9741125dbbaf3a08107db47760f3e11f9c4831'
- '4eb30cc4db5d1789429861d2d8f15238b21204d4311763ab7a1f4f32ff2b0321')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
+sha256sums=('9dd4b326498223abbfdf786089a46ea3db4fa6bbd341308eb48a9e00bc3fd51b')
build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- patch -Np1 -i ${srcdir}/git-fix.diff
+ cd ${pkgname}-${pkgver}
./configure --prefix=/usr
make
}
package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
+ cd ${pkgname}-${pkgver}
make DESTDIR="${pkgdir}" install
install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
diff --git a/extra/xf86-video-fbdev/git-fix.diff b/extra/xf86-video-fbdev/git-fix.diff
deleted file mode 100644
index 138d5bc2a..000000000
--- a/extra/xf86-video-fbdev/git-fix.diff
+++ /dev/null
@@ -1,29 +0,0 @@
-From ac293412a01d87f87eb61f4adb9db7486a75d3fc Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@redhat.com>
-Date: Tue, 25 Sep 2012 12:54:37 +0000
-Subject: Remove mibstore.h
-
-Signed-off-by: Adam Jackson <ajax@redhat.com>
----
-diff --git a/src/fbdev.c b/src/fbdev.c
-index cd7ebc5..f5a7378 100644
---- a/src/fbdev.c
-+++ b/src/fbdev.c
-@@ -14,7 +14,6 @@
- #include "xf86_OSproc.h"
-
- #include "mipointer.h"
--#include "mibstore.h"
- #include "micmap.h"
- #include "colormapst.h"
- #include "xf86cmap.h"
-@@ -845,7 +844,6 @@ FBDevScreenInit(SCREEN_INIT_ARGS_DECL)
- }
-
- xf86SetBlackWhitePixels(pScreen);
-- miInitializeBackingStore(pScreen);
- xf86SetBackingStore(pScreen);
-
- /* software cursor */
---
-cgit v0.9.0.2-2-gbebe
diff --git a/extra/xf86-video-savage/PKGBUILD b/extra/xf86-video-savage/PKGBUILD
index d5f9a2eea..08158f8fc 100644
--- a/extra/xf86-video-savage/PKGBUILD
+++ b/extra/xf86-video-savage/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 181070 2013-03-31 08:09:15Z andyrtr $
+# $Id: PKGBUILD 195146 2013-09-25 17:11:53Z andyrtr $
# Maintainer: Jan de Groot <jgc@archlinux.org>
pkgname=xf86-video-savage
-pkgver=2.3.6
-pkgrel=4
+pkgver=2.3.7
+pkgrel=1
pkgdesc="X.org savage video driver"
arch=(i686 x86_64)
url="http://xorg.freedesktop.org/"
@@ -14,21 +14,17 @@ conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERS
optdepends=('savage-dri: DRI1 support from community repo')
options=(!libtool)
groups=('xorg-drivers' 'xorg')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
- git_fixes.diff)
-sha256sums=('48813ed8f4a08858e8c2466fd2dc810ea31f86842025fa39ec949d44f9ad63d6'
- 'b415bab5bbad890365c649fe3daa47db23428e92b4a4d8e5aa685e9d78de668d')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
+sha256sums=('041d4205c9222c1780fba6e0e397a559aed393b7a7991b58fa79ba8cccc54a44')
build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- patch -Np1 -i ${srcdir}/git_fixes.diff
+ cd ${pkgname}-${pkgver}
./configure --prefix=/usr
make
}
package() {
- #cd "${srcdir}/${pkgname}-${pkgver}"
- cd ${srcdir}/${pkgname}*
+ cd ${pkgname}-${pkgver}
make DESTDIR="${pkgdir}" install
install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}"
diff --git a/extra/xf86-video-savage/git_fixes.diff b/extra/xf86-video-savage/git_fixes.diff
deleted file mode 100644
index 8d5ef49b0..000000000
--- a/extra/xf86-video-savage/git_fixes.diff
+++ /dev/null
@@ -1,64 +0,0 @@
-From 3d181030a6ba2205a57ef4665e53aed0251ccaa6 Mon Sep 17 00:00:00 2001
-From: Dave Airlie <airlied@gmail.com>
-Date: Wed, 18 Jul 2012 08:52:38 +0000
-Subject: savage: move compat-api.h down to proper place.
-
-This screws up when DRI isn't enabled.
-
-Signed-off-by: Dave Airlie <airlied@redhat.com>
----
-diff --git a/src/savage_driver.h b/src/savage_driver.h
-index b604292..ec4b1ea 100644
---- a/src/savage_driver.h
-+++ b/src/savage_driver.h
-@@ -85,8 +85,6 @@
- #include "GL/glxint.h"
- #include "xf86drm.h"
-
--#include "compat-api.h"
--
- /* Totals 2 Mbytes which equals 2^16 32-byte vertices divided among up
- * to 32 clients. */
- #define SAVAGE_NUM_BUFFERS 32
-@@ -153,6 +151,8 @@ typedef struct _server{
-
- #endif
-
-+#include "compat-api.h"
-+
- typedef enum {
- MT_NONE,
- MT_CRT,
---
-cgit v0.9.0.2-2-gbebe
-From ca9718a887ecbc59b76869af673791ab591b849b Mon Sep 17 00:00:00 2001
-From: Dave Airlie <airlied@gmail.com>
-Date: Sat, 22 Dec 2012 10:00:00 +0000
-Subject: savage: fix default accel arch when built with no XAA
-
-Signed-off-by: Dave Airlie <airlied@redhat.com>
----
-diff --git a/src/savage_driver.c b/src/savage_driver.c
-index 026bf5c..5b49e60 100644
---- a/src/savage_driver.c
-+++ b/src/savage_driver.c
-@@ -1267,6 +1267,7 @@ static Bool SavagePreInit(ScrnInfoPtr pScrn, int flags)
- from = X_DEFAULT;
- char *strptr;
- if((strptr = (char *)xf86GetOptValString(psav->Options, OPTION_ACCELMETHOD))) {
-+#ifdef HAVE_XAA_H
- if(!xf86NameCmp(strptr,"XAA")) {
- from = X_CONFIG;
- psav->useEXA = FALSE;
-@@ -1274,6 +1275,9 @@ static Bool SavagePreInit(ScrnInfoPtr pScrn, int flags)
- from = X_CONFIG;
- psav->useEXA = TRUE;
- }
-+#else
-+ psav->useEXA = TRUE;
-+#endif
- }
- xf86DrvMsg(pScrn->scrnIndex, from, "Using %s acceleration architecture\n",
- psav->useEXA ? "EXA" : "XAA");
---
-cgit v0.9.0.2-2-gbebe
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-10-13 15:17:16 +0000