Date: Mon, 7 Mar 2016 17:48:08 +0000 (UTC) From: Mathieu Arnold <mat@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r410534 - in head/multimedia/bombono: . files Message-ID: <201603071748.u27Hm8wR008100@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mat Date: Mon Mar 7 17:48:08 2016 New Revision: 410534 URL: https://svnweb.freebsd.org/changeset/ports/410534 Log: Fix build on 10.x+ PR: 206896 Submitted by: tkato432 yahoo com Sponsored by: Absolight Added: head/multimedia/bombono/files/patch-src_mgui_ffviewer.cpp (contents, props changed) - copied, changed from r410533, head/multimedia/bombono/files/patch-src-mgui-ffviewer.cpp head/multimedia/bombono/files/patch-src_mgui_stream__utils.h (contents, props changed) head/multimedia/bombono/files/patch-src_mlib_filesystem.cpp (contents, props changed) - copied, changed from r410533, head/multimedia/bombono/files/patch-src-mlib-filesystem.cpp head/multimedia/bombono/files/patch-src_mlib_stream.h (contents, props changed) - copied, changed from r410533, head/multimedia/bombono/files/patch-stream.h Deleted: head/multimedia/bombono/files/patch-src-mgui-ffviewer.cpp head/multimedia/bombono/files/patch-src-mlib-filesystem.cpp head/multimedia/bombono/files/patch-stream.h Modified: head/multimedia/bombono/Makefile head/multimedia/bombono/files/patch-SConstruct (contents, props changed) Modified: head/multimedia/bombono/Makefile ============================================================================== --- head/multimedia/bombono/Makefile Mon Mar 7 17:48:03 2016 (r410533) +++ head/multimedia/bombono/Makefile Mon Mar 7 17:48:08 2016 (r410534) @@ -3,7 +3,7 @@ PORTNAME= bombono PORTVERSION= 1.2.2 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= multimedia MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-dvd/${PORTVERSION:R} DISTNAME= ${PORTNAME}-dvd-${PORTVERSION} @@ -11,9 +11,11 @@ DISTNAME= ${PORTNAME}-dvd-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= DVD authoring program +LICENSE= GPLv2+ +LICENSE_FILE= ${WRKSRC}/COPYING + BUILD_DEPENDS= gm:${PORTSDIR}/graphics/GraphicsMagick -LIB_DEPENDS= libgtkmm-2.4.so:${PORTSDIR}/x11-toolkits/gtkmm24 \ - libxml++-2.6.so:${PORTSDIR}/textproc/libxml++26 \ +LIB_DEPENDS= libxml++-2.6.so:${PORTSDIR}/textproc/libxml++26 \ liblavfile.so:${PORTSDIR}/multimedia/mjpegtools \ libdvdread.so:${PORTSDIR}/multimedia/libdvdread \ libavcodec.so:${PORTSDIR}/multimedia/ffmpeg \ @@ -23,8 +25,9 @@ RUN_DEPENDS= gm:${PORTSDIR}/graphics/Gra growisofs:${PORTSDIR}/sysutils/dvd+rw-tools \ toolame:${PORTSDIR}/audio/toolame -USES= gettext pkgconfig scons tar:bzip2 -USE_GCC= any +USES= desktop-file-utils gettext pkgconfig scons shared-mime-info \ + tar:bzip2 +USE_GNOME= gtkmm24 INSTALLS_ICONS= yes CXXFLAGS+= -I${LOCALBASE}/include @@ -34,14 +37,16 @@ MAKE_ARGS= DVDREAD_INCLUDE=${LOCALBASE}/ CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}" \ CC="${CC}" CXX="${CXX}" USE_EXT_BOOST=true -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> .if ${OPSYS} == FreeBSD && ${OSVERSION} > 1000023 -BROKEN= does not build on 10.x+ +USES+= compiler:gcc-c++11-lib .endif post-install: - cd ${WRKSRC}/docs/man/man1 && ${INSTALL_MAN} bombono-dvd.1 \ - mpeg2demux.1 ${STAGEDIR}${MANPREFIX}/man/man1 +.for i in bombono-dvd mpeg2demux + ${INSTALL_MAN} ${WRKSRC}/docs/man/man1/${i}.1 ${STAGEDIR}${MANPREFIX}/man/man1 + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${i} +.endfor -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/multimedia/bombono/files/patch-SConstruct ============================================================================== --- head/multimedia/bombono/files/patch-SConstruct Mon Mar 7 17:48:03 2016 (r410533) +++ head/multimedia/bombono/files/patch-SConstruct Mon Mar 7 17:48:08 2016 (r410534) @@ -5,10 +5,19 @@ cxx_warn_flags = [] debug_flags = ['-g', '-O0'] -release_flags = ['-O2'] -+release_flags = [''] ++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']) Copied and modified: head/multimedia/bombono/files/patch-src_mgui_ffviewer.cpp (from r410533, head/multimedia/bombono/files/patch-src-mgui-ffviewer.cpp) ============================================================================== Added: head/multimedia/bombono/files/patch-src_mgui_stream__utils.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/bombono/files/patch-src_mgui_stream__utils.h Mon Mar 7 17:48:08 2016 (r410534) @@ -0,0 +1,13 @@ +--- 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) Copied and modified: head/multimedia/bombono/files/patch-src_mlib_filesystem.cpp (from r410533, head/multimedia/bombono/files/patch-src-mlib-filesystem.cpp) ============================================================================== --- head/multimedia/bombono/files/patch-src-mlib-filesystem.cpp Mon Mar 7 17:48:03 2016 (r410533, copy source) +++ head/multimedia/bombono/files/patch-src_mlib_filesystem.cpp Mon Mar 7 17:48:08 2016 (r410534) @@ -1,6 +1,6 @@ ---- ./src/mlib/filesystem.cpp.orig 2013-03-07 22:20:45.000000000 +0100 -+++ src/mlib/filesystem.cpp 2013-03-08 16:42:27.000000000 +0100 -@@ -105,7 +105,7 @@ +--- src/mlib/filesystem.cpp.orig 2013-03-07 21:20:45 UTC ++++ src/mlib/filesystem.cpp +@@ -105,7 +105,7 @@ std::string get_extension(const fs::path std::string get_basename(const fs::path& pth) { @@ -9,7 +9,7 @@ const char* name = name_s.c_str(); //if( const char* dot = strstr(name, ".") ) -@@ -116,7 +116,7 @@ +@@ -116,7 +116,7 @@ std::string get_basename(const fs::path& std::string get_extension(const fs::path& pth) { Copied and modified: head/multimedia/bombono/files/patch-src_mlib_stream.h (from r410533, head/multimedia/bombono/files/patch-stream.h) ============================================================================== --- head/multimedia/bombono/files/patch-stream.h Mon Mar 7 17:48:03 2016 (r410533, copy source) +++ head/multimedia/bombono/files/patch-src_mlib_stream.h Mon Mar 7 17:48:08 2016 (r410534) @@ -1,6 +1,6 @@ ---- src/mlib/stream.h.orig 2009-08-24 15:11:47.000000000 +0700 -+++ src/mlib/stream.h 2009-08-24 15:12:03.000000000 +0700 -@@ -186,6 +186,7 @@ +--- src/mlib/stream.h.orig 2013-03-07 21:20:45 UTC ++++ src/mlib/stream.h +@@ -186,6 +186,7 @@ class basic_fstream : public basic_iostr // write(fd, "some text", 9); // .. // Причины использования класса io::fd_proxy см. в его описании
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201603071748.u27Hm8wR008100>