Version bump wrt #297579 by Jan Vansteenkiste.

Package-Manager: portage-2.2_rc60/cvs/Linux x86_64

4 files changed, 69 insertions, 2 deletions

diff --git a/media-libs/libmms/ChangeLog b/media-libs/libmms/ChangeLog
index 68dfc9705d56..0cd6ded7df5d 100644
--- a/media-libs/libmms/ChangeLog
+++ b/media-libs/libmms/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/libmms
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmms/ChangeLog,v 1.34 2009/05/20 15:35:28 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmms/ChangeLog,v 1.35 2009/12/22 11:45:54 ssuominen Exp $
+
+*libmms-0.5 (22 Dec 2009)
+
+  22 Dec 2009; Samuli Suominen <ssuominen@gentoo.org> +libmms-0.5.ebuild,
+  +files/libmms-0.5-checkborders.patch:
+  Version bump wrt #297579 by Jan Vansteenkiste.
 
   20 May 2009; Brent Baude <ranger@gentoo.org> libmms-0.4.ebuild:
   Marking libmms-0.4 ppc for bug 268294
diff --git a/media-libs/libmms/Manifest b/media-libs/libmms/Manifest
index b07e4921319a..42dd700d4573 100644
--- a/media-libs/libmms/Manifest
+++ b/media-libs/libmms/Manifest
@@ -1,6 +1,9 @@
 AUX libmms-0.4-nested_comments.patch 438 RMD160 9a0c7390b617218edccbc78e17f39a54b42ad47e SHA1 941fbc8ebc25c36cf43ae757f1ccfc97bb9efae3 SHA256 751f87b83dcddfa376621320dae44155cd42fd50120863aa8eda7e121e762ea3
 AUX libmms-0.4-this_keyword.patch 1848 RMD160 04005cec9c511628c193ea04a38c886cc2755b09 SHA1 57cc6a00b4bfad746626df847a5cd3211a05a1a6 SHA256 d8cfda17acaaf02c3ffc157b55cee74538c05a213dd3b7f0d1cba17dcb5b219b
+AUX libmms-0.5-checkborders.patch 964 RMD160 903282b5dac88b4109aa0a1f5bc3de09363afa40 SHA1 56d1bf1afe8cf9476de71913dcead93d9e73467b SHA256 78d75d238b21a80add0fb293b6e7007e60521cd1c7eeafada81982d89b3c6899
 DIST libmms-0.4.tar.gz 367690 RMD160 5fcc9cddd50b82f0f37e2f21b6f9cd51ec3706f8 SHA1 301dff27db1742eeab699d6f7619a05cd7b0d8a4 SHA256 6d01d04ae5824eb77ca6e8a0676af553cc486b87eaeac792f133ea336fe6d87f
+DIST libmms-0.5.tar.gz 333919 RMD160 87b47fde3043af2c72b0cfdc3b212732ccbaf0c2 SHA1 59ba9eb70a69b4f01cf4d90995cffcb3d277d6c4 SHA256 02d9ca2b16b1517b84edb6c1c378a1f447679a831ba708a0396b30852aa6f091
 EBUILD libmms-0.4.ebuild 853 RMD160 4a258c113dc817c492bda557415208e405269c2c SHA1 3c38e4dcea17263c16c540a30672caee075fb67e SHA256 00db7e0e2cd56f226ba856bd5b17a2f46788fd10cdef4101185b2ba38dcb6e5a
-MISC ChangeLog 3585 RMD160 572508fea72734275e763cd4029f9bf13742b87a SHA1 640258837f2d78d1be622285eb161b346fc4fbd8 SHA256 8808362222003dc3d9f02ab4fcc09d987bac4945467fae091102705e3a28e33a
+EBUILD libmms-0.5.ebuild 854 RMD160 14b55e8af6d825a24dedae5e9b4e8c58f3e8ea8e SHA1 fdd70076b0af76302a493d80ee04eccc9445e021 SHA256 46149267c77ef8f72dc2626c912d10cc194a9de7ca08e9c1e3f7d9fcfa255370
+MISC ChangeLog 3779 RMD160 f5cd5b9d2a41e8510254d9d58783898b88327e84 SHA1 421639bcf0b1a0920829aaf78450aea1753d0b46 SHA256 eedb345ab2b0273a4ea6a6f1192a0e9f1d5e8a678b6b402e422f802f01abfc13
 MISC metadata.xml 159 RMD160 21717801992314b5fc85dfeb6da77bf71fc54c7e SHA1 26b6ea95dc60c40d9b482830ce7e7c54233a7698 SHA256 38df217d3a650829cd34e6c74bd2710a01751ccd5511b5be296e3f48dd4d81cb
diff --git a/media-libs/libmms/files/libmms-0.5-checkborders.patch b/media-libs/libmms/files/libmms-0.5-checkborders.patch
new file mode 100644
index 000000000000..fe82fb2bbc92
--- /dev/null
+++ b/media-libs/libmms/files/libmms-0.5-checkborders.patch
@@ -0,0 +1,25 @@
+http://bugs.gentoo.org/show_bug.cgi?id=297579
+
+--- src/mms.c
++++ src/mms.c
+@@ -1021,10 +1021,15 @@
+       
+       /* forces the asf demuxer to not choose this stream */
+       if (this->streams[i].bitrate_pos) {
+-        this->asf_header[this->streams[i].bitrate_pos    ] = 0;
+-        this->asf_header[this->streams[i].bitrate_pos + 1] = 0;
+-        this->asf_header[this->streams[i].bitrate_pos + 2] = 0;
+-        this->asf_header[this->streams[i].bitrate_pos + 3] = 0;
++        if (this->streams[i].bitrate_pos+3 <= ASF_HEADER_LEN) {
++          this->asf_header[this->streams[i].bitrate_pos    ] = 0;
++          this->asf_header[this->streams[i].bitrate_pos + 1] = 0;
++          this->asf_header[this->streams[i].bitrate_pos + 2] = 0;
++          this->asf_header[this->streams[i].bitrate_pos + 3] = 0;
++        } else {
++          lprintf("***LOG:*** -- "
++                  "libmms: attempt to write beyond asf header limit");
++        }
+       }
+     }
+   }
+
diff --git a/media-libs/libmms/libmms-0.5.ebuild b/media-libs/libmms/libmms-0.5.ebuild
new file mode 100644
index 000000000000..07d7ff4967a7
--- /dev/null
+++ b/media-libs/libmms/libmms-0.5.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmms/libmms-0.5.ebuild,v 1.1 2009/12/22 11:45:54 ssuominen Exp $
+
+EAPI=2
+inherit eutils
+
+DESCRIPTION="Common library for accessing Microsoft Media Server (MMS) media streaming protocol"
+HOMEPAGE="https://launchpad.net/libmms/"
+SRC_URI="http://launchpad.net/libmms/trunk/${PV}/+download/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND="dev-libs/glib:2"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-checkborders.patch
+}
+
+src_configure() {
+	econf \
+		--disable-dependency-tracking
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog NEWS README TODO
+}