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

7 files changed, 174 insertions, 5 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+"$@"}