[SCM] gpac/master: Refresh patches
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sat Feb 22 18:16:25 UTC 2014
The following commit has been merged in the master branch:
commit 9670ed269df60671985faf575009b55c868fd4f2
Author: Reinhard Tartler <siretart at tauware.de>
Date: Sat Feb 22 18:02:04 2014 +0000
Refresh patches
diff --git a/debian/patches/gcc-optflags.patch b/debian/patches/gcc-optflags.patch
index bae8512..0352317 100644
--- a/debian/patches/gcc-optflags.patch
+++ b/debian/patches/gcc-optflags.patch
@@ -5,9 +5,9 @@ Forwarded: not-needed
configure | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
---- gpac.orig/configure
-+++ gpac/configure
-@@ -332,7 +332,7 @@ for opt do
+--- a/configure
++++ b/configure
+@@ -342,7 +342,7 @@ for opt do
;;
--cpu=*) cpu=`echo $opt | cut -d '=' -f 2`
;;
@@ -16,7 +16,7 @@ Forwarded: not-needed
;;
--disable-opt) no_gcc_opt="yes"
;;
-@@ -618,7 +618,7 @@ fi
+@@ -638,7 +638,7 @@ fi
#GCC opt
if test "$no_gcc_opt" = "no"; then
diff --git a/debian/patches/mp4box-manpage-fix.patch b/debian/patches/mp4box-manpage-fix.patch
index 0e90649..3723517 100644
--- a/debian/patches/mp4box-manpage-fix.patch
+++ b/debian/patches/mp4box-manpage-fix.patch
@@ -4,8 +4,8 @@ Origin: http://git.debian.org/?p=pkg-multimedia/gpac.git;a=blob;f=debian/patches
doc/man/mp4box.1 | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
---- gpac.orig/doc/man/mp4box.1
-+++ gpac/doc/man/mp4box.1
+--- a/doc/man/mp4box.1
++++ b/doc/man/mp4box.1
@@ -393,7 +393,7 @@ decrypts a specific track using ISMA AES
.B \-set-kms [tkID=]kms_uri
changes KMS location for all tracks or a given one if tkID is specified.
--
gpac packaging
More information about the pkg-multimedia-commits
mailing list