Hello all.

Those patches allow C++ programs that include libmms headers to compile.
This is needed in particular for upcoming KDE update. Patches will be
sent upstream too, of course.

Index: Makefile
===================================================================
RCS file: /cvs/ports/multimedia/libmms/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- Makefile    19 Nov 2010 07:23:13 -0000      1.3
+++ Makefile    5 Sep 2011 19:01:20 -0000
@@ -3,6 +3,7 @@
 COMMENT =      library for parsing mms:// and mmsh:// type network streams
 
 DISTNAME =     libmms-0.4
+REVISION =     0
 CATEGORIES =   multimedia net
 SHARED_LIBS =  mms 0.0 #0.2
 
Index: patches/patch-src_mms_h
===================================================================
RCS file: patches/patch-src_mms_h
diff -N patches/patch-src_mms_h
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_mms_h     5 Sep 2011 19:01:20 -0000
@@ -0,0 +1,18 @@
+$OpenBSD$
+--- src/mms.h.orig     Mon Sep  5 22:58:06 2011
++++ src/mms.h  Mon Sep  5 22:58:51 2011
+@@ -76,11 +76,11 @@ int      mms_peek_header (mms_t *instance, char *data,
+ 
+ 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 *that);
+ 
+-uint64_t mms_get_asf_packet_len (mms_t *this);
++uint64_t mms_get_asf_packet_len (mms_t *that);
+ 
+-int      mms_get_seekable (mms_t *this);
++int      mms_get_seekable (mms_t *that);
+ 
+ #ifdef __cplusplus
+ }
Index: patches/patch-src_mmsh_h
===================================================================
RCS file: patches/patch-src_mmsh_h
diff -N patches/patch-src_mmsh_h
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_mmsh_h    5 Sep 2011 19:01:20 -0000
@@ -0,0 +1,30 @@
+$OpenBSD$
+--- src/mmsh.h.orig    Mon Sep  5 22:58:13 2011
++++ src/mmsh.h Mon Sep  5 22:59:01 2011
+@@ -41,20 +41,20 @@ mmsh_t*   mmsh_connect (mms_io_t *io, void *data, cons
+ 
+ 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 *that, 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 *that);
++uint64_t mmsh_get_raw_time_length (mmsh_t *that);
+ 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 *that);
+ 
+-uint32_t mmsh_get_asf_packet_len (mmsh_t *this);
++uint32_t mmsh_get_asf_packet_len (mmsh_t *that);
+ 
+-int      mmsh_get_seekable (mmsh_t *this);
++int      mmsh_get_seekable (mmsh_t *that);
+ 
+ #ifdef __cplusplus
+ }
Index: patches/patch-src_mmsx_h
===================================================================
RCS file: patches/patch-src_mmsx_h
diff -N patches/patch-src_mmsx_h
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_mmsx_h    5 Sep 2011 19:01:20 -0000
@@ -0,0 +1,18 @@
+$OpenBSD$
+--- src/mmsx.h.orig    Mon Sep  5 22:58:09 2011
++++ src/mmsx.h Mon Sep  5 22:59:09 2011
+@@ -55,11 +55,11 @@ int       mmsx_peek_header (mmsx_t *instance, char *da
+ 
+ mms_off_t mmsx_get_current_pos (mmsx_t *instance);
+ 
+-uint32_t  mmsx_get_asf_header_len (mmsx_t *this);
++uint32_t  mmsx_get_asf_header_len (mmsx_t *that);
+ 
+-uint64_t  mmsx_get_asf_packet_len (mmsx_t *this);
++uint64_t  mmsx_get_asf_packet_len (mmsx_t *that);
+ 
+-int       mmsx_get_seekable (mmsx_t *this);
++int       mmsx_get_seekable (mmsx_t *that);
+ 
+ #ifdef __cplusplus
+ }

Reply via email to