Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	community-staging/motion/PKGBUILD
	community-testing/tor/PKGBUILD
	community/icecast/PKGBUILD
	libre/hplip-libre/PKGBUILD
	libre/virtualbox-modules/PKGBUILD

3 files changed, 74 insertions, 4 deletions

diff --git a/~lukeshu/freeglut26/2.6.0-GFX_radeon.patch b/~lukeshu/freeglut26/2.6.0-GFX_radeon.patch
new file mode 100644
index 000000000..8806fe849
--- /dev/null
+++ b/~lukeshu/freeglut26/2.6.0-GFX_radeon.patch
@@ -0,0 +1,28 @@
+Index: src/freeglut_window.c
+===================================================================
+--- src/freeglut_window.c	(Revision 832)
++++ src/freeglut_window.c	(Arbeitskopie)
+@@ -594,10 +594,9 @@
+ #if TARGET_HOST_POSIX_X11
+     if ( window )
+     {
+-        glXMakeContextCurrent(
++        glXMakeCurrent(
+             fgDisplay.Display,
+             window->Window.Handle,
+-            window->Window.Handle,
+             window->Window.Context
+         );
+ 
+@@ -932,10 +932,9 @@
+     XSetWMProtocols( fgDisplay.Display, window->Window.Handle,
+                      &fgDisplay.DeleteWindow, 1 );
+ 
+-    glXMakeContextCurrent(
++    glXMakeCurrent(
+         fgDisplay.Display,
+         window->Window.Handle,
+-        window->Window.Handle,
+         window->Window.Context
+     );
+ 
diff --git a/~lukeshu/freeglut26/PKGBUILD b/~lukeshu/freeglut26/PKGBUILD
new file mode 100644
index 000000000..5245eca9d
--- /dev/null
+++ b/~lukeshu/freeglut26/PKGBUILD
@@ -0,0 +1,42 @@
+# Maintainer (Parabola): Luke Shumaker <lukeshu@sbcglobal.net>
+# Maintainer (Arch): Eric Belanger <eric@archlinux.org>
+# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
+
+_pkgname=freeglut
+pkgname=freeglut26
+pkgver=2.6.0
+pkgrel=1
+
+provides=("$_pkgname=$pkgver")
+conflicts=("$_pkgname")
+
+pkgdesc="Provides functionality for small OpenGL programs"
+arch=('i686' 'x86_64')
+url="http://freeglut.sourceforge.net/"
+license=('MIT')
+depends=('libxxf86vm' 'mesa' 'libxi')
+replaces=('glut')
+provides=('glut')
+conflicts=('glut')
+options=('!libtool')
+source=(http://downloads.sourceforge.net/freeglut/${_pkgname}-${pkgver}.tar.gz \
+        2.6.0-GFX_radeon.patch)
+md5sums=('39f0f2de89f399529d2b981188082218' '6d0a018fe4f0bc9ace2b244ca59514d3')
+sha1sums=('68306c4486c13d005a4e4d54035e0c0b1bdc220b' '2e392c7d0b60016ec89e6a5edf504f5722351b95')
+
+build() {
+  cd "${srcdir}/${_pkgname}-${pkgver}"
+  # fixes an issue with the radeon[hd] ATI opensource drivers
+  # ref: http://bugs.gentoo.org/show_bug.cgi?id=295163
+  patch -p0 -i "${srcdir}/2.6.0-GFX_radeon.patch"
+
+  ./autogen.sh
+  ./configure --prefix=/usr --disable-static
+  make all
+}
+
+package() {
+  cd "${srcdir}/${_pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+  install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${_pkgname}/LICENSE"
+}
diff --git a/~lukeshu/make-graph/PKGBUILD b/~lukeshu/make-graph/PKGBUILD
index f7f7cd0b1..0d9320f69 100644
--- a/~lukeshu/make-graph/PKGBUILD
+++ b/~lukeshu/make-graph/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 138004 2011-09-14 05:05:12Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
+# Maintainer (Parabola): Luke Shumaker <lukeshu@sbcglobal.net>
+# Maintainer (Arch): Allan McRae <allan@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 
 _pkgname=make
 pkgname=$_pkgname-graph
 pkgver=3.82
-pkgrel=4.1
+pkgrel=4.2
 provides=("$_pkgname=$pkgver")
 conflicts=("$_pkgname")
 pkgdesc="GNU make utility to maintain groups of programs, with patch to dump a Graphviz dependency graph."
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/make"
 license=('GPL3')
-groups=('base-devel')
+#groups=('base-devel')
 depends=('glibc' 'sh')
 install=$_pkgname.install
 source=(ftp://ftp.gnu.org/gnu/${_pkgname}/${_pkgname}-${pkgver}.tar.bz2