move ffmpeg patch to 2.48-r1 and remove unneeded 2.48-r2

Package-Manager: portage-2.2_rc12/cvs/Linux 2.6.27 i686

4 files changed, 12 insertions, 159 deletions

diff --git a/media-gfx/blender/ChangeLog b/media-gfx/blender/ChangeLog
index da76a2033db6..1a1b02a7500e 100644
--- a/media-gfx/blender/ChangeLog
+++ b/media-gfx/blender/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/blender
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.152 2008/10/16 05:27:38 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.153 2008/10/16 18:30:17 maekke Exp $
+
+  16 Oct 2008; Markus Meier <maekke@gentoo.org> blender-2.48-r1.ebuild,
+  -blender-2.48-r2.ebuild:
+  move ffmpeg patch to 2.48-r1 and remove unneeded 2.48-r2
 
 *blender-2.48-r2 (16 Oct 2008)
 *blender-2.48-r1 (16 Oct 2008)
diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest
index a7b7e8748c34..bb985e4a7ff1 100644
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -28,15 +28,14 @@ EBUILD blender-2.46-r1.ebuild 3630 RMD160 f2a4f3bbdfbc0b30f4284694e6ec263b6e7e66
 EBUILD blender-2.46.ebuild 3602 RMD160 86e8526c456b78f44bcd8cc05c1df320d76903f0 SHA1 5c1ab9951e4256ce75f47c9623755cd90e52f2e8 SHA256 d36260c6399766db15b38c79a01216be23dd982113a34e3e83927ed6ecfac52a
 EBUILD blender-2.47-r1.ebuild 3898 RMD160 720bb4010b011282cdd83294abc28528ec738bac SHA1 04c6ae4ab6e7173c39e4b71ca1530d814c6f4835 SHA256 e671f2121b13001acc4b4f3261515df61f58621425d1a7d281cb1ecb34142fc0
 EBUILD blender-2.47.ebuild 3869 RMD160 257e24844e835bd63b47a6c3ce6115ad61c77c5a SHA1 2fa64735a9c6a5180d9d90062abbe3baf21da740 SHA256 cd68ab5a6991222a7268fbf0a1244be660768dbab165f2488b0bf85c4c93a723
-EBUILD blender-2.48-r1.ebuild 3905 RMD160 516c674cc3d09659f0fb373f661763bdbf294287 SHA1 24bfc6d03be273873891102b298fdfa53b796e94 SHA256 883fe38144d93c06b6a1d0ea2b08a6fb5439498a36281e3b8c15534c625395db
-EBUILD blender-2.48-r2.ebuild 3954 RMD160 e03a42148ca2a3dfd73013d483e0f7741ccfc035 SHA1 1e6b4ec213b03acb16785e1b3cebf9f8f22c1b37 SHA256 e02ddff12a90479c162ffda868e40d87bec909a3541fbadd70a134df27744e33
+EBUILD blender-2.48-r1.ebuild 3954 RMD160 d1661ddb5b548c5958557294b5b77f88890adb1d SHA1 687778920775a6129f8bca9f360f9b12595fe19e SHA256 b432a58969ee7caba5c2ed7731c9a27a0d630edecd9cf973d02832c65f207ae6
 EBUILD blender-2.48.ebuild 3870 RMD160 6586e7473dd036ef98aa70600727d2d901f927c4 SHA1 500d712e3b4a1882875aa783c2352f35fb747ecf SHA256 9a206bce680152058e693c3a44ebf566734de1f9ffd9c3a90db635dffc4f14a8
