Attachment 166516 Details for Bug 206896 – multimedia_bombono.diff

[patch] multimedia_bombono.diff

multimedia_bombono.diff (text/plain), 6.37 KB, created by tkato432 on 2016-02-03 18:33:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2016-02-03 18:33:35 UTC

Size: 6.37 KB

patch

obsolete

>diff -urN /usr/ports/multimedia/bombono/Makefile multimedia/bombono/Makefile
>--- /usr/ports/multimedia/bombono/Makefile	2015-12-08 03:17:16.728408000 +0900
>+++ multimedia/bombono/Makefile	2016-02-04 00:00:00.000000000 +0900
>@@ -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,37 +11,43 @@
> 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 \
>-		liblavfile.so:${PORTSDIR}/multimedia/mjpegtools \
>-		libdvdread.so:${PORTSDIR}/multimedia/libdvdread \
>+LIB_DEPENDS=	libboost_filesystem.so:${PORTSDIR}/devel/boost-libs \
> 		libavcodec.so:${PORTSDIR}/multimedia/ffmpeg \
>-		libboost_filesystem.so:${PORTSDIR}/devel/boost-libs
>-RUN_DEPENDS=	gm:${PORTSDIR}/graphics/GraphicsMagick \
>+		libdvdread.so:${PORTSDIR}/multimedia/libdvdread \
>+		liblavfile.so:${PORTSDIR}/multimedia/mjpegtools \
>+		libxml++-2.6.so:${PORTSDIR}/textproc/libxml++26
>+RUN_DEPENDS=	toolame:${PORTSDIR}/audio/toolame \
> 		enca:${PORTSDIR}/converters/enca \
>-		growisofs:${PORTSDIR}/sysutils/dvd+rw-tools \
>-		toolame:${PORTSDIR}/audio/toolame
>+		gm:${PORTSDIR}/graphics/GraphicsMagick \
>+		growisofs:${PORTSDIR}/sysutils/dvd+rw-tools
> 
>-USES=		gettext pkgconfig scons tar:bzip2
>-USE_GCC=	any
>+USES=		desktop-file-utils gettext pkgconfig scons shared-mime-info \
>+		tar:bzip2
>+USE_GNOME=	gtkmm24
>+MAKE_ARGS=	DVDREAD_INCLUDE="${LOCALBASE}/include" \
>+		DVDREAD_LIBPATH="${LOCALBASE}/lib" \
>+		CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}" \
>+		CC="${CC}" CXX="${CXX}" USE_EXT_BOOST=true
> INSTALLS_ICONS=	yes
> 
> CXXFLAGS+=	-I${LOCALBASE}/include
> LDFLAGS+=	-L${LOCALBASE}/lib -lintl
>-MAKE_ARGS=	DVDREAD_INCLUDE=${LOCALBASE}/include \
>-		DVDREAD_LIBPATH=${LOCALBASE}/lib \
>-		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
>+	(cd ${WRKSRC}/docs/man/man1 && ${INSTALL_MAN} ${i}.1 \
>+		${STAGEDIR}${MANPREFIX}/man/man1)
>+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${i}
>+.endfor
> 
>-.include <bsd.port.post.mk>
>+.include <bsd.port.mk>
>diff -urN /usr/ports/multimedia/bombono/files/patch-SConstruct multimedia/bombono/files/patch-SConstruct
>--- /usr/ports/multimedia/bombono/files/patch-SConstruct	2015-12-08 03:17:16.745873000 +0900
>+++ multimedia/bombono/files/patch-SConstruct	2016-02-04 00:00:00.000000000 +0900
>@@ -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'])
>diff -urN /usr/ports/multimedia/bombono/files/patch-src-mgui-stream_utils.h multimedia/bombono/files/patch-src-mgui-stream_utils.h
>--- /usr/ports/multimedia/bombono/files/patch-src-mgui-stream_utils.h	1970-01-01 09:00:00.000000000 +0900
>+++ multimedia/bombono/files/patch-src-mgui-stream_utils.h	2016-02-04 00:00:00.000000000 +0900
>@@ -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)
>diff -urN /usr/ports/multimedia/bombono/files/patch-src-mlib-filesystem.cpp multimedia/bombono/files/patch-src-mlib-filesystem.cpp
>--- /usr/ports/multimedia/bombono/files/patch-src-mlib-filesystem.cpp	2015-08-24 03:51:00.064294000 +0900
>+++ multimedia/bombono/files/patch-src-mlib-filesystem.cpp	2016-02-04 00:00:00.000000000 +0900
>@@ -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)
>  {
>diff -urN /usr/ports/multimedia/bombono/files/patch-stream.h multimedia/bombono/files/patch-stream.h
>--- /usr/ports/multimedia/bombono/files/patch-stream.h	2015-08-24 03:51:00.070389000 +0900
>+++ multimedia/bombono/files/patch-stream.h	2016-02-04 00:00:00.000000000 +0900
>@@ -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 ÑÐ¼. Ð² ÐµÐ³Ð¾ Ð¾Ð¿Ð¸ÑÐ°Ð½Ð¸Ð¸

Actions: View | Diff

Attachments on bug 206896: 166516