X-Original-To: alpine-aports@lists.alpinelinux.org Received: from mout01.posteo.de (mout01.posteo.de [185.67.36.65]) by lists.alpinelinux.org (Postfix) with ESMTP id BA20D5C5115 for ; Tue, 19 Jun 2018 16:28:33 +0000 (GMT) Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 49B922100B for ; Tue, 19 Jun 2018 18:28:32 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1529425712; bh=wnKON6dWnASCNEhj8Jb58HGnellSi9uHsKiP3+49r6w=; h=From:To:Cc:Subject:Date:From; b=M9222BQPHxJdAx9Og0yxGwEytlexZE/zcyj4i2ImV2+vx7vL9h0D1uy1U5zejFo9n bvzrExAQWw59V0LNfHdp1CLXKU8Qv1YhfKUtqwJ7ttqdL05D0emdTE2zovLDSP7iuw OYCSkkFQCubvFHll3WnoePCIs9vq1OXgR6rSY09AHH+FiU7LAgjysms9R3fcgBD2XX NquyiVG9sPxklTR4E+MPGw3ZVK1TLf0++TxxT9ObWinv5qqMFWefjgqFLqSiaBzAch p4rQ+Pq4anGEizLMw2jQCwOY1P0HYG7yOMhtPMG+LFCKPPf4BppdrnE9Tb8gYoHnDK tXhQEpjzIc3kw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 419D0t4hsbz9rxY; Tue, 19 Jun 2018 18:28:30 +0200 (CEST) From: Sascha Paunovic To: alpine-aports@lists.alpinelinux.org Cc: Sascha Paunovic Subject: [alpine-aports] [PATCH] testing/blender: upgrade to 2.79b Date: Tue, 19 Jun 2018 18:28:25 +0200 Message-Id: <20180619162825.750-1-azarus@posteo.net> X-Mailer: git-send-email 2.17.1 X-Mailinglist: alpine-aports Precedence: list List-Id: Alpine Development List-Unsubscribe: List-Post: List-Help: List-Subscribe: 2.79b builds again, so reenable it also modernize --- testing/blender/APKBUILD | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/testing/blender/APKBUILD b/testing/blender/APKBUILD index ecbcc12474..80c34f77ea 100644 --- a/testing/blender/APKBUILD +++ b/testing/blender/APKBUILD @@ -1,19 +1,18 @@ # Contributor: Mark Riedesel # Maintainer: Mark Riedesel pkgname=blender -pkgver=2.78c +pkgver=2.79b _pkgver=${pkgver/[a-z]} pkgrel=0 pkgdesc="3D Creation/Animation/Publishing System" url="http://www.blender.org/" -arch="" -license="GPL-2.0" +arch="x86_64" +license="GPL-2.0-or-later" depends="blender-shared=$pkgver-r$pkgrel" makedepends="cmake libx11-dev jpeg-dev zlib-dev libpng-dev freetype-dev python3-dev openimageio-dev opencolorio-dev glew-dev openal-soft-dev ffmpeg-dev fftw-dev tiff-dev mesa-dev libxi-dev libsndfile-dev libxmu-dev boost-dev openexr-dev py-numpy-dev opensubdiv-dev" -install="" subpackages="$pkgname-doc $pkgname-shared::noarch $pkgname-headless $pkgname-player py3-$pkgname:python" source="http://download.blender.org/source/${pkgname}-${pkgver}.tar.gz blender-2.78a-musl.patch" @@ -55,28 +54,27 @@ _build() { -DPYTHON_LIBRARY=python${PY_VERSION}m \ -DPYTHON_INCLUDE_DIRS=/usr/include/python${PY_VERSION}m \ -DNO_EXECINFO:BOOL=ON \ - || return 1 - make || return 1 + make } package() { # Install headless files cd "$builddir"/build-headless - make DESTDIR="$pkgdir"/headless install || return 1 + make DESTDIR="$pkgdir"/headless install # Rename the headless blender to blender-headless mkdir -p "$pkgdir"/usr/bin - mv "$pkgdir"/headless/usr/bin/blender "$pkgdir"/usr/bin/blender-headless || return 1 + mv "$pkgdir"/headless/usr/bin/blender "$pkgdir"/usr/bin/blender-headless rm -rf "$pkgdir"/headless # Install python module cd "$builddir"/build-py - make DESTDIR="$pkgdir" install || return 1 + make DESTDIR="$pkgdir" install # Install the full package cd "$builddir"/build-full - make DESTDIR="$pkgdir" install || return 1 + make DESTDIR="$pkgdir" install } shared() { @@ -110,5 +108,5 @@ python() { ln -s /usr/share/blender/${_pkgver} "$subpkgdir"/usr/lib/python${PY_VERSION}/site-packages/${_pkgver} } -sha512sums="dee09e6ac19c4eeab71d64ad9581df1bb043a3de97586206b07aeb9aa55e68ecfc3a96d39835bcec20c72fb73a5eb418b349af7abe66d906a1e660caa1e4d267 blender-2.78c.tar.gz +sha512sums="2db21ace446168dd683cdb5aad9dec001f8888ae4e9603a04ddb44fb78489ded827deb07e83712b0f1118a0e7bf66f2a5d935dc4ebb3a6703d72672ff414367f blender-2.79b.tar.gz 47e8a6a017cea8c004d7e4205f201f167dd81ba95a4aadf9e55d01e81cc4a23e4d7f1d6aa7a6d1300fe3a5f5c98c664f584e7551fcde7fb1137147e2438f7ed5 blender-2.78a-musl.patch" -- 2.17.1 --- Unsubscribe: alpine-aports+unsubscribe@lists.alpinelinux.org Help: alpine-aports+help@lists.alpinelinux.org ---