Merge branch 'master' of ssh://parabolagnulinux.org:1863/srv/git/abslibre

4 files changed, 22 insertions, 167 deletions

diff --git a/libre/libdrm-libre/PKGBUILD b/libre/libdrm-libre/PKGBUILD
deleted file mode 100644
index 1746710cb..000000000
--- a/libre/libdrm-libre/PKGBUILD
+++ /dev/null
@@ -1,90 +0,0 @@
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
-
-pkgname=libdrm-libre
-pkgver=2.4.39
-pkgrel=1
-pkgdesc='Userspace interface to kernel DRM services, without VMWare Graphics KMS API (vmwgfx)'
-arch=(
-  i686
-  x86_64
-  mips64el
-:)
-license=(
-  MIT
-)
-depends=(
-  libpciaccess
-  )
-makedepends=(
-  cairo
-  valgrind
-)
-options=(
-  !libtool
-)
-url=http://dri.freedesktop.org/
-provides=(
-  ${pkgname%-libre}=$pkgver
-  ${pkgname%-libre}-git
-  $pkgname-git
-)
-conflicts=(
-  ${pkgname%-libre}
-  ${pkgname%-libre}-git
-  $pkgname-git
-  ${pkgname%-libre}-new
-  ${pkgname%-libre}-nouveau
-  ${pkgname%-libre}-old
-)
-replaces=(
-  ${pkgname%-libre}
-  ${pkgname%-libre}-git
-  ${pkgname%-libre}-new
-  ${pkgname%-libre}-nouveau
-)
-
-source=(
-  http://dri.freedesktop.org/${pkgname%-libre}/${pkgname%-libre}-$pkgver.tar.bz2
-  COPYING
-)
-sha512sums=(
-  51b849d501adbf6c9d65847d2e6b41e426137af8cdb1335d19e22939128b7cdae8685c27d750db3aad7b1c43e7bb5a448634491dcd86873ba98293d56320eb1f
-  b0ca349b882a4326b19f81f22804fabdb6fb7aef31cdc7b16b0a7ae191bfbb50c7daddb2fc4e6c33f1136af06d060a273de36f6f3412ea326f16fa4309fda660
-)
-
-build() {
-  cd ${pkgname%-libre}-$pkgver
-
-  sed -i '/PKG_CHECK_MODULES(PTHREADSTUBS, pthread-stubs)/d;/AC_SUBST(PTHREADSTUBS_CFLAGS)/d;/AC_SUBST(PTHREADSTUBS_LIBS)/d' \
-    configure.ac
-  sed -i '/	$(PTHREADSTUBS_CFLAGS) /d;s/ @PTHREADSTUBS_LIBS@//' \
-    exynos/Makefile.am
-  sed -i '/	$(PTHREADSTUBS_CFLAGS) /d;/	@PTHREADSTUBS_LIBS@ /d' \
-    intel/Makefile.am
-  sed -i '/	$(PTHREADSTUBS_CFLAGS) /d;s/ @PTHREADSTUBS_LIBS@//' \
-    nouveau/Makefile.am
-  sed -i '/	$(PTHREADSTUBS_CFLAGS) /d;s/ @PTHREADSTUBS_LIBS@//' \
-    omap/Makefile.am
-  sed -i '/	$(PTHREADSTUBS_CFLAGS) /d;s/ @PTHREADSTUBS_LIBS@//' \
-    radeon/Makefile.am
-
-  #libtoolize --force
-  autoreconf --force --install
-  ./configure --prefix=/usr \
-    --disable-vmwgfx-experimental-api \
-    --enable-udev
-  make V=0
-}
-
-check() {
-cd ${pkgname%-libre}-$pkgver
-  make -k check
-}
-
-package() {
-cd ${pkgname%-libre}-$pkgver
-  make DESTDIR=$pkgdir install
-  install -m755 -d $pkgdir/usr/share/licenses/${pkgname%-libre}
-  install -m644 ../COPYING $pkgdir/usr/share/licenses/${pkgname%-libre}
-}
diff --git a/libre/libdrm-libre/COPYING b/pcr/libdrm-git/COPYING
index 6e74c337c..6e74c337c 100644
--- a/libre/libdrm-libre/COPYING
+++ b/pcr/libdrm-git/COPYING
diff --git a/pcr/libdrm-libre-git/PKGBUILD b/pcr/libdrm-git/PKGBUILD
index 37c7066fc..94b7dca85 100644
--- a/pcr/libdrm-libre-git/PKGBUILD
+++ b/pcr/libdrm-git/PKGBUILD
@@ -1,11 +1,11 @@
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
 
