libdrm-libre{-git}: add packages to {libre,pcr}, lib{egl,drm}-git: drop old packages

4 files changed, 161 insertions, 187 deletions

diff --git a/pcr/libdrm-git/PKGBUILD b/pcr/libdrm-git/PKGBUILD
deleted file mode 100644
index 823631073..000000000
--- a/pcr/libdrm-git/PKGBUILD
+++ /dev/null
@@ -1,82 +0,0 @@
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Alexander Baldeck <alexander@archlinux.org>
-# Arch libdrm Maintainers:
-#	Jan de Groot
-#	Andreas Radke
-# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
-
-pkgname=libdrm-git
-pkgver=20120905
-pkgrel=2
-pkgdesc='Userspace interface to kernel DRM services'
-arch=(
-  i686
-  x86_64
-  mips64el
-)
-license=(
-  MIT
-)
-depends=(
-  libpciaccess
-  )
-makedepends=(
-  cairo
-  git
-  valgrind
-)
-options=(
-  !libtool
-)
-url=http://dri.freedesktop.org/
-provides=(
-  ${pkgname%-git}
-  ${pkgname%-git}-nouveau1
-)
-conflicts=(
-  ${pkgname%-git}
-  ${pkgname%-git}-nouveau1
-)
-
-_gitroot=git://git.freedesktop.org/git/mesa/drm
-_gitname=drm
-
-build() {
-  cd $srcdir
-  msg 'Connecting to GIT server....'
-
-  if [[ -d $_gitname ]]; then
-    cd $_gitname && git pull origin
-    msg 'The local files are updated.'
-  else
-    git clone $_gitroot $_gitname
-  fi
-
-  msg 'GIT checkout done or server timeout'
-  msg 'Starting build...'
-
-  rm -rf $srcdir}/$_gitname-build
-  git clone $srcdir/$_gitname $srcdir/$_gitname-build
-  cd $srcdir/$_gitname-build
-
-  sed -i 's/PKG_CHECK_MODULES(PTHREADSTUBS, pthread-stubs)//' configure.ac
-
-  ./autogen.sh
-  ./configure --prefix=/usr \
-      --enable-udev \
-      --enable-intel \
-      --enable-radeon \
-      --enable-nouveau \
-      --enable-vmwgfx
-  make V=1
-}
-
-check() {
-  cd $srcdir/$_gitname-build
-  make -k check
-}
-
-package() {
-  cd $srcdir/$_gitname-build
-  make DESTDIR=$pkgdir install
-}
diff --git a/pcr/libdrm-libre-git/COPYING b/pcr/libdrm-libre-git/COPYING
new file mode 100644
index 000000000..6e74c337c
--- /dev/null
+++ b/pcr/libdrm-libre-git/COPYING
@@ -0,0 +1,48 @@
+ 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.
diff --git a/pcr/libdrm-libre-git/PKGBUILD b/pcr/libdrm-libre-git/PKGBUILD
new file mode 100644
index 000000000..37c7066fc
--- /dev/null
+++ b/pcr/libdrm-libre-git/PKGBUILD
@@ -0,0 +1,113 @@
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
+
+pkgname=libdrm-libre-git
+pkgver=20120909
+_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
+  git
+  valgrind
+)
+options=(
+  !libtool
+)
+url=http://dri.freedesktop.org/
+provides=(
+  ${pkgname%-libre-git}=$_pkgver
+  ${pkgname%-libre-git}-libre=$_pkgver
+  ${pkgname%-libre-git}-git
+  ${pkgname%-libre-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
+)
+replaces=(
+  ${pkgname%-libre-git}
+  ${pkgname%-libre-git}-git
+  ${pkgname%-libre-git}-new
+  ${pkgname%-libre-git}-nouveau
+)
+source=(
+  COPYING
+)
+sha512sums=(
+  b0ca349b882a4326b19f81f22804fabdb6fb7aef31cdc7b16b0a7ae191bfbb50c7daddb2fc4e6c33f1136af06d060a273de36f6f3412ea326f16fa4309fda660
+)
+
+_gitroot=git://git.freedesktop.org/git/mesa/drm
+_gitname=drm
+
+build() {
+  cd $srcdir
+  msg 'Connecting to GIT server....'
+
+  if [[ -d $_gitname ]]; then
+    cd $_gitname && git pull origin
+    msg 'The local files are updated.'
+  else
+    git clone $_gitroot $_gitname
+  fi
+
+  msg 'GIT checkout done or server timeout'
+  msg 'Starting build...'
+
+  rm -rf $srcdir}/$_gitname-build
+  git clone $srcdir/$_gitname $srcdir/$_gitname-build
+  cd $srcdir/$_gitname-build
+
+  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
+
+  ./autogen.sh
+  ./configure --prefix=/usr \
+      --disable-vmwgfx \
+      --enable-exynos-experimental-api \
+      --enable-intel \
+      --enable-nouveau \
+      --enable-omap-experimental-api \
+      --enable-radeon \
+      --enable-udev
+  make V=0
+}
+
+check() {
+  cd $srcdir/$_gitname-build
+  make -k 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}
+}
diff --git a/pcr/libegl-git/PKGBUILD b/pcr/libegl-git/PKGBUILD
deleted file mode 100644
index aa48ab5a3..000000000
--- a/pcr/libegl-git/PKGBUILD
+++ /dev/null
@@ -1,105 +0,0 @@
-# Maintainer: Márcio Silva <coadde@lavabit.com>
-
-pkgname=libegl-git
-true && pkgver=9.0.0.git20120906
-true && pkgrel=1
-_mesaver=9.0
-arch=(
-  i686
-  x86_64
-  mips64el
-)
-makedepends=(
-  clang
-  dri2proto
-  git
-  glproto-git
-  imake
-  libdrm-git
-  libxdamage
-  libxml2
-  libxxf86vm
-  python2
-)
-license=(
-  MIT
-  Khronos
-  LGPL
-)
-depends=(
-  khrplatform-devel-git
-  libgbm-git
-  libxext
-  libxfixes
-  libvg-git
-)
-conflicts=(
-  ${pkgname%-git}
-  ${pkgname%-git}-wayland
-  ${pkgname%-git}-wayland-git
-)
-provides=(
-  ${pkgname%-git}=$_mesaver
-  ${pkgname%-git}-wayland-git=$_mesaver
-)
-pkgdesc='Mesa EGL libraries and headers'
-url=http://mesa3d.sourceforge.net
-#source=(
-#  ftp://ftp.freedesktop.org/pub/mesa/$pkgver/MesaLib-$pkgver.tar.bz2
-#)
-#sha512sums=(
-#  b7e8879e92252d0588d9eeeed904fd502ce1f48551b9a97f52aeb1318c79a80fab27504521107d61fbb5d986b2d778d89023a892baf9f1c5a5d2ee3746fefa57
-#)
-
-_gitroot=git://anongit.freedesktop.org/git/mesa/mesa
-_gitname=mesa
-
-build() {
-  msg 'Connecting to git.freedesktop.org GIT server....'
-  if [ -d $_gitname ] ; then
-    cd $_gitname && git pull origin
-  else
-    git clone $_gitroot --depth 1
-  fi
-  msg 'GIT checkout done or server timeout'
-  msg 'Starting make...'
-
-  cd $srcdir
-
-  # Cleanup and prepare the build dir
-  [ -d build ] && rm -rf build
-  cp -r $_gitname build
-  cd build
-
-  #cd $srcdir/Mesa-$pkgver
-
-  autoreconf -vfi
-  ./autogen.sh --prefix=/usr \
-    --enable-egl \
-    --enable-gallium-egl \
-    --enable-gallium-gbm \
-    --enable-gbm \
-    --enable-openvg \
-    --with-clang-libdir=/usr/lib \
-  make
-}
-
-package() {
-  #make -C $srcdir/build/src/egl                        DESTDIR=$pkgdir install
-  #make -C $srcdir/build/src/gallium/targets/egl-static DESTDIR=$pkgdir install
-
-  cd $srcdir/build
-  install -m755 -d $pkgdir/usr/include/EGL
-  install -m755 -d $pkgdir/usr/lib/egl
-  install -m755 -d $pkgdir/usr/lib/pkgconfig
-  install -m755 -d $pkgdir/usr/share/doc/${pkgname%-git}
-  install -m755 -d $pkgdir/usr/share/licenses/${pkgname%-git}
-  bin/minstall include/EGL/*          $pkgdir/usr/include/EGL
-  bin/minstall src/egl/main/libEGL.la $pkgdir/usr/lib
-  bin/minstall lib/libEGL.so*         $pkgdir/usr/lib
-  bin/minstall lib/egl/egl_gallium.so $pkgdir/usr/lib/egl
-  bin/minstall src/egl/main/egl.pc    $pkgdir/usr/lib/pkgconfig
-  bin/minstall docs/egl.html          $pkgdir/usr/share/doc/${pkgname%-git}
-  bin/minstall docs/COPYING           $pkgdir/usr/share/licenses/${pkgname%-git}
-  bin/minstall docs/license.html      $pkgdir/usr/share/licenses/${pkgname%-git}
-}