Attachment #148009 for bug #194169

View | Details | Raw Unified | Return to bug 194169
Collapse All | Expand All




# $FreeBSD: head/multimedia/aegisub/Makefile 367888 2014-09-10 20:50:31Z gerald $

PORTNAME=	aegisub
PORTVERSION=	3.2.1
PORTREVISION=	2
CATEGORIES=	multimedia
MASTER_SITES=	http://ftp.aegisub.org/pub/archives/releases/source/:aegisub \
		ftp://ftp.aegisub.org/pub/archives/releases/source/:aegisub \

GH_ACCOUNT=	FFMS
GH_PROJECT=	ffms2
GH_TAGNAME=	${FFMS_VERSION}
GH_COMMIT=	f673b48

WRKSRC=		${WRKDIR}/${DISTNAME}


USE_GL=		glu
USE_CSTD=	c99
GNU_CONFIGURE=	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 \

PLIST_SUB=	VERSION="${PORTVERSION:R}"

CPPFLAGS+=	-I${LOCALBASE}/include
LDFLAGS+=	-L${LOCALBASE}/lib

OPTIONS_DEFINE=		ALSA DOCS FFMPEG FFTW HUNSPELL OPENAL PORTAUDIO \
			PULSEAUDIO

			--without-libpulse

FFMS_NAME=	ffms2
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}

Lines 1-4 Link Here

(-)multimedia/aegisub/distinfo (-4 / +4 lines)
1	SHA256 (aegisub-3.2.0.tar.xz) = d9e5fd48b243e29832361a13f8be82b271ef0c606b13593ec72461156ee19159	1	SHA256 (aegisub-3.2.1.tar.xz) = 961a28f2528a3c6330f06d0f2aef5fa71d93ca2ae1e6dcfabe347befbb6df8dc
2	SIZE (aegisub-3.2.0.tar.xz) = 5181228	2	SIZE (aegisub-3.2.1.tar.xz) = 5200564
3	SHA256 (ffms2-2.19.1.tar.gz) = 8516af3f71531746e7e3e4b16eb30dade5df5edfc0782e7b69f965310ea66640	3	SHA256 (ffms2-2.20.tar.gz) = 25060b39c36449fe8ca9b3a2e87ee52f89fd697161feab0246d2c0baecf03fad
4	SIZE (ffms2-2.19.1.tar.gz) = 512444	4	SIZE (ffms2-2.20.tar.gz) = 539697




--- 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
 




--- 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)
 

Line 0 Link Here

(-)multimedia/aegisub/files/patch-src__fft.cpp (+11 lines)
	1	--- src/fft.cpp.orig
	2	+++ src/fft.cpp
	3	@@ -43,7 +43,7 @@
	4
	5	void FFT::DoTransform (size_t n_samples,float input,float output_r,float *output_i,bool inverse) {
	6	if (!IsPowerOfTwo(n_samples))
	7	- agi::InternalError(throw "FFT requires power of two input.");
	8	+ throw agi::InternalError("FFT requires power of two input.");
	9
	10	// Inverse transform
	11	float angle_num = 2.0f * 3.1415926535897932384626433832795f;




+			file.WriteLineToFile(key + TO_STRING(n));
 	}
 
 	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.id);
+			line += TO_STRING(edi.id);
 			line += ",";
 			line += inline_string_encode(edi.key);
 			line += ",";




--- 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
 




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%%

Return to bug 194169

Lines 2-9 Link Here

(-)multimedia/aegisub/Makefile (-6 / +6 lines)
2	# $FreeBSD: head/multimedia/aegisub/Makefile 367888 2014-09-10 20:50:31Z gerald $	2	# $FreeBSD: head/multimedia/aegisub/Makefile 367888 2014-09-10 20:50:31Z gerald $
3		3
4	PORTNAME= aegisub	4	PORTNAME= aegisub
5	PORTVERSION= 3.2.0	5	PORTVERSION= 3.2.1
6	PORTREVISION= 2
7	CATEGORIES= multimedia	6	CATEGORIES= multimedia
8	MASTER_SITES= http://ftp.aegisub.org/pub/archives/releases/source/:aegisub \	7	MASTER_SITES= http://ftp.aegisub.org/pub/archives/releases/source/:aegisub \
9	ftp://ftp.aegisub.org/pub/archives/releases/source/:aegisub \	8	ftp://ftp.aegisub.org/pub/archives/releases/source/:aegisub \
Lines 25-31 Link Here
25	GH_ACCOUNT= FFMS	24	GH_ACCOUNT= FFMS
26	GH_PROJECT= ffms2	25	GH_PROJECT= ffms2
27	GH_TAGNAME= ${FFMS_VERSION}	26	GH_TAGNAME= ${FFMS_VERSION}
28	GH_COMMIT= 6b0e4a2	27	GH_COMMIT= f673b48
29		28
30	WRKSRC= ${WRKDIR}/${DISTNAME}	29	WRKSRC= ${WRKDIR}/${DISTNAME}
31		30
Lines 38-44 Link Here
38	USE_GL= glu	37	USE_GL= glu
39	USE_CSTD= c99	38	USE_CSTD= c99
40	GNU_CONFIGURE= yes	39	GNU_CONFIGURE= yes
41	CONFIGURE_ENV= agi_cv_with_iconv=yes	40	CONFIGURE_ENV= ICONV_LIBS="${ICONV_LIB}" PTHREAD_LIBS="-pthread" \
		41	agi_cv_with_iconv=yes
42	CONFIGURE_ARGS= --disable-compiler-flags \	42	CONFIGURE_ARGS= --disable-compiler-flags \
43	--disable-gcc-prec \	43	--disable-gcc-prec \
44	--disable-sanity-checks \	44	--disable-sanity-checks \
Lines 50-56 Link Here
50	PLIST_SUB= VERSION="${PORTVERSION:R}"	50	PLIST_SUB= VERSION="${PORTVERSION:R}"
51		51
52	CPPFLAGS+= -I${LOCALBASE}/include	52	CPPFLAGS+= -I${LOCALBASE}/include
53	LIBS+= -L${LOCALBASE}/lib ${ICONV_LIB} -pthread	53	LDFLAGS+= -L${LOCALBASE}/lib
54		54
55	OPTIONS_DEFINE= ALSA DOCS FFMPEG FFTW HUNSPELL OPENAL PORTAUDIO \	55	OPTIONS_DEFINE= ALSA DOCS FFMPEG FFTW HUNSPELL OPENAL PORTAUDIO \
56	PULSEAUDIO	56	PULSEAUDIO
Lines 81-87 Link Here
81	--without-libpulse	81	--without-libpulse
82		82
83	FFMS_NAME= ffms2	83	FFMS_NAME= ffms2
84	FFMS_VERSION= 2.19.1	84	FFMS_VERSION= 2.20
85	FFMS_DISTNAME= ${FFMS_NAME}-${FFMS_VERSION}	85	FFMS_DISTNAME= ${FFMS_NAME}-${FFMS_VERSION}
86	FFMS_DISTFILE= ${FFMS_DISTNAME}.tar.gz	86	FFMS_DISTFILE= ${FFMS_DISTNAME}.tar.gz
87	FFMS_WRKSRC= ${WRKDIR}/${GH_ACCOUNT}-${GH_PROJECT}-${GH_COMMIT}	87	FFMS_WRKSRC= ${WRKDIR}/${GH_ACCOUNT}-${GH_PROJECT}-${GH_COMMIT}

Line 0 Link Here

(-)multimedia/aegisub/files/patch-automation__Makefile (+13 lines)
	1	--- automation/Makefile.orig
	2	+++ automation/Makefile
	3	@@ -13,8 +13,8 @@
	4	$(MKDIR_INSTALL)
	5
	6	aegisub-lua_OBJ := $(d)tests/aegisub.o $(TOP)lib/libaegisub.a $(TOP)lib/libluabins.a $(LIBS_LUA)
	7	-aegisub-lua_CPPFLAGS := $(CPPFLAGS_BOOST) $(CFLAGS_LUA) -I$(TOP)libaegisub/include -I$(TOP)src $(CXXFLAGS_WX)
	8	-aegisub-lua_LIBS := $(LIBS_WX) $(LIBS_BOOST) $(LIBS_ICU)
	9	+aegisub-lua_CPPFLAGS := $(CPPFLAGS_BOOST) $(CFLAGS_LUA) -I$(TOP)libaegisub/include -I$(TOP)src $(CXXFLAGS_WX) $(CFLAGS_ICONV) $(CFLAGS_PTHREAD)
	10	+aegisub-lua_LIBS := $(LIBS_WX) $(LIBS_BOOST) $(LIBS_ICU) $(LIBS_ICONV) $(LIBS_PTHREAD)
	11
	12	PROGRAM += $(d)aegisub-lua
	13

Line 0 Link Here

(-)multimedia/aegisub/files/patch-src__Makefile (+15 lines)
	1	--- src/Makefile.orig
	2	+++ src/Makefile
	3	@@ -3,10 +3,10 @@
	4	PROGRAM += $(d)src
	5
	6	src_CPPFLAGS := -I$(d) -I.. -I$(d)include -I$(TOP)libaegisub/include -I$(TOP)build \
	7	- $(CFLAGS_PTHREAD) $(CFLAGS_FFTW3) $(CFLAGS_ICU)
	8	+ $(CFLAGS_PTHREAD) $(CFLAGS_FFTW3) $(CFLAGS_ICU) $(CFLAGS_ICONV)
	9	src_CXXFLAGS := $(CXXFLAGS_WX)
	10	src_LIBS := $(LIBS_GL) $(LIBS_PTHREAD) $(LIBS_WX) $(LIBS_FREETYPE) \
	11	- $(LIBS_LIBASS) $(LIBS_FONTCONFIG) $(LIBS_FFTW3) $(LIBS_BOOST) $(LIBS_ICU)
	12	+ $(LIBS_LIBASS) $(LIBS_FONTCONFIG) $(LIBS_FFTW3) $(LIBS_BOOST) $(LIBS_ICU) $(LIBS_ICONV)
	13	src_PCH := $(d)agi_pre.h
	14	src_INSTALLNAME := $(AEGISUB_COMMAND)
	15

