public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [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
@ 2012-04-02 13:28 Samuli Suominen (ssuominen)
  0 siblings, 0 replies; 2+ messages in thread
From: Samuli Suominen (ssuominen) @ 2012-04-02 13:28 UTC (permalink / raw
  To: gentoo-commits

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 >= 1.5.0 wrt #409283. Every version has source/blender/imbuf/intern/jp2.c with parameters->tile_size_on set to false.
  
  (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=1.13&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/blender-2.49b-r2.ebuild?rev=1.13&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/blender-2.49b-r2.ebuild?r1=1.12&r2=1.13

Index: blender-2.49b-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.49b-r2.ebuild,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.ebuild,v 1.12 2011/11/13 07:19:54 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.49b-r2.ebuild,v 1.13 2012/04/02 13:28:58 ssuominen Exp $
 
 EAPI=2
 
@@ -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 >=media-libs/openjpeg-1.5.0 (bug #409283)
+	sed -i \
+		-e '/parameters.*tile_size_on/s:false:FALSE:' \
+		source/blender/imbuf/intern/jp2.c || die
 }
 
 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=1.18&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/blender-2.49a.ebuild?rev=1.18&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/blender-2.49a.ebuild?r1=1.17&r2=1.18

Index: blender-2.49a.ebuild
===================================================================
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.ebuild,v 1.17 2011/10/30 12:59:41 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.49a.ebuild,v 1.18 2012/04/02 13:28:58 ssuominen Exp $
 
 EAPI=2
 
@@ -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 >=media-libs/openjpeg-1.5.0 (bug #409283)
+	sed -i \
+		-e '/parameters.*tile_size_on/s:false:FALSE:' \
+		source/blender/imbuf/intern/jp2.c || die
 }
 
 src_configure() {



1.222                media-gfx/blender/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/ChangeLog?rev=1.222&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/ChangeLog?rev=1.222&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/ChangeLog?r1=1.221&r2=1.222

Index: ChangeLog
===================================================================
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 2012/02/23 16:57:16 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.222 2012/04/02 13:28:58 ssuominen Exp $
+
+  02 Apr 2012; Samuli Suominen <ssuominen@gentoo.org> blender-2.48a-r3.ebuild,
+  blender-2.49a.ebuild, blender-2.49b-r2.ebuild, blender-2.57-r1.ebuild,
+  blender-2.60a.ebuild:
+  Fix building with media-libs/openjpeg >= 1.5.0 wrt #409283. Every version has
+  source/blender/imbuf/intern/jp2.c with parameters->tile_size_on set to false.
 
   23 Feb 2012; Kacper Kowalik <xarthisius@gentoo.org> blender-2.57-r1.ebuild,
   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=1.10&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/blender-2.60a.ebuild?rev=1.10&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/blender-2.60a.ebuild?r1=1.9&r2=1.10

Index: blender-2.60a.ebuild
===================================================================
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.ebuild,v 1.9 2012/02/23 16:57:16 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.60a.ebuild,v 1.10 2012/04/02 13:28:58 ssuominen Exp $
 
 PYTHON_DEPEND="3:3.2"
 EAPI=4
@@ -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 >=media-libs/openjpeg-1.5.0 (bug #409283)
+	sed -i \
+		-e '/parameters.*tile_size_on/s:false:FALSE:' \
+		source/blender/imbuf/intern/jp2.c || die
 }
 
 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=1.12&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/blender-2.57-r1.ebuild?rev=1.12&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/blender-2.57-r1.ebuild?r1=1.11&r2=1.12

Index: blender-2.57-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.57-r1.ebuild,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.ebuild,v 1.11 2012/02/23 16:57:16 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.57-r1.ebuild,v 1.12 2012/04/02 13:28:58 ssuominen Exp $
 
 PYTHON_DEPEND="3:3.2"
 
@@ -156,6 +156,11 @@
 
 	# Linux 3.x (bug #381099)
 	epatch "${FILESDIR}"/${P}-linux-3.patch
+
+	# Fix building with >=media-libs/openjpeg-1.5.0 (bug #409283)
+	sed -i \
+		-e '/parameters.*tile_size_on/s:false:FALSE:' \
+		source/blender/imbuf/intern/jp2.c || die
 }
 
 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=1.18&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/blender-2.48a-r3.ebuild?rev=1.18&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/blender-2.48a-r3.ebuild?r1=1.17&r2=1.18

Index: blender-2.48a-r3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.48a-r3.ebuild,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.ebuild,v 1.17 2011/10/30 12:59:41 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.48a-r3.ebuild,v 1.18 2012/04/02 13:28:58 ssuominen Exp $
 
 EAPI=2
 
@@ -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 >=media-libs/openjpeg-1.5.0 (bug #409283)
+	sed -i \
+		-e '/parameters.*tile_size_on/s:false:FALSE:' \
+		source/blender/imbuf/intern/jp2.c || die
 }
 
 src_configure() {






^ permalink raw reply	[flat|nested] 2+ messages in thread

* [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
@ 2012-04-02 13:34 Samuli Suominen (ssuominen)
  0 siblings, 0 replies; 2+ messages in thread
From: Samuli Suominen (ssuominen) @ 2012-04-02 13:34 UTC (permalink / raw
  To: gentoo-commits

ssuominen    12/04/02 13:34:47

  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 deps to match the change, revert commit to 2.48
  
  (Portage version: 2.2.0_alpha96/cvs/Linux x86_64)

Revision  Changes    Path
1.14                 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=1.14&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/blender-2.49b-r2.ebuild?rev=1.14&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/blender-2.49b-r2.ebuild?r1=1.13&r2=1.14

Index: blender-2.49b-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.49b-r2.ebuild,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- blender-2.49b-r2.ebuild	2 Apr 2012 13:28:58 -0000	1.13
+++ blender-2.49b-r2.ebuild	2 Apr 2012 13:34:47 -0000	1.14
@@ -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.49b-r2.ebuild,v 1.13 2012/04/02 13:28:58 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.49b-r2.ebuild,v 1.14 2012/04/02 13:34:47 ssuominen Exp $
 
 EAPI=2
 
@@ -17,7 +17,7 @@
 KEYWORDS="amd64 ppc ppc64 x86"
 
 RDEPEND="ffmpeg? ( virtual/ffmpeg[encode,theora] )
-	media-libs/openjpeg
+	>=media-libs/openjpeg-1.5.0
 	media-libs/tiff
 	>=dev-lang/python-2.5
 	nls? ( >=media-libs/freetype-2.0



1.19                 media-gfx/blender/blender-2.49a.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/blender-2.49a.ebuild?rev=1.19&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/blender-2.49a.ebuild?rev=1.19&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/blender-2.49a.ebuild?r1=1.18&r2=1.19

Index: blender-2.49a.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.49a.ebuild,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- blender-2.49a.ebuild	2 Apr 2012 13:28:58 -0000	1.18
+++ blender-2.49a.ebuild	2 Apr 2012 13:34:47 -0000	1.19
@@ -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.49a.ebuild,v 1.18 2012/04/02 13:28:58 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.49a.ebuild,v 1.19 2012/04/02 13:34:47 ssuominen Exp $
 
 EAPI=2
 
@@ -17,7 +17,7 @@
 KEYWORDS="amd64 ppc ppc64 x86"
 
 RDEPEND="ffmpeg? ( virtual/ffmpeg[encode,theora] )
-	media-libs/openjpeg
+	>=media-libs/openjpeg-1.5.0
 	media-libs/tiff
 	>=dev-lang/python-2.5
 	nls? ( >=media-libs/freetype-2.0



1.223                media-gfx/blender/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/ChangeLog?rev=1.223&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/ChangeLog?rev=1.223&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/ChangeLog?r1=1.222&r2=1.223

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v
retrieving revision 1.222
retrieving revision 1.223
diff -u -r1.222 -r1.223
--- ChangeLog	2 Apr 2012 13:28:58 -0000	1.222
+++ ChangeLog	2 Apr 2012 13:34:47 -0000	1.223
@@ -1,10 +1,9 @@
 # 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.222 2012/04/02 13:28:58 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.223 2012/04/02 13:34:47 ssuominen Exp $
 
-  02 Apr 2012; Samuli Suominen <ssuominen@gentoo.org> blender-2.48a-r3.ebuild,
-  blender-2.49a.ebuild, blender-2.49b-r2.ebuild, blender-2.57-r1.ebuild,
-  blender-2.60a.ebuild:
+  02 Apr 2012; Samuli Suominen <ssuominen@gentoo.org> blender-2.49a.ebuild,
+  blender-2.49b-r2.ebuild, blender-2.57-r1.ebuild, blender-2.60a.ebuild:
   Fix building with media-libs/openjpeg >= 1.5.0 wrt #409283. Every version has
   source/blender/imbuf/intern/jp2.c with parameters->tile_size_on set to false.
 



1.11                 media-gfx/blender/blender-2.60a.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/blender-2.60a.ebuild?rev=1.11&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/blender-2.60a.ebuild?rev=1.11&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/blender-2.60a.ebuild?r1=1.10&r2=1.11

Index: blender-2.60a.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.60a.ebuild,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- blender-2.60a.ebuild	2 Apr 2012 13:28:58 -0000	1.10
+++ blender-2.60a.ebuild	2 Apr 2012 13:34:47 -0000	1.11
@@ -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.ebuild,v 1.10 2012/04/02 13:28:58 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.60a.ebuild,v 1.11 2012/04/02 13:34:47 ssuominen Exp $
 
 PYTHON_DEPEND="3:3.2"
 EAPI=4
@@ -54,7 +54,10 @@
 	openexr? ( media-libs/openexr )
 	ffmpeg? (
 		>=virtual/ffmpeg-0.6.90[x264,mp3,encode,theora]
-		jpeg2k? ( >=virtual/ffmpeg-0.6.90[x264,mp3,encode,theora,jpeg2k] )
+		jpeg2k? (
+			!<media-libs/openjpeg-1.5.0
+			>=virtual/ffmpeg-0.6.90[x264,mp3,encode,theora,jpeg2k]
+		)
 	)
 	openal? ( >=media-libs/openal-1.6.372 )
 	fftw? ( sci-libs/fftw:3.0 )



1.13                 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=1.13&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/blender-2.57-r1.ebuild?rev=1.13&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/blender-2.57-r1.ebuild?r1=1.12&r2=1.13

Index: blender-2.57-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.57-r1.ebuild,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- blender-2.57-r1.ebuild	2 Apr 2012 13:28:58 -0000	1.12
+++ blender-2.57-r1.ebuild	2 Apr 2012 13:34:47 -0000	1.13
@@ -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.ebuild,v 1.12 2012/04/02 13:28:58 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.57-r1.ebuild,v 1.13 2012/04/02 13:34:47 ssuominen Exp $
 
 PYTHON_DEPEND="3:3.2"
 
@@ -58,7 +58,10 @@
 	openexr? ( media-libs/openexr )
 	ffmpeg? (
 		virtual/ffmpeg[x264,mp3,encode,theora]
-		jpeg2k? ( virtual/ffmpeg[x264,mp3,encode,theora,jpeg2k] )
+		jpeg2k? (
+			!<media-libs/openjpeg-1.5.0
+			virtual/ffmpeg[x264,mp3,encode,theora,jpeg2k]
+		)
 	)
 	openal? ( >=media-libs/openal-1.6.372 )
 	fftw? ( sci-libs/fftw:3.0 )



1.19                 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=1.19&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/blender-2.48a-r3.ebuild?rev=1.19&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/blender-2.48a-r3.ebuild?r1=1.18&r2=1.19

Index: blender-2.48a-r3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.48a-r3.ebuild,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- blender-2.48a-r3.ebuild	2 Apr 2012 13:28:58 -0000	1.18
+++ blender-2.48a-r3.ebuild	2 Apr 2012 13:34:47 -0000	1.19
@@ -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.48a-r3.ebuild,v 1.18 2012/04/02 13:28:58 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.48a-r3.ebuild,v 1.19 2012/04/02 13:34:47 ssuominen Exp $
 
 EAPI=2
 
@@ -60,11 +60,6 @@
 	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 >=media-libs/openjpeg-1.5.0 (bug #409283)
-	sed -i \
-		-e '/parameters.*tile_size_on/s:false:FALSE:' \
-		source/blender/imbuf/intern/jp2.c || die
 }
 
 src_configure() {






^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2012-04-02 13:35 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-04-02 13:34 [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 Samuli Suominen (ssuominen)
  -- strict thread matches above, loose matches on Subject: below --
2012-04-02 13:28 Samuli Suominen (ssuominen)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox