Attachment #166516 for bug #206896

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

Lines 3-9 Link Here

(-)multimedia/bombono/Makefile (-20 / +26 lines)
3		3
4	PORTNAME= bombono	4	PORTNAME= bombono
5	PORTVERSION= 1.2.2	5	PORTVERSION= 1.2.2
6	PORTREVISION= 6	6	PORTREVISION= 7
7	CATEGORIES= multimedia	7	CATEGORIES= multimedia
8	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-dvd/${PORTVERSION:R}	8	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-dvd/${PORTVERSION:R}
9	DISTNAME= ${PORTNAME}-dvd-${PORTVERSION}	9	DISTNAME= ${PORTNAME}-dvd-${PORTVERSION}
Lines 11-47 Link Here
11	MAINTAINER= ports@FreeBSD.org	11	MAINTAINER= ports@FreeBSD.org
12	COMMENT= DVD authoring program	12	COMMENT= DVD authoring program
13		13
		14	LICENSE= GPLv2+
		15	LICENSE_FILE= ${WRKSRC}/COPYING
		16
14	BUILD_DEPENDS= gm:${PORTSDIR}/graphics/GraphicsMagick	17	BUILD_DEPENDS= gm:${PORTSDIR}/graphics/GraphicsMagick
15	LIB_DEPENDS= libgtkmm-2.4.so:${PORTSDIR}/x11-toolkits/gtkmm24 \	18	LIB_DEPENDS= libboost_filesystem.so:${PORTSDIR}/devel/boost-libs \
16	libxml++-2.6.so:${PORTSDIR}/textproc/libxml++26 \
17	liblavfile.so:${PORTSDIR}/multimedia/mjpegtools \
18	libdvdread.so:${PORTSDIR}/multimedia/libdvdread \
19	libavcodec.so:${PORTSDIR}/multimedia/ffmpeg \	19	libavcodec.so:${PORTSDIR}/multimedia/ffmpeg \
20	libboost_filesystem.so:${PORTSDIR}/devel/boost-libs	20	libdvdread.so:${PORTSDIR}/multimedia/libdvdread \
21	RUN_DEPENDS= gm:${PORTSDIR}/graphics/GraphicsMagick \	21	liblavfile.so:${PORTSDIR}/multimedia/mjpegtools \
		22	libxml++-2.6.so:${PORTSDIR}/textproc/libxml++26
		23	RUN_DEPENDS= toolame:${PORTSDIR}/audio/toolame \
22	enca:${PORTSDIR}/converters/enca \	24	enca:${PORTSDIR}/converters/enca \
23	growisofs:${PORTSDIR}/sysutils/dvd+rw-tools \	25	gm:${PORTSDIR}/graphics/GraphicsMagick \
24	toolame:${PORTSDIR}/audio/toolame	26	growisofs:${PORTSDIR}/sysutils/dvd+rw-tools
25		27
26	USES= gettext pkgconfig scons tar:bzip2	28	USES= desktop-file-utils gettext pkgconfig scons shared-mime-info \
27	USE_GCC= any	29	tar:bzip2
		30	USE_GNOME= gtkmm24
		31	MAKE_ARGS= DVDREAD_INCLUDE="${LOCALBASE}/include" \
		32	DVDREAD_LIBPATH="${LOCALBASE}/lib" \
		33	CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}" \
		34	CC="${CC}" CXX="${CXX}" USE_EXT_BOOST=true
28	INSTALLS_ICONS= yes	35	INSTALLS_ICONS= yes
29		36
30	CXXFLAGS+= -I${LOCALBASE}/include	37	CXXFLAGS+= -I${LOCALBASE}/include
31	LDFLAGS+= -L${LOCALBASE}/lib -lintl	38	LDFLAGS+= -L${LOCALBASE}/lib -lintl
32	MAKE_ARGS= DVDREAD_INCLUDE=${LOCALBASE}/include \
33	DVDREAD_LIBPATH=${LOCALBASE}/lib \
34	CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}" \
35	CC="${CC}" CXX="${CXX}" USE_EXT_BOOST=true
36		39
37	.include <bsd.port.pre.mk>	40	.include <bsd.port.options.mk>
38		41
39	.if ${OPSYS} == FreeBSD && ${OSVERSION} > 1000023	42	.if ${OPSYS} == FreeBSD && ${OSVERSION} > 1000023
40	BROKEN= does not build on 10.x+	43	USES+= compiler:gcc-c++11-lib
41	.endif	44	.endif
42		45
43	post-install:	46	post-install:
44	cd ${WRKSRC}/docs/man/man1 && ${INSTALL_MAN} bombono-dvd.1 \	47	.for i in bombono-dvd mpeg2demux
45	mpeg2demux.1 ${STAGEDIR}${MANPREFIX}/man/man1	48	(cd ${WRKSRC}/docs/man/man1 && ${INSTALL_MAN} ${i}.1 \
		49	${STAGEDIR}${MANPREFIX}/man/man1)
		50	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${i}
		51	.endfor
46		52
47	.include <bsd.port.post.mk>	53	.include <bsd.port.mk>




 cxx_warn_flags    = []
 debug_flags   = ['-g', '-O0']
-release_flags = ['-O2']
+release_flags = []
 defines       = []
 
 def CalcCommonFlags():
@@ -69,7 +69,7 @@ def CalcCommonFlags():
     global common_warn_flags, cxx_warn_flags, debug_flags, defines
     if BV.IsGccCompiler():
         # GCC
-        common_warn_flags = ['-ansi']
+        common_warn_flags = []
         # -Wno-reorder - not to warn if not accurate order in ctor (let compiler do!)
         # :TODO: why 
         #   CXXCOM = $CXX -o $TARGET -c $CXXFLAGS $CCFLAGS ...
@@ -148,18 +148,6 @@ def AdjustConfigOptions(env):
     #env.Replace (PATH = user_options_dict['PATH'])
     #env.Replace (AR = user_options_dict['AR'])




--- src/mgui/stream_utils.h.orig	2013-03-07 21:20:45 UTC
+++ src/mgui/stream_utils.h
@@ -42,8 +42,8 @@ class stream
                 stream(std::iostream& strm): io_strm(strm) {}
 
  std::iostream& strm() { return io_strm; }
-                operator void*() const { return (void*)io_strm; }
-          bool  operator!() const { return !operator void*(); }
+                operator bool() const { return static_cast<bool> (io_strm); }
+          bool  operator!() const { return !operator bool(); }
         stream& seekg(streamoff off, ios_base::seekdir dir)
                 { io_strm.seekg(off, dir); return *this; }
         stream& seekp(streamoff off, ios_base::seekdir dir)

Lines 1-6 Link Here

(-)multimedia/bombono/files/patch-src-mlib-filesystem.cpp (-4 / +4 lines)
1	--- ./src/mlib/filesystem.cpp.orig 2013-03-07 22:20:45.000000000 +0100	1	--- src/mlib/filesystem.cpp.orig 2013-03-07 21:20:45 UTC
2	+++ src/mlib/filesystem.cpp 2013-03-08 16:42:27.000000000 +0100	2	+++ src/mlib/filesystem.cpp
3	@@ -105,7 +105,7 @@	3	@@ -105,7 +105,7 @@ std::string get_extension(const fs::path
4		4
5	std::string get_basename(const fs::path& pth)	5	std::string get_basename(const fs::path& pth)
6	{	6	{
Lines 9-15 Link Here
9	const char* name = name_s.c_str();	9	const char* name = name_s.c_str();
10		10
11	//if( const char* dot = strstr(name, ".") )	11	//if( const char* dot = strstr(name, ".") )
12	@@ -116,7 +116,7 @@	12	@@ -116,7 +116,7 @@ std::string get_basename(const fs::path&
13		13
14	std::string get_extension(const fs::path& pth)	14	std::string get_extension(const fs::path& pth)
15	{	15	{

Lines 1-6 Link Here

(-)multimedia/bombono/files/patch-stream.h (-3 / +3 lines)
1	--- src/mlib/stream.h.orig 2009-08-24 15:11:47.000000000 +0700	1	--- src/mlib/stream.h.orig 2013-03-07 21:20:45 UTC
2	+++ src/mlib/stream.h 2009-08-24 15:12:03.000000000 +0700	2	+++ src/mlib/stream.h
3	@@ -186,6 +186,7 @@	3	@@ -186,6 +186,7 @@ class basic_fstream : public basic_iostr
4	// write(fd, "some text", 9);	4	// write(fd, "some text", 9);
5	// ..	5	// ..
6	// Причины использования класса io::fd_proxy см. в его описании	6	// Причины использования класса io::fd_proxy см. в его описании

Return to bug 206896

Lines 5-14 Link Here

(-)multimedia/bombono/files/patch-SConstruct (-1 / +10 lines)
5	cxx_warn_flags = []	5	cxx_warn_flags = []
6	debug_flags = ['-g', '-O0']	6	debug_flags = ['-g', '-O0']
7	-release_flags = ['-O2']	7	-release_flags = ['-O2']
8	+release_flags = ['']	8	+release_flags = []
9	defines = []	9	defines = []
10		10
11	def CalcCommonFlags():	11	def CalcCommonFlags():
		12	@@ -69,7 +69,7 @@ def CalcCommonFlags():
		13	global common_warn_flags, cxx_warn_flags, debug_flags, defines
		14	if BV.IsGccCompiler():
		15	# GCC
		16	- common_warn_flags = ['-ansi']
		17	+ common_warn_flags = []
		18	# -Wno-reorder - not to warn if not accurate order in ctor (let compiler do!)
		19	# :TODO: why
		20	# CXXCOM = $CXX -o $TARGET -c $CXXFLAGS $CCFLAGS ...
12	@@ -148,18 +148,6 @@ def AdjustConfigOptions(env):	21	@@ -148,18 +148,6 @@ def AdjustConfigOptions(env):
13	#env.Replace (PATH = user_options_dict['PATH'])	22	#env.Replace (PATH = user_options_dict['PATH'])
14	#env.Replace (AR = user_options_dict['AR'])	23	#env.Replace (AR = user_options_dict['AR'])

Line 0 Link Here

(-)multimedia/bombono/files/patch-src-mgui-stream_utils.h (+13 lines)
	1	--- src/mgui/stream_utils.h.orig 2013-03-07 21:20:45 UTC
	2	+++ src/mgui/stream_utils.h
	3	@@ -42,8 +42,8 @@ class stream
	4	stream(std::iostream& strm): io_strm(strm) {}
	5
	6	std::iostream& strm() { return io_strm; }
	7	- operator void() const { return (void)io_strm; }
	8	- bool operator!() const { return !operator void*(); }
	9	+ operator bool() const { return static_cast<bool> (io_strm); }
	10	+ bool operator!() const { return !operator bool(); }
	11	stream& seekg(streamoff off, ios_base::seekdir dir)
	12	{ io_strm.seekg(off, dir); return *this; }
	13	stream& seekp(streamoff off, ios_base::seekdir dir)