svn commit: r426061 - in head/multimedia/aegisub: . files

Sun Nov 13 18:49:43 UTC 2016

Author: jbeich
Date: Sun Nov 13 18:49:41 2016
New Revision: 426061
URL: https://svnweb.freebsd.org/changeset/ports/426061

Log:
  multimedia/aegisub: simplify + unbreak boost 1.62 on 9.x
  
  In file included from libaegisub/ass/time.cpp:20:0:
  libaegisub/include/libaegisub/format.h: In static member function 'static Out agi::format_detail::runtime_cast_helper<In, Out, <anonymous> >::cast(const In&)':
  libaegisub/include/libaegisub/format.h:31:37: error: 'bad_cast' is not a member of 'std'
    static Out cast(In const&) { throw std::bad_cast(); }
                                       ^
  In file included from libaegisub/lua/script_reader.cpp:19:0:
  libaegisub/include/libaegisub/file_mapping.h:37:3: error: 'unique_ptr' in namespace 'std' does not name a type
     std::unique_ptr<boost::interprocess::mapped_region> region;
     ^
  libaegisub/include/libaegisub/file_mapping.h:54:3: error: 'unique_ptr' in namespace 'std' does not name a type
     std::unique_ptr<boost::interprocess::mapped_region> read_region;
     ^
  libaegisub/include/libaegisub/file_mapping.h:56:3: error: 'unique_ptr' in namespace 'std' does not name a type
     std::unique_ptr<boost::interprocess::mapped_region> write_region;
     ^
  
  PR:		199601

Added:
  head/multimedia/aegisub/files/patch-libaegisub_common_cajun_reader.cpp   (contents, props changed)
  head/multimedia/aegisub/files/patch-libaegisub_include_libaegisub_file__mapping.h   (contents, props changed)
  head/multimedia/aegisub/files/patch-libaegisub_include_libaegisub_format.h   (contents, props changed)
Deleted:
  head/multimedia/aegisub/files/patch-libaegisub__common__cajun__reader.cpp
  head/multimedia/aegisub/files/patch-libaegisub__common__color.cpp
  head/multimedia/aegisub/files/patch-src__ass_file.cpp
  head/multimedia/aegisub/files/patch-src__ass_override.cpp
  head/multimedia/aegisub/files/patch-src__auto4_lua_dialog.cpp
  head/multimedia/aegisub/files/patch-src__command__edit.cpp
  head/multimedia/aegisub/files/patch-src__command__recent.cpp
  head/multimedia/aegisub/files/patch-src__command__video.cpp
  head/multimedia/aegisub/files/patch-src__dialog_jumpto.cpp
  head/multimedia/aegisub/files/patch-src__dialog_kara_timing_copy.cpp
  head/multimedia/aegisub/files/patch-src__dialog_properties.cpp
  head/multimedia/aegisub/files/patch-src__dialog_shift_times.cpp
  head/multimedia/aegisub/files/patch-src__dialog_style_editor.cpp
  head/multimedia/aegisub/files/patch-src__dialog_video_properties.cpp
  head/multimedia/aegisub/files/patch-src__ffmpegsource_common.cpp
  head/multimedia/aegisub/files/patch-src__ffmpegsource_common.h
  head/multimedia/aegisub/files/patch-src__grid_column.cpp
  head/multimedia/aegisub/files/patch-src__preferences_base.cpp
  head/multimedia/aegisub/files/patch-src__resolution_resampler.cpp
  head/multimedia/aegisub/files/patch-src__subs_edit_box.cpp
  head/multimedia/aegisub/files/patch-src__subs_preview.cpp
  head/multimedia/aegisub/files/patch-src__subtitle_format_ass.cpp
  head/multimedia/aegisub/files/patch-src__subtitle_format_srt.cpp
  head/multimedia/aegisub/files/patch-src__timeedit_ctrl.cpp
  head/multimedia/aegisub/files/patch-src__validators.cpp
  head/multimedia/aegisub/files/patch-src__video_out_gl.h
  head/multimedia/aegisub/files/patch-src__video_provider_ffmpegsource.cpp
  head/multimedia/aegisub/files/patch-src__visual_tool_rotatexy.cpp
  head/multimedia/aegisub/files/patch-src__visual_tool_scale.cpp
  head/multimedia/aegisub/files/patch-src__visual_tool_vector_clip.cpp
Modified:
  head/multimedia/aegisub/Makefile   (contents, props changed)

Modified: head/multimedia/aegisub/Makefile
==============================================================================