-pkgname=libdrm-libre-git
-pkgver=20120909
+pkgname=libdrm-git
+pkgver=$(LC_ALL=C date -u +%Y%m%d)
 _pkgver=2.4.39
 pkgrel=1
-pkgdesc='Userspace interface to kernel DRM services, without VMWare Graphics KMS API (vmwgfx)'
+pkgdesc='Userspace interface to kernel DRM services'
 arch=(
   i686
   x86_64
@@ -27,25 +27,19 @@ options=(
 )
 url=http://dri.freedesktop.org/
 provides=(
-  ${pkgname%-libre-git}=$_pkgver
-  ${pkgname%-libre-git}-libre=$_pkgver
-  ${pkgname%-libre-git}-git
-  ${pkgname%-libre-git}-nouveau1
+  ${pkgname%-git}=$_pkgver
+  ${pkgname%-git}-nouveau1
 )
 conflicts=(
-  ${pkgname%-libre-git}
-  ${pkgname%-libre-git}-libre
-  ${pkgname%-libre-git}-git
-  ${pkgname%-libre-git}-new
-  ${pkgname%-libre-git}-nouveau
-  ${pkgname%-libre-git}-nouveau1
-  ${pkgname%-libre-git}-old
+  ${pkgname%-git}
+  ${pkgname%-git}-new
+  ${pkgname%-git}-nouveau
+  ${pkgname%-git}-nouveau1
+  ${pkgname%-git}-old
 )
 replaces=(
-  ${pkgname%-libre-git}
-  ${pkgname%-libre-git}-git
-  ${pkgname%-libre-git}-new
-  ${pkgname%-libre-git}-nouveau
+  ${pkgname%-git}-new
+  ${pkgname%-git}-nouveau
 )
 source=(
   COPYING
@@ -88,15 +82,14 @@ build() {
   sed -i '/	$(PTHREADSTUBS_CFLAGS) /d;s/ @PTHREADSTUBS_LIBS@//' \
     radeon/Makefile.am
 
-  ./autogen.sh
-  ./configure --prefix=/usr \
-      --disable-vmwgfx \
-      --enable-exynos-experimental-api \
-      --enable-intel \
-      --enable-nouveau \
-      --enable-omap-experimental-api \
-      --enable-radeon \
-      --enable-udev
+  ./autogen.sh --prefix=/usr \
+    --enable-exynos-experimental-api \
+    --enable-intel \
+    --enable-nouveau \
+    --enable-omap-experimental-api \
+    --enable-radeon \
+    --enable-udev \
+    --enable-vmwgfx
   make V=0
 }
 
@@ -108,6 +101,6 @@ check() {
 package() {
   cd $srcdir/$_gitname-build
   make DESTDIR=$pkgdir install
-  install -m755 -d $pkgdir/usr/share/licenses/${pkgname%-libre-git}
-  install -m644 ../COPYING $pkgdir/usr/share/licenses/${pkgname%-libre-git}
+  install -m755 -d $pkgdir/usr/share/licenses/${pkgname%-git}
+  install -m644 ../COPYING $pkgdir/usr/share/licenses/${pkgname%-git}
 }
diff --git a/pcr/libdrm-libre-git/COPYING b/pcr/libdrm-libre-git/COPYING
deleted file mode 100644
index 6e74c337c..000000000
--- a/pcr/libdrm-libre-git/COPYING
+++ /dev/null
@@ -1,48 +0,0 @@
- Copyright 2005 Adam Jackson.
-
- Permission is hereby granted, free of charge, to any person obtaining
- a copy of this software and associated documentation files (the
- "Software"), to deal in the Software without restriction, including
- without limitation on the rights to use, copy, modify, merge,
- publish, distribute, sub license, and/or sell copies of the Software,
- and to permit persons to whom the Software is furnished to do so,
- subject to the following conditions:
-
- The above copyright notice and this permission notice (including the
- next paragraph) shall be included in all copies or substantial
- portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NON-INFRINGEMENT.  IN NO EVENT SHALL ADAM JACKSON BE LIABLE FOR ANY
- CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-------------------------------------------------------------------------
-
- Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
- Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
- All Rights Reserved.
-
- Permission is hereby granted, free of charge, to any person obtaining
- a copy of this software and associated documentation files (the
- "Software"), to deal in the Software without restriction, including
- without limitation the rights to use, copy, modify, merge, publish,
- distribute, sublicense, and/or sell copies of the Software, and to
- permit persons to whom the Software is furnished to do so, subject to
- the following conditions:
-
- The above copyright notice and this permission notice (including the
- next paragraph) shall be included in all copies or substantial
- portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NONINFRINGEMENT.  IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS
- SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- DEALINGS IN THE SOFTWARE.