new upstream release. fixes bug #75617.

10 files changed, 106 insertions, 21 deletions

diff --git a/media-libs/xvid/ChangeLog b/media-libs/xvid/ChangeLog
index cc62afd63062..80eb7d043498 100644
--- a/media-libs/xvid/ChangeLog
+++ b/media-libs/xvid/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/xvid
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xvid/ChangeLog,v 1.35 2004/12/16 05:44:55 absinthe Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xvid/ChangeLog,v 1.36 2005/01/09 07:04:18 luckyduck Exp $
+
+*xvid-1.0.3 (09 Jan 2005)
+
+  09 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org> +xvid-1.0.3.ebuild:
+  new upstream release. fixes bug #75617.
 
   16 Dec 2004; Dylan Carlson <absinthe@gentoo.org> xvid-1.0.2.ebuild:
   Stable on amd64.
diff --git a/media-libs/xvid/Manifest b/media-libs/xvid/Manifest
index be9e8ea0d501..ec29d84f9ad6 100644
--- a/media-libs/xvid/Manifest
+++ b/media-libs/xvid/Manifest
@@ -1,16 +1,19 @@
-MD5 07e9a661c3e73204ab259113dbe911f1 ChangeLog 4203
-MD5 9ef4af14dad87b03fde8e43f19e08d26 metadata.xml 225
-MD5 f9f3a3810d057b0ad2d4468f2d2ae967 xvid-0.9.1.ebuild 1035
-MD5 05a45c221688a428d5aebb618263c20c xvid-0.9.2-r1.ebuild 1146
+MD5 b08acb2b4538abdafd8c6c148e23dce3 xvid-1.0.2.ebuild 1178
 MD5 b426fe20edac2b6d51baa646eaa7a946 xvid-1.0.0_rc4.ebuild 1075
 MD5 8bd75d2532aeba3e3dbaa79dfd04b228 xvid-1.0.1.ebuild 1292
-MD5 b08acb2b4538abdafd8c6c148e23dce3 xvid-1.0.2.ebuild 1178
-MD5 8c100445a64d960693db8424931ff0eb files/1.0.0_rc4-DESTDIR.patch 1450
-MD5 8c100445a64d960693db8424931ff0eb files/1.0.1-DESTDIR.patch 1450
+MD5 05a45c221688a428d5aebb618263c20c xvid-0.9.2-r1.ebuild 1146
+MD5 f9f3a3810d057b0ad2d4468f2d2ae967 xvid-0.9.1.ebuild 1035
+MD5 57aa84794578d24e661b012eec4c90f2 xvid-1.0.3.ebuild 1179
+MD5 07e9a661c3e73204ab259113dbe911f1 ChangeLog 4203
+MD5 9ef4af14dad87b03fde8e43f19e08d26 metadata.xml 225
 MD5 8c100445a64d960693db8424931ff0eb files/1.0.2-DESTDIR.patch 1450
+MD5 8c100445a64d960693db8424931ff0eb files/1.0.3-DESTDIR.patch 1450
 MD5 e83498fda540ee61cdb0ce3fe79585c8 files/digest-xvid-0.9.1 67
-MD5 3943af38157fef55f9da6987560d2e77 files/digest-xvid-0.9.2-r1 67
-MD5 181053d1f28fcfb20d9a491c674d5064 files/digest-xvid-1.0.0_rc4 71
 MD5 ea0eb745946d70fea0c5dfd32d166ddb files/digest-xvid-1.0.1 67
 MD5 3ed49831081a6eb29ccda7ec2956c592 files/digest-xvid-1.0.2 67
+MD5 a508fb244e68f01cbf06e590abbee04e files/digest-xvid-1.0.3 67
+MD5 3943af38157fef55f9da6987560d2e77 files/digest-xvid-0.9.2-r1 67
 MD5 b2f1f286ed22acfa893dae382f47fee2 files/xvid-1.0.1-64bit-clean.patch 1723