Lines 22-34 Link Here

(-)multimedia/aegisub/files/patch-src__subtitle_format_ass.cpp (-4 / +4 lines)
22	+ file.WriteLineToFile(key + TO_STRING(n));	22	+ file.WriteLineToFile(key + TO_STRING(n));
23	}	23	}
24		24
25	void WriteExtradata(AegisubExtradataMap const& extradata) {	25	void WriteExtradata(std::vector<ExtradataEntry> const& extradata) {
26	@@ -131,7 +138,7 @@	26	@@ -131,7 +138,7 @@
27	file.WriteLineToFile("[Aegisub Extradata]");	27	file.WriteLineToFile("[Aegisub Extradata]");
28	for (auto const& edi : extradata) {	28	for (auto const& edi : extradata) {
29	std::string line = "Data: ";	29	std::string line = "Data: ";
30	- line += std::to_string(edi.first);	30	- line += std::to_string(edi.id);
31	+ line += TO_STRING(edi.first);	31	+ line += TO_STRING(edi.id);
32	line += ",";	32	line += ",";
33	line += inline_string_encode(edi.second.first);	33	line += inline_string_encode(edi.key);
34	line += ",";	34	line += ",";

Line 0 Link Here

(-)multimedia/aegisub/files/patch-tools__Makefile (+13 lines)
	1	--- tools/Makefile.orig
	2	+++ tools/Makefile
	3	@@ -7,8 +7,8 @@
	4	endif
	5
	6	repack-thes-dict_OBJ := $(d)repack-thes-dict.o $(TOP)lib/libaegisub.a
	7	-repack-thes-dict_LIBS := $(LIBS_BOOST) $(LIBS_ICU)
	8	-repack-thes-dict_CPPFLAGS := -I$(TOP) -I$(TOP)libaegisub/include $(CFLAGS_ICU)
	9	+repack-thes-dict_LIBS := $(LIBS_BOOST) $(LIBS_ICU) $(LIBS_PTHREAD) $(LIBS_ICONV)
	10	+repack-thes-dict_CPPFLAGS := -I$(TOP) -I$(TOP)libaegisub/include $(CFLAGS_ICU) $(CFLAGS_ICONV) $(CFLAGS_PTHREAD)
	11
	12	PROGRAM += $(d)repack-thes-dict
	13

Lines 63-81 Link Here

(-)multimedia/aegisub/pkg-plist (-13 / +1 lines)
63	share/locale/ru/LC_MESSAGES/aegisub-32.mo	63	share/locale/ru/LC_MESSAGES/aegisub-32.mo
64	share/locale/sr_RS/LC_MESSAGES/aegisub-32.mo	64	share/locale/sr_RS/LC_MESSAGES/aegisub-32.mo
65	share/locale/sr_RS@latin/LC_MESSAGES/aegisub-32.mo	65	share/locale/sr_RS@latin/LC_MESSAGES/aegisub-32.mo
		66	share/locale/uk_UA/LC_MESSAGES/aegisub-32.mo
66	share/locale/vi/LC_MESSAGES/aegisub-32.mo	67	share/locale/vi/LC_MESSAGES/aegisub-32.mo
67	share/locale/zh_CN/LC_MESSAGES/aegisub-32.mo	68	share/locale/zh_CN/LC_MESSAGES/aegisub-32.mo
68	share/locale/zh_TW/LC_MESSAGES/aegisub-32.mo	69	share/locale/zh_TW/LC_MESSAGES/aegisub-32.mo
69	@dirrmtry share/locale/sr_RS@latin/LC_MESSAGES
70	@dirrmtry share/locale/sr_RS@latin
71	@dirrmtry share/locale/sr_RS/LC_MESSAGES
72	@dirrmtry share/locale/sr_RS
73	%%PORTDOCS%%@dirrm %%DOCSDIR%%/automation/v4-docs
74	%%PORTDOCS%%@dirrm %%DOCSDIR%%/automation
75	%%PORTDOCS%%@dirrm %%DOCSDIR%%
76	@dirrm %%DATADIR%%/automation/include/aegisub
77	@dirrm %%DATADIR%%/automation/include
78	@dirrm %%DATADIR%%/automation/demos
79	@dirrm %%DATADIR%%/automation/autoload
80	@dirrm %%DATADIR%%/automation
81	@dirrm %%DATADIR%%