Index: head/multimedia/aegisub/Makefile =================================================================== --- head/multimedia/aegisub/Makefile (revision 371504) +++ head/multimedia/aegisub/Makefile (revision 371505) @@ -1,147 +1,147 @@ # Created by: Leinier Cruz Salfran # $FreeBSD$ PORTNAME= aegisub -PORTVERSION= 3.2.0 -PORTREVISION= 2 +PORTVERSION= 3.2.1 CATEGORIES= multimedia MASTER_SITES= http://ftp.aegisub.org/pub/archives/releases/source/:aegisub \ ftp://ftp.aegisub.org/pub/archives/releases/source/:aegisub \ ftp://ftp2.aegisub.org/pub/archives/releases/source/:aegisub \ GH DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:aegisub ${FFMS_DISTFILE} MAINTAINER= ports@FreeBSD.org COMMENT= Cross-platform subtitle editor LICENSE= BSD3CLAUSE LIB_DEPENDS= libboost_thread.so:${PORTSDIR}/devel/boost-libs \ libicui18n.so:${PORTSDIR}/devel/icu \ libass.so:${PORTSDIR}/multimedia/libass \ libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig USE_GITHUB= yes GH_ACCOUNT= FFMS GH_PROJECT= ffms2 GH_TAGNAME= ${FFMS_VERSION} -GH_COMMIT= 6b0e4a2 +GH_COMMIT= f673b48 WRKSRC= ${WRKDIR}/${DISTNAME} USES= compiler:c++11-lib desktop-file-utils gettext gmake iconv \ pkgconfig tar:xz USE_GNOME= intltool USE_WX= 3.0 WX_UNICODE= yes WX_CONF_ARGS= absolute USE_GL= glu USE_CSTD= c99 GNU_CONFIGURE= yes -CONFIGURE_ENV= agi_cv_with_iconv=yes +CONFIGURE_ENV= ICONV_LIBS="${ICONV_LIB}" PTHREAD_LIBS="-pthread" \ + agi_cv_with_iconv=yes CONFIGURE_ARGS= --disable-compiler-flags \ --disable-gcc-prec \ --disable-sanity-checks \ --disable-update-checker \ --without-libc++ \ ${ICONV_CONFIGURE_ARG} INSTALLS_ICONS= yes PLIST_SUB= VERSION="${PORTVERSION:R}" CPPFLAGS+= -I${LOCALBASE}/include -LIBS+= -L${LOCALBASE}/lib ${ICONV_LIB} -pthread +LDFLAGS+= -L${LOCALBASE}/lib OPTIONS_DEFINE= ALSA DOCS FFMPEG FFTW HUNSPELL OPENAL PORTAUDIO \ PULSEAUDIO OPTIONS_DEFAULT= FFMPEG FFTW HUNSPELL PULSEAUDIO ALSA_LIB_DEPENDS= libasound.so:${PORTSDIR}/audio/alsa-lib ALSA_CONFIGURE_OFF= --without-alsa FFMPEG_LIB_DEPENDS= libavcodec.so:${PORTSDIR}/multimedia/ffmpeg FFMPEG_CONFIGURE_ENV= FFMS2_CFLAGS="${FFMS_CFLAGS}" \ FFMS2_LIBS="${FFMS_LIBS}" FFMPEG_CONFIGURE_OFF= --without-ffms FFMPEG_CPPFLAGS= ${FFMS_CFLAGS} FFTW_LIB_DEPENDS= libfftw3.so:${PORTSDIR}/math/fftw3 FFTW_CONFIGURE_OFF= --without-fftw3 HUNSPELL_LIB_DEPENDS= libhunspell-1.3.so:${PORTSDIR}/textproc/hunspell HUNSPELL_CONFIGURE_OFF= --without-hunspell OPENAL_USES= openal OPENAL_CONFIGURE_OFF= --without-openal PORTAUDIO_BUILD_DEPENDS=\ portaudio2>0:${PORTSDIR}/audio/portaudio2 PORTAUDIO_RUN_DEPENDS= portaudio2>0:${PORTSDIR}/audio/portaudio2 PORTAUDIO_CFLAGS= -isystem ${LOCALBASE}/include/portaudio2 PORTAUDIO_LDFLAGS= -L${LOCALBASE}/lib/portaudio2 PORTAUDIO_CONFIGURE_OFF=\ --without-portaudio PULSEAUDIO_LIB_DEPENDS= libpulse.so:${PORTSDIR}/audio/pulseaudio PULSEAUDIO_CONFIGURE_OFF=\ --without-libpulse FFMS_NAME= ffms2 -FFMS_VERSION= 2.19.1 +FFMS_VERSION= 2.20 FFMS_DISTNAME= ${FFMS_NAME}-${FFMS_VERSION} FFMS_DISTFILE= ${FFMS_DISTNAME}.tar.gz FFMS_WRKSRC= ${WRKDIR}/${GH_ACCOUNT}-${GH_PROJECT}-${GH_COMMIT} FFMS_CFLAGS= -I${FFMS_WRKSRC}/include FFMS_LIBS= ${FFMS_WRKSRC}/src/core/.libs/libffms2.a \ $$(pkg-config --libs libavcodec libavformat libswscale libavutil libavresample) .include .if ${COMPILER_TYPE} == "gcc" USE_CXXSTD= gnu++11 .if empty(CFLAGS:M-march=*) CFLAGS_i386= -march=pentium .endif .else USE_CXXSTD= c++11 CXXFLAGS+= -Wno-c++11-narrowing .if ${COMPILER_VERSION} < 34 BUILD_DEPENDS+= ${LOCALBASE}/lib/c++/libstdc++.so:${PORTSDIR}/devel/libc++ \ ${LOCALBASE}/bin/clang34:${PORTSDIR}/lang/clang34 CPP= clang-cpp34 CC= clang34 CXX= clang++34 CXXFLAGS+= -nostdinc++ -isystem ${LOCALBASE}/include/c++/v1 LDFLAGS+= -L${LOCALBASE}lib/c++ .endif .endif post-patch: @${REINPLACE_CMD} -e \ 's| -O3||' ${WRKSRC}/configure @${REINPLACE_CMD} -e \ 's|".*build/|"./build/|' ${WRKSRC}/build/version.sh @${REINPLACE_CMD} -e \ 's|^CC=|CC?=| ; \ /^CCOPT_/s|=.*|=| ; \ /^CCDEBUG/s|=.*|=|' ${WRKSRC}/vendor/luajit/src/Makefile .if ${COMPILER_TYPE} == "gcc" @${FIND} ${WRKSRC} -name "*.h" | ${XARGS} ${REINPLACE_CMD} -e \ '/virtual /s|= default;$$|{ }|' .endif pre-configure: .if ${PORT_OPTIONS:MFFMPEG} @(cd ${FFMS_WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ./configure \ --disable-shared CC="${CC}" CXX="${CXX}" CFLAGS="${CFLAGS}" \ CXXFLAGS="${CXXFLAGS}") .endif pre-build: .if ${PORT_OPTIONS:MFFMPEG} @(cd ${FFMS_WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \ ${MAKE_FLAGS} ${MAKEFILE} -j${MAKE_JOBS_NUMBER} ${MAKE_ARGS} \ ${ALL_TARGET}) .endif post-install: @${MKDIR} ${STAGEDIR}${DOCSDIR}/automation/v4-docs (cd ${WRKSRC}/automation/v4-docs && ${INSTALL_DATA} * \ ${STAGEDIR}${DOCSDIR}/automation/v4-docs) @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/aegisub-* .include Index: head/multimedia/aegisub/distinfo =================================================================== --- head/multimedia/aegisub/distinfo (revision 371504) +++ head/multimedia/aegisub/distinfo (revision 371505) @@ -1,4 +1,4 @@ -SHA256 (aegisub-3.2.0.tar.xz) = d9e5fd48b243e29832361a13f8be82b271ef0c606b13593ec72461156ee19159 -SIZE (aegisub-3.2.0.tar.xz) = 5181228 -SHA256 (ffms2-2.19.1.tar.gz) = 8516af3f71531746e7e3e4b16eb30dade5df5edfc0782e7b69f965310ea66640 -SIZE (ffms2-2.19.1.tar.gz) = 512444 +SHA256 (aegisub-3.2.1.tar.xz) = 961a28f2528a3c6330f06d0f2aef5fa71d93ca2ae1e6dcfabe347befbb6df8dc +SIZE (aegisub-3.2.1.tar.xz) = 5200564 +SHA256 (ffms2-2.20.tar.gz) = 25060b39c36449fe8ca9b3a2e87ee52f89fd697161feab0246d2c0baecf03fad +SIZE (ffms2-2.20.tar.gz) = 539697 Index: head/multimedia/aegisub/files/patch-automation__Makefile =================================================================== --- head/multimedia/aegisub/files/patch-automation__Makefile (nonexistent) +++ head/multimedia/aegisub/files/patch-automation__Makefile (revision 371505) @@ -0,0 +1,13 @@ +--- automation/Makefile.orig ++++ automation/Makefile +@@ -13,8 +13,8 @@ + $(MKDIR_INSTALL) + + aegisub-lua_OBJ := $(d)tests/aegisub.o $(TOP)lib/libaegisub.a $(TOP)lib/libluabins.a $(LIBS_LUA) +-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_CPPFLAGS := $(CPPFLAGS_BOOST) $(CFLAGS_LUA) -I$(TOP)libaegisub/include -I$(TOP)src $(CXXFLAGS_WX) $(CFLAGS_ICONV) $(CFLAGS_PTHREAD) ++aegisub-lua_LIBS := $(LIBS_WX) $(LIBS_BOOST) $(LIBS_ICU) $(LIBS_ICONV) $(LIBS_PTHREAD) + + PROGRAM += $(d)aegisub-lua + Property changes on: head/multimedia/aegisub/files/patch-automation__Makefile ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/multimedia/aegisub/files/patch-src__Makefile =================================================================== --- head/multimedia/aegisub/files/patch-src__Makefile (nonexistent) +++ head/multimedia/aegisub/files/patch-src__Makefile (revision 371505) @@ -0,0 +1,15 @@ +--- src/Makefile.orig ++++ src/Makefile +@@ -3,10 +3,10 @@ + PROGRAM += $(d)src + + src_CPPFLAGS := -I$(d) -I.. -I$(d)include -I$(TOP)libaegisub/include -I$(TOP)build \ +- $(CFLAGS_PTHREAD) $(CFLAGS_FFTW3) $(CFLAGS_ICU) ++ $(CFLAGS_PTHREAD) $(CFLAGS_FFTW3) $(CFLAGS_ICU) $(CFLAGS_ICONV) + src_CXXFLAGS := $(CXXFLAGS_WX) + src_LIBS := $(LIBS_GL) $(LIBS_PTHREAD) $(LIBS_WX) $(LIBS_FREETYPE) \ +- $(LIBS_LIBASS) $(LIBS_FONTCONFIG) $(LIBS_FFTW3) $(LIBS_BOOST) $(LIBS_ICU) ++ $(LIBS_LIBASS) $(LIBS_FONTCONFIG) $(LIBS_FFTW3) $(LIBS_BOOST) $(LIBS_ICU) $(LIBS_ICONV) + src_PCH := $(d)agi_pre.h + src_INSTALLNAME := $(AEGISUB_COMMAND) + Property changes on: head/multimedia/aegisub/files/patch-src__Makefile ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/multimedia/aegisub/files/patch-src__fft.cpp =================================================================== --- head/multimedia/aegisub/files/patch-src__fft.cpp (nonexistent) +++ head/multimedia/aegisub/files/patch-src__fft.cpp (revision 371505) @@ -0,0 +1,11 @@ +--- src/fft.cpp.orig ++++ src/fft.cpp +@@ -43,7 +43,7 @@ + + void FFT::DoTransform (size_t n_samples,float *input,float *output_r,float *output_i,bool inverse) { + if (!IsPowerOfTwo(n_samples)) +- agi::InternalError(throw "FFT requires power of two input."); ++ throw agi::InternalError("FFT requires power of two input."); + + // Inverse transform + float angle_num = 2.0f * 3.1415926535897932384626433832795f; Property changes on: head/multimedia/aegisub/files/patch-src__fft.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/multimedia/aegisub/files/patch-src__subtitle_format_ass.cpp =================================================================== --- head/multimedia/aegisub/files/patch-src__subtitle_format_ass.cpp (revision 371504) +++ head/multimedia/aegisub/files/patch-src__subtitle_format_ass.cpp (revision 371505) @@ -1,34 +1,34 @@ --- src/subtitle_format_ass.cpp.orig 2014-08-05 23:16:03.000000000 +0900 +++ src/subtitle_format_ass.cpp 2014-08-05 23:18:02.000000000 +0900 @@ -31,6 +31,13 @@ #include #include +#ifdef _LIBCPP_VERSION +#define TO_STRING(x) std::to_string(x) +#else +#include +#define TO_STRING(x) boost::lexical_cast(x) +#endif + DEFINE_EXCEPTION(AssParseError, SubtitleFormatParseError); void AssSubtitleFormat::ReadFile(AssFile *target, agi::fs::path const& filename, agi::vfr::Framerate const& fps, std::string const& encoding) const { @@ -119,7 +126,7 @@ template void WriteIfNotZero(const char *key, Number n) { if (n != Number{}) - file.WriteLineToFile(key + std::to_string(n)); + file.WriteLineToFile(key + TO_STRING(n)); } - void WriteExtradata(AegisubExtradataMap const& extradata) { + void WriteExtradata(std::vector const& extradata) { @@ -131,7 +138,7 @@ file.WriteLineToFile("[Aegisub Extradata]"); for (auto const& edi : extradata) { std::string line = "Data: "; -- line += std::to_string(edi.first); -+ line += TO_STRING(edi.first); +- line += std::to_string(edi.id); ++ line += TO_STRING(edi.id); line += ","; - line += inline_string_encode(edi.second.first); + line += inline_string_encode(edi.key); line += ","; Property changes on: head/multimedia/aegisub/files/patch-src__subtitle_format_ass.cpp ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/multimedia/aegisub/files/patch-tools__Makefile =================================================================== --- head/multimedia/aegisub/files/patch-tools__Makefile (nonexistent) +++ head/multimedia/aegisub/files/patch-tools__Makefile (revision 371505) @@ -0,0 +1,13 @@ +--- tools/Makefile.orig ++++ tools/Makefile +@@ -7,8 +7,8 @@ + 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) $(LIBS_ICONV) ++repack-thes-dict_CPPFLAGS := -I$(TOP) -I$(TOP)libaegisub/include $(CFLAGS_ICU) $(CFLAGS_ICONV) $(CFLAGS_PTHREAD) + + PROGRAM += $(d)repack-thes-dict + Property changes on: head/multimedia/aegisub/files/patch-tools__Makefile ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/multimedia/aegisub/pkg-plist =================================================================== --- head/multimedia/aegisub/pkg-plist (revision 371504) +++ head/multimedia/aegisub/pkg-plist (revision 371505) @@ -1,81 +1,69 @@ bin/aegisub-%%VERSION%% %%DATADIR%%/automation/autoload/cleantags-autoload.lua %%DATADIR%%/automation/autoload/kara-templater.lua %%DATADIR%%/automation/autoload/karaoke-auto-leadin.lua %%DATADIR%%/automation/autoload/macro-1-edgeblur.lua %%DATADIR%%/automation/autoload/macro-2-mkfullwitdh.lua %%DATADIR%%/automation/autoload/select-overlaps.moon %%DATADIR%%/automation/autoload/strip-tags.lua %%DATADIR%%/automation/demos/future-windy-blur.lua %%DATADIR%%/automation/demos/raytracer.lua %%DATADIR%%/automation/demos/raytracer-test1.ass %%DATADIR%%/automation/include/aegisub/clipboard.lua %%DATADIR%%/automation/include/aegisub/re.moon %%DATADIR%%/automation/include/aegisub/unicode.moon %%DATADIR%%/automation/include/aegisub/util.moon %%DATADIR%%/automation/include/cleantags.lua %%DATADIR%%/automation/include/clipboard.lua %%DATADIR%%/automation/include/karaskel-auto4.lua %%DATADIR%%/automation/include/karaskel.lua %%DATADIR%%/automation/include/moonscript.lua %%DATADIR%%/automation/include/re.lua %%DATADIR%%/automation/include/unicode.lua %%DATADIR%%/automation/include/utils-auto4.lua %%DATADIR%%/automation/include/utils.lua share/applications/aegisub.desktop %%PORTDOCS%%%%DOCSDIR%%/automation/v4-docs/basic-function-interface.txt %%PORTDOCS%%%%DOCSDIR%%/automation/v4-docs/configuration-dialogs.txt %%PORTDOCS%%%%DOCSDIR%%/automation/v4-docs/file-streams.txt %%PORTDOCS%%%%DOCSDIR%%/automation/v4-docs/misc.txt %%PORTDOCS%%%%DOCSDIR%%/automation/v4-docs/overview.txt %%PORTDOCS%%%%DOCSDIR%%/automation/v4-docs/progress-reporting.txt %%PORTDOCS%%%%DOCSDIR%%/automation/v4-docs/subtitle-data.txt %%PORTDOCS%%%%DOCSDIR%%/automation/v4-docs/template-scripting-ideas.ass share/icons/hicolor/16x16/apps/aegisub.png share/icons/hicolor/22x22/apps/aegisub.png share/icons/hicolor/24x24/apps/aegisub.png share/icons/hicolor/32x32/apps/aegisub.png share/icons/hicolor/48x48/apps/aegisub.png share/icons/hicolor/64x64/apps/aegisub.png share/icons/hicolor/scalable/apps/aegisub.svg share/locale/ar/LC_MESSAGES/aegisub-32.mo share/locale/bg/LC_MESSAGES/aegisub-32.mo share/locale/ca/LC_MESSAGES/aegisub-32.mo share/locale/cs/LC_MESSAGES/aegisub-32.mo share/locale/da/LC_MESSAGES/aegisub-32.mo share/locale/de/LC_MESSAGES/aegisub-32.mo share/locale/el/LC_MESSAGES/aegisub-32.mo share/locale/es/LC_MESSAGES/aegisub-32.mo share/locale/eu/LC_MESSAGES/aegisub-32.mo share/locale/fa/LC_MESSAGES/aegisub-32.mo share/locale/fi/LC_MESSAGES/aegisub-32.mo share/locale/fr_FR/LC_MESSAGES/aegisub-32.mo share/locale/gl/LC_MESSAGES/aegisub-32.mo share/locale/hu/LC_MESSAGES/aegisub-32.mo share/locale/id/LC_MESSAGES/aegisub-32.mo share/locale/it/LC_MESSAGES/aegisub-32.mo share/locale/ja/LC_MESSAGES/aegisub-32.mo share/locale/ko/LC_MESSAGES/aegisub-32.mo share/locale/nl/LC_MESSAGES/aegisub-32.mo share/locale/pl/LC_MESSAGES/aegisub-32.mo share/locale/pt_BR/LC_MESSAGES/aegisub-32.mo share/locale/pt_PT/LC_MESSAGES/aegisub-32.mo share/locale/ru/LC_MESSAGES/aegisub-32.mo share/locale/sr_RS/LC_MESSAGES/aegisub-32.mo share/locale/sr_RS@latin/LC_MESSAGES/aegisub-32.mo +share/locale/uk_UA/LC_MESSAGES/aegisub-32.mo share/locale/vi/LC_MESSAGES/aegisub-32.mo share/locale/zh_CN/LC_MESSAGES/aegisub-32.mo share/locale/zh_TW/LC_MESSAGES/aegisub-32.mo -@dirrmtry share/locale/sr_RS@latin/LC_MESSAGES -@dirrmtry share/locale/sr_RS@latin -@dirrmtry share/locale/sr_RS/LC_MESSAGES -@dirrmtry share/locale/sr_RS -%%PORTDOCS%%@dirrm %%DOCSDIR%%/automation/v4-docs -%%PORTDOCS%%@dirrm %%DOCSDIR%%/automation -%%PORTDOCS%%@dirrm %%DOCSDIR%% -@dirrm %%DATADIR%%/automation/include/aegisub -@dirrm %%DATADIR%%/automation/include -@dirrm %%DATADIR%%/automation/demos -@dirrm %%DATADIR%%/automation/autoload -@dirrm %%DATADIR%%/automation -@dirrm %%DATADIR%%