summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libre/psutils-libre/PKGBUILD8
-rw-r--r--libre/psutils-libre/libre.patch41
-rw-r--r--pcr/mitsuba/PKGBUILD57
-rw-r--r--pcr/yafaray/PKGBUILD (renamed from pcr/yafaray-git/PKGBUILD)46
4 files changed, 91 insertions, 61 deletions
diff --git a/libre/psutils-libre/PKGBUILD b/libre/psutils-libre/PKGBUILD
index d6fcff26e..4a55ea38e 100644
--- a/libre/psutils-libre/PKGBUILD
+++ b/libre/psutils-libre/PKGBUILD
@@ -19,13 +19,17 @@ replaces=('psutils-lprng' 'psutils')
conflicts=('psutils-lprng' 'psutils')
options=('!makeflags')
source=("ftp://ftp.archlinux.org/other/psutils/${_pkgname}-${pkgver}.tar.gz"
- 'psutils-1.17.diff')
+ 'psutils-1.17.diff'
+ 'libre.patch')
md5sums=('b161522f3bd1507655326afa7db4a0ad'
- '2b49e9e796000b42f42804d4b50a2be1')
+ '2b49e9e796000b42f42804d4b50a2be1'
+ 'a4beaf371607085e89ef190c1db7aee3')
build() {
cd "${srcdir}/${_pkgname}"
patch -Np1 -i "${srcdir}/psutils-1.17.diff"
+ # apply patch to remove nonfree files support from Makefile
+ patch -Np1 -i "${srcdir}/libre.patch"
# remove nonfree files
rm -v {fixmacps.{man,pl},md{68_0,71_0}.ps}
make -f Makefile.unix BINDIR=/usr/bin \
diff --git a/libre/psutils-libre/libre.patch b/libre/psutils-libre/libre.patch
new file mode 100644
index 000000000..c2bd21245
--- /dev/null
+++ b/libre/psutils-libre/libre.patch
@@ -0,0 +1,41 @@
+--- psutils.orig/Makefile.unix 2013-06-21 05:46:39.671197867 -0300
++++ psutils/Makefile.unix 2013-06-21 05:55:30.248672628 -0300
+@@ -44,15 +44,14 @@
+ BIN = psbook psselect pstops epsffit psnup \
+ psresize
+ SHELLSCRIPTS = getafm showchar
+-PERLSCRIPTS = fixfmps fixmacps fixpsditps fixpspps \
++PERLSCRIPTS = fixfmps fixpsditps fixpspps \
+ fixtpps fixwfwps fixwpps fixscribeps fixwwps \
+ fixdlsrps extractres includeres psmerge
+ MANPAGES = psbook.$(MANEXT) psselect.$(MANEXT) pstops.$(MANEXT) epsffit.$(MANEXT) psnup.$(MANEXT) \
+ psresize.$(MANEXT) psmerge.$(MANEXT) fixscribeps.$(MANEXT) getafm.$(MANEXT) \
+- fixdlsrps.$(MANEXT) fixfmps.$(MANEXT) fixmacps.$(MANEXT) fixpsditps.$(MANEXT) \
++ fixdlsrps.$(MANEXT) fixfmps.$(MANEXT) fixpsditps.$(MANEXT) \
+ fixpspps.$(MANEXT) fixtpps.$(MANEXT) fixwfwps.$(MANEXT) fixwpps.$(MANEXT) \
+ fixwwps.$(MANEXT) extractres.$(MANEXT) includeres.$(MANEXT)
+-INCLUDES = md68_0.ps md71_0.ps
+
+ all: $(BIN) $(PERLSCRIPTS) $(MANPAGES) $(SHELLSCRIPTS)
+
+@@ -106,10 +105,6 @@
+ $(PERL) maketext OS=$(OS) PERL=$(PERL) $? > $@
+ $(CHMOD) $(BINMODE) $@
+
+-fixmacps: fixmacps.pl
+- $(PERL) maketext OS=$(OS) PERL=$(PERL) INCLUDE=$(INCLUDEDIR) $? > $@
+- $(CHMOD) $(BINMODE) $@
+-
+ fixpsditps: fixpsditps.pl
+ $(PERL) maketext OS=$(OS) PERL=$(PERL) $? > $@
+ $(CHMOD) $(BINMODE) $@
+@@ -174,9 +169,6 @@
+ fixfmps.$(MANEXT): fixfmps.man
+ $(PERL) maketext "MAN=$(MANPAGES)" $? > $@
+
+-fixmacps.$(MANEXT): fixmacps.man
+- $(PERL) maketext "MAN=$(MANPAGES)" INCLUDE=$(INCLUDEDIR) $? > $@
+-
+ fixpsditps.$(MANEXT): fixpsditps.man
+ $(PERL) maketext "MAN=$(MANPAGES)" $? > $@
+
diff --git a/pcr/mitsuba/PKGBUILD b/pcr/mitsuba/PKGBUILD
index 219da84fc..747641dcc 100644
--- a/pcr/mitsuba/PKGBUILD
+++ b/pcr/mitsuba/PKGBUILD
@@ -4,32 +4,31 @@ pkgname=(
mitsuba
blender-addon-mitsuba
)
+_pkgname=${pkgname[0]}
_bldname=${pkgname[1]::7}
-_addname=${pkgname[0]}-${_bldname}
-pkgver=0.4.4 # Thu Feb 28 15:00:37 2013 -0800 tag:v0.4.4 rev:1674
-_pkgdat=20130228
-_pkgrev=1674
-_bldver=2.66
+_addname=$_pkgname-$_bldname
+pkgver=0.4.4
+_bldver=2.67
_addver=0.2.1 # Wed Mar 20 01:30:37 2013 +0100 rev:40 ($srcdir/$_addname/${pkgname[0]}/__init__.py:bl_info>version)
_adddat=20130320
_addrev=40
-_bldep=7
+_bldep=8
_pyver=3.3
-pkgrel=1
+pkgrel=2
pkgdesc='A physically based renderer'
arch=(
i686
x86_64
mips64el
)
-url=https://${pkgname[0]}-renderer.org/
+url=https://www.$_pkgname-renderer.org/
license=GPL3
depends=(
boost-libs
collada-dom
glew
libxxf86vm
- 'openexr=2.0.0'
+ openexr
qt4
xerces-c
)
@@ -44,28 +43,25 @@ makedepends=(
mercurial
python
)
-install=$pkgname.install
+install=$_pkgname.install
source=(
- hg+https://${pkgname[0]}-renderer.org/hg/${pkgname[0]}
- hg+https://${pkgname[0]}-renderer.org/hg/$_addname
+ ${url}hg/$_pkgname/archive/v$pkgver.tar.bz2
+ hg+${url}hg/$_addname
${pkgname[1]}.install
)
-sha512sums=(SKIP SKIP SKIP)
+sha512sums=(
+ 66dcab376a44eeb2fbe808a32ead5b554d777fb2f6a73c43883086b7829e0c697aaeccbb6fbbed9fcb221684a64ccce8be81a78ebcd228316ea12b8f6f3e7f6c
+ SKIP SKIP
+)
prepare() {
mv $srcdir/${pkgname[1]}.install $startdir
- cd $srcdir/${pkgname[0]}
+ cd $srcdir/$_pkgname-v$pkgver
[[ -d build ]] && rm -r build
mkdir build
- cd $startdir/../srcdest/${pkgname[0]}
-
- msg "${pkgname[0]}"
- hg update -c v$pkgver
- hg log -l 1 -r v$pkgver
-
cd $startdir/../srcdest/$_addname
msg "${pkgname[1]}"
@@ -74,7 +70,7 @@ prepare() {
}
build() {
- cd $srcdir/${pkgname[0]}/build
+ cd $srcdir/$_pkgname-v$pkgver/build
[[ $CARCH != x86_64 ]] && DMTS_SSE='-DMTS_SSE=OFF'
@@ -83,24 +79,23 @@ build() {
-DBoost_PYTHON_LIBRARY=/usr/lib/libboost_python${_pyver::1}.so\
-DPYTHON_INCLUDE_DIR=/usr/include/python${_pyver}m\
-DPYTHON_LIBRARY=/usr/lib/libpython${_pyver}m.so
-
setarch $CARCH make
}
package_mitsuba() {
- cd $srcdir/${pkgname[0]}/build
+ cd $srcdir/$_pkgname-v$pkgver/build
setarch $CARCH make DESTDIR=$pkgdir install
#fixing files and folders location
a=$pkgdir/usr
- b=$srcdir/${pkgname[0]}
- install -d $a/{bin,lib{,/python$_pyver/lib-dynload},share/{applications,{licenses/,}${pkgname[0]},pixmaps}}
- install -m644 $b/data/linux/${pkgname[0]}.desktop $a/share/applications
- install -m644 $b/src/mtsgui/resources/${pkgname[0]}48.png $a/share/pixmaps
- install -m644 $b/doc/license.txt $a/share/licenses/${pkgname[0]}/LICENSE
+ b=$srcdir/$_pkgname-v$pkgver
+ install -d $a/{bin,lib{,/python$_pyver/lib-dynload},share/{applications,{licenses/,}$_pkgname,pixmaps}}
+ install -m644 $b/data/linux/$_pkgname.desktop $a/share/applications
+ install -m644 $b/src/mtsgui/resources/${_pkgname}48.png $a/share/pixmaps
+ install -m644 $b/doc/license.txt $a/share/licenses/$_pkgname/LICENSE
mv $a/{m{itsuba,ts{gui,import,srv,util}},bin}
mv $a/lib{${pkgname[0]}-{bidir,core,hw,render}.so,}
- mv $a/{{data,plugins},share/${pkgname[0]}}
+ mv $a/{{data,plugins},share/$_pkgname}
mv $a/{python/mitsuba.so,lib/python$_pyver/lib-dynload}
mv $a/{sdk/include,}
rmdir $a/{python,sdk}
@@ -123,8 +118,8 @@ package_blender-addon-mitsuba() {
cd $srcdir/$_addname
a=$pkgdir/usr/share/$_bldname/$_bldver/scripts/addons
- b=$pkgdir/usr/share/licenses/$pkgname
- c=$srcdir/$_pkgname/doc/license.txt
+ b=$pkgdir/usr/share/licenses/$_pkgname
+ c=$srcdir/$_pkgname-v$_pkgver/doc/license.txt
install -d $a && cp -a $_pkgname $a
install -d $b && install -m644 $c $b/LICENSE
diff --git a/pcr/yafaray-git/PKGBUILD b/pcr/yafaray/PKGBUILD
index 1d4b3436c..e3c0381d8 100644
--- a/pcr/yafaray-git/PKGBUILD
+++ b/pcr/yafaray/PKGBUILD
@@ -1,18 +1,18 @@
# Maintainer: Márcio Silva <coadde@lavabit.com>
pkgname=(
- yafaray-git
- blender-addon-yafaray-git
+ yafaray
+ blender-addon-yafaray
)
-_pkgflag=git
-_pkgname=${pkgname[0]%-$_pkgflag}
+_pkgname=${pkgname[0]}
_bldname=${pkgname[1]::7}
_gitname=Core
_addname=${_bldname^}-Exporter
-pkgver=$(LC_ALL=C date -u +%Y%m%d)
-_pkgver=1.2
-_bldver=2.66
-_bldep=7
+_pkgdate=20130510
+pkgver=1.5.$_pkgdate
+_srcver=44323def5b3866ff601fd401ef2160b80ced8141 # Fri May 10 00:57:12 2013 -0700 - Merge pull request #67 from DarkTide/master // Depth fix for hist on background
+_bldver=2.67
+_bldep=8
_pyver=3.3
pkgrel=1
pkgdesc='A libre software raytracing engine'
@@ -27,7 +27,7 @@ depends=(
freetype2
libjpeg
libxml2
- 'openexr=2.0.0'
+ openexr
)
optdepends=(
'python: Python bindings'
@@ -41,17 +41,17 @@ makedepends=(
qt4
swig
)
-provides=($_pkgname=$_pkgver)
-conflicts=$_pkgname
source=(
- git://github.com/YafaRay/$_gitname.$_pkgflag
- git://github.com/YafaRay/$_addname.$_pkgflag
+ git://github.com/YafaRay/$_gitname.git
+ git://github.com/YafaRay/$_addname.git
)
sha512sums=(SKIP SKIP)
prepare() {
cd $srcdir/$_gitname
+ git checkout $_srcver
+
[[ -d build ]] && rm -r build
mkdir build
}
@@ -62,17 +62,17 @@ build() {
setarch $CARCH cmake .. -DCMAKE_INSTALL_PREFIX=/usr\
-DYAF_PY_VERSION=$_pyver\
-DYAF_BINDINGS_PY_DIR=/usr/lib/python$_pyver
-
setarch $CARCH make
}
-package_yafaray-git() {
+package_yafaray() {
cd $srcdir/$_gitname/build
setarch $CARCH make DESTDIR=$pkgdir install
}
-package_blender-addon-yafaray-git() {
+package_blender-addon-yafaray() {
pkgver=$pkgver.v$_bldver
+ _srcver=e6688fc4f480bcb1ae7d0a6dbe65563b3d070169 # Fri May 10 00:24:58 2013 -0700 - Merge pull request #14 from DarkTide/master // Version bump, and some other fixes
pkgdesc="A addon for the ${_bldname^} which allows render with YafaRay (built for the $_bldname-libre package)"
arch=any
depends=(
@@ -80,24 +80,14 @@ package_blender-addon-yafaray-git() {
"$_bldname>=$(($_bldep-1)):$_bldver"
"$_bldname<$_bldep:${_bldver::2}$((${_bldver:2:4}+1))"
)
- optdepends=''
- provides=(
- ${pkgname%-$_pkgflag}=$_pkgver.v$_bldver
- $_pkgname-$_bldname-exporter=$_pkgver.v$_bldver
- $_pkgname-$_bldname-exporter-$_pkgflag=$pkgver
- )
- conflicts=(
- ${pkgname%-$_pkgflag}
- $_pkgname-$_bldname-exporter
- $_pkgname-$_bldname-exporter-$_pkgflag
- )
- replaces=$_pkgname-$_bldname-exporter-$_pkgflag
+ optdepends=
cd $srcdir/$_addname
a=/usr/lib
b=$pkgdir/usr/share/$_bldname/$_bldver/scripts/addons/$_pkgname/bin
+ git checkout $_srcver
git checkout-index -a -f --prefix=${b%bin}
install -d $b