Wed Jan 15 03:43:12 UTC 2014

4 files changed, 65 insertions, 51 deletions

diff --git a/libre/liferea-libre/PKGBUILD b/libre/liferea-libre/PKGBUILD
index 63d195ff0..313e81327 100644
--- a/libre/liferea-libre/PKGBUILD
+++ b/libre/liferea-libre/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 196228 2013-10-08 23:20:06Z eric $
+# $Id: PKGBUILD 203676 2014-01-14 01:46:42Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 # Contributor (Parabola): bitlord
 # Contributor (Parabola): André Silva <emulatorman@parabola.nu>
 
 _pkgname=liferea
 pkgname=liferea-libre
-pkgver=1.10.3
+pkgver=1.10.4
 pkgrel=1
 pkgdesc="A desktop news aggregator for online news feeds and weblogs, without nonfree suggestions"
 arch=('i686' 'x86_64')
@@ -22,11 +22,11 @@ optdepends=('gnome-keyring: for keyring plugin support'
 	    'gst-plugins-base: for media player plugin support'
 	    'gst-plugins-good: for media player plugin support'
 	    'gst-plugins-bad-libre: for media player plugin support')
-options=('!libtool' '!emptydirs')
+options=('!emptydirs')
 install=liferea.install
 source=(http://downloads.sourceforge.net/sourceforge/liferea/liferea-${pkgver}.tar.bz2
         remove-non-free-suggestions.patch)
