summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Masłowski <mtjm@mtjm.eu>2012-06-18 14:09:42 +0200
committerMichał Masłowski <mtjm@mtjm.eu>2012-06-18 14:09:42 +0200
commit0982af0e4b5622aaae02f43925fe1152006f878e (patch)
tree38f7971d08e822fa0a4ffcb5e432b7da993da497
parent38389505b5f8809743855ead04f7feb9a37a9cc8 (diff)
parent014b5d0a1ee98ba0466f067f605b9637f2a14b2f (diff)
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts: community/nautilus-actions/PKGBUILD extra/libdrm/PKGBUILD extra/mesa/PKGBUILD extra/perl-dbd-mysql/PKGBUILD multilib/lib32-freetype2/PKGBUILD multilib/lib32-krb5/PKGBUILD multilib/lib32-libdrm/PKGBUILD multilib/lib32-libdrm/no-pthread-stubs.patch multilib/lib32-libpng/PKGBUILD multilib/lib32-mesa/PKGBUILD multilib/lib32-pango/PKGBUILD testing/bind/PKGBUILD testing/dmraid/PKGBUILD testing/glibc/PKGBUILD
-rw-r--r--community/cdrtools/PKGBUILD8
-rw-r--r--community/cdrtools/cdrtools.install10
-rw-r--r--community/conntrack-tools/01-config-file-path.patch11
-rw-r--r--community/conntrack-tools/02-fix-compilation-of-timeout-extension.patch33
-rw-r--r--community/conntrack-tools/PKGBUILD30
-rw-r--r--community/conntrack-tools/conntrack-tools.install9
-rw-r--r--community/conntrack-tools/conntrackd.conf2
-rw-r--r--community/conntrack-tools/conntrackd.rc1
-rw-r--r--community/libnetfilter_cttimeout/PKGBUILD26
-rw-r--r--community/nautilus-actions/PKGBUILD24
-rw-r--r--community/uptimed/PKGBUILD15
-rw-r--r--community/uptimed/rc.d39
-rw-r--r--extra/jade/PKGBUILD8
-rw-r--r--extra/libdrm-old/COPYING48
-rw-r--r--extra/libdrm-old/PKGBUILD54
-rw-r--r--extra/libdrm-old/no-pthread-stubs.patch66
-rw-r--r--extra/libdrm/PKGBUILD34
-rw-r--r--extra/libdrm/no-pthread-stubs.patch56
-rw-r--r--extra/libpng/PKGBUILD16
-rw-r--r--extra/mesa/PKGBUILD10
-rw-r--r--extra/nouveau-dri/LICENSE82
-rw-r--r--extra/nouveau-dri/PKGBUILD56
-rw-r--r--extra/nouveau-dri/mesa-8.0.3-llvm-3.1-fixes.patch46
-rw-r--r--extra/perl-dbd-mysql/PKGBUILD14
-rw-r--r--extra/racket/PKGBUILD13
-rw-r--r--extra/racket/drracket-normal.rkt199
-rw-r--r--extra/xf86-video-ati/PKGBUILD51
-rw-r--r--extra/xf86-video-nouveau/PKGBUILD18
-rw-r--r--libre/grub2/PKGBUILD21
-rw-r--r--libre/icecat-i18n/PKGBUILD182
-rw-r--r--libre/lirc-libre/PKGBUILD112
-rw-r--r--libre/lirc-libre/irexec.conf5
-rw-r--r--libre/lirc-libre/irexecd38
-rw-r--r--libre/lirc-libre/kernel-2.6.39.patch54
-rw-r--r--libre/lirc-libre/lirc.install16
-rw-r--r--libre/lirc-libre/lirc.logrotate5
-rw-r--r--libre/lirc-libre/lirc_atiusb-kfifo.patch31
-rw-r--r--libre/lirc-libre/lirc_wpc8769l.patch88
-rw-r--r--libre/lirc-libre/lircd52
-rw-r--r--libre/lirc-libre/lircd-handle-large-config.patch39
-rw-r--r--libre/lirc-libre/lircd.conf8
-rw-r--r--libre/lirc-libre/lircmd36
-rw-r--r--libre/mozilla-searchplugins/PKGBUILD2
-rw-r--r--social/gnuhealth/PKGBUILD5
44 files changed, 1411 insertions, 262 deletions
diff --git a/community/cdrtools/PKGBUILD b/community/cdrtools/PKGBUILD
index 66e433311..dbe53d8f6 100644
--- a/community/cdrtools/PKGBUILD
+++ b/community/cdrtools/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 68938 2012-04-06 10:10:47Z stativ $
+# $Id: PKGBUILD 72573 2012-06-16 18:43:00Z stativ $
# Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
pkgname=cdrtools
pkgver=3.01a07
-pkgrel=3
+pkgrel=4
pkgdesc="Original cdrtools supporting CD, DVD and BluRay burning"
arch=('i686' 'x86_64')
url="http://cdrecord.berlios.de/private/cdrecord.html"
@@ -32,6 +32,10 @@ package() {
make INS_BASE=/usr INS_RBASE=/ DESTDIR="$pkgdir" install
rm -rf "$pkgdir"/usr/include
rm -rf "$pkgdir"/usr/lib/{*.a,profiled}
+
+ # autoload 'sg' module needed by cdrecord
+ install -d -m755 "$pkgdir"/usr/lib/modules-load.d/
+ echo sg > "$pkgdir"/usr/lib/modules-load.d/cdrecord.conf
}
# vim:set ts=2 sw=2 et:
diff --git a/community/cdrtools/cdrtools.install b/community/cdrtools/cdrtools.install
index af3800716..3f49eb1bb 100644
--- a/community/cdrtools/cdrtools.install
+++ b/community/cdrtools/cdrtools.install
@@ -3,8 +3,12 @@ post_install() {
echo "To allow other users than root execute rscsi add an entry"
echo "to /etc/default/rscsi or use an \"rscsi\" user"
echo ""
- echo "If you get folowing error while executing \"cdrecord --scanbus\":"
- echo " No such file or directory. Cannot open '/dev/pg*'. Cannot open or use SCSI driver."
- echo "you may need to load the sg module manually using \"modprobe sg\"."
+ post_upgrade
+}
+
+post_upgrade() {
+ echo "The manual loading (or loading using rc.conf)"
+ echo "of the 'sg' module is no longer necessary."
+ echo "It is automatically loaded during boot by systemd-tools (udev 185)."
}
diff --git a/community/conntrack-tools/01-config-file-path.patch b/community/conntrack-tools/01-config-file-path.patch
new file mode 100644
index 000000000..8512cc9ab
--- /dev/null
+++ b/community/conntrack-tools/01-config-file-path.patch
@@ -0,0 +1,11 @@
+--- a/include/conntrackd.h 2012-05-26 15:29:15.630027223 +0200
++++ b/include/conntrackd.h 2012-05-27 02:26:59.426811589 +0200
+@@ -50,7 +50,7 @@
+ #define EXP_DUMP_INT_XML 47 /* dump internal cache in XML */
+ #define EXP_DUMP_EXT_XML 48 /* dump external cache in XML */
+
+-#define DEFAULT_CONFIGFILE "/etc/conntrackd/conntrackd.conf"
++#define DEFAULT_CONFIGFILE "/etc/conntrackd.conf"
+ #define DEFAULT_LOCKFILE "/var/lock/conntrackd.lock"
+ #define DEFAULT_LOGFILE "/var/log/conntrackd.log"
+ #define DEFAULT_STATS_LOGFILE "/var/log/conntrackd-stats.log"
diff --git a/community/conntrack-tools/02-fix-compilation-of-timeout-extension.patch b/community/conntrack-tools/02-fix-compilation-of-timeout-extension.patch
new file mode 100644
index 000000000..746934994
--- /dev/null
+++ b/community/conntrack-tools/02-fix-compilation-of-timeout-extension.patch
@@ -0,0 +1,33 @@
+From 18efbc802479ce042378dc0cccc7577e1c6afa41 Mon Sep 17 00:00:00 2001
+From: Pablo Neira Ayuso <pablo@netfilter.org>
+Date: Sat, 26 May 2012 20:58:16 +0200
+Subject: [PATCH] nfct: fix compilation of timeout extension
+MIME-Version: 1.0
+Content-Type: text/plain; charset=utf8
+Content-Transfer-Encoding: 8bit
+
+nfct-extensions/timeout.c: In function ‘nfct_timeout_cb’:
+nfct-extensions/timeout.c:99:2: warning: passing argument 4 of ‘nfct_timeout_snprintf’ makes integer from pointer without a cast [enabled by default]
+/usr/include/libnetfilter_cttimeout/libnetfilter_cttimeout.h:114:5: note: expected ‘unsigned int’ but argument is of type ‘struct nfct_timeout *’
+
+Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
+---
+ src/nfct-extensions/timeout.c | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/nfct-extensions/timeout.c b/src/nfct-extensions/timeout.c
+index a1a5c52..5b32023 100644
+--- a/src/nfct-extensions/timeout.c
++++ b/src/nfct-extensions/timeout.c
+@@ -96,7 +96,7 @@ static int nfct_timeout_cb(const struct nlmsghdr *nlh, void *data)
+ goto err_free;
+ }
+
+- nfct_timeout_snprintf(buf, sizeof(buf), t, 0);
++ nfct_timeout_snprintf(buf, sizeof(buf), t, NFCT_TIMEOUT_O_DEFAULT, 0);
+ printf("%s\n", buf);
+
+ err_free:
+--
+1.7.2.5
+
diff --git a/community/conntrack-tools/PKGBUILD b/community/conntrack-tools/PKGBUILD
index 006e17429..541456cd8 100644
--- a/community/conntrack-tools/PKGBUILD
+++ b/community/conntrack-tools/PKGBUILD
@@ -1,29 +1,37 @@
-# $Id: PKGBUILD 71212 2012-05-25 00:16:39Z seblu $
+# $Id: PKGBUILD 72534 2012-06-16 14:02:03Z seblu $
# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
# Contributor: Valere Monseur <valere_monseur@hotmail.com>
# Contributor: Alessandro Sagratini <ale_sagra@hotmail.com>
# Contributor: Kevin Edmonds <edmondskevin@hotmail.com>
pkgname=conntrack-tools
-pkgver=1.0.1
-pkgrel=2
+pkgver=1.2.0
+pkgrel=1
pkgdesc='Userspace tools to interact with the Netfilter connection tracking system'
arch=('i686' 'x86_64')
url='http://www.netfilter.org/projects/conntrack-tools'
license=('GPL2')
-depends=('libnetfilter_conntrack')
-backup=('etc/conntrackd/conntrackd.conf')
+depends=('libnetfilter_conntrack' 'libnetfilter_cttimeout')
+backup=('etc/conntrackd.conf' 'etc/conf.d/conntrackd')
+install=$pkgname.install
source=("http://www.netfilter.org/projects/$pkgname/files/$pkgname-$pkgver.tar.bz2"
'conntrackd.rc'
'conntrackd.conf'
- 'conntrackd.service')
-md5sums=('8a60f02a177fc31fe40cc992c4de90e2'
- '977dfb8fc58df0c74120c8ac92026a6a'
- '92a7fc6ab5cba5e48cde4cac0ac403b1'
- 'bd135eaefb47923bb8e8d26f084d3e9d')
+ 'conntrackd.service'
+ '01-config-file-path.patch'
+ '02-fix-compilation-of-timeout-extension.patch')
+md5sums=('8e20330d6ca3a3f23552aa900b1d467c'
+ '478fe76da0202fcb5249bf65968d1c26'
+ 'd3e73e81b54e3e8166d357d434680684'
+ 'bd135eaefb47923bb8e8d26f084d3e9d'
+ '411fc0eb97c02595aab69b14c26c1d00'
+ '0144021bbec4d5b496ddd86a7ff7a257')
build() {
cd $pkgname-$pkgver
+ for i in "$srcdir"/*.patch; do
+ patch -p1 -i "$i"
+ done
./configure --prefix=/usr --sysconfdir=/etc
make
}
@@ -39,7 +47,7 @@ package() {
install -D -m 644 conntrackd.service \
"$pkgdir/usr/lib/systemd/system/conntrackd.service"
# install empty configuration files
- install -D -m 644 /dev/null "$pkgdir/etc/conntrackd/conntrackd.conf"
+ install -D -m 644 /dev/null "$pkgdir/etc/conntrackd.conf"
}
# vim:set ts=2 sw=2 ft=sh et:
diff --git a/community/conntrack-tools/conntrack-tools.install b/community/conntrack-tools/conntrack-tools.install
new file mode 100644
index 000000000..d21a5f92c
--- /dev/null
+++ b/community/conntrack-tools/conntrack-tools.install
@@ -0,0 +1,9 @@
+## arg 1: the new package version
+## arg 2: the old package version
+post_upgrade() {
+ [ $(vercmp "$2" '1.0.1-2') -gt 0 ] || cat <<EOF
+Config file have been moved from /etc/conntrackd/conntrackd.conf to /etc/conntrackd.conf.
+EOF
+}
+
+# vim:set ts=2 sw=2 ft=sh et:
diff --git a/community/conntrack-tools/conntrackd.conf b/community/conntrack-tools/conntrackd.conf
index b90427a49..285f566d2 100644
--- a/community/conntrack-tools/conntrackd.conf
+++ b/community/conntrack-tools/conntrackd.conf
@@ -1,3 +1,3 @@
# vim:set ts=2 sw=2 ft=sh noet:
-DAEMON_OPTIONS='-d'
+#DAEMON_OPTIONS=''
diff --git a/community/conntrack-tools/conntrackd.rc b/community/conntrack-tools/conntrackd.rc
index a7040c633..4300a7041 100644
--- a/community/conntrack-tools/conntrackd.rc
+++ b/community/conntrack-tools/conntrackd.rc
@@ -6,6 +6,7 @@
DAEMON=/usr/sbin/conntrackd
PID=$(pidof -o %PPID $DAEMON)
+DAEMON_OPTIONS="-d $DAEMON_OPTIONS"
case "$1" in
start)
diff --git a/community/libnetfilter_cttimeout/PKGBUILD b/community/libnetfilter_cttimeout/PKGBUILD
new file mode 100644
index 000000000..1c3211c32
--- /dev/null
+++ b/community/libnetfilter_cttimeout/PKGBUILD
@@ -0,0 +1,26 @@
+# $Id: PKGBUILD 72544 2012-06-16 15:53:38Z seblu $
+# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
+
+pkgname=libnetfilter_cttimeout
+pkgver=1.0.0
+pkgrel=3
+pkgdesc='Library for the connection tracking timeout infrastructure'
+arch=('i686' 'x86_64')
+url='http://www.netfilter.org/projects/libnetfilter_cttimeout/'
+license=('GPL2')
+depends=('libmnl')
+options=('!libtool')
+source=("http://www.netfilter.org/projects/$pkgname/files/$pkgname-$pkgver.tar.bz2")
+md5sums=('7697437fc9ebb6f6b83df56a633db7f9')
+
+build() {
+ cd $pkgname-$pkgver
+ ./configure --prefix=/usr
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 ft=sh et:
diff --git a/community/nautilus-actions/PKGBUILD b/community/nautilus-actions/PKGBUILD
index 47dca2027..28741b7ac 100644
--- a/community/nautilus-actions/PKGBUILD
+++ b/community/nautilus-actions/PKGBUILD
@@ -1,34 +1,34 @@
-# $Id: PKGBUILD 60313 2011-12-10 09:56:53Z ibiru $
+# $Id: PKGBUILD 72506 2012-06-16 07:11:54Z ebelanger $
# Maintainer : Ionut Biru <ibiru@archlinux.org>
# Contributor: Roman Kyrylych <roman@archlinux.org>
# Contributor: Tor Krill <tor@krill.nu>
pkgname=nautilus-actions
-pkgver=3.1.5
+pkgver=3.2.2
pkgrel=1
pkgdesc="Configures programs to be launched when files are selected in Nautilus"
arch=('i686' 'x86_64' 'mips64el')
-url="http://gnome.org"
+url="http://www.nautilus-actions.org/"
license=('GPL')
depends=('nautilus' 'libunique3' 'libgtop' 'gconf' 'libsm')
makedepends=('intltool' 'gnome-doc-utils')
install=nautilus-actions.install
options=('!libtool')
-source=(http://ftp.gnome.org/pub/GNOME/sources/nautilus-actions/3.1/$pkgname-$pkgver.tar.xz)
-sha256sums=('dc6b7522d04e1ed1505d6cb2e3be7888ffbac3f094ba6204da81a19c92cb230a')
+source=(http://ftp.gnome.org/pub/GNOME/sources/nautilus-actions/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+sha256sums=('214af9fd2a7f561366bf88446f9b79182e696a303da8e15c7a8a1ffaeaca11c4')
build() {
- cd $srcdir/$pkgname-$pkgver
+ cd "$srcdir/$pkgname-$pkgver"
./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
--libexecdir=/usr/lib/nautilus-actions
make
}
package(){
- cd $srcdir/$pkgname-$pkgver
- make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR=$pkgdir install
- mkdir -p $pkgdir/usr/share/gconf/schemas
- gconf-merge-schema $pkgdir/usr/share/gconf/schemas/$pkgname.schemas --domain nautilus-actions \
- $pkgdir/etc/gconf/schemas/*.schemas
- rm -rf $pkgdir/etc/gconf/schemas/
+ cd "$srcdir/$pkgname-$pkgver"
+ make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="$pkgdir" install
+ mkdir -p "$pkgdir/usr/share/gconf/schemas"
+ gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/$pkgname.schemas" --domain nautilus-actions \
+ "$pkgdir"/etc/gconf/schemas/*.schemas
+ rm -rf "$pkgdir/etc/gconf/schemas/"
}
diff --git a/community/uptimed/PKGBUILD b/community/uptimed/PKGBUILD
index feaff9e0f..0720c515f 100644
--- a/community/uptimed/PKGBUILD
+++ b/community/uptimed/PKGBUILD
@@ -1,11 +1,12 @@
-# $Id: PKGBUILD 65353 2012-02-21 02:18:04Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# $Id: PKGBUILD 72514 2012-06-16 08:04:35Z bpiotrowski $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
# Contributor: Tom Killian <tomk@runbox.com>
# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
pkgname=uptimed
-pkgver=0.3.16
-pkgrel=4
+pkgver=0.3.17
+pkgrel=1
pkgdesc="A system uptime record daemon"
arch=(i686 x86_64 'mips64el')
url="http://podgorny.cz/uptimed/"
@@ -15,8 +16,8 @@ backup=(etc/uptimed.conf)
options=('!libtool')
install=$pkgname.install
source=(http://podgorny.cz/$pkgname/releases/$pkgname-$pkgver.tar.bz2
- uptimed)
-md5sums=('f87ec2cc39039239004afa542cf99c59'
+ rc.d)
+md5sums=('528b62c33454b33537c3bf2366977bdb'
'4ae90bee9fc78014a889a5072effb735')
build() {
@@ -40,5 +41,5 @@ package() {
make prefix=$pkgdir/usr sysconfdir=$pkgdir/etc install
mv $pkgdir/etc/uptimed.conf-dist $pkgdir/etc/uptimed.conf
- install -D $srcdir/uptimed $pkgdir/etc/rc.d/uptimed
+ install -D $srcdir/rc.d $pkgdir/etc/rc.d/uptimed
}
diff --git a/community/uptimed/rc.d b/community/uptimed/rc.d
new file mode 100644
index 000000000..6fe9ec3e3
--- /dev/null
+++ b/community/uptimed/rc.d
@@ -0,0 +1,39 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+PID=`pidof -o %PPID /usr/sbin/uptimed`
+case "$1" in
+ start)
+ stat_busy "Starting Uptimed Daemon"
+ [ -z "$PID" ] && /usr/sbin/uptimed -b # create the boot record
+ if [ $? -gt 0 ] ; then
+ stat_fail
+ else
+ add_daemon uptimed # create the 'state' dir
+ /usr/sbin/uptimed # fire up the daemon
+ if [ $? -gt 0 ]; then
+ stat_fail
+ fi
+ stat_done
+ fi
+ ;;
+ stop)
+ stat_busy "Stopping Uptimed Daemon"
+ [ "$PID" ] && kill $PID &> /dev/null
+ if [ $? -gt 0 ]; then
+ stat_fail
+ else
+ rm_daemon uptimed # remove the 'state' dir
+ stat_done
+ fi
+ ;;
+ restart)
+ $0 stop
+ $0 start
+ ;;
+ *)
+ echo "usage: $0 {start|stop|restart}"
+esac
+exit 0
diff --git a/extra/jade/PKGBUILD b/extra/jade/PKGBUILD
index 18b247b29..88a9508cd 100644
--- a/extra/jade/PKGBUILD
+++ b/extra/jade/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 150527 2012-02-18 12:08:07Z pierre $
+# $Id: PKGBUILD 161891 2012-06-16 05:10:30Z eric $
# Maintainer:
# Contributor: dorphell <dorphell@archlinux.org>
# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
pkgname=jade
pkgver=1.2.1
-pkgrel=7
-_debpatch=47
+pkgrel=8
+_debpatch=47.1
pkgdesc="James Clark's DSSSL Engine"
url='http://www.jclark.com/jade/'
arch=('i686' 'x86_64' 'mips64el')
@@ -17,7 +17,7 @@ options=('!libtool' '!makeflags')
source=("ftp://ftp.jclark.com/pub/${pkgname}/${pkgname}-${pkgver}.tar.gz"
"http://ftp.debian.org/debian/pool/main/j/jade/jade_${pkgver}-${_debpatch}.diff.gz")
md5sums=('4239670ca6b578bff68b8c2e7cd1225f'
- 'feb3889e2a5fa86ac6bdb742a25d0001')
+ '6c9c0109e3b6d283cb7a18ec8a672575')
build() {
cd "${srcdir}"/${pkgname}-${pkgver}
diff --git a/extra/libdrm-old/COPYING b/extra/libdrm-old/COPYING
new file mode 100644
index 000000000..6e74c337c
--- /dev/null
+++ b/extra/libdrm-old/COPYING
@@ -0,0 +1,48 @@
+ Copyright 2005 Adam Jackson.
+
+ Permission is hereby granted, free of charge, to any person obtaining
+ a copy of this software and associated documentation files (the
+ "Software"), to deal in the Software without restriction, including
+ without limitation on the rights to use, copy, modify, merge,
+ publish, distribute, sub license, and/or sell copies of the Software,
+ and to permit persons to whom the Software is furnished to do so,
+ subject to the following conditions:
+
+ The above copyright notice and this permission notice (including the
+ next paragraph) shall be included in all copies or substantial
+ portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ NON-INFRINGEMENT. IN NO EVENT SHALL ADAM JACKSON BE LIABLE FOR ANY
+ CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+------------------------------------------------------------------------
+
+ Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
+ Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
+ All Rights Reserved.
+
+ Permission is hereby granted, free of charge, to any person obtaining
+ a copy of this software and associated documentation files (the
+ "Software"), to deal in the Software without restriction, including
+ without limitation the rights to use, copy, modify, merge, publish,
+ distribute, sublicense, and/or sell copies of the Software, and to
+ permit persons to whom the Software is furnished to do so, subject to
+ the following conditions:
+
+ The above copyright notice and this permission notice (including the
+ next paragraph) shall be included in all copies or substantial
+ portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ NONINFRINGEMENT. IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS
+ SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ DEALINGS IN THE SOFTWARE.
diff --git a/extra/libdrm-old/PKGBUILD b/extra/libdrm-old/PKGBUILD
new file mode 100644
index 000000000..f72b03e5c
--- /dev/null
+++ b/extra/libdrm-old/PKGBUILD
@@ -0,0 +1,54 @@
+#Id$
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+
+pkgbase=libdrm-old
+pkgname=(libdrm-old libdrm-nouveau1)
+pkgver=2.4.33
+pkgrel=1
+pkgdesc="Userspace interface to kernel DRM services"
+arch=(i686 x86_64)
+license=('custom')
+depends=('glibc' 'libpciaccess')
+makedepends=('cairo' 'valgrind')
+options=('!libtool' '!emptydirs')
+url="http://dri.freedesktop.org/"
+source=(http://dri.freedesktop.org/libdrm/libdrm-$pkgver.tar.bz2
+ no-pthread-stubs.patch
+ COPYING
+)
+sha1sums=('4da2c635491724e44326871e6a49ccfec0b6b5a6'
+ '825ff5e0c4238b31bdea52f104bfec8949270e25'
+ 'ba3dcd636997ee0d30df14b03dae05c24ae5d094')
+
+build() {
+ cd "libdrm-$pkgver"
+ patch -Np1 -i "$srcdir/no-pthread-stubs.patch"
+
+ #libtoolize --force
+ autoreconf --force --install
+ ./configure --prefix=/usr \
+ --disable-libkms \
+ --disable-intel \
+ --disable-radeon \
+ --enable-nouveau-experimental-api
+ make
+}
+
+package_libdrm-old() {
+ pkgdesc="Userspace interface to kernel DRM services - used as makedepends for nouveau-dri"
+ conflicts=('libdrm')
+ provides=("libdrm=$pkgver")
+ cd "libdrm-$pkgver"
+ make DESTDIR="$pkgdir" install
+ rm "$pkgdir"/usr/lib/libdrm_nouveau.so.1*
+}
+
+package_libdrm-nouveau1() {
+ pkgdesc="Userspace interface to kernel DRM services for nouveau - used as depends for nouveau-dri"
+ depends=(libdrm)
+ cd "libdrm-$pkgver"
+ make DESTDIR="$pkgdir" install-libdrm_laLTLIBRARIES
+ make -C nouveau DESTDIR="$pkgdir" install
+ make DESTDIR="$pkgdir" uninstall-libdrm_laLTLIBRARIES
+ rm -rf "$pkgdir"/usr/include/ "$pkgdir"/usr/lib/pkgconfig/libdrm_nouveau.pc "$pkgdir"/usr/lib/libdrm_nouveau.so
+}
diff --git a/extra/libdrm-old/no-pthread-stubs.patch b/extra/libdrm-old/no-pthread-stubs.patch
new file mode 100644
index 000000000..5430244f9
--- /dev/null
+++ b/extra/libdrm-old/no-pthread-stubs.patch
@@ -0,0 +1,66 @@
+diff -ru libdrm-2.4.0/configure.ac libdrm-2.4.0-nostubs/configure.ac
+--- libdrm-2.4.0/configure.ac 2008-10-09 21:57:09.000000000 +0200
++++ libdrm-2.4.0-nostubs/configure.ac 2008-10-21 10:48:24.000000000 +0200
+@@ -47,10 +47,6 @@
+ LT_INIT([disable-static])
+
+
+-PKG_CHECK_MODULES(PTHREADSTUBS, pthread-stubs)
+-AC_SUBST(PTHREADSTUBS_CFLAGS)
+-AC_SUBST(PTHREADSTUBS_LIBS)
+-
+ pkgconfigdir=${libdir}/pkgconfig
+ AC_SUBST(pkgconfigdir)
+ AC_ARG_ENABLE([udev],
+--- libdrm-2.4.16/intel/Makefile.am 2009-11-20 23:54:36.000000000 +0000
++++ libdrm-2.4.16/intel/Makefile.am.new 2009-12-07 08:11:32.235748069 +0000
+@@ -26,7 +26,6 @@
+ $(WARN_CFLAGS) \
+ -I$(top_srcdir) \
+ -I$(top_srcdir)/intel \
+- $(PTHREADSTUBS_CFLAGS) \
+ $(PCIACCESS_CFLAGS) \
+ -I$(top_srcdir)/include/drm
+
+@@ -34,7 +33,6 @@
+ libdrm_intel_ladir = $(libdir)
+ libdrm_intel_la_LDFLAGS = -version-number 1:0:0 -no-undefined
+ libdrm_intel_la_LIBADD = ../libdrm.la \
+- @PTHREADSTUBS_LIBS@ \
+ @PCIACCESS_LIBS@ \
+ @CLOCK_LIB@
+
+--- libdrm-2.4.16/radeon/Makefile.am 2009-11-20 23:54:36.000000000 +0000
++++ libdrm-2.4.16/radeon/Makefile.am.new 2009-12-07 08:12:31.889075388 +0000
+@@ -26,13 +26,12 @@
+ $(WARN_CFLAGS) \
+ -I$(top_srcdir) \
+ -I$(top_srcdir)/radeon \
+- $(PTHREADSTUBS_CFLAGS) \
+ -I$(top_srcdir)/include/drm
+
+ libdrm_radeon_la_LTLIBRARIES = libdrm_radeon.la
+ libdrm_radeon_ladir = $(libdir)
+ libdrm_radeon_la_LDFLAGS = -version-number 1:0:0 -no-undefined
+-libdrm_radeon_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@
++libdrm_radeon_la_LIBADD = ../libdrm.la
+
+ libdrm_radeon_la_SOURCES = \
+ radeon_bo_gem.c \
+--- libdrm-2.4.16/nouveau/Makefile.am 2009-11-20 23:54:36.000000000 +0000
++++ libdrm-2.4.16/nouveau/Makefile.am.new 2009-12-07 08:13:01.489072320 +0000
+@@ -2,13 +2,12 @@
+ $(WARN_CFLAGS) \
+ -I$(top_srcdir) \
+ -I$(top_srcdir)/nouveau \
+- $(PTHREADSTUBS_CFLAGS) \
+ -I$(top_srcdir)/include/drm
+
+ libdrm_nouveau_la_LTLIBRARIES = libdrm_nouveau.la
+ libdrm_nouveau_ladir = $(libdir)
+ libdrm_nouveau_la_LDFLAGS = -version-number 1:0:0 -no-undefined
+-libdrm_nouveau_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@
++libdrm_nouveau_la_LIBADD = ../libdrm.la
+
+ libdrm_nouveau_la_SOURCES = \
+ nouveau_device.c \
diff --git a/extra/libdrm/PKGBUILD b/extra/libdrm/PKGBUILD
index fa9f64eed..d6f5709e9 100644
--- a/extra/libdrm/PKGBUILD
+++ b/extra/libdrm/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 154508 2012-03-29 17:30:54Z andyrtr $
+# $Id: PKGBUILD 161901 2012-06-16 12:11:13Z ibiru $
# Maintainer: Jan de Groot <jgc@archlinux.org>
pkgname=libdrm
-pkgver=2.4.33
+pkgver=2.4.35
pkgrel=1
pkgdesc="Userspace interface to kernel DRM services"
arch=(i686 x86_64 'mips64el')
@@ -10,43 +10,37 @@ license=('custom')
depends=('glibc' 'libpciaccess')
makedepends=('cairo')
[ "$CARCH" != "mips64el" ] && makedepends+=('valgrind')
+replaces=('libdrm-new' 'libdrm-nouveau')
options=('!libtool')
url="http://dri.freedesktop.org/"
-source=(http://dri.freedesktop.org/${pkgname}/${pkgname}-${pkgver}.tar.bz2
+source=(http://dri.freedesktop.org/$pkgname/$pkgname-$pkgver.tar.bz2
no-pthread-stubs.patch
COPYING
-# git_fixes.diff
)
-sha1sums=('4da2c635491724e44326871e6a49ccfec0b6b5a6'
- '825ff5e0c4238b31bdea52f104bfec8949270e25'
+sha1sums=('a1d8d4945f782371d7855dbd693db885bd7e3d83'
+ '2a5410baa3e6e078f9378ce486a88f41d22fd838'
'ba3dcd636997ee0d30df14b03dae05c24ae5d094')
build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- patch -Np1 -i "${srcdir}/no-pthread-stubs.patch"
+ cd $pkgname-$pkgver
+ patch -Np1 -i ../no-pthread-stubs.patch
- # git fixes - currently none
-# patch -Np1 -i ${srcdir}/git_fixes.diff
-
#libtoolize --force
autoreconf --force --install
./configure --prefix=/usr \
--enable-udev \
- --enable-intel \
- --enable-radeon \
- --enable-vmwgfx-experimental-api \
- --enable-nouveau-experimental-api
+ --enable-vmwgfx-experimental-api
make
}
check() {
- cd "${srcdir}/${pkgname}-${pkgver}"
+ cd $pkgname-$pkgver
make -k check
}
package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
- install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
- install -m644 "${srcdir}/COPYING" "${pkgdir}/usr/share/licenses/${pkgname}/"
+ 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/libdrm/no-pthread-stubs.patch b/extra/libdrm/no-pthread-stubs.patch
index 5430244f9..6745f4bc4 100644
--- a/extra/libdrm/no-pthread-stubs.patch
+++ b/extra/libdrm/no-pthread-stubs.patch
@@ -1,6 +1,6 @@
-diff -ru libdrm-2.4.0/configure.ac libdrm-2.4.0-nostubs/configure.ac
---- libdrm-2.4.0/configure.ac 2008-10-09 21:57:09.000000000 +0200
-+++ libdrm-2.4.0-nostubs/configure.ac 2008-10-21 10:48:24.000000000 +0200
+diff -Nur libdrm-2.4.34.orig/configure.ac libdrm-2.4.34/configure.ac
+--- libdrm-2.4.34.orig/configure.ac 2012-05-12 14:54:06.375335490 +0000
++++ libdrm-2.4.34/configure.ac 2012-05-12 14:54:32.075142065 +0000
@@ -47,10 +47,6 @@
LT_INIT([disable-static])
@@ -12,17 +12,18 @@ diff -ru libdrm-2.4.0/configure.ac libdrm-2.4.0-nostubs/configure.ac
pkgconfigdir=${libdir}/pkgconfig
AC_SUBST(pkgconfigdir)
AC_ARG_ENABLE([udev],
---- libdrm-2.4.16/intel/Makefile.am 2009-11-20 23:54:36.000000000 +0000
-+++ libdrm-2.4.16/intel/Makefile.am.new 2009-12-07 08:11:32.235748069 +0000
+diff -Nur libdrm-2.4.34.orig/intel/Makefile.am libdrm-2.4.34/intel/Makefile.am
+--- libdrm-2.4.34.orig/intel/Makefile.am 2012-05-12 14:54:06.372001955 +0000
++++ libdrm-2.4.34/intel/Makefile.am 2012-05-12 14:55:24.164745055 +0000
@@ -26,7 +26,6 @@
$(WARN_CFLAGS) \
-I$(top_srcdir) \
-I$(top_srcdir)/intel \
- $(PTHREADSTUBS_CFLAGS) \
$(PCIACCESS_CFLAGS) \
+ $(VALGRIND_CFLAGS) \
-I$(top_srcdir)/include/drm
-
-@@ -34,7 +33,6 @@
+@@ -35,7 +34,6 @@
libdrm_intel_ladir = $(libdir)
libdrm_intel_la_LDFLAGS = -version-number 1:0:0 -no-undefined
libdrm_intel_la_LIBADD = ../libdrm.la \
@@ -30,8 +31,28 @@ diff -ru libdrm-2.4.0/configure.ac libdrm-2.4.0-nostubs/configure.ac
@PCIACCESS_LIBS@ \
@CLOCK_LIB@
---- libdrm-2.4.16/radeon/Makefile.am 2009-11-20 23:54:36.000000000 +0000
-+++ libdrm-2.4.16/radeon/Makefile.am.new 2009-12-07 08:12:31.889075388 +0000
+diff -Nur libdrm-2.4.34.orig/nouveau/Makefile.am libdrm-2.4.34/nouveau/Makefile.am
+--- libdrm-2.4.34.orig/nouveau/Makefile.am 2012-05-12 14:54:06.331998148 +0000
++++ libdrm-2.4.34/nouveau/Makefile.am 2012-05-12 14:56:00.941132085 +0000
+@@ -2,14 +2,13 @@
+ $(WARN_CFLAGS) \
+ -I$(top_srcdir) \
+ -I$(top_srcdir)/nouveau \
+- $(PTHREADSTUBS_CFLAGS) \
+ -I$(top_srcdir)/include/drm \
+ -DDEBUG
+
+ libdrm_nouveau_la_LTLIBRARIES = libdrm_nouveau.la
+ libdrm_nouveau_ladir = $(libdir)
+ libdrm_nouveau_la_LDFLAGS = -version-number 2:0:0 -no-undefined
+-libdrm_nouveau_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@
++libdrm_nouveau_la_LIBADD = ../libdrm.la
+
+ libdrm_nouveau_la_SOURCES = nouveau.c \
+ pushbuf.c \
+diff -Nur libdrm-2.4.34.orig/radeon/Makefile.am libdrm-2.4.34/radeon/Makefile.am
+--- libdrm-2.4.34.orig/radeon/Makefile.am 2012-05-12 14:54:06.365334765 +0000
++++ libdrm-2.4.34/radeon/Makefile.am 2012-05-12 14:55:48.084557437 +0000
@@ -26,13 +26,12 @@
$(WARN_CFLAGS) \
-I$(top_srcdir) \
@@ -47,20 +68,3 @@ diff -ru libdrm-2.4.0/configure.ac libdrm-2.4.0-nostubs/configure.ac
libdrm_radeon_la_SOURCES = \
radeon_bo_gem.c \
---- libdrm-2.4.16/nouveau/Makefile.am 2009-11-20 23:54:36.000000000 +0000
-+++ libdrm-2.4.16/nouveau/Makefile.am.new 2009-12-07 08:13:01.489072320 +0000
-@@ -2,13 +2,12 @@
- $(WARN_CFLAGS) \
- -I$(top_srcdir) \
- -I$(top_srcdir)/nouveau \
-- $(PTHREADSTUBS_CFLAGS) \
- -I$(top_srcdir)/include/drm
-
- libdrm_nouveau_la_LTLIBRARIES = libdrm_nouveau.la
- libdrm_nouveau_ladir = $(libdir)
- libdrm_nouveau_la_LDFLAGS = -version-number 1:0:0 -no-undefined
--libdrm_nouveau_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@
-+libdrm_nouveau_la_LIBADD = ../libdrm.la
-
- libdrm_nouveau_la_SOURCES = \
- nouveau_device.c \
diff --git a/extra/libpng/PKGBUILD b/extra/libpng/PKGBUILD
index abe396cf3..cb29f066c 100644
--- a/extra/libpng/PKGBUILD
+++ b/extra/libpng/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 155695 2012-04-05 07:31:28Z ibiru $
+# $Id: PKGBUILD 161912 2012-06-16 14:11:51Z ibiru $
# Maintainer: Jan de Groot <jgc@archlinux.org>
# Contributor: dorphell <dorphell@archlinux.org>
# Contributor: Travis Willard <travis@archlinux.org>
# Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
pkgname=libpng
-pkgver=1.5.10
-_apngver=1.5.10
+pkgver=1.5.11
+_apngver=1.5.11
pkgrel=1
pkgdesc="A collection of routines used to create PNG format graphics files"
arch=('i686' 'x86_64' 'mips64el')
@@ -16,22 +16,22 @@ depends=('zlib' 'sh')
options=('!libtool')
source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.xz"
"http://downloads.sourceforge.net/sourceforge/libpng-apng/libpng-$_apngver-apng.patch.gz")
-md5sums=('9c2ac3c3a31de2ab867875718f8de18e'
- '88517ab0e9c0be2590800116e2b50c8d')
+md5sums=('57f838299e701b6db9e8389c5602dc18'
+ 'e9ddf7670e78ad93f4cc189c884d4f26')
build() {
- cd "$pkgname-$pkgver"
+ cd $pkgname-$pkgver
# Add animated PNG (apng) support
# see http://sourceforge.net/projects/libpng-apng/
- patch -p1 -i "$srcdir/libpng-$_apngver-apng.patch"
+ patch -p1 -i ../libpng-$_apngver-apng.patch
./configure --prefix=/usr
make
}
package() {
- cd "$pkgname-$pkgver"
+ cd $pkgname-$pkgver
make DESTDIR="$pkgdir" install
cd contrib/pngminus
diff --git a/extra/mesa/PKGBUILD b/extra/mesa/PKGBUILD
index 71947ef05..705d96cd4 100644
--- a/extra/mesa/PKGBUILD
+++ b/extra/mesa/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 160367 2012-06-01 12:58:38Z dreisner $
+# $Id: PKGBUILD 161903 2012-06-16 12:11:28Z ibiru $
# Maintainer: Jan de Groot <jgc@archlinux.org>
# Maintainer: Andreas Radke <andyrtr@archlinux.org>
pkgbase=mesa
pkgname=('mesa' 'libgl' 'osmesa' 'libglapi' 'libgbm' 'libgles' 'libegl' 'khrplatform-devel')
-[[ "$CARCH" != "mips64el" ]] && pkgname+=( 'ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri')
+[[ "$CARCH" != "mips64el" ]] && pkgname+=( 'ati-dri' 'intel-dri' 'svga-dri')
#_git=true
_gitdate=20111031
@@ -16,7 +16,7 @@ if [ "${_git}" = "true" ]; then
else
pkgver=8.0.3
fi
-pkgrel=2
+pkgrel=3
arch=('i686' 'x86_64' 'mips64el')
makedepends=('glproto>=1.4.15' 'libdrm>=2.4.30' 'libxxf86vm>=1.1.1' 'libxdamage>=1.1.3' 'expat>=2.0.1' 'libx11>=1.4.99.1' 'libxt>=1.1.1'
'gcc-libs>=4.6.1' 'dri2proto>=2.6' 'python2' 'libxml2' 'imake' 'udev>=183')
@@ -72,6 +72,10 @@ if [ "${_git}" = "true" ]; then
autoreconf -vfi
./configure --prefix=/usr \
--with-dri-driverdir=/usr/lib/xorg/modules/dri \
+ --with-gallium-drivers=r300,r600,svga,swrast \
+ --with-dri-drivers=i915,i965,r200,radeon,swrast \
+ --enable-gallium-llvm \
+ --enable-gallium-egl \
--enable-shared-glapi \
--enable-gbm \
--enable-glx-tls \
diff --git a/extra/nouveau-dri/LICENSE b/extra/nouveau-dri/LICENSE
new file mode 100644
index 000000000..ae33d2709
--- /dev/null
+++ b/extra/nouveau-dri/LICENSE
@@ -0,0 +1,82 @@
+Disclaimer
+
+Mesa is a 3-D graphics library with an API which is very similar to
+that of OpenGL*
+To the extent that Mesa utilizes the OpenGL command syntax or state
+machine, it is being used with authorization from Silicon Graphics,
+Inc.(SGI). However, the author does not possess an OpenGL license
+from SGI, and makes no claim that Mesa is in any way a compatible
+replacement for OpenGL or associated with SGI. Those who want a
+licensed implementation of OpenGL should contact a licensed
+vendor.
+
+Please do not refer to the library as MesaGL (for legal
+reasons). It's just Mesa or The Mesa 3-D graphics
+library
+
+* OpenGL is a trademark of Silicon Graphics Incorporated.
+
+License / Copyright Information
+
+The Mesa distribution consists of several components. Different copyrights
+and licenses apply to different components. For example, GLUT is copyrighted
+by Mark Kilgard, some demo programs are copyrighted by SGI, some of the Mesa
+device drivers are copyrighted by their authors. See below for a list of
+Mesa's main components and the license for each.
+
+The core Mesa library is licensed according to the terms of the MIT license.
+This allows integration with the XFree86, Xorg and DRI projects.
+
+The default Mesa license is as follows:
+
+Copyright (C) 1999-2007 Brian Paul All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Attention, Contributors
+
+When contributing to the Mesa project you must agree to the licensing terms
+of the component to which you're contributing.
+The following section lists the primary components of the Mesa distribution
+and their respective licenses.
+
+
+Mesa Component Licenses
+
+Component Location Primary Author License
+----------------------------------------------------------------------------
+Main Mesa code src/mesa/ Brian Paul Mesa (MIT)
+
+Device drivers src/mesa/drivers/* See drivers See drivers
+
+Ext headers include/GL/glext.h SGI SGI Free B
+ include/GL/glxext.h
+
+GLUT src/glut/ Mark Kilgard Mark's copyright
+
+Mesa GLU library src/glu/mesa/ Brian Paul GNU-LGPL
+
+SGI GLU library src/glu/sgi/ SGI SGI Free B
+
+demo programs progs/demos/ various see source files
+
+X demos progs/xdemos/ Brian Paul see source files
+
+SGI demos progs/samples/ SGI SGI copyright
+
+RedBook demos progs/redbook/ SGI SGI copyright
diff --git a/extra/nouveau-dri/PKGBUILD b/extra/nouveau-dri/PKGBUILD
new file mode 100644
index 000000000..e4066e945
--- /dev/null
+++ b/extra/nouveau-dri/PKGBUILD
@@ -0,0 +1,56 @@
+# $Id: PKGBUILD 161906 2012-06-16 12:11:45Z ibiru $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+# Maintainer: Andreas Radke <andyrtr@archlinux.org>
+
+pkgname=nouveau-dri
+pkgver=8.0.3
+pkgrel=3
+arch=('i686' 'x86_64')
+makedepends=('glproto>=1.4.15' 'libdrm-old' 'libdrm-nouveau1' 'libxxf86vm>=1.1.1' 'libxdamage>=1.1.3' 'expat>=2.0.1' 'libx11>=1.4.99.1' 'libxt>=1.1.1'
+ 'gcc-libs>=4.6.1' 'dri2proto>=2.6' 'python2' 'libxml2' 'imake' 'llvm' 'udev>=183')
+url="http://mesa3d.sourceforge.net"
+license=('custom')
+source=(LICENSE
+ mesa-8.0.3-llvm-3.1-fixes.patch
+ ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2
+)
+md5sums=('5c65a0fe315dd347e09b1f2826a1df5a'
+ 'c452ed3392468170726c004c2f4e02ca'
+ 'cc5ee15e306b8c15da6a478923797171')
+
+build() {
+ cd ${srcdir}/?esa-*
+
+ patch -Np1 -i "${srcdir}/mesa-8.0.3-llvm-3.1-fixes.patch"
+
+ autoreconf -vfi
+ ./configure --prefix=/usr \
+ --with-dri-driverdir=/usr/lib/xorg/modules/dri \
+ --with-gallium-drivers=nouveau \
+ --with-dri-drivers=nouveau \
+ --enable-gallium-llvm \
+ --enable-gallium-egl \
+ --enable-shared-glapi \
+ --enable-gbm \
+ --enable-glx-tls \
+ --enable-dri \
+ --enable-glx \
+ --enable-osmesa \
+ --enable-gles1 \
+ --enable-gles2 \
+ --enable-egl \
+ --enable-texture-float \
+ --enable-xa \
+ --enable-shared-dricore
+ make
+}
+
+package() {
+ depends=("libgl=${pkgver}" 'libdrm-nouveau1')
+ pkgdesc="Mesa classic DRI + Gallium3D drivers for Nouveau"
+
+ # classic mesa driver for nv10 , nv20 nouveau_vieux_dri.so
+ make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/nouveau DESTDIR="${pkgdir}" install
+ # gallium3D driver for nv30 - nv40 - nv50 nouveau_dri.so
+ make -C ${srcdir}/?esa-*/src/gallium/targets/dri-nouveau DESTDIR="${pkgdir}" install
+}
diff --git a/extra/nouveau-dri/mesa-8.0.3-llvm-3.1-fixes.patch b/extra/nouveau-dri/mesa-8.0.3-llvm-3.1-fixes.patch
new file mode 100644
index 000000000..a567b5926
--- /dev/null
+++ b/extra/nouveau-dri/mesa-8.0.3-llvm-3.1-fixes.patch
@@ -0,0 +1,46 @@
+diff --git a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
+index a50a51d..f1bb4d9 100644
+--- a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
++++ b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
+@@ -235,7 +235,24 @@ lp_disassemble(const void* func)
+ int AsmPrinterVariant = AsmInfo->getAssemblerDialect();
+ #endif
+
+-#if HAVE_LLVM >= 0x0300
++#if HAVE_LLVM >= 0x0301
++ OwningPtr<const MCRegisterInfo> MRI(T->createMCRegInfo(Triple));
++ if (!MRI) {
++ debug_printf("error: no register info for target %s\n", Triple.c_str());
++ return;
++ }
++
++ OwningPtr<const MCInstrInfo> MII(T->createMCInstrInfo());
++ if (!MII) {
++ debug_printf("error: no instruction info for target %s\n", Triple.c_str());
++ return;
++ }
++#endif
++
++#if HAVE_LLVM >= 0x0301
++ OwningPtr<MCInstPrinter> Printer(
++ T->createMCInstPrinter(AsmPrinterVariant, *AsmInfo, *MII, *MRI, *STI));
++#elif HAVE_LLVM == 0x0300
+ OwningPtr<MCInstPrinter> Printer(
+ T->createMCInstPrinter(AsmPrinterVariant, *AsmInfo, *STI));
+ #elif HAVE_LLVM >= 0x0208
+diff --git a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
+index fe7616b..68f8808 100644
+--- a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
++++ b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
+@@ -62,7 +62,11 @@
+ extern "C" void
+ lp_register_oprofile_jit_event_listener(LLVMExecutionEngineRef EE)
+ {
++#if HAVE_LLVM >= 0x0301
++ llvm::unwrap(EE)->RegisterJITEventListener(llvm::JITEventListener::createOProfileJITEventListener());
++#else
+ llvm::unwrap(EE)->RegisterJITEventListener(llvm::createOProfileJITEventListener());
++#endif
+ }
+
+
diff --git a/extra/perl-dbd-mysql/PKGBUILD b/extra/perl-dbd-mysql/PKGBUILD
index 21586d5f3..7372de086 100644
--- a/extra/perl-dbd-mysql/PKGBUILD
+++ b/extra/perl-dbd-mysql/PKGBUILD
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD 160517 2012-06-02 10:27:16Z bluewind $
+# $Id: PKGBUILD 161944 2012-06-16 19:18:00Z eric $
# Maintainer: kevin <kevin@archlinux.org>
# Contributor: Eric Johnson <eric@coding-zone.com>
pkgname=perl-dbd-mysql
_realname=DBD-mysql
-pkgver=4.020
-pkgrel=3
+pkgver=4.021
+pkgrel=1
pkgdesc="Perl/CPAN DBD::mysql module for interacting with MySQL via DBD"
-arch=(i686 x86_64 'mips64el')
+arch=('i686' 'x86_64' 'mips64el')
license=('GPL' 'PerlArtistic')
url="http://search.cpan.org/dist/${_realname}/"
-depends=('libmysqlclient' 'perl-dbi' 'perl>=5.14.0')
+depends=('libmysqlclient' 'perl-dbi')
makedepends=('mysql')
-options=(!emptydirs)
+options=('!emptydirs')
source=(http://search.cpan.org/CPAN/authors/id/C/CA/CAPTTOFU/${_realname}-${pkgver}.tar.gz)
-md5sums=('a2bf8808bbd45298e84dde06afbd58e9')
+md5sums=('35653efca4bbe6e49ef31d237b4a50b7')
build() {
cd "${srcdir}/${_realname}-${pkgver}"
diff --git a/extra/racket/PKGBUILD b/extra/racket/PKGBUILD
index 5f1b90ce5..a5db6e3cb 100644
--- a/extra/racket/PKGBUILD
+++ b/extra/racket/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 157415 2012-04-28 09:27:18Z allan $
+# $Id: PKGBUILD 161957 2012-06-17 01:21:57Z eric $
# Maintainer: Eric Bélanger <eric@archlinux.org>
pkgname=racket
pkgver=5.2.1
-pkgrel=2
+pkgrel=3
pkgdesc="A programming language environment (formerly known as PLT Scheme) suitable for tasks ranging from scripting to application development"
arch=('i686' 'x86_64' 'mips64el')
url="http://racket-lang.org/"
@@ -13,9 +13,10 @@ makedepends=('gsfonts')
options=('!libtool' '!strip')
install=racket.install
source=(http://download.racket-lang.org/installers/${pkgver}/racket/${pkgname}-${pkgver}-src-unix.tgz \
- drracket.desktop)
+ drracket.desktop drracket-normal.rkt)
sha1sums=('b51cdd8b9825edb60e5c2c80472cec8220918cd1'
- 'a20808f6b250225704856f82a544681a962a299d')
+ 'a20808f6b250225704856f82a544681a962a299d'
+ '6699e80e424479d45f427ba341003235e0d475cf')
build() {
cd "${srcdir}/${pkgname}-${pkgver}/src"
@@ -27,6 +28,10 @@ build() {
package() {
cd "${srcdir}/${pkgname}-${pkgver}/src"
make DESTDIR="${pkgdir}" install
+
+ # FS#30245
+ install -D -m644 "${srcdir}/drracket-normal.rkt" "${pkgdir}/usr/lib/racket/collects/drracket/private/drracket-normal.rkt"
+
install -D -m644 ../collects/icons/plt.xpm "${pkgdir}/usr/share/pixmaps/drracket.xpm"
install -D -m644 "${srcdir}/drracket.desktop" "${pkgdir}/usr/share/applications/drracket.desktop"
}
diff --git a/extra/racket/drracket-normal.rkt b/extra/racket/drracket-normal.rkt
new file mode 100644
index 000000000..5ed11c21c
--- /dev/null
+++ b/extra/racket/drracket-normal.rkt
@@ -0,0 +1,199 @@
+#lang racket/base
+
+(require mred
+ racket/class
+ racket/cmdline
+ racket/list
+ framework/private/bday
+ framework/splash
+ racket/runtime-path
+ racket/file
+ "frame-icon.rkt"
+ "eb.rkt")
+
+(define-runtime-path doc-icon.rkt "dock-icon.rkt")
+
+(define files-to-open (command-line #:args filenames filenames))
+
+;; updates the command-line-arguments with only the files
+;; to open. See also main.rkt.
+(current-command-line-arguments (apply vector files-to-open))
+
+(define (currently-the-weekend?)
+ (define date (seconds->date (current-seconds)))
+ (define dow (date-week-day date))
+ (or (= dow 6) (= dow 0)))
+
+(define (valentines-day?)
+ (define date (seconds->date (current-seconds)))
+ (and (= 2 (date-month date))
+ (= 14 (date-day date))))
+
+(define (current-icon-state)
+ (cond
+ [(valentines-day?) 'valentines]
+ [(currently-the-weekend?) 'weekend]
+ [else 'normal]))
+
+(define-values (texas-independence-day? prince-kuhio-day? kamehameha-day? halloween?)
+ (let* ([date (seconds->date (current-seconds))]
+ [month (date-month date)]
+ [day (date-day date)]
+ [dow (date-week-day date)])
+ (values (and (= 3 month) (= 2 day))
+ #f
+ (and (= 6 month) (= 11 day))
+ (and (= 10 month) (= 31 day)))))
+
+
+(define special-state #f)
+
+(define (icons-bitmap name)
+ (make-object bitmap% (collection-file-path name "icons")))
+
+(define-struct magic-image (chars filename [bitmap #:mutable]))
+
+(define (magic-img str img)
+ (make-magic-image (reverse (string->list str)) img #f))
+
+;; magic strings and their associated images. There should not be a string
+;; in this list that is a prefix of another.
+(define magic-images
+ (list #;(magic-img "larval" "PLT-206-larval.png")
+ (magic-img "mars" "PLT-206-mars.jpg")))
+
+(define (load-magic-images)
+ (set! load-magic-images void) ; run only once
+ (for-each (λ (magic-image)
+ (unless (magic-image-bitmap magic-image)
+ (set-magic-image-bitmap!
+ magic-image
+ (icons-bitmap (magic-image-filename magic-image)))))
+ magic-images))
+
+(define longest-magic-string
+ (apply max (map (λ (s) (length (magic-image-chars s))) magic-images)))
+
+(define key-codes null)
+
+(define (find-magic-image)
+ (define (prefix? l1 l2)
+ (or (null? l1)
+ (and (pair? l2)
+ (eq? (car l1) (car l2))
+ (prefix? (cdr l1) (cdr l2)))))
+ (ormap (λ (i) (and (prefix? (magic-image-chars i) key-codes) i))
+ magic-images))
+
+(define (add-key-code new-code)
+ (set! key-codes (cons new-code key-codes))
+ (when ((length key-codes) . > . longest-magic-string)
+ (set! key-codes (take key-codes longest-magic-string))))
+
+(define (drracket-splash-char-observer evt)
+ (let ([ch (send evt get-key-code)])
+ (when (and (eq? ch #\q)
+ (send evt get-control-down))
+ (exit))
+ (when (char? ch)
+ ;; as soon as something is typed, load the bitmaps
+ (load-magic-images)
+ (add-key-code ch)
+ (let ([match (find-magic-image)])
+ (when match
+ (set! key-codes null)
+ (set-splash-bitmap
+ (if (eq? special-state match)
+ (begin (set! special-state #f) the-splash-bitmap)
+ (begin (set! special-state match)
+ (magic-image-bitmap match))))
+ (refresh-splash))))))
+
+(when (eb-bday?) (install-eb))
+
+(define weekend-bitmap-spec (collection-file-path "plt-logo-red-shiny.png" "icons"))
+(define normal-bitmap-spec (collection-file-path "plt-logo-red-diffuse.png" "icons"))
+(define valentines-days-spec (collection-file-path "heart.png" "icons"))
+
+(define the-bitmap-spec
+ (cond
+ [(valentines-day?)
+ valentines-days-spec]
+ [(or prince-kuhio-day? kamehameha-day?)
+ (set-splash-progress-bar?! #f)
+ (let ([size ((dynamic-require 'drracket/private/palaka 'palaka-pattern-size) 4)])
+ (vector (dynamic-require 'drracket/private/honu-logo 'draw-honu)
+ size
+ size))]
+ [texas-independence-day?
+ (collection-file-path "texas-plt-bw.gif" "icons")]
+ [halloween?
+ (collection-file-path "PLT-pumpkin.png" "icons")]
+ [(currently-the-weekend?)
+ weekend-bitmap-spec]
+ [else normal-bitmap-spec]))
+(define the-splash-bitmap (read-bitmap the-bitmap-spec))
+(set-splash-char-observer drracket-splash-char-observer)
+
+(when (eq? (system-type) 'macosx)
+ (define initial-state (current-icon-state))
+ (define weekend-bitmap (if (equal? the-bitmap-spec weekend-bitmap-spec)
+ the-splash-bitmap
+ #f))
+ (define weekday-bitmap (if (equal? the-bitmap-spec normal-bitmap-spec)
+ the-splash-bitmap
+ #f))
+ (define valentines-bitmap (if (equal? the-bitmap-spec valentines-days-spec)
+ the-splash-bitmap
+ #f))
+ (define set-doc-tile-bitmap (dynamic-require doc-icon.rkt 'set-dock-tile-bitmap))
+ (define (set-icon state)
+ (case state
+ [(valentines)
+ (unless valentines-bitmap (set! valentines-bitmap (read-bitmap valentines-days-spec)))
+ (set-doc-tile-bitmap valentines-bitmap)]
+ [(weekend)
+ (unless weekend-bitmap (set! weekend-bitmap (read-bitmap weekend-bitmap-spec)))
+ (set-doc-tile-bitmap weekend-bitmap)]
+ [(normal)
+ (unless weekday-bitmap (set! weekday-bitmap (read-bitmap normal-bitmap-spec)))
+ (set-doc-tile-bitmap weekday-bitmap)]))
+ (set-icon initial-state)
+ (void
+ (thread
+ (λ ()
+ (let loop ([last-state initial-state])
+ (sleep 10)
+ (define next-state (current-icon-state))
+ (unless (equal? last-state next-state)
+ (set-icon next-state))
+ (loop next-state))))))
+
+(start-splash the-splash-bitmap
+ "DrRacket"
+ 700
+ #:allow-funny? #t
+ #:frame-icon todays-icon)
+
+(when (getenv "PLTDRBREAK")
+ (printf "PLTDRBREAK: creating break frame\n") (flush-output)
+ (let ([to-break (eventspace-handler-thread (current-eventspace))])
+ (parameterize ([current-eventspace (make-eventspace)])
+ (let* ([f (new frame% (label "Break DrRacket"))]
+ [b (new button%
+ (label "Break Main Thread")
+ (callback
+ (λ (x y)
+ (break-thread to-break)))
+ (parent f))]
+ [b (new button%
+ (label "Break All Threads")
+ (callback
+ (λ (x y)
+ ((dynamic-require 'drracket/private/key 'break-threads))))
+ (parent f))])
+ (send f show #t)))))
+
+(dynamic-require 'drracket/tool-lib #f)
+(shutdown-splash)
+(close-splash)
diff --git a/extra/xf86-video-ati/PKGBUILD b/extra/xf86-video-ati/PKGBUILD
index 5735fc350..5ba47825e 100644
--- a/extra/xf86-video-ati/PKGBUILD
+++ b/extra/xf86-video-ati/PKGBUILD
@@ -1,60 +1,31 @@
-# $Id: PKGBUILD 160377 2012-06-01 12:58:56Z dreisner $
+# $Id: PKGBUILD 161905 2012-06-16 12:11:37Z ibiru $
# Maintainer: Jan de Groot <jgc@archlinux.org>
# Contributor: Alexander Baldeck <alexander@archlinux.org>
pkgname=xf86-video-ati
-pkgver=6.14.99
-_gitdate=20120517
-pkgrel=1.${_gitdate} # UMS/EXA: Add reminder for potential solid picture performance issue.
+pkgver=6.14.5
+epoch=1
+pkgrel=1
pkgdesc="X.org ati video driver"
arch=('i686' 'x86_64')
url="http://xorg.freedesktop.org/"
license=('custom')
-depends=('libpciaccess' 'libdrm>=2.4.33' 'udev>=183' 'pixman' 'ati-dri')
-makedepends=('xorg-server-devel>=1.11.99.902' 'xf86driproto' 'mesa' 'glproto')
+depends=('libdrm>=2.4.35' 'systemd-tools' 'ati-dri')
+makedepends=('xorg-server-devel>=1.11.99.902' 'xf86driproto' 'mesa')
conflicts=('xorg-server<1.11.99.902')
groups=('xorg-drivers' 'xorg')
options=('!libtool')
-source=(#${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
- ${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2::http://cgit.freedesktop.org/xorg/driver/xf86-video-ati/snapshot/xf86-video-ati-3fb694b308ebadd1b849836059b6b56bb19385f7.tar.gz
- git_fixes.diff
- 0000-poor-man-s-solid-picture-support-for-r300-r600.patch
- 0001-poor-man-s-solid-picture-support-for-evergreen.patch
- 0002-poor-man-s-solid-picture-support-for-r100.patch
- 0003-poor-man-s-solid-picture-support-for-r200.patch)
-sha1sums=('75ad000bc00599e1797134f2d20d3094cba6af92'
- '8b774e2f0310075cff2b7d874b0bed38d6245769'
- '787f88c428f56ca6e96ba5eaf043a30bddfd0e23'
- '69359a6623fe0f2214790c8ad40cac1a680a3825'
- 'c0709ab82728e34838a8aeead7d1b79b7faf09bd'
- '77a519e250c27a9fb94eeb52da655eed7c5f2eca')
-sha1sums=('80c12b88e193354af204b13689b2fae922922c6c'
- '8b774e2f0310075cff2b7d874b0bed38d6245769'
- '787f88c428f56ca6e96ba5eaf043a30bddfd0e23'
- '69359a6623fe0f2214790c8ad40cac1a680a3825'
- 'c0709ab82728e34838a8aeead7d1b79b7faf09bd'
- '77a519e250c27a9fb94eeb52da655eed7c5f2eca')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
+sha256sums=('ef879d2845de50cec1aa98e37185271e1d535c0009efd6713ec88206b7197d53')
build() {
- #cd ${srcdir}/${pkgname}-${pkgver}
- cd ${srcdir}/${pkgname}*
- #patch -Np1 -i ${srcdir}/git_fixes.diff
-
- # fix rendering issues with recent cairo - testing attemp taken from https://bugs.freedesktop.org/show_bug.cgi?id=47266
- # and http://lists.x.org/archives/xorg-driver-ati/2012-April/022724.html
-# patch -Np1 -i ${srcdir}/0000-poor-man-s-solid-picture-support-for-r300-r600.patch
-# patch -Np1 -i ${srcdir}/0001-poor-man-s-solid-picture-support-for-evergreen.patch
-# patch -Np1 -i ${srcdir}/0002-poor-man-s-solid-picture-support-for-r100.patch
-# patch -Np1 -i ${srcdir}/0003-poor-man-s-solid-picture-support-for-r200.patch
-
- ./autogen.sh --prefix=/usr --enable-dri
-# ./configure --prefix=/usr --enable-dri
+ cd ${srcdir}/${pkgname}-${pkgver}
+ ./configure --prefix=/usr #--enable-dri --help
make
}
package() {
- #cd "${srcdir}/${pkgname}-${pkgver}"
- cd ${srcdir}/${pkgname}*
+ cd "${srcdir}/${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-nouveau/PKGBUILD b/extra/xf86-video-nouveau/PKGBUILD
index a9fc10cbd..9c58482b4 100644
--- a/extra/xf86-video-nouveau/PKGBUILD
+++ b/extra/xf86-video-nouveau/PKGBUILD
@@ -1,23 +1,23 @@
-# $Id: PKGBUILD 160381 2012-06-01 12:59:04Z dreisner $
+# $Id: PKGBUILD 161904 2012-06-16 12:11:34Z ibiru $
# Maintainer: Andreas Radke <andyrtr@archlinux.org>
# Contributor: buddabrod <buddabrod@gmail.com>
pkgname=xf86-video-nouveau
-_gitdate=20120512
+_gitdate=20120615
pkgver=0.0.16_git${_gitdate} # see configure.ac
-pkgrel=2
+pkgrel=1
pkgdesc="Open Source 2D acceleration driver for nVidia cards (experimental)"
arch=('i686' 'x86_64')
url="http://nouveau.freedesktop.org/wiki/"
license=('GPL') #and MIT, not yet a license file, see http://nouveau.freedesktop.org/wiki/FAQ#head-09f75d03eb30011c754038a3893119a70745de4e
-depends=('libdrm-nouveau' 'udev')
+depends=('libdrm' 'udev')
optdepends=('nouveau-dri: experimental gallium3d features')
-makedepends=('xorg-server-devel' 'libdrm-new' 'xf86driproto')
+makedepends=('xorg-server-devel' 'xf86driproto')
conflicts=('xorg-server<1.11.99.902')
options=('!libtool')
install=$pkgname.install
source=(ftp://ftp.archlinux.org/other/$pkgname/xf86-video-nouveau-${_gitdate}.tar.bz2)
-md5sums=('3e27e283219936d64c194eca24cd81cd')
+md5sums=('9ceb49ff436c9a00536490fb1c8bf6d1')
# source PKGBUILD && mksource
mksource() {
@@ -30,12 +30,12 @@ mksource() {
}
build() {
- cd $srcdir/xf86-video-nouveau-${_gitdate}
+ cd xf86-video-nouveau-${_gitdate}
./autogen.sh --prefix=/usr
make
}
package() {
- cd $srcdir/xf86-video-nouveau-${_gitdate}
- make DESTDIR=$pkgdir install
+ cd xf86-video-nouveau-${_gitdate}
+ make DESTDIR="$pkgdir" install
}
diff --git a/libre/grub2/PKGBUILD b/libre/grub2/PKGBUILD
index 342d61fe5..dd5dab575 100644
--- a/libre/grub2/PKGBUILD
+++ b/libre/grub2/PKGBUILD
@@ -1,9 +1,9 @@
# Maintainer: Ronald van Haren <ronald.archlinux.org>
# Contributor: Keshav P R <(the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)>
-# Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy>
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
_grub_bzr_rev="4232"
-_pkgver="2.00~beta4"
+_pkgver="2.00~beta6"
_grub_lua_ver=24
_grub_gpxe_ver=12
@@ -13,7 +13,7 @@ _grub_915_ver=9
pkgname=('grub2-common' 'grub2-bios' 'grub2-efi-i386')
[ "$CARCH" = "mips64el" ] && pkgname=('grub2-common' 'grub2-loongson')
pkgbase=grub2
-pkgver=2.00beta4
+pkgver=2.00beta6
pkgrel=1
url="http://www.gnu.org/software/grub/"
arch=('i686' 'x86_64' 'mips64el')
@@ -31,15 +31,14 @@ source=("http://alpha.gnu.org/gnu/grub/grub-${_pkgver}".tar.xz
'parabola_grub_mkconfig_fixes.patch'
'grub.default'
'grub.cfg'
- '20_memtest86+'
- 'grub-install.fix')
+ '20_memtest86+')
noextract=("grub2_extras_lua_r${_grub_lua_ver}.tar.xz"
"grub2_extras_gpxe_r${_grub_gpxe_ver}.tar.xz"
"grub2_extras_ntldr-img_r${_grub_ntldr_ver}.tar.xz"
"grub2_extras_915resolution_r${_grub_915_ver}.tar.xz")
-sha1sums=('72d7f46a67dd7e958105e7faac72e646ef6e9f11'
+sha1sums=('0ba5ccf6e6761911f9bf236e21f8f77a2d29ebdb'
'89290031b974780c6df76893836d2477d4add895'
'b04994c005910b4bf123f034b30109d5c8d6fd86'
'eb4b35b4c36b64f9405cbcbc538cb205171c1c0a'
@@ -47,8 +46,8 @@ sha1sums=('72d7f46a67dd7e958105e7faac72e646ef6e9f11'
'31aa740fc225b3f3ed4917843038f9e8658a71be'
'348b148d5183825f31a3d24a7ebf2d6a709f4e6a'
'9735043d518e16f147f64ef283eceb2549fed860'
- 'ce35d7ae75cd1b5b677e894e528f96add40e77b9'
- '4ff0e12e65fb1d4d3f2a16e82eaaa43940b7dde7')
+ 'ce35d7ae75cd1b5b677e894e528f96add40e77b9')
+
_build_grub2-common_and_bios() {
## copy the source for building the common/bios package
@@ -59,10 +58,6 @@ _build_grub2-common_and_bios() {
patch -Np1 -i "${srcdir}/parabola_grub_mkconfig_fixes.patch"
echo
- ## upstream grub-install fix
- ## http://lists.gnu.org/archive/html/help-grub/2012-04/msg00096.html
- patch -Np0 -i "${srcdir}/grub-install.fix"
-
## add the grub-extra sources
export GRUB_CONTRIB="${srcdir}/grub_bios-${_pkgver}/grub-extras/"
install -d "${srcdir}/grub_bios-${_pkgver}/grub-extras"
@@ -205,7 +200,7 @@ package_grub2-common() {
options=('strip' 'purge' 'docs' 'zipman' '!emptydirs')
cd "${srcdir}/grub_bios-${_pkgver}"
- make DESTDIR="${pkgdir}/" install
+ make bashcompletiondir=/usr/share/bash-completion/completions DESTDIR="${pkgdir}/" install
## install extra /etc/grub.d/ files
install -D -m0755 "${srcdir}/20_memtest86+" "${pkgdir}/etc/grub.d/20_memtest86+"
diff --git a/libre/icecat-i18n/PKGBUILD b/libre/icecat-i18n/PKGBUILD
index f995939da..e6f2e82b8 100644
--- a/libre/icecat-i18n/PKGBUILD
+++ b/libre/icecat-i18n/PKGBUILD
@@ -2,6 +2,7 @@
# Contributor: fauno <fauno@kiwwwi.com.ar>
# Contributor: Figue <ffigue@gmail.com>
# Contributor: emulatorman <andre.paulista@adinet.com.uy>
+
# Based on firefox-i18n package
# When updating to a newer upstream release:
@@ -9,22 +10,22 @@
# - (optionally) edit PKGBUILD.in
# - Run 'make'. It will take care of everything else for you.
-_langpacks=(af ak ar ast be bg bn-BD bn-IN br bs ca cs cy da de el en-GB en-US en-ZA eo es-AR es-CL es-ES es-MX et eu fa fi fr fy-NL ga-IE gd gl gu-IN he hi-IN hr hu hy-AM id is it ja kk kn ko ku lg lt lv mai mk ml mr nb-NO nl nn-NO nso or pa-IN pl pt-BR pt-PT rm ro ru si sk sl son sq sr sv-SE ta-LK ta te th tr uk vi zh-CN zh-TW zu)
+_langpacks=(af ak ar as ast be bg bn-BD bn-IN br bs ca cs csb cy da de el en-GB en-US en-ZA eo es-AR es-CL es-ES es-MX et eu fa fi fr fy-NL ga-IE gd gl gu-IN he hi-IN hr hu hy-AM id is it ja kk kn ko ku lg lij lt lv mai mk ml mr nb-NO nl nn-NO nso or pa-IN pl pt-BR pt-PT rm ro ru si sk sl son sq sr sv-SE ta-LK ta te th tr uk vi zh-CN zh-TW zu)
pkgbase='icecat-i18n'
pkgname=($(for lang in ${_langpacks[@]}
do echo icecat-i18n-$lang | tr A-Z a-z
done))
-_pkgver=10.0
-pkgver=10.0
-pkgrel=1
+_pkgver=12.0
+pkgver=12.0
+pkgrel=2
pkgdesc="Language packs for GNUzilla IceCat."
arch=('any')
license=('MPL')
url="http://www.gnu.org/software/gnuzilla/"
depends=("icecat=${pkgver}")
source=($(for lang in ${_langpacks[@]}
- do echo http://gnuzilla.gnu.org/download/langpacks/$pkgver/$lang.xpi
+ do echo http://ftp.gnu.org/gnu/gnuzilla/lang/$pkgver/$lang.xpi
done))
noextract=($(for lang in ${_langpacks[@]}
do echo $lang.xpi
@@ -34,7 +35,7 @@ build() {
cd "${srcdir}"
}
-_path="/usr/lib/icecat-$_pkgver/extensions/"
+_path="/usr/lib/icecat/extensions/"
for lang in ${_langpacks[@]}
do
@@ -45,86 +46,89 @@ package_icecat-i18n-$(echo $lang | tr A-Z a-z) () {
"
done
-md5sums=('6d4c69921bbdfe92c0fd31873983d426'
- '4e994c70c93e4d266d273d2358f7acf3'
- 'd783c592edfa96d6abecd1efa1aa1b5e'
- '70b8badcddb6d5cf6b226c0f0141b463'
- 'bcfe52114b1c0f5346594452117bec5d'
- '7d8900839fcf5972a91c4ce1a1bdd7c6'
- 'd9720bf726a8f6fde0dc94e6e73863a9'
- 'ce61734ab226dc041b55e95c9b6f9d92'
- '965c2ec576ac41e7351e159f516ec65f'
- '4feb78e0dd79606f416b8ab46432ad41'
- '61989146fe89320c847e4de6261a06ff'
- '260f3abb8612248493060e2dec6f0a22'
- '6b49d830c47717001250236c9cc933a5'
- '338137d425c8e6ae98796f3cc9a0550f'
- '4ddf33cc1af9d3ad483d8fc47609aee3'
- 'e04918865a21260b8eaf27b3dc84ade5'
- '59961e347c4fe3816f809f456bc9a2b8'
- '262ad46f6c6e8a89eb29b590cc092eb9'
- 'e9452d83d914605f06c055c00325bf6b'
- 'ae652d7db9b3cd3cba85306d16a7a599'
- '04fec5cd927a57ac6c9780a9f42444e1'
- '70ba3ec972f01e75b144e106afacd8ac'
- 'f1ee7deccf3c73083b51c5741722b120'
- 'ca5566a24ee4fd38a3a907bfb5d72975'
- 'd4717e5c3e44fbaebe4eaf99f0195120'
- '907c42bdaa3af02c39bef5d83198f8a9'
- '7afa1ac8645657722cdf3415244e4686'
- 'd3d780b6c8d179c68065d9bec19dce48'
- '09fae6ea53f5435ccfdbf41f660378ee'
- '043306182ec497280b3ea78dcbd7b7d3'
- '8a481d0d41f22d5bc65ed7844a0d7c27'
- '2a8648998f2aafd307511e043cd8564d'
- 'e7fbc4b7364d151edac9840b90949f56'
- 'e2ea49277375825f612bcfb225dcb0a0'
- '9fb2a20a2222a0d814a3f48d7208d820'
- '88976bac6b9e647f4d17ab1638f12601'
- 'a6a39406914459deaefb3403e94dfa39'
- 'd3acecff63909d946fb549520785ef99'
- 'a8327a1a525330ca9ef8e3f9d50ca5f8'
- 'ba3ad9e8843b0de408a72896183985d6'
- '3dfb48ecea5eda9f0e3e05295eb3c82b'
- '95a1e7e2ec604409b54f1ded4ee7accf'
- '69ebeb59c7ff4e0452c9f0998db65ef0'
- '7bdf97288cef0d14ff1521db063cd20c'
- '8f50cfa1e8c788b7b839273848dc2834'
- '3aa0631dc6a53581cf53d559b27a0ee3'
- '45e7238e0d0e427df04d3ba91ca045cd'
- 'b992cfa2b0440486cd70fd6ab9e32deb'
- '3a9fac821e039556f7d009080daec643'
- '6872abed4f4d4b81cf5f0b7b656846c7'
- 'eb44e902c6a6186c85dca8aff1d5b95f'
- '21f5aeacbb233167218ab7f1b34efdce'
- 'b97e29d866ae1ed422d0a1c4327cfd49'
- '5cce41015e73c36944224f827ac5a8d1'
- 'a13ac7293acc75015f0034d77ddb0f30'
- '38c84e214af65ed6f059ad524c923dc9'
- '66c8d82875f55f67167048e3d6888d8f'
- '4ec423b8e34a4de058b115fd5918e0b2'
- '0026e20db1bad1eaf692bd0b2043c038'
- '31f029a6665ccae9b4c8cac9eda06c6f'
- 'e72ffe020543ca0ad4f8be2aad9e90a9'
- '7b75e8fb1cd8ae34023b312d2214029a'
- '88b1a96268e08f65579b2fe6d7677b73'
- '4418d687e4dcb313fd59247844eab93c'
- 'b200a045163b7c09cde85b82013fec98'
- '263f6ff19491b68865bcab4309dff0a8'
- '80d0fb352eb1f252c355d3b8388d3513'
- 'dd79b0c4d959f46852e1e23b0cc984af'
- 'db51a6767331bb3a8c0a1e0f5f35d968'
- '3155d4cafe5f90ec83336ddd07183629'
- 'b9246693498e1ec3c5b4dffa8145d04e'
- '770bf78f2a0c6522e641e61e44617b40'
- 'aadf3a6f9517c76e2b37867cb1a654c6'
- '3530c75b3c2311d8127f20df7bd724da'
- 'ef3bfc5db8197edb095da10390d8e058'
- '46b701b2db7415b30b82023bb707e1dc'
- '24da3bee4042e31da5781b02dc089499'
- 'b3faadcabfd6d738a41ee4c12696adcd'
- '9938f231ce13202d040c24783c95c35b'
- '04894f460b81525d29367f1ed1504f5e'
- 'c6049613b48eaaa71c45df2e44db1087'
- '7e7e81ca9c6d44913d37159b4627967c'
- '1a80a20da9cc26e2edd942d77a35c824')
+md5sums=('334d06cd9e32b2c3df5129dba4f0f474'
+ '99954e582ddb9bbd8965e6468e7d9799'
+ 'a2b777edb9a595b4c427716458ffdeb6'
+ '2d1796a37f2e927b5939de257dddab4e'
+ '17589c7d8994d4f62fd95fddc2c0c796'
+ '27f9d4029dbab73d9f5c6a7c169c1811'
+ '5d13f0aeb780e4d3693bf62be21e6e11'
+ 'c47f6aaa0b33261e7277f6d807e88396'
+ '0d87bb53f0b71634c189eeb3f3d64bc5'
+ '2ada422bef681cee2bd7e667a9090d6a'
+ 'fc8bc018c6d41c2fcb883734e37b518a'
+ '5e9b488cd52a42e235169de3a4b4cea2'
+ '0b781ce69f571797d3dc1fd5b70d882c'
+ '5ae943ee2293fd427a0072f1c95dd2e9'
+ '15d2a2076008efefdb7d031f4d0b1663'
+ '71a45cefe3b5f45de4ff784ca1a4fe1e'
+ '98e6f6de8c0184f339cc1b88e31e285b'
+ '43f9c2a3e9580b6a2adcc36dba4c0755'
+ 'a12665f7c8e6121e82c6c0be91da3f2a'
+ '7268181e8190cb62685c365fb99d9102'
+ '6f60912c53bd21acd99ee11abd5862d9'
+ '25f2c8a6665f6aef75204b1bcd0c0ff1'
+ '6e3516383f6eaad4bc1abe5fdd212d26'
+ 'c76f8a91086735c8252eab0d90e163e6'
+ '85cf430e36e70713b715fca4e1ac3410'
+ '60f3573882bbd1dc0ed0f16518660bf9'
+ '6c51beefb2da7add8c8c635efc2fc565'
+ 'e2d4d8182716b329249619d227d449f1'
+ '28facbc470554488b0a722cb0c3d53d3'
+ '3b167b50c188ef190fbad18077aacc0d'
+ 'f8edd8921fb8fa24099d1725fc478a2b'
+ '5b90202d9288d073e5f401b498355c13'
+ 'ec8478b6e0420484de8d7332bafafac2'
+ '9d932bc91062a58b0509b5395403c708'
+ 'bba6d905218c4a2b3d6e289e3ef35186'
+ 'b32d1ad6e5c8ed52cde0ea351290fd17'
+ 'd0d1d307c87ec8c8102527944f05887e'
+ '2605d5226c23205f3c7cd5466059b802'
+ '2b800c1c729d3b65ae38050bd4c06af1'
+ '8744ce05e573acefa9f802e53da2aea4'
+ 'edd3e216b37ee32fd517c2b49e85439a'
+ 'd9786706c058b1e4acac62f07deac285'
+ '6377004ddaa6731734696509be6dda53'
+ 'c73bd01ab8c5a25e234e51082978f7f5'
+ 'b44a3df07e663803234c72f359d06422'
+ '81c646a84b4f56d4721bec4013c123bf'
+ '9b678f5dbb7243b9e5751d04b988b640'
+ 'c237afb9ed6819a6219383590a8ee448'
+ 'b27c9236866dd55ee01a6e3929752767'
+ '8d527119a84f22840a919bc35ed612c0'
+ '1b51158c8c218544654245c418943c3a'
+ '1314bbc8cde2babcf6e807f7f958152c'
+ '59eb9146f16189932d9d5eea536cd8af'
+ 'a427b45282c6f8f4f1646050e9a93f71'
+ '618771f03f807603b2efed2760f6004c'
+ '56ca63d8c797d47fd3b6c094390990d7'
+ '24bde56465d7ab923fed3e23eca59d42'
+ 'ff9858a371df54c25f77ea4a5d1091f9'
+ '6135b885b12ccc64d5c93f385d5c62ad'
+ 'f98347a6ae9db6faef247373fd5092df'
+ 'e58f094448b085636c9e9435ef22fb53'
+ 'ed073cd4a1f3bbdcec1ee56334d8b9d3'
+ '988a1c279f94941bd4ab3b90cfad0bbe'
+ 'd8bc3ee80be944051f975a2534651ce1'
+ 'bd94ef18efe11eeee93a0ff1dc602301'
+ '20a8381c88b1735c558316936469c1a9'
+ '064d6f05f7b4c1ce8c5e0f083eccef15'
+ 'c22c4fb9da7cdee2cb29119e7c4f3696'
+ '50071d48b92f373713f6f8ee483b6f7d'
+ '518fbbf3838332da2e561565d29281bf'
+ '2a5a42ad2110e7e24c967233fdc0dc2c'
+ 'd21424a551ff625034b6e015f0eddcc4'
+ '829a1e6fe575e761f97564f68a1859ec'
+ 'd1047468370b7cbb766ed688107ca879'
+ '27f3609a99c3be8e59cfc700e251a5d7'
+ 'c7eb3ef0bedc610065713da9a55e2bf9'
+ '9125fcb792da1e58f00c43ec5b7bce97'
+ '5b9dd2a8ac84aace97a6095042ea537b'
+ '13be748a3331f2a9fac691dec7173aa8'
+ '0b694233f5385e0e5898d4b64a683bbc'
+ 'ad037272aabcc3b58fd2141447113905'
+ '347f53738950c9927b19ec3462840696'
+ '4fc25f81dd0b744aaaea5705dd36d943'
+ '5c96e79fc7463907b1c635586c910a71'
+ '50b1dcbd0eaf9d62b3f9050598298933'
+ 'c40de39f9502a8789f8301581cad25b4')
diff --git a/libre/lirc-libre/PKGBUILD b/libre/lirc-libre/PKGBUILD
new file mode 100644
index 000000000..d6a294fe6
--- /dev/null
+++ b/libre/lirc-libre/PKGBUILD
@@ -0,0 +1,112 @@
+# $Id$
+# Maintainer: Paul Mattal <paul@archlinux.org>
+# Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy>
+
+_pkgbase=lirc
+pkgbase=lirc-libre
+pkgname=('lirc-libre' 'lirc-utils-libre')
+pkgver=0.9.0
+pkgrel=18
+epoch=1
+_extramodules=extramodules-3.4-LIBRE
+arch=('i686' 'x86_64' 'mips64el')
+url="http://www.lirc.org/"
+license=('GPL')
+### NOTICE don't forget to bump version in depends in package_lirc
+makedepends=('help2man' 'linux-libre-headers>=3.4' 'linux-libre-headers<3.5' 'alsa-lib' 'libx11' 'libftdi' 'libirman' 'python2')
+options=('!makeflags' '!strip')
+source=(http://prdownloads.sourceforge.net/${_pkgbase}/${_pkgbase}-${pkgver}.tar.bz2
+ lirc_wpc8769l.patch
+ lircd-handle-large-config.patch
+ lirc_atiusb-kfifo.patch
+ kernel-2.6.39.patch
+ lircd lircmd lirc.logrotate lircd.conf irexec.conf irexecd)
+md5sums=('b232aef26f23fe33ea8305d276637086'
+ '1cce37e18e3f6f46044abab29016d18f'
+ 'b70cc9640505205446ec47b7d4779f38'
+ '1f8b104a2365d9f93404b143f499059b'
+ '087a7d102e1c96bf1179f38db2b0b237'
+ '8d0e238dc0eda95e340fe570605da492'
+ '85f7fdac55e5256967241864049bf5e9'
+ '3deb02604b37811d41816e9b4385fcc3'
+ '5b1f8c9cd788a39a6283f93302ce5c6e'
+ 'f0c0ac930326168035f0c8e24357ae55'
+ '69d099e6deedfa3c1ee2b6e82d9b8bfb')
+
+build() {
+ _kernver="$(cat /lib/modules/${_extramodules}/version)"
+ cd "${srcdir}/lirc-${pkgver}"
+ patch -Np1 -i "${srcdir}/lirc_wpc8769l.patch"
+ patch -Np1 -i "${srcdir}/lircd-handle-large-config.patch"
+ patch -Np1 -i "${srcdir}/lirc_atiusb-kfifo.patch"
+ patch -Np1 -i "${srcdir}/kernel-2.6.39.patch"
+
+ sed -i '/AC_PATH_XTRA/d' configure.ac
+ sed -e 's/@X_CFLAGS@//g' \
+ -e 's/@X_LIBS@//g' \
+ -e 's/@X_PRE_LIBS@//g' \
+ -e 's/@X_EXTRA_LIBS@//g' -i Makefile.am tools/Makefile.am
+ libtoolize
+ autoreconf
+
+ PYTHON=python2 ./configure --enable-sandboxed --prefix=/usr \
+ --with-driver=all --with-kerneldir=/usr/src/linux-${_kernver}/ \
+ --with-moduledir=/lib/modules/${_kernver}/kernel/drivers/misc \
+ --with-transmitter
+
+ # Remove drivers already in kernel
+ sed -e "s:lirc_dev::" -e "s:lirc_bt829::" -e "s:lirc_igorplugusb::" \
+ -e "s:lirc_imon::" -e "s:lirc_parallel::" -e "s:lirc_sasem::" \
+ -e "s:lirc_serial::" -e "s:lirc_sir::" -e "s:lirc_ttusbir::" \
+ -i Makefile drivers/Makefile drivers/*/Makefile tools/Makefile
+ make
+}
+
+package_lirc-libre() {
+ pkgdesc="Linux-libre Infrared Remote Control kernel modules for stock libre kernel"
+ depends=('lirc-utils-libre' 'linux-libre>=3.4' 'linux-libre<3.5')
+ replaces=('lirc' 'lirc+pctv')
+ conflicts=('lirc')
+ provides=("lirc=$pkgver")
+ install=lirc.install
+
+ cd "${srcdir}/lirc-${pkgver}/drivers"
+ make DESTDIR="${pkgdir}" moduledir="/lib/modules/${_extramodules}" install
+
+ # set the kernel we've built for inside the install script
+ sed -i -e "s/EXTRAMODULES=.*/EXTRAMODULES=${_extramodules}/g" "${startdir}/lirc.install"
+ # gzip -9 modules
+ find "${pkgdir}" -name '*.ko' -exec gzip -9 {} \;
+}
+
+package_lirc-utils-libre() {
+ pkgdesc="Linux-libre Infrared Remote Control utils"
+ depends=('alsa-lib' 'libx11' 'libftdi' 'libirman')
+ optdepends=('python2: pronto2lirc utility')
+ options=('strip' '!libtool')
+ replaces=('lirc-utils')
+ conflicts=('lirc-utils')
+ provides=("lirc-utils=$pkgver")
+ backup=('etc/conf.d/lircd.conf' 'etc/conf.d/irexec.conf')
+
+ cd "${srcdir}/lirc-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+ install -d "${pkgdir}/usr/share/lirc" "${pkgdir}/etc/rc.d"
+ cp "${srcdir}"/{lircd,lircmd,irexecd} "${pkgdir}/etc/rc.d"
+ cp -rp remotes "${pkgdir}/usr/share/lirc"
+ chmod -R go-w "${pkgdir}/usr/share/lirc/"
+
+ # install the logrotate config
+ install -Dm644 "${srcdir}/lirc.logrotate" "${pkgdir}/etc/logrotate.d/lirc"
+
+ # install conf.d file
+ install -Dm644 "${srcdir}/lircd.conf" "${pkgdir}/etc/conf.d/lircd.conf"
+
+ # install conf.d file
+ install -Dm644 "${srcdir}/irexec.conf" "${pkgdir}/etc/conf.d/irexec.conf"
+
+ install -d "${pkgdir}/etc/lirc"
+
+ # remove built modules
+ rm -r "${pkgdir}/lib/"
+}
diff --git a/libre/lirc-libre/irexec.conf b/libre/lirc-libre/irexec.conf
new file mode 100644
index 000000000..f911c7515
--- /dev/null
+++ b/libre/lirc-libre/irexec.conf
@@ -0,0 +1,5 @@
+#
+# Parameters for irexec daemon (path to lircrc)
+#
+
+IREXEC_OPTS="" \ No newline at end of file
diff --git a/libre/lirc-libre/irexecd b/libre/lirc-libre/irexecd
new file mode 100644
index 000000000..a64b033a5
--- /dev/null
+++ b/libre/lirc-libre/irexecd
@@ -0,0 +1,38 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+. /etc/conf.d/irexec.conf
+
+PID=`pidof -o %PPID /usr/bin/irexec`
+case "$1" in
+ start)
+ stat_busy "Starting IREXEC Daemon"
+ [ -z "$PID" ] && /usr/bin/irexec --daemon $IREXEC_OPTS
+ if [ $? -gt 0 ]; then
+ stat_fail
+ else
+ add_daemon irexecd
+ stat_done
+ fi
+ ;;
+ stop)
+ stat_busy "Stopping IREXEC Daemon"
+ [ ! -z "$PID" ] && kill $PID &> /dev/null
+ if [ $? -gt 0 ]; then
+ stat_fail
+ else
+ rm_daemon irexecd
+ stat_done
+ fi
+ ;;
+ restart)
+ $0 stop
+ sleep 1
+ $0 start
+ ;;
+ *)
+ echo "usage: $0 {start|stop|restart}"
+esac
+exit 0
+
diff --git a/libre/lirc-libre/kernel-2.6.39.patch b/libre/lirc-libre/kernel-2.6.39.patch
new file mode 100644
index 000000000..7353d61ca
--- /dev/null
+++ b/libre/lirc-libre/kernel-2.6.39.patch
@@ -0,0 +1,54 @@
+diff -ru lirc-0.9.0/drivers//lirc_atiusb/lirc_atiusb.c lirc-0.9.0.new/drivers//lirc_atiusb/lirc_atiusb.c
+--- lirc-0.9.0/drivers//lirc_atiusb/lirc_atiusb.c 2011-03-25 23:28:18.000000000 +0100
++++ lirc-0.9.0.new/drivers//lirc_atiusb/lirc_atiusb.c 2011-06-07 17:02:20.356580306 +0200
+@@ -48,7 +48,6 @@
+ #include <linux/slab.h>
+ #include <linux/module.h>
+ #include <linux/kmod.h>
+-#include <linux/smp_lock.h>
+ #include <linux/completion.h>
+ #include <linux/uaccess.h>
+ #include <linux/usb.h>
+diff -ru lirc-0.9.0/drivers//lirc_i2c/lirc_i2c.c lirc-0.9.0.new/drivers//lirc_i2c/lirc_i2c.c
+--- lirc-0.9.0/drivers//lirc_i2c/lirc_i2c.c 2011-03-25 23:28:18.000000000 +0100
++++ lirc-0.9.0.new/drivers//lirc_i2c/lirc_i2c.c 2011-06-07 17:04:19.725933627 +0200
+@@ -555,8 +555,8 @@
+ kfree(ir);
+ return -EINVAL;
+ }
+- printk(KERN_INFO "lirc_i2c: chip 0x%x found @ 0x%02x (%s)\n",
+- adap->id, addr, ir->c.name);
++ printk(KERN_INFO "lirc_i2c: chip found @ 0x%02x (%s)\n",
++ addr, ir->c.name);
+
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 31)
+ /* register device */
+diff -ru lirc-0.9.0/drivers//lirc_wpc8769l/lirc_wpc8769l.c lirc-0.9.0.new/drivers//lirc_wpc8769l/lirc_wpc8769l.c
+--- lirc-0.9.0/drivers//lirc_wpc8769l/lirc_wpc8769l.c 2011-03-25 23:28:18.000000000 +0100
++++ lirc-0.9.0.new/drivers//lirc_wpc8769l/lirc_wpc8769l.c 2011-06-07 17:07:23.984935411 +0200
+@@ -361,14 +361,14 @@
+ size = count << 3;
+
+ ldata = (unsigned long *) data_buf;
+- next_one = generic_find_next_le_bit(ldata, size, 0);
++ next_one = find_next_zero_bit_le(ldata, size, 0);
+
+ if (next_one > 0)
+ put_pulse_bit(next_one
+ * WPC8769L_USECS_PER_BIT);
+
+ while (next_one < size) {
+- next_zero = generic_find_next_zero_le_bit(ldata,
++ next_zero = find_next_zero_bit_le(ldata,
+ size, next_one + 1);
+
+ put_space_bit(
+@@ -376,7 +376,7 @@
+ * WPC8769L_USECS_PER_BIT);
+
+ if (next_zero < size) {
+- next_one = generic_find_next_le_bit(ldata,
++ next_one = find_next_bit_le(ldata,
+ size, next_zero + 1);
+
+ put_pulse_bit(
diff --git a/libre/lirc-libre/lirc.install b/libre/lirc-libre/lirc.install
new file mode 100644
index 000000000..d6b9e5ff2
--- /dev/null
+++ b/libre/lirc-libre/lirc.install
@@ -0,0 +1,16 @@
+EXTRAMODULES=extramodules-3.4-LIBRE
+
+post_install() {
+ # updating module dependencies
+ echo ">>> Updating module dependencies. Please wait ..."
+ depmod $(cat /lib/modules/$EXTRAMODULES/version) > /dev/null 2>&1
+}
+
+post_upgrade() {
+ post_install
+}
+
+# arg 1: the old package version
+post_remove() {
+ post_install
+}
diff --git a/libre/lirc-libre/lirc.logrotate b/libre/lirc-libre/lirc.logrotate
new file mode 100644
index 000000000..623c4f328
--- /dev/null
+++ b/libre/lirc-libre/lirc.logrotate
@@ -0,0 +1,5 @@
+/var/log/lircd {
+ missingok
+ notifempty
+ delaycompress
+}
diff --git a/libre/lirc-libre/lirc_atiusb-kfifo.patch b/libre/lirc-libre/lirc_atiusb-kfifo.patch
new file mode 100644
index 000000000..a64984dce
--- /dev/null
+++ b/libre/lirc-libre/lirc_atiusb-kfifo.patch
@@ -0,0 +1,31 @@
+From ec3c5660e67c122e2d5eb9cfa838c9709fccf8e0 Mon Sep 17 00:00:00 2001
+From: Jason Martin <publicmsu@gmail.com>
+Date: Fri, 3 Jun 2011 00:12:51 -0400
+Subject: [PATCH] lirc_atiusb: fix buffer alloc to work with new kfifo
+
+I came across posts with regards to lirc_atiusb and its compatibility
+with newer kernels, and their use of kfifo.I spent a little bit of time
+this evening, and was able to correct the issues with the driver, and
+now have a functioning lirc_atiusb device under the 2.6.38 kernel.
+
+Signed-off-by: Jarod Wilson <jarod@redhat.com>
+---
+ drivers/lirc_atiusb/lirc_atiusb.c | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/drivers/lirc_atiusb/lirc_atiusb.c b/drivers/lirc_atiusb/lirc_atiusb.c
+index 52080de..bf2b631 100644
+--- a/drivers/lirc_atiusb/lirc_atiusb.c
++++ b/drivers/lirc_atiusb/lirc_atiusb.c
+@@ -1048,7 +1048,7 @@ static struct atirf_dev *new_irctl(struct usb_interface *intf)
+ goto new_irctl_failure_check;
+ }
+
+- if (lirc_buffer_init(driver->rbuf, dclen, 1)) {
++ if (lirc_buffer_init(driver->rbuf, dclen, 2)) {
+ mem_failure = 4;
+ goto new_irctl_failure_check;
+ }
+--
+1.7.0.1
+
diff --git a/libre/lirc-libre/lirc_wpc8769l.patch b/libre/lirc-libre/lirc_wpc8769l.patch
new file mode 100644
index 000000000..e4e2a049b
--- /dev/null
+++ b/libre/lirc-libre/lirc_wpc8769l.patch
@@ -0,0 +1,88 @@
+From 413e83bf504fe9a9a177f27742220cfcb184b034 Mon Sep 17 00:00:00 2001
+From: =?utf8?q?Juan=20Jes=C3=BAs=20Garc=C3=ADa=20de=20Soria=20Lucena?= <skandalfo@gmail.com>
+Date: Wed, 30 Mar 2011 16:46:35 -0400
+Subject: [PATCH] Make lirc_wpc8769l functional again
+
+Signed-off-by: Jarod Wilson <jarod@redhat.com>
+---
+ drivers/lirc_wpc8769l/lirc_wpc8769l.c | 28 +++++++++++++++++-----------
+ 1 files changed, 17 insertions(+), 11 deletions(-)
+
+diff --git a/drivers/lirc_wpc8769l/lirc_wpc8769l.c b/drivers/lirc_wpc8769l/lirc_wpc8769l.c
+index f820d11..4d04063 100644
+--- a/drivers/lirc_wpc8769l/lirc_wpc8769l.c
++++ b/drivers/lirc_wpc8769l/lirc_wpc8769l.c
+@@ -816,10 +816,6 @@ static int set_use_inc(void *data)
+ /* Reset last timeout value. */
+ lastus = 0;
+
+- /* Init the read buffer. */
+- if (lirc_buffer_init(&rbuf, sizeof(lirc_t), RBUF_LEN) < 0)
+- return -ENOMEM;
+-
+ /* Acquire the IRQ. */
+ result = request_irq(irq, irq_handler,
+ IRQF_DISABLED | IRQF_SHARED,
+@@ -863,9 +859,6 @@ static void set_use_dec(void *data)
+ /* Free the IRQ. */
+ free_irq(irq, THIS_MODULE);
+ dprintk("Freed IRQ %d\n", irq);
+-
+- /* Free the RX buffer. */
+- lirc_buffer_free(&rbuf);
+ }
+
+ static struct lirc_driver driver = {
+@@ -1065,19 +1058,29 @@ static int __init lirc_wpc8769l_module_init(void)
+ /* Do load-time checks. */
+ wpc8769l_power_up_and_check_if_we_woke_us_up();
+
++ /* Init the read buffer. */
++ if (lirc_buffer_init(&rbuf, sizeof(lirc_t), RBUF_LEN) < 0) {
++ rc = -ENOMEM;
++ goto exit_platform_exit;
++ }
++
+ /* Configure the driver hooks. */
+ driver.features = LIRC_CAN_REC_MODE2;
++ driver.dev = &lirc_wpc8769l_platform_dev->dev;
+ driver.minor = lirc_register_driver(&driver);
+ if (driver.minor < 0) {
+ eprintk("lirc_register_driver failed!\n");
+ rc = -EIO;
+- goto exit_platform_exit;
++ goto exit_release_buffer;
+ }
+
+ iprintk("Driver loaded.\n");
+
+ return 0; /* Everything OK. */
+
++exit_release_buffer:
++ lirc_buffer_free(&rbuf);
++
+ exit_platform_exit:
+ lirc_wpc8769l_platform_exit();
+
+@@ -1095,12 +1098,15 @@ module_init(lirc_wpc8769l_module_init);
+
+ static void __exit lirc_wpc8769l_module_exit(void)
+ {
+- /* Unregister the platform driver and device. */
+- lirc_wpc8769l_platform_exit();
+-
+ /* Unregister the LIRC driver. */
+ lirc_unregister_driver(driver.minor);
+
++ /* Free the buffer. */
++ lirc_buffer_free(&rbuf);
++
++ /* Unregister the platform driver and device. */
++ lirc_wpc8769l_platform_exit();
++
+ /* Release the second range. */
+ if (baseport2)
+ release_region(baseport2, WPC8769L_IO_REGION_2_SIZE);
+--
+1.7.0.1
+
diff --git a/libre/lirc-libre/lircd b/libre/lirc-libre/lircd
new file mode 100644
index 000000000..e9739b36e
--- /dev/null
+++ b/libre/lirc-libre/lircd
@@ -0,0 +1,52 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+. /etc/conf.d/lircd.conf
+
+PID=$(pidof -o %PPID /usr/sbin/lircd)
+LIRCD_SYMLINKFILE=/dev/lircd
+LIRCD_SOCKET=/var/run/lirc/lircd
+case "$1" in
+ start)
+ stat_busy "Starting LIRC Daemon"
+ [ ! -d /var/run/lirc ] && install -d /var/run/lirc &>/dev/null
+ rm -f $LIRCD_SOCKET && ln -s $LIRCD_SOCKET $LIRCD_SYMLINKFILE
+ if [ $? -ne 0 ]; then
+ stat_fail
+ exit 0
+ fi
+ [ -n "$LIRC_DRIVER" ] && LIRC_EXTRAOPTS="-H $LIRC_DRIVER $LIRC_EXTRAOPTS"
+ [ -z "$PID" ] &&
+ if [ -n "$LIRC_DEVICE" ] ; then
+ eval /usr/sbin/lircd -d "$LIRC_DEVICE" $LIRC_EXTRAOPTS $LIRC_CONFIGFILE
+ else
+ /usr/sbin/lircd $LIRC_EXTRAOPTS $LIRC_CONFIGFILE
+ fi
+ if [ $? -gt 0 ]; then
+ stat_fail
+ else
+ add_daemon lircd
+ stat_done
+ fi
+ ;;
+ stop)
+ stat_busy "Stopping LIRC Daemon"
+ rm -f $LIRCD_SYMLINKFILE
+ [ ! -z "$PID" ] && kill $PID &> /dev/null
+ if [ $? -gt 0 ]; then
+ stat_fail
+ else
+ rm_daemon lircd
+ stat_done
+ fi
+ ;;
+ restart)
+ $0 stop
+ sleep 1
+ $0 start
+ ;;
+ *)
+ echo "usage: $0 start|stop|restart"
+esac
+exit 0
diff --git a/libre/lirc-libre/lircd-handle-large-config.patch b/libre/lirc-libre/lircd-handle-large-config.patch
new file mode 100644
index 000000000..85bc20518
--- /dev/null
+++ b/libre/lirc-libre/lircd-handle-large-config.patch
@@ -0,0 +1,39 @@
+From 5efb56bf22a5077db564c766ba7cc37bc269231d Mon Sep 17 00:00:00 2001
+From: Jarod Wilson <jarod@redhat.com>
+Date: Wed, 6 Apr 2011 11:04:12 -0400
+Subject: [PATCH] lircd: handle larger config files in write_socket better
+
+Pointed out by Michael Zanetti on list, irsend LIST has issues with long
+config files, which didn't exist in maintainer mode, as we were using a
+do while loop to make sure we spit out everything. Just use that loop
+all the time.
+
+Signed-off-by: Jarod Wilson <jarod@redhat.com>
+---
+ daemons/lircd.c | 8 ++------
+ 1 files changed, 2 insertions(+), 6 deletions(-)
+
+diff --git a/daemons/lircd.c b/daemons/lircd.c
+index 6c21a3a..ddcca05 100644
+--- a/daemons/lircd.c
++++ b/daemons/lircd.c
+@@ -231,14 +231,10 @@ inline int write_socket(int fd, const char *buf, int len)
+ int done, todo = len;
+
+ while (todo) {
+-#ifdef SIM_REC
+ do {
+ done = write(fd, buf, todo);
+- }
+- while (done < 0 && errno == EAGAIN);
+-#else
+- done = write(fd, buf, todo);
+-#endif
++ } while (done < 0 && errno == EAGAIN);
++
+ if (done <= 0)
+ return (done);
+ buf += done;
+--
+1.7.0.1
+
diff --git a/libre/lirc-libre/lircd.conf b/libre/lirc-libre/lircd.conf
new file mode 100644
index 000000000..760dab065
--- /dev/null
+++ b/libre/lirc-libre/lircd.conf
@@ -0,0 +1,8 @@
+#
+# Parameters for lirc daemon
+#
+
+LIRC_DEVICE="/dev/lirc0"
+LIRC_DRIVER=""
+LIRC_EXTRAOPTS=""
+LIRC_CONFIGFILE=""
diff --git a/libre/lirc-libre/lircmd b/libre/lirc-libre/lircmd
new file mode 100644
index 000000000..220c47c9c
--- /dev/null
+++ b/libre/lirc-libre/lircmd
@@ -0,0 +1,36 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+PID=`pidof -o %PPID /usr/sbin/lircmd`
+case "$1" in
+ start)
+ stat_busy "Starting lircmd Daemon"
+ [ -z "$PID" ] && /usr/sbin/lircmd
+ if [ $? -gt 0 ]; then
+ stat_fail
+ else
+ add_daemon lircmd
+ stat_done
+ fi
+ ;;
+ stop)
+ stat_busy "Stopping lircmd Daemon"
+ [ ! -z "$PID" ] && kill $PID &> /dev/null
+ if [ $? -gt 0 ]; then
+ stat_fail
+ else
+ rm_daemon lircmd
+ stat_done
+ fi
+ ;;
+ restart)
+ $0 stop
+ sleep 1
+ $0 start
+ ;;
+ *)
+ echo "usage: $0 {start|stop|restart}"
+esac
+exit 0
diff --git a/libre/mozilla-searchplugins/PKGBUILD b/libre/mozilla-searchplugins/PKGBUILD
index 50b4d65d2..288ce698d 100644
--- a/libre/mozilla-searchplugins/PKGBUILD
+++ b/libre/mozilla-searchplugins/PKGBUILD
@@ -10,7 +10,7 @@
pkgname=mozilla-searchplugins
pkgver=1.2
-pkgrel=2
+pkgrel=3
pkgdesc="System-wide OpenSearch plugins common for Mozilla based browsers."
arch=('any')
license=('MPL' 'GPL' 'LGPL')
diff --git a/social/gnuhealth/PKGBUILD b/social/gnuhealth/PKGBUILD
index f1da528ff..10d059d4a 100644
--- a/social/gnuhealth/PKGBUILD
+++ b/social/gnuhealth/PKGBUILD
@@ -1,7 +1,8 @@
# Maintainer: SpepS <dreamspepser at yahoo dot it>
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
pkgname=gnuhealth
-pkgver=1.6.1
+pkgver=1.6.2
pkgrel=1
pkgdesc="A free Health and Hospital Information System"
arch=(any)
@@ -9,7 +10,7 @@ url="http://health.gnu.org/"
license=('GPL3')
depends=('trytond')
source=("http://ftp.gnu.org/gnu/health/$pkgname-$pkgver.tar.gz")
-md5sums=('fef8c811ca6de3fdd6e2430d644e13c9')
+md5sums=('f36bb82a7a142c99da0218d9a889344c')
build() {
cd "$srcdir/$pkgname-$pkgver"