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

21 files changed, 206 insertions, 18 deletions

diff --git a/pcr/bsnes/PKGBUILD b/pcr/bsnes/PKGBUILD
index 04c61bc30..04c61bc30 100644..100755
--- a/pcr/bsnes/PKGBUILD
+++ b/pcr/bsnes/PKGBUILD
diff --git a/pcr/bsnes/bsnes.changelog b/pcr/bsnes/bsnes.changelog
index 9328c9aee..9328c9aee 100644..100755
--- a/pcr/bsnes/bsnes.changelog
+++ b/pcr/bsnes/bsnes.changelog
diff --git a/pcr/bsnes/bsnes.install b/pcr/bsnes/bsnes.install
index 2e40f6bba..2e40f6bba 100644..100755
--- a/pcr/bsnes/bsnes.install
+++ b/pcr/bsnes/bsnes.install
diff --git a/pcr/csync-owncloud/PKGBUILD b/pcr/csync-owncloud/PKGBUILD
new file mode 100644
index 000000000..daba8c568
--- /dev/null
+++ b/pcr/csync-owncloud/PKGBUILD
@@ -0,0 +1,53 @@
+# Maintainer: Kuba Serafinowski <zizzfizzix(at)gmail(dot)com>
+# https://github.com/zizzfizzix/pkgbuilds
+
+##############################################################
+#### The section below can be adjusted to suit your needs ####
+##############################################################
+
+# What type of build do you want?
+# See http://techbase.kde.org/Development/CMake/Addons_for_KDE#Buildtypes to check what is supported.
+# Default is RelWithDebInfo to help with debugging.
+
+_buildtype="RelWithDebInfo"
+
+##############################################################
+
+_name=csync
+pkgname=csync-owncloud
+pkgver=0.50.8
+pkgrel=1
+pkgdesc="A file synchronizer especially designed for you, the normal user."
+arch=("i686" "x86_64")
+url="http://www.csync.org"
+license=('GPL2')
+depends=('log4c' 'sqlite3' 'iniparser' 'neon' 'smbclient' 'libssh')
+makedepends=('cmake')
+#optdepends=('samba: smb support' 'libssh: sftp support')
+provides=('csync')
+conflicts=('csync')
+options=(!strip)
+source=("http://download.owncloud.com/download/${_name}-${pkgver}.tar.bz2")
+md5sums=('322f6fa22ca0e8cd05f23dc0d075e7ca')
+
+# Clean options array to strip pkg if release buildtype is chosen
+if [[ ${_buildtype} == "Release" ]] || [[ ${_buildtype} == "release" ]]; then
+  options=()
+fi
+
+build() {
+  if [[ -e ${srcdir}/${_name}-${pkgver}-build ]]; then rm -rf ${srcdir}/${_name}-${pkgver}-build; fi
+  mkdir ${srcdir}/${_name}-${pkgver}-build
+  cd ${srcdir}/${_name}-${pkgver}-build
+  
+  cmake -DCMAKE_BUILD_TYPE=${_buildtype} \
+        -DCMAKE_INSTALL_PREFIX=/usr \
+        -DSYSCONF_INSTALL_DIR=/etc \
+        -DLOG_TO_CALLBACK=on \
+        ../${_name}-${pkgver}
+  make
+}
+package() {
+  cd ${srcdir}/${_name}-${pkgver}-build
+  make DESTDIR=${pkgdir} install
+}
diff --git a/pcr/d0_blind_id-git/PKGBUILD b/pcr/d0_blind_id-git/PKGBUILD
index bfda13205..bfda13205 100644..100755
--- a/pcr/d0_blind_id-git/PKGBUILD
+++ b/pcr/d0_blind_id-git/PKGBUILD
diff --git a/pcr/kervalasquish-hg/PKGBUILD b/pcr/kervalasquish-hg/PKGBUILD
index e5e489950..e5e489950 100644..100755
--- a/pcr/kervalasquish-hg/PKGBUILD
+++ b/pcr/kervalasquish-hg/PKGBUILD
diff --git a/pcr/log4c/PKGBUILD b/pcr/log4c/PKGBUILD
new file mode 100644
index 000000000..bfcb6bb53
--- /dev/null
+++ b/pcr/log4c/PKGBUILD
@@ -0,0 +1,22 @@
+# Contributor: rockerzz <rockerzz@gmail.com>
+#
+pkgname=log4c
+pkgver=1.2.1
+pkgrel=1
+pkgdesc="Logging FrameWork for C, as Log4j or Log4Cpp"
+url="http://log4c.sourceforge.net/"
+arch=('i686' 'x86_64')
+license="LGPL"
+depends=('gcc-libs')
+makedepends=( 'bash' 'make' 'gcc' )
+source=(http://prdownloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz)
+md5sums=('ca5412b7515d8901714ab7892323adb6')
+options=('!libtool')
+
+build() {
+  cd $startdir/src/log4c-$pkgver
+  ./configure --prefix=/usr
+  make || return 1
+  make DESTDIR=$startdir/pkg install
+}
+
diff --git a/pcr/mesa-git/PKGBUILD b/pcr/mesa-git/PKGBUILD
index 8b8a5c7dd..0a63f43d8 100644
--- a/pcr/mesa-git/PKGBUILD
+++ b/pcr/mesa-git/PKGBUILD
@@ -4,7 +4,7 @@ _d3d1x=false
 _openvg=true
 _va=false
 _vdpau=true
-_wayland=false
+_wayland=true
 _xorg=true
 _xvmc=true
 pkgbase=mesa-git
@@ -24,6 +24,7 @@ true && pkgname=(
   intel-gallium-dri-git
   intel-dri-git
   nouveau-dri-git
+  svga-dri-git
   mesa-git
 )
 if [ $_openvg = true ]; then
@@ -67,9 +68,10 @@ if [ $_xvmc = true ]; then
     soft-xvmc-git
   )
 fi
