commit: 077cb0bcdea76ee5473363de5c5f66077aba6768
Author: Ilya Tumaykin <itumaykin <AT> gmail <DOT> com>
AuthorDate: Sun Dec 27 23:21:00 2015 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Sun Dec 27 23:36:15 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=077cb0bc
media-video/aegisub: reuse patch for 3.2.2 in live ebuild
Package-Manager: portage-2.2.24
media-video/aegisub/aegisub-9999.ebuild | 2 +-
.../aegisub-9999-respect-user-compiler-flags.patch | 50 ----------------------
2 files changed, 1 insertion(+), 51 deletions(-)
diff --git a/media-video/aegisub/aegisub-9999.ebuild
b/media-video/aegisub/aegisub-9999.ebuild
index f7d6889..4474823 100644
--- a/media-video/aegisub/aegisub-9999.ebuild
+++ b/media-video/aegisub/aegisub-9999.ebuild
@@ -61,7 +61,7 @@ PATCHES=(
"${FILESDIR}/${PN}-3.2.2-fix-lua-regexp.patch"
"${FILESDIR}/${P}-unbundle-luajit.patch"
"${FILESDIR}/${P}-add-missing-pthread-flags.patch"
- "${FILESDIR}/${P}-respect-user-compiler-flags.patch"
+ "${FILESDIR}/${PN}-3.2.2-respect-user-compiler-flags.patch"
)
pkg_pretend() {
diff --git
a/media-video/aegisub/files/aegisub-9999-respect-user-compiler-flags.patch
b/media-video/aegisub/files/aegisub-9999-respect-user-compiler-flags.patch
deleted file mode 100644
index ae1f5c1..0000000
--- a/media-video/aegisub/files/aegisub-9999-respect-user-compiler-flags.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index d0b5152..2609161 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -136,20 +136,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"
-+ 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 08f9216..e2e5602 100644
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -182,14 +182,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 := -I$(TOP)vendor/luajit/include
