From 05c29ae0cd1395cdef6f3695d1ce0dbe072dd205 Mon Sep 17 00:00:00 2001 From: "coadde [Márcio Alexandre Silva Delgado]" Date: Sat, 6 Sep 2014 04:40:44 -0300 Subject: mitsuba: fix paths --- pcr/mitsuba/PKGBUILD | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'pcr/mitsuba') diff --git a/pcr/mitsuba/PKGBUILD b/pcr/mitsuba/PKGBUILD index 52cd725f6..c8e57333c 100644 --- a/pcr/mitsuba/PKGBUILD +++ b/pcr/mitsuba/PKGBUILD @@ -40,9 +40,9 @@ url="https://www.$_pkgname-renderer.org" _prepare_mitsuba() { msg 'Renaming source dir' - mv -v $srcdir/$_pkgname-???????????? $srcdir/$_pkgname-$pkgver.$_pkgrev + mv -v $srcdir/$_pkgname-???????????? $srcdir/$_pkgname-$_pkgver.$_pkgrev - cd $srcdir/$_pkgname-$pkgver.$_pkgrev + cd $srcdir/$_pkgname-$_pkgver.$_pkgrev msg 'renaming wrong OS name' _OS=$(uname -o) @@ -72,7 +72,7 @@ prepare() { } _build_mitsuba() { - cd $srcdir/$_pkgname-$pkgver.$_pkgrev/build + cd $srcdir/$_pkgname-$_pkgver.$_pkgrev/build [[ $CARCH == x86_64 ]] && _SSE=ON || _SSE=OFF # i686: MTS_SSE disabled @@ -93,16 +93,16 @@ package_mitsuba() { "$_addname: ${_bldname^} addon exporter and renderer") install="$_pkgname.install" - cd $srcdir/$_pkgname-$pkgver.$_pkgrev/build + cd $srcdir/$_pkgname-$_pkgver.$_pkgrev/build make DESTDIR=$pkgdir install b=$pkgdir/usr/share/licenses/$pkgname - install -vd $b && install -m644 ../LICENSE $b/GPL-v3.0 + install -vd $b && install -m644 ../doc/license.txt $b/GPL-v3.0 msg 'fixing files and folders location' a=$pkgdir/usr - b=$srcdir/$_pkgname-v$pkgver + b=$srcdir/$_pkgname-$_pkgver.$_pkgrev install -vd $a/{bin,lib/python$_pyver/lib-dynload,share/{applications,$_pkgname,pixmaps}} install -vm644 $b/data/linux/$_pkgname.desktop $a/share/applications install -vm644 $b/src/mtsgui/resources/${_pkgname}48.png $a/share/pixmaps -- cgit v1.2.3 From 20c71337c715fdbc3d5a917a11e3d5c232dc2584 Mon Sep 17 00:00:00 2001 From: "coadde [Márcio Alexandre Silva Delgado]" Date: Sat, 6 Sep 2014 05:10:09 -0300 Subject: mitsuba: remove -libre depends --- pcr/mitsuba/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pcr/mitsuba') diff --git a/pcr/mitsuba/PKGBUILD b/pcr/mitsuba/PKGBUILD index c8e57333c..4da488c78 100644 --- a/pcr/mitsuba/PKGBUILD +++ b/pcr/mitsuba/PKGBUILD @@ -120,7 +120,7 @@ package_blender-addon-mitsuba() { pkgdesc="A addon for the ${_bldname^} which allows render and export with Mitsuba (built for the $_bldname package)" arch=('any') license=('GPL2') - depends=("$_pkgname=$_pkgver" "$_bldname-libre>=$_bldep:$_bldver" "$_bldname-libre<$(($_bldep+1)):${_bldver::2}$((${_bldver:2:4}+1))") + depends=("$_pkgname=$_pkgver" "$_bldname>=$_bldep:$_bldver" "$_bldname<$(($_bldep+1)):${_bldver::2}$((${_bldver:2:4}+1))") makedepends=() cd $srcdir/$_addname-$_addver.$_addrev -- cgit v1.2.3 From 5d9523f9d6f16e07b3f66ee50280117989899cda Mon Sep 17 00:00:00 2001 From: "coadde [Márcio Alexandre Silva Delgado]" Date: Sat, 6 Sep 2014 05:13:15 -0300 Subject: rebuild mitsuba --- pcr/mitsuba/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pcr/mitsuba') diff --git a/pcr/mitsuba/PKGBUILD b/pcr/mitsuba/PKGBUILD index 4da488c78..2d9dd5bd3 100644 --- a/pcr/mitsuba/PKGBUILD +++ b/pcr/mitsuba/PKGBUILD @@ -19,7 +19,7 @@ _addname=$_bldname-addon-$_pkgname _addver=0.3.0 # __init__.py:bl_info>version _adddat=20140722 _addrev=61 -_addrel=2 +_addrel=3 _pyver=3.4 pkgbase=$_pkgname -- cgit v1.2.3 From dc40ebd1479b22cb5e313e13d75d46ea57474a8b Mon Sep 17 00:00:00 2001 From: "coadde [Márcio Alexandre Silva Delgado]" Date: Sat, 6 Sep 2014 15:47:53 -0300 Subject: revome unused sltv --- pcr/mitsuba/PKGBUILD | 6 +++--- pcr/sltv/PKGBUILD | 32 -------------------------------- pcr/sltv/PKGBUILD.new | 32 -------------------------------- pcr/sltv/sltv.install | 7 ------- 4 files changed, 3 insertions(+), 74 deletions(-) delete mode 100644 pcr/sltv/PKGBUILD delete mode 100644 pcr/sltv/PKGBUILD.new delete mode 100644 pcr/sltv/sltv.install (limited to 'pcr/mitsuba') diff --git a/pcr/mitsuba/PKGBUILD b/pcr/mitsuba/PKGBUILD index 2d9dd5bd3..4d0fd8452 100644 --- a/pcr/mitsuba/PKGBUILD +++ b/pcr/mitsuba/PKGBUILD @@ -1,6 +1,6 @@ # Maintainer: Márcio Silva -_build_pkg=yes +_build_pkg=no _build_add=yes [[ $_build_pkg != yes && $_build_pkg != no ]] && _build_pkg=yes @@ -19,7 +19,7 @@ _addname=$_bldname-addon-$_pkgname _addver=0.3.0 # __init__.py:bl_info>version _adddat=20140722 _addrev=61 -_addrel=3 +_addrel=4 _pyver=3.4 pkgbase=$_pkgname @@ -120,7 +120,7 @@ package_blender-addon-mitsuba() { pkgdesc="A addon for the ${_bldname^} which allows render and export with Mitsuba (built for the $_bldname package)" arch=('any') license=('GPL2') - depends=("$_pkgname=$_pkgver" "$_bldname>=$_bldep:$_bldver" "$_bldname<$(($_bldep+1)):${_bldver::2}$((${_bldver:2:4}+1))") + depends=("$_pkgname>=$_pkgver" "$_pkgname<${_pkgver::4}$(${_pkgver:4:}+1)" "$_bldname>=$_bldep:$_bldver" "$_bldname<$(($_bldep+1)):${_bldver::2}$((${_bldver:2:}+1))") makedepends=() cd $srcdir/$_addname-$_addver.$_addrev diff --git a/pcr/sltv/PKGBUILD b/pcr/sltv/PKGBUILD deleted file mode 100644 index 74ebb6c26..000000000 --- a/pcr/sltv/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# Maintainer (Arch): farid abdelnour -# Contributor (Arch): SpepS -# Contributor (Arch): Wille Marcel - -pkgname=sltv -pkgver=0.91 -pkgrel=1 -pkgdesc="An audio and video streamer that receives streams from several sources (V4L2, Firewire, ALSA, Pulseaudio, files...) and sends a stream using Icecast or to files (Vorbis+Theora)." -arch=('any') -url="http://sltv.holoscopio.com" -license=('GPL') -depends=('pygtk' 'python2-configobj' 'gstreamer0.10-python' 'gstreamer-hplugins' 'gstreamer0.10-bad' 'gstreamer0.10-good' 'gstreamer0.10-ffmpeg' 'python2' 'gstreamer0.10' 'gstreamer0.10-base' ) -install="$pkgname.install" -source=("http://sltv.holoscopio.com/$pkgname-$pkgver.tar.gz") -md5sums=(b5f9b2d7102ca0a4068ebe1783699764) - -build() { - cd "$srcdir/$pkgname-$pkgver" - - # Python2 fix - sed -i "s#python#python2#" src/sltv.in - - ./configure --prefix=/usr - make -} - -package() { - - cd "$srcdir/$pkgname-$pkgver" - - make DESTDIR="$pkgdir/" install -} diff --git a/pcr/sltv/PKGBUILD.new b/pcr/sltv/PKGBUILD.new deleted file mode 100644 index 2a8344c61..000000000 --- a/pcr/sltv/PKGBUILD.new +++ /dev/null @@ -1,32 +0,0 @@ -# Maintainer (Arch): farid abdelnour -# Contributor (Arch): SpepS -# Contributor (Arch): Wille Marcel - -pkgname=sltv -pkgver=0.92 -pkgrel=1 -pkgdesc="An audio and video streamer that receives streams from several sources (V4L2, Firewire, ALSA, Pulseaudio, files...) and sends a stream using Icecast or to files (Vorbis+Theora)." -arch=('any') -url="http://sltv.holoscopio.com" -license=('GPL') -depends=('pygtk' 'python2-configobj' 'gstreamer0.10-python' 'gstreamer-hplugins' 'gstreamer0.10-bad' 'gstreamer0.10-good' 'gstreamer0.10-ffmpeg' 'python2' 'gstreamer0.10' 'gstreamer0.10-base' ) -install="$pkgname.install" -source=("http://sltv.holoscopio.com/$pkgname-$pkgver.tar.gz") -md5sums=(a1dc9a09b29b817e74f87d673aff2310) - -build() { - cd "$srcdir/$pkgname-$pkgver" - - # Python2 fix - sed -i "s#python#python2#" src/landell.in - - ./configure --prefix=/usr - make -} - -package() { - - cd "$srcdir/$pkgname-$pkgver" - - make DESTDIR="$pkgdir/" install -} diff --git a/pcr/sltv/sltv.install b/pcr/sltv/sltv.install deleted file mode 100644 index 16b4ff953..000000000 --- a/pcr/sltv/sltv.install +++ /dev/null @@ -1,7 +0,0 @@ -post_install() { - update-desktop-database -q -} - -post_remove() { - update-desktop-database -q -} -- cgit v1.2.3 From ee3f5d85f60834d63924f048ac9d60c61195c7eb Mon Sep 17 00:00:00 2001 From: "coadde [Márcio Alexandre Silva Delgado]" Date: Sat, 6 Sep 2014 15:50:44 -0300 Subject: blender-addon-mitsuba: fix depends --- pcr/mitsuba/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pcr/mitsuba') diff --git a/pcr/mitsuba/PKGBUILD b/pcr/mitsuba/PKGBUILD index 4d0fd8452..d703dec67 100644 --- a/pcr/mitsuba/PKGBUILD +++ b/pcr/mitsuba/PKGBUILD @@ -1,6 +1,6 @@ # Maintainer: Márcio Silva -_build_pkg=no +_build_pkg=yes _build_add=yes [[ $_build_pkg != yes && $_build_pkg != no ]] && _build_pkg=yes @@ -120,7 +120,7 @@ package_blender-addon-mitsuba() { pkgdesc="A addon for the ${_bldname^} which allows render and export with Mitsuba (built for the $_bldname package)" arch=('any') license=('GPL2') - depends=("$_pkgname>=$_pkgver" "$_pkgname<${_pkgver::4}$(${_pkgver:4:}+1)" "$_bldname>=$_bldep:$_bldver" "$_bldname<$(($_bldep+1)):${_bldver::2}$((${_bldver:2:}+1))") + depends=("$_pkgname>=$_pkgver" "$_pkgname<${_pkgver::1}.$((${_pkgver:2:1}+1)).${_pkgver:4}" "$_bldname>=$_bldep:$_bldver" "$_bldname<$(($_bldep+1)):${_bldver::1}.$((${_bldver:2}+1))") makedepends=() cd $srcdir/$_addname-$_addver.$_addrev -- cgit v1.2.3 From 2c5de6f1648e51c81c6446b45dfcd8d091fdd929 Mon Sep 17 00:00:00 2001 From: "coadde [Márcio Alexandre Silva Delgado]" Date: Sat, 6 Sep 2014 15:58:34 -0300 Subject: blender-addon-mitsuba: fix depends --- pcr/mitsuba/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pcr/mitsuba') diff --git a/pcr/mitsuba/PKGBUILD b/pcr/mitsuba/PKGBUILD index d703dec67..c0116cd21 100644 --- a/pcr/mitsuba/PKGBUILD +++ b/pcr/mitsuba/PKGBUILD @@ -120,7 +120,7 @@ package_blender-addon-mitsuba() { pkgdesc="A addon for the ${_bldname^} which allows render and export with Mitsuba (built for the $_bldname package)" arch=('any') license=('GPL2') - depends=("$_pkgname>=$_pkgver" "$_pkgname<${_pkgver::1}.$((${_pkgver:2:1}+1)).${_pkgver:4}" "$_bldname>=$_bldep:$_bldver" "$_bldname<$(($_bldep+1)):${_bldver::1}.$((${_bldver:2}+1))") + depends=("$_pkgname>=$_pkgver" "$_pkgname<${_pkgver::1}.$((${_pkgver:2:1}+1)).$((${_pkgver:4}==0))" "$_bldname>=$_bldep:$_bldver" "$_bldname<$(($_bldep+1)):${_bldver::1}.$((${_bldver:2}+1))") makedepends=() cd $srcdir/$_addname-$_addver.$_addrev -- cgit v1.2.3