Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/bitcoin/PKGBUILD
	community/ecryptfs-utils/PKGBUILD
	community/erlang/PKGBUILD
	community/esmtp/PKGBUILD
	community/gmic/PKGBUILD
	community/ibus-sunpinyin/PKGBUILD
	community/libev/PKGBUILD
	community/libmirage/PKGBUILD
	community/libraw/PKGBUILD
	community/lilypond/PKGBUILD
	community/luajit/PKGBUILD
	community/matchbox-window-manager/PKGBUILD
	community/miniupnpc/PKGBUILD
	community/mplayer2/PKGBUILD
	community/mumble/PKGBUILD
	community/oss/PKGBUILD
	community/pidgin-lwqq/PKGBUILD
	community/postgis/PKGBUILD
	community/python2-pytables/PKGBUILD
	community/qmc2/PKGBUILD
	community/qtfm/PKGBUILD
	community/ruby-gtk3/PKGBUILD
	community/tea/PKGBUILD
	community/yacpi/PKGBUILD
	core/bridge-utils/PKGBUILD
	core/gcc/PKGBUILD
	core/libsasl/PKGBUILD
	core/lvm2/PKGBUILD
	core/net-tools/PKGBUILD
	core/ppp/PKGBUILD
	core/pptpclient/PKGBUILD
	core/sdparm/PKGBUILD
	core/systemd/PKGBUILD
	core/sysvinit-tools/PKGBUILD
	extra/aisleriot/PKGBUILD
	extra/arora/PKGBUILD
	extra/bluez-hcidump/PKGBUILD
	extra/bluez/PKGBUILD
	extra/cups/PKGBUILD
	extra/cyrus-sasl/PKGBUILD
	extra/dhcp/PKGBUILD
	extra/gnome-bluetooth/PKGBUILD
	extra/gnome-desktop/PKGBUILD
	extra/gnutls/PKGBUILD
	extra/gts/PKGBUILD
	extra/guile/PKGBUILD
	extra/harfbuzz/PKGBUILD
	extra/iptraf-ng/PKGBUILD
	extra/json-c/PKGBUILD
	extra/kdenetwork/PKGBUILD
	extra/kdepim/PKGBUILD
	extra/kdesdk-kate/PKGBUILD
	extra/libatasmart/PKGBUILD
	extra/libbsd/PKGBUILD
	extra/libdmtx/PKGBUILD
	extra/libhangul/PKGBUILD
	extra/libindi/PKGBUILD
	extra/libpeas/PKGBUILD
	extra/libsmbios/PKGBUILD
	extra/libspiro/PKGBUILD
	extra/libsrtp/PKGBUILD
	extra/libxml2/PKGBUILD
	extra/libxrender/PKGBUILD
	extra/libxvmc/PKGBUILD
	extra/llvm/PKGBUILD
	extra/maxima/PKGBUILD
	extra/msmtp/PKGBUILD
	extra/ortp/PKGBUILD
	extra/perl-dbd-sqlite/PKGBUILD
	extra/perl-yaml-syck/PKGBUILD
	extra/php/PKGBUILD
	extra/pm-utils/PKGBUILD
	extra/pulseaudio/PKGBUILD
	extra/pyqt4/PKGBUILD
	extra/scim-anthy/PKGBUILD
	extra/scim-chewing/PKGBUILD
	extra/scim-m17n/PKGBUILD
	extra/scim/PKGBUILD
	extra/ssmtp/PKGBUILD
	extra/texmacs/PKGBUILD
	extra/v86d/PKGBUILD
	extra/vlc/PKGBUILD
	extra/webkitgtk/PKGBUILD
	extra/webkitgtk2/PKGBUILD
	extra/wireshark/PKGBUILD
	extra/zsh/PKGBUILD
	libre/bogofilter-libre/PKGBUILD
	libre/ecasound-libre/PKGBUILD
	libre/libretools/libretools.install
	libre/mc-libre/PKGBUILD

1 files changed, 17 insertions, 19 deletions

diff --git a/community/glfw/PKGBUILD b/community/glfw/PKGBUILD
index 1990e63b0..847ef3031 100644
--- a/community/glfw/PKGBUILD
+++ b/community/glfw/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 87832 2013-04-07 21:39:10Z svenstaro $
+# $Id: PKGBUILD 92771 2013-06-15 00:51:49Z svenstaro $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: philefou <tuxication AT gmail DOT com>
 # Contributor: lindquist <tomas@famolsen.dk>
@@ -7,37 +7,35 @@
 # Contributor: SpepS <dreamspepser at yahoo dot it>
 
 pkgname=glfw
-pkgver=2.7.8
+pkgver=3.0
 pkgrel=1
 pkgdesc="A free, open source, portable framework for OpenGL application development"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.glfw.org/"
 license=('custom:ZLIB')
-depends=('libgl' 'libxrandr' 'glu')
-makedepends=('mesa')
-source=("http://switch.dl.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2")
-md5sums=('a2e1b13e46a7c637a7760c94b72896cd')
+depends=('libgl' 'libxrandr' 'glu' 'xorg-xinput')
+makedepends=('mesa' 'cmake' 'doxygen')
+source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2")
+md5sums=('415aef32d70af0cc829148c1cc7b1357')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  export LFLAGS+="-lrt"
-  make x11
+  [[ -d build ]] && rm -r build
+  mkdir build && cd build
+
+  cmake .. \
+      -DCMAKE_INSTALL_PREFIX=/usr \
+      -DBUILD_SHARED_LIBS=ON
+  make
 }
 
 package() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  make PREFIX="$pkgdir/usr" x11-dist-install
-
-  # license
-  install -Dm644 COPYING.txt \
-    "$pkgdir/usr/share/licenses/$pkgname/COPYING"
-
-  # docs
-  install -d "$pkgdir/usr/share/doc/$pkgname"
-  install -Dm644 docs/*.pdf "$pkgdir/usr/share/doc/$pkgname"
+  cd build
+  make DESTDIR=$pkgdir install
 
-  # fix pc file prefix path
-  sed -i "s|$pkgdir||g" "$pkgdir/usr/lib/pkgconfig/lib$pkgname.pc"
+  cd ..
+  install -Dm644 COPYING.txt "$pkgdir/usr/share/licenses/$pkgname/COPYING"
 }