Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/alienarena/PKGBUILD
	community/mumble/PKGBUILD
	community/mysql-workbench/PKGBUILD
	community/paintown/PKGBUILD
	community/ufoai/PKGBUILD
	core/dcron/PKGBUILD
	core/udev/PKGBUILD
	extra/qt/PKGBUILD
	extra/texlive-bin/PKGBUILD
	testing/opencv/PKGBUILD
	testing/pciutils/PKGBUILD
	testing/usbutils/PKGBUILD

4 files changed, 77 insertions, 322 deletions

diff --git a/extra/blender/PKGBUILD b/extra/blender/PKGBUILD
index 660bc6894..430a3002e 100644
--- a/extra/blender/PKGBUILD
+++ b/extra/blender/PKGBUILD
@@ -1,143 +1,89 @@
-# $Id: PKGBUILD 101917 2010-12-02 16:14:10Z ibiru $
+# $Id: PKGBUILD 121081 2011-04-29 00:16:23Z eric $
 # Contributor: John Sowiak <john@archlinux.org>
 # Maintainer: tobias <tobias@archlinux.org>
 
-# TODO:
-# - consider switching to scons when it is better supported
-
 # Apparently, the blender guys refuse to release source tarballs for
 # intermediate releases that deal mainly with binaries but incorporate tiny
-# minor changes from cvs. Since I'm sick and tired of the urges of users that
-# look for release numbers only we make a messy PKGBUILD that can checkout cvs
-# tags if necessary.
-#cvs=true
-cvs=false
+# minor changes from svn. Since I'm sick and tired of the urges of users that
+# look for release numbers only we make a messy PKGBUILD that can checkout svn
+# release if necessary.
+
+_svn=true
+#_svn=false
 
 pkgname=blender
-pkgver=2.49b
+pkgver=2.57b
 pkgrel=2
+epoch=1
 pkgdesc="A fully integrated 3D graphics creation suite"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://www.blender.org"
-depends=('libjpeg' 'libpng' 'openexr' 'sdl' 'python2' 'desktop-file-utils' \
-         'gettext' 'libxi' 'libxmu' 'mesa' 'freetype2' 'openal')
-makedepends=('freeglut' 'libtiff' 'librsvg' 'yasm' 'csv')
-options=('!makeflags')
+depends=('libjpeg' 'libpng' 'openjpeg' 'libtiff' 'openexr' 'sdl' 'python' 'desktop-file-utils' \
+         'shared-mime-info' 'hicolor-icon-theme' 'xdg-utils' 'gettext' 'libxi' 'libxmu' 'mesa' \
+         'freetype2' 'openal' 'libsndfile' 'libsamplerate' 'ffmpeg')
+makedepends=('cmake') # 'subversion'
 install=blender.install
-source=($pkgname.desktop $pkgname.svg)
-if [ ! $cvs -o $cvs = false ]; then
-  makedepends=('freeglut' 'libtiff' 'librsvg' 'yasm')
-  source=(${source[@]} http://download.blender.org/source/$pkgname-$pkgver.tar.gz)
-  md5sums=('b5b9720b9430b1f5e2aa0b2df533fed8'
-         '0e53299444ff5570639c8f59372bc98c'
-         '718eef6a4ff377989e829b92a886cc5b')
-  sha1sums=('9ae82b5df21b4803f981e3df4a256b4be7137273'
-          '1e5452f56f590d5ce1af8c174113f0e639714c0c'
-          '43f71e7de4efe79c518d45f4b5a04e03c28d5fc5')
+if [ $_svn = false ]; then
+  source=(http://download.blender.org/source/$pkgname-$pkgver.tar.gz)
+  md5sums=('e6cb5523323a71c070051e6fe6efe497')
+else
+  source=(ftp://ftp.archlinux.org/other/${pkgname}/$pkgname-$pkgver.tar.xz)
+  md5sums=('59e344d4ec48750a86e4ef079c3acbfc')
 fi
 
-build() {
-  if [ $cvs = true ]; then
-    cd "$srcdir/"
-    #cvs -d:pserver:anonymous@cvs.blender.org:/cvsroot/bf-blender login
-    cvs -z3 -d:pserver:anonymous@cvs.blender.org:/cvsroot/bf-blender checkout $pkgname
-    _cvsrel=$pkgname-$(echo $pkgver | sed 's/\./-/')-release
-    cvs -d:pserver:anonymous@cvs.blender.org:/cvsroot/bf-blender update -r $_cvsrel
-    find $pkgname/{bin,release/scripts} -name 'CVS' -exec rm -rf {} \; 2> /dev/null
-    cd $pkgname
-  else
-    cd "$srcdir/$pkgname-$pkgver"
-  fi
-
- rm -f user-def.mk
-
- ##########################################################################
- # tweak the makefiles to prepare build for ArchLinux
-   # disable static binaries and enable blenderplayer binary
-  sed -i "s|^.*\(BINTARGETS += blenderstatic\)|    #\1|g" source/Makefile
-  sed -i "s|^#\(.*BINTARGETS += blenderplayer\)|\1|g" source/Makefile
-  # link freetype and openal dynamically
-  sed -i 's|LOPTS)|LOPTS) -lfreetype -lopenal|g' source/Makefile
-  sed -i 's|COMLIB.*libfreetype\.a|#\0|g' source/Makefile
-  sed -i 's|NAN_SND_LIBS.*libopenal\.a|#\0|g' source/Makefile
-   # make ode (alternative physics engine)
-   # does not work for Arch64
-   #[ "$CARCH" = "i686" ] && sed -i 's|^\(DIRS.*\)$|\1 ode|' extern/Makefile
-   # make the nan_makefiles happy
-  export NAN_PYTHON_VERSION=2.7
-  export INTERNATIONAL=true
-  export WITH_FREETYPE2=true
-  export NAN_FREETYPE=/usr
-  export WITH_ICONV=true
-
-  export NAN_NO_PLUGIN=true
-
-  export NAN_OPENAL=/usr
-  export NAN_FMOD=/usr
-  export NAN_JPEG=/usr
-  export NAN_PNG=/usr
-  export WITH_OPENEXR=true
-  export NAN_OPENEXR=/usr
-  export NAN_ODE=/usr
-  export NAN_OPENEXR_LIBS=$(pkg-config --libs-only-l OpenEXR)
-
-  export NAN_SDL=/usr
-  export NAN_ZLIB=/usr
-  export NAN_MESA=/usr
+# source PKGBUILD && mksource
+mksource() {
+  _svnver=36339
+  _svntrunk="https://svn.blender.org/svnroot/bf-blender/trunk/blender"
+  _svnmod="$pkgname-$pkgver"
+  mkdir ${pkgname}-$pkgver
+  pushd ${pkgname}-$pkgver
+  svn co $_svntrunk --config-dir ./ -r $_svnver $_svnmod
+  find . -depth -type d -name .svn -exec rm -rf {} \;
+  tar -cJf ../${pkgname}-$pkgver.tar.xz ${pkgname}-$pkgver/*
+  popd
+}
 
-  export NAN_USE_BULLET=true
-  export NAN_USE_FFMPEG_CONFIG=true
-  export WITH_BF_VERSE=true
-  export WITH_VERSE=true
-  export WITH_BF_OPENMP=true
-  # there is an issue with a file
-  export NAN_DEBUG=-O
- ###########################################################################
- # build
-  LDFLAGS="-Wl,--hash-style=gnu"
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+  mkdir build
+  cd build
+
+  [[ $CARCH == i686 ]] && ENABLESSE2="-DSUPPORT_SSE2_BUILD:BOOL=OFF"
+
+  cmake .. \
+    -DCMAKE_INSTALL_PREFIX:PATH=/usr \
+    -DCMAKE_BUILD_TYPE:STRING=Release \
+    -DWITH_INSTALL_PORTABLE:BOOL=OFF \
+    -DWITH_PYTHON_INSTALL:BOOL=OFF \
+    -DWITH_OPENCOLLADA:BOOL=OFF \
+    -DWITH_GAMEENGINE:BOOL=ON \
+    -DWITH_PLAYER:BOOL=ON \
+    -DPYTHON_VERSION:STRING=3.2 \
+    -DPYTHON_LIBPATH:STRING=/usr/lib \
+    -DPYTHON_LIBRARY:STRING=python3.2mu \
+    -DPYTHON_INCLUDE_DIRS:STRING=/usr/include/python3.2mu \
+    $ENABLESSE2
+
+  make $MAKEFLAGS
+
+  cp -rf "$srcdir"/${pkgname}-$pkgver/release/plugins/* \
+    "$srcdir"/${pkgname}-$pkgver/source/blender/blenpluginapi/
+  cd "$srcdir"/${pkgname}-$pkgver/source/blender/blenpluginapi
+  chmod 755 bmake
   make
- ###########################################################################
 }
 
 package() {
-  if [ $cvs = true ]; then
-    cd "$srcdir/$pkgname"
-  else
-    cd "$srcdir/$pkgname-$pkgver"
-  fi
-
-  cd obj/linux-glibc2*/bin
-
-# common part
-
- mkdir -p "$pkgdir/usr/share/"
-
- # install binaries
- install -Dm755 blender "$pkgdir/usr/bin/blender"
- install -Dm755 blenderplayer "$pkgdir/usr/bin/blenderplayer"
-
- # install internationalization support
- cd ../../../bin/.blender
- install -D -m644 .Blanguages \
-   "$pkgdir/usr/share/$pkgname/.Blanguages"
- install -D -m644 .bfont.ttf \
-   "$pkgdir/usr/share/$pkgname/.bfont.ttf"
-
- cp -R locale "$pkgdir/usr/share/"
-
- # install scripts
- cd ../../release/
- cp -R scripts "$pkgdir/usr/share/$pkgname/"
-sed -i 's|#!/usr/bin/python|#!/usr/bin/python2|' "$pkgdir/usr/share/blender/scripts/bpymodules/blend2renderinfo.py"
-
- # install all additional stuff
- # install a freedesktop.org compliant menu entry
- install -Dm644 "$srcdir/$pkgname.desktop" "$pkgdir/usr/share/applications/$pkgname.desktop"
- # install some freedesktop.org compatibility
- install -D -m644 "$srcdir/$pkgname.svg" "$pkgdir/usr/share/pixmaps/$pkgname.svg"
- # finally we render a png as fallback for not svg aware menu applications
- # Attention: always make sure you check the dimensions of the source-svg,
- # you can read the dimensions via inkscape's export function
- rsvg -w 64 -h 64 -f png "$pkgdir/usr/share/pixmaps/$pkgname.svg" "$pkgdir/usr/share/pixmaps/$pkgname.png"
+  cd "$srcdir/$pkgname-$pkgver/build"
+  make DESTDIR="${pkgdir}" install
+  python -m compileall "${pkgdir}/usr/share/blender"
+
+# install plugins
+  install -d -m755 "$pkgdir"/usr/share/blender/${pkgver%[a-z]}/plugins/{sequence,texture}
+  cp "$srcdir"/${pkgname}-$pkgver/source/blender/blenpluginapi/sequence/*.so \
+    "$pkgdir"/usr/share/blender/${pkgver%[a-z]}/plugins/sequence/
+  cp "$srcdir"/${pkgname}-$pkgver/source/blender/blenpluginapi/texture/*.so \
+    "$pkgdir"/usr/share/blender/${pkgver%[a-z]}/plugins/texture/
 }
diff --git a/extra/blender/blender.desktop b/extra/blender/blender.desktop
deleted file mode 100644
index 71893dc4a..000000000
--- a/extra/blender/blender.desktop
+++ /dev/null
@@ -1,19 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=Blender
-Name[da]=Blender
-Name[nl]=Blender
-Name[no]=Blender
-Name[de]=Blender
-Name[es]=Blender
-Comment=A 3D program
-Comment[es]=Un programa de 3D
-Comment[no]=Et 3d-program
-Comment[da]=Et program til 3d-modelering
-Exec=blender
-Icon=blender
-Terminal=false
-X-MultipleArgs=false
-Type=Application
-Categories=Application;Graphics;3DGraphics;
-MimeType=application/blender;application/x-blender;
diff --git a/extra/blender/blender.install b/extra/blender/blender.install
index 0cc7aef46..2fcf98022 100644
--- a/extra/blender/blender.install
+++ b/extra/blender/blender.install
@@ -3,26 +3,25 @@ post_install() {
 
 NOTE
 ----
-blender is using the NAN makefiles to build, so we can access some better
-features:
-	- i18n support
-	- anti-aliased interface fonts
-	- gameplayer
+
 We also ship the plugins, but most of these features can be accessed only
-from the users home directory. Therefore, you wanna copy everything from
-/usr/share/blender to ~/.blender (some are hidden files!). The browser-
-plugin builds but is using an old mozilla API, this is why it doesn't work
-and we don't ship it.
-Happy blending!
+from the users home directory. Therefore, you want to copy everything from
+/usr/share/blender/2.57 to ~/.blender (some are hidden files!). 
 
 EOF
   update-desktop-database -q
+  update-mime-database usr/share/mime &> /dev/null
+  xdg-icon-resource forceupdate --theme hicolor &> /dev/null
 }
 
 post_upgrade() {
   update-desktop-database -q
+  update-mime-database usr/share/mime &> /dev/null
+  xdg-icon-resource forceupdate --theme hicolor &> /dev/null
 }
 
 post_remove() {
   update-desktop-database -q
+  update-mime-database usr/share/mime &> /dev/null
+  xdg-icon-resource forceupdate --theme hicolor &> /dev/null
 }
diff --git a/extra/blender/blender.svg b/extra/blender/blender.svg
deleted file mode 100644
index ab61cc362..000000000
--- a/extra/blender/blender.svg
+++ /dev/null
@@ -1,171 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
-"http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   id="svg1573"
-   sodipodi:version="0.32"
-   inkscape:version="0.39"
-   width="100.00000pt"
-   height="100.00000pt"
-   sodipodi:docbase="/home/build/abs/extra/multimedia/blender"
-   sodipodi:docname="blender.svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:xlink="http://www.w3.org/1999/xlink">
-  <defs
-     id="defs1575">
-    <linearGradient
-       id="linearGradient1792">
-      <stop
-         style="stop-color:#000000;stop-opacity:0.42937854;"
-         offset="0.0000000"
-         id="stop1793" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0.12429378;"
-         offset="0.63222224"
-         id="stop1795" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0.0000000;"
-         offset="1.0000000"
-         id="stop1794" />
-    </linearGradient>
-    <radialGradient
-       xlink:href="#linearGradient1792"
-       id="radialGradient1950"
-       cx="0.50000000"
-       cy="0.50000000"
-       r="0.50000000"
-       fx="0.67944252"
-       fy="0.19298245" />
-    <linearGradient
-       id="linearGradient1606">
-      <stop
-         style="stop-color:#000000;stop-opacity:0.62745100;"
-         offset="0.0000000"
-         id="stop1607" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0.0000000;"
-         offset="1.0000000"
-         id="stop1608" />
-    </linearGradient>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7.9999998"
-     inkscape:cx="50.134523"
-     inkscape:cy="35.997949"
-     inkscape:window-width="1272"
-     inkscape:window-height="1002"
-     showgrid="true"
-     snaptogrid="false"
-     gridspacingy="10.000000pt"
-     gridspacingx="10.000000pt"
-     gridoriginy="0.0000000pt"
-     gridoriginx="0.0000000pt"
-     gridtolerance="2.0000000px"
-     inkscape:grid-bbox="true"
-     inkscape:grid-points="true"
-     inkscape:window-x="1282"
-     inkscape:window-y="0" />
-  <metadata
-     id="metadata1576">
-    <rdf:RDF
-       id="RDF1577">
-      <cc:Work
-         rdf:about=""
-         id="Work1578">
-        <dc:description
-           id="description1579">Created with Inkscape
-http://www.inkscape.org/</dc:description>
-        <dc:format
-           id="format1581">image/svg+xml</dc:format>
-        <dc:type
-           id="type1583"
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title
-           id="title1606">ML-Term Icon</dc:title>
-        <dc:date
-           id="date1608">2004-07-14</dc:date>
-        <dc:creator
-           id="creator1610">
-          <cc:Agent
-             id="Agent1611">
-            <dc:title
-               id="title1612">Tobias Kieslich</dc:title>
-          </cc:Agent>
-        </dc:creator>
-        <dc:coverage
-           id="coverage1614" />
-        <cc:license
-           id="license1616"
-           rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" />
-      </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/licenses/GPL/2.0/"
-         id="License1624">
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Reproduction"
-           id="permits1625" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Distribution"
-           id="permits1626" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/Notice"
-           id="requires1627" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/DerivativeWorks"
-           id="permits1628" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/ShareAlike"
-           id="requires1629" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/SourceCode"
-           id="requires1630" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-  <path
-     sodipodi:type="arc"
-     style="fill:url(#radialGradient1950);fill-opacity:0.75000000;fill-rule:evenodd;stroke-width:1.0000000pt;"
-     id="path1827"
-     sodipodi:cx="29.010935"
-     sodipodi:cy="58.727592"
-     sodipodi:rx="23.157850"
-     sodipodi:ry="23.157850"
-     d="M 52.168785 58.727592 A 23.157850 23.157850 0 1 0 5.8530846,58.727592 A 23.157850 23.157850 0 1 0 52.168785 58.727592 z"
-     transform="matrix(2.556262,0.000000,0.000000,0.770827,-8.357083,60.08188)" />
-  <g
-     id="g1084"
-     transform="matrix(4.277757,0.000000,0.000000,4.277757,-244.4442,-256.4384)">
-    <path
-       style="fill:#e79100;fill-rule:evenodd;stroke:#000000;stroke-width:2.5581360;"
-       d="M 70.183754,64.486103 C 70.970246,65.122765 71.746941,65.771669 72.540115,66.399985 C 69.453580,66.550314 66.336707,66.536916 63.267234,66.751339 C 61.553800,66.933280 62.119503,69.750024 63.656883,69.617641 C 64.925860,69.617641 66.194837,69.617641 67.463814,69.617641 C 64.899642,71.537080 62.334113,73.454704 59.769421,75.373447 C 57.974777,76.830324 59.759220,79.624301 61.528139,78.790956 C 62.843668,78.218932 63.672855,76.918567 64.775590,76.029244 C 65.272386,75.762533 66.061744,74.237148 66.195454,75.421789 C 66.812356,77.527269 68.113458,79.532317 70.023285,80.657078 C 78.453997,86.618341 88.293096,75.890516 82.467250,70.321032 C 81.347167,68.630878 79.527221,67.572142 77.996121,66.287702 C 76.220705,64.972085 74.509428,63.515316 72.695293,62.285243 C 70.961182,60.910865 68.645443,63.114782 70.183754,64.486103 z "
-       id="path1829"
-       sodipodi:nodetypes="cccccccccccccc" />
-    <path
-       style="fill:#e79100;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.63953400pt;"
-       d="M 70.479501,64.479682 C 71.265993,65.116344 72.042688,65.765247 72.835862,66.393564 C 69.749327,66.543893 66.632454,66.530495 63.562981,66.744917 C 61.849547,66.926859 62.415250,69.743603 63.952630,69.611219 C 65.221607,69.611219 66.490584,69.611219 67.759561,69.611219 C 65.195389,71.530659 62.629860,73.448283 60.065168,75.367025 C 58.270524,76.823903 60.054967,79.617880 61.823886,78.784535 C 63.139415,78.212510 63.968602,76.912146 65.071337,76.022823 C 65.568133,75.756111 66.357491,74.230727 66.491201,75.415368 C 67.108103,77.520848 68.409205,79.525896 70.319032,80.650657 C 78.749744,86.611920 88.588843,75.884095 82.762997,70.314611 C 81.642914,68.624457 79.822968,67.565721 78.291868,66.281281 C 76.516452,64.965664 74.805175,63.508895 72.991040,62.278821 C 71.256929,60.904444 68.941190,63.108361 70.479501,64.479682 z "
-       id="path1831"
-       sodipodi:nodetypes="cccccccccccccc" />
-    <path
-       sodipodi:type="arc"
-       style="fill:#345c87;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.4483387;"
-       id="path1832"
-       sodipodi:cx="28.791338"
-       sodipodi:cy="24.460691"
-       sodipodi:rx="5.3983760"
-       sodipodi:ry="5.0384841"
-       d="M 34.189714 24.460691 A 5.3983760 5.0384841 0 1 0 23.392962,24.460691 A 5.3983760 5.0384841 0 1 0 34.189714 24.460691 z"
-       transform="matrix(0.822413,0.000000,0.000000,0.822413,51.33976,53.33570)" />
-  </g>
-</svg>