[gentoo-commits] repo/gentoo:master commit in: media-video/aegisub/files/, media-video/aegisub/

2021-01-15 Thread Nick Sarnie 
commit: 21ffb11f616da44099e8b0b311d5176ede6c7be7
Author: Matthew White  inventati  org>
AuthorDate: Fri Jan 15 12:01:10 2021 +
Commit: Nick Sarnie  gentoo  org>
CommitDate: Fri Jan 15 17:10:57 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21ffb11f

media-video/aegisub-: use wangqr repo to fix make 4.3 build

The bug presents itself during compilation as unresolved dependencies.

The official Aegisub repo isn't actively updated...  That leaves now a
problem when make is updated to sys-devel/make-4.3.

In Makefile.target it is required to use the automatic variable $(*F),
rather than $*, to compile the Aegisub .a libraries with make 4.3.

References about make 4.3 bug:
- GNU make Automatic Variables
  https://www.gnu.org/software/make/manual/make.html#Automatic-Variables
- Failing to compile on make 4.3
  https://github.com/Aegisub/Aegisub/issues/171
- Use target name without directory in $*_OBJ macro
  
https://github.com/wangqr/Aegisub/commit/6bd3f4c26b8fc1f76a8b797fcee11e7611d59a39

Closes: https://bugs.gentoo.org/765133
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Matteo Bianco  inventati.org>
Closes: https://github.com/gentoo/gentoo/pull/19065
Signed-off-by: Nick Sarnie  gentoo.org>

 media-video/aegisub/aegisub-.ebuild  |  4 ++--
 media-video/aegisub/files/aegisub--git.patch | 17 -
 2 files changed, 2 insertions(+), 19 deletions(-)

diff --git a/media-video/aegisub/aegisub-.ebuild 
b/media-video/aegisub/aegisub-.ebuild
index bcc8a14c9a3..58b02287943 100644
--- a/media-video/aegisub/aegisub-.ebuild
+++ b/media-video/aegisub/aegisub-.ebuild
@@ -12,8 +12,8 @@ PLOCALES="ar be bg ca cs da de el es eu fa fi fr_FR gl hu id 
it ja ko nl pl pt_B
 inherit autotools l10n lua-single wxwidgets xdg-utils git-r3
 
 DESCRIPTION="Advanced subtitle editor"
-HOMEPAGE="http://www.aegisub.org/ https://github.com/Aegisub/Aegisub";
-EGIT_REPO_URI="https://github.com/${PN^}/${PN^}.git";
+HOMEPAGE="http://www.aegisub.org/ https://github.com/wangqr/Aegisub";
+EGIT_REPO_URI="https://github.com/wangqr/${PN^}.git";
 # Submodules are used to pull bundled libraries.
 EGIT_SUBMODULES=()
 

diff --git a/media-video/aegisub/files/aegisub--git.patch 
b/media-video/aegisub/files/aegisub--git.patch
index 80fd243703b..a5883336757 100644
--- a/media-video/aegisub/files/aegisub--git.patch
+++ b/media-video/aegisub/files/aegisub--git.patch
@@ -59,20 +59,3 @@ index e45a54767..1bd0120ed 100644
CPPFLAGS="$aegisub_save_CPPFLAGS"
LIBS="$aegisub_save_LIBS"
  ])
-diff --git a/src/libresrc/libresrc.cpp b/src/libresrc/libresrc.cpp
-index 79dc0f16c..8648d2987 100644
 a/src/libresrc/libresrc.cpp
