1 files changed, 53 insertions, 0 deletions
diff --git a/media-video/aegisub/files/aegisub-3.2.2_p20160306-respect-user-compiler-flags.patch b/media-video/aegisub/files/aegisub-3.2.2_p20160306-respect-user-compiler-flags.patch
new file mode 100644
index 000000000000..4cd4790e3f0a
--- /dev/null
+++ b/media-video/aegisub/files/aegisub-3.2.2_p20160306-respect-user-compiler-flags.patch
@@ -0,0 +1,53 @@
+http://devel.aegisub.org/ticket/1899
+http://devel.aegisub.org/ticket/1900
+
+diff --git a/configure.ac b/configure.ac
+index 1649efc..2f4470b 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -133,20 +133,17 @@ AS_IF([test x$build_darwin != xyes], [
+ AC_ARG_ENABLE(compiler-flags, AS_HELP_STRING([--disable-compiler-flags],[Disable *all* additional compiler flags. [no]]))
+
+ AS_IF([test x$enable_compiler_flags != xno], [
+-  CFLAGS="$CFLAGS -Wall -Wextra -Wno-unused-parameter -std=gnu99 -pipe -g"
+-  CXXFLAGS="$CXXFLAGS -Wall -Wextra -Wno-unused-parameter -fno-strict-aliasing -pipe -g"
++  CFLAGS="$CFLAGS -Wall -Wextra -Wno-unused-parameter"
++  CXXFLAGS="$CXXFLAGS -Wall -Wextra -Wno-unused-parameter -fno-strict-aliasing"
++  AC_C_FLAG([-std=gnu99])
+   AC_CXX_FLAG([-std=c++11])
+-  AC_CXX_FLAG([-Wno-c++11-narrowing])
+   AC_C_FLAG([-Wno-unused-local-typedefs])
+   AC_CXX_FLAG([-Wno-unused-local-typedefs])
+
+   # -O* messes with debugging.
+   AS_IF([test x$enable_debug = xyes], [
+-    CFLAGS="$CFLAGS -O0"
+-    CXXFLAGS="$CXXFLAGS -O0"
+-  ], [
+-    CFLAGS="$CFLAGS -O3"
+-    CXXFLAGS="$CXXFLAGS -O3"
++    CFLAGS="$CFLAGS -O0 -g"
++    CXXFLAGS="$CXXFLAGS -O0 -g"
+   ])
+ ])
+
+diff --git a/src/Makefile b/src/Makefile
+index 0ee6c84..cad213b 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -188,14 +188,13 @@ endif
+ #####################
+ # SOURCE-LEVEL CFLAGS
+ #####################
+-$(d)MatroskaParser.o_FLAGS              := -Wno-sometimes-uninitialized
+ $(d)audio_player.o_FLAGS                := $(CFLAGS_ALSA) $(CFLAGS_PORTAUDIO) $(CFLAGS_LIBPULSE) $(CFLAGS_OPENAL)
+ $(d)audio_provider_factory.o_FLAGS      := $(CFLAGS_FFMS2)
+ $(d)auto4_base.o_FLAGS                  := $(CFLAGS_FREETYPE)
+ $(d)charset_detect.o_FLAGS              := -D_X86_
+ $(d)font_file_lister_fontconfig.o_FLAGS := $(CFLAGS_FONTCONFIG)
+ $(d)subtitles_provider.o_FLAGS          := $(CFLAGS_LIBASS)
+-$(d)subtitles_provider_libass.o_FLAGS   := $(CFLAGS_LIBASS) -Wno-c++11-narrowing
++$(d)subtitles_provider_libass.o_FLAGS   := $(CFLAGS_LIBASS)
+ $(d)text_file_reader.o_FLAGS            := -D_X86_
+ $(d)video_provider_manager.o_FLAGS      := $(CFLAGS_FFMS2)
+ $(d)auto4_lua.o_FLAGS                   := $(CFLAGS_LUA)