--- head/multimedia/aegisub/Makefile	Sun Nov 13 17:36:35 2016	(r426060)
+++ head/multimedia/aegisub/Makefile	Sun Nov 13 18:49:41 2016	(r426061)
@@ -3,7 +3,7 @@
 
 PORTNAME=	aegisub
 PORTVERSION=	3.2.2
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	multimedia
 MASTER_SITES=	http://ftp.aegisub.org/pub/archives/releases/source/ \
 		ftp://ftp.aegisub.org/pub/archives/releases/source/ \
@@ -25,8 +25,11 @@ USES=		compiler:c++11-lib desktop-file-u
 USE_GNOME=	intltool
 USE_WX=		3.0
 WX_CONF_ARGS=	absolute
-USE_GL=		glu
+USE_GL=		gl
 USE_CSTD=	c99
+USE_CXXSTD=	c++11
+CXXFLAGS+=	-D_GLIBCXX_USE_C99 # XXX ports/193528
+LDFLAGS+=	-Wl,--as-needed # freetype
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	ICONV_LIBS="${ICONV_LIB}" PTHREAD_LIBS="-pthread" \
 		agi_cv_with_iconv=yes
@@ -61,25 +64,10 @@ PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audi
 PULSEAUDIO_CONFIGURE_OFF=\
 			--without-libpulse
 
-.include <bsd.port.pre.mk>
-
-.if ${COMPILER_TYPE} == "gcc"
-USE_CXXSTD=	gnu++11
+# src/audio_display.o: undefined reference to symbol '__atomic_load_8@@LIBATOMIC_1.0'
 .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:devel/libc++ \
-		${LOCALBASE}/bin/clang34:lang/clang34
-CPP=		clang-cpp34
-CC=		clang34
-CXX=		clang++34
-CXXFLAGS+=	-nostdinc++ -isystem ${LOCALBASE}/include/c++/v1
-LDFLAGS+=	-L${LOCALBASE}lib/c++
-.endif
+CFLAGS+=		${CFLAGS_${ARCH}_${CHOSEN_COMPILER_TYPE}}
+CFLAGS_i386_gcc=	-march=pentium
 .endif
 
 post-patch:
@@ -91,14 +79,10 @@ post-patch:
 		'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
 
 post-install:
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} \
 		automation/v4-docs ${STAGEDIR}${DOCSDIR})
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/aegisub-*
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Added: head/multimedia/aegisub/files/patch-libaegisub_common_cajun_reader.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/multimedia/aegisub/files/patch-libaegisub_common_cajun_reader.cpp	Sun Nov 13 18:49:41 2016	(r426061)
@@ -0,0 +1,10 @@
+--- libaegisub/common/cajun/reader.cpp.orig	2014-12-08 00:07:09 UTC
++++ libaegisub/common/cajun/reader.cpp
+@@ -9,6 +9,7 @@ Author: Terry Caton
+ #include "libaegisub/cajun/reader.h"
+ 
+ #include <boost/interprocess/streams/bufferstream.hpp>
++#include <algorithm> // std::find
+ #include <cassert>
+ 
+ /*

Added: head/multimedia/aegisub/files/patch-libaegisub_include_libaegisub_file__mapping.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/multimedia/aegisub/files/patch-libaegisub_include_libaegisub_file__mapping.h	Sun Nov 13 18:49:41 2016	(r426061)
@@ -0,0 +1,10 @@
+--- libaegisub/include/libaegisub/file_mapping.h.orig	2014-12-08 00:07:09 UTC
++++ libaegisub/include/libaegisub/file_mapping.h
+@@ -18,6 +18,7 @@
+ 
+ #include <boost/interprocess/detail/os_file_functions.hpp>
+ #include <cstdint>
++#include <memory> // std::unique_ptr
+ 
+ namespace agi {
+ 	// boost::interprocess::file_mapping is awesome and uses CreateFileA on Windows

Added: head/multimedia/aegisub/files/patch-libaegisub_include_libaegisub_format.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/multimedia/aegisub/files/patch-libaegisub_include_libaegisub_format.h	Sun Nov 13 18:49:41 2016	(r426061)
@@ -0,0 +1,10 @@
+--- libaegisub/include/libaegisub/format.h.orig	2014-12-08 00:07:09 UTC
++++ libaegisub/include/libaegisub/format.h
+@@ -19,6 +19,7 @@
+ #include <boost/interprocess/streams/vectorstream.hpp>
+ #include <boost/io/ios_state.hpp>
+ #include <type_traits>
++#include <typeinfo> // std::bad_cast
+ 
+ class wxString;
+ 