-+++ b/src/libresrc/libresrc.cpp
-@@ -22,9 +22,10 @@
- 
- wxBitmap libresrc_getimage(const unsigned char *buff, size_t size, double 
scale, int dir) {
-   wxMemoryInputStream mem(buff, size);
-+auto img = wxImage(mem);
-   if (dir != wxLayout_RightToLeft)
--  return wxBitmap(wxImage(mem), -1, scale);
--  return wxBitmap(wxImage(mem).Mirror(), -1, scale);
-+return wxBitmap(img.Scale(img.GetHeight() * scale, img.GetWidth() 
* scale));
-+  return wxBitmap(img.Mirror().Scale(img.GetHeight() * scale, 
img.GetWidth() * scale));
- }
- 
- wxIcon libresrc_geticon(const unsigned char *buff, size_t size) {

[gentoo-commits] repo/gentoo:master commit in: media-video/aegisub/files/, media-video/aegisub/

2020-08-05 Thread Nick Sarnie 
commit: f1efe67d2c8cdc8ebbf688b587bd86146a054c60
Author: Jan Seeger  thenybble  de>
AuthorDate: Mon Aug  3 13:00:08 2020 +
Commit: Nick Sarnie  gentoo  org>
CommitDate: Wed Aug  5 16:09:33 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1efe67d

media-video/aegisub-: Updated git ebuild.

Closes: https://bugs.gentoo.org/734916
Signed-off-by: Jan Seeger  thenybble.de>
Signed-off-by: Nick Sarnie  gentoo.org>

 media-video/aegisub/aegisub-.ebuild  | 12 ++--
 media-video/aegisub/files/aegisub--git.patch | 78 
 2 files changed, 84 insertions(+), 6 deletions(-)

diff --git a/media-video/aegisub/aegisub-.ebuild 
b/media-video/aegisub/aegisub-.ebuild
index 1e6debce1e8..c1f73d3373a 100644
--- a/media-video/aegisub/aegisub-.ebuild
+++ b/media-video/aegisub/aegisub-.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 WX_GTK_VER=3.0
-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 sr_RS@latin uk_UA vi zh_CN zh_TW"
+PLOCALES="ar be 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 sr_RS@latin uk_UA vi zh_CN zh_TW"
 
 inherit autotools gnome2-utils l10n wxwidgets xdg-utils git-r3
 
@@ -52,9 +52,7 @@ DEPEND="${RDEPEND}
 REQUIRED_USE="|| ( alsa openal oss portaudio pulseaudio )"
 
 PATCHES=(
-   
"${FILESDIR}/3.2.2_p20160518/${PN}-3.2.2_p20160518-fix-system-luajit-build.patch"
-   
"${FILESDIR}/3.2.2_p20160518/${PN}-3.2.2_p20160518-respect-compiler-flags.patch"
-   
"${FILESDIR}/3.2.2_p20160518/${PN}-3.2.2_p20160518-fix-boost170-build.patch"
+   "${FILESDIR}/${P}-git.patch"
 )
 
 src_prepare() {
@@ -94,12 +92,14 @@ src_configure() {
$(use_with pulseaudio libpulse)
$(use_with spell hunspell)
$(use_with uchardet)
+   --disable-compiler-flags
)
econf "${myeconfargs[@]}"
 }
 
 src_compile() {
-   emake
+   # Concurrent builds seem to break the build process.
+   emake -j1
 }
 
 src_test() {

diff --git a/media-video/aegisub/files/aegisub--git.patch 
b/media-video/aegisub/files/aegisub--git.patch
new file mode 100644
index 000..80fd243703b
--- /dev/null
+++ b/media-video/aegisub/files/aegisub--git.patch
@@ -0,0 +1,78 @@
+diff --git a/Makefile.target b/Makefile.target
+index 516ef3c24..65de0e767 100644
+--- a/Makefile.target
 b/Makefile.target
+@@ -79,13 +79,13 @@ endif
+ all: $(LIB_TARGETS)
+ 
+ clean:
+-  $(BIN_RM) -f $(OBJ) $(CLEANFILES) $(LIB_TARGETS)
++  $(BIN_RM) -f -- $(OBJ) $(CLEANFILES) $(LIB_TARGETS)
+ 
+ distclean: clean
+-  $(BIN_RM) -rf $(DISTCLEANFILES) $(DEP)
++  $(BIN_RM) -rf -- $(DISTCLEANFILES) $(DEP)
+ 
+ depclean: clean
+-  $(BIN_RM) -rf $(DEP)
++  $(BIN_RM) -rf -- $(DEP)
+ 
+ install:
+ 
+diff --git a/header.mk b/header.mk
+index 613b38ff1..2c238e125 100644
+--- a/header.mk
 b/header.mk
+@@ -5,15 +5,13 @@ TOP := $(abspath $(dir $(lastword $(MAKEFILE_LIST/
+ include $(TOP)Makefile.inc
+ 
+ subdirs := \
+-  automation \
+   libaegisub \
+   packages/desktop \
+   po \
+   src \
+   tests \
+-  tools \
+   vendor/luabins \
+-  vendor/luajit
++  tools
+ 
+ subdirs := $(addprefix $(TOP),$(addsuffix /Makefile,$(subdirs)))
+ 
+diff --git a/m4macros/ac_agi.m4 b/m4macros/ac_agi.m4
+index e45a54767..1bd0120ed 100644
+--- a/m4macros/ac_agi.m4
 b/m4macros/ac_agi.m4
+@@ -20,12 +20,14 @@ AC_DEFUN([AC_AGI_LINK],[
+   aegisub_save_CPPFLAGS="$CPPFLAGS"
+   CPPFLAGS="$CPPFLAGS $4"
+   LIBS="$LIBS $5"
++  AC_LANG_PUSH(C++)
+   AC_CHECK_HEADER([$3], [agi_cv_header="yes"], [agi_cv_header="no"])
+   AS_IF([test "x$agi_cv_header" = xyes],
+ [AC_CACHE_CHECK(
+   [whether $1 works], [agi_cv_with_$2],
+   [AC_LINK_IFELSE([AC_LANG_SOURCE([$6])], [eval 
agi_cv_with_$2="yes"], [eval agi_cv_with_$2="no"])])]
+ [eval agi_cv_with_$2="no"])
++  AC_LANG_POP(C++)
+   CPPFLAGS="$aegisub_save_CPPFLAGS"
+   LIBS="$aegisub_save_LIBS"
+ ])
+diff --git a/src/libresrc/libresrc.cpp b/src/libresrc/libresrc.cpp
+index 79dc0f16c..8648d2987 100644
+--- a/src/libresrc/libresrc.cpp
 b/src/libresrc/libresrc.cpp
+@@ -22,9 +22,10 @@
+ 
+ wxBitmap libresrc_getimage(const unsigned char *buff, size_t size, double 
scale, int dir) {
+   wxMemoryInputStream mem(buff, size);
++auto img = wxImage(mem);
+   if (dir != wxLayout_RightToLeft)
+-  return wxBitmap(wxImage(mem), -1, scale);
+-  return wxBitmap(wxImage(mem).Mirror(), -1, scale);
++return wxBitmap(img.Scale(img.GetHeight() * scale, img.GetWidth() 
* scale));
++  return wxBitmap(img.Mirror().Scale(img.GetHeight() * scale, 
img.GetWidth() * scale));
+ }
+ 
+ wxIcon libresrc_geticon(const unsigned char *buff, size_t size

[gentoo-commits] repo/gentoo:master commit in: media-video/aegisub/files/, media-video/aegisub/

2016-06-28 Thread Patrice Clement 
commit: 88dd32ed15fabd7a46dbfa06524620952b0b9200
Author: Ilya Tumaykin  gmail  com>
AuthorDate: Sat Jun  4 18:15:22 2016 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Tue Jun 28 17:38:38 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88dd32ed

media-video/aegisub: remove old

Closes: https://github.com/gentoo/gentoo/pull/1781
Package-Manager: portage-2.3.0_rc1

Signed-off-by: Patrice Clement  gentoo.org>

 media-video/aegisub/Manifest   |   1 -
 media-video/aegisub/aegisub-3.2.2_p20160306.ebuild | 126 
 ...sub-3.2.2_p20160306-fix-luajit-unbundling.patch | 127 -
 ...2.2_p20160306-respect-user-compiler-flags.patch |  53 -
 4 files changed, 307 deletions(-)

diff --git a/media-video/aegisub/Manifest b/media-video/aegisub/Manifest
index 2db679d..dc56fe5 100644
--- a/media-video/aegisub/Manifest
+++ b/media-video/aegisub/Manifest
@@ -1,3 +1,2 @@
 DIST aegisub-3.2.2.tar.xz 5252052 SHA256 
c55e33945b82d8513c02ea6e782f0d72c726adcd3707e95b8c0022f6151e6885 SHA512 
54f825e52f238fef8d5cc31c37436e21355aee27883347f905271e5d2a8ff2a77e1b67d5aef38b0f8468bd0bad851fe944e02de27ec96310b902fbe5b1086722
 WHIRLPOOL 
fe948edbb01f11385e14d1912b73942605df18325fcd95f4284a3c2edb73778d90d73038ac4a062e211fd56879590040e3c558fe1e361ec9fe2eee6a5c016448
-DIST aegisub-3.2.2_p20160306.tar.gz 7436713 SHA256 
1b70f67c3b3d6ecce482bc1f4beb1ceffd4c523aa060556658e403ea98fcc58c SHA512 
815775b64b1ad5cd09eda6106561a8a0d4dc129d4c2e08e057eab881289526a7b67bab2f4d2f48748ef2015ea21f2839ed8f84d168bf9127c62c9a35caa1abd5
 WHIRLPOOL 
caaa6b1d69c7e4d1da4abfd0382d263585c5216d9ed5e63f515d8bce98b2e0dad2848552f3f097a8db9e39dad5d2c00d3b752f0407490d0d2c777aaa8fc6dc38
 DIST aegisub-3.2.2_p20160518.tar.gz 7438734 SHA256 
744318ce8be1afb21fbd6b0ce6d407a6f42c442db0df10c7cf89692a5bc8ca31 SHA512 
8d8775ba0a12735a9756b9abfd65c89519dae4e21afcaedbd18985d1c1021975b1ae909b3bef1121b707c626e1711d56f1823f3b4746eab49e8386536a5e84e6
 WHIRLPOOL 
0d46799009c72cac1d6df89f4ffe5110d904e671175380e20605683b6a2f3ccdd46855cf98ebac8f0088c7a928b82547557afc8214b2fce85aed759aa5e9e4ab

diff --git a/media-video/aegisub/aegisub-3.2.2_p20160306.ebuild 
b/media-video/aegisub/aegisub-3.2.2_p20160306.ebuild
deleted file mode 100644
index ef73e9d..000
--- a/media-video/aegisub/aegisub-3.2.2_p20160306.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# 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"
-COMMIT_ID="26fea0e123246b4f122beb54559c8dcd82925071"
-
-inherit autotools-utils fdo-mime flag-o-matic gnome2-utils l10n wxwidgets 
vcs-snapshot
-
-DESCRIPTION="Advanced subtitle editor"
-HOMEPAGE="http://www.aegisub.org/";
-SRC_URI="https://github.com/Aegisub/Aegisub/archive/${COMMIT_ID}.tar.gz -> 
${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="alsa debug +ffmpeg +fftw openal oss portaudio pulseaudio spell +uchardet"
-
-# configure.ac specifies minimal versions for some of the dependencies below.
-# However, most of these minimal versions date back to 2006-2012 yy.
-# Such version specifiers are meaningless nowadays, so they are omitted.
-#
-# aegisub bundles luabins (https://github.com/agladysh/luabins).
-# Unfortunately, luabins upstream is practically dead since 2010.
-# Thus unbundling luabins is not worth the effort.
-RDEPEND="
-   dev-lang/luajit:2[lua52compat]
-   dev-libs/boost:=[icu,nls,threads]
-   dev-libs/icu:=
-   media-libs/fontconfig
-   media-libs/freetype
-   media-libs/libass:=[fontconfig]
-   virtual/libiconv
-   virtual/opengl
-   x11-libs/wxGTK:${WX_GTK_VER}[X,opengl,debug?]
-
-   alsa? ( media-libs/alsa-lib )
-   openal? ( media-libs/openal )
-   portaudio? ( =media-libs/portaudio-19* )
-   pulseaudio? ( media-sound/pulseaudio )
-
-   ffmpeg? ( media-libs/ffmpegsource:= )
-   fftw? ( >=sci-libs/fftw-3.3:= )
-
-   spell? ( app-text/hunspell )
-   uchardet? ( dev-libs/uchardet )
-"
-DEPEND="${RDEPEND}
-   oss? ( virtual/os-headers )
-   dev-util/intltool
-   sys-devel/gettext
-   virtual/pkgconfig
-"
-REQUIRED_USE="
-   || ( alsa openal oss portaudio pulseaudio )
-"
-
-PATCHES=(
-   "${FILESDIR}/${P}-fix-luajit-unbundling.patch"
-   "${FILESDIR}/${P}-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() {
-   remove_locale() {
-   rm "po/${1}.po" || die
-   }
-
-   l10n_find_plocales_changes 'po' '' '.po'
-   l10n_for_each_disabled_locale_do remove_locale
-
-

[gentoo-commits] repo/gentoo:master commit in: media-video/aegisub/files/, media-video/aegisub/

2016-03-07 Thread Ian Delaney 
commit: 07146ec002decac6cf35c0762d33cd14a627efec
Author: Ilya Tumaykin  gmail  com>
AuthorDate: Mon Mar  7 15:11:13 2016 +
Commit: Ian Delaney  gentoo  org>
CommitDate: Mon Mar  7 16:25:12 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07146ec0

media-video/aegisub: remove unneeded unbundle-luajit patch from 

Mostly merged upstream. Upstream now supports building with system
luajit. There are still some problems left, see [1]. But it's already
a major improvement.

[1]: http://devel.aegisub.org/ticket/1904#comment:10

Package-Manager: portage-2.2.27

 media-video/aegisub/aegisub-.ebuild|   4 +-
 .../files/aegisub--unbundle-luajit.patch   | 153 -
 2 files changed, 2 insertions(+), 155 deletions(-)

diff --git a/media-video/aegisub/aegisub-.ebuild 
b/media-video/aegisub/aegisub-.ebuild
index 7a83307..2d555ef 100644
--- a/media-video/aegisub/aegisub-.ebuild
+++ b/media-video/aegisub/aegisub-.ebuild
@@ -55,11 +55,10 @@ REQUIRED_USE="
|| ( alsa openal oss portaudio pulseaudio )
 "
 
-# aegisub also bundles luabins (https://github.com/agladysh/luabins).
+# aegisub 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}-unbundle-luajit.patch"
"${FILESDIR}/${PN}-3.2.2-r1-respect-user-compiler-flags.patch"
 )
 
@@ -87,6 +86,7 @@ src_configure() {
use openal && export agi_cv_with_openal="yes"
local myeconfargs=(
--disable-update-checker
+   --with-system-luajit
$(use_enable debug)
$(use_with alsa)
$(use_with ffmpeg ffms2)

diff --git a/media-video/aegisub/files/aegisub--unbundle-luajit.patch 
b/media-video/aegisub/files/aegisub--unbundle-luajit.patch
deleted file mode 100644
index c7e3e94..000
--- a/media-video/aegisub/files/aegisub--unbundle-luajit.patch
+++ /dev/null
@@ -1,153 +0,0 @@
-http://devel.aegisub.org/ticket/1904
-
-diff --git a/Makefile.inc.in b/Makefile.inc.in
-index 5a52d25..6cd16f1 100644
 a/Makefile.inc.in
-+++ b/Makefile.inc.in
-@@ -79,7 +79,7 @@ CFLAGS_ICONV   = @ICONV_CFLAGS@
- CFLAGS_ICU = @ICU_I18N_CFLAGS@
- CFLAGS_LIBASS  = @LIBASS_CFLAGS@
- CFLAGS_LIBPULSE= @LIBPULSE_CFLAGS@
--CFLAGS_LUA = -I$(TOP)vendor/luajit/include
-+CFLAGS_LUA = @LUAJIT_CFLAGS@
- CFLAGS_OPENAL  = @OPENAL_CFLAGS@
- CFLAGS_OSS = @OSS_CFLAGS@
- CFLAGS_PORTAUDIO   = @PORTAUDIO_CFLAGS@
-@@ -97,16 +97,12 @@ LIBS_ICONV = @ICONV_LIBS@
- LIBS_ICU   = @ICU_UC_LIBS@ @ICU_I18N_LIBS@
- LIBS_LIBASS= @LIBASS_LIBS@
- LIBS_LIBPULSE  = @LIBPULSE_LIBS@
--LIBS_LUA   = $(TOP)vendor/luajit/src/libluajit.a
-+LIBS_LUA   = @LUAJIT_LIBS@
- LIBS_OPENAL= @OPENAL_LIBS@
- LIBS_PORTAUDIO = @PORTAUDIO_LIBS@
- LIBS_PTHREAD   = @PTHREAD_LIBS@
- LIBS_UCHARDET  = @UCHARDET_LIBS@
-
--ifeq (yes, $(BUILD_DARWIN))
--LIBS_LUA   = $(TOP)vendor/luajit/src/libluajit-aegisub.so
--endif
--
- FONTCONFIG_CONF_DIR = @FONTCONFIG_CONF_DIR@
-
- #
-diff --git a/automation/Makefile b/automation/Makefile
-index d5425b7..121aae7 100644
 a/automation/Makefile
-+++ b/automation/Makefile
-@@ -12,9 +12,9 @@ DATA_AUTOMATION_INSTALLED = $(addprefix 
$(DESTDIR)$(P_DATA)/automation/, $(DATA_
- $(DESTDIR)$(P_DATA)/automation/%: $(d)%
-   $(MKDIR_INSTALL)
-
--aegisub-lua_OBJ := $(d)tests/aegisub.o $(TOP)lib/libaegisub.a 
$(TOP)lib/libluabins.a $(LIBS_LUA)
-+aegisub-lua_OBJ := $(d)tests/aegisub.o $(TOP)lib/libaegisub.a 
$(TOP)lib/libluabins.a
- aegisub-lua_CPPFLAGS := $(CPPFLAGS_BOOST) $(CFLAGS_LUA) 
-I$(TOP)libaegisub/include -I$(TOP)src $(CXXFLAGS_WX)
--aegisub-lua_LIBS := $(LIBS_WX) $(LIBS_BOOST) $(LIBS_ICU)
-+aegisub-lua_LIBS := $(LIBS_WX) $(LIBS_BOOST) $(LIBS_ICU) $(LIBS_LUA)
-
- PROGRAM += $(d)aegisub-lua
-
-diff --git a/configure.ac b/configure.ac
-index 7492568..2c77fcf 100644
 a/configure.ac
-+++ b/configure.ac
-@@ -16,6 +16,8 @@ m4_define([libpulse_required_version], [0.5])
- m4_define([pkgconfig_required_version], [0.20])
- m4_define([portaudio_required_version], [19])
- m4_define([wx_required_version], [3.0.0])
-+# Same version as the bundled one
-+m4_define([luajit_required_version], [2.0.4])
-
- ###
- # Setup
-@@ -209,6 +211,7 @@ AS_IF([test x$build_darwin != xyes], [
- ])
-
- PKG_CHECK_MODULES(LIBASS, libass >= libass_required_version)
-+PKG_CHECK_MODULES(LUAJIT, luajit >= luajit_required_version)
-
- AX_BOOST_BASE([boost_required_version])
- AX_BOOST_LIB(chrono, BOOST_CHRONO_LIB, [chrono.hpp], 
[boost::chrono::system_clock::time_point time])
-diff --git a/header.mk b/header.mk
-index 613b38f..873d4ce 100644
 a/header.mk
-+++ b/header.mk
-@@ -13,7 +13,6 @@ subdirs := \
-   tests \
-   tools \
-   vendor/luabins \
--  v

[gentoo-commits] repo/gentoo:master commit in: media-video/aegisub/files/, media-video/aegisub/

2016-03-07 Thread Ian Delaney 
commit: 878010e4b5fca1db2520cefa2e40ae16d110b3c1
Author: Ilya Tumaykin  gmail  com>
AuthorDate: Mon Mar  7 15:40:24 2016 +
Commit: Ian Delaney  gentoo  org>
CommitDate: Mon Mar  7 18:35:00 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=878010e4

media-video/aegisub: verbump to 3.2.2_p20160306

New snapshot release with most of our Gentoo patches merged upstream.

Package-Manager: portage-2.2.27

 media-video/aegisub/Manifest   |   1 +
 ...-.ebuild => aegisub-3.2.2_p20160306.ebuild} |  10 +-
 media-video/aegisub/aegisub-.ebuild|   3 +-
 ...sub-3.2.2_p20160306-fix-luajit-unbundling.patch | 127 +
 ...2.2_p20160306-respect-user-compiler-flags.patch |  53 +
 5 files changed, 189 insertions(+), 5 deletions(-)

diff --git a/media-video/aegisub/Manifest b/media-video/aegisub/Manifest
index e696d2d..9589891 100644
--- a/media-video/aegisub/Manifest
+++ b/media-video/aegisub/Manifest
@@ -1,2 +1,3 @@
 DIST aegisub-3.0.4.tar.xz 4155728 SHA256 
7d5d8b94da02278b3327f24dd546c0c897c4b369bd2da9e094dc60371422019a SHA512 
2917195a61d16578a83ce0b69006dd0269c086c6eff2f622c47d9880697e4e531a7c0c0232c187f9023635c9d3857a1d6a0cee4f6251e49d22e2b625ac5dda7f
 WHIRLPOOL 
60bd3e0374a60f6af62fe450488e8c68e18957283fff59d704f40e192da624bdf90d68c3cea41122e5b9ca440d218c3bd6d9d8091ed5226a2e9d1b9fdc2ce689
 DIST aegisub-3.2.2.tar.xz 5252052 SHA256 
c55e33945b82d8513c02ea6e782f0d72c726adcd3707e95b8c0022f6151e6885 SHA512 
54f825e52f238fef8d5cc31c37436e21355aee27883347f905271e5d2a8ff2a77e1b67d5aef38b0f8468bd0bad851fe944e02de27ec96310b902fbe5b1086722
 WHIRLPOOL 
fe948edbb01f11385e14d1912b73942605df18325fcd95f4284a3c2edb73778d90d73038ac4a062e211fd56879590040e3c558fe1e361ec9fe2eee6a5c016448
+DIST aegisub-3.2.2_p20160306.tar.gz 7436713 SHA256 
1b70f67c3b3d6ecce482bc1f4beb1ceffd4c523aa060556658e403ea98fcc58c SHA512 
815775b64b1ad5cd09eda6106561a8a0d4dc129d4c2e08e057eab881289526a7b67bab2f4d2f48748ef2015ea21f2839ed8f84d168bf9127c62c9a35caa1abd5
 WHIRLPOOL 
caaa6b1d69c7e4d1da4abfd0382d263585c5216d9ed5e63f515d8bce98b2e0dad2848552f3f097a8db9e39dad5d2c00d3b752f0407490d0d2c777aaa8fc6dc38

diff --git a/media-video/aegisub/aegisub-.ebuild 
b/media-video/aegisub/aegisub-3.2.2_p20160306.ebuild
similarity index 90%
copy from media-video/aegisub/aegisub-.ebuild
copy to media-video/aegisub/aegisub-3.2.2_p20160306.ebuild
index 09c7389..1c21ae6 100644
--- a/media-video/aegisub/aegisub-.ebuild
+++ b/media-video/aegisub/aegisub-3.2.2_p20160306.ebuild
@@ -8,16 +8,17 @@ 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"
+COMMIT_ID="26fea0e123246b4f122beb54559c8dcd82925071"
 
-inherit autotools-utils fdo-mime flag-o-matic gnome2-utils l10n wxwidgets git-2
+inherit autotools-utils fdo-mime flag-o-matic gnome2-utils l10n wxwidgets 
vcs-snapshot
 
 DESCRIPTION="Advanced subtitle editor"
 HOMEPAGE="http://www.aegisub.org/";
-EGIT_REPO_URI="git://github.com/Aegisub/Aegisub.git"
+SRC_URI="https://github.com/Aegisub/Aegisub/archive/${COMMIT_ID}.tar.gz -> 
${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86"
 IUSE="alsa debug +ffmpeg +fftw openal oss portaudio pulseaudio spell +uchardet"
 
 # configure.ac specifies minimal versions for some of the dependencies below.
@@ -59,7 +60,8 @@ REQUIRED_USE="
 # Unfortunately, luabins upstream is dead since 2011.
 # Thus unbundling luabins is not worth the effort.
 PATCHES=(
-   "${FILESDIR}/${PN}-3.2.2-r1-respect-user-compiler-flags.patch"
+   "${FILESDIR}/${P}-fix-luajit-unbundling.patch"
+   "${FILESDIR}/${P}-respect-user-compiler-flags.patch"
 )
 
 pkg_pretend() {

diff --git a/media-video/aegisub/aegisub-.ebuild 
b/media-video/aegisub/aegisub-.ebuild
index 09c7389..a356fa8 100644
--- a/media-video/aegisub/aegisub-.ebuild
+++ b/media-video/aegisub/aegisub-.ebuild
@@ -59,7 +59,8 @@ REQUIRED_USE="
 # Unfortunately, luabins upstream is dead since 2011.
 # Thus unbundling luabins is not worth the effort.
 PATCHES=(
-   "${FILESDIR}/${PN}-3.2.2-r1-respect-user-compiler-flags.patch"
+   "${FILESDIR}/${PN}-3.2.2_p20160306-fix-luajit-unbundling.patch"
+   "${FILESDIR}/${PN}-3.2.2_p20160306-respect-user-compiler-flags.patch"
 )
 
 pkg_pretend() {

diff --git 
a/media-video/aegisub/files/aegisub-3.2.2_p20160306-fix-luajit-unbundling.patch 
b/media-video/aegisub/files/aegisub-3.2.2_p20160306-fix-luajit-unbundling.patch
new file mode 100644
index 000..a3649c7
--- /dev/null
+++ 
b/media-video/aegisub/files/aegisub-3.2.2_p20160306-fix-luajit-unbundling.patch
@@ -0,0 +1,127 @@
+From 11bd157747ebb855d56d2bc59952a1093cfd9ddc Mon Sep 17 00:00:00 2001
+From: Ilya Tumaykin 
+Date: Mon, 7 Mar 2016 11:21:10 +0300
+Subject: Properly separate bundled and system luajit builds
+
+Build bundled luajit bits only when using bundl

[gentoo-commits] repo/gentoo:master commit in: media-video/aegisub/files/, media-video/aegisub/

2016-03-07 Thread Ian Delaney 
commit: 70ee8e9fac24055830b264113bd86841ffd2fed1
Author: Ilya Tumaykin  gmail  com>
AuthorDate: Mon Mar  7 15:05:40 2016 +
Commit: Ian Delaney  gentoo  org>
CommitDate: Mon Mar  7 16:25:12 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70ee8e9f

media-video/aegisub: remove unneeded pthread-flags patch from 

Merged upstream.

Package-Manager: portage-2.2.27

 media-video/aegisub/aegisub-.ebuild|  1 -
 .../aegisub--add-missing-pthread-flags.patch   | 44 --
 2 files changed, 45 deletions(-)

diff --git a/media-video/aegisub/aegisub-.ebuild 
b/media-video/aegisub/aegisub-.ebuild
index 6677686..7a83307 100644
--- a/media-video/aegisub/aegisub-.ebuild
+++ b/media-video/aegisub/aegisub-.ebuild
@@ -60,7 +60,6 @@ REQUIRED_USE="
 # Thus unbundling luabins is not worth the effort.
 PATCHES=(
"${FILESDIR}/${P}-unbundle-luajit.patch"
-   "${FILESDIR}/${P}-add-missing-pthread-flags.patch"
"${FILESDIR}/${PN}-3.2.2-r1-respect-user-compiler-flags.patch"
 )
 

diff --git 
a/media-video/aegisub/files/aegisub--add-missing-pthread-flags.patch 
b/media-video/aegisub/files/aegisub--add-missing-pthread-flags.patch
deleted file mode 100644
index 9f41ee5..000
--- a/media-video/aegisub/files/aegisub--add-missing-pthread-flags.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-http://devel.aegisub.org/ticket/1902
-http://devel.aegisub.org/ticket/1903
-http://devel.aegisub.org/ticket/1911
-
-diff --git a/Makefile.inc.in b/Makefile.inc.in
-index 5a52d25..86f93d1 100644
 a/Makefile.inc.in
-+++ b/Makefile.inc.in
-@@ -100,7 +100,7 @@ LIBS_LIBPULSE  = @LIBPULSE_LIBS@
- LIBS_LUA   = $(TOP)vendor/luajit/src/libluajit.a
- LIBS_OPENAL= @OPENAL_LIBS@
- LIBS_PORTAUDIO = @PORTAUDIO_LIBS@
--LIBS_PTHREAD   = @PTHREAD_LIBS@
-+LIBS_PTHREAD   = @PTHREAD_LIBS@ -lpthread
- LIBS_UCHARDET  = @UCHARDET_LIBS@
-
- ifeq (yes, $(BUILD_DARWIN))
-diff --git a/libaegisub/Makefile b/libaegisub/Makefile
-index b021523..77a18ec 100644
 a/libaegisub/Makefile
-+++ b/libaegisub/Makefile
-@@ -44,7 +44,8 @@ aegisub_OBJ += $(d)common/dispatch.o
- endif
-
- aegisub_PCH := $(d)lagi_pre.h
--aegisub_CPPFLAGS := -I$(d)include -I$(TOP) $(CPPFLAGS_BOOST) $(CFLAGS_LUA)
-+aegisub_CPPFLAGS := -I$(d)include -I$(TOP) \
-+  $(CFLAGS_PTHREAD) $(CPPFLAGS_BOOST) $(CFLAGS_LUA)
-
- $(d)common/charset.o_FLAGS := $(CFLAGS_UCHARDET)
- $(d)common/charset_conv.o_FLAGS := $(CFLAGS_ICONV)
-diff --git a/tools/Makefile b/tools/Makefile
-index cbf985a..d9f64b8 100644
 a/tools/Makefile
-+++ b/tools/Makefile
-@@ -7,7 +7,7 @@ PROGRAM += $(d)osx-bundle-restart-helper
- endif
-
- repack-thes-dict_OBJ  := $(d)repack-thes-dict.o $(TOP)lib/libaegisub.a
--repack-thes-dict_LIBS := $(LIBS_BOOST) $(LIBS_ICU) $(PTHREAD_LIBS)
-+repack-thes-dict_LIBS := $(LIBS_BOOST) $(LIBS_ICU) $(LIBS_PTHREAD)
- repack-thes-dict_CPPFLAGS := -I$(TOP) -I$(TOP)libaegisub/include $(CFLAGS_ICU)
-
- PROGRAM += $(d)repack-thes-dict

[gentoo-commits] repo/gentoo:master commit in: media-video/aegisub/files/, media-video/aegisub/

2016-02-10 Thread Patrice Clement 
commit: 9b3ff52664e5ddda63f2a0ddfb243fb69bb02d25
Author: Ilya Tumaykin  gmail  com>
AuthorDate: Wed Feb 10 17:00:15 2016 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Wed Feb 10 17:29:23 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b3ff526

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

 ...aegisub-.ebuild => aegisub-3.2.2-r1.ebuild} | 14 +++---
 media-video/aegisub/aegisub-.ebuild|  2 +-
 .../aegisub-3.2.2-add-missing-pthread-flags.patch  | 10 ++---
 .../files/aegisub-3.2.2-fix-lua-regexp.patch   |  2 +-
 ...isub-3.2.2-r1-respect-user-compiler-flags.patch | 50 ++
 .../files/aegisub-3.2.2-unbundle-luajit.patch  | 32 +++---
 6 files changed, 82 insertions(+), 28 deletions(-)

diff --git a/media-video/aegisub/aegisub-.ebuild 
b/media-video/aegisub/aegisub-3.2.2-r1.ebuild
similarity index 90%
copy from media-video/aegisub/aegisub-.ebuild
copy to media-video/aegisub/aegisub-3.2.2-r1.ebuild
index e554a3d..79bc20d 100644
--- a/media-video/aegisub/aegisub-.ebuild
+++ b/media-video/aegisub/aegisub-3.2.2-r1.ebuild
@@ -9,22 +9,25 @@ 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 git-2
+inherit autotools-utils fdo-mime flag-o-matic gnome2-utils l10n wxwidgets
 
 DESCRIPTION="Advanced subtitle editor"
 HOMEPAGE="http://www.aegisub.org/";
-EGIT_REPO_URI="git://github.com/Aegisub/Aegisub.git"
+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=""
+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.4:2[lua52compat]
+   >=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?]
@@ -58,9 +61,10 @@ REQUIRED_USE="
 # 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}/${PN}-3.2.2-respect-user-compiler-flags.patch"
+   "${FILESDIR}/${PF}-respect-user-compiler-flags.patch"
 )
 
 pkg_pretend() {

diff --git a/media-video/aegisub/aegisub-.ebuild 
b/media-video/aegisub/aegisub-.ebuild
index e554a3d..2d5050e 100644
--- a/media-video/aegisub/aegisub-.ebuild
+++ b/media-video/aegisub/aegisub-.ebuild
@@ -60,7 +60,7 @@ REQUIRED_USE="
 PATCHES=(
"${FILESDIR}/${P}-unbundle-luajit.patch"
"${FILESDIR}/${P}-add-missing-pthread-flags.patch"
-   "${FILESDIR}/${PN}-3.2.2-respect-user-compiler-flags.patch"
+   "${FILESDIR}/${PN}-3.2.2-r1-respect-user-compiler-flags.patch"
 )
 
 pkg_pretend() {

diff --git 
a/media-video/aegisub/files/aegisub-3.2.2-add-missing-pthread-flags.patch 
b/media-video/aegisub/files/aegisub-3.2.2-add-missing-pthread-flags.patch
index ed45de7..a5a6fc0 100644
--- a/media-video/aegisub/files/aegisub-3.2.2-add-missing-pthread-flags.patch
+++ b/media-video/aegisub/files/aegisub-3.2.2-add-missing-pthread-flags.patch
@@ -8,7 +8,7 @@ index c93b9dc..8c5678a 100644
  LIBS_PORTAUDIO = @PORTAUDIO_LIBS@
 -LIBS_PTHREAD   = @PTHREAD_LIBS@
 +LIBS_PTHREAD   = @PTHREAD_LIBS@ -lpthread
- 
+
  ifeq (yes, $(BUILD_DARWIN))
  LIBS_LUA   = $(TOP)vendor/luajit/src/libluajit-aegisub.so
 diff --git a/libaegisub/Makefile b/libaegisub/Makefile
@@ -17,12 +17,12 @@ index 64204ef..178044d 100644
 +++ b/libaegisub/Makefile
 @@ -41,7 +41,8 @@ aegisub_OBJ += $(d)common/dispatch.o
  endif
- 
+
  aegisub_PCH := $(d)lagi_pre.h
 -aegisub_CPPFLAGS := -I$(d)include -I$(TOP) -fPIC $(CPPFLAGS_BOOST) 
$(CFLAGS_LUA)
 +aegisub_CPPFLAGS := -I$(d)include -I$(TOP) -fPIC \
 +  $(CFLAGS_PTHREAD) $(CPPFLAGS_BOOST) $(CFLAGS_LUA)
- 
+
  $(d)common/charset_conv.o_FLAGS := $(CFLAGS_ICONV)
  $(d)common/parser.o_FLAGS := -ftemplate-depth=256
 diff --git a/tools/Makefile b/tools/Makefile
@@ -31,10 +31,10 @@ index 81bcef3..d9f64b8 100644
 +++ b/tools/Makefile
 @@ -7,7 +7,7 @@ PROGRAM += $(d)osx-bundle-restart-helper
  endif
- 
+
  repack-thes-dict_OBJ  := $(d)repack-thes-dict.o $(TOP)lib/libaegisub.a
 -repack-thes-dict_LIBS := $(LIBS_BOOST) $(LIBS_ICU)
 +repack-thes-dict_LIBS := $(LIBS_BOOST)

[gentoo-commits] repo/gentoo:master commit in: media-video/aegisub/files/, media-video/aegisub/

2016-02-10 Thread Patrice Clement 
commit: b6b27ad742a9770b78fad3ee853388f9d1846825
Author: Ilya Tumaykin  gmail  com>
AuthorDate: Wed Feb 10 16:17:55 2016 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Wed Feb 10 16:19:06 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6b27ad7

media-video/aegisub: revbump to 3.0.4-r1 to restore -fno-strict-aliasing

Package-Manager: portage-2.2.27

 .../aegisub/{aegisub-3.0.4.ebuild => aegisub-3.0.4-r1.ebuild}  |  0
 .../files/aegisub-3.0.4-fix-install-with-empty-LINGUAS.patch   |  6 +++---
 media-video/aegisub/files/aegisub-3.0.4-fix-lua-macro.patch|  2 +-
 .../files/aegisub-3.0.4-respect-user-compiler-flags.patch  | 10 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/media-video/aegisub/aegisub-3.0.4.ebuild 
b/media-video/aegisub/aegisub-3.0.4-r1.ebuild
similarity index 100%
rename from media-video/aegisub/aegisub-3.0.4.ebuild
rename to media-video/aegisub/aegisub-3.0.4-r1.ebuild

diff --git 
a/media-video/aegisub/files/aegisub-3.0.4-fix-install-with-empty-LINGUAS.patch 
b/media-video/aegisub/files/aegisub-3.0.4-fix-install-with-empty-LINGUAS.patch
index 59927d3..3eda0da 100644
--- 
a/media-video/aegisub/files/aegisub-3.0.4-fix-install-with-empty-LINGUAS.patch
+++ 
b/media-video/aegisub/files/aegisub-3.0.4-fix-install-with-empty-LINGUAS.patch
@@ -9,7 +9,7 @@ index 0b73bde..957c123 100644
 +++ b/aegisub/po/Makefile
 @@ -38,11 +38,13 @@ all: $(MO)
$(BIN_MSGFMT) -o $@ $<
- 
+
  install:
 +ifdef PO
@$(BIN_MKDIR) -p $(addsuffix /LC_MESSAGES/, $(addprefix 
$(DESTDIR)$(P_LOCALE)/, $(basename $(PO
@@ -18,6 +18,6 @@ index 0b73bde..957c123 100644
$(BIN_INSTALL) $$i.mo 
$(DESTDIR)$(P_LOCALE)/$$i/LC_MESSAGES/$(AEGISUB_CATALOG).mo; \
done
 +endif
- 
- 
+
+
  CLEANFILES = $(MO)

diff --git a/media-video/aegisub/files/aegisub-3.0.4-fix-lua-macro.patch 
b/media-video/aegisub/files/aegisub-3.0.4-fix-lua-macro.patch
index c7f7e32..253fb3e 100644
--- a/media-video/aegisub/files/aegisub-3.0.4-fix-lua-macro.patch
+++ b/media-video/aegisub/files/aegisub-3.0.4-fix-lua-macro.patch
@@ -5,7 +5,7 @@ index d961bd6..17df012 100644
 @@ -369,7 +369,7 @@ AC_ARG_WITH(lua,
  AS_HELP_STRING([--without-lua],
 [build without lua 5.1 (auto4)]))
- 
+
 -AS_IF([test x$with_lua = xno], [$with_auto4_lua="no"; 
lua_disabled="(disabled)"], [
 +AS_IF([test x$with_lua = xno], [with_auto4_lua="no"; 
lua_disabled="(disabled)"], [
# First try pkg-config with several names

diff --git 
a/media-video/aegisub/files/aegisub-3.0.4-respect-user-compiler-flags.patch 
b/media-video/aegisub/files/aegisub-3.0.4-respect-user-compiler-flags.patch
index 80e1eb9..408fb8d 100644
--- a/media-video/aegisub/files/aegisub-3.0.4-respect-user-compiler-flags.patch
+++ b/media-video/aegisub/files/aegisub-3.0.4-respect-user-compiler-flags.patch
@@ -1,8 +1,8 @@
 diff --git a/aegisub/configure.ac b/aegisub/configure.ac
-index d961bd6..8922042 100644
+index d961bd6..e0bdc46 100644
 --- a/aegisub/configure.ac
 +++ b/aegisub/configure.ac
-@@ -157,23 +157,17 @@ AS_IF([test x$enable_compiler_flags != xno], [
+@@ -157,23 +157,18 @@ AS_IF([test x$enable_compiler_flags != xno], [
AC_C_FLAG([-Wextra],[AC_C_FLAG([-W])])
AC_C_FLAG([-Wno-unused-parameter])
AC_C_FLAG([-std=gnu99])
@@ -12,10 +12,10 @@ index d961bd6..8922042 100644
AC_CXX_FLAG([-Wextra],[AC_CXX_FLAG([-W])])
AC_CXX_FLAG([-Wno-unused-parameter])
AC_CXX_FLAG([-Wno-long-long])
--  AC_CXX_FLAG([-fno-strict-aliasing])
+   AC_CXX_FLAG([-fno-strict-aliasing])
 -  AC_CXX_FLAG([-pipe])
 -  AC_CXX_FLAG([-g])
- 
+
# -O* messes with debugging.
AS_IF([test x$enable_debug = xyes], [
  AC_C_FLAG([-O0])
@@ -27,4 +27,4 @@ index d961bd6..8922042 100644
 +AC_CXX_FLAG([-g])
])
  ])
- 
+

[gentoo-commits] repo/gentoo:master commit in: media-video/aegisub/files/, media-video/aegisub/

2015-12-31 Thread Ian Delaney 
commit: 68efac96d646a880a0941040b53290275e8bb85e
Author: Ilya Tumaykin  gmail  com>
AuthorDate: Fri Jan  1 02:53:07 2016 +
Commit: Ian Delaney  gentoo  org>
CommitDate: Fri Jan  1 07:55:09 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68efac96

media-video/aegisub: fix installation of 3.0.4 with empty LINGUAS

3.2.2 and live are not affected.

Package-Manager: portage-2.2.24

 media-video/aegisub/aegisub-3.0.4.ebuild   |  3 ++-
 ...isub-3.0.4-fix-install-with-empty-LINGUAS.patch | 23 ++
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/media-video/aegisub/aegisub-3.0.4.ebuild 
b/media-video/aegisub/aegisub-3.0.4.ebuild
index 6320424..93bc4fe 100644
--- a/media-video/aegisub/aegisub-3.0.4.ebuild
+++ b/media-video/aegisub/aegisub-3.0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -57,6 +57,7 @@ REQUIRED_USE="
 
 PATCHES=(
"${FILESDIR}/${P}-fix-lua-macro.patch"
+   "${FILESDIR}/${P}-fix-install-with-empty-LINGUAS.patch"
"${FILESDIR}/${P}-respect-user-compiler-flags.patch"
 )
 

diff --git 
a/media-video/aegisub/files/aegisub-3.0.4-fix-install-with-empty-LINGUAS.patch 
b/media-video/aegisub/files/aegisub-3.0.4-fix-install-with-empty-LINGUAS.patch
new file mode 100644
index 000..59927d3
--- /dev/null
+++ 
b/media-video/aegisub/files/aegisub-3.0.4-fix-install-with-empty-LINGUAS.patch
@@ -0,0 +1,23 @@
+Upstream always installs all available localization files. We workaround it by
+sed'ing out unneeded languages from PO variable in aegisub/po/Makefile file.
+This can lead to an empty PO definition and in this case install target fails.
+Thus a simple guard is introduced to prevent this fail.
+
+diff --git a/aegisub/po/Makefile b/aegisub/po/Makefile
+index 0b73bde..957c123 100644
+--- a/aegisub/po/Makefile
 b/aegisub/po/Makefile
+@@ -38,11 +38,13 @@ all: $(MO)
+   $(BIN_MSGFMT) -o $@ $<
+ 
+ install:
++ifdef PO
+   @$(BIN_MKDIR) -p $(addsuffix /LC_MESSAGES/, $(addprefix 
$(DESTDIR)$(P_LOCALE)/, $(basename $(PO
+   @for i in $(basename $(PO)); do \
+   echo $(BIN_INSTALL) $$i.mo 
$(DESTDIR)$(P_LOCALE)/$$i/LC_MESSAGES/$(AEGISUB_CATALOG).mo; \
+   $(BIN_INSTALL) $$i.mo 
$(DESTDIR)$(P_LOCALE)/$$i/LC_MESSAGES/$(AEGISUB_CATALOG).mo; \
+   done
++endif
+ 
+ 
+ CLEANFILES = $(MO)

[gentoo-commits] repo/gentoo:master commit in: media-video/aegisub/files/, media-video/aegisub/

2015-12-28 Thread Patrice Clement 
commit: 077cb0bcdea76ee5473363de5c5f66077aba6768
Author: Ilya Tumaykin  gmail  com>
AuthorDate: Sun Dec 27 23:21:00 2015 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Sun Dec 27 23:36:15 2015 +
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-.ebuild|  2 +-
 .../aegisub--respect-user-compiler-flags.patch | 50 --
 2 files changed, 1 insertion(+), 51 deletions(-)

diff --git a/media-video/aegisub/aegisub-.ebuild 
b/media-video/aegisub/aegisub-.ebuild
index f7d6889..4474823 100644
--- a/media-video/aegisub/aegisub-.ebuild
+++ b/media-video/aegisub/aegisub-.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--respect-user-compiler-flags.patch 
b/media-video/aegisub/files/aegisub--respect-user-compiler-flags.patch
deleted file mode 100644
index ae1f5c1..000
--- a/media-video/aegisub/files/aegisub--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

[gentoo-commits] repo/gentoo:master commit in: media-video/aegisub/files/, media-video/aegisub/

2015-12-21 Thread Ian Delaney 
commit: d7810e2c933d6630efe6ab54471ef3b65cd1a357
Author: Ilya Tumaykin  gmail  com>
AuthorDate: Mon Dec 21 15:01:31 2015 +
Commit: Ian Delaney  gentoo  org>
CommitDate: Mon Dec 21 15:01:31 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7810e2c

media-video/aegisub: add missing pthread flags

This also fixes build with GCC-5.

Gentoo-Bug: 568878

Package-Manager: portage-2.2.24

 media-video/aegisub/aegisub-3.2.2.ebuild |  1 +
 media-video/aegisub/aegisub-.ebuild  |  1 +
 .../files/aegisub-3.2.2-add-missing-pthread-flags.patch  | 16 
 .../files/aegisub--add-missing-pthread-flags.patch   | 14 ++
 4 files changed, 32 insertions(+)

diff --git a/media-video/aegisub/aegisub-3.2.2.ebuild 
b/media-video/aegisub/aegisub-3.2.2.ebuild
index 185e7f1..19b2dc6 100644
--- a/media-video/aegisub/aegisub-3.2.2.ebuild
+++ b/media-video/aegisub/aegisub-3.2.2.ebuild
@@ -63,6 +63,7 @@ REQUIRED_USE="
 PATCHES=(
"${FILESDIR}/${P}-fix-lua-regexp.patch"
"${FILESDIR}/${P}-unbundle-luajit.patch"
+   "${FILESDIR}/${P}-add-missing-pthread-flags.patch"
"${FILESDIR}/${P}-respect-user-compiler-flags.patch"
 )
 

diff --git a/media-video/aegisub/aegisub-.ebuild 
b/media-video/aegisub/aegisub-.ebuild
index c678b5f..6f6eb8c 100644
--- a/media-video/aegisub/aegisub-.ebuild
+++ b/media-video/aegisub/aegisub-.ebuild
@@ -60,6 +60,7 @@ REQUIRED_USE="
 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"
 )
 

diff --git 
a/media-video/aegisub/files/aegisub-3.2.2-add-missing-pthread-flags.patch 
b/media-video/aegisub/files/aegisub-3.2.2-add-missing-pthread-flags.patch
new file mode 100644
index 000..c1aa14a
--- /dev/null
+++ b/media-video/aegisub/files/aegisub-3.2.2-add-missing-pthread-flags.patch
@@ -0,0 +1,16 @@
+diff --git a/tools/Makefile b/tools/Makefile
+index 81bcef3..f9a6cd3 100644
+--- a/tools/Makefile
 b/tools/Makefile
+@@ -7,8 +7,9 @@ PROGRAM += $(d)osx-bundle-restart-helper
+ endif
+ 
+ repack-thes-dict_OBJ  := $(d)repack-thes-dict.o $(TOP)lib/libaegisub.a
+-repack-thes-dict_LIBS := $(LIBS_BOOST) $(LIBS_ICU)
+-repack-thes-dict_CPPFLAGS := -I$(TOP) -I$(TOP)libaegisub/include $(CFLAGS_ICU)
++repack-thes-dict_LIBS := $(LIBS_BOOST) $(LIBS_ICU) $(LIBS_PTHREAD)
++repack-thes-dict_CPPFLAGS := -I$(TOP) -I$(TOP)libaegisub/include \
++  $(CFLAGS_ICU) $(CFLAGS_PTHREAD)
+ 
+ PROGRAM += $(d)repack-thes-dict
+ 

diff --git 
a/media-video/aegisub/files/aegisub--add-missing-pthread-flags.patch 
b/media-video/aegisub/files/aegisub--add-missing-pthread-flags.patch
new file mode 100644
index 000..1d709fe
--- /dev/null
+++ b/media-video/aegisub/files/aegisub--add-missing-pthread-flags.patch
@@ -0,0 +1,14 @@
+diff --git a/tools/Makefile b/tools/Makefile
+index d9f64b8..f9a6cd3 100644
+--- a/tools/Makefile
 b/tools/Makefile
+@@ -8,7 +8,8 @@ endif
+ 
+ repack-thes-dict_OBJ  := $(d)repack-thes-dict.o $(TOP)lib/libaegisub.a
+ repack-thes-dict_LIBS := $(LIBS_BOOST) $(LIBS_ICU) $(LIBS_PTHREAD)
+-repack-thes-dict_CPPFLAGS := -I$(TOP) -I$(TOP)libaegisub/include $(CFLAGS_ICU)
++repack-thes-dict_CPPFLAGS := -I$(TOP) -I$(TOP)libaegisub/include \
++  $(CFLAGS_ICU) $(CFLAGS_PTHREAD)
+ 
+ PROGRAM += $(d)repack-thes-dict
+

[gentoo-commits] repo/gentoo:master commit in: media-video/aegisub/files/, media-video/aegisub/

2015-11-03 Thread Ian Delaney 
commit: c2677e5cfc8e1dd211890be4159fc5d604e9b434
Author: Ilya Tumaykin  gmail  com>
AuthorDate: Mon Nov  2 08:26:28 2015 +
Commit: Ian Delaney  gentoo  org>
CommitDate: Mon Nov  2 08:56:58 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2677e5c

media-video/aegisub: version bump to 3.0.4

Add the last aegisub version that has:
- dependency on http://www.aegisub.org/";
+SRC_URI="http://ftp.aegisub.org/pub/releases/${P}.tar.xz";
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa debug +ffmpeg +fftw +libass lua 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="
+   >=x11-libs/wxGTK-2.9.3:${WX_GTK_VER}[X,opengl,debug?]
+   media-libs/fontconfig
+   media-libs/freetype
+   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:= )
+
+   libass? ( media-libs/libass[fontconfig] )
+   lua? ( =dev-lang/lua-5.1*:= )
+   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 )
+"
+
+PATCHES=(
+   "${FILESDIR}/${P}-fix-lua-macro.patch"
+   "${FILESDIR}/${P}-respect-user-compiler-flags.patch"
+)
+
+S="${WORKDIR}/${PN}/${PN}"
+
+src_prepare() {
+   cp /usr/share/gettext/config.rpath . || die
+
+   remove_locale() {
+   sed -i -e "s/${1}\.po//" po/Makefile || 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-crash-reporter
+   --disable-update-checker
+   $(use_enable debug)
+   $(use_with alsa)
+   $(use_with ffmpeg ffms2)
+   $(use_with fftw fftw3)
+   $(use_with libass)
+   $(use_with lua)
+   $(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
+}

diff --git a/media-video/aegisub/files/aegisub-3.0.4-fix-lua-macro.patch 
b/media-video/aegisub/files/aegisub-3.0.4-fix-lua-macro.patch
new file mode 100644
index 000..c7f7e32
--- /dev/null
+++ b/media-video/aegisub/files/aegisub-3.0.4-fix-lua-macro.patch
@@ -0,0 +1,13 @@
+diff --git a/aegisub/configure.ac b/aegisub/configure.ac
+index d961bd6..17df012 100644
+--- a/aegisub/configure.ac
 b/aegisub/configure.ac
+@@ -369,7 +369,7 @@ AC_ARG_WITH(lua,
+ AS_HELP_STRING([--without-lua],
+[build without lua 5.1 (auto4)]))
+ 
+-AS_IF([test x$with_lua = xno], [$with_auto4_lua="no"; 
lua_disabled="(disabled)"], [
++AS_IF([test x$with_lua = xno], [with_auto4_lua="no"; 
lua_disabled="(disabled)"], [
+   # First try pkg-config with several names
+   PKG_CHECK_MODULES(LUA, lua5.1  >= 5.1 lua5.1  < 5.2, 
[with_auto4_lua="yes"], [
+   PKG_CHECK_MODULES(LUA, lua-5.1 >= 5.1 lua-5.1 < 5.2, 
[with_auto4_lua="yes"], [

diff --git 
a/media-video/aegisub/files/aegisub-3.0.4-respect-user-compiler-flags.patch 
b/media-video/aegisub/files/aegisub-3.0.4-respect-user-compiler-flags.patch
new file mode 100644
index 000..80e1eb9
--- /dev/null
+++ b/media-video/aegisub/files/aegisub-3.0.4-respect-user-compiler-flags.patch
@@ -0,0 +1,30 @@
+diff --git a/aegisub/configure.ac b/aegisub/configure.ac
+index d961bd6..8922042 100644
+--- a/aegisub/configure.ac
 b/aegisub/configure.ac
+@@ -157,23 +157,17 @@ AS_IF([test x$enable_compiler_flags != xno], [
+   AC_C_FLAG([-Wextra],[AC_C_FLAG([-W])])
+   AC_C_FLAG([-Wno-unused-parameter])
+   AC_C_FLAG([-std=gnu99])
+-  AC_C_FLAG([-pipe])
+-  AC_C_FLAG([-g])
+   AC_CXX_FLAG([-Wall])
+   AC_CXX_FLAG([-Wextra],[AC_CXX_FLAG([-W])])
+   AC_CXX_FLAG([-Wno-unused-parameter])
+   AC_CXX_FLAG([-Wno-long-long])
+-  AC_CXX_FLAG([-fno-strict-aliasing])
+-  AC_CXX_FLAG([-pipe])
+-  AC_CXX_FLAG([-g])
+ 
+   # -O* messes with debugging.
+   AS_IF([test x$