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

2 files changed, 120 insertions, 8 deletions

diff --git a/pcr/libegl-git/PKGBUILD b/pcr/libegl-git/PKGBUILD
new file mode 100644
index 000000000..aa48ab5a3
--- /dev/null
+++ b/pcr/libegl-git/PKGBUILD
@@ -0,0 +1,105 @@
+# 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}
+}
diff --git a/pcr/mesa-git/PKGBUILD b/pcr/mesa-git/PKGBUILD
index 6ca8a419a..e4f96e5ae 100644
--- a/pcr/mesa-git/PKGBUILD
+++ b/pcr/mesa-git/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=(
 true && pkgname=(
   khrplatform-devel-git
   libcl-libre-git
-  libegl-git
+  libegl-wayland-git
   libgbm-git
   libgl-gallium-git
   libgl-git
@@ -24,7 +24,7 @@ true && pkgname=(
   soft-xvmc-git
   mesa-git
 )
-true && pkgver=9.0.0.git20120905
+true && pkgver=9.0.0.git20120906
 true && pkgrel=1
 _mesaver=9.0
 arch=(
@@ -60,7 +60,7 @@ url=http://mesa3d.sourceforge.net
 #  b7e8879e92252d0588d9eeeed904fd502ce1f48551b9a97f52aeb1318c79a80fab27504521107d61fbb5d986b2d778d89023a892baf9f1c5a5d2ee3746fefa57
 #)
 
-_gitroot=git://anongit.freedesktop.org/git/mesa/mesa
+_gitroot=git://anongit.freedesktop.org/git/${pkgbase%-git}/${pkgbase%-git}
 _gitname=${pkgbase%-git}
 
 build() {
@@ -161,7 +161,7 @@ package_libcl-libre-git() {
   bin/minstall docs/license.html                       $pkgdir/usr/share/licenses/libcl
 }
 
-package_libegl-git() {
+package_libegl-wayland-git() {
   depends=(
     khrplatform-devel-git
     libgbm-git
@@ -172,11 +172,14 @@ package_libegl-git() {
   )
   conflicts=(
     libegl
+    libegl-git
+    libegl-wayland
   )
   provides=(
     libegl=$_mesaver
+    libegl-git=$_mesaver
   )
-  pkgdesc='Mesa EGL libraries and headers'
+  pkgdesc='Mesa EGL libraries and headers, with wayland Support'
 
   #make -C $srcdir/build/src/egl                        DESTDIR=$pkgdir install
   #make -C $srcdir/build/src/gallium/targets/egl-static DESTDIR=$pkgdir install
@@ -242,10 +245,12 @@ package_libgl-gallium-git() {
     libxxf86vm
   )
   conflicts=(
-    libgl libgl-git
+    libgl
+    libgl-git
   )
   provides=(
     libgl=$_mesaver
+    libgl-git=$_mesaver
   )
   pkgdesc='Mesa 3D OpenGL graphics library and DRI Gallium software rasterizer'
 
@@ -277,10 +282,12 @@ package_libgl-git() {
     libxxf86vm
   )
   conflicts=(
-    libgl libgl-gallium-git
+    libgl
+    libgl-gallium-git
   )
   provides=(
     libgl=$_mesaver
+    libgl-gallium-git=$_mesaver
   )
   pkgdesc='Mesa 3D OpenGL graphics library and DRI software rasterizer'
 
@@ -598,7 +605,7 @@ package_soft-xvmc-git() {
 
 package_mesa-git() {
   depends=(
-    dri2proto-git
+    dri2proto
     glproto-git
     libgl-git
   )