forked from gentoo/gentoo
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
media-video/aegisub: revbump to 3.2.2-r1 to restore -fno-strict-aliasing
Also backport ff9648f and 9f158e9 changes from the live ebuild. Package-Manager: portage-2.2.27
- Loading branch information
Showing
6 changed files
with
192 additions
and
23 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,119 @@ | ||
| # Copyright 1999-2016 Gentoo Foundation | ||
| # Distributed under the terms of the GNU General Public License v2 | ||
| # $Id$ | ||
|
|
||
| EAPI=5 | ||
|
|
||
| AUTOTOOLS_AUTORECONF=1 | ||
| AUTOTOOLS_IN_SOURCE_BUILD=1 | ||
| PLOCALES="ar bg ca cs da de el es eu fa fi fr_FR gl hu id it ja ko nl pl pt_BR pt_PT ru sr_RS@latin sr_RS uk_UA vi zh_CN zh_TW" | ||
| WX_GTK_VER="3.0" | ||
|
|
||
| inherit autotools-utils fdo-mime flag-o-matic gnome2-utils l10n wxwidgets | ||
|
|
||
| DESCRIPTION="Advanced subtitle editor" | ||
| HOMEPAGE="http://www.aegisub.org/" | ||
| SRC_URI=" | ||
| http://ftp.aegisub.org/pub/releases/${P}.tar.xz | ||
| ftp://ftp.aegisub.org/pub/releases/${P}.tar.xz | ||
| " | ||
|
|
||
| LICENSE="BSD" | ||
| SLOT="0" | ||
| KEYWORDS="~amd64 ~x86" | ||
| IUSE="alsa debug +ffmpeg +fftw openal oss portaudio pulseaudio spell" | ||
|
|
||
| # configure.ac specifies minimal versions for some of the dependencies below. | ||
| # However, most of these minimal versions date back to 2006-2010 yy. | ||
| # Such version specifiers are meaningless nowadays, so they are omitted. | ||
| RDEPEND=" | ||
| >=dev-lang/luajit-2.0.3:2[lua52compat] | ||
| >=dev-libs/boost-1.50.0:=[icu,nls,threads] | ||
| >=dev-libs/icu-4.8.1.1:= | ||
| >=x11-libs/wxGTK-3.0.0:${WX_GTK_VER}[X,opengl,debug?] | ||
| media-libs/fontconfig | ||
| media-libs/freetype | ||
| media-libs/libass[fontconfig] | ||
| virtual/libiconv | ||
| virtual/opengl | ||
| alsa? ( media-libs/alsa-lib ) | ||
| openal? ( media-libs/openal ) | ||
| portaudio? ( =media-libs/portaudio-19* ) | ||
| pulseaudio? ( media-sound/pulseaudio ) | ||
| ffmpeg? ( >=media-libs/ffmpegsource-2.16:= ) | ||
| fftw? ( >=sci-libs/fftw-3.3:= ) | ||
| spell? ( app-text/hunspell ) | ||
| " | ||
| DEPEND="${RDEPEND} | ||
| oss? ( virtual/os-headers ) | ||
| dev-util/intltool | ||
| sys-devel/gettext | ||
| virtual/pkgconfig | ||
| " | ||
| REQUIRED_USE=" | ||
| || ( alsa openal oss portaudio pulseaudio ) | ||
| " | ||
|
|
||
| # aegisub also bundles luabins (https://github.com/agladysh/luabins). | ||
| # Unfortunately, luabins upstream is dead since 2011. | ||
| # Thus unbundling luabins is not worth the effort. | ||
| PATCHES=( | ||
| "${FILESDIR}/${P}-fix-lua-regexp.patch" | ||
| "${FILESDIR}/${P}-unbundle-luajit.patch" | ||
| "${FILESDIR}/${P}-add-missing-pthread-flags.patch" | ||
| "${FILESDIR}/${PF}-respect-user-compiler-flags.patch" | ||
| ) | ||
|
|
||
| pkg_pretend() { | ||
| if [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11; then | ||
| die "Your compiler lacks C++11 support. Use GCC>=4.7.0 or Clang>=3.3." | ||
| fi | ||
| } | ||
|
|
||
| src_prepare() { | ||
| cp /usr/share/gettext/config.rpath . || die | ||
|
|
||
| remove_locale() { | ||
| rm "po/${1}.po" || die | ||
| } | ||
|
|
||
| l10n_find_plocales_changes 'po' '' '.po' | ||
| l10n_for_each_disabled_locale_do remove_locale | ||
|
|
||
| autotools-utils_src_prepare | ||
| } | ||
|
|
||
| src_configure() { | ||
| # Prevent sandbox violation from OpenAL detection. Gentoo bug #508184. | ||
| use openal && export agi_cv_with_openal="yes" | ||
| local myeconfargs=( | ||
| --disable-update-checker | ||
| $(use_enable debug) | ||
| $(use_with alsa) | ||
| $(use_with ffmpeg ffms2) | ||
| $(use_with fftw fftw3) | ||
| $(use_with openal) | ||
| $(use_with oss) | ||
| $(use_with portaudio) | ||
| $(use_with pulseaudio libpulse) | ||
| $(use_with spell hunspell) | ||
| ) | ||
| autotools-utils_src_configure | ||
| } | ||
|
|
||
| pkg_preinst() { | ||
| gnome2_icon_savelist | ||
| } | ||
|
|
||
| pkg_postinst() { | ||
| fdo-mime_desktop_database_update | ||
| gnome2_icon_cache_update | ||
| } | ||
|
|
||
| pkg_postrm() { | ||
| fdo-mime_desktop_database_update | ||
| gnome2_icon_cache_update | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
50 changes: 50 additions & 0 deletions
50
media-video/aegisub/files/aegisub-3.2.2-r1-respect-user-compiler-flags.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,50 @@ | ||
| diff --git a/configure.ac b/configure.ac | ||
| index be657b0..de8184f 100644 | ||
| --- a/configure.ac | ||
| +++ b/configure.ac | ||
| @@ -139,20 +139,17 @@ CC="$PTHREAD_CC" | ||
| 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 60d7101..1f7b2bc 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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters