aboutsummaryrefslogtreecommitdiffstats
path: root/multimedia/bombono
diff options
context:
space:
mode:
Diffstat (limited to 'multimedia/bombono')
-rw-r--r--multimedia/bombono/Makefile6
-rw-r--r--multimedia/bombono/files/patch-src-mbase-project-table.cpp11
-rw-r--r--multimedia/bombono/files/patch-src-mgui-editor-toolbar.cpp11
-rw-r--r--multimedia/bombono/files/patch-src-mgui-project-add.cpp20
-rw-r--r--multimedia/bombono/files/patch-src-mgui-project-mconstructor.cpp11
-rw-r--r--multimedia/bombono/files/patch-src-mgui-project-serialize.cpp11
-rw-r--r--multimedia/bombono/files/patch-src-mlib-filesystem.cpp28
7 files changed, 96 insertions, 2 deletions
diff --git a/multimedia/bombono/Makefile b/multimedia/bombono/Makefile
index 8cc395facd59..1dd283f65339 100644
--- a/multimedia/bombono/Makefile
+++ b/multimedia/bombono/Makefile
@@ -7,7 +7,7 @@
PORTNAME= bombono
PORTVERSION= 1.2.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= multimedia
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-dvd/1.2
DISTNAME= ${PORTNAME}-dvd-${PORTVERSION}
@@ -16,12 +16,14 @@ MAINTAINER= pawel@FreeBSD.org
COMMENT= DVD authoring program
BUILD_DEPENDS= GraphicsMagick>=1.1.7:${PORTSDIR}/graphics/GraphicsMagick \
+ boost-libs>=1.48.0:${PORTSDIR}/devel/boost-libs \
mjpegtools>=1.9.0:${PORTSDIR}/multimedia/mjpegtools
LIB_DEPENDS= gtkmm-2.4.1:${PORTSDIR}/x11-toolkits/gtkmm24 \
xml++-2.6.2:${PORTSDIR}/textproc/libxml++26 \
lavfile:${PORTSDIR}/multimedia/mjpegtools \
dvdread:${PORTSDIR}/multimedia/libdvdread \
- avcodec:${PORTSDIR}/multimedia/ffmpeg
+ avcodec:${PORTSDIR}/multimedia/ffmpeg \
+ boost_filesystem:${PORTSDIR}/devel/boost-libs
RUN_DEPENDS= GraphicsMagick>=1.1.7:${PORTSDIR}/graphics/GraphicsMagick \
dvda-author:${PORTSDIR}/audio/dvda-author \
enca:${PORTSDIR}/converters/enca \
diff --git a/multimedia/bombono/files/patch-src-mbase-project-table.cpp b/multimedia/bombono/files/patch-src-mbase-project-table.cpp
new file mode 100644
index 000000000000..669d85e0218e
--- /dev/null
+++ b/multimedia/bombono/files/patch-src-mbase-project-table.cpp
@@ -0,0 +1,11 @@
+--- src/mbase/project/table.cpp.orig 2012-06-05 22:28:36.000000000 +0200
++++ src/mbase/project/table.cpp 2012-06-05 22:39:36.000000000 +0200
+@@ -427,7 +427,7 @@
+ {
+ for( fs::directory_iterator itr(dir), end; itr != end; ++itr )
+ if( IsFrameDir(*itr) )
+- t_lst.push_back(itr->leaf());
++ t_lst.push_back(itr->path().filename().string());
+ }
+ }
+
diff --git a/multimedia/bombono/files/patch-src-mgui-editor-toolbar.cpp b/multimedia/bombono/files/patch-src-mgui-editor-toolbar.cpp
new file mode 100644
index 000000000000..7b8956dd7e39
--- /dev/null
+++ b/multimedia/bombono/files/patch-src-mgui-editor-toolbar.cpp
@@ -0,0 +1,11 @@
+--- src/mgui/editor/toolbar.cpp.orig 2012-06-05 17:43:12.000000000 +0200
++++ src/mgui/editor/toolbar.cpp 2012-06-05 17:43:33.000000000 +0200
+@@ -287,7 +287,7 @@
+ if( fs::is_directory(dir) )
+ {
+ boost_foreach( const fs::path& pth, dir_range(dir) )
+- o_lst.push_back(pth.filename());
++ o_lst.push_back(pth.filename().string());
+ }
+ }
+ std::sort(o_lst.begin(), o_lst.end(), &ByExtName);
diff --git a/multimedia/bombono/files/patch-src-mgui-project-add.cpp b/multimedia/bombono/files/patch-src-mgui-project-add.cpp
new file mode 100644
index 000000000000..1c182ebe9ebd
--- /dev/null
+++ b/multimedia/bombono/files/patch-src-mgui-project-add.cpp
@@ -0,0 +1,20 @@
+--- src/mgui/project/add.cpp.orig 2012-02-08 13:19:21.000000000 +0100
++++ src/mgui/project/add.cpp 2012-06-05 17:53:01.000000000 +0200
+@@ -420,7 +420,7 @@
+ static std::string StandFNameOut(const fs::path& pth)
+ {
+ return "<span style=\"italic\" underline=\"low\">" +
+- pth.leaf() + "</span>";
++ pth.filename().string() + "</span>";
+ }
+
+ #if GTK_CHECK_VERSION(2,18,0)
+@@ -465,7 +465,7 @@
+ {
+ const std::string fname = paths[0];
+ fs::path pth(fname);
+- std::string leaf = pth.leaf();
++ std::string leaf = pth.filename().string();
+ {
+ static re::pattern dvd_video_vob("(VIDEO_TS|VTS_[0-9][0-9]_[0-9]).VOB",
+ re::pattern::perl|re::pattern::icase);
diff --git a/multimedia/bombono/files/patch-src-mgui-project-mconstructor.cpp b/multimedia/bombono/files/patch-src-mgui-project-mconstructor.cpp
new file mode 100644
index 000000000000..97c3d65ace1f
--- /dev/null
+++ b/multimedia/bombono/files/patch-src-mgui-project-mconstructor.cpp
@@ -0,0 +1,11 @@
+--- src/mgui/project/mconstructor.cpp.orig 2012-06-05 22:41:12.000000000 +0200
++++ src/mgui/project/mconstructor.cpp 2012-06-05 22:42:17.000000000 +0200
+@@ -961,7 +961,7 @@
+ static const fs::directory_iterator end_itr;
+ for( fs::directory_iterator itr(DataDirPath("bmd-icons"));
+ itr != end_itr; ++itr )
+- pix_lst.push_back(Gdk::Pixbuf::create_from_file(itr->string()));
++ pix_lst.push_back(Gdk::Pixbuf::create_from_file(itr->path().string()));
+ Gtk::Window::set_default_icon_list(pix_lst);
+
+ ActionFunctor after_fnr = BuildConstructor(app, prj_file_name);
diff --git a/multimedia/bombono/files/patch-src-mgui-project-serialize.cpp b/multimedia/bombono/files/patch-src-mgui-project-serialize.cpp
new file mode 100644
index 000000000000..46e7a8a901dd
--- /dev/null
+++ b/multimedia/bombono/files/patch-src-mgui-project-serialize.cpp
@@ -0,0 +1,11 @@
+--- src/mgui/project/serialize.cpp.orig 2012-06-05 18:34:29.000000000 +0200
++++ src/mgui/project/serialize.cpp 2012-06-05 18:35:16.000000000 +0200
+@@ -71,7 +71,7 @@
+ return "untitled.bmd";
+
+ fs::path full_path(db.GetProjectFName());
+- std::string res_str = full_path.leaf();
++ std::string res_str = full_path.filename().string();
+ if( with_path_breakdown )
+ res_str += " (" + full_path.branch_path().string() + ")";
+ return res_str;
diff --git a/multimedia/bombono/files/patch-src-mlib-filesystem.cpp b/multimedia/bombono/files/patch-src-mlib-filesystem.cpp
new file mode 100644
index 000000000000..587039c65cca
--- /dev/null
+++ b/multimedia/bombono/files/patch-src-mlib-filesystem.cpp
@@ -0,0 +1,28 @@
+--- src/mlib/filesystem.cpp.orig 2012-06-05 18:44:31.000000000 +0200
++++ src/mlib/filesystem.cpp 2012-06-05 18:46:42.000000000 +0200
+@@ -47,7 +47,7 @@
+
+ std::string get_basename(const fs::path& pth)
+ {
+- std::string name_s = pth.leaf();
++ std::string name_s = pth.filename().string();
+ const char* name = name_s.c_str();
+
+ //if( const char* dot = strstr(name, ".") )
+@@ -58,7 +58,7 @@
+
+ std::string get_extension(const fs::path& pth)
+ {
+- std::string name_s = pth.leaf();
++ std::string name_s = pth.filename().string();
+
+ if( const char* dot = FindExtDot(name_s.c_str()) )
+ return std::string(dot+1);
+@@ -72,7 +72,6 @@
+ tune_boost_filesystem()
+ {
+ // чтоб любые символы в именах файлов позволялись, для utf8
+- fs::path::default_name_check(fs::native);
+ }
+ } tune_boost_filesystem_obj;
+