summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCecil <knoppmyth@gmail.com>2011-01-04 01:59:10 (GMT)
committerCecil <knoppmyth@gmail.com>2011-01-04 01:59:10 (GMT)
commit1f1215442f445f58b67083d80bd8a40060eb9fa7 (patch)
treed55aa38215790bece50af78cc60bb867739372c7
parenta4aacb8385185ffcc0fa33ee7d9b752821b1e0c6 (diff)
parent2cae18b3f848454632c564386a2055d26373f42c (diff)
downloadlinhes_pkgbuild-1f1215442f445f58b67083d80bd8a40060eb9fa7.zip
linhes_pkgbuild-1f1215442f445f58b67083d80bd8a40060eb9fa7.tar.gz
linhes_pkgbuild-1f1215442f445f58b67083d80bd8a40060eb9fa7.tar.bz2
Merge branch 'testing' of ssh://cesman@linhes.org/mount/repository/linhes_pkgbuild into testing
Conflicts: abs/extra/glew/PKGBUILD
-rw-r--r--abs/core/mesa-demos/LICENSE (renamed from abs/extra/mesa-demos/LICENSE)1
-rw-r--r--abs/core/mesa-demos/PKGBUILD (renamed from abs/extra/mesa-demos/PKGBUILD)13
-rw-r--r--abs/extra/glew/PKGBUILD28
3 files changed, 8 insertions, 34 deletions
diff --git a/abs/extra/mesa-demos/LICENSE b/abs/core/mesa-demos/LICENSE
index ae33d27..26a04af 100644
--- a/abs/extra/mesa-demos/LICENSE
+++ b/abs/core/mesa-demos/LICENSE
@@ -80,3 +80,4 @@ X demos progs/xdemos/ Brian Paul see source files
SGI demos progs/samples/ SGI SGI copyright
RedBook demos progs/redbook/ SGI SGI copyright
+
diff --git a/abs/extra/mesa-demos/PKGBUILD b/abs/core/mesa-demos/PKGBUILD
index 8fabad0..2f71ce6 100644
--- a/abs/extra/mesa-demos/PKGBUILD
+++ b/abs/core/mesa-demos/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 94667 2010-10-09 11:21:35Z andyrtr $
+# $Id$
# Maintainer: Jan de Groot <jgc@archlinux.org>
# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-pkgname=('mesa-demos')
+pkgname=mesa-demos
pkgver=8.0.1
-pkgrel=1
-arch=(i686 x86_64)
+pkgrel=2
+arch=('i686' 'x86_64')
pkgdesc="Mesa demos and tools"
url="http://mesa3d.sourceforge.net"
license=('custom')
@@ -13,8 +13,6 @@ depends=('glew>=1.5.6')
conflicts=('mesa<7.9')
source=(ftp://ftp.freedesktop.org/pub/mesa/demos/${pkgver}/mesa-demos-${pkgver}.tar.bz2
LICENSE)
-md5sums=('320c2a4b6edc6faba35d9cb1e2a30bf4'
- '5c65a0fe315dd347e09b1f2826a1df5a')
build() {
cd "${srcdir}/mesa-demos-${pkgver}"
@@ -28,3 +26,6 @@ package() {
install -m755 -d "${pkgdir}/usr/share/licenses/mesa-demos"
install -m755 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa-demos/"
}
+
+md5sums=('320c2a4b6edc6faba35d9cb1e2a30bf4'
+ '10a9d94c27477a9f9afed27f7d1c4476')
diff --git a/abs/extra/glew/PKGBUILD b/abs/extra/glew/PKGBUILD
deleted file mode 100644
index 291abce..0000000
--- a/abs/extra/glew/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 98297 2010-11-06 17:51:38Z stephane $
-# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
-# Contributor: SleepyDog
-
-pkgname=glew
-pkgver=1.5.7
-pkgrel=1
-pkgdesc="The OpenGL Extension Wrangler Library"
-arch=('i686' 'x86_64')
-url="http://glew.sourceforge.net"
-license=('BSD' 'MIT' 'GPL')
-depends=('libxmu' 'libxi' 'mesa')
-source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tgz)
-sha1sums=('4adc816afbfb65a4969484d10343a88c117ca989')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- sed -i 's|lib64|lib|' config/Makefile.linux
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make GLEW_DEST="${pkgdir}/usr" install
- install -D -m644 LICENSE.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
-
-# vim: set noexpandtab tabstop=8 shiftwidth=8 textwidth=132 autoindent