[SCM] mplayer/master.experimental: Refresh patches.
micove-guest at users.alioth.debian.org
micove-guest at users.alioth.debian.org
Tue Dec 2 21:14:13 UTC 2014
The following commit has been merged in the master.experimental branch:
commit 4473622fd4fc3693d0b64241ed57f5bbaeebfdfd
Author: Miguel A. Colón Vélez <debian.micove at gmail.com>
Date: Tue Dec 2 00:44:13 2014 -0500
Refresh patches.
diff --git a/debian/patches/0001_version.patch b/debian/patches/0001_version.patch
index d169296..d1929a0 100644
--- a/debian/patches/0001_version.patch
+++ b/debian/patches/0001_version.patch
@@ -7,8 +7,8 @@ Description: Modify the VERSION file.
Author: Miguel A. Colón Vélez <debian.micove at gmail.com>
Forwarded: not-needed
---- mplayer-1.1.1+svn37328.orig/VERSION
-+++ mplayer-1.1.1+svn37328/VERSION
+--- a/VERSION
++++ b/VERSION
@@ -1 +1 @@
--1.1.1+svn37328
-+svn r37328 (Debian), built with gcc
+-1.1.1+svn37329
++svn r37329 (Debian), built with gcc
diff --git a/debian/patches/0002_hardening_format_security.patch b/debian/patches/0002_hardening_format_security.patch
index 8e4d5b2..011e021 100644
--- a/debian/patches/0002_hardening_format_security.patch
+++ b/debian/patches/0002_hardening_format_security.patch
@@ -2,14 +2,14 @@ Description: Patch to fix FTBFS due to hardening. (-Werror=format-security)
Author: Miguel A. Colón Vélez <debian.micove at gmail.com>
Forwarded: no
---- mplayer-1.1.1+svn37328.orig/stream/stream_vstream.c
-+++ mplayer-1.1.1+svn37328/stream/stream_vstream.c
-@@ -57,7 +57,7 @@ void vstream_error(const char *format, .
+--- a/stream/stream_vstream.c
++++ b/stream/stream_vstream.c
+@@ -57,7 +57,7 @@
va_start(va, format);
vsnprintf(buf, 1024, format, va);
va_end(va);
- mp_msg(MSGT_STREAM, MSGL_ERR, buf);
+ mp_msg(MSGT_STREAM, MSGL_ERR, "%s", buf);
}
-
+
static struct stream_priv_s {
--
mplayer packaging
More information about the pkg-multimedia-commits
mailing list