Projects
Essentials
fdk-aac
Sign Up
Log In
Username
Password
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
Expand all
Collapse all
Changes of Revision 3
View file
fdk-aac.spec
Changed
@@ -23,6 +23,7 @@ Url: https://github.com/mstorsjo/fdk-aac Group: System/Libraries Source: %{name}-%{version}.tar.bz2 +Patch0: fdk-aac-cpp98.patch BuildRequires: gcc-c++ BuildRequires: libtool BuildRequires: pkg-config @@ -51,13 +52,14 @@ %prep %setup -q +%patch0 -p1 FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%b %%e %%Y') sed -i "s/__DATE__/\"$FAKE_BUILDDATE\"/" lib*/src/{*.cpp,version} FAKE_BUILDTIME=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%H:%%M:%%S') sed -i "s/__TIME__/\"$FAKE_BUILDTIME\"/" lib*/src/{*.cpp,version} -NOCONFIGURE=1 ./autogen.sh %build +NOCONFIGURE=1 ./autogen.sh %configure --disable-static make %{?_smp_mflags}
View file
fdk-aac-cpp98.patch
Added
@@ -0,0 +1,27 @@ +commit 15b128d + +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 +d52f374. + +This fixes buliding with GCC 6. + +--- 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
Locations
Projects
Search
Status Monitor
Help
Open Build Service
OBS Manuals
API Documentation
OBS Portal
Reporting a Bug
Contact
Mailing List
Forums
Chat (IRC)
Twitter
Open Build Service (OBS)
is an
openSUSE project
.