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

14 files changed, 269 insertions, 24 deletions

diff --git a/libre/blender-libre/PKGBUILD b/libre/blender-libre/PKGBUILD
index 359f2a6cf..f01210a1e 100644
--- a/libre/blender-libre/PKGBUILD
+++ b/libre/blender-libre/PKGBUILD
@@ -3,7 +3,7 @@
 _pkgname=blender
 epoch=10
 _pkgver=2.69
-pkgrel=1
+pkgrel=2
 _jpgver=1.5
 _pyver=3.3
 
@@ -15,7 +15,7 @@ _spn=false
 
 pkgname=$_pkgname$_spnname-libre
 pkgver=$_pkgver
-pkgdesc='Fully integrated 3D graphics creation suite, without nonfree povray and cuda support'$_spndesc
+pkgdesc='Fully integrated 3D graphics creation suite, without nonfree cuda support'$_spndesc
 arch=(
   mips64el
   x86_64
@@ -88,9 +88,6 @@ prepare() {
          ' release/text/readme.html
 
   mkdir -v build
-
-  msg 'Remove nonfree povray render support'
-  rm -vr release/scripts/addons/render_povray
 }
 
 build() {
diff --git a/libre/povray-libre/PKGBUILD b/libre/povray-libre/PKGBUILD
new file mode 100644
index 000000000..033b2bd6c
--- /dev/null
+++ b/libre/povray-libre/PKGBUILD
@@ -0,0 +1,64 @@
+# $Id: PKGBUILD 101201 2013-11-19 12:48:08Z arodseth $
+# Maintainer: Alexander Rødseth <rodseth@gmail.com>
+# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
+# Contributor: tobias <tobias@archlinux.org>
+# Contributor: red_over_blue
+# Contributor: neri
+
+# Maintainer (Parabola): Márcio Silva <coadde@parabola.nu>
+# Don't build povray before 3.7 version (it's nonfree software)
+
+_pkgname=povray
+pkgname=$_pkgname-libre
+pkgver=3.7
+pkgrel=2
+epoch=1
+pkgdesc='Script based raytracer for creating 3D graphics, without nonfree documentation'
+arch=('x86_64' 'i686' 'mips64el')
+license=('AGPL3')
+url='http://povray.org/'
+depends=('libtiff' 'libpng' 'boost-libs')
+makedepends=('boost')
+provides=("$_pkgname=$pkgver")
+conflicts=("$_pkgname")
+replaces=("$_pkgname")
+backup=("etc/povray/$pkgver/povray.conf"
+        "etc/povray/$pkgver/povray.ini")
+source=("https://github.com/POV-Ray/$_pkgname/archive/$pkgver-stable.zip"
+        'povray3.7.0_rc3-user-conf.patch')
+sha256sums=('1261d963327a4b04c09d56bbd7436d0062e6bf8363674e3fb4e240beefb5b5cb'
+            '95b04ec4973e6e8a80fc83df2e3caff0b4d6699c4154144f3017d42cab7236e0')
+
+prepare() {
+  cd "$_pkgname-$pkgver-stable"
+
+  cd unix
+  sed 's/automake --w/automake --add-missing --w/g' -i prebuild.sh
+  sed 's/dist-bzip2/dist-bzip2 subdir-objects/g' -i configure.ac
+  ./prebuild.sh
+  cd ..
+  ./bootstrap
+  patch -p1 < "$srcdir/povray3.7.0_rc3-user-conf.patch"
+}
+
+build() {
+  cd "$_pkgname-$pkgver-stable"
+
+  ./configure LIBS="-lboost_system -lboost_thread" COMPILED_BY='Parabola GNU/Linux-libre' \
+    --prefix=/usr --sysconfdir=/etc
+  make CXXFLAGS+="-w -lboost_system -lboost_thread"
+  gzip -f povray.1
+}
+
+package() {
+  cd "$_pkgname-$pkgver-stable"
+
+  install -d "$pkgdir/usr/share/$_pkgname-$pkgver"
+  cp -r icons include ini scenes scripts "$pkgdir/usr/share/$_pkgname-$pkgver"
+  install -Dm755 unix/povray "$pkgdir/usr/bin/povray"
+  install -Dm644 povray.conf "$pkgdir/etc/povray/$pkgver/povray.conf"
+  install -Dm644 povray.ini "$pkgdir/etc/povray/$pkgver/povray.ini"
+  install -Dm644 povray.1.gz "$pkgdir/usr/share/man/man1/povray.1.gz"
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/libre/povray-libre/povray3.7.0_rc3-user-conf.patch b/libre/povray-libre/povray3.7.0_rc3-user-conf.patch
new file mode 100644
index 000000000..f20d9b506
--- /dev/null
+++ b/libre/povray-libre/povray3.7.0_rc3-user-conf.patch
@@ -0,0 +1,27 @@
+ Makefile.am |   13 -------------
+ 1 files changed, 0 insertions(+), 13 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 76b394c..9822c52 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -107,19 +107,6 @@ install-data-local:
+ 	for f in $$filelist ; do \
+ 	  $(INSTALL_DATA) $(top_srcdir)/doc/$$f $(DESTDIR)$(povdocdir)/$$f && echo "$(DESTDIR)$(povdocdir)/$$f" >> $(povinstall); \
+ 	done
+-	@echo "Creating user directories..."; \
+-	for p in $(povuser) $(povconfuser) ; do \
+-	  $(mkdir_p) $$p && chown $(povowner) $$p && chgrp $(povgroup) $$p && printf "%s\n" "$$p" "`cat $(povinstall)`" > $(povinstall); \
+-	done
+-	@echo "Copying user configuration and INI files..."; \
+-	for f in povray.conf povray.ini ; do \
+-	  if test -f $(povconfuser)/$$f; then \
+-	    echo "Creating backup of $(povconfuser)/$$f"; \
+-	    mv -f $(povconfuser)/$$f $(povconfuser)/$$f.bak; \
+-	  fi; \
+-	done; \
+-	$(INSTALL_DATA) $(top_srcdir)/povray.conf $(povconfuser)/povray.conf && chown $(povowner) $(povconfuser)/povray.conf && chgrp $(povgroup) $(povconfuser)/povray.conf  && echo "$(povconfuser)/povray.conf" >> $(povinstall); \
+-	$(INSTALL_DATA) $(top_builddir)/povray.ini $(povconfuser)/povray.ini && chown $(povowner) $(povconfuser)/povray.ini && chgrp $(povgroup) $(povconfuser)/povray.ini  && echo "$(povconfuser)/povray.ini" >> $(povinstall)
+ 
+ # Remove data, config, and empty folders for 'make uninstall'.
+ # Use 'hook' instead of 'local' so as to properly remove *empty* folders (e.g. scripts).
diff --git a/libre/wings3d-libre/PKGBUILD b/libre/wings3d-libre/PKGBUILD
new file mode 100644
index 000000000..dfbd783c7
--- /dev/null
+++ b/libre/wings3d-libre/PKGBUILD
@@ -0,0 +1,65 @@
+# $Id: PKGBUILD 95697 2013-08-15 18:20:27Z arodseth $
+# Maintainer: Alexander Rødseth <rodseth@gmail.com>
+# Contributor: kappa <kappacurve@gmail.com>
+# Maintainer (Parabola): Márcio Silva <coadde@parabola.nu>
+
+_name=wings
+_pkgname=${_name}3d
+pkgname=$_pkgname-libre
+pkgver=1.5.2
+pkgrel=1
+pkgdesc='3D modeling program, without nonfree kerkythea render support'
+arch=('x86_64' 'i686' 'mips64el')
+url='http://www.wings3d.com/'
+license=('GPL')
+depends=('erlang-sdl' 'erlang-cl' 'bash' 'desktop-file-utils' 'erlang')
+makedepends=('gendesk')
+optdepends=('povray-libre: rendering support via POV-Ray')
+provides=("$_pkgname")
+conflicts=("$_pkgname")
+replaces=("$_pkgname")
+install=$_pkgname.install
+source=("$_pkgname-$pkgver.tar.gz::https://github.com/dgud/wings/archive/v$pkgver.tar.gz"
+        "$_pkgname.sh"
+        "$_pkgname.png::http://img299.imageshack.us/img299/2538/wingsiconblackshiningew5.png")
+sha256sums=('d86980e4fa91a04ca96b989b0dcba53a37c8cfda4e6d98accb8e7bd9a289094b'
+            '46513cd05f8b6e778120af4a87b239c5250799c17b591592893d98cbf082359e'
+            '6658977cc3bc8db2c9358edf3a2d6cb6bb8084c9a1d96ca573a83dd4e8781f1a')
+
+prepare() {
+  gendesk --pkgname "$_pkgname" --pkgdesc "$pkgdesc" \
+    --genericname '3D Modeler' --categories 'Graphics;3DGraphics'
+
+  cd "$_name-$pkgver"
+  sed -i "s|v1[.]2[.]x[.]y[.]WINGS|v$pkgver.$pkgrel.PARABOLA|" WINGS-VERSION-GEN
+}
+
+build() {
+  cd "$_name-$pkgver"
+
+  export ESDL_PATH=$(echo /usr/lib/erlang/lib/esdl-*)
+  make
+  make lang
+}
+
+package() {
+  cd "$_name-$pkgver"
+
+  mkdir -p "$pkgdir/usr/lib/$_pkgname"
+  for subdir in ebin fonts patches plugins shaders textures; do
+    cp -r "$srcdir/$_name-$pkgver/$subdir/" "$pkgdir/usr/lib/$_pkgname"
+  done
+  cd "$srcdir"
+  install -Dm755 "$_pkgname.sh" "$pkgdir/usr/bin/$_pkgname"
+  install -Dm644 "$_pkgname.png" "$pkgdir/usr/share/pixmaps/$_pkgname.png"
+  install -Dm644 "$_pkgname.desktop" \
+    "$pkgdir/usr/share/applications/$_pkgname.desktop"
+
+  msg 'remove nonfree kerkythea render support plugin'
+  rm -v $pkgdir/usr/lib/wings3d/plugins/import_export/wpc_kerky.beam
+
+  msg 'remove obsolete yafray render support plugin'
+  rm -v $pkgdir/usr/lib/wings3d/plugins/import_export/wpc_yafray{.beam,_{de,en,fr,ko}.lang}
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/libre/wings3d-libre/wings3d.install b/libre/wings3d-libre/wings3d.install
new file mode 100644
index 000000000..98f3ea190
--- /dev/null
+++ b/libre/wings3d-libre/wings3d.install
@@ -0,0 +1,14 @@
+post_upgrade() {
+  #gtk-update-icon-cache -q -f -t /usr/share/icons/hicolor
+  update-desktop-database -q
+}
+
+post_install() {
+  post_upgrade
+}
+
+post_remove() {
+  post_upgrade
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/libre/wings3d-libre/wings3d.png b/libre/wings3d-libre/wings3d.png
new file mode 100644
index 000000000..1fe6579dc
--- /dev/null
+++ b/libre/wings3d-libre/wings3d.png
diff --git a/libre/wings3d-libre/wings3d.sh b/libre/wings3d-libre/wings3d.sh
new file mode 100644
index 000000000..c0fd3b2fb
--- /dev/null
+++ b/libre/wings3d-libre/wings3d.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+erl -noinput -smp disable -pa /usr/lib/erlang/lib/esdl-*/ebin /usr/lib/wings3d/ebin -run wings_start start_halt ${1+"$@"}
diff --git a/pcr/blender-addon-ogre/PKGBUILD b/pcr/blender-addon-ogre/PKGBUILD
index 4baf8ca39..5fd846220 100644
--- a/pcr/blender-addon-ogre/PKGBUILD
+++ b/pcr/blender-addon-ogre/PKGBUILD
@@ -1,13 +1,13 @@
 # Maintainer: Márcio Silva <coadde@lavabit.com>
 
 _bldname=blender
-_bldver=2.68
-_bldep=9
+_bldver=2.69
+_bldep=10
 
 _pkgname=ogre
 pkgname=$_bldname-addon-$_pkgname
 pkgver=0.6.0
-pkgrel=2
+pkgrel=3
 pkgdesc="${_bldname}2$_pkgname: A addon for the ${_bldname^} which allows export to ${_pkgname^}3D formats (scene/mesh/material/skeleton) (built for the $_bldname-libre package)"
 arch=any
 url=https://code.google.com/p/${_bldname}2$_pkgname
diff --git a/pcr/libav/PKGBUILD b/pcr/libav/PKGBUILD
index c0fb9e062..2d5c09ec0 100644
--- a/pcr/libav/PKGBUILD
+++ b/pcr/libav/PKGBUILD
@@ -1,8 +1,8 @@
 # Maintainer: Márcio Silva <coadde@lavabit.com>
 
 pkgname=libav
-pkgver=9.8
-pkgrel=3
+pkgver=9.10
+pkgrel=1
 pkgdesc="Complete and free Internet live audio and video broadcasting solution for GNU/Linux"
 arch=(
   mips64el
@@ -15,6 +15,7 @@ depends=(
   alsa-lib
   bzip2
   freetype2
+  gnutls
   gsm
   lame
   libpulse
@@ -38,7 +39,7 @@ makedepends=(
   libvdpau
 )
 source=http://$pkgname.org/releases/$pkgname-$pkgver.tar.gz
-sha512sums=ef7c164fb29d365a236ead927e6355ca9191203dce86f0d0d8251f275ed5be4ab5e3f56a0c51384d7b9e83c3c3ef7ebdee95c9a7ac7b6520eaf25973a2bd20ae
+sha512sums=88bbe82fc3edfde17339cbd5fbae5ab074e750ad750fafcabc2c1fa408f352e38f32d8c0df0ff6c926d449bff29c725fc2c219d8b6e0398e3b93d43f086c9f10
 
 build() {
   cd $pkgname-$pkgver
@@ -53,9 +54,8 @@ build() {
   else
     _asm='--disable-asm'
   fi
-  [[ $_static == false ]] && _stf='--disable-static'
   ./configure\
-    $_asm $_stf\
+    $_asm\
     --prefix=/usr\
     --bindir=/opt/$pkgname/bin\
     --incdir=/opt/$pkgname/include\
@@ -63,14 +63,16 @@ build() {
     --shlibdir=/opt/$pkgname/lib\
     --disable-avserver\
     --disable-debug\
+    --disable-static\
     --enable-avresample\
     --enable-dxva2\
+    --enable-gnutls\
     --enable-gpl\
     --enable-libfreetype\
     --enable-libgsm\
     --enable-libmp3lame\
-    --enable-libopencore_amrnb\
-    --enable-libopencore_amrwb\
+    --enable-libopencore-amrnb\
+    --enable-libopencore-amrwb\
     --disable-libopenjpeg\
     --enable-libopus\
     --enable-libpulse\
@@ -90,7 +92,7 @@ build() {
     --enable-x11grab
   make
   make tools/qt-faststart
-  make doc/av{conv,play}.1 # doc/avserver.1
+  make doc/av{conv,play}.1
 }
 
 package() {
diff --git a/pcr/python2-renpy/PKGBUILD b/pcr/python2-renpy/PKGBUILD
index ee91bafb8..db2a94428 100644
--- a/pcr/python2-renpy/PKGBUILD
+++ b/pcr/python2-renpy/PKGBUILD
@@ -3,8 +3,8 @@
 
 _pkgname=renpy
 pkgname=python2-renpy
-pkgver=6.15.7
-pkgrel=2
+pkgver=6.16.2
+pkgrel=1
 pkgdesc="Platform-dependant Ren'Py libraries."
 arch=(
   mips64el
@@ -29,7 +29,7 @@ conflicts=(
 )
 renplaces=python-$_pkgname
 source=http://www.$_pkgname.org/dl/$pkgver/$_pkgname-$pkgver-source.tar.bz2
-sha512sums=d79b1d6b931f281ff208b8ece3889c116ceb05c58fe115e9f7f470788e74e63cfeb3df4f804b4a37a4f1da6ba194c883023808fafc8e8beddf864424958204e6
+sha512sums=fc3b40f01f2d1e820a05f90a2d85e42986aaa4840e506d18ea76a78527d2f98ca6cf832ebde3e1f996b94f4ce4b175856da913f3de7f1a9db48aba0eea84b52d
 
 build() {
   cd $srcdir/$_pkgname-$pkgver-source
diff --git a/pcr/renpy/PKGBUILD b/pcr/renpy/PKGBUILD
index a9f2475db..61874b5ba 100644
--- a/pcr/renpy/PKGBUILD
+++ b/pcr/renpy/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
 
 pkgname=renpy
-pkgver=6.15.7
+pkgver=6.16.2
 pkgrel=1
 pkgdesc="Ren'Py is a visual novel engine that helps you use words, images, and sounds to tell stories with the computer. This package contains both player and development tools."
 arch=any
@@ -25,7 +25,7 @@ source=(
   $pkgname-launcher.sh
 )
 sha512sums=(
-  d79b1d6b931f281ff208b8ece3889c116ceb05c58fe115e9f7f470788e74e63cfeb3df4f804b4a37a4f1da6ba194c883023808fafc8e8beddf864424958204e6
+  fc3b40f01f2d1e820a05f90a2d85e42986aaa4840e506d18ea76a78527d2f98ca6cf832ebde3e1f996b94f4ce4b175856da913f3de7f1a9db48aba0eea84b52d
   1af85c7a0c10662bfa4c03611fed695325f5953ac0f2c913f5342b1dca22b22115f07e69d646d92a3b95f5b896283e9b1bc7fe3e0a338536b5d9d48beedae8d5
   2a9302adbc6ff45e048d42487ac86e7501f90b2d393933af5d39d663a0b3707f795a04f65598e356a64809dfa0175a4ad860b355e5337ee149692c21caf339df
   bcb3152a88d5f913a99855e9d6fa5d0019e310ba9d55a6288d2d8b60cb6c9ab3ddf8c772dfd23a2851d52479adc2a16bd3ffe25ff7fb50d222ec1f55eaa48b09
@@ -50,7 +50,7 @@ package(){
   install -vDm755 $srcdir/$pkgname-launcher.sh $pkgdir/usr/bin/$pkgname
   install -vDm644 $srcdir/$pkgname.desktop $pkgdir/usr/share/applications/$pkgname.desktop
 
-  cp -va launcher $pkgname{,.py} template the_question tutorial $pkgdir/usr/share/$pkgname
+  cp -va launcher $pkgname{,.py} templates the_question tutorial $pkgdir/usr/share/$pkgname
   ln -vs $pkgname/common $pkgdir/usr/share/$pkgname/common
   cp -va doc/* $pkgdir/usr/share/doc/$pkgname
 
diff --git a/pcr/twinkle/PKGBUILD b/pcr/twinkle/PKGBUILD
new file mode 100644
index 000000000..5a8a0430c
--- /dev/null
+++ b/pcr/twinkle/PKGBUILD
@@ -0,0 +1,50 @@
+# $Id: PKGBUILD 68598 2012-03-29 08:03:13Z arodseth $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor: Jeff Mickey <jeff@archlinux.org>
+# Contributor: Alexander Baldeck <alexander@archlinux.org>
+# Contributor: Federico Quagliata (quaqo) <quaqo@despammed.com>
+# Contributor: Alexander Rødseth <rodseth@gmail.com>
+
+pkgname=twinkle
+pkgver=1.4.2
+pkgrel=19
+pkgdesc="Softphone for voice over IP and IM communication using SIP"
+arch=('x86_64' 'i686')
+url="http://www.twinklephone.com/"
+license=('GPL')
+depends=('file' 'speex' 'boost-libs' 'libsndfile' 'qt3' 'libzrtpcpp' 
+'commoncpp2' 'libxml2')
+makedepends=('pkg-config' 'boost')
+source=("http://www.xs4all.nl/~mfnboer/$pkgname/download/$pkgname-$pkgver.tar.gz"
+ twinkle-1.4.2-ccrtp.patch)
+md5sums=('d70c8972f296ffd998c7fb698774705b'
+         '934f59ff60a8ae29a152feb8bf131ae2')
+
+build() {
+  cd "$srcdir"
+  patch -p0 < ./twinkle-1.4.2-ccrtp.patch || return 1
+
+  cd "$pkgname-$pkgver"
+  aclocal
+  autoconf
+  automake -a
+  export QTDIR=/usr/lib/qt3
+  export PATH=$QTDIR/bin:$PATH
+  CPPFLAGS="$CPPFLAGS -I/usr/include/qt3" \
+  ./configure --prefix=/usr \
+	--without-kde \
+	--with-speex \
+	--without-ilbc \
+	--mandir=/usr/share/man
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  make DESTDIR="$pkgdir" install
+  install -Dm644 "$pkgdir/usr/share/twinkle/twinkle48.png" \
+    "$pkgdir/usr/share/pixmaps/twinkle.png"
+  install -Dm644 twinkle.desktop \
+    "$pkgdir/usr/share/applications/twinkle.desktop"
+}
diff --git a/pcr/twinkle/twinkle-1.4.2-ccrtp.patch b/pcr/twinkle/twinkle-1.4.2-ccrtp.patch
new file mode 100644
index 000000000..fdb5f6260
--- /dev/null
+++ b/pcr/twinkle/twinkle-1.4.2-ccrtp.patch
@@ -0,0 +1,24 @@
+diff -pruN twinkle-1.4.2-o/configure.in twinkle-1.4.2/configure.in
+--- twinkle-1.4.2-o/configure.in	2009-02-24 11:49:20.000000000 -0800
++++ twinkle-1.4.2/configure.in	2012-05-19 09:20:51.151778516 -0700
+@@ -66,7 +66,7 @@ fi
+ 
+ export PKG_CONFIG_PATH
+ 
+-PKG_CHECK_MODULES(CCRTP, libccrtp1 >= 1.6.0)
++PKG_CHECK_MODULES(CCRTP, libccrtp >= 2.0.0)
+ 
+ PKG_CHECK_MODULES(XML2, libxml-2.0)
+ # AC_CHECK_HEADER(libxml/tree.h, [],
+diff -pruN twinkle-1.4.2-o/src/log.cpp twinkle-1.4.2/src/log.cpp
+--- twinkle-1.4.2-o/src/log.cpp	2009-01-18 06:35:28.000000000 -0800
++++ twinkle-1.4.2/src/log.cpp	2012-05-19 09:21:11.071594114 -0700
+@@ -161,7 +161,7 @@ void t_log::write_header(const string &f
+ 
+ 	gettimeofday(&t, NULL);
+ 	date = t.tv_sec;
+-	localtime_r(&date, &tm);
++	::localtime_r(&date, &tm);
+ 
+ 	*log_stream << "+++ ";
+ 	*log_stream << tm.tm_mday;
diff --git a/pcr/youtube-dl-current/PKGBUILD b/pcr/youtube-dl-current/PKGBUILD
index 75e4d2bd6..e1eb3fc8a 100644
--- a/pcr/youtube-dl-current/PKGBUILD
+++ b/pcr/youtube-dl-current/PKGBUILD
@@ -5,7 +5,7 @@
 pkgname=youtube-dl-current
 _pkgname=youtube-dl
 provides=(youtube-dl)
-pkgver=2013.11.15.1
+pkgver=2013.11.24.1
 pkgrel=1
 pkgdesc="A small command-line program to download videos from YouTube.com and a few more sites"
 arch=('any')
@@ -27,5 +27,5 @@ package() {
     "${pkgdir}/usr/share/bash-completion/completions/youtube-dl"
   install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${_pkgname}/LICENSE"
 }
-md5sums=('eb60e8a818fca584cbb3f43cae321d83'
+md5sums=('76b8a95cccfb5bab782cee42c7891d44'
          'SKIP')