+MD5 181053d1f28fcfb20d9a491c674d5064 files/digest-xvid-1.0.0_rc4 71
+MD5 8c100445a64d960693db8424931ff0eb files/1.0.1-DESTDIR.patch 1450
+MD5 8c100445a64d960693db8424931ff0eb files/1.0.0_rc4-DESTDIR.patch 1450
diff --git a/media-libs/xvid/files/1.0.3-DESTDIR.patch b/media-libs/xvid/files/1.0.3-DESTDIR.patch
new file mode 100644
index 000000000000..68d7249da598
--- /dev/null
+++ b/media-libs/xvid/files/1.0.3-DESTDIR.patch
@@ -0,0 +1,33 @@
+--- build/generic/Makefile.orig	2004-04-26 18:36:04.708813608 -0400
++++ build/generic/Makefile	2004-04-26 18:37:39.278436840 -0400
+@@ -135,15 +135,15 @@
+ 
+ install: $(BUILD_DIR)/$(STATIC_LIB) $(BUILD_DIR)/$(SHARED_LIB)
+ 	@echo "  D: $(libdir)"
+-	@$(INSTALL) -d $(libdir)
++	@$(INSTALL) -d $(DESTDIR)$(libdir)
+ 	@echo "  I: $(libdir)/$(SHARED_LIB)"
+-	@$(INSTALL) -m 755 $(BUILD_DIR)/$(SHARED_LIB) $(libdir)/$(SHARED_LIB)
++	@$(INSTALL) -m 755 $(BUILD_DIR)/$(SHARED_LIB) $(DESTDIR)$(libdir)/$(SHARED_LIB)
+ 	@echo "  I: $(libdir)/$(STATIC_LIB)"
+-	@$(INSTALL) -m 755 $(BUILD_DIR)/$(STATIC_LIB) $(libdir)/$(STATIC_LIB)
++	@$(INSTALL) -m 755 $(BUILD_DIR)/$(STATIC_LIB) $(DESTDIR)$(libdir)/$(STATIC_LIB)
+ 	@echo "  D: $(includedir)"
+-	@$(INSTALL) -d $(includedir)
++	@$(INSTALL) -d $(DESTDIR)$(includedir)
+ 	@echo "  I: $(includedir)/xvid.h"
+-	@$(INSTALL) -m 644 $(SRC_DIR)/xvid.h $(includedir)/xvid.h
++	@$(INSTALL) -m 644 $(SRC_DIR)/xvid.h $(DESTDIR)$(includedir)/xvid.h
+ 
+ #-----------------------------------------------------------------------------
+ # Platorm specific file -- dumb rules for people executing make before
+--- build/generic/platform.inc.in.orig	2004-04-26 18:36:51.928635104 -0400
++++ build/generic/platform.inc.in	2004-04-26 18:37:02.919964168 -0400
+@@ -55,6 +55,7 @@
+ # ============================================================================
+ 
+ INSTALL=@INSTALL@
++DESTDIR=
+ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+ libdir=@libdir@
diff --git a/media-libs/xvid/files/digest-xvid-1.0.3 b/media-libs/xvid/files/digest-xvid-1.0.3
new file mode 100644
index 000000000000..4bb2d6f21c7e
--- /dev/null
+++ b/media-libs/xvid/files/digest-xvid-1.0.3
@@ -0,0 +1 @@
+MD5 1487c4dd4449aedeb695807467e69054 xvidcore-1.0.3.tar.bz2 541841
diff --git a/media-libs/xvid/xvid-0.9.1.ebuild b/media-libs/xvid/xvid-0.9.1.ebuild
index 93d774db0d73..ccd93862dc3d 100644
--- a/media-libs/xvid/xvid-0.9.1.ebuild
+++ b/media-libs/xvid/xvid-0.9.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xvid/xvid-0.9.1.ebuild,v 1.13 2004/07/14 20:39:09 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xvid/xvid-0.9.1.ebuild,v 1.14 2005/01/09 07:04:18 luckyduck Exp $
 
 DESCRIPTION="high performance/quality MPEG-4 video de-/encoding solution"
 HOMEPAGE="http://www.xvid.org/"
