summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndré Fabian Silva Delgado <emulatorman@parabola.nu>2014-09-03 07:34:45 -0300
committerAndré Fabian Silva Delgado <emulatorman@parabola.nu>2014-09-03 07:34:45 -0300
commit2945507149df876505c048936cc487d76b1cfcdd (patch)
tree1e93bc731d36d5d3fa7b077a982e9e7f65516466
parent588fad3f4ac69a1234341ffd3c2b3cd2b1d020c2 (diff)
parentdeff77ebe2b2c552e3b8b4e2d156697d1c92bb74 (diff)
Merge branch 'master' of ssh://lukeshu.com:1863/srv/git/mirror/parabola/abslibre
-rw-r--r--libre/blender/PKGBUILD (renamed from libre/blender-parabola/PKGBUILD)0
-rw-r--r--libre/blender/blender.install (renamed from libre/blender-parabola/blender.install)0
-rw-r--r--libre/opencollada/PKGBUILD (renamed from libre/opencollada-parabola/PKGBUILD)14
-rw-r--r--libre/opencolorio/PKGBUILD2
-rw-r--r--libre/openexr/PKGBUILD (renamed from libre/openexr-libre/PKGBUILD)36
-rw-r--r--libre/openexr/gcc43.patch (renamed from libre/openexr-libre/gcc43.patch)0
-rw-r--r--libre/openimageio/PKGBUILD4
-rw-r--r--libre/openshadinglanguage/PKGBUILD (renamed from libre/openshadinglanguage-parabola/PKGBUILD)16
-rw-r--r--libre/openshadinglanguage/llvm-133.patch (renamed from libre/openshadinglanguage-parabola/llvm-133.patch)0
-rw-r--r--libre/openshadinglanguage/llvm-141.patch (renamed from libre/openshadinglanguage-parabola/llvm-141.patch)0
10 files changed, 33 insertions, 39 deletions
diff --git a/libre/blender-parabola/PKGBUILD b/libre/blender/PKGBUILD
index 7d665ec9f..7d665ec9f 100644
--- a/libre/blender-parabola/PKGBUILD
+++ b/libre/blender/PKGBUILD
diff --git a/libre/blender-parabola/blender.install b/libre/blender/blender.install
index 724bfce00..724bfce00 100644
--- a/libre/blender-parabola/blender.install
+++ b/libre/blender/blender.install
diff --git a/libre/opencollada-parabola/PKGBUILD b/libre/opencollada/PKGBUILD
index c22bf3a3e..5b6733645 100644
--- a/libre/opencollada-parabola/PKGBUILD
+++ b/libre/opencollada/PKGBUILD
@@ -1,19 +1,17 @@
# Maintainer (Arch): Sven-Hendrik Haase <sh@lutzhaase.com>
# Maintainer: Márcio Silva <coadde@parabola.nu>
-_pkgname=opencollada
-pkgname=$_pkgname-parabola
+pkgname=opencollada
pkgver=20140214
-pkgrel=1.1
-pkgdesc="Stream based reader and writer library for COLLADA files (built for the blender-parabola package)"
+pkgrel=1.parabola1
+pkgdesc="Stream based reader and writer library for COLLADA files (built for the blender package)"
arch=('i686' 'x86_64' 'mips64el')
url='https://github.com/KhronosGroup/OpenCOLLADA'
license=('GPL')
depends=('libxml2' 'pcre')
makedepends=('git' 'cmake')
-provides=("$_pkgname=$pkgver")
-conflicts=("$_pkgname")
-replaces=("$_pkgname")
+conflicts=("$pkgname-parabola")
+replaces=("$pkgname-parabola")
source=('git://github.com/KhronosGroup/OpenCOLLADA.git')
md5sums=('SKIP')
@@ -43,7 +41,7 @@ package() {
make DESTDIR=$pkgdir install
install -d $pkgdir/etc/ld.so.conf.d
- echo /usr/lib/$_pkgname > $pkgdir/etc/ld.so.conf.d/$_pkgname.conf
+ echo /usr/lib/$pkgname > $pkgdir/etc/ld.so.conf.d/$pkgname.conf
}
# vim:set ts=2 sw=2 et:
diff --git a/libre/opencolorio/PKGBUILD b/libre/opencolorio/PKGBUILD
index 7a3e4fd98..3ce13113a 100644
--- a/libre/opencolorio/PKGBUILD
+++ b/libre/opencolorio/PKGBUILD
@@ -4,7 +4,7 @@
pkgname=opencolorio
pkgver=1.0.9
-pkgrel=2.6
+pkgrel=2.parabola1
pkgdesc='A color management framework for visual effects and animation (built for the blender package)'
arch=('i686' 'x86_64' 'mips64el')
url="http://$pkgname.org"
diff --git a/libre/openexr-libre/PKGBUILD b/libre/openexr/PKGBUILD
index 5423862e3..a2a2ba472 100644
--- a/libre/openexr-libre/PKGBUILD
+++ b/libre/openexr/PKGBUILD
@@ -2,30 +2,28 @@
# Maintainer (Arch): Tobias Powalowski <tpowa@archlinux.org>
# Maintainer: André Silva <emulatorman@parabola.nu>
-_pkgname=openexr
-pkgname=openexr-libre
+pkgname=openexr
pkgver=2.1.0
-pkgrel=1
+pkgrel=1.parabola1
pkgdesc="An high dynamic-range image file format library, without embedded nonfree fonts in the documentation"
-url="http://www.openexr.com/"
+url="http://www.$pkgname.com/"
arch=('i686' 'x86_64' 'mips64el')
license=('BSD')
depends=('zlib' 'ilmbase')
-[ "$CARCH" != "mips64el" ] && makedepends=('jre7-openjdk-headless' 'libcups' 'libreoffice-writer' 'libxinerama')
-replaces=($_pkgname)
-conflicts=($_pkgname)
-provides=($_pkgname=$pkgver)
-mksource=("http://download.savannah.nongnu.org/releases/${_pkgname}/${_pkgname}-${pkgver}.tar.gz"
- "https://github.com/${_pkgname}/${_pkgname}/raw/master/OpenEXR/doc/InterpretingDeepPixels.docx"
- "https://github.com/${_pkgname}/${_pkgname}/raw/master/OpenEXR/doc/MultiViewOpenEXR.odt"
- "https://github.com/${_pkgname}/${_pkgname}/raw/master/OpenEXR/doc/OpenEXRFileLayout.odt"
- "https://github.com/${_pkgname}/${_pkgname}/raw/master/OpenEXR/doc/ReadingAndWritingImageFiles.odt"
- "https://github.com/${_pkgname}/${_pkgname}/raw/master/OpenEXR/doc/TechnicalIntroduction.odt")
+makedepends=('jre7-openjdk-headless' 'libcups' 'libreoffice-writer' 'libxinerama')
+replaces=("$pkgname-libre")
+conflicts=("$pkgname-libre")
+mksource=("http://download.savannah.nongnu.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz"
+ "https://github.com/${pkgname}/${pkgname}/raw/master/OpenEXR/doc/InterpretingDeepPixels.docx"
+ "https://github.com/${pkgname}/${pkgname}/raw/master/OpenEXR/doc/MultiViewOpenEXR.odt"
+ "https://github.com/${pkgname}/${pkgname}/raw/master/OpenEXR/doc/OpenEXRFileLayout.odt"
+ "https://github.com/${pkgname}/${pkgname}/raw/master/OpenEXR/doc/ReadingAndWritingImageFiles.odt"
+ "https://github.com/${pkgname}/${pkgname}/raw/master/OpenEXR/doc/TechnicalIntroduction.odt")
source=("https://repo.parabolagnulinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.gz")
noextract=(InterpretingDeepPixels.docx MultiViewOpenEXR.odt OpenEXRFileLayout.odt ReadingAndWritingImageFiles.odt TechnicalIntroduction.odt)
mksource() {
- cd "${srcdir}/${_pkgname}-${pkgver}"
+ cd "${srcdir}/${pkgname}-${pkgver}"
# remove documentation with embedded nonfree fonts
rm -rv "doc/"{InterpretingDeepPixels,MultiViewOpenEXR,OpenEXRFileLayout,ReadingAndWritingImageFiles,TechnicalIntroduction,TheoryDeepPixels}.pdf
@@ -45,19 +43,19 @@ prepare() {
# remove TheoryDeepPixels.pdf reference
sed -i '\|TheoryDeepPixels[.]pdf|d
\|InterpretingDeepPixels[.]pdf| s| [\]||
- ' "${srcdir}/${_pkgname}-${pkgver}/doc/Makefile."{am,in}
+ ' "${srcdir}/${pkgname}-${pkgver}/doc/Makefile."{am,in}
}
build() {
- cd "${srcdir}/${_pkgname}-${pkgver}"
+ cd "${srcdir}/${pkgname}-${pkgver}"
./configure --prefix=/usr
make
}
package() {
- cd "${srcdir}/${_pkgname}-${pkgver}"
+ cd "${srcdir}/${pkgname}-${pkgver}"
make DESTDIR="${pkgdir}" install
- install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${_pkgname}/LICENSE"
+ install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
install -m644 "doc/"{InterpretingDeepPixels.docx,{MultiViewOpenEXR,OpenEXRFileLayout,ReadingAndWritingImageFiles,TechnicalIntroduction}.odt} "${pkgdir}/usr/share/doc/OpenEXR-${pkgver}"
}
mkmd5sums=('33735d37d2ee01c6d8fbd0df94fb8b43'
diff --git a/libre/openexr-libre/gcc43.patch b/libre/openexr/gcc43.patch
index ab99eb9a1..ab99eb9a1 100644
--- a/libre/openexr-libre/gcc43.patch
+++ b/libre/openexr/gcc43.patch
diff --git a/libre/openimageio/PKGBUILD b/libre/openimageio/PKGBUILD
index 84ec3570b..f60f498cb 100644
--- a/libre/openimageio/PKGBUILD
+++ b/libre/openimageio/PKGBUILD
@@ -4,8 +4,8 @@
pkgname=openimageio
pkgver=1.4.12
-pkgrel=3.2
-pkgdesc='A library for reading and writing images, including classes, utilities, and applications (built for the blender-parabola package)'
+pkgrel=3.parabola1
+pkgdesc='A library for reading and writing images, including classes, utilities, and applications (built for the blender package)'
arch=('i686' 'x86_64' 'mips64el')
url="http://www.$pkgname.org/"
license=('custom')
diff --git a/libre/openshadinglanguage-parabola/PKGBUILD b/libre/openshadinglanguage/PKGBUILD
index ce04f74c1..ec2e732be 100644
--- a/libre/openshadinglanguage-parabola/PKGBUILD
+++ b/libre/openshadinglanguage/PKGBUILD
@@ -1,19 +1,17 @@
# Maintainer (Arch): Sven-Hendrik Haase <sh@lutzhaase.com>
# Maintainer: Márcio Silva <coadde@parabola.nu>
-_pkgname=openshadinglanguage
-pkgname=$_pkgname-parabola
+pkgname=openshadinglanguage
pkgver=1.4.2 # 1.5.10 for blender 2.72
-pkgrel=1
-pkgdesc='Advanced shading language for production GI renderers (built for the blender-parabola package)'
+pkgrel=1.parabola1
+pkgdesc='Advanced shading language for production GI renderers (built for the blender package)'
arch=('i686' 'x86_64' 'mips64el')
url='https://github.com/imageworks/OpenShadingLanguage'
license=('custom')
depends=('boost-libs' 'freetype2' 'libpng' 'libtiff' 'llvm-libs' 'openexr' 'openimageio')
makedepends=('boost' 'clang' 'cmake')
-provides=("$_pkgname=$pkgver")
-conflicts=("$_pkgname")
-replaces=("$_pkgname")
+conflicts=("$pkgname-parabola")
+replaces=("$pkgname-parabola")
source=("https://github.com/imageworks/OpenShadingLanguage/archive/Release-$pkgver.tar.gz"
'llvm-141.patch')
md5sums=('5aeb3c9502aedf62d0120b3523957e92'
@@ -87,11 +85,11 @@ package() {
make DESTDIR=$pkgdir install
mkdir -p $pkgdir/usr/share/OSL/
- mkdir -p $pkgdir/usr/share/licenses/$_pkgname
+ mkdir -p $pkgdir/usr/share/licenses/$pkgname
mv $pkgdir/usr/{CHANGES,README.md,INSTALL} $pkgdir/usr/share/OSL
mv $pkgdir/usr/doc $pkgdir/usr/share/OSL/doc
mv $pkgdir/usr/shaders $pkgdir/usr/share/OSL/shaders
- mv $pkgdir/usr/LICENSE $pkgdir/usr/share/licenses/$_pkgname
+ mv $pkgdir/usr/LICENSE $pkgdir/usr/share/licenses/$pkgname
}
# vim:set ts=2 sw=2 et:
diff --git a/libre/openshadinglanguage-parabola/llvm-133.patch b/libre/openshadinglanguage/llvm-133.patch
index a63b91e0d..a63b91e0d 100644
--- a/libre/openshadinglanguage-parabola/llvm-133.patch
+++ b/libre/openshadinglanguage/llvm-133.patch
diff --git a/libre/openshadinglanguage-parabola/llvm-141.patch b/libre/openshadinglanguage/llvm-141.patch
index eeb82935e..eeb82935e 100644
--- a/libre/openshadinglanguage-parabola/llvm-141.patch
+++ b/libre/openshadinglanguage/llvm-141.patch