svn commit: r371505 - in head/multimedia/aegisub: . files
Thomas Zander
riggs at FreeBSD.org
Sun Oct 26 15:29:31 UTC 2014
Author: riggs
Date: Sun Oct 26 15:29:28 2014
New Revision: 371505
URL: https://svnweb.freebsd.org/changeset/ports/371505
QAT: https://qat.redports.org/buildarchive/r371505/
Log:
- Update to upstream version 3.2.1
PR: 194169
Submitted by: tkato432 at yahoo.com
Added:
head/multimedia/aegisub/files/patch-automation__Makefile (contents, props changed)
head/multimedia/aegisub/files/patch-src__Makefile (contents, props changed)
head/multimedia/aegisub/files/patch-src__fft.cpp (contents, props changed)
head/multimedia/aegisub/files/patch-tools__Makefile (contents, props changed)
Modified:
head/multimedia/aegisub/Makefile
head/multimedia/aegisub/distinfo
head/multimedia/aegisub/files/patch-src__subtitle_format_ass.cpp (contents, props changed)
head/multimedia/aegisub/pkg-plist
Modified: head/multimedia/aegisub/Makefile
==============================================================================
--- head/multimedia/aegisub/Makefile Sun Oct 26 14:43:54 2014 (r371504)
+++ head/multimedia/aegisub/Makefile Sun Oct 26 15:29:28 2014 (r371505)
@@ -2,8 +2,7 @@
# $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 \
@@ -25,7 +24,7 @@ USE_GITHUB= yes
GH_ACCOUNT= FFMS
GH_PROJECT= ffms2
GH_TAGNAME= ${FFMS_VERSION}
-GH_COMMIT= 6b0e4a2
+GH_COMMIT= f673b48
WRKSRC= ${WRKDIR}/${DISTNAME}
@@ -38,7 +37,8 @@ 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 \
@@ -50,7 +50,7 @@ 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
@@ -81,7 +81,7 @@ 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}
Modified: head/multimedia/aegisub/distinfo
==============================================================================
--- head/multimedia/aegisub/distinfo Sun Oct 26 14:43:54 2014 (r371504)
+++ head/multimedia/aegisub/distinfo Sun Oct 26 15:29:28 2014 (r371505)
@@ -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
Added: head/multimedia/aegisub/files/patch-automation__Makefile
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/multimedia/aegisub/files/patch-automation__Makefile Sun Oct 26 15:29:28 2014 (r371505)
@@ -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
+
Added: head/multimedia/aegisub/files/patch-src__Makefile
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/multimedia/aegisub/files/patch-src__Makefile Sun Oct 26 15:29:28 2014 (r371505)
@@ -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)
+
Added: head/multimedia/aegisub/files/patch-src__fft.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/multimedia/aegisub/files/patch-src__fft.cpp Sun Oct 26 15:29:28 2014 (r371505)
@@ -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;
Modified: head/multimedia/aegisub/files/patch-src__subtitle_format_ass.cpp
==============================================================================
--- head/multimedia/aegisub/files/patch-src__subtitle_format_ass.cpp Sun Oct 26 14:43:54 2014 (r371504)
+++ head/multimedia/aegisub/files/patch-src__subtitle_format_ass.cpp Sun Oct 26 15:29:28 2014 (r371505)
@@ -22,13 +22,13 @@
+ file.WriteLineToFile(key + TO_STRING(n));
}
- void WriteExtradata(AegisubExtradataMap const& extradata) {
+ void WriteExtradata(std::vector<ExtradataEntry> 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 += ",";
Added: head/multimedia/aegisub/files/patch-tools__Makefile
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/multimedia/aegisub/files/patch-tools__Makefile Sun Oct 26 15:29:28 2014 (r371505)
@@ -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
+
Modified: head/multimedia/aegisub/pkg-plist
==============================================================================
--- head/multimedia/aegisub/pkg-plist Sun Oct 26 14:43:54 2014 (r371504)
+++ head/multimedia/aegisub/pkg-plist Sun Oct 26 15:29:28 2014 (r371505)
@@ -63,19 +63,7 @@ share/locale/pt_PT/LC_MESSAGES/aegisub-3
share/locale/ru/LC_MESSAGES/aegisub-32.mo
share/locale/sr_RS/LC_MESSAGES/aegisub-32.mo
share/locale/sr_RS at 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
- at dirrmtry share/locale/sr_RS at latin/LC_MESSAGES
- at dirrmtry share/locale/sr_RS at latin
- at dirrmtry share/locale/sr_RS/LC_MESSAGES
- at dirrmtry share/locale/sr_RS
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/automation/v4-docs
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/automation
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
- at dirrm %%DATADIR%%/automation/include/aegisub
- at dirrm %%DATADIR%%/automation/include
- at dirrm %%DATADIR%%/automation/demos
- at dirrm %%DATADIR%%/automation/autoload
- at dirrm %%DATADIR%%/automation
- at dirrm %%DATADIR%%
More information about the svn-ports-head
mailing list