-sha1sums=('70ea247cd84274cd6a144f63772d97af4e6b5ebb'
+sha1sums=('7ee44bff223cd3112c54399de04e9fa750ac3f6a'
           '855de60c91b5fee71c7ec88dd04b7d24a02dc0d1')
 
 build() {
diff --git a/libre/mesa-libcl/PKGBUILD b/libre/mesa-libcl/PKGBUILD
index d97f31df7..88c817dcd 100644
--- a/libre/mesa-libcl/PKGBUILD
+++ b/libre/mesa-libcl/PKGBUILD
@@ -4,8 +4,8 @@ pkgbase=mesa
 _pkgname=libcl
 pkgname=$pkgbase-$_pkgname
 _pkgflag=libre
-pkgver=10.0.1
-pkgrel=2
+pkgver=10.0.2
+pkgrel=1
 pkgdesc='Mesa 3-D OpenCL library'
 url=http://${pkgbase}3d.sourceforge.net
 license=(MIT Khronos LGPL)
@@ -26,21 +26,8 @@ makedepends=(
 provides=($_pkgname-$_pkgflag $_pkgname opencl-nvidia opencl-nvidia-304xx)
 conflicts=($_pkgname-$_pkgflag $_pkgname opencl-nvidia opencl-nvidia-304xx)
 replaces=($_pkgname-$_pkgflag $_pkgname opencl-nvidia opencl-nvidia-304xx)
-source=(
-  ftp://ftp.freedesktop.org/pub/$pkgbase/${pkgver%.0}/${pkgbase^}Lib-$pkgver.tar.bz2
-  revert.remove.GLXContextID.typedef.patch
-)
-sha512sums=(
-  7abdc38cb5b8b09bd586e6045b1d67cb809951f467d67a95e866d49b972c0c56d6a5b8612c411580bf59759a7ce49992eaf4dcc1c16aa1d67513f16b869bdfc1
-  a2a92d997e1615548371ef618daf47011c7fc71d51d31dbdf47a54d56e078f98af624bde5cd7779c3d8ffb60f3b64aa8ebb5d6363cad261e52605926b47d7a35
-)
-
-prepare() {
-  cd $srcdir/${pkgbase^}-$pkgver
-
-  # Cherry picked from mesa branch 10.0, this fix wxgtk rebuild (FS#38392)
-  patch -Np1 -i ../revert.remove.GLXContextID.typedef.patch
-}
+source=ftp://ftp.freedesktop.org/pub/$pkgbase/${pkgver%.0}/${pkgbase^}Lib-$pkgver.tar.bz2
+sha512sums=15741b916e6338645a28961fb7a731f8c2a33afe11e91c0bd144f9d9afca96837c9caf7fb2fd769aedbeba2b8b12443e7a7eb8ab6cd2270024308ca11e88ff24
 
 build() {
   cd $srcdir/${pkgbase^}-$pkgver
diff --git a/libre/mesa-libcl/revert.remove.GLXContextID.typedef.patch b/libre/mesa-libcl/revert.remove.GLXContextID.typedef.patch
deleted file mode 100644
index 92232dd2d..000000000
--- a/libre/mesa-libcl/revert.remove.GLXContextID.typedef.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 347f1493320e1bc2194c70d4d66bfe2b5883bf1e Mon Sep 17 00:00:00 2001
-From: Kenneth Graunke <kenneth@whitecape.org>
-Date: Mon, 30 Dec 2013 07:19:36 +0000
-Subject: Revert "mesa: Remove GLXContextID typedef from glx.h."
-
-This reverts commit 136a12ac98868d82c2ae9fcc80d11044a7ec56d1.
-
-According to belak51 on IRC, this commit broke Allegro, which would no
-longer compile.  Applications apparently expect the GLXContextID typedef
-to exist in glx.h; removing it breaks them.  A bit of searching around
-the internet revealed other complaints since upgrading to Mesa 10.
-
-Cc: "10.0" <mesa-stable@lists.freedesktop.org>
-(cherry picked from commit f425d56ba41382be04366d011536ee78a03a2f33)
----
-diff --git a/include/GL/glx.h b/include/GL/glx.h
-index 62d0ede..234abc0 100644
---- a/include/GL/glx.h
-+++ b/include/GL/glx.h
-@@ -168,6 +168,7 @@ typedef XID GLXDrawable;
- /* GLX 1.3 and later */
- typedef struct __GLXFBConfigRec *GLXFBConfig;
- typedef XID GLXFBConfigID;
-+typedef XID GLXContextID;
- typedef XID GLXWindow;
- typedef XID GLXPbuffer;
- 
---
-cgit v0.9.0.2-2-gbebe
-
diff --git a/libre/pcsx2-libre/PKGBUILD b/libre/pcsx2-libre/PKGBUILD
new file mode 100644
index 000000000..9331100aa
--- /dev/null
+++ b/libre/pcsx2-libre/PKGBUILD
@@ -0,0 +1,57 @@
+# $Id: PKGBUILD 103474 2014-01-06 14:09:29Z alucryd $
+# Maintainer: Maxime Gauduin <alucryd@gmail.com>
+# Contributor: josephgbr <rafael.f.f1@gmail.com>
+# Contributor: vEX <vex@niechift.com>
+
+_pkgname=pcsx2
+pkgname=$_pkgname-libre
+pkgver=1.1.0.r5797
+pkgrel=1
+pkgdesc='A Sony PlayStation 2 emulator, without nonfree nvidia-cg-toolkit support'
+arch=('i686' 'x86_64')
+url='http://www.pcsx2.net'
+license=('GPL')
+makedepends=('cmake' 'sparsehash' 'svn')
+if [[ $CARCH == "i686" ]]; then
+  depends=('glew' 'libaio' 'libcanberra' 'libjpeg-turbo' 'portaudio' 'sdl2' 'soundtouch' 'wxgtk2.8')
+elif [[ $CARCH == "x86_64" ]]; then
+  makedepends+=('gcc-multilib' 'lib32-glew' 'lib32-libaio' 'lib32-libcanberra' 'lib32-libjpeg-turbo' 'lib32-mesa-libgl' 'lib32-portaudio' 'lib32-sdl2' 'lib32-soundtouch' 'lib32-wxgtk2.8')
+fi
+provides=("$_pkgname=$pkgver")
+conflicts=("$_pkgname")
+replaces=("$_pkgname")
+options=('!emptydirs')
+source=("${_pkgname}::svn+http://pcsx2.googlecode.com/svn/trunk/#revision=${pkgver#*r}")
+sha256sums=('SKIP')
+
+build() {
+  cd ${_pkgname}
+
+  if [[ -d build ]]; then
+    rm -rf build
+  fi
+  mkdir build && cd build
+
+  if [[ $CARCH == "i686" ]]; then
+    cmake .. -DCMAKE_INSTALL_PREFIX='/usr' -DCMAKE_BUILD_TYPE='Release' -D{GLSL_API,PACKAGE_MODE,REBUILD_SHADER,SDL2_API,XDG_STD}=TRUE -DPLUGIN_DIR='/usr/lib/pcsx2' -DGAMEINDEX_DIR='/usr/share/pcsx2' -DwxWidgets_CONFIG_EXECUTABLE='/usr/bin/wx-config-2.8' -DwxWidgets_wxrc_EXECUTABLE='/usr/bin/wxrc-2.8'
+  elif [[ $CARCH == "x86_64" ]]; then
+    export CC='gcc -m32'
+    export CXX='g++ -m32'
+    export PKG_CONFIG_PATH='/usr/lib32/pkgconfig'
+    cmake .. -DCMAKE_INSTALL_PREFIX='/usr' -DCMAKE_BUILD_TYPE='Release' -D{GLSL_API,PACKAGE_MODE,REBUILD_SHADER,SDL2_API,XDG_STD}=TRUE -DPLUGIN_DIR='/usr/lib32/pcsx2' -DGAMEINDEX_DIR='/usr/share/pcsx2' -DwxWidgets_CONFIG_EXECUTABLE='/usr/bin/wx-config32-2.8' -DwxWidgets_wxrc_EXECUTABLE='/usr/bin/wxrc32-2.8' -DCMAKE_LIBRARY_PATH='/usr/lib32'
+  fi
+
+  make
+}
+
+package() {
+  cd ${_pkgname}/build
+
+  if [[ $CARCH == "x86_64" ]]; then
+    depends=('lib32-glew' 'lib32-libaio' 'lib32-libcanberra' 'lib32-libjpeg-turbo' 'lib32-portaudio' 'lib32-sdl2' 'lib32-soundtouch' 'lib32-wxgtk2.8')
+  fi
+
+  make DESTDIR="${pkgdir}" install
+}
+
+# vim: ts=2 sw=2 et: