summaryrefslogtreecommitdiff
path: root/libre
diff options
context:
space:
mode:
authorNicolás Reynolds <fauno@parabola.nu>2013-04-25 12:23:15 -0300
committerNicolás Reynolds <fauno@parabola.nu>2013-04-25 12:23:15 -0300
commit9812539755a6a6add00fcf90f52a8a20b0385bfb (patch)
treee875b28795e38c8798602ea02e7fefe58bb27bfa /libre
parent6bb91ff33ab7e35929e346854d8e5c558c4107cf (diff)
parentee387c4f2fc3fc5fc3251fd84a7386202e270d63 (diff)
downloadabslibre-9812539755a6a6add00fcf90f52a8a20b0385bfb.tar.gz
abslibre-9812539755a6a6add00fcf90f52a8a20b0385bfb.tar.bz2
abslibre-9812539755a6a6add00fcf90f52a8a20b0385bfb.zip
Merge branch 'master' of vparabola:abslibre
Diffstat (limited to 'libre')
-rw-r--r--libre/blender-addon-luxrender/PKGBUILD35
-rw-r--r--libre/blender-libre/PKGBUILD47
-rw-r--r--libre/cgminer-libre/PKGBUILD4
-rw-r--r--libre/luxblend25/PKGBUILD35
-rw-r--r--libre/luxrender-libre/PKGBUILD8
-rw-r--r--libre/luxrender-libre/boost-1.53-shared_array_constructor.diff62
-rw-r--r--libre/opencollada/PKGBUILD52
-rw-r--r--libre/python2-cssmin-fredj/PKGBUILD34
-rw-r--r--libre/python2-django-countries/PKGBUILD3
-rw-r--r--libre/soundkonverter-libre/PKGBUILD6
10 files changed, 219 insertions, 67 deletions
diff --git a/libre/blender-addon-luxrender/PKGBUILD b/libre/blender-addon-luxrender/PKGBUILD
new file mode 100644
index 000000000..97a1b4f12
--- /dev/null
+++ b/libre/blender-addon-luxrender/PKGBUILD
@@ -0,0 +1,35 @@
+# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
+
+pkgname=blender-addon-luxrender
+_pkgname=${pkgname:14:3}${pkgname::5}25
+_srcver=c9deae0646d0
+pkgver=1.2.1.v2.66
+_pkgver=${pkgver::5}
+_reqname=${pkgname::7}
+_reqver=${pkgver:7}
+_reqep=7
+pkgrel=2
+pkgdesc="$_pkgname: A addon for the ${_reqname^} which allows render and export with LuxRender (built for the $_reqname-libre package)"
+arch=any
+url=http://www.${pkgname:14}.net/
+license=GPL
+depends=(
+ ${pkgname:14}=$_pkgver
+ "$_reqname>=$(($_reqep-1)):$_reqver"
+ "$_reqname<$_reqep:${_reqver::2}$((${_reqver:2:4}+1))"
+)
+provides=($_pkgname=$_pkgver)
+conflicts=$_pkgname
+replaces=$_pkgname
+source=http://src.${pkgname:14}.net/$_pkgname/archive/$_srcver.tar.bz2
+sha512sums=e8d93d5d9d73c1cd4f2008697bd9a8a125d08910aed3f4d3e4bcd290810d673aa663c327fc2cb7ac983cb3439a6996431c39bc3a2f0b6ed05ce5d0b8398ece92
+
+package() {
+ a=$srcdir/$_pkgname-$_srcver/src/${pkgname:14}
+ b=$pkgdir/usr/share/$_reqname/$_reqver/scripts/addons
+ install -d -m755 $b && cp -a $a $b
+ # change the search path in exporter so it finds pylux in its new location
+ sed -i 's|from.*import pylux|import pylux|' $b/${pkgname:14}/outputs/pure_api.py
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/libre/blender-libre/PKGBUILD b/libre/blender-libre/PKGBUILD
index 441e658a9..e303d8d2b 100644
--- a/libre/blender-libre/PKGBUILD
+++ b/libre/blender-libre/PKGBUILD
@@ -1,4 +1,3 @@
-# $Id$
# Maintainer: Márcio Silva <coadde@lavabit.com>
_spacenav=false
@@ -14,7 +13,7 @@ fi
epoch=7
pkgver=2.66a
_pyver=3.3
-pkgrel=3
+pkgrel=4
pkgdesc="Fully integrated 3D graphics creation suite, without nonfree povray and cuda support$_spndesc"
arch=(
i686
@@ -22,21 +21,23 @@ arch=(
mips64el
)
license=GPL
-url="http://www.${_pkgname%-$_pkgflag}.org"
+url=http://www.${_pkgname%-$_pkgflag}.org
depends=(
desktop-file-utils
- ffmpeg
- fftw
- freetype2
+ 'ffmpeg=1:1.2'
+ fftw #3.3.3
+ freetype2 #2.4.11
hicolor-icon-theme
+ 'ilmbase=2.0.0'
jack
- libpng
- libtiff
- openal
- openimageio
- opencollada
- opencolorio
- openshadinglanguage
+ libpng #1.5.15
+ libtiff #4.0.3
+ openal #1.15.1
+ 'openexr=2.0.0'
+ openimageio #1.1.9
+ 'opencollada=20130305'
+ opencolorio #1.0.8
+ openshadinglanguage #1.3.0
shared-mime-info
xdg-utils
)
@@ -45,27 +46,29 @@ if [ $_spacenav == true ]; then
libspnav
)
fi
-optdepends='bullet: for Rigid Bodies and Physics Simulation'
+optdepends=(
+ 'bullet: for Rigid Bodies and Physics Simulation'
+ 'xcftools: for import GIMP images to scene (pcr repo)'
+)
makedepends=(
boost
cmake
mesa
subversion
)
-provides=(
- ${_pkgname%-$_pkgflag}=$epoch:$pkgver
-)
+provides=(${_pkgname%-$_pkgflag}=$epoch:$pkgver)
conflicts=${_pkgname%-$_pkgflag}
replaces=${_pkgname%-$_pkgflag}
install=$_pkgname.install
-source="http://download.${_pkgname%-$_pkgflag}.org/source/${_pkgname%-$_pkgflag}-$pkgver.tar.gz"
+source=http://download.${_pkgname%-$_pkgflag}.org/source/${_pkgname%-$_pkgflag}-$pkgver.tar.gz
sha512sums=ea5def031daa220991f6165950234b311e8ae3baa6785d6226efefa90b64e1b83e8635f71f9a7fc7ae23923ce313d5ae48ffa0c54cf7ff794a4fb2dacbe8714f
-build() {
- cd $srcdir/${_pkgname%-$_pkgflag}-$pkgver
+prepare() {
+ mkdir cd $srcdir/${_pkgname%-$_pkgflag}-$pkgver/build
+}
- mkdir build
- cd build
+build() {
+ cd $srcdir/${_pkgname%-$_pkgflag}-$pkgver/build
[[ $CARCH == i686 ]] && DSUPPORT_SSE2_BUILD='-DSUPPORT_SSE2_BUILD=OFF'
diff --git a/libre/cgminer-libre/PKGBUILD b/libre/cgminer-libre/PKGBUILD
index 9d771b952..748b1a1da 100644
--- a/libre/cgminer-libre/PKGBUILD
+++ b/libre/cgminer-libre/PKGBUILD
@@ -8,8 +8,8 @@
pkgname=cgminer-libre
_pkgflag=libre
pkgver=3.0.0
-pkgrel=1
-pkgdesc="Multi-threaded multi-pool CPU and GPU miner for bitcoin, forked from cpuminer, without nonfree OpenCL recommendation"
+pkgrel=2
+pkgdesc="Multi-threaded multi-pool GPU, FPGA and ASIC miner for bitcoin and derivative coins, without nonfree OpenCL recommendation"
url='http://forum.bitcoin.org/index.php?topic=28402.0'
license=('GPL3')
arch=('i686' 'x86_64' 'mips64el')
diff --git a/libre/luxblend25/PKGBUILD b/libre/luxblend25/PKGBUILD
deleted file mode 100644
index 2af861641..000000000
--- a/libre/luxblend25/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id$
-# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
-
-pkgbase=luxrender
-pkgname=luxblend25
-srcver=c9deae0646d0
-pkgver=1.2.1.v2.66
-_pkgver=${pkgver::5}
-reqname=blender
-reqver=${pkgver:7}
-reqep=7
-pkgrel=1
-pkgdesc="LuxRender exporter for ${reqname^}."
-arch=any
-url=http://www.$pkgbase.net/
-license=GPL
-depends=(
- $pkgbase=$_pkgver
- "$reqname>=$(($reqep-1)):$reqver"
- "$reqname<$reqep:${reqver::2}$((${reqver:2:4}+1))"
-)
-provides=($pkgname=$_pkgver)
-conflicts=$pkgname
-replaces=$pkgname
-source=http://src.$pkgbase.net/$pkgname/archive/$srcver.tar.bz2
-sha512sums=e8d93d5d9d73c1cd4f2008697bd9a8a125d08910aed3f4d3e4bcd290810d673aa663c327fc2cb7ac983cb3439a6996431c39bc3a2f0b6ed05ce5d0b8398ece92
-
-package() {
- a=$pkgname-$srcver/src/$pkgbase
- b=usr/share/$reqname/$reqver/scripts/addons
- install -d -m755 $pkgdir/$b
- cp -a $srcdir/$a $pkgdir/$b
- # change the search path in exporter so it finds pylux in its new location
- sed -i 's|from.*import pylux|import pylux|' $pkgdir/$b/$pkgbase/outputs/pure_api.py
-}
diff --git a/libre/luxrender-libre/PKGBUILD b/libre/luxrender-libre/PKGBUILD
index 15bc771ed..3e9ae0e9e 100644
--- a/libre/luxrender-libre/PKGBUILD
+++ b/libre/luxrender-libre/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=luxrender-libre
_pkgflag=libre
pkgver=1.2.1
_pkgver=3066b2161439
-pkgrel=1
+pkgrel=2
pkgdesc="Rendering system for physically correct, unbiased image synthesis, without nonfree OpenCL recommendation"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.${pkgname%-$_pkgflag}.net/"
@@ -34,18 +34,18 @@ build() {
patch -Np1 < "$srcdir/boost-1.53-shared_array_constructor.diff" || true
export CXXFLAGS="$CXXFLAGS -lpthread"
- cmake -DCMAKE_INSTALL_PREFIX=/usr \
+ setarch $CARCH cmake -DCMAKE_INSTALL_PREFIX=/usr \
-DLUXRAYS_DISABLE_OPENCL=OFF \
-DPYTHON_CUSTOM=ON \
-DPYTHON_LIBRARIES=/usr/lib/libpython3.3m.so \
-DPYTHON_INCLUDE_PATH=/usr/include/python3.3m/ \
.
- make
+ setarch $CARCH make
}
package() {
cd "$srcdir"/${pkgname%-$_pkgflag}-lux-$_pkgver
- make DESTDIR="$pkgdir" install
+ setarch $CARCH make DESTDIR="$pkgdir" install
# fix library path on x86_64
[ "$CARCH" = "x86_64" ] && mv "$pkgdir"/usr/lib64 "$pkgdir"/usr/lib
diff --git a/libre/luxrender-libre/boost-1.53-shared_array_constructor.diff b/libre/luxrender-libre/boost-1.53-shared_array_constructor.diff
new file mode 100644
index 000000000..a6a8d532b
--- /dev/null
+++ b/libre/luxrender-libre/boost-1.53-shared_array_constructor.diff
@@ -0,0 +1,62 @@
+diff -rup luxrender-lux-3066b2161439/cmake/luxrender.cmake luxrender-lux-3066b2161439.new/cmake/luxrender.cmake
+--- luxrender-lux-3066b2161439/cmake/luxrender.cmake 2013-03-16 19:32:24.000000000 +0000
++++ luxrender-lux-3066b2161439.new/cmake/luxrender.cmake 2013-03-26 18:26:46.194520697 +0000
+@@ -98,7 +98,7 @@ IF(QT4_FOUND)
+
+ QT4_ADD_RESOURCES( LUXQTGUI_RC_SRCS ${LUXQTGUI_RCS})
+ QT4_WRAP_UI( LUXQTGUI_UI_HDRS ${LUXQTGUI_UIS} )
+- QT4_WRAP_CPP( LUXQTGUI_MOC_SRCS ${LUXQTGUI_MOC} )
++ QT4_WRAP_CPP( LUXQTGUI_MOC_SRCS ${LUXQTGUI_MOC} OPTIONS -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED -DBOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION )
+
+ #file (GLOB TRANSLATIONS_FILES qtgui/translations/*.ts)
+ #qt4_create_translation(QM_FILES ${FILES_TO_TRANSLATE} ${TRANSLATIONS_FILES})
+diff -rup luxrender-lux-3066b2161439/core/film.cpp luxrender-lux-3066b2161439.new/core/film.cpp
+--- luxrender-lux-3066b2161439/core/film.cpp 2013-03-16 19:32:24.000000000 +0000
++++ luxrender-lux-3066b2161439.new/core/film.cpp 2013-03-26 18:03:02.828222310 +0000
+@@ -890,8 +890,8 @@ Film::Film(u_int xres, u_int yres, Filte
+ filename(filename1),
+ colorSpace(0.63f, 0.34f, 0.31f, 0.595f, 0.155f, 0.07f, 0.314275f, 0.329411f), // default is SMPTE
+ convTest(NULL), varianceBuffer(NULL),
+- noiseAwareMap(NULL), noiseAwareMapVersion(0),
+- userSamplingMapFileName(samplingmapfilename), userSamplingMap(NULL), userSamplingMapVersion(0),
++ noiseAwareMapVersion(0),
++ userSamplingMapFileName(samplingmapfilename), userSamplingMapVersion(0),
+ ZBuffer(NULL), use_Zbuf(useZbuffer),
+ debug_mode(debugmode), premultiplyAlpha(premult),
+ writeResumeFlm(w_resume_FLM), restartResumeFlm(restart_resume_FLM), writeFlmDirect(write_FLM_direct),
+diff -rup luxrender-lux-3066b2161439/samplers/lowdiscrepancy.cpp luxrender-lux-3066b2161439.new/samplers/lowdiscrepancy.cpp
+--- luxrender-lux-3066b2161439/samplers/lowdiscrepancy.cpp 2013-03-16 19:32:24.000000000 +0000
++++ luxrender-lux-3066b2161439.new/samplers/lowdiscrepancy.cpp 2013-03-26 18:03:02.828222310 +0000
+@@ -29,7 +29,7 @@
+ using namespace lux;
+
+ LDSampler::LDData::LDData(const Sampler &sampler, int xPixelStart, int yPixelStart, u_int pixelSamples) :
+- samplingMap(NULL), noiseAwareMapVersion(0), userSamplingMapVersion(0) {
++ noiseAwareMapVersion(0), userSamplingMapVersion(0) {
+ xPos = xPixelStart - 1;
+ yPos = yPixelStart;
+ samplePos = pixelSamples - 1;
+diff -rup luxrender-lux-3066b2161439/samplers/metrosampler.cpp luxrender-lux-3066b2161439.new/samplers/metrosampler.cpp
+--- luxrender-lux-3066b2161439/samplers/metrosampler.cpp 2013-03-16 19:32:24.000000000 +0000
++++ luxrender-lux-3066b2161439.new/samplers/metrosampler.cpp 2013-03-26 18:13:13.146702871 +0000
+@@ -39,7 +39,7 @@ static const u_int rngA = 884;
+ MetropolisSampler::MetropolisData::MetropolisData(const MetropolisSampler &sampler) :
+ consecRejects(0), stamp(0), currentStamp(0), weight(0.f),
+ LY(0.f), alpha(0.f), totalLY(0.f), sampleCount(0.f),
+- samplingMap(NULL), noiseAwareMapVersion(0), userSamplingMapVersion(0),
++ noiseAwareMapVersion(0), userSamplingMapVersion(0),
+ large(true), cooldown(sampler.cooldownTime > 0)
+ {
+ u_int i;
+diff -rup luxrender-lux-3066b2161439/samplers/random.cpp luxrender-lux-3066b2161439.new/samplers/random.cpp
+--- luxrender-lux-3066b2161439/samplers/random.cpp 2013-03-16 19:32:24.000000000 +0000
++++ luxrender-lux-3066b2161439.new/samplers/random.cpp 2013-03-26 18:12:34.378868365 +0000
+@@ -30,7 +30,7 @@ using namespace lux;
+
+ RandomSampler::RandomData::RandomData(const Sampler &sampler, int xPixelStart,
+ int yPixelStart, u_int pixelSamples) :
+- samplingMap(NULL), noiseAwareMapVersion(0), userSamplingMapVersion(0)
++ noiseAwareMapVersion(0), userSamplingMapVersion(0)
+ {
+ xPos = xPixelStart;
+ yPos = yPixelStart;
diff --git a/libre/opencollada/PKGBUILD b/libre/opencollada/PKGBUILD
new file mode 100644
index 000000000..2cf700e1f
--- /dev/null
+++ b/libre/opencollada/PKGBUILD
@@ -0,0 +1,52 @@
+# Maintainer: Márcio Silva <coadde@lavabit.com>
+
+pkgname=opencollada
+pkgver=20130305
+pkgrel=1
+pkgdesc="Stream based reader and writer library for COLLADA files (built for the blender-libre package)"
+arch=(
+ i686
+ x86_64
+ mips64el
+)
+url=https://github.com/KhronosGroup/OpenCOLLADA
+license=GPL
+depends=(
+ libxml2
+ pcre
+)
+makedepends=(
+ git
+ cmake
+)
+source=git://github.com/KhronosGroup/OpenCOLLADA.git
+sha512sums=SKIP
+
+prepare() {
+ cd $srcdir/OpenCOLLADA
+
+ # adapt source to last blender release
+ git reset --hard da9f1c3d5da28d475f35ff1175d60cb74fa0f661 # Tue Mar 5 11:30:27 2013 +0100
+
+ [[ -d build ]] && rm -r build
+ mkdir build
+}
+
+build() {
+ cd $srcdir/OpenCOLLADA/build
+
+ setarch $CARCH cmake .. -DCMAKE_INSTALL_PREFIX=/usr
+ setarch $CARCH make
+}
+
+package() {
+ cd $srcdir/OpenCOLLADA/build
+
+ setarch $CARCH make DESTDIR=$pkgdir install
+
+ install -d $pkgdir/etc/ld.so.conf.d
+ echo /usr/lib/$pkgname > $pkgdir/etc/ld.so.conf.d/$pkgname.conf
+}
+
+# vim:set ts=2 sw=2 et:
+
diff --git a/libre/python2-cssmin-fredj/PKGBUILD b/libre/python2-cssmin-fredj/PKGBUILD
new file mode 100644
index 000000000..0f155de89
--- /dev/null
+++ b/libre/python2-cssmin-fredj/PKGBUILD
@@ -0,0 +1,34 @@
+# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
+
+_pkgname=python2-cssmin
+pkgname=python2-cssmin-fredj
+pkgver=0.1.4.git4 # 0.1.4.git<number of commits after 0.1.4>
+_gitver='commit=3422b9962c5a6c2adb9597f418131d73e991c9b6'
+pkgdesc="Provides a country field for Django models"
+license=('custom:MIT')
+url="http://bitbucket.org/smileychris/django-countries/"
+
+provides=("$_pkgname=$pkgver")
+conflicts=("$_pkgname")
+
+pkgrel=1
+arch=(any)
+
+makedepends=('python2-distribute')
+source=("libre://$pkgname-$pkgver.tar.gz")
+md5sums=('09649b374d148014a5644e9df8fcf18e')
+
+mkmakedepends=('git')
+mksource=("$pkgname-$pkgver::git://github.com/fredj/cssmin.git#${_gitver}")
+mkmd5sums=('SKIP')
+
+build() {
+ cd "$srcdir/$pkgname-$pkgver"
+ sed -i 's|#!/usr/bin/env python\s*$|#!/usr/bin/env python2|' setup.py src/cssmin.py
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
+ ./setup.py install --root="$pkgdir/" --optimize=1
+}
+
diff --git a/libre/python2-django-countries/PKGBUILD b/libre/python2-django-countries/PKGBUILD
index a7bd85da1..36bc6a580 100644
--- a/libre/python2-django-countries/PKGBUILD
+++ b/libre/python2-django-countries/PKGBUILD
@@ -10,7 +10,7 @@ license=('custom:MIT')
replaces=($_pkgname)
conflicts=($_pkgname)
-pkgrel=2
+pkgrel=3
arch=(any)
depends=('python2-django')
makedepends=('python2-distribute')
@@ -28,4 +28,5 @@ build() {
package() {
cd "$srcdir/$_pkgname-$pkgver"
./setup.py install --root="$pkgdir/" --optimize=1
+ install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
}
diff --git a/libre/soundkonverter-libre/PKGBUILD b/libre/soundkonverter-libre/PKGBUILD
index 8b3c74d7c..b37ef217c 100644
--- a/libre/soundkonverter-libre/PKGBUILD
+++ b/libre/soundkonverter-libre/PKGBUILD
@@ -7,9 +7,9 @@
_pkgname=soundkonverter
pkgname=soundkonverter-libre
-pkgver=2.0.0
+pkgver=2.0.1
pkgrel=1
-pkgdesc="Front-end to various audio converters (without nonfree faac and mac recommendation)"
+pkgdesc="Front-end to various audio converters, without nonfree faac and mac recommendation"
arch=('i686' 'x86_64')
url="http://www.kde-apps.org/content/show.php?content=29024"
license=('GPL')
@@ -36,7 +36,7 @@ conflicts=$_pkgname
provides=$_pkgname=$pkgver
install=$_pkgname.install
source=("http://kde-apps.org/CONTENT/content-files/29024-${_pkgname}-${pkgver}.tar.gz")
-md5sums=('f1df729916b2418c474b859ed6b9eda6')
+md5sums=('d4f039003954c5279e56113237f608ca')
build() {
cd "$srcdir"/$_pkgname-$pkgver