Wed Oct 3 01:31:01 PDT 2012

14 files changed, 247 insertions, 29 deletions

diff --git a/community/catalyst-dkms/3.5-do_mmap.patch b/community/catalyst-dkms/3.5-do_mmap.patch
new file mode 100644
index 000000000..04248eb7b
--- /dev/null
+++ b/community/catalyst-dkms/3.5-do_mmap.patch
@@ -0,0 +1,50 @@
+--- a/common/lib/modules/fglrx/build_mod/firegl_public.c	2012-06-15 18:30:13.483762070 +0200
++++ b/common/lib/modules/fglrx/build_mod/firegl_public.c	2012-06-17 17:47:36.543041869 +0200
+@@ -2106,6 +2106,12 @@
+     }
+ }
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 5, 0)
++# define NO_DO_MMAP
++# define do_mmap(a,b,c,d,e,f) vm_mmap(a, b, c, d, e, f)
++# define do_munmap(a,b,c) vm_munmap(b, c)
++#endif
++
+ unsigned long ATI_API_CALL KCL_MEM_AllocLinearAddrInterval(
+                                         KCL_IO_FILE_Handle file,
+                                         unsigned long addr,
+@@ -2117,10 +2123,13 @@
+ 
+     flags = MAP_SHARED;
+     prot  = PROT_READ|PROT_WRITE;
+-
++#ifdef NO_DO_MMAP
++    vaddr = (void *) vm_mmap(file, 0, len, prot, flags, pgoff);
++#else
+     down_write(&current->mm->mmap_sem);
+     vaddr = (void *) do_mmap(file, 0, len, prot, flags, pgoff);
+     up_write(&current->mm->mmap_sem);
++#endif
+     if (IS_ERR(vaddr))
+        return 0;
+     else
+@@ -2131,7 +2140,9 @@
+ {
+     int retcode = 0;
+ 
++#ifndef NO_DO_MMAP
+     down_write(&current->mm->mmap_sem);
++#endif
+ #ifdef FGL_LINUX_RHEL_MUNMAP_API
+     retcode = do_munmap(current->mm,
+                         addr,
+@@ -2142,7 +2153,9 @@
+                         addr,
+                         len);
+ #endif                        
++#ifndef NO_DO_MMAP
+     up_write(&current->mm->mmap_sem);
++#endif
+     return retcode;
+ }
+ 
diff --git a/community/catalyst-dkms/PKGBUILD b/community/catalyst-dkms/PKGBUILD
new file mode 100644
index 000000000..175851c6b
--- /dev/null
+++ b/community/catalyst-dkms/PKGBUILD
@@ -0,0 +1,49 @@
+# $Id: PKGBUILD 76979 2012-10-02 21:27:47Z lcarlier $
+# Maintainer: Laurent Carlier <lordheavym@gmail.com>
+# Contributor: Vi0L0, wonder, Eduardo "kensai" Romero
+# Contributor: aidanlinz, Rip-Rip, OvsInc, Sebastian Siebert
+
+pkgname=catalyst-dkms
+pkgver=12.8
+pkgrel=0.1
+pkgdesc="AMD proprietary gpu kernel driver"
+arch=('i686' 'x86_64')
+url="http://www.amd.com"
+license=('custom')
+depends=('linux>=3.5' 'linux-headers>=3.5' 'dkms')
+source=(http://www2.ati.com/drivers/linux/amd-driver-installer-${pkgver/./-}-x86.x86_64.zip
+        dkms.conf
+        3.5-do_mmap.patch)
+md5sums=('41c5478322b13be6909eeb46412a3aa0'
+         '972049dc247a74a7162f2227078abcb0'
+         'a450e2e3db61994b09e9d99d95bee837')
+install=catalyst.install
+
+package() {
+  depends=(${depends[@]} "catalyst-utils=${pkgver}")
+
+  cd ${srcdir}
+  
+  if [ "${CARCH}" = "x86_64" ]; then
+    _archdir=x86_64
+  else
+    _archdir=x86
+  fi
+
+  sh ./amd-driver-installer*.run --extract fglrx-install
+
+  cd fglrx-install
+  patch -Np1 -i ../3.5-do_mmap.patch
+
+  install -dm755 "${pkgdir}/usr/lib/modprobe.d"
+  install -dm755 "${pkgdir}/usr/src/fglrx-${pkgver}-${pkgrel}"
+  cp -r common/lib/modules/fglrx/build_mod/* "${pkgdir}/usr/src/fglrx-${pkgver}-${pkgrel}/"
+  cp "arch/${_archdir}"/lib/modules/fglrx/build_mod/libfglrx_ip.a "${pkgdir}/usr/src/fglrx-${pkgver}-${pkgrel}/"
+  cp ${srcdir}/dkms.conf "${pkgdir}/usr/src/fglrx-${pkgver}-${pkgrel}/"
+  sed -i -e "s/@VERSION@/${pkgver}-${pkgrel}/" "${pkgdir}/usr/src/fglrx-${pkgver}-${pkgrel}/dkms.conf"
+  
+  echo "blacklist radeon" >> "${pkgdir}/usr/lib/modprobe.d/catalyst.conf"
+  
+  # license
+  install -Dm644 "${srcdir}/fglrx-install/LICENSE.TXT" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.TXT"
+}
diff --git a/community/catalyst-dkms/catalyst.install b/community/catalyst-dkms/catalyst.install
new file mode 100644
index 000000000..f32e7ae7a
--- /dev/null
+++ b/community/catalyst-dkms/catalyst.install
@@ -0,0 +1,24 @@
+post_install() 
+{
+    dkms add -m fglrx -v $1
+    dkms build -m fglrx -v $1
+    dkms install -m fglrx -v $1
+}
+
+pre_upgrade() 
+{
+    dkms remove -m fglrx -v $1 --all
+}
+
+post_upgrade() 
+{
+    dkms add -m fglrx -v $1
+    dkms build -m fglrx -v $1
+    dkms install -m fglrx -v $1
+}
+
+pre_remove() 
+{
+    dkms remove -m fglrx -v $1 --all
+}
+
diff --git a/community/catalyst-dkms/dkms.conf b/community/catalyst-dkms/dkms.conf
new file mode 100644
index 000000000..8d312da4f
--- /dev/null
+++ b/community/catalyst-dkms/dkms.conf
@@ -0,0 +1,7 @@
+PACKAGE_NAME="fglrx"
+PACKAGE_VERSION="@VERSION@"
+CLEAN="rm -f *.*o"
+BUILT_MODULE_NAME[0]="fglrx"
+MAKE[0]="sh make.sh --nohints --uname_r=$kernelver --norootcheck"
+DEST_MODULE_LOCATION[0]="/extramodules"
+AUTOINSTALL="yes"
diff --git a/community/catalyst-lts-dkms/PKGBUILD b/community/catalyst-lts-dkms/PKGBUILD
new file mode 100644
index 000000000..2c0683df7
--- /dev/null
+++ b/community/catalyst-lts-dkms/PKGBUILD
@@ -0,0 +1,46 @@
+# $Id: PKGBUILD 76980 2012-10-02 21:28:25Z lcarlier $
+# Maintainer: Laurent Carlier <lordheavym@gmail.com>
+# Contributor: Vi0L0, wonder, Eduardo "kensai" Romero
+# Contributor: aidanlinz, Rip-Rip, OvsInc, Sebastian Siebert
+
+pkgname=catalyst-lts-dkms
+pkgver=12.8
+pkgrel=0.1
+pkgdesc="AMD proprietary gpu kernel driver"
+arch=('i686' 'x86_64')
+url="http://www.amd.com"
+license=('custom')
+depends=('linux-lts' 'linux-lts-headers' 'dkms')
+source=(http://www2.ati.com/drivers/linux/amd-driver-installer-${pkgver/./-}-x86.x86_64.zip
+        dkms.conf)
+md5sums=('41c5478322b13be6909eeb46412a3aa0'
+         '98d42443e84e91674ba79f0e6c38c572')
+install=catalyst.install
+
+package() {
+  depends=(${depends[@]} "catalyst-utils=${pkgver}")
+
+  cd ${srcdir}
+  
+  if [ "${CARCH}" = "x86_64" ]; then
+    _archdir=x86_64
+  else
+    _archdir=x86
+  fi
+
+  sh ./amd-driver-installer*.run --extract fglrx-install
+
+  cd fglrx-install
+
+  install -dm755 "${pkgdir}/usr/lib/modprobe.d"
+  install -dm755 "${pkgdir}/usr/src/fglrx-lts-${pkgver}-${pkgrel}"
+  cp -r common/lib/modules/fglrx/build_mod/* "${pkgdir}/usr/src/fglrx-lts-${pkgver}-${pkgrel}/"
+  cp "arch/${_archdir}"/lib/modules/fglrx/build_mod/libfglrx_ip.a "${pkgdir}/usr/src/fglrx-lts-${pkgver}-${pkgrel}/"
+  cp ${srcdir}/dkms.conf "${pkgdir}/usr/src/fglrx-lts-${pkgver}-${pkgrel}/"
+  sed -i -e "s/@VERSION@/${pkgver}-${pkgrel}/" "${pkgdir}/usr/src/fglrx-lts-${pkgver}-${pkgrel}/dkms.conf"
+  
+  echo "blacklist radeon" >> "${pkgdir}/usr/lib/modprobe.d/catalyst-lts.conf"
+  
+  # license
+  install -Dm644 "${srcdir}/fglrx-install/LICENSE.TXT" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.TXT"
+}
diff --git a/community/catalyst-lts-dkms/catalyst.install b/community/catalyst-lts-dkms/catalyst.install
new file mode 100644
index 000000000..021f3fc54
--- /dev/null
+++ b/community/catalyst-lts-dkms/catalyst.install
@@ -0,0 +1,24 @@
+post_install() 
+{
+    dkms add -m fglrx-lts -v $1
+    dkms build -m fglrx-lts -v $1
+    dkms install -m fglrx-lts -v $1
+}
+
+pre_upgrade() 
+{
+    dkms remove -m fglrx-lts -v $1 --all
+}
+
+post_upgrade() 
+{
+    dkms add -m fglrx-lts -v $1
+    dkms build -m fglrx-lts -v $1
+    dkms install -m fglrx-lts -v $1
+}
+
+pre_remove() 
+{
+    dkms remove -m fglrx-lts -v $1 --all
+}
+
diff --git a/community/catalyst-lts-dkms/dkms.conf b/community/catalyst-lts-dkms/dkms.conf
new file mode 100644
index 000000000..64f81f832
--- /dev/null
+++ b/community/catalyst-lts-dkms/dkms.conf
@@ -0,0 +1,7 @@
+PACKAGE_NAME="fglrx-lts"
+PACKAGE_VERSION="@VERSION@"
+CLEAN="rm -f *.*o"
+BUILT_MODULE_NAME[0]="fglrx"
+MAKE[0]="sh make.sh --nohints --uname_r=$kernelver --norootcheck"
+DEST_MODULE_LOCATION[0]="/extramodules"
+AUTOINSTALL="yes"
diff --git a/community/mftrace/PKGBUILD b/community/mftrace/PKGBUILD
index 8bc526c61..8d8d7ba9c 100644
--- a/community/mftrace/PKGBUILD
+++ b/community/mftrace/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 66235 2012-02-23 05:09:11Z spupykin $
+# $Id: PKGBUILD 76923 2012-10-02 09:37:01Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: William Rea <sillywilly@gmail.com>
 
 pkgname=mftrace
-pkgver=1.2.17
-pkgrel=2
+pkgver=1.2.18
+pkgrel=1
 pkgdesc="Traces TeX bitmap fonts into PFA, PFB, or TTF"
 arch=('i686' 'x86_64')
 url="http://lilypond.org/mftrace/"
 license=("GPL")
 depends=('python2' 'potrace' 't1utils')
 source=(http://lilypond.org/download/sources/mftrace/mftrace-$pkgver.tar.gz)
-md5sums=('1a40b28e94594d215d5c4401b5ac76cb')
+md5sums=('7d660226b6f933a239b2413ac010fe0c')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
diff --git a/community/monit/PKGBUILD b/community/monit/PKGBUILD
index 9f7426ba0..726379806 100644
--- a/community/monit/PKGBUILD
+++ b/community/monit/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 70938 2012-05-20 10:06:55Z jlichtblau $
+# $Id: PKGBUILD 76973 2012-10-02 18:27:38Z jlichtblau $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Geoffroy Carrier <geoffroy.carrier@aur.archlinux.org>
 # Contributor: Marco Bartholomew <marco@marcobartholomew.com>
 
 pkgname=monit
-pkgver=5.4
+pkgver=5.5
 pkgrel=1
 pkgdesc="Utility for managing and monitoring, processes, files, directories and devices on a *NIX system"
 arch=('i686' 'x86_64')
@@ -15,7 +15,7 @@ backup=('etc/monitrc')
 changelog=$pkgname.changelog
 source=(http://mmonit.com/$pkgname/dist/$pkgname-$pkgver.tar.gz \
         monitd)
-sha256sums=('805c6545de2dd7f3d9e6e0c68018b2aadd5fc98b243c8868178f247a60906038'
+sha256sums=('8276b060b3f0e6453c9748d421dec044ddae09d3e4c4666e13472aab294d7c53'
             'b235b2fdeec49015d6b74f028d161b289663692f9ee2d2d78cf52d8db87ca496')
 
 build() {
diff --git a/community/monit/monit.changelog b/community/monit/monit.changelog
index f0472719c..7c26c1a39 100644
--- a/community/monit/monit.changelog
+++ b/community/monit/monit.changelog
@@ -1,3 +1,6 @@
+2012-10-02 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* monit 5.5-1
+
 2012-05-20 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 	* monit 5.4-1
 
diff --git a/community/osdbattery/PKGBUILD b/community/osdbattery/PKGBUILD
index 8e45267ef..1d2da5715 100644
--- a/community/osdbattery/PKGBUILD
+++ b/community/osdbattery/PKGBUILD
@@ -1,31 +1,36 @@
-# $Id: PKGBUILD 67719 2012-03-14 08:59:42Z giovanni $
+# $Id: PKGBUILD 76967 2012-10-02 18:09:45Z jlichtblau $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: dibblethewrecker <dibblethewrecker@jiwe.org>
 
 pkgname=osdbattery
 pkgver=1.4
-pkgrel=4
+pkgrel=5
 pkgdesc="Displays battery information in the OSD style"
 arch=('i686' 'x86_64')
-url="http://osdbattery.sourceforge.net"
+url="http://osdbattery.sourceforge.net/"
 license=('GPL2')
 depends=('xosd')
-install=osdbattery.install
-source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}_${pkgver}.tar.gz"
-        'showbatt')
-md5sums=('43f9cc0428b6cb25baf1e6e2286e88b1'
-         'a786cd645135a369c8ed55b837174c92')
+makedepends=('patch')
+install=$pkgname.install
+source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}_${pkgver}.tar.gz
+        sysfs.patch::"http://sourceforge.net/tracker/download.php?group_id=120528&atid=687314&file_id=429967&aid=3450277"
+        showbatt)
+sha256sums=('b1f775c746cd78b6aa7fc9ee75ecf2806ef3da93a42dd806c0414dcae55aed9f'
+            'd7a00e918929d36aaf3eb398649ea070ed6c4840e3da2407226fc5d9ae15d776'
+            '69969053235642315b49fe6ea5df7f8c391befbf492fd4ff71afbf4d438333b2')
 
 build() {
-  cd "${srcdir}/${pkgname}_${pkgver}"
+  cd ${srcdir}/${pkgname}_${pkgver}
+  
+  patch -i ${srcdir}/sysfs.patch
 
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}_${pkgver}"
+  cd ${srcdir}/${pkgname}_${pkgver}
 
-  install -D -m755 $pkgname "${pkgdir}/usr/bin/${pkgname}"
-  install -D -m755 ${srcdir}/showbatt "${pkgdir}/usr/bin/showbatt"
-  install -D -m644 $pkgname.cfg "${pkgdir}/etc/${pkgname}/${pkgname}.cfg"
+  install -D -m755 $pkgname ${pkgdir}/usr/bin/${pkgname}
+  install -D -m755 ${srcdir}/showbatt ${pkgdir}/usr/bin/showbatt
+  install -D -m644 $pkgname.cfg ${pkgdir}/etc/${pkgname}/${pkgname}.cfg
 }
diff --git a/community/parrot/PKGBUILD b/community/parrot/PKGBUILD
index d0c7dc3b2..72e283e60 100644
--- a/community/parrot/PKGBUILD
+++ b/community/parrot/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 74176 2012-07-22 18:32:23Z spupykin $
+# $Id: PKGBUILD 76937 2012-10-02 14:00:19Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: mpie <michael.kyne-phillips1@ntlworld.com>
 
 pkgname=parrot
-pkgver=4.6.0
-_rel=stable
-#_rel=devel
+pkgver=4.8.0
+#_rel=stable
+_rel=devel
 pkgrel=1
 pkgdesc="Standalone VM that can execute bytecode compiled dynamic languages"
 arch=('x86_64' 'i686')
@@ -16,7 +16,7 @@ makedepends=('perl-json')
 optdepends=('freeglut')
 options=('!makeflags')
 source=(ftp://ftp.parrot.org/pub/parrot/releases/$_rel/$pkgver/$pkgname-$pkgver.tar.bz2)
-md5sums=('2acdf1855baf04f07bac6d6e307dcd0d')
+md5sums=('c00ed8867dcf69255452a2e1267906ec')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/viking/PKGBUILD b/community/viking/PKGBUILD
index 76f27bb29..e9f8b27f5 100644
--- a/community/viking/PKGBUILD
+++ b/community/viking/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 70959 2012-05-20 19:00:08Z jlichtblau $
+# $Id: PKGBUILD 76965 2012-10-02 17:50:42Z jlichtblau $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Nick Østergaard <oe.nick@gmail.com>
 # Contributor: Jonny Gerold <jonny@fsk141.com>
 
 pkgname=viking
-pkgver=1.3
-pkgrel=2
+pkgver=1.3.2.1
+pkgrel=1
 pkgdesc="GTK+2 application to manage GPS data"
 arch=('i686' 'x86_64')
 url="http://viking.sourceforge.net/"
@@ -16,7 +16,7 @@ options=('!emptydirs')
 install=$pkgname.install
 changelog=$pkgname.changelog
 source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz)
-sha256sums=('54dc43b0136722118b8402d51ac8d78180ad59cc37e37ddf3fb6a7ee6bf04fdf')
+sha256sums=('ebd6f134a340a1b2ba582ea77bd97ddd9db16b476be7090a12649f6069fa1565')
 
 build() {
   cd ${srcdir}/$pkgname-$pkgver
diff --git a/community/viking/viking.changelog b/community/viking/viking.changelog
index d9333735f..3fc494db1 100644
--- a/community/viking/viking.changelog
+++ b/community/viking/viking.changelog
@@ -1,3 +1,6 @@
+2012-10-02 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* viking 1.3.2.1-1
+
 2012-05-05 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 	* viking 1.3.0-1