Fri Apr 20 03:43:51 UTC 2012

4 files changed, 100 insertions, 14 deletions

diff --git a/artistic/yafaray-git/PKGBUILD b/artistic/yafaray-git/PKGBUILD
new file mode 100644
index 000000000..0c5d4f6e4
--- /dev/null
+++ b/artistic/yafaray-git/PKGBUILD
@@ -0,0 +1,78 @@
+# Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
+# Maintainer (Parabola): Márcio Silva <coadde@adinet.com.uy>
+pkgname=yafaray-git
+_blendver=2.62
+pkgver=20120420
+pkgrel=1
+pkgdesc="A libre software raytracing engine"
+arch=('i686' 'x86_64')
+url="http://www.yafaray.org/"
+license=('LGPL2.1')
+depends=('libxml2' 'openexr' 'libjpeg')
+optdepends=('qt: QT GUI' 'python: Python bindings, Blender exporter')
+makedepends=('cmake' 'git' 'qt' 'swig' 'python')
+provides=('yafaray')
+conflicts=('yafaray')
+source=('gcc47.patch')
+md5sums=('d99eb7db30885549687a8f7a775a582d')
+
+_gitroot=git://github.com/YafaRay/Core.git
+_gitname=yafaray
+_gitrootexport=git://github.com/YafaRay/Blender-2.5-Exporter.git
+_gitnameexport=exporter
+
+build() {
+  cd "$srcdir"
+  msg "Connecting to GIT server...."
+
+  # core
+  if [[ -d "$_gitname" ]]; then
+    cd "$_gitname" && git pull origin
+    cd ..
+    msg "The local files are updated."
+  else
+    git clone "$_gitroot" "$_gitname"
+  fi
+  # exporter
+  if [[ -d "$_gitnameexport" ]]; then
+    cd "$_gitnameexport" && git pull origin
+    cd ..
+    msg "The local files are updated."
+  else
+    git clone "$_gitrootexport" "$_gitnameexport"
+  fi
+
+  msg "GIT checkout done or server timeout"
+  msg "Starting build..."
+
+  if [ -e "$srcdir"/$_gitname-build ]; then
+      rm -rf "$srcdir"/$_gitname-build
+  fi
+  mkdir "$srcdir/$_gitname-build"
+
+  patch -Np0 -i "$srcdir/gcc47.patch"
+
+  cd "$srcdir/$_gitname-build"
+
+  cmake -DCMAKE_INSTALL_PREFIX=/usr \
+    -DYAF_PY_VERSION=3.2 \
+    -DYAF_BINDINGS_PY_DIR=/usr/lib/python3.2 \
+    "../$_gitname"
+  make
+}
+
+package() {
+  cd "$srcdir/$_gitname-build"
+  make DESTDIR="$pkgdir/" install
+
+  # install exporter
+  cd "$srcdir/$_gitnameexport"
+  git checkout-index -a -f --prefix="$pkgdir/usr/share/blender/$_blendver/scripts/addons/yafaray/"
+  # create symlinks to make exporter fully work
+  install -d -m755 "$pkgdir/usr/share/blender/$_blendver/scripts/addons/yafaray/bin"
+  ln -sf "/usr/lib/libyafaraycore.so" "$pkgdir/usr/share/blender/$_blendver/scripts/addons/yafaray/bin/libyafaraycore.so"
+  ln -sf "/usr/lib/libyafarayplugin.so" "$pkgdir/usr/share/blender/$_blendver/scripts/addons/yafaray/bin/libyafarayplugin.so"
+  ln -sf "/usr/lib/yafaray" "$pkgdir/usr/share/blender/$_blendver/scripts/addons/yafaray/bin/plugins"
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/artistic/yafaray-git/gcc47.patch b/artistic/yafaray-git/gcc47.patch
new file mode 100644
index 000000000..75775498b
--- /dev/null
+++ b/artistic/yafaray-git/gcc47.patch
@@ -0,0 +1,10 @@
+--- yafaray.orig/src/yafraycore/scene.cc	2012-04-18 00:03:16.508415920 -0300
++++ yafaray/src/yafraycore/scene.cc		2012-04-18 00:29:59.090117108 -0300
+@@ -39,6 +39,7 @@
+ #include <iostream>
+ #include <limits>
+ #include <sstream>
++#include <unistd.h>
+ 
+ __BEGIN_YAFRAY
+ 
diff --git a/kernels/linux-libre-rt/PKGBUILD b/kernels/linux-libre-rt/PKGBUILD
index 36287b9fb..c97763c2a 100644
--- a/kernels/linux-libre-rt/PKGBUILD
+++ b/kernels/linux-libre-rt/PKGBUILD
@@ -13,8 +13,8 @@ pkgname=('linux-libre-rt' 'linux-libre-rt-headers') # Build stock -LIBRE kernel
 # pkgname=linux-custom       # Build kernel with a different name
 _kernelname=-LIBRE-RT
 _basekernel=3.2
-_releasever=12
-_rtpatchver=rt22
+_releasever=15
+_rtpatchver=rt26
 _pkgver=${_basekernel}.${_releasever}
 pkgver=${_basekernel}.${_releasever}_${_rtpatchver}
 pkgrel=1
@@ -25,7 +25,7 @@ makedepends=('xmlto' 'docbook-xsl')
 options=('!strip')
 source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gnu/linux-libre-${_basekernel}-gnu.tar.xz"
         "http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgver}-gnu/patch-${_basekernel}-gnu-${_pkgver}-gnu.xz"
-        "http://www.kernel.org/pub/linux/kernel/projects/rt/3.2/patch-${_pkgver}-${_rtpatchver}.patch.xz"
+        "http://repo.parabolagnulinux.org/other/patch-${_pkgver}-${_rtpatchver}.patch.xz"
         # the main kernel config files
         'config.i686' 'config.x86_64'
         # standard config files for mkinitcpio ramdisk
@@ -33,18 +33,16 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
         'boot-logo.patch'
         'change-default-console-loglevel.patch'
         'i915-fix-ghost-tv-output.patch'
-        'i915-gpu-finish.patch'
         'ext4-options.patch')
 md5sums=('65c669b6e4888db84a80882461851867'
-         'd1d6c566dbc5b9fe6983eb6cab8fa00a'
-         'd530078f8e59eda4de457041687db952'
+         '7dcae363be46096d15d3bb9456991048'
+         '0aa7c5d90e4e01e7775a1a030c24ca56'
          '6141ab0cb60a5cf9e6ee3bdf8c8c79b1'
          'c2f3423d7c7d8e5776e961b75a52a3fc'
          '0d001b0277f318bc40a263aaa980d44e'
          '04b21c79df0a952c22d681dd4f4562df'
 	 '9d3c56a4b999c8bfbd4018089a62f662'
          '263725f20c0b9eb9c353040792d644e5'
-         '4cd79aa147825837dc8bc9f6b736c0a0'
          'c8299cf750a84e12d60b372c8ca7e1e8')
 
 build() {
@@ -60,10 +58,6 @@ build() {
   # Add freedo as boot logo
   patch -Np1 -i "${srcdir}/boot-logo.patch"
 
-  # fix FS#27883
-  # drm/i915: Only clear the GPU domains upon a successful finish
-  patch -Np1 -i "${srcdir}/i915-gpu-finish.patch"
-
   # Some chips detect a ghost TV output
   # mailing list discussion: http://lists.freedesktop.org/archives/intel-gfx/2011-April/010371.html
   # Arch Linux bug report: FS#19234
diff --git a/kernels/linux-libre-rt/linux-libre-rt.install b/kernels/linux-libre-rt/linux-libre-rt.install
index 410e69aa0..a5a37437c 100644
--- a/kernels/linux-libre-rt/linux-libre-rt.install
+++ b/kernels/linux-libre-rt/linux-libre-rt.install
@@ -2,7 +2,7 @@
 # arg 2:  the old package version
 
 KERNEL_NAME=-rt
-KERNEL_VERSION=3.2.12-1-LIBRE-RT
+KERNEL_VERSION=3.2.15-1-LIBRE-RT
 
 post_install () {
   # updating module dependencies
@@ -44,8 +44,12 @@ post_upgrade() {
     echo ">>>"
   fi
 
-  if findmnt --fstab -uno SOURCE /boot &>/dev/null && ! mountpoint -q /boot; then
-    echo "WARNING: /boot appears to be a separate partition but is not mounted."
+  if grep "^[^#]*[[:space:]]/boot" etc/fstab 2>&1 >/dev/null; then
+    if ! grep "[[:space:]]/boot" etc/mtab 2>&1 >/dev/null; then
+      echo "WARNING: /boot appears to be a seperate partition but is not mounted"
+      echo "         This is most likely not what you want.  Please mount your /boot"
+      echo "         partition and reinstall the kernel unless you are sure this is OK"
+    fi
   fi
 
   # updating module dependencies