diff --git a/media-libs/xvid/xvid-0.9.2-r1.ebuild b/media-libs/xvid/xvid-0.9.2-r1.ebuild
index dd5f424fc6b7..6f2dff61097f 100644
--- a/media-libs/xvid/xvid-0.9.2-r1.ebuild
+++ b/media-libs/xvid/xvid-0.9.2-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xvid/xvid-0.9.2-r1.ebuild,v 1.9 2004/10/05 19:07:44 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xvid/xvid-0.9.2-r1.ebuild,v 1.10 2005/01/09 07:04:18 luckyduck Exp $
 
 inherit eutils
 
diff --git a/media-libs/xvid/xvid-1.0.0_rc4.ebuild b/media-libs/xvid/xvid-1.0.0_rc4.ebuild
index e3ab33addbed..cb2cd4afbf2c 100644
--- a/media-libs/xvid/xvid-1.0.0_rc4.ebuild
+++ b/media-libs/xvid/xvid-1.0.0_rc4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xvid/xvid-1.0.0_rc4.ebuild,v 1.4 2004/07/01 08:05:11 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xvid/xvid-1.0.0_rc4.ebuild,v 1.5 2005/01/09 07:04:18 luckyduck Exp $
 
 inherit eutils
 
diff --git a/media-libs/xvid/xvid-1.0.1.ebuild b/media-libs/xvid/xvid-1.0.1.ebuild
index a142be827981..600e9823aca2 100644
--- a/media-libs/xvid/xvid-1.0.1.ebuild
+++ b/media-libs/xvid/xvid-1.0.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xvid/xvid-1.0.1.ebuild,v 1.8 2004/10/05 19:07:44 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xvid/xvid-1.0.1.ebuild,v 1.9 2005/01/09 07:04:18 luckyduck Exp $
 
 inherit eutils
 
diff --git a/media-libs/xvid/xvid-1.0.2.ebuild b/media-libs/xvid/xvid-1.0.2.ebuild
index f6add772a43c..34f6a22cc909 100644
--- a/media-libs/xvid/xvid-1.0.2.ebuild
+++ b/media-libs/xvid/xvid-1.0.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xvid/xvid-1.0.2.ebuild,v 1.11 2004/12/16 05:44:55 absinthe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xvid/xvid-1.0.2.ebuild,v 1.12 2005/01/09 07:04:18 luckyduck Exp $
 
 inherit eutils
 
diff --git a/media-libs/xvid/xvid-1.0.3.ebuild b/media-libs/xvid/xvid-1.0.3.ebuild
new file mode 100644
index 000000000000..bc323cf43fff
--- /dev/null
+++ b/media-libs/xvid/xvid-1.0.3.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xvid/xvid-1.0.3.ebuild,v 1.1 2005/01/09 07:04:18 luckyduck Exp $
+
+inherit eutils
+
+MY_P=${PN}core-${PV/_rc/-rc}
+DESCRIPTION="XviD, a high performance/quality MPEG-4 video de-/encoding solution."
+HOMEPAGE="http://www.xvid.org/"
+SRC_URI="http://files.xvid.org/downloads/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="1"
+KEYWORDS="~x86 ~amd64"
+IUSE="doc"
+
+DEPEND="virtual/libc
+	x86? ( >=dev-lang/nasm-0.98.36 )"
+
+S="${WORKDIR}/${MY_P}/build/generic"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PV}-DESTDIR.patch
+}
+
+src_install() {
+	make install DESTDIR=${D} || die
+
+	cd ${S}/../../
+	dodoc AUTHORS ChangeLog README TODO doc/*
+
+	local mylib="$(basename $(ls ${D}/usr/$(get_libdir)/libxvidcore.so*))"
+	dosym ${mylib} /usr/$(get_libdir)/libxvidcore.so
+	dosym ${mylib} /usr/$(get_libdir)/${mylib/.0}
+
+	if use doc ; then
+		dodoc CodingStyle doc/README
+		insinto /usr/share/doc/${PF}/examples
+		doins examples/*
+	fi
+}