[SCM] libmms/master: Remove all patches, applied upstream.
fabian-guest at users.alioth.debian.org
fabian-guest at users.alioth.debian.org
Fri Jan 21 10:01:47 UTC 2011
The following commit has been merged in the master branch:
commit 5c72d5e0de7a1257019b9f4909e1f4c53b173526
Author: Fabian Greffrath <fabian at greffrath.com>
Date: Fri Jan 21 10:37:19 2011 +0100
Remove all patches, applied upstream.
diff --git a/debian/patches/0001-Remove-unneeded-bswap.h-from-public-headers.patch b/debian/patches/0001-Remove-unneeded-bswap.h-from-public-headers.patch
deleted file mode 100644
index 8d5df9a..0000000
--- a/debian/patches/0001-Remove-unneeded-bswap.h-from-public-headers.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 144f65dbef2f273f4b235b618eb7aeb041949a8c Mon Sep 17 00:00:00 2001
-From: Hans de Goede <j.w.r.degoede at hhs.nl>
-Date: Wed, 2 Jun 2010 10:21:28 +0200
-Subject: [PATCH 1/3] Remove unneeded bswap.h from public headers
-
-This resolves:
-http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=362657
----
- src/Makefile.am | 1 -
- src/mms.h | 1 -
- 2 files changed, 0 insertions(+), 2 deletions(-)
-
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 9031b11..af01af6 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -28,7 +28,6 @@ libmmsincdir = $(includedir)/libmms
- libmmsinc_HEADERS = \
- mms.h \
- mms_config.h \
-- bswap.h \
- mmsio.h \
- mmsx.h \
- mmsh.h
-diff --git a/src/mms.h b/src/mms.h
-index 0faa701..35e915e 100644
---- a/src/mms.h
-+++ b/src/mms.h
-@@ -38,7 +38,6 @@
-
- /* #include "xine_internal.h" */
-
--#include "bswap.h"
- #include "mmsio.h"
-
- #ifdef __cplusplus
---
-1.7.1
-
-diff --git a/src/Makefile.in b/src/Makefile.in
-index dd84705..22fc953 100644
---- a/src/Makefile.in
-+++ b/src/Makefile.in
-@@ -239,7 +239,6 @@ libmmsincdir = $(includedir)/libmms
- libmmsinc_HEADERS = \
- mms.h \
- mms_config.h \
-- bswap.h \
- mmsio.h \
- mmsx.h \
- mmsh.h
diff --git a/debian/patches/0003-Bug-493735-libmms-dev-Incorrect-use-of-this-keyword-.patch b/debian/patches/0003-Bug-493735-libmms-dev-Incorrect-use-of-this-keyword-.patch
deleted file mode 100644
index 97db6fd..0000000
--- a/debian/patches/0003-Bug-493735-libmms-dev-Incorrect-use-of-this-keyword-.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From d892fd83b3f96b8da2ed05f3713b6e2c13dd4548 Mon Sep 17 00:00:00 2001
-From: Fabian Greffrath <greffrath at leat.rub.de>
-Date: Wed, 2 Jun 2010 11:21:55 +0200
-Subject: [PATCH 3/3] Bug#493735: libmms-dev: Incorrect use of "this" keyword in mmsx.h
-
-Am 02.06.2010 10:58, schrieb Fabian Greffrath:
-> Am 02.06.2010 10:28, schrieb Hans de Goede:
->> Yes, as can #493735 of course.
->
-> Not entirely, the "this" keyword is still used in mmsh.h and mmsx.h.
-
-I guess the attached patch for finally fix it.
-
-From eb1312be01397a403f4fd80a3b5192cb2a53aa72 Mon Sep 17 00:00:00 2001
-From: Fabian Greffrath <fabian at greffrath.com>
-Date: Wed, 2 Jun 2010 11:20:47 +0200
-Subject: [PATCH] Do not incorrectly use the reserved keyword "this" as a variable name.
----
- src/mmsh.h | 12 ++++++------
- src/mmsx.h | 6 +++---
- 2 files changed, 9 insertions(+), 9 deletions(-)
-
-diff --git a/src/mmsh.h b/src/mmsh.h
-index 6a33f0c..b222eea 100644
---- a/src/mmsh.h
-+++ b/src/mmsh.h
-@@ -41,20 +41,20 @@ mmsh_t* mmsh_connect (mms_io_t *io, void *data, const char *url_, int bandwidt
-
- 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/src/mmsx.h b/src/mmsx.h
-index ed6837b..df4adfc 100644
---- a/src/mmsx.h
-+++ b/src/mmsx.h
-@@ -55,11 +55,11 @@ int mmsx_peek_header (mmsx_t *instance, char *data, int maxsize);
-
- 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 *instance);
-
--uint64_t mmsx_get_asf_packet_len (mmsx_t *this);
-+uint64_t mmsx_get_asf_packet_len (mmsx_t *instance);
-
--int mmsx_get_seekable (mmsx_t *this);
-+int mmsx_get_seekable (mmsx_t *instance);
-
- #ifdef __cplusplus
- }
---
-1.7.1
-
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 897fe03..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-0001-Remove-unneeded-bswap.h-from-public-headers.patch
-0003-Bug-493735-libmms-dev-Incorrect-use-of-this-keyword-.patch
--
libmms packaging
More information about the pkg-multimedia-commits
mailing list