Version bump, bug 249934

Package-Manager: portage-2.2_rc17/cvs/Linux 2.6.27-gentoo x86_64

3 files changed, 69 insertions, 2 deletions

diff --git a/media-libs/xvid/ChangeLog b/media-libs/xvid/ChangeLog
index 6afdd8250961..601f748e1eb0 100644
--- a/media-libs/xvid/ChangeLog
+++ b/media-libs/xvid/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/xvid
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xvid/ChangeLog,v 1.101 2008/12/12 05:31:20 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xvid/ChangeLog,v 1.102 2008/12/12 05:41:57 beandog Exp $
+
+*xvid-1.2.1 (12 Dec 2008)
+
+  12 Dec 2008; Steve Dibb <beandog@gentoo.org> +xvid-1.2.1.ebuild:
+  Version bump, bug 249934
 
 *xvid-1.2.0 (12 Dec 2008)
 
diff --git a/media-libs/xvid/Manifest b/media-libs/xvid/Manifest
index c357ff357ef4..381dd710cfa8 100644
--- a/media-libs/xvid/Manifest
+++ b/media-libs/xvid/Manifest
@@ -5,8 +5,10 @@ DIST xvid-1.1.2-noexec-stack.patch.bz2 2426 RMD160 083da9ab8e4fdcd067cd2970eeb7a
 DIST xvid-1.1.3-textrel-3.patch.bz2 24815 RMD160 bd1a798a2f0da00a024534fc46328cb768472df6 SHA1 94c7753e405ae62dd7f32f0543b48e9164f327bd SHA256 3f8796b5b7db07583f92c580df18ddb3a65637716f71882cc0ccafbc432bcd87
 DIST xvidcore-1.1.3.tar.bz2 625974 RMD160 f890a2ef58be5362aa1d2894e748ef11a0c7bba8 SHA1 7a945c245851e115bc107aa621f72d775a5d1adb SHA256 f5d7f658840ef6fda5b2cd8b105d3738e1a3e735ee12ddc0136527f0185c14ed
 DIST xvidcore-1.2.0.tar.bz2 640196 RMD160 05f7b72aa34ea3b3a3a3dba9caa9ed65e947ea2a SHA1 f7f2dbaf7affadf647d2cee46a767c108750fa99 SHA256 2151d810f345ba6fb604e77de051f666e762b4facf25226e5ad4b23eea90c8dd
+DIST xvidcore-1.2.1.tar.bz2 641101 RMD160 fcb6a5a0410d1921d99361fe5d580f00128b9ba3 SHA1 0e4fdbbf12914999095a5ea51d94adb4e9a0eca3 SHA256 ef0175aa86b2d8b48138ca993526645403371b87683c69853b09f1163797ddcc
 EBUILD xvid-1.1.3-r3.ebuild 2267 RMD160 02632006c8ffe14a0c37e99cc0695a05d462a8b6 SHA1 9995e7142ebd5cdc6625c3c2fbd38888df6d1991 SHA256 6ea95588e2bee8bde97f3aab330e0536d4617efa51dd66f586af50280bcbe757
 EBUILD xvid-1.1.3.ebuild 1875 RMD160 61aa265000c6b92e62afe2172db47dbf62dfb5fc SHA1 0965e58a77047ba8f5e809e6eae1bbd7f7230411 SHA256 238316234351f6a64aa34ceb3291208b928f50d6bf8e29a7d24995c76b61cc59
 EBUILD xvid-1.2.0.ebuild 1869 RMD160 fd3aae4ab02d4b47e4c8e5d157b97f5a2fc4279d SHA1 adc579c71f0d8114e2acbd64e93dfc005b2c0ef8 SHA256 1cccb0cad030150d4168bbb75a4aa052635ba173e90a48f5128b326b7aeb2ffe
-MISC ChangeLog 13284 RMD160 c3392a796fbe822c8c2cf0685afcb5797c102b3f SHA1 f0956ba96d5b9aa63a1da2d2d28e079af68902c0 SHA256 06d005db938d822baf38848287255041c1ce32e663a28efc63930ea3bb62643b
+EBUILD xvid-1.2.1.ebuild 1869 RMD160 c233288871479ae6bfd309be9998d58a597e25eb SHA1 ccd54aa237f63b38b6b76c207a2107591d697412 SHA256 71b2ca7eea38926e4fa42ccf19c47a8aa0c0e7b68ccb9cc05218babb1d8e87ec
+MISC ChangeLog 13406 RMD160 50ebd1bb42457f64fffb533e28c07c8148623207 SHA1 de1eeec6ae58ba0a2cc5fe877a97486e8fdd40e1 SHA256 63a91adc086ee7b90402ec9e38da351b05f7c9c4b51b8f5fdb8b35929aa25972
 MISC metadata.xml 225 RMD160 6e3fccd1ae62f02a0cb28d319aa185af0020822d SHA1 1b8ccc849053361ac907dc9b652796defd1ce906 SHA256 1a7f3e805478b42bc379b2a36944579d34d7e66ba5bf418a651e1cd58ad0a7f5
diff --git a/media-libs/xvid/xvid-1.2.1.ebuild b/media-libs/xvid/xvid-1.2.1.ebuild
new file mode 100644
index 000000000000..815f5994c672
--- /dev/null
+++ b/media-libs/xvid/xvid-1.2.1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xvid/xvid-1.2.1.ebuild,v 1.1 2008/12/12 05:41:57 beandog Exp $
+
+inherit eutils fixheadtails autotools
+
+MY_PN="${PN}core"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="XviD, a high performance/quality MPEG-4 video de-/encoding solution"
+HOMEPAGE="http://www.xvid.org"
+SRC_URI="http://downloads.xvid.org/downloads/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="1"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="examples altivec"
+
+# once yasm-0.6.0+ comes out, we can switch this to
+# dev-lang/nasm >=dev-lang/yasm-0.6.0
+# and then drop the quotes from section in the noexec-stack.patch
+
+# yasm < 0.6.2 has a bug when computing pic adresses.
+# See http://www.tortall.net/projects/yasm/ticket/114
+# the build system prefers yasm if it finds it
+# thus if we intend to have || (yasm nasm) for building
+# we need to make it block yasm < 0.6.2 on x86
+# otherwise it will compile wrong code
+NASM=">=dev-lang/yasm-0.6.2"
+DEPEND="x86? ( ${NASM} )
+	amd64? ( ${NASM} )"
+RDEPEND=""
+
+S="${WORKDIR}/${MY_PN}/build/generic"
+
+src_compile() {
+	econf $(use_enable altivec)
+	emake || die "emake failed."
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed."
+
+	dodoc "${S}"/../../{AUTHORS,ChangeLog*,README,TODO}
+
+	if [[ ${CHOST} == *-darwin* ]]; then
+		local mylib=$(basename $(ls "${D}"/usr/$(get_libdir)/libxvidcore.*.dylib))
+		dosym ${mylib} /usr/$(get_libdir)/libxvidcore.dylib
+	else
+		local mylib=$(basename $(ls "${D}"/usr/$(get_libdir)/libxvidcore.so*))
+		dosym ${mylib} /usr/$(get_libdir)/libxvidcore.so
+		dosym ${mylib} /usr/$(get_libdir)/${mylib/.1}
+	fi
+
+	if use examples; then
+		dodoc "${S}"/../../CodingStyle
+		insinto /usr/share/${PN}
+		doins -r "${S}"/../../examples
+	fi
+}