[SCM] fdk-aac/master: Removed, no longer needed

sramacher at users.alioth.debian.org sramacher at users.alioth.debian.org
Tue Apr 25 19:30:27 UTC 2017


The following commit has been merged in the master branch:
commit 0d5c92c67b1025cc209fc104abac3c35909fc433
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Tue Apr 25 21:29:27 2017 +0200

    Removed, no longer needed

diff --git a/debian/patches/gcc6_c++98 b/debian/patches/gcc6_c++98
deleted file mode 100644
index 317cf03..0000000
--- a/debian/patches/gcc6_c++98
+++ /dev/null
@@ -1,31 +0,0 @@
-commit 15b128dd826ba86ee962d86b0b06966a25ed9158
-Author: Martin Storsjo <martin at martin.st>
-Date:   Wed May 18 10:09:20 2016 +0300
-
-    Explicitly force building in C++98 mode
-    
-    GCC 6 defaults to C++14 (or more precisely, gnu++14) instead of C++98
-    (or gnu++98).
-    
-    The fdk-aac source doesn't support being built in this mode at the
-    moment, since it relies on narrowing conversion from unsigned 32 bit
-    integers to FIXP_DBL (which is a signed data type of the same size).
-    
-    The same approach is used upstream in Android as well, since
-    d52f3747683.
-    
-    This fixes buliding with GCC 6.
-
-diff --git a/Makefile.am b/Makefile.am
-index a90edaa..2c64ca7 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -12,7 +12,7 @@ AM_CPPFLAGS = \
-     -I$(top_srcdir)/libFDK/include \
-     -I$(top_srcdir)/libPCMutils/include
- 
--AM_CXXFLAGS = -fno-exceptions -fno-rtti
-+AM_CXXFLAGS = -fno-exceptions -fno-rtti -std=c++98
- libfdk_aac_la_LINK = $(LINK) $(libfdk_aac_la_LDFLAGS)
- # Mention a dummy pure C file to trigger generation of the $(LINK) variable
- nodist_EXTRA_libfdk_aac_la_SOURCES = dummy.c
diff --git a/debian/patches/series b/debian/patches/series
index b64782b..afbded6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,2 @@
 add_more_arch
-gcc6_c++98
+# gcc6_c++98

-- 
fdk-aac packaging



More information about the pkg-multimedia-commits mailing list