-MISC ChangeLog 22714 RMD160 b7922e25721ba212062c78502a028a1b2caf22cb SHA1 07f59ffe04677ffb5cf12536701d4d38faaa970d SHA256 64940983cb97c23279df7933bf4d5b1944a42d8199456c05a84730110f10e22b
+MISC ChangeLog 22873 RMD160 4caa7767cf09f3228bfeec6cbab5bff9045b2626 SHA1 8eb5a60201b0afd262cc23457b62d8dabd422042 SHA256 a3ba1ff8248457d97770d696081384c0150ca76ae64c6d648f11af3cc2ce475d
 MISC metadata.xml 867 RMD160 a630f92b5061faea6e66057dc3a51dc3b8c161cb SHA1 4be79b0bc68377bd5ab9e83207fd734c5617fd44 SHA256 cec2cb5acea5ea8d18bd76edf58ba037a87302f69e3b6a30a9ca9c20fdd0534b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkj20SsACgkQkKaRLQcq0GLy3ACgqVxqTj1h0guBkEAVL8wBL37H
-23UAniKYBfOrAfbLpOpHs6BYV3l/lD5+
-=VJTx
+iEYEARECAAYFAkj3iJ0ACgkQkKaRLQcq0GJI/ACfY0ImJDeN7EppworP9FsHEBDE
+usMAnRYQkvb3zP1hanzcWzorA/W0HINx
+=23LG
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/blender/blender-2.48-r1.ebuild b/media-gfx/blender/blender-2.48-r1.ebuild
index a91c36e164fc..31c3b565f8a6 100644
--- a/media-gfx/blender/blender-2.48-r1.ebuild
+++ b/media-gfx/blender/blender-2.48-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.48-r1.ebuild,v 1.1 2008/10/16 05:27:38 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.48-r1.ebuild,v 1.2 2008/10/16 18:30:17 maekke Exp $
 
 EAPI="2"
 
@@ -57,6 +57,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/blender-2.44-scriptsdir.patch
 	epatch "${FILESDIR}"/blender-2.46-ffmpeg.patch
 	epatch "${FILESDIR}"/blender-2.46-cve-2008-1103-1.patch
