Version bump for bug 203647, thanks to Gordon and Hans.

(Portage version: 2.1.6/cvs/Linux 2.6.27.7 i686)

9 files changed, 103 insertions, 269 deletions

diff --git a/media-libs/libmms/ChangeLog b/media-libs/libmms/ChangeLog
index 0dd392aff473..147ca61f5687 100644
--- a/media-libs/libmms/ChangeLog
+++ b/media-libs/libmms/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/libmms
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmms/ChangeLog,v 1.23 2007/12/25 13:16:04 phreak Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmms/ChangeLog,v 1.24 2008/12/12 13:58:54 ssuominen Exp $
+
+*libmms-0.4 (12 Dec 2008)
+
+  12 Dec 2008; <ssuominen@gentoo.org>
+  +files/libmms-0.4-nested_comments.patch,
+  +files/libmms-0.4-this_keyword.patch, +libmms-0.4.ebuild:
+  Version bump for bug 203647, thanks to Gordon and Hans.
 
   25 Dec 2007; Christian Heim <phreak@gentoo.org> metadata.xml:
   Removing foser from metadata.xml as per #120234.
diff --git a/media-libs/libmms/files/libmms-0.4-nested_comments.patch b/media-libs/libmms/files/libmms-0.4-nested_comments.patch
new file mode 100644
index 000000000000..3d42f0c98b18
--- /dev/null
+++ b/media-libs/libmms/files/libmms-0.4-nested_comments.patch
@@ -0,0 +1,9 @@
+diff -ur libmms-0.4.orig/src/mms_config.h.in libmms-0.4/src/mms_config.h.in
+--- libmms-0.4.orig/src/mms_config.h.in	2007-12-16 21:19:34.000000000 +0200
++++ libmms-0.4/src/mms_config.h.in	2008-12-12 15:50:01.000000000 +0200
+@@ -1,4 +1,4 @@
+-/* libmms public autoconf settings header file
++/* libmms public autoconf settings header file */
+ 
+ /* Define to 1 if libmms is compiled with 64 bit file offsets */
+ #undef LIBMMS_HAVE_64BIT_OFF_T
diff --git a/media-libs/libmms/files/libmms-0.4-this_keyword.patch b/media-libs/libmms/files/libmms-0.4-this_keyword.patch
new file mode 100644
index 000000000000..7d20b0820792
--- /dev/null
+++ b/media-libs/libmms/files/libmms-0.4-this_keyword.patch
@@ -0,0 +1,48 @@
+diff -ur libmms-0.4.orig/src/mms.h libmms-0.4/src/mms.h
+--- libmms-0.4.orig/src/mms.h	2007-12-11 22:24:48.000000000 +0200
++++ libmms-0.4/src/mms.h	2008-12-12 15:48:46.000000000 +0200
+@@ -76,11 +76,11 @@
+ 
+ mms_off_t mms_get_current_pos (mms_t *instance);
+ 
+-uint32_t mms_get_asf_header_len (mms_t *this);
++uint32_t mms_get_asf_header_len (mms_t *instance);
+ 
+-uint64_t mms_get_asf_packet_len (mms_t *this);
++uint64_t mms_get_asf_packet_len (mms_t *instance);
+ 
+-int      mms_get_seekable (mms_t *this);
++int      mms_get_seekable (mms_t *instance);
+ 
+ #ifdef __cplusplus
+ }
+diff -ur libmms-0.4.orig/src/mmsh.h libmms-0.4/src/mmsh.h
+--- libmms-0.4.orig/src/mmsh.h	2007-12-11 22:24:48.000000000 +0200
++++ libmms-0.4/src/mmsh.h	2008-12-12 15:48:46.000000000 +0200
+@@ -41,20 +41,20 @@
+ 
+ int      mmsh_read (mms_io_t *io, mmsh_t *instance, char *data, int len);
+ int      mmsh_time_seek (mms_io_t *io, mmsh_t *instance, double time_sec);
+-mms_off_t mmsh_seek (mms_io_t *io, mmsh_t *this, mms_off_t offset, int origin);
++mms_off_t mmsh_seek (mms_io_t *io, mmsh_t *instance, mms_off_t offset, int origin);
+ uint32_t mmsh_get_length (mmsh_t *instance);
+-double   mmsh_get_time_length (mmsh_t *this);
+-uint64_t mmsh_get_raw_time_length (mmsh_t *this);
++double   mmsh_get_time_length (mmsh_t *instance);
++uint64_t mmsh_get_raw_time_length (mmsh_t *instance);
+ mms_off_t mmsh_get_current_pos (mmsh_t *instance);
+ void     mmsh_close (mmsh_t *instance);
+ 
+ int      mmsh_peek_header (mmsh_t *instance, char *data, int maxsize);
+ 
+-uint32_t mmsh_get_asf_header_len (mmsh_t *this);
++uint32_t mmsh_get_asf_header_len (mmsh_t *instance);
+ 
+-uint32_t mmsh_get_asf_packet_len (mmsh_t *this);
++uint32_t mmsh_get_asf_packet_len (mmsh_t *instance);
+ 
+-int      mmsh_get_seekable (mmsh_t *this);
++int      mmsh_get_seekable (mmsh_t *instance);
+ 
+ #ifdef __cplusplus
+ }
diff --git a/media-libs/libmms/files/libmms_0.2-7-cumulative.diff b/media-libs/libmms/files/libmms_0.2-7-cumulative.diff
deleted file mode 100644
index 63a4c13aefc1..000000000000
--- a/media-libs/libmms/files/libmms_0.2-7-cumulative.diff
+++ /dev/null
@@ -1,144 +0,0 @@
---- libmms-0.2.orig/src/mms.c
-+++ libmms-0.2/src/mms.c
-@@ -144,7 +144,7 @@
-   int           stream_types[ASF_MAX_NUM_STREAMS];
-   off_t         start_packet_seq; /* for live streams != 0, need to keep it around */
-   int           need_discont; /* whether we need to set start_packet_seq */
--  int           asf_packet_len;
-+  uint32_t      asf_packet_len;
-   uint64_t      file_len;
-   char          guid[37];
-   uint32_t      bitrates[ASF_MAX_NUM_STREAMS];
-@@ -477,7 +477,7 @@
- }
- 
- static void string_utf16(iconv_t url_conv, char *dest, char *src, int len) {
--    memset(dest, 0, 1000);
-+    memset(dest, 0, 2 * len);
- 
-     if (url_conv == (iconv_t)-1) {
-       int i;
-@@ -503,7 +503,7 @@
- static void string_utf16(int unused, char *dest, char *src, int len) {
-   int i;
- 
--  memset (dest, 0, 1000);
-+  memset (dest, 0, 2 * len);
- 
-   for (i = 0; i < len; i++) {
-     dest[i * 2] = src[i];
-@@ -539,13 +539,17 @@
-       goto error;
-     
-     header->packet_len = LE_32(this->buf + 8) + 4;
-+    if (header->packet_len > BUF_SIZE - 12) {
-+        header->packet_len = 0;
-+        goto error;
-+    }
-     lprintf("mms command\n");
-     packet_type = MMS_PACKET_COMMAND;
-   } else {
-     header->packet_seq     = LE_32(this->buf);
-     header->packet_id_type = this->buf[4];
-     header->flags          = this->buf[5];
--    header->packet_len     = LE_16(this->buf + 6) - 8;
-+    header->packet_len     = (LE_16(this->buf + 6) - 8) & 0xffff;
-     if (header->packet_id_type == ASF_HEADER_PACKET_ID_TYPE) {
-       lprintf("asf header\n");
-       packet_type = MMS_PACKET_ASF_HEADER;
-@@ -674,6 +678,11 @@
-         break;
-       case MMS_PACKET_ASF_HEADER:
-       case MMS_PACKET_ASF_PACKET:
-+        if (header.packet_len + this->asf_header_len > ASF_HEADER_LEN) {
-+            lprintf( "***LOG:*** -- "
-+                     "libmms: asf packet too large\n");
-+            return 0;
-+        }
-         len = io_read(io,  this->s,
-                               this->asf_header + this->asf_header_len, header.packet_len);
-         if (len != header.packet_len) {
-@@ -720,6 +729,12 @@
-       case GUID_ASF_FILE_PROPERTIES:
- 
-         this->asf_packet_len = LE_32(this->asf_header + i + 92 - 24);
-+        if (this->asf_packet_len > BUF_SIZE) {
-+          this->asf_packet_len = 0;
-+          lprintf( "***LOG:*** -- "
-+                   "libmms: asf packet len too large\n");
-+          break;
-+        }
-         this->file_len       = LE_64(this->asf_header + i + 40 - 24);
-         lprintf ("file object, packet length = %d (%d)\n",
-                  this->asf_packet_len, LE_32(this->asf_header + i + 96 - 24));
-@@ -1420,8 +1435,20 @@
- 
-         /* explicit padding with 0 */
-         lprintf("padding: %d bytes\n", this->asf_packet_len - header.packet_len);
--        memset(this->buf + header.packet_len, 0, this->asf_packet_len - header.packet_len);
--        this->buf_size = this->asf_packet_len;
-+	{
-+	  char *base  = (char *)(this->buf);
-+	  char *start = base + header.packet_len;
-+	  char *end   = start + this->asf_packet_len - header.packet_len;
-+	  if ((start > base) && (start < (base+BUF_SIZE-1)) &&
-+	      (start < end)  && (end < (base+BUF_SIZE-1))) {
-+	    memset(this->buf + header.packet_len, 0, this->asf_packet_len - header.packet_len);
-+ 	  }
-+	  if (this->asf_packet_len > BUF_SIZE) {
-+            this->buf_size = BUF_SIZE;
-+          } else {
-+            this->buf_size = this->asf_packet_len;
-+          }
-+	}
-       }
-       break;
-   }
---- libmms-0.2.orig/src/mmsh.c
-+++ libmms-0.2/src/mmsh.c
-@@ -184,7 +184,7 @@
-   int           num_stream_ids;
-   int           stream_ids[ASF_MAX_NUM_STREAMS];
-   int           stream_types[ASF_MAX_NUM_STREAMS];
--  int           packet_length;
-+  uint32_t      packet_length;
-   int64_t       file_length;
-   char          guid[37];
-   uint32_t      bitrates[ASF_MAX_NUM_STREAMS];
-@@ -604,6 +604,10 @@
-       case GUID_ASF_FILE_PROPERTIES:
- 
-         this->packet_length = LE_32(this->asf_header + i + 92 - 24);
-+        if (this->packet_length > CHUNK_SIZE) {
-+          this->packet_length = 0;
-+          break;
-+        }
-         this->file_length   = LE_64(this->asf_header + i + 40 - 24);
-         lprintf ("file object, packet length = %d (%d)\n",
- 		 this->packet_length, LE_32(this->asf_header + i + 96 - 24));
-@@ -1054,9 +1058,22 @@
- 		 this->chunk_length, this->packet_length);
- 	return 0;
-       }
--      memset(this->buf + this->chunk_length, 0,
--             this->packet_length - this->chunk_length);
--      this->buf_size = this->packet_length;
-+
-+      {
-+	char *base  = (char *)(this->buf);
-+	char *start = base + this->chunk_length;
-+	char *end   = start + this->packet_length - this->chunk_length;
-+	if ((start > base) && (start < (base+CHUNK_SIZE-1)) &&
-+	    (start < end)  && (end < (base+CHUNK_SIZE-1))) {
-+	  memset(start, 0,
-+		 this->packet_length - this->chunk_length);
-+	}
-+	if (this->packet_length > CHUNK_SIZE) {
-+	  this->buf_size = CHUNK_SIZE;
-+	} else {
-+	  this->buf_size = this->packet_length;
-+	}
-+      }
-       return 1;
-     } else {
-       lprintf ("mmsh: read error, %d != %d\n", len, this->chunk_length);
diff --git a/media-libs/libmms/libmms-0.1.ebuild b/media-libs/libmms/libmms-0.1.ebuild
deleted file mode 100644
index 5568bab3ce85..000000000000
--- a/media-libs/libmms/libmms-0.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmms/libmms-0.1.ebuild,v 1.2 2005/11/07 09:37:25 flameeyes Exp $
-
-DESCRIPTION="Common library for accessing Microsoft Media Server (MMS) media streaming protocol"
-
-HOMEPAGE="http://libmms.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-LICENSE="LGPL-2.1"
-
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-RDEPEND=">=dev-libs/glib-2"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-src_compile() {
-
-	econf || die
-	emake || die "emake failed"
-
-}
-
-src_install() {
-
-	make DESTDIR=${D} install || die
-
-	dodoc AUTHORS ChangeLog NEWS README* TODO
-
-}
diff --git a/media-libs/libmms/libmms-0.2-r1.ebuild b/media-libs/libmms/libmms-0.2-r1.ebuild
deleted file mode 100644
index c3c9c9967675..000000000000
--- a/media-libs/libmms/libmms-0.2-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmms/libmms-0.2-r1.ebuild,v 1.1 2006/07/20 14:23:51 allanonjl Exp $
-
-inherit eutils
-
-DESCRIPTION="Common library for accessing Microsoft Media Server (MMS) media streaming protocol"
-
-HOMEPAGE="http://libmms.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-LICENSE="LGPL-2.1"
-
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-RDEPEND=">=dev-libs/glib-2"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-src_unpack() {
-	unpack "${A}"
-	cd "${S}"
-
-	# patch for bug #139320
-	epatch "${FILESDIR}"/${PN}_0.2-7-cumulative.diff
-}
-
-src_compile() {
-
-	econf || die
-	emake || die "emake failed"
-
-}
-
-src_install() {
-
-	make DESTDIR=${D} install || die
-
-	dodoc AUTHORS ChangeLog NEWS README* TODO
-
-}
diff --git a/media-libs/libmms/libmms-0.2.ebuild b/media-libs/libmms/libmms-0.2.ebuild
deleted file mode 100644
index cdb4a4cfe7af..000000000000
--- a/media-libs/libmms/libmms-0.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmms/libmms-0.2.ebuild,v 1.1 2006/03/26 15:40:58 foser Exp $
-
-DESCRIPTION="Common library for accessing Microsoft Media Server (MMS) media streaming protocol"
-
-HOMEPAGE="http://libmms.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-LICENSE="LGPL-2.1"
-
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-RDEPEND=">=dev-libs/glib-2"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-src_compile() {
-
-	econf || die
-	emake || die "emake failed"
-
-}
-
-src_install() {
-
-	make DESTDIR=${D} install || die
-
-	dodoc AUTHORS ChangeLog NEWS README* TODO
-
-}
diff --git a/media-libs/libmms/libmms-0.3.ebuild b/media-libs/libmms/libmms-0.3.ebuild
index 7c4d7149ffd8..ceb696ffd7a7 100644
--- a/media-libs/libmms/libmms-0.3.ebuild
+++ b/media-libs/libmms/libmms-0.3.ebuild
@@ -1,34 +1,27 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmms/libmms-0.3.ebuild,v 1.15 2007/10/23 23:51:17 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmms/libmms-0.3.ebuild,v 1.16 2008/12/12 13:58:54 ssuominen Exp $
 
 DESCRIPTION="Common library for accessing Microsoft Media Server (MMS) media streaming protocol"
-
 HOMEPAGE="http://libmms.sourceforge.net"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-LICENSE="LGPL-2.1"
 
+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_unpack() {
 	unpack ${A}
-	cd ${S}
-	sed -e "s:<malloc.h>:<stdlib.h>:g" -i src/uri.c || die "sed failed."
-}
-
-src_compile() {
-	econf || die
-	emake || die "emake failed"
+	cd "${S}"
+	sed -i -e "s:<malloc.h>:<stdlib.h>:g" src/uri.c || die "sed failed."
 }
 
 src_install() {
-	einstall || die
-	dodoc AUTHORS ChangeLog NEWS README* TODO
+	einstall || die "einstall failed."
+	dodoc AUTHORS ChangeLog NEWS README TODO
 }
diff --git a/media-libs/libmms/libmms-0.4.ebuild b/media-libs/libmms/libmms-0.4.ebuild
new file mode 100644
index 000000000000..e8e1fa1fa6b9
--- /dev/null
+++ b/media-libs/libmms/libmms-0.4.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmms/libmms-0.4.ebuild,v 1.1 2008/12/12 13:58:54 ssuominen Exp $
+
+inherit eutils
+
+DESCRIPTION="Common library for accessing Microsoft Media Server (MMS) media streaming protocol"
+HOMEPAGE="http://libmms.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${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_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-this_keyword.patch \
+		"${FILESDIR}"/${P}-nested_comments.patch
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed."
+	dodoc AUTHORS ChangeLog NEWS README TODO
+}