From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1SEhJk-0002A2-5G for garchives@archives.gentoo.org; Mon, 02 Apr 2012 13:29:08 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 71AE3E0BCF; Mon, 2 Apr 2012 13:29:00 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 2D2C1E0BCF for ; Mon, 2 Apr 2012 13:29:00 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 619F264194 for ; Mon, 2 Apr 2012 13:28:59 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 2166) id 36FCE2004B; Mon, 2 Apr 2012 13:28:58 +0000 (UTC) From: "Samuli Suominen (ssuominen)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, ssuominen@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in media-gfx/blender: blender-2.49b-r2.ebuild blender-2.49a.ebuild ChangeLog blender-2.60a.ebuild blender-2.57-r1.ebuild blender-2.48a-r3.ebuild X-VCS-Repository: gentoo-x86 X-VCS-Files: blender-2.49b-r2.ebuild blender-2.49a.ebuild ChangeLog blender-2.60a.ebuild blender-2.57-r1.ebuild blender-2.48a-r3.ebuild X-VCS-Directories: media-gfx/blender X-VCS-Committer: ssuominen X-VCS-Committer-Name: Samuli Suominen Content-Type: text/plain; charset=utf8 Message-Id: <20120402132858.36FCE2004B@flycatcher.gentoo.org> Date: Mon, 2 Apr 2012 13:28:58 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 411f2efd-b585-4d80-8880-8acb2ff3e185 X-Archives-Hash: cdbb8558ac43ad3b35a17fa7ca021af4 ssuominen 12/04/02 13:28:58 Modified: blender-2.49b-r2.ebuild blender-2.49a.ebuild ChangeLog blender-2.60a.ebuild blender-2.57-r1.ebuild blender-2.48a-r3.ebuild Log: Fix building with media-libs/openjpeg >=3D 1.5.0 wrt #409283. Every ver= sion has source/blender/imbuf/intern/jp2.c with parameters->tile_size_on = set to false. =20 (Portage version: 2.2.0_alpha96/cvs/Linux x86_64) Revision Changes Path 1.13 media-gfx/blender/blender-2.49b-r2.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/= blender-2.49b-r2.ebuild?rev=3D1.13&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/= blender-2.49b-r2.ebuild?rev=3D1.13&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/= blender-2.49b-r2.ebuild?r1=3D1.12&r2=3D1.13 Index: blender-2.49b-r2.ebuild =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.49b-r2.ebui= ld,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- blender-2.49b-r2.ebuild 13 Nov 2011 07:19:54 -0000 1.12 +++ blender-2.49b-r2.ebuild 2 Apr 2012 13:28:58 -0000 1.13 @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.49b-r2.eb= uild,v 1.12 2011/11/13 07:19:54 lu_zero Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.49b-r2.eb= uild,v 1.13 2012/04/02 13:28:58 ssuominen Exp $ =20 EAPI=3D2 =20 @@ -61,6 +61,11 @@ epatch "${FILESDIR}"/${PN}-2.49b-subversion-1.7.patch epatch "${FILESDIR}"/${P}-libav-0.7.patch rm -f "${S}/release/scripts/bpymodules/"*.pyc + + # Fix building with >=3Dmedia-libs/openjpeg-1.5.0 (bug #409283) + sed -i \ + -e '/parameters.*tile_size_on/s:false:FALSE:' \ + source/blender/imbuf/intern/jp2.c || die } =20 src_configure() { 1.18 media-gfx/blender/blender-2.49a.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/= blender-2.49a.ebuild?rev=3D1.18&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/= blender-2.49a.ebuild?rev=3D1.18&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/= blender-2.49a.ebuild?r1=3D1.17&r2=3D1.18 Index: blender-2.49a.ebuild =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.49a.ebuild,= v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- blender-2.49a.ebuild 30 Oct 2011 12:59:41 -0000 1.17 +++ blender-2.49a.ebuild 2 Apr 2012 13:28:58 -0000 1.18 @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.49a.ebuil= d,v 1.17 2011/10/30 12:59:41 sping Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.49a.ebuil= d,v 1.18 2012/04/02 13:28:58 ssuominen Exp $ =20 EAPI=3D2 =20 @@ -58,6 +58,11 @@ epatch "${FILESDIR}"/${PN}-2.49a-sys-openjpeg.patch epatch "${FILESDIR}"/${PN}-2.49a-bake.patch rm -f "${S}/release/scripts/bpymodules/"*.pyc + + # Fix building with >=3Dmedia-libs/openjpeg-1.5.0 (bug #409283) + sed -i \ + -e '/parameters.*tile_size_on/s:false:FALSE:' \ + source/blender/imbuf/intern/jp2.c || die } =20 src_configure() { 1.222 media-gfx/blender/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/= ChangeLog?rev=3D1.222&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/= ChangeLog?rev=3D1.222&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/= ChangeLog?r1=3D1.221&r2=3D1.222 Index: ChangeLog =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v retrieving revision 1.221 retrieving revision 1.222 diff -u -r1.221 -r1.222 --- ChangeLog 23 Feb 2012 16:57:16 -0000 1.221 +++ ChangeLog 2 Apr 2012 13:28:58 -0000 1.222 @@ -1,6 +1,12 @@ # ChangeLog for media-gfx/blender # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.221 2= 012/02/23 16:57:16 xarthisius Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.222 2= 012/04/02 13:28:58 ssuominen Exp $ + + 02 Apr 2012; Samuli Suominen blender-2.48a-r3.e= build, + blender-2.49a.ebuild, blender-2.49b-r2.ebuild, blender-2.57-r1.ebuild, + blender-2.60a.ebuild: + Fix building with media-libs/openjpeg >=3D 1.5.0 wrt #409283. Every ve= rsion has + source/blender/imbuf/intern/jp2.c with parameters->tile_size_on set to= false. =20 23 Feb 2012; Kacper Kowalik blender-2.57-r1.eb= uild, blender-2.60a.ebuild: 1.10 media-gfx/blender/blender-2.60a.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/= blender-2.60a.ebuild?rev=3D1.10&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/= blender-2.60a.ebuild?rev=3D1.10&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/= blender-2.60a.ebuild?r1=3D1.9&r2=3D1.10 Index: blender-2.60a.ebuild =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.60a.ebuild,= v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- blender-2.60a.ebuild 23 Feb 2012 16:57:16 -0000 1.9 +++ blender-2.60a.ebuild 2 Apr 2012 13:28:58 -0000 1.10 @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.60a.ebuil= d,v 1.9 2012/02/23 16:57:16 xarthisius Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.60a.ebuil= d,v 1.10 2012/04/02 13:28:58 ssuominen Exp $ =20 PYTHON_DEPEND=3D"3:3.2" EAPI=3D4 @@ -148,6 +148,11 @@ epatch "${FILESDIR}"/${P}-libav-0.7.patch epatch "${FILESDIR}"/${P}-CVE-2009-3850-v3.patch epatch "${FILESDIR}"/${P}-enable_site_module.patch + + # Fix building with >=3Dmedia-libs/openjpeg-1.5.0 (bug #409283) + sed -i \ + -e '/parameters.*tile_size_on/s:false:FALSE:' \ + source/blender/imbuf/intern/jp2.c || die } =20 src_configure() { 1.12 media-gfx/blender/blender-2.57-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/= blender-2.57-r1.ebuild?rev=3D1.12&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/= blender-2.57-r1.ebuild?rev=3D1.12&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/= blender-2.57-r1.ebuild?r1=3D1.11&r2=3D1.12 Index: blender-2.57-r1.ebuild =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.57-r1.ebuil= d,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- blender-2.57-r1.ebuild 23 Feb 2012 16:57:16 -0000 1.11 +++ blender-2.57-r1.ebuild 2 Apr 2012 13:28:58 -0000 1.12 @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.57-r1.ebu= ild,v 1.11 2012/02/23 16:57:16 xarthisius Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.57-r1.ebu= ild,v 1.12 2012/04/02 13:28:58 ssuominen Exp $ =20 PYTHON_DEPEND=3D"3:3.2" =20 @@ -156,6 +156,11 @@ =20 # Linux 3.x (bug #381099) epatch "${FILESDIR}"/${P}-linux-3.patch + + # Fix building with >=3Dmedia-libs/openjpeg-1.5.0 (bug #409283) + sed -i \ + -e '/parameters.*tile_size_on/s:false:FALSE:' \ + source/blender/imbuf/intern/jp2.c || die } =20 src_configure() { 1.18 media-gfx/blender/blender-2.48a-r3.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/= blender-2.48a-r3.ebuild?rev=3D1.18&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/= blender-2.48a-r3.ebuild?rev=3D1.18&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/= blender-2.48a-r3.ebuild?r1=3D1.17&r2=3D1.18 Index: blender-2.48a-r3.ebuild =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.48a-r3.ebui= ld,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- blender-2.48a-r3.ebuild 30 Oct 2011 12:59:41 -0000 1.17 +++ blender-2.48a-r3.ebuild 2 Apr 2012 13:28:58 -0000 1.18 @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.48a-r3.eb= uild,v 1.17 2011/10/30 12:59:41 sping Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.48a-r3.eb= uild,v 1.18 2012/04/02 13:28:58 ssuominen Exp $ =20 EAPI=3D2 =20 @@ -60,6 +60,11 @@ epatch "${FILESDIR}"/${PN}-2.46-cve-2008-1103-1.patch epatch "${FILESDIR}"/${PN}-2.48-ffmpeg-20081014.patch epatch "${FILESDIR}"/${P}-CVE-2008-4863.patch + + # Fix building with >=3Dmedia-libs/openjpeg-1.5.0 (bug #409283) + sed -i \ + -e '/parameters.*tile_size_on/s:false:FALSE:' \ + source/blender/imbuf/intern/jp2.c || die } =20 src_configure() {