+	epatch "${FILESDIR}"/${P}-ffmpeg-20081014.patch
 }
 
 src_configure() {
diff --git a/media-gfx/blender/blender-2.48-r2.ebuild b/media-gfx/blender/blender-2.48-r2.ebuild
deleted file mode 100644
index 03649142a572..000000000000
--- a/media-gfx/blender/blender-2.48-r2.ebuild
+++ /dev/null
@@ -1,151 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.48-r2.ebuild,v 1.1 2008/10/16 05:27:38 maekke Exp $
-
-EAPI="2"
-
-inherit multilib flag-o-matic eutils python
-
-#IUSE="jpeg mozilla png sdl static truetype"
-IUSE="blender-game ffmpeg jpeg nls openal openexr openmp
-	player png quicktime verse"
-DESCRIPTION="3D Creation/Animation/Publishing System"
-HOMEPAGE="http://www.blender.org/"
-SRC_URI="http://download.blender.org/source/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="|| ( GPL-2 BL )"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-
-RDEPEND=">=dev-libs/openssl-0.9.6
-	ffmpeg? ( >=media-video/ffmpeg-0.4.9_p20081014 )
-	jpeg? ( media-libs/jpeg )
-	media-libs/tiff
-	>=dev-lang/python-2.4
-	nls? ( >=media-libs/freetype-2.0
-			virtual/libintl
-			>=media-libs/ftgl-2.1 )
-	openal? ( media-libs/openal
-			media-libs/freealut )
-	openexr? ( media-libs/openexr )
-	png? ( media-libs/libpng )
-	quicktime? ( media-libs/libquicktime )
-	>=media-libs/libsdl-1.2
-	virtual/opengl"
-
-DEPEND=">=dev-util/scons-0.98
-	x11-libs/libXt
-	x11-proto/inputproto
-	${RDEPEND}"
-
-blend_with() {
-	local UWORD="$2"
-	if [ -z "${UWORD}" ]; then
-		UWORD="$1"
-	fi
-	if useq $1; then
-		echo "WITH_BF_${UWORD}=1" | tr '[:lower:]' '[:upper:]' \
-			>> "${S}"/user-config.py
-	else
-		echo "WITH_BF_${UWORD}=0" | tr '[:lower:]' '[:upper:]' \
-			>> "${S}"/user-config.py
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/blender-2.37-dirs.patch
-	epatch "${FILESDIR}"/blender-2.44-scriptsdir.patch
-	epatch "${FILESDIR}"/blender-2.46-ffmpeg.patch
-	epatch "${FILESDIR}"/blender-2.46-cve-2008-1103-1.patch
-	epatch "${FILESDIR}"/${P}-ffmpeg-20081014.patch
-}
-
-src_configure() {
-	if use ffmpeg ; then
-#		cd "${S}"/extern
-#		rm -rf ffmpeg libmp3lame x264
-		cat <<- EOF >> "${S}"/user-config.py
-		BF_FFMPEG="/usr"
-		BF_FFMPEG_LIB="avformat avcodec swscale avutil"
-		EOF
-	fi
-	# pass compiler flags to the scons build system
-	# and set python version to current version in use
-	python_version
-	cat <<- EOF >> "${S}"/user-config.py
-		CFLAGS += '${CFLAGS}'
-		BF_PYTHON_VERSION="${PYVER}"
-		BF_PYTHON_INC="/usr/include/python${PYVER}"
-		BF_PYTHON_BINARY="/usr/bin/python${PYVER}"
-		BF_PYTHON_LIB="python${PYVER}"
-	EOF
-
-	if use openmp && built_with_use --missing false sys-devel/gcc openmp ; then
-		echo "WITH_BF_OPENMP=1" >> "${S}"/user-config.py
-		elog "enabling openmp"
-	else
-		echo "WITH_BF_OPENMP=0" >> "${S}"/user-config.py
-		elog "disabling openmp"
-	fi
-
-	for arg in \
-			'blender-game gameengine' \
-			'ffmpeg' \
-			'jpeg' \
-			'nls international' \
-			'openal' \
-			'openexr' \
-			'player' \
-			'png' \
-			'verse' ; do
-		blend_with ${arg}
-	done
-}
-
-src_compile() {
-	# scons uses -l differently -> remove it
-	scons ${MAKEOPTS/-l[0-9]} || die \
-	"!!! Please add ${S}/scons.config when filing bugs reports to bugs.gentoo.org"
-
-	cd "${WORKDIR}"/install/linux2/plugins
-	chmod 755 bmake
-	emake || die
-}
-
-src_install() {
-	exeinto /usr/bin/
-	doexe "${WORKDIR}"/install/linux2/blender
-
-	dodir /usr/share/${PN}
-
-	exeinto /usr/$(get_libdir)/${PN}/textures
-	doexe "${WORKDIR}"/install/linux2/plugins/texture/*.so
-	exeinto /usr/$(get_libdir)/${PN}/sequences
-	doexe "${WORKDIR}"/install/linux2/plugins/sequence/*.so
-	insinto /usr/include/${PN}
-	doins "${WORKDIR}"/install/linux2/plugins/include/*.h
-
-	if use nls ; then
-		mv "${WORKDIR}"/install/linux2/.blender/{.Blanguages,.bfont.ttf} \
-			"${D}"/usr/share/${PN}
-		mv "${WORKDIR}"/install/linux2/.blender/locale \
-			"${D}"/usr/share/locale
-	fi
-
-	mv "${WORKDIR}"/install/linux2/.blender/scripts "${D}"/usr/share/${PN}
-
-	insinto /usr/share/pixmaps
-	doins "${FILESDIR}"/${PN}.png
-	insinto /usr/share/applications
-	doins "${FILESDIR}"/${PN}.desktop
-
-	dodoc INSTALL README
-	dodoc "${WORKDIR}"/install/linux2/BlenderQuickStart.pdf
-}
-
-pkg_preinst(){
-	if [ -h "${ROOT}/usr/$(get_libdir)/blender/plugins/include" ];
-	then
-		rm -f "${ROOT}"/usr/$(get_libdir)/blender/plugins/include
-	fi
-}