-true && pkgver=9.0.0.git20120908
+true && pkgver=9.0.0.git$(LC_ALL=C date -u +%Y%m%d)
 true && pkgrel=1
 _mesaver=9.0
+_dricore=9.1
 arch=(
   i686
   x86_64
@@ -205,7 +207,7 @@ build() {
     --with-clang-libdir=/usr/lib \
     --with-dri-driverdir=/usr/lib/xorg/modules/dri \
     --with-dri-drivers=i915,i965,nouveau,r200,radeon,swrast \
-    --with-gallium-drivers=i915,nouveau,r300,r600,radeonsi,swrast
+    --with-gallium-drivers=i915,nouveau,r300,r600,radeonsi,svga,swrast
   make V=0
 }
 
@@ -275,11 +277,12 @@ package_libegl-wayland-git() {
   fi
   conflicts=(
     libegl
+    libegl-git
     libegl-wayland
   )
   provides=(
     libegl=$_mesaver
-    libegl-git=$_mesaver
+    libegl-git
     libegl-wayland=$_mesaver
   )
   pkgdesc='Mesa EGL libraries and headers, with wayland Support'
@@ -322,11 +325,12 @@ package_libegl-git() {
   conflicts=(
     libegl
     libegl-wayland
+    libegl-wayland-git
   )
   provides=(
     libegl=$_mesaver
-    libegl-git=$_mesaver
     libegl-wayland=$_mesaver
+    libegl-wayland-git
   )
   pkgdesc='Mesa EGL libraries and headers'
 
@@ -397,11 +401,12 @@ package_libgl-gallium-git() {
   )
   conflicts=(
     libgl
+    libgl-git
     libgl-gallium
   )
   provides=(
     libgl=$_mesaver
-    libgl-git=$_mesaver
+    libgl-git
     libgl-gallium=$_mesaver
   )
   pkgdesc='Mesa 3D OpenGL graphics library and DRI Gallium software rasterizer'
@@ -415,12 +420,12 @@ package_libgl-gallium-git() {
   install -m755 -d $pkgdir/usr/lib/xorg/modules/extensions
   install -m755 -d $pkgdir/usr/share/doc/libgl
   install -m755 -d $pkgdir/usr/share/licenses/libgl
- #ln -s libdricore$_mesaver.so.1.0.0 $pkgdir/usr/lib/libdricore.so
+ #ln -s libdricore$_dricore.so.1.0.0 $pkgdir/usr/lib/libdricore.so
   ln -s libglx.xorg                  $pkgdir/usr/lib/xorg/modules/extensions/libglx.so
  #install -Dm644 src/glx/libGL.la                           $pkgdir/usr/lib
  #install -Dm644 lib/libGL.so*                              $pkgdir/usr/lib
- #install -Dm644 src/mesa/libdricore/libdricore$_mesaver.la $pkgdir/usr/lib
- #install -Dm644 lib/libdricore$_mesaver.so*                $pkgdir/usr/lib
+ #install -Dm644 src/mesa/libdricore/libdricore$_dricore.la $pkgdir/usr/lib
+ #install -Dm644 lib/libdricore$_dricore.so*                $pkgdir/usr/lib
  #install -Dm644 lib/gallium/swrast_dri.so                  $pkgdir/usr/lib/xorg/modules/dri
   install -Dm644 docs/libGL.txt                             $pkgdir/usr/share/doc/libgl
   install -Dm644 docs/COPYING                               $pkgdir/usr/share/licenses/libgl
@@ -439,11 +444,12 @@ package_libgl-git() {
   conflicts=(
     libgl
     libgl-gallium
+    libgl-gallium-git
   )
   provides=(
     libgl=$_mesaver
     libgl-gallium=$_mesaver
-    libgl-gallium-git=$_mesaver
+    libgl-gallium-git
   )
   pkgdesc='Mesa 3D OpenGL graphics library and DRI software rasterizer'
 
@@ -460,8 +466,8 @@ package_libgl-git() {
   ln -s libglx.xorg                  $pkgdir/usr/lib/xorg/modules/extensions/libglx.so
  #install -Dm644 src/glx/libGL.la                           $pkgdir/usr/lib
  #install -Dm644 lib/libGL.so*                              $pkgdir/usr/lib
- #install -Dm644 src/mesa/libdricore/libdricore$_mesaver.la $pkgdir/usr/lib
- #install -Dm644 lib/libdricore$_mesaver.so*                $pkgdir/usr/lib
+ #install -Dm644 src/mesa/libdricore/libdricore$_dricore.la $pkgdir/usr/lib
+ #install -Dm644 lib/libdricore$_dricore.so*                $pkgdir/usr/lib
  #install -Dm644 src/mesa/drivers/dri/swrast/swrast_dri.la  $pkgdir/usr/lib/xorg/modules/dri
  #install -Dm644 lib/swrast_dri.so                          $pkgdir/usr/lib/xorg/modules/dri
   install -Dm644 docs/libGL.txt                             $pkgdir/usr/share/doc/libgl
@@ -625,11 +631,12 @@ package_intel-gallium-dri-git() {
   )
   conflicts=(
     intel-dri
+    intel-dri-git
     intel-gallium-dri
   )
   provides=(
     intel-dri=$_mesaver
-    intel-dri-git=$_mesaver
+    intel-dri-git
     intel-gallium-dri=$_mesaver
   )
   pkgdesc='Mesa DRI drivers for Intel, with i915 Gallium Driver )'
@@ -654,6 +661,7 @@ package_intel-dri-git() {
   conflicts=(
     intel-dri
     intel-gallium-dri
+    intel-gallium-dri-git
   )
   provides=(
     intel-dri=$_mesaver
@@ -703,6 +711,36 @@ package_nouveau-dri-git() {
   install -Dm644 docs/license.html                                 $pkgdir/usr/share/licenses/nouveau-dri
 }
 
+package_svga-dri-git() {
+  depends=(
+    libgl-git
+  )
+  conflicts=(
+    svga-dri
+  )
+  provides=(
+    svga-dri=$_mesaver
+  )
+  pkgdesc='Free Gallium3D VMware guest GL driver'
+
+  make -C $srcdir/build/src/gallium/targets/dri-vmwgfx DESTDIR=$pkgdir install
+  make -C $srcdir/build/src/gallium/targets/xa-vmwgfx  DESTDIR=$pkgdir install
+
+  cd $srcdir/build
+ #install -m755 -d $pkgdir/usr/lib/include
+ #install -m755 -d $pkgdir/usr/lib/pkgconfig
+ #install -m755 -d $pkgdir/usr/lib/xorg/modules/dri
+  install -m755 -d $pkgdir/usr/share/licenses/svga-dri
+ #install -Dm644 lib/gallium/libxatracker.so*                 $pkgdir/usr/lib
+ #install -Dm644 src/gallium/state_trackers/xa/xa_composite.h $pkgdir/usr/lib/include
+ #install -Dm644 src/gallium/state_trackers/xa/xa_context.h   $pkgdir/usr/lib/include
+ #install -Dm644 src/gallium/state_trackers/xa/xa_tracker.h   $pkgdir/usr/lib/include
+ #install -Dm644 src/gallium/targets/xa-vmwgfx/xatracker.pc   $pkgdir/usr/lib/pkgconfig
+ #install -Dm644 lib/gallium/vmwgfx_dri.so                    $pkgdir/usr/lib/xorg/modules/dri
+  install -Dm644 docs/COPYING                                 $pkgdir/usr/share/licenses/svga-dri
+  install -Dm644 docs/license.html                            $pkgdir/usr/share/licenses/svga-dri
+}
+
 package_ati-va-git() {
   depends=(
     glibc
@@ -974,7 +1012,6 @@ package_mesa-git() {
   depends=(
     dri2proto
     glproto-git
-    libgl-git
     libglu-git
   )
   optdepends=(
@@ -992,10 +1029,10 @@ package_mesa-git() {
 
   cd $srcdir/build
   make DESTDIR=$pkgdir install
-  rm -fvr $pkgdir/usr/include/{EGL,GLES,GLES2,KHR,VG,gbm.h}
+  rm -fvr $pkgdir/usr/include/{EGL,GLES,GLES2,KHR,VG,gbm.h,xa_*.h}
   rm -fvr $pkgdir/usr/lib/{egl,gbm,opencl,vdpau,xorg}
-  rm -fv  $pkgdir/usr/lib/{libEGL*,libGL*,libGLESv*,libOSMesa*,libOpenCL*,libOpenVG*,libXvMC*,libdricore*,libgbm*,libglapi*,libwayland*}
-  rm -fv  $pkgdir/usr/lib/pkgconfig/{egl.pc,gbm.pc,glesv1_cm.pc,glesv2.pc,osmesa.pc,vg.pc,wayland-egl.pc}
+  rm -fv  $pkgdir/usr/lib/{libEGL*,libGL*,libGLESv*,libOSMesa*,libOpenCL*,libOpenVG*,libXvMC*,libdricore*,libgbm*,libglapi*,libwayland*,libxatracker.so*}
+  rm -fv  $pkgdir/usr/lib/pkgconfig/{egl.pc,gbm.pc,glesv1_cm.pc,glesv2.pc,osmesa.pc,vg.pc,wayland-egl.pc,xatracker.pc}
   install -m755 -d $pkgdir/usr/share/licenses/mesa
   install -Dm644 docs/COPYING      $pkgdir/usr/share/licenses/mesa
   install -Dm644 docs/license.html $pkgdir/usr/share/licenses/mesa
diff --git a/pcr/minetest/PKGBUILD b/pcr/minetest/PKGBUILD
index 8d11e3747..8d11e3747 100644..100755
--- a/pcr/minetest/PKGBUILD
+++ b/pcr/minetest/PKGBUILD
diff --git a/pcr/owncloud-client/PKGBUILD b/pcr/owncloud-client/PKGBUILD
new file mode 100644
index 000000000..7e8dfa59a
--- /dev/null
+++ b/pcr/owncloud-client/PKGBUILD
@@ -0,0 +1,54 @@
+# Maintainer: Kuba Serafinowski <zizzfizzix(at)gmail(dot)com>
+# https://github.com/zizzfizzix/pkgbuilds
+
+##############################################################
+#### The section below can be adjusted to suit your needs ####
+##############################################################
+
+# What type of build do you want?
+# See http://techbase.kde.org/Development/CMake/Addons_for_KDE#Buildtypes to check what is supported.
+# Default is RelWithDebInfo to help with debugging.
+
+_buildtype="RelWithDebInfo"
+
+##############################################################
+
+_name=mirall
+pkgname=owncloud-client
+pkgver=1.0.5
+pkgrel=2
+pkgdesc="ownCloud client based on mirall"
+arch=('i686' 'x86_64')
+url="http://owncloud.org/"
+license=('GPL2')
+depends=('qt' 'csync-owncloud')
+makedepends=('cmake')
+provides=('mirall' 'owncloud-client')
+conflicts=('mirall-git')
+options=(!strip)
+install=owncloud-client.install
+backup=('etc/exclude.lst')
+source=("http://download.owncloud.com/download/${_name}-${pkgver}.tar.bz2"
+        "${pkgname}.desktop")
+md5sums=('b7a96411f092bb16f88e3868a558032f'
+         'e223d162626c2ff54efebaa90a182d81')
+
+# Clean options array to strip pkg if release buildtype is chosen
+if [[ ${_buildtype} == "Release" ]] || [[ ${_buildtype} == "release" ]]; then
+  options=()
+fi
+
+build() {
+  if [[ -e ${srcdir}/${_name}-${pkgver}-build ]]; then rm -rf ${srcdir}/${_name}-${pkgver}-build; fi
+  mkdir ${srcdir}/${_name}-${pkgver}-build
+  cd ${srcdir}/${_name}-${pkgver}-build
+
+  cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_LIBDIR=/usr/lib -DCMAKE_BUILD_TYPE=${_buildtype} ../${_name}-${pkgver}
+  make
+}
+
+package() {
+  cd ${srcdir}/${_name}-${pkgver}-build
+  make DESTDIR=${pkgdir} install
+  install -Dm644 ${srcdir}/${pkgname}.desktop ${pkgdir}/usr/share/applications/${pkgname}.desktop
+}
diff --git a/pcr/owncloud-client/owncloud-client.desktop b/pcr/owncloud-client/owncloud-client.desktop
new file mode 100644
index 000000000..005e52219
--- /dev/null
+++ b/pcr/owncloud-client/owncloud-client.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Type=Application
+Version=1.0
+Name=ownCloud 2012 client
+GenericName=File Sync
+TryExec=owncloud
+Exec=owncloud %u
+Comment=ownCloud - Your Cloud, Your Data, Your Way!
+Icon=mirall
+Terminal=false
+Categories=Qt;Utility;
diff --git a/pcr/owncloud-client/owncloud-client.install b/pcr/owncloud-client/owncloud-client.install
new file mode 100644
index 000000000..1c0de2e4f
--- /dev/null
+++ b/pcr/owncloud-client/owncloud-client.install
@@ -0,0 +1,11 @@
+post_install() {
+  xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
diff --git a/pcr/python-sfml2/PKGBUILD b/pcr/python-sfml2/PKGBUILD
index 48a8e4d30..48a8e4d30 100644..100755
--- a/pcr/python-sfml2/PKGBUILD
+++ b/pcr/python-sfml2/PKGBUILD
diff --git a/pcr/python2-sfml2/PKGBUILD b/pcr/python2-sfml2/PKGBUILD
index 263097e50..263097e50 100644..100755
--- a/pcr/python2-sfml2/PKGBUILD
+++ b/pcr/python2-sfml2/PKGBUILD
diff --git a/pcr/ryzom-client/PKGBUILD b/pcr/ryzom-client/PKGBUILD
index dbcd531f4..dbcd531f4 100644..100755
--- a/pcr/ryzom-client/PKGBUILD
+++ b/pcr/ryzom-client/PKGBUILD
diff --git a/pcr/ryzom-data/PKGBUILD b/pcr/ryzom-data/PKGBUILD
index dfb8a116c..dfb8a116c 100644..100755
--- a/pcr/ryzom-data/PKGBUILD
+++ b/pcr/ryzom-data/PKGBUILD
diff --git a/pcr/ryzom-nel/PKGBUILD b/pcr/ryzom-nel/PKGBUILD
index b45bef098..b45bef098 100644..100755
--- a/pcr/ryzom-nel/PKGBUILD
+++ b/pcr/ryzom-nel/PKGBUILD
diff --git a/pcr/sfml-git/PKGBUILD b/pcr/sfml-git/PKGBUILD
index 94f89f7e7..94f89f7e7 100644..100755
--- a/pcr/sfml-git/PKGBUILD
+++ b/pcr/sfml-git/PKGBUILD
diff --git a/pcr/xonotic-git/PKGBUILD b/pcr/xonotic-git/PKGBUILD
index 2a032cd4a..2a032cd4a 100644..100755
--- a/pcr/xonotic-git/PKGBUILD
+++ b/pcr/xonotic-git/PKGBUILD
diff --git a/pcr/yate/PKGBUILD b/pcr/yate/PKGBUILD
index 01428fa27..01428fa27 100644..100755
--- a/pcr/yate/PKGBUILD
+++ b/pcr/yate/PKGBUILD
diff --git a/pcr/zoneminder/PKGBUILD b/pcr/zoneminder/PKGBUILD
index ec19ae664..97f7ee9b7 100644
--- a/pcr/zoneminder/PKGBUILD
+++ b/pcr/zoneminder/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=zoneminder
 pkgver=1.25.0
 pkgrel=13
 pkgdesc="Capture, analyse, record and monitor video security cameras"
-arch=('i686' 'x86_64' 'arm')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.zoneminder.com"
 license=('GPL')
 depends=('cambozola' 'apache' 'php' 'php-gd' 'php-mcrypt' 'mysql' 'pcre' 'openssl' 'ffmpeg' 'perl-libwww' 'perl-date-manip' 'perl-unicode-map' 'perl-dbi' 'perl-dbd-mysql' 'perl-io-stringy' 'perl-mime-lite' 'perl-timedate' 'perl-x10' 'perl-time-modules' 'perl-net-smtp-ssl' 'perl-sys-mmap' 'perl-net-sftp-foreign' 'perl-mime-tools' 'perl-io-tty' 'libv4l' 'libjpeg' 'gnutls' 'php-apache')