summaryrefslogtreecommitdiff
path: root/extra
diff options
context:
space:
mode:
Diffstat (limited to 'extra')
-rw-r--r--extra/audacious/PKGBUILD24
-rw-r--r--extra/audacious/install12
-rw-r--r--extra/bluedevil/PKGBUILD6
-rw-r--r--extra/garcon/PKGBUILD6
-rw-r--r--extra/gstreamer0.10-good/PKGBUILD.orig60
-rw-r--r--extra/libbluedevil/PKGBUILD8
-rw-r--r--extra/libfm/PKGBUILD4
-rw-r--r--extra/libfm/libfm.install5
-rw-r--r--extra/libguess/PKGBUILD4
-rw-r--r--extra/libmcs/PKGBUILD28
-rw-r--r--extra/libmcs/PKGBUILD.orig34
-rw-r--r--extra/libmowgli/PKGBUILD28
-rw-r--r--extra/libmowgli/PKGBUILD.orig33
-rw-r--r--extra/lirc/PKGBUILD.orig95
-rw-r--r--extra/mc/PKGBUILD.orig57
-rw-r--r--extra/mesa/PKGBUILD158
-rw-r--r--extra/mesa/PKGBUILD.orig349
-rw-r--r--extra/v86d/PKGBUILD.orig42
-rw-r--r--extra/virtuoso/PKGBUILD6
-rw-r--r--extra/xfce4-mixer/PKGBUILD6
-rw-r--r--extra/xorg-server/PKGBUILD6
21 files changed, 758 insertions, 213 deletions
diff --git a/extra/audacious/PKGBUILD b/extra/audacious/PKGBUILD
index 4986fad6c..0991e44fb 100644
--- a/extra/audacious/PKGBUILD
+++ b/extra/audacious/PKGBUILD
@@ -1,9 +1,10 @@
-# $Id: PKGBUILD 111201 2011-02-24 23:45:10Z bisson $
+# $Id: PKGBUILD 119918 2011-04-16 22:59:51Z bisson $
# Contributor: Alexander Fehr <pizzapunk gmail com>
# Contributor: Giovanni Scafora <giovanni@archlinux.org>
+# Maintainer: Gaetan Bisson <bisson@archlinux.org>
pkgname=audacious
-pkgver=2.4.4
+pkgver=2.5.0
pkgrel=1
pkgdesc='Lightweight, GTK2-based advanced audio player focused on audio quality'
arch=('i686' 'x86_64' 'mips64el')
@@ -11,20 +12,21 @@ url='http://audacious-media-player.org/'
license=('GPL3')
depends=('gtk2' 'libmcs' 'dbus-glib' 'libguess' 'audacious-plugins' 'desktop-file-utils' 'hicolor-icon-theme')
optdepends=('unzip: zipped skins support')
+source=("http://distfiles.atheme.org/$pkgname-$pkgver.tgz")
+sha1sums=('df76909c83a69b42197dab0702e0846295eceb1f')
+
provides=('audacious-player')
replaces=('audacious-player')
-install=audacious.install
-source=("http://distfiles.atheme.org/$pkgname-$pkgver.tgz")
-sha1sums=('697b2cc217cef9785cf7ec0c4ee617bc174fbe98')
+install=install
build() {
- cd "$srcdir/$pkgname-$pkgver"
- [[ $CARCH == x86_64 ]] && extraopts='' || extraopts='--disable-sse2'
- ./configure --prefix=/usr $extraopts
- make
+ cd "$srcdir/$pkgname-$pkgver"
+ [[ $CARCH == x86_64 ]] && extraopts='' || extraopts='--disable-sse2'
+ ./configure --prefix=/usr $extraopts
+ make
}
package() {
- cd "$srcdir/$pkgname-$pkgver"
- make DESTDIR="$pkgdir" install
+ cd "$srcdir/$pkgname-$pkgver"
+ make DESTDIR="$pkgdir" install
}
diff --git a/extra/audacious/install b/extra/audacious/install
new file mode 100644
index 000000000..af0c8724a
--- /dev/null
+++ b/extra/audacious/install
@@ -0,0 +1,12 @@
+post_install() {
+ update-desktop-database -q
+ gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
diff --git a/extra/bluedevil/PKGBUILD b/extra/bluedevil/PKGBUILD
index acf88fbb1..fca92ae47 100644
--- a/extra/bluedevil/PKGBUILD
+++ b/extra/bluedevil/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 119634 2011-04-12 21:52:47Z andrea $
+# $Id: PKGBUILD 119938 2011-04-17 01:35:14Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=bluedevil
-pkgver=1.0.4
+pkgver=1.1
pkgrel=1
pkgdesc='KDE bluetooth framework'
arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ depends=('kdebase-workspace' 'libbluedevil' 'obex-data-server' 'obexd-client')
makedepends=('cmake' 'automoc4')
install="${pkgname}.install"
source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('016e8b048bd834548a436fb0440667a9')
+md5sums=('240151ff99b81f630de51fa9f8230198')
build(){
cd ${srcdir}
diff --git a/extra/garcon/PKGBUILD b/extra/garcon/PKGBUILD
index d90c12371..092cc5aaf 100644
--- a/extra/garcon/PKGBUILD
+++ b/extra/garcon/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 106319 2011-01-16 16:09:00Z andyrtr $
+# $Id: PKGBUILD 119882 2011-04-16 11:21:52Z andyrtr $
# Maintainer: AndyRTR <andyrtr@archlinux.org>
# Contributor: Xavier Devlamynck <magicrhesus@ouranos.be>
pkgname=garcon
-pkgver=0.1.5
+pkgver=0.1.7
pkgrel=1
pkgdesc="implementation of the freedesktop.org menu specification"
arch=('i686' 'x86_64' 'mips64el')
@@ -16,7 +16,7 @@ conflicts=('garcon-git')
replaces=('libxfce4menu')
options=('!libtool')
source=(http://archive.xfce.org/src/libs/garcon/0.1/garcon-${pkgver}.tar.bz2)
-md5sums=('c4fd42082b4ae157aa4c7abb6d6570aa')
+md5sums=('8990668e4f2fecffe124f613b6e1e01f')
build() {
cd ${srcdir}/garcon-${pkgver}
diff --git a/extra/gstreamer0.10-good/PKGBUILD.orig b/extra/gstreamer0.10-good/PKGBUILD.orig
new file mode 100644
index 000000000..577779e7d
--- /dev/null
+++ b/extra/gstreamer0.10-good/PKGBUILD.orig
@@ -0,0 +1,60 @@
+# $Id: PKGBUILD 119465 2011-04-11 17:28:14Z jgc $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+
+pkgbase=gstreamer0.10-good
+pkgname=('gstreamer0.10-good' 'gstreamer0.10-good-plugins')
+<<<<<<< HEAD
+pkgver=0.10.27
+pkgrel=2
+arch=('i686' 'x86_64' 'mips64el')
+=======
+pkgver=0.10.28
+pkgrel=1
+arch=('i686' 'x86_64')
+>>>>>>> 28b5bbf3fee0627993658e096eadab71c2779912
+license=('LGPL')
+makedepends=('intltool' 'pkgconfig' 'gstreamer0.10-base>=0.10.32' 'libavc1394' 'libiec61883' 'aalib' 'libshout' 'libdv' 'esound' 'flac' 'gconf' 'wavpack' 'taglib' 'libsoup-gnome' 'v4l-utils' 'libcaca' 'bzip2' 'gdk-pixbuf2' 'libpulse' 'jack')
+url="http://gstreamer.freedesktop.org/"
+options=(!libtool !emptydirs)
+source=(${url}/src/gst-plugins-good/gst-plugins-good-${pkgver}.tar.bz2)
+md5sums=('6ef1588921f59d85c44ee2e49a3c97a0')
+
+build() {
+ cd "${srcdir}/gst-plugins-good-${pkgver}"
+ sed -i '/AC_PATH_XTRA/d' configure.ac
+ autoreconf
+ ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+ --disable-static --enable-experimental \
+ --disable-schemas-install \
+ --disable-hal \
+ --with-package-name="GStreamer Good Plugins (Archlinux)" \
+ --with-package-origin="http://www.archlinux.org/"
+
+ make
+ sed -e 's/gst sys ext/gst/' -i Makefile
+}
+
+package_gstreamer0.10-good() {
+ depends=('gstreamer0.10-base>=0.10.32' 'bzip2')
+ pkgdesc="GStreamer Multimedia Framework Good plugin libraries"
+ conflicts=('gstreamer0.10-bad<=0.10.17')
+
+ cd "${srcdir}/gst-plugins-good-${pkgver}"
+ make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
+ rm -rf "${pkgdir}/etc/gconf"
+}
+
+package_gstreamer0.10-good-plugins() {
+ depends=("gstreamer0.10-good=${pkgver}" 'libavc1394' 'libiec61883' 'aalib' 'libshout' 'libdv' 'esound' 'flac' 'gconf' 'wavpack' 'taglib' 'libsoup-gnome' 'v4l-utils' 'libcaca' 'libpng' 'libjpeg' 'jack' 'libpulse')
+ pkgdesc="GStreamer Multimedia Framework Good Plugins (gst-plugins-good)"
+ groups=('gstreamer0.10-plugins')
+ replaces=('gstreamer0.10-aalib' 'gstreamer0.10-wavpack' 'gstreamer0.10-shout2' 'gstreamer0.10-taglib' 'gstreamer0.10-libcaca' 'gstreamer0.10-libpng' 'gstreamer0.10-jpeg' 'gstreamer0.10-cairo' 'gstreamer0.10-flac' 'gstreamer0.10-speex' 'gstreamer0.10-gdkpixbuf' 'gstreamer0.10-dv1394' 'gstreamer0.10-annodex' 'gstreamer0.10-gconf' 'gstreamer0.10-esd' 'gstreamer0.10-cdio' 'gstreamer0.10-dv' 'gstreamer0.10-soup' 'gstreamer0.10-pulse')
+ conflicts=('gstreamer0.10-aalib' 'gstreamer0.10-wavpack' 'gstreamer0.10-shout2' 'gstreamer0.10-taglib' 'gstreamer0.10-libcaca' 'gstreamer0.10-libpng' 'gstreamer0.10-jpeg' 'gstreamer0.10-cairo' 'gstreamer0.10-flac' 'gstreamer0.10-speex' 'gstreamer0.10-gdkpixbuf' 'gstreamer0.10-dv1394' 'gstreamer0.10-annodex' 'gstreamer0.10-gconf' 'gstreamer0.10-esd' 'gstreamer0.10-cdio' 'gstreamer0.10-dv' 'gstreamer0.10-bad-plugins<0.10.7' 'gstreamer0.10-soup' 'gstreamer0.10-pulse')
+ install=gstreamer0.10-good-plugins.install
+
+ cd "${srcdir}/gst-plugins-good-${pkgver}"
+ make -C sys DESTDIR="${pkgdir}" install
+ make -C ext GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
+ install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
+ install -m644 gconf/gstreamer-0.10.schemas "${pkgdir}/usr/share/gconf/schemas/gstreamer0.10-good-plugins.schemas"
+}
diff --git a/extra/libbluedevil/PKGBUILD b/extra/libbluedevil/PKGBUILD
index 57448e344..f26e0a152 100644
--- a/extra/libbluedevil/PKGBUILD
+++ b/extra/libbluedevil/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 116725 2011-03-25 15:32:20Z andrea $
+# $Id: PKGBUILD 119928 2011-04-17 01:27:41Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=libbluedevil
-pkgver=1.8.1
+pkgver=1.9
pkgrel=1
pkgdesc='A Qt wrapper for bluez used in the new KDE bluetooth stack'
arch=('i686' 'x86_64' 'mips64el')
@@ -10,8 +10,8 @@ url="https://projects.kde.org/projects/playground/libs/libbluedevil"
license=('GPL')
depends=('qt' 'bluez')
makedepends=('cmake')
-source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('4534b5d254b15e3884c4e51dfdf586b7')
+source=("http://download.kde.org/unstable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
+md5sums=('5f22614dfb840734da6e8b8710c2472e')
build(){
cd ${srcdir}
diff --git a/extra/libfm/PKGBUILD b/extra/libfm/PKGBUILD
index 5d0a31628..a51cf6935 100644
--- a/extra/libfm/PKGBUILD
+++ b/extra/libfm/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 110478 2011-02-19 16:45:55Z angvp $
+# $Id: PKGBUILD 119892 2011-04-16 12:10:54Z angvp $
# Maintainer: Angel Velasquez <angvp@archlinux.org>
# Maintainer: Juergen Hoetzel <juergen@archlinux.org>
pkgname=libfm
pkgver=0.1.14
-pkgrel=4
+pkgrel=5
pkgdesc="the core of next generation file manager PCManFM"
url="http://pcmanfm.sourceforge.net/"
arch=('i686' 'x86_64' 'mips64el')
diff --git a/extra/libfm/libfm.install b/extra/libfm/libfm.install
index a2dcc622d..076da308e 100644
--- a/extra/libfm/libfm.install
+++ b/extra/libfm/libfm.install
@@ -1,6 +1,7 @@
post_install() {
- /usr/bin/update-mime-database usr/share/mime > /dev/null
- /usr/bin/update-desktop-database -q
+ usr/bin/update-mime-database usr/share/mime > /dev/null
+ usr/bin/update-desktop-database -q
+ usr/bin/gio-querymodules usr/lib/gio/modules
}
post_upgrade() {
diff --git a/extra/libguess/PKGBUILD b/extra/libguess/PKGBUILD
index 93a203d93..917b5fe70 100644
--- a/extra/libguess/PKGBUILD
+++ b/extra/libguess/PKGBUILD
@@ -3,12 +3,12 @@
pkgname=libguess
pkgver=1.0
-pkgrel=2
+pkgrel=3
pkgdesc='High-speed character set detection library'
arch=('i686' 'x86_64' 'mips64el')
url='http://atheme.org/project/libguess'
license=('BSD')
-depends=('libmowgli' 'glibc')
+depends=('libmowgli')
source=("http://distfiles.atheme.org/libguess-$pkgver.tgz")
sha1sums=('b5324b4840176324576eb91d401e5f9e1322feec')
diff --git a/extra/libmcs/PKGBUILD b/extra/libmcs/PKGBUILD
index e0c7ef750..51c2b7fd3 100644
--- a/extra/libmcs/PKGBUILD
+++ b/extra/libmcs/PKGBUILD
@@ -1,27 +1,27 @@
-# $Id: PKGBUILD 85570 2010-07-15 22:07:43Z eric $
-# Maintainer: Alexander Fehr <pizzapunk gmail com>
+# $Id: PKGBUILD 119903 2011-04-16 22:57:07Z bisson $
+# Contributor: Alexander Fehr <pizzapunk gmail com>
# Contributor: Brad Gordon <brad@rpgcyco.net>
+# Maintainer: Gaetan Bisson <bisson@archlinux.org>
pkgname=libmcs
pkgver=0.7.2
-pkgrel=1
-pkgdesc="Library which abstracts the storage of configuration settings"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.atheme.org/project/mcs"
+pkgrel=2
+pkgdesc='Library which abstracts the storage of configuration settings'
+arch=('i686' 'x86_64')
+url='http://www.atheme.org/project/mcs'
license=('BSD')
depends=('libmowgli')
-source=(http://distfiles.atheme.org/libmcs-${pkgver}.tbz2)
-md5sums=('9fc91a8e860a0ab99316824aebb1d40a')
+source=("http://distfiles.atheme.org/libmcs-${pkgver}.tbz2")
sha1sums=('20c30bf7d4b3043848b5180de4c2cb61f7e0154c')
build() {
- cd "${srcdir}/libmcs-${pkgver}"
- ./configure --prefix=/usr --disable-gconf --disable-kconfig
- make
+ cd "${srcdir}/libmcs-${pkgver}"
+ ./configure --prefix=/usr --disable-gconf --disable-kconfig
+ make
}
package() {
- cd "${srcdir}/libmcs-${pkgver}"
- make DESTDIR="${pkgdir}" install
- install -D -m644 COPYING "${pkgdir}/usr/share/licenses/libmcs/COPYING"
+ cd "${srcdir}/libmcs-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+ install -D -m644 COPYING "${pkgdir}/usr/share/licenses/libmcs/COPYING"
}
diff --git a/extra/libmcs/PKGBUILD.orig b/extra/libmcs/PKGBUILD.orig
new file mode 100644
index 000000000..a00c9c10e
--- /dev/null
+++ b/extra/libmcs/PKGBUILD.orig
@@ -0,0 +1,34 @@
+# $Id: PKGBUILD 119903 2011-04-16 22:57:07Z bisson $
+# Contributor: Alexander Fehr <pizzapunk gmail com>
+# Contributor: Brad Gordon <brad@rpgcyco.net>
+# Maintainer: Gaetan Bisson <bisson@archlinux.org>
+
+pkgname=libmcs
+pkgver=0.7.2
+<<<<<<< HEAD
+pkgrel=1
+pkgdesc="Library which abstracts the storage of configuration settings"
+arch=('i686' 'x86_64' 'mips64el')
+url="http://www.atheme.org/project/mcs"
+=======
+pkgrel=2
+pkgdesc='Library which abstracts the storage of configuration settings'
+arch=('i686' 'x86_64')
+url='http://www.atheme.org/project/mcs'
+>>>>>>> 84837d89991e1e82e5aef8e297541c572ebf2efa
+license=('BSD')
+depends=('libmowgli')
+source=("http://distfiles.atheme.org/libmcs-${pkgver}.tbz2")
+sha1sums=('20c30bf7d4b3043848b5180de4c2cb61f7e0154c')
+
+build() {
+ cd "${srcdir}/libmcs-${pkgver}"
+ ./configure --prefix=/usr --disable-gconf --disable-kconfig
+ make
+}
+
+package() {
+ cd "${srcdir}/libmcs-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+ install -D -m644 COPYING "${pkgdir}/usr/share/licenses/libmcs/COPYING"
+}
diff --git a/extra/libmowgli/PKGBUILD b/extra/libmowgli/PKGBUILD
index 5083a6e95..7c3c1bb5c 100644
--- a/extra/libmowgli/PKGBUILD
+++ b/extra/libmowgli/PKGBUILD
@@ -1,27 +1,27 @@
-# $Id: PKGBUILD 85575 2010-07-15 22:09:17Z eric $
-# Maintainer: Alexander Fehr <pizzapunk gmail com>
+# $Id: PKGBUILD 119898 2011-04-16 22:56:08Z bisson $
+# Contributor: Alexander Fehr <pizzapunk gmail com>
# Contributor: Brad Gordon <brad@rpgcyco.net>
+# Maintainer: Gaetan Bisson <bisson@archlinux.org>
pkgname=libmowgli
-pkgver=0.7.1
+pkgver=0.9.50
pkgrel=1
-pkgdesc="Class library containing performance and usability oriented extensions to C"
+pkgdesc='Performance and usability-oriented extensions to C'
arch=('i686' 'x86_64' 'mips64el')
-url="http://www.atheme.org/project/mowgli"
+url='http://www.atheme.org/project/mowgli'
license=('custom')
depends=('glibc')
-source=(http://distfiles.atheme.org/libmowgli-${pkgver}.tbz2)
-md5sums=('412b4fd72ddbdc07d736a691fc8031ca')
-sha1sums=('ad51d5f5352954553fc55ce26b98185edce31509')
+source=("http://distfiles.atheme.org/libmowgli-${pkgver}.tar.bz2")
+sha1sums=('51cac29a5670561e63dd9346820d61e6fd409e88')
build() {
- cd "${srcdir}/libmowgli-${pkgver}"
- ./configure --prefix=/usr
- make
+ cd "${srcdir}/libmowgli-${pkgver}"
+ ./configure --prefix=/usr
+ make
}
package() {
- cd "${srcdir}/libmowgli-${pkgver}"
- make DESTDIR="${pkgdir}" install
- install -D -m644 COPYING "${pkgdir}/usr/share/licenses/libmowgli/COPYING"
+ cd "${srcdir}/libmowgli-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+ install -D -m644 COPYING "${pkgdir}/usr/share/licenses/libmowgli/COPYING"
}
diff --git a/extra/libmowgli/PKGBUILD.orig b/extra/libmowgli/PKGBUILD.orig
new file mode 100644
index 000000000..49586147d
--- /dev/null
+++ b/extra/libmowgli/PKGBUILD.orig
@@ -0,0 +1,33 @@
+# $Id: PKGBUILD 119898 2011-04-16 22:56:08Z bisson $
+# Contributor: Alexander Fehr <pizzapunk gmail com>
+# Contributor: Brad Gordon <brad@rpgcyco.net>
+# Maintainer: Gaetan Bisson <bisson@archlinux.org>
+
+pkgname=libmowgli
+pkgver=0.9.50
+pkgrel=1
+<<<<<<< HEAD
+pkgdesc="Class library containing performance and usability oriented extensions to C"
+arch=('i686' 'x86_64' 'mips64el')
+url="http://www.atheme.org/project/mowgli"
+=======
+pkgdesc='Performance and usability-oriented extensions to C'
+arch=('i686' 'x86_64')
+url='http://www.atheme.org/project/mowgli'
+>>>>>>> 84837d89991e1e82e5aef8e297541c572ebf2efa
+license=('custom')
+depends=('glibc')
+source=("http://distfiles.atheme.org/libmowgli-${pkgver}.tar.bz2")
+sha1sums=('51cac29a5670561e63dd9346820d61e6fd409e88')
+
+build() {
+ cd "${srcdir}/libmowgli-${pkgver}"
+ ./configure --prefix=/usr
+ make
+}
+
+package() {
+ cd "${srcdir}/libmowgli-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+ install -D -m644 COPYING "${pkgdir}/usr/share/licenses/libmowgli/COPYING"
+}
diff --git a/extra/lirc/PKGBUILD.orig b/extra/lirc/PKGBUILD.orig
new file mode 100644
index 000000000..fb7621875
--- /dev/null
+++ b/extra/lirc/PKGBUILD.orig
@@ -0,0 +1,95 @@
+# $Id: PKGBUILD 118049 2011-04-05 07:45:38Z jgc $
+# Maintainer: Paul Mattal <paul@archlinux.org>
+
+pkgbase=lirc
+pkgname=('lirc' 'lirc-utils')
+pkgver=0.9.0
+pkgrel=2
+epoch=1
+<<<<<<< HEAD
+_kernver=2.6.37-ARCH
+arch=('i686' 'x86_64' 'mips64el')
+=======
+_kernver=2.6.38-ARCH
+arch=('i686' 'x86_64')
+>>>>>>> 28b5bbf3fee0627993658e096eadab71c2779912
+url="http://www.lirc.org/"
+license=('GPL')
+makedepends=('help2man' 'kernel26-headers>=2.6.38' 'kernel26-headers<2.6.39' 'alsa-lib' 'libx11' 'libftdi' 'libirman' 'python')
+options=('!makeflags' '!strip')
+source=(http://prdownloads.sourceforge.net/${pkgbase}/${pkgbase}-${pkgver}.tar.bz2
+ lircd lircmd lirc.logrotate lircd.conf irexec.conf irexecd)
+md5sums=('b232aef26f23fe33ea8305d276637086'
+ '8d0e238dc0eda95e340fe570605da492'
+ '85f7fdac55e5256967241864049bf5e9'
+ '3deb02604b37811d41816e9b4385fcc3'
+ '5b1f8c9cd788a39a6283f93302ce5c6e'
+ 'f0c0ac930326168035f0c8e24357ae55'
+ '69d099e6deedfa3c1ee2b6e82d9b8bfb')
+
+build() {
+ cd "${srcdir}/lirc-${pkgver}"
+
+ 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() {
+ pkgdesc="Linux Infrared Remote Control kernel modules for stock arch kernel"
+ depends=('lirc-utils' 'kernel26>=2.6.38' 'kernel26<2.6.39')
+ replaces=('lirc+pctv')
+ install=lirc.install
+
+ cd "${srcdir}/lirc-${pkgver}/drivers"
+ make DESTDIR="${pkgdir}" install
+
+ # set the kernel we've built for inside the install script
+ sed -i -e "s/KERNEL_VERSION=.*/KERNEL_VERSION=${_kernver}/g" "${startdir}/lirc.install"
+ # gzip -9 modules
+ find "${pkgdir}" -name '*.ko' -exec gzip -9 {} \;
+}
+
+package_lirc-utils() {
+ pkgdesc="Linux Infrared Remote Control utils"
+ depends=('alsa-lib' 'libx11' 'libftdi' 'libirman')
+ optdepends=('python2: pronto2lirc utility')
+ options=('strip' '!libtool')
+
+ 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/extra/mc/PKGBUILD.orig b/extra/mc/PKGBUILD.orig
new file mode 100644
index 000000000..de4f212dd
--- /dev/null
+++ b/extra/mc/PKGBUILD.orig
@@ -0,0 +1,57 @@
+# $Id: PKGBUILD 119545 2011-04-12 03:04:01Z eric $
+# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
+
+pkgname=mc
+<<<<<<< HEAD
+pkgver=4.7.5.1
+pkgrel=2
+pkgdesc="A filemanager/shell that emulates Norton Commander"
+arch=('i686' 'x86_64' 'mips64el')
+=======
+pkgver=4.7.5.2
+pkgrel=1
+pkgdesc="Midnight Commander is a text based filemanager/shell that emulates Norton Commander"
+arch=('i686' 'x86_64')
+>>>>>>> 28b5bbf3fee0627993658e096eadab71c2779912
+url="http://www.ibiblio.org/mc/"
+license=('GPL')
+depends=('e2fsprogs' 'glib2' 'pcre' 'gpm' 'slang')
+makedepends=('libxt' 'libx11')
+optdepends=('p7zip: support for 7zip archives')
+provides=('mcedit-pkgbuild-syntax')
+conflicts=('mc-utf8')
+replaces=('mc-utf8')
+options=('!emptydirs' '!makeflags')
+source=("http://www.midnight-commander.org/downloads/${pkgname}-${pkgver}.tar.bz2")
+md5sums=('bdae966244496cd4f6d282d80c9cf3c6')
+sha1sums=('08ffcc9fd19c7d8906a454c27b7074ca35bce14a')
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ ./configure \
+ --prefix=/usr --sysconfdir=/etc --mandir=/usr/share/man \
+ --enable-background --enable-charset --enable-largefile \
+ --with-edit --with-gpm-mouse --with-mmap --enable-vfs-smb \
+ --with-screen=slang --with-subshell --with-vfs --with-x \
+ --without-debug --without-gnome --without-included-gettext \
+ --libexecdir=/usr/lib
+
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ make DESTDIR="${pkgdir}" install
+
+ # Fix FS#15177
+ sed 's|op_has_zipinfo = 0|op_has_zipinfo = 1|' \
+ -i "${pkgdir}/usr/lib/mc/extfs.d/uzip"
+
+ # Fix FS#18312
+ rm "${pkgdir}/usr/lib/mc/extfs.d/u7z"
+
+ sed 's#/usr/bin/env python#/usr/bin/python2#' \
+ -i "${pkgdir}/usr/lib/mc/extfs.d/s3+"
+}
diff --git a/extra/mesa/PKGBUILD b/extra/mesa/PKGBUILD
index bce2a5adb..76dc37e8d 100644
--- a/extra/mesa/PKGBUILD
+++ b/extra/mesa/PKGBUILD
@@ -3,7 +3,7 @@
# Maintainer: Andreas Radke <andyrtr@archlinux.org>
pkgbase=mesa
-pkgname=('mesa' 'libgl' 'libgles' 'libegl' 'ati-dri' 'intel-dri' 'unichrome-dri' 'mach64-dri' 'mga-dri' 'r128-dri' 'savage-dri' 'sis-dri' 'tdfx-dri' 'nouveau-dri')
+pkgname=('mesa' 'libgl' 'libgles' 'libegl' 'sis-dri')
#_git=true
_git=false
@@ -19,7 +19,7 @@ makedepends=('glproto>=1.4.12' 'pkgconfig' 'libdrm>=2.4.23' 'libxxf86vm>=1.1.0'
'gcc-libs>=4.5' 'dri2proto=2.3' 'python2' 'libxml2' 'imake')
url="http://mesa3d.sourceforge.net"
license=('custom')
-source=(LICENSE gnome-shell-shader-fix.patch nouveau-fix-header.patch)
+source=(LICENSE gnome-shell-shader-fix.patch nouveau-fix-header.patch mesa-7.5-mips-wmb.patch)
if [ "${_git}" = "true" ]; then
# mesa git shot from 7.10 branch - see for state: http://cgit.freedesktop.org/mesa/mesa/commit/?h=7.10&id=cc1636b6db85604510f97f8a37d7fd0ecf453866
source=(${source[@]} 'ftp://ftp.archlinux.org/other/mesa/mesa-cc1636b6db85604510f97f8a37d7fd0ecf453866.tar.bz2')
@@ -30,7 +30,8 @@ fi
md5sums=('5c65a0fe315dd347e09b1f2826a1df5a'
'3ec78f340f9387abd7a37b195e764cbf'
'67c87b77cc2236b52a3b47dad3fbb5d4'
- 'f5de82852f1243f42cc004039e10b771')
+ 'f5de82852f1243f42cc004039e10b771'
+ 'efe8da4d80c2a5d32a800770b8ce5dfa')
build() {
if [ "${_git}" = "true" ]; then
@@ -45,13 +46,13 @@ fi
patch -Np1 -i "${srcdir}/gnome-shell-shader-fix.patch"
patch -Np1 -i "${srcdir}/nouveau-fix-header.patch"
+ # WMB for MIPS patch from Fedora
+ patch -Np1 -i $srcdir/mesa-7.5-mips-wmb.patch
+
if [ "${_git}" = "true" ]; then
./autogen.sh --prefix=/usr \
--with-dri-driverdir=/usr/lib/xorg/modules/dri \
- --enable-gallium-radeon \
- --enable-gallium-r600 \
- --enable-gallium-nouveau \
- --enable-gallium-swrast \
+ --with-dri-drivers=sis \
--enable-glx-tls \
--with-driver=dri \
--enable-xcb \
@@ -64,10 +65,7 @@ if [ "${_git}" = "true" ]; then
else
./configure --prefix=/usr \
--with-dri-driverdir=/usr/lib/xorg/modules/dri \
- --enable-gallium-radeon \
- --enable-gallium-r600 \
- --enable-gallium-nouveau \
- --enable-gallium-swrast \
+ --with-dri-drivers=sis \
--enable-glx-tls \
--with-driver=dri \
--enable-xcb \
@@ -192,109 +190,6 @@ fi
install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa/"
}
-package_ati-dri() {
- depends=("libgl=${pkgver}")
- pkgdesc="Mesa DRI + Gallium3D r300 drivers for AMD/ATI Radeon"
- conflicts=('xf86-video-ati<6.9.0-6')
-
-if [ "${_git}" = "true" ]; then
- cd ${srcdir}/mesa-*/src/mesa/drivers/dri
- else
- cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri"
-fi
- make -C radeon DESTDIR="${pkgdir}" install
- make -C r200 DESTDIR="${pkgdir}" install
- # classic mesa driver for R300 r300_dri.so
- #make -C r300 DESTDIR="${pkgdir}" install <------- deprecated
- # gallium3D driver for R300 r300_dri.so
-if [ "${_git}" = "true" ]; then
- make -C ${srcdir}/mesa-*/src/gallium/targets/dri-r300 DESTDIR="${pkgdir}" install
- make -C ${srcdir}/mesa-*/src/gallium/targets/dri-r600 DESTDIR="${pkgdir}" install
- else
- make -C ${srcdir}/Mesa-${pkgver}/src/gallium/targets/dri-r300 DESTDIR="${pkgdir}" install
- make -C ${srcdir}/Mesa-${pkgver}/src/gallium/targets/dri-r600 DESTDIR="${pkgdir}" install
-fi
- #make -C r600 DESTDIR="${pkgdir}" install
-}
-
-package_intel-dri() {
- depends=("libgl=${pkgver}")
- pkgdesc="Mesa DRI drivers for Intel"
-
-if [ "${_git}" = "true" ]; then
- cd ${srcdir}/mesa-*/src/mesa/drivers/dri
- else
- cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri"
-fi
- make -C i810 DESTDIR="${pkgdir}" install
- make -C i915 DESTDIR="${pkgdir}" install
- make -C i965 DESTDIR="${pkgdir}" install
-}
-
-package_unichrome-dri() {
- depends=("libgl=${pkgver}")
- pkgdesc="Mesa DRI drivers for S3 Graphics/VIA Unichrome"
-
-if [ "${_git}" = "true" ]; then
- cd ${srcdir}/mesa-*/src/mesa/drivers/dri
- else
- cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri"
-fi
- make -C unichrome DESTDIR="${pkgdir}" install
-}
-
-package_mach64-dri() {
- depends=("libgl=${pkgver}")
- pkgdesc="Mesa DRI drivers for ATI Mach64"
- conflicts=('xf86-video-mach64<6.8.2')
-
-if [ "${_git}" = "true" ]; then
- cd ${srcdir}/mesa-*/src/mesa/drivers/dri
- else
- cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri"
-fi
- make -C mach64 DESTDIR="${pkgdir}" install
-}
-
-package_mga-dri() {
- depends=("libgl=${pkgver}")
- pkgdesc="Mesa DRI drivers for Matrox"
- conflicts=('xf86-video-mga<1.4.11')
-
-if [ "${_git}" = "true" ]; then
- cd ${srcdir}/mesa-*/src/mesa/drivers/dri
- else
- cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri"
-fi
- make -C mga DESTDIR="${pkgdir}" install
-}
-
-package_r128-dri() {
- depends=("libgl=${pkgver}")
- pkgdesc="Mesa DRI drivers for ATI Rage128"
- conflicts=('xf86-video-r128<6.8.1')
-
-if [ "${_git}" = "true" ]; then
- cd ${srcdir}/mesa-*/src/mesa/drivers/dri
- else
- cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri"
-fi
- make -C r128 DESTDIR="${pkgdir}" install
-}
-
-package_savage-dri() {
- depends=("libgl=${pkgver}")
- pkgdesc="Mesa DRI drivers for S3 Sraphics/VIA Savage"
- conflicts=('xf86-video-savage<2.3.1')
-
-if [ "${_git}" = "true" ]; then
- cd ${srcdir}/mesa-*/src/mesa/drivers/dri
- else
- cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri"
-fi
- make -C savage DESTDIR="${pkgdir}" install
-}
-
package_sis-dri() {
depends=("libgl=${pkgver}")
pkgdesc="Mesa DRI drivers for SiS"
@@ -307,38 +202,3 @@ if [ "${_git}" = "true" ]; then
fi
make -C sis DESTDIR="${pkgdir}" install
}
-
-package_tdfx-dri() {
- depends=("libgl=${pkgver}")
- pkgdesc="Mesa DRI drivers for 3dfx"
- conflicts=('xf86-video-tdfx<1.4.3')
-
-if [ "${_git}" = "true" ]; then
- cd ${srcdir}/mesa-*/src/mesa/drivers/dri
- else
- cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri"
-fi
- make -C tdfx DESTDIR="${pkgdir}" install
-}
-
-package_nouveau-dri() {
- depends=("libgl=${pkgver}")
- pkgdesc="Mesa classic DRI + Gallium3D drivers for Nouveau"
-
-if [ "${_git}" = "true" ]; then
- cd ${srcdir}/mesa-*/src/mesa/drivers/dri
- else
- cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri"
-fi
-
- # classic mesa driver for nv10 , nv20 nouveau_vieux_dri.so
- make -C nouveau DESTDIR="${pkgdir}" install
-
- # gallium3D driver for nv30 - nv40 - nv50 nouveau_dri.so
-if [ "${_git}" = "true" ]; then
- make -C ${srcdir}/mesa-*/src/gallium/targets/dri-nouveau DESTDIR="${pkgdir}" install
- else
- make -C ${srcdir}/Mesa-${pkgver}/src/gallium/targets/dri-nouveau DESTDIR="${pkgdir}" install
-fi
-}
-
diff --git a/extra/mesa/PKGBUILD.orig b/extra/mesa/PKGBUILD.orig
new file mode 100644
index 000000000..c5fc9f4a6
--- /dev/null
+++ b/extra/mesa/PKGBUILD.orig
@@ -0,0 +1,349 @@
+# $Id: PKGBUILD 119075 2011-04-10 20:11:41Z ibiru $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+# Maintainer: Andreas Radke <andyrtr@archlinux.org>
+
+pkgbase=mesa
+pkgname=('mesa' 'libgl' 'libgles' 'libegl' 'ati-dri' 'intel-dri' 'unichrome-dri' 'mach64-dri' 'mga-dri' 'r128-dri' 'savage-dri' 'sis-dri' 'tdfx-dri' 'nouveau-dri')
+
+#_git=true
+_git=false
+
+if [ "${_git}" = "true" ]; then
+ pkgver=7.10.0.git20110215
+ else
+ pkgver=7.10.2
+fi
+<<<<<<< HEAD
+pkgrel=1
+arch=('i686' 'x86_64' 'mips64el')
+=======
+pkgrel=2
+arch=('i686' 'x86_64')
+>>>>>>> 28b5bbf3fee0627993658e096eadab71c2779912
+makedepends=('glproto>=1.4.12' 'pkgconfig' 'libdrm>=2.4.23' 'libxxf86vm>=1.1.0' 'libxdamage>=1.1.3' 'expat>=2.0.1' 'libx11>=1.3.5' 'libxt>=1.0.8'
+ 'gcc-libs>=4.5' 'dri2proto=2.3' 'python2' 'libxml2' 'imake')
+url="http://mesa3d.sourceforge.net"
+license=('custom')
+source=(LICENSE gnome-shell-shader-fix.patch nouveau-fix-header.patch)
+if [ "${_git}" = "true" ]; then
+ # mesa git shot from 7.10 branch - see for state: http://cgit.freedesktop.org/mesa/mesa/commit/?h=7.10&id=cc1636b6db85604510f97f8a37d7fd0ecf453866
+ source=(${source[@]} 'ftp://ftp.archlinux.org/other/mesa/mesa-cc1636b6db85604510f97f8a37d7fd0ecf453866.tar.bz2')
+ else
+ source=(${source[@]} "ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2"
+)
+fi
+md5sums=('5c65a0fe315dd347e09b1f2826a1df5a'
+ '3ec78f340f9387abd7a37b195e764cbf'
+ '67c87b77cc2236b52a3b47dad3fbb5d4'
+ 'f5de82852f1243f42cc004039e10b771')
+
+build() {
+if [ "${_git}" = "true" ]; then
+ cd ${srcdir}/mesa-*
+ autoreconf -vfi
+ else
+ cd "${srcdir}/Mesa-${pkgver}"
+fi
+
+#backport from master to fix gnome-shell shader
+#https://bugs.freedesktop.org/show_bug.cgi?id=35714
+patch -Np1 -i "${srcdir}/gnome-shell-shader-fix.patch"
+patch -Np1 -i "${srcdir}/nouveau-fix-header.patch"
+
+if [ "${_git}" = "true" ]; then
+ ./autogen.sh --prefix=/usr \
+ --with-dri-driverdir=/usr/lib/xorg/modules/dri \
+ --enable-gallium-radeon \
+ --enable-gallium-r600 \
+ --enable-gallium-nouveau \
+ --enable-gallium-swrast \
+ --enable-glx-tls \
+ --with-driver=dri \
+ --enable-xcb \
+ --with-state-trackers=dri,glx \
+ --disable-glut \
+ --enable-gles1 \
+ --enable-gles2 \
+ --enable-egl \
+ --disable-gallium-egl
+ else
+ ./configure --prefix=/usr \
+ --with-dri-driverdir=/usr/lib/xorg/modules/dri \
+ --enable-gallium-radeon \
+ --enable-gallium-r600 \
+ --enable-gallium-nouveau \
+ --enable-gallium-swrast \
+ --enable-glx-tls \
+ --with-driver=dri \
+ --enable-xcb \
+ --with-state-trackers=dri,glx \
+ --disable-glut \
+ --enable-gles1 \
+ --enable-gles2 \
+ --enable-egl \
+ --disable-gallium-egl
+fi
+
+ make
+}
+
+package_libgl() {
+ depends=('libdrm>=2.4.22' 'libxxf86vm>=1.1.0' 'libxdamage>=1.1.3' 'expat>=2.0.1')
+ pkgdesc="Mesa 3-D graphics library and DRI software rasterizer"
+
+if [ "${_git}" = "true" ]; then
+ cd ${srcdir}/mesa-*
+ else
+ cd "${srcdir}/Mesa-${pkgver}"
+fi
+ install -m755 -d "${pkgdir}/usr/lib"
+ install -m755 -d "${pkgdir}/usr/lib/xorg/modules/extensions"
+
+ bin/minstall lib/libGL.so* "${pkgdir}/usr/lib/"
+
+ cd src/mesa/drivers/dri
+ #make -C swrast DESTDIR="${pkgdir}" install
+if [ "${_git}" = "true" ]; then
+ make -C ${srcdir}/mesa-*/src/gallium/targets/dri-swrast DESTDIR="${pkgdir}" install
+ else
+ make -C ${srcdir}/Mesa-${pkgver}/src/gallium/targets/dri-swrast DESTDIR="${pkgdir}" install
+fi
+ ln -s swrastg_dri.so "${pkgdir}/usr/lib/xorg/modules/dri/swrast_dri.so"
+ ln -s libglx.xorg "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so"
+
+ install -m755 -d "${pkgdir}/usr/share/licenses/libgl"
+ install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libgl/"
+}
+
+package_libgles() {
+ depends=('libgl')
+ pkgdesc="Mesa GLES libraries and headers"
+
+if [ "${_git}" = "true" ]; then
+ cd ${srcdir}/mesa-*
+ else
+ cd "${srcdir}/Mesa-${pkgver}"
+fi
+ install -m755 -d "${pkgdir}/usr/lib"
+ install -m755 -d "${pkgdir}/usr/lib/pkgconfig"
+ install -m755 -d "${pkgdir}/usr/include"
+ install -m755 -d "${pkgdir}/usr/include/GLES"
+ install -m755 -d "${pkgdir}/usr/include/GLES2"
+ bin/minstall lib/libGLESv* "${pkgdir}/usr/lib/"
+ bin/minstall src/mapi/es1api/glesv1_cm.pc "${pkgdir}/usr/lib/pkgconfig/"
+ bin/minstall src/mapi/es2api/glesv2.pc "${pkgdir}/usr/lib/pkgconfig/"
+ bin/minstall include/GLES/* "${pkgdir}/usr/include/GLES/"
+ bin/minstall include/GLES2/* "${pkgdir}/usr/include/GLES2/"
+ bin/minstall include/GLES2/* "${pkgdir}/usr/include/GLES2/"
+
+ install -m755 -d "${pkgdir}/usr/share/licenses/libgles"
+ install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libgles/"
+}
+
+package_libegl() {
+ depends=('libgl')
+ pkgdesc="Mesa libEGL libraries and headers"
+
+if [ "${_git}" = "true" ]; then
+ cd ${srcdir}/mesa-*
+ else
+ cd "${srcdir}/Mesa-${pkgver}"
+fi
+ install -m755 -d "${pkgdir}/usr/lib"
+ install -m755 -d "${pkgdir}/usr/lib/egl"
+ install -m755 -d "${pkgdir}/usr/lib/pkgconfig"
+ install -m755 -d "${pkgdir}/usr/include"
+ install -m755 -d "${pkgdir}/usr/include/"
+ install -m755 -d "${pkgdir}/usr/include/EGL"
+ install -m755 -d "${pkgdir}/usr/include/KHR"
+ install -m755 -d "${pkgdir}/usr/share"
+ install -m755 -d "${pkgdir}/usr/share/doc"
+ install -m755 -d "${pkgdir}/usr/share/doc/libegl"
+ bin/minstall lib/libEGL.so* "${pkgdir}/usr/lib/"
+ bin/minstall lib/egl/* "${pkgdir}/usr/lib/egl/"
+ bin/minstall src/egl/main/egl.pc "${pkgdir}/usr/lib/pkgconfig/"
+ bin/minstall include/EGL/* "${pkgdir}/usr/include/EGL/"
+ bin/minstall include/KHR/khrplatform.h "${pkgdir}/usr/include/KHR/"
+ bin/minstall docs/egl.html "${pkgdir}/usr/share/doc/libegl/"
+
+ install -m755 -d "${pkgdir}/usr/share/licenses/libegl"
+ install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libegl/"
+}
+package_mesa() {
+ depends=('libgl' 'libx11>=1.3.5' 'libxt>=1.0.8' 'gcc-libs>=4.5' 'dri2proto=2.3' 'libdrm>=2.4.22' 'glproto>=1.4.12')
+ optdepends=('opengl-man-pages: for the OpenGL API man pages')
+ pkgdesc="Mesa 3-D graphics libraries and include files"
+
+if [ "${_git}" = "true" ]; then
+ cd ${srcdir}/mesa-*
+ else
+ cd "${srcdir}/Mesa-${pkgver}"
+fi
+ make DESTDIR="${pkgdir}" install
+
+ rm -f "${pkgdir}/usr/lib/libGL.so"*
+ rm -f "${pkgdir}/usr/lib/libGLESv"*
+ rm -f "${pkgdir}/usr/lib/libEGL"*
+ rm -rf "${pkgdir}/usr/lib/egl"
+ rm -f ${pkgdir}/usr/lib/pkgconfig/{glesv1_cm.pc,glesv2.pc,egl.pc}
+ rm -rf "${pkgdir}/usr/lib/xorg"
+ rm -f "${pkgdir}/usr/include/GL/glew.h"
+ rm -f "${pkgdir}/usr/include/GL/glxew.h"
+ rm -f "${pkgdir}/usr/include/GL/wglew.h"
+ rm -f "${pkgdir}/usr/include/GL/glut.h"
+ rm -rf ${pkgdir}/usr/include/{GLES,GLES2,EGL,KHR}
+
+ install -m755 -d "${pkgdir}/usr/share/licenses/mesa"
+ install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa/"
+}
+
+package_ati-dri() {
+ depends=("libgl=${pkgver}")
+ pkgdesc="Mesa DRI + Gallium3D r300 drivers for AMD/ATI Radeon"
+ conflicts=('xf86-video-ati<6.9.0-6')
+
+if [ "${_git}" = "true" ]; then
+ cd ${srcdir}/mesa-*/src/mesa/drivers/dri
+ else
+ cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri"
+fi
+ make -C radeon DESTDIR="${pkgdir}" install
+ make -C r200 DESTDIR="${pkgdir}" install
+ # classic mesa driver for R300 r300_dri.so
+ #make -C r300 DESTDIR="${pkgdir}" install <------- deprecated
+ # gallium3D driver for R300 r300_dri.so
+if [ "${_git}" = "true" ]; then
+ make -C ${srcdir}/mesa-*/src/gallium/targets/dri-r300 DESTDIR="${pkgdir}" install
+ make -C ${srcdir}/mesa-*/src/gallium/targets/dri-r600 DESTDIR="${pkgdir}" install
+ else
+ make -C ${srcdir}/Mesa-${pkgver}/src/gallium/targets/dri-r300 DESTDIR="${pkgdir}" install
+ make -C ${srcdir}/Mesa-${pkgver}/src/gallium/targets/dri-r600 DESTDIR="${pkgdir}" install
+fi
+ #make -C r600 DESTDIR="${pkgdir}" install
+}
+
+package_intel-dri() {
+ depends=("libgl=${pkgver}")
+ pkgdesc="Mesa DRI drivers for Intel"
+
+if [ "${_git}" = "true" ]; then
+ cd ${srcdir}/mesa-*/src/mesa/drivers/dri
+ else
+ cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri"
+fi
+ make -C i810 DESTDIR="${pkgdir}" install
+ make -C i915 DESTDIR="${pkgdir}" install
+ make -C i965 DESTDIR="${pkgdir}" install
+}
+
+package_unichrome-dri() {
+ depends=("libgl=${pkgver}")
+ pkgdesc="Mesa DRI drivers for S3 Graphics/VIA Unichrome"
+
+if [ "${_git}" = "true" ]; then
+ cd ${srcdir}/mesa-*/src/mesa/drivers/dri
+ else
+ cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri"
+fi
+ make -C unichrome DESTDIR="${pkgdir}" install
+}
+
+package_mach64-dri() {
+ depends=("libgl=${pkgver}")
+ pkgdesc="Mesa DRI drivers for ATI Mach64"
+ conflicts=('xf86-video-mach64<6.8.2')
+
+if [ "${_git}" = "true" ]; then
+ cd ${srcdir}/mesa-*/src/mesa/drivers/dri
+ else
+ cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri"
+fi
+ make -C mach64 DESTDIR="${pkgdir}" install
+}
+
+package_mga-dri() {
+ depends=("libgl=${pkgver}")
+ pkgdesc="Mesa DRI drivers for Matrox"
+ conflicts=('xf86-video-mga<1.4.11')
+
+if [ "${_git}" = "true" ]; then
+ cd ${srcdir}/mesa-*/src/mesa/drivers/dri
+ else
+ cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri"
+fi
+ make -C mga DESTDIR="${pkgdir}" install
+}
+
+package_r128-dri() {
+ depends=("libgl=${pkgver}")
+ pkgdesc="Mesa DRI drivers for ATI Rage128"
+ conflicts=('xf86-video-r128<6.8.1')
+
+if [ "${_git}" = "true" ]; then
+ cd ${srcdir}/mesa-*/src/mesa/drivers/dri
+ else
+ cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri"
+fi
+ make -C r128 DESTDIR="${pkgdir}" install
+}
+
+package_savage-dri() {
+ depends=("libgl=${pkgver}")
+ pkgdesc="Mesa DRI drivers for S3 Sraphics/VIA Savage"
+ conflicts=('xf86-video-savage<2.3.1')
+
+if [ "${_git}" = "true" ]; then
+ cd ${srcdir}/mesa-*/src/mesa/drivers/dri
+ else
+ cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri"
+fi
+ make -C savage DESTDIR="${pkgdir}" install
+}
+
+package_sis-dri() {
+ depends=("libgl=${pkgver}")
+ pkgdesc="Mesa DRI drivers for SiS"
+ conflicts=('xf86-video-sis<0.10.2')
+
+if [ "${_git}" = "true" ]; then
+ cd ${srcdir}/mesa-*/src/mesa/drivers/dri
+ else
+ cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri"
+fi
+ make -C sis DESTDIR="${pkgdir}" install
+}
+
+package_tdfx-dri() {
+ depends=("libgl=${pkgver}")
+ pkgdesc="Mesa DRI drivers for 3dfx"
+ conflicts=('xf86-video-tdfx<1.4.3')
+
+if [ "${_git}" = "true" ]; then
+ cd ${srcdir}/mesa-*/src/mesa/drivers/dri
+ else
+ cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri"
+fi
+ make -C tdfx DESTDIR="${pkgdir}" install
+}
+
+package_nouveau-dri() {
+ depends=("libgl=${pkgver}")
+ pkgdesc="Mesa classic DRI + Gallium3D drivers for Nouveau"
+
+if [ "${_git}" = "true" ]; then
+ cd ${srcdir}/mesa-*/src/mesa/drivers/dri
+ else
+ cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri"
+fi
+
+ # classic mesa driver for nv10 , nv20 nouveau_vieux_dri.so
+ make -C nouveau DESTDIR="${pkgdir}" install
+
+ # gallium3D driver for nv30 - nv40 - nv50 nouveau_dri.so
+if [ "${_git}" = "true" ]; then
+ make -C ${srcdir}/mesa-*/src/gallium/targets/dri-nouveau DESTDIR="${pkgdir}" install
+ else
+ make -C ${srcdir}/Mesa-${pkgver}/src/gallium/targets/dri-nouveau DESTDIR="${pkgdir}" install
+fi
+}
+
diff --git a/extra/v86d/PKGBUILD.orig b/extra/v86d/PKGBUILD.orig
new file mode 100644
index 000000000..f73fc234b
--- /dev/null
+++ b/extra/v86d/PKGBUILD.orig
@@ -0,0 +1,42 @@
+# $Id: PKGBUILD 119572 2011-04-12 13:37:13Z eric $
+# Maintainer: Thomas Baechler <thomas@archlinux.org>
+
+pkgname=v86d
+pkgver=0.1.10
+pkgrel=1
+pkgdesc="userspace helper for uvesafb that runs x86 code in an emulated environment"
+arch=('i686' 'x86_64')
+url="http://dev.gentoo.org/~spock/projects/uvesafb/"
+license=('GPL2')
+<<<<<<< HEAD
+arch=("i686" "x86_64" 'mips64el')
+=======
+>>>>>>> 6dab5c46b00f624c7900ff6d11b75bcafbe251d0
+depends=('glibc')
+conflicts=('mkinitcpio<0.5.99')
+backup=('etc/modprobe.d/uvesafb.conf')
+options=('!makeflags')
+source=(http://dev.gentoo.org/~spock/projects/uvesafb/archive/v86d-$pkgver.tar.bz2
+ v86d
+ v86d_hook
+ modprobe.uvesafb)
+md5sums=('51c792ba7b874ad8c43f0d3da4cfabe0'
+ '33f3131e7bf041ed6a67e92bff272f4c'
+ '813958b8f6c75a7063e4858f31509694'
+ '2d7cc8dc6a41916a13869212d0191147')
+
+build() {
+ cd "$srcdir/v86d-$pkgver"
+ ./configure --with-x86emu
+ # we only need /usr/include/video/uvesafb.h
+ make KDIR=/usr
+}
+
+package() {
+ cd "$srcdir/v86d-$pkgver"
+ make DESTDIR="$pkgdir" install
+
+ install -D -m644 "$srcdir/v86d" "$pkgdir/lib/initcpio/install/v86d"
+ install -D -m644 "$srcdir/v86d_hook" "$pkgdir/lib/initcpio/hooks/v86d"
+ install -D -m644 "$srcdir/modprobe.uvesafb" "$pkgdir/etc/modprobe.d/uvesafb.conf"
+}
diff --git a/extra/virtuoso/PKGBUILD b/extra/virtuoso/PKGBUILD
index 50da41a39..e64e3085f 100644
--- a/extra/virtuoso/PKGBUILD
+++ b/extra/virtuoso/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id $
+# $Id: PKGBUILD 119933 2011-04-17 01:32:48Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Massimiliano Torromeo <massimiliano DOT torromeo AT google mail service>
pkgname=virtuoso
-pkgver=6.1.2
+pkgver=6.1.3
pkgrel=1
arch=('i686' 'x86_64' 'mips64el')
pkgdesc='A scalable cross-platform server that combines SQL/RDF/XML Data Management with Web Application Server and Web Services Platform functionality'
@@ -13,7 +13,7 @@ depends=('openssl')
makedepends=('bison' 'flex')
options=('!libtool' '!makeflags')
source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-opensource-${pkgver}.tar.gz")
-md5sums=('0519e1f104428e0c8b25fad89e3c57ef')
+md5sums=('7d4b0497411ff1c34d7ca247618cdd17')
build() {
cd ${srcdir}/${pkgname}-opensource-${pkgver}
diff --git a/extra/xfce4-mixer/PKGBUILD b/extra/xfce4-mixer/PKGBUILD
index e3c0594ad..2a611c91f 100644
--- a/extra/xfce4-mixer/PKGBUILD
+++ b/extra/xfce4-mixer/PKGBUILD
@@ -11,9 +11,9 @@ url="http://www.xfce.org/"
groups=('xfce4')
depends=("xfce4-panel>=4.8.0" 'gstreamer0.10-base>=0.10.22' 'hicolor-icon-theme')
makedepends=('intltool')
-optdepends=('gstreamer0.10-base-plugins: to support basic audio hardware' \
- 'gstreamer0.10-good-plugins: well supported hardware'\
- 'gstreamer0.10-bad-plugins: not so well supported hardware'\
+optdepends=('gstreamer0.10-base-plugins: to support basic audio hardware'
+ 'gstreamer0.10-good-plugins: well supported hardware'
+ 'gstreamer0.10-bad-plugins: not so well supported hardware'
'gstreamer0.10-ugly-plugins: might contain questionable license hardware')
options=('!libtool')
install=${pkgname}.install
diff --git a/extra/xorg-server/PKGBUILD b/extra/xorg-server/PKGBUILD
index 0ab67f23d..bd16d9086 100644
--- a/extra/xorg-server/PKGBUILD
+++ b/extra/xorg-server/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 119206 2011-04-11 10:54:18Z jgc $
+# $Id: PKGBUILD 119887 2011-04-16 12:07:45Z andyrtr $
# Maintainer: Jan de Groot <jgc@archlinux.org>
pkgbase=xorg-server
pkgname=('xorg-server' 'xorg-server-xephyr' 'xorg-server-xdmx' 'xorg-server-xvfb' 'xorg-server-xnest' 'xorg-server-common' 'xorg-server-devel')
-pkgver=1.10.0.902
+pkgver=1.10.1
pkgrel=1
arch=('i686' 'x86_64' 'mips64el')
license=('custom')
@@ -18,7 +18,7 @@ source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2
xvfb-run
xvfb-run.1
10-quirks.conf)
-sha1sums=('7d44c57735c321fefd2b58f8917f51a95a829886'
+sha1sums=('59ada4c9a59f7f1eb4b68c359e9cd58272aa4809'
'629c6d8d52126eab81ee1b72a9e4209535f8cb81'
'19e7164dcf9814ad64231b50a46f651b0e68a27a'
'1b95e91384a57d966428c7db98ed06f4cc562f91'