diff options
-rw-r--r-- | .SRCINFO | 26 | ||||
-rw-r--r-- | .gitignore | 1 | ||||
-rw-r--r-- | PKGBUILD | 38 | ||||
-rw-r--r-- | autoptr2uniqueptr.patch | 5 | ||||
-rw-r--r-- | bombono-dvd-1.2.2-ffmpeg26.patch | 13 | ||||
-rw-r--r-- | fix_c++11_literal_warnings.patch | 30 | ||||
-rw-r--r-- | fix_crefoftemp_bug.patch | 20 | ||||
-rw-r--r-- | fix_deprecated_boost_api.patch | 75 | ||||
-rw-r--r-- | fix_ffmpeg30.patch | 53 | ||||
-rw-r--r-- | fix_ffmpeg_codecid.patch | 19 | ||||
-rw-r--r-- | fix_ptr2bool_cast.patch | 73 | ||||
-rw-r--r-- | stream_bool_cast.patch | 13 |
12 files changed, 98 insertions, 268 deletions
@@ -1,7 +1,7 @@ pkgbase = bombono-dvd pkgdesc = DVD authoring program with nice and clean GUI - pkgver = 1.2.2 - pkgrel = 8 + pkgver = 1.2.4 + pkgrel = 1 url = http://www.bombono.org install = bombono-dvd.install arch = i686 @@ -22,26 +22,20 @@ pkgbase = bombono-dvd depends = cdrkit optdepends = gvfs: web browser integration conflicts = bombono-dvd-git - source = http://downloads.sourceforge.net/bombono/bombono-dvd-1.2.2.tar.bz2 + source = https://github.com/muravjov/bombono-dvd/archive/1.2.4.tar.gz source = fix_ffmpeg_codecid.patch - source = bombono-dvd-1.2.2-ffmpeg26.patch source = fix_ptr2bool_cast.patch source = fix_c++11_literal_warnings.patch - source = fix_crefoftemp_bug.patch source = autoptr2uniqueptr.patch - source = stream_bool_cast.patch source = fix_deprecated_boost_api.patch source = fix_ffmpeg30.patch - sha256sums = 3ffaadc803dc2526d2805629ee928800ce150cb2e6a40b6724d898c76366f68b - sha256sums = decc8f9261b0fcd18780080438c9fc4297d56a281355f195a5dee9a92abf474a - sha256sums = ee89adeff7bd19d731eac96c180d5d59766bb3a68f3b21b898199e1cb6c5639e - sha256sums = 9471454c97d8b91b4234085f1eabc625d9e23e76a91266b205dc3f79553322b9 - sha256sums = 31dfc5400d450490a53bbd386bafb59d68a9a2d6f9036755419d3be035aa87be - sha256sums = 0ea8ad5ccf64d30d0463e9bde5b07abdedd00e2da2fa7f3f72de99aa3915a64c - sha256sums = 9214f838377cdf35bf1f151e4eaac10952049ccff4d74ca485fc8b6f05bc8ba4 - sha256sums = 62d0f56ab4c2512bf004756426da6bf63cc0bd134ae6bc60304cc20116277e27 - sha256sums = 8abd4e79a34a4d919060443439127cca95412d79534eef6554c300f55a0425ed - sha256sums = e345c0788991e6c6b5eaf0f271db4b0d9c0c0ff42757a4d67ebc023d352acc15 + sha256sums = 4f8c882a0c359ca8c182a627885c64aa271820eead2f9a64b34f1625c3b0a9d7 + sha256sums = 63e47ffb812acb33a4d1f5d7f421eb2ccdf3ee1ce1b7f75267c32079dbc9dea1 + sha256sums = b0ff83b2fad27e39dfd77d12e00c25e554fe86ee1894c2f8fbe1915a2c46dd88 + sha256sums = 28be98eb36eb6422717df7048c8ee74927495e7d7829e17cb54d746befc238c4 + sha256sums = 4c29e9b19ba3bcf8c42c46aaea6c1411580629e581307a91f4d085fcdaa6eab6 + sha256sums = a69f51f9d5bd6ebe26c13abeece9de012d110dcec944c76efbab59b6bc0ef915 + sha256sums = f6fd3a309987ac08b6f70132686c5a06bc7496fb6e1097539d6348f558d09502 pkgname = bombono-dvd diff --git a/.gitignore b/.gitignore index 1dee3482e94d..b101a9aeac20 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ bombono-dvd-*.tar.bz2 *.pkg.tar.xz +*.tar.gz pkg/ src/ @@ -2,8 +2,8 @@ # Contributor: Sirocco <sirocco at ngs dot ru> pkgname=bombono-dvd -pkgver=1.2.2 -pkgrel=8 +pkgver=1.2.4 +pkgrel=1 pkgdesc="DVD authoring program with nice and clean GUI" arch=('i686' 'x86_64') url="http://www.bombono.org" @@ -13,32 +13,28 @@ depends=('gtk2' 'gtkmm' 'mjpegtools' 'ffmpeg' 'libdvdread' 'dvdauthor' \ makedepends=('scons') optdepends=('gvfs: web browser integration') conflicts=('bombono-dvd-git') -source=(http://downloads.sourceforge.net/bombono/$pkgname-$pkgver.tar.bz2 - fix_ffmpeg_codecid.patch bombono-dvd-1.2.2-ffmpeg26.patch - fix_ptr2bool_cast.patch fix_c++11_literal_warnings.patch fix_crefoftemp_bug.patch - autoptr2uniqueptr.patch stream_bool_cast.patch - fix_deprecated_boost_api.patch fix_ffmpeg30.patch) +source=("https://github.com/muravjov/${pkgname}/archive/${pkgver}.tar.gz" + "fix_ffmpeg_codecid.patch" + "fix_ptr2bool_cast.patch" + "fix_c++11_literal_warnings.patch" + "autoptr2uniqueptr.patch" + "fix_deprecated_boost_api.patch" + "fix_ffmpeg30.patch") install=bombono-dvd.install -sha256sums=('3ffaadc803dc2526d2805629ee928800ce150cb2e6a40b6724d898c76366f68b' - 'decc8f9261b0fcd18780080438c9fc4297d56a281355f195a5dee9a92abf474a' - 'ee89adeff7bd19d731eac96c180d5d59766bb3a68f3b21b898199e1cb6c5639e' - '9471454c97d8b91b4234085f1eabc625d9e23e76a91266b205dc3f79553322b9' - '31dfc5400d450490a53bbd386bafb59d68a9a2d6f9036755419d3be035aa87be' - '0ea8ad5ccf64d30d0463e9bde5b07abdedd00e2da2fa7f3f72de99aa3915a64c' - '9214f838377cdf35bf1f151e4eaac10952049ccff4d74ca485fc8b6f05bc8ba4' - '62d0f56ab4c2512bf004756426da6bf63cc0bd134ae6bc60304cc20116277e27' - '8abd4e79a34a4d919060443439127cca95412d79534eef6554c300f55a0425ed' - 'e345c0788991e6c6b5eaf0f271db4b0d9c0c0ff42757a4d67ebc023d352acc15') +sha256sums=('4f8c882a0c359ca8c182a627885c64aa271820eead2f9a64b34f1625c3b0a9d7' + '63e47ffb812acb33a4d1f5d7f421eb2ccdf3ee1ce1b7f75267c32079dbc9dea1' + 'b0ff83b2fad27e39dfd77d12e00c25e554fe86ee1894c2f8fbe1915a2c46dd88' + '28be98eb36eb6422717df7048c8ee74927495e7d7829e17cb54d746befc238c4' + '4c29e9b19ba3bcf8c42c46aaea6c1411580629e581307a91f4d085fcdaa6eab6' + 'a69f51f9d5bd6ebe26c13abeece9de012d110dcec944c76efbab59b6bc0ef915' + 'f6fd3a309987ac08b6f70132686c5a06bc7496fb6e1097539d6348f558d09502') prepare() { cd "${pkgname}-${pkgver}" patch -Np1 -i "${srcdir}/fix_ffmpeg_codecid.patch" - patch -Np1 -i "${srcdir}/bombono-dvd-1.2.2-ffmpeg26.patch" patch -Np1 -i "${srcdir}/fix_ptr2bool_cast.patch" patch -Np1 -i "${srcdir}/fix_c++11_literal_warnings.patch" - patch -Np1 -i "${srcdir}/fix_crefoftemp_bug.patch" patch -Np1 -i "${srcdir}/autoptr2uniqueptr.patch" - patch -Np1 -i "${srcdir}/stream_bool_cast.patch" patch -Np1 -i "${srcdir}/fix_deprecated_boost_api.patch" patch -Np1 -i "${srcdir}/fix_ffmpeg30.patch" # python2 fix @@ -63,7 +59,7 @@ prepare() { build() { cd "${pkgname}-${pkgver}" - scons PREFIX="/usr" DESTDIR="$pkgdir" CPPFLAGS="-std=c++11 -DBOOST_SYSTEM_NO_DEPRECATED -DBOOST_FILESYSTEM_NO_DEPRECATED -DBOOST_FILESYSTEM_VERSION=3" USE_EXT_BOOST=1 + scons PREFIX="/usr" DESTDIR="$pkgdir" CPPFLAGS="-std=c++14 -DBOOST_SYSTEM_NO_DEPRECATED -DBOOST_FILESYSTEM_NO_DEPRECATED -DBOOST_FILESYSTEM_VERSION=3" USE_EXT_BOOST=1 } package() { diff --git a/autoptr2uniqueptr.patch b/autoptr2uniqueptr.patch index 7aae4ec58f3b..1787e5b271ef 100644 --- a/autoptr2uniqueptr.patch +++ b/autoptr2uniqueptr.patch @@ -1,5 +1,6 @@ ---- bombono-dvd-1.2.2/libs/boost-logging/boost/logging/detail/tss/tss_impl_pthread.hpp 2013-03-08 00:50:45.000000000 +0330 -+++ new/libs/boost-logging/boost/logging/detail/tss/tss_impl_pthread.hpp 2015-11-26 20:06:48.693423531 +0330 +diff -ruN old/libs/boost-logging/boost/logging/detail/tss/tss_impl_pthread.hpp new/libs/boost-logging/boost/logging/detail/tss/tss_impl_pthread.hpp +--- old/libs/boost-logging/boost/logging/detail/tss/tss_impl_pthread.hpp 2016-04-10 15:15:39.000000000 +0430 ++++ new/libs/boost-logging/boost/logging/detail/tss/tss_impl_pthread.hpp 2016-06-18 11:18:42.736469469 +0430 @@ -39,7 +39,7 @@ slots = static_cast<tss_slots*>( pthread_getspecific(tss_data_native_key())); if (slots == 0) diff --git a/bombono-dvd-1.2.2-ffmpeg26.patch b/bombono-dvd-1.2.2-ffmpeg26.patch deleted file mode 100644 index b511a9d4ebd3..000000000000 --- a/bombono-dvd-1.2.2-ffmpeg26.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: bombono-dvd-1.2.2/src/mgui/ffviewer.cpp -=================================================================== ---- bombono-dvd-1.2.2.orig/src/mgui/ffviewer.cpp -+++ bombono-dvd-1.2.2/src/mgui/ffviewer.cpp -@@ -1120,7 +1120,7 @@ static bool SeekSetTime(FFViewer& ffv, d - bool seek_ok = TimeSeek(ffv, start_time, time); - if( !seek_ok && CanByteSeek(ffv.iCtx) ) - // тогда переходим в начало файла -- seek_ok = DoSeek(ffv, ffv.iCtx->data_offset, true); -+ seek_ok = DoSeek(ffv, 0, true); - - // некоторое видео глючит в начале (Hellboy), из-за чего - // последовательный доступ выполняется с перескоками - diff --git a/fix_c++11_literal_warnings.patch b/fix_c++11_literal_warnings.patch index 5ea2fb3e598d..5cfc96f47ea9 100644 --- a/fix_c++11_literal_warnings.patch +++ b/fix_c++11_literal_warnings.patch @@ -1,5 +1,6 @@ ---- bombono-dvd-1.2.2/src/mlib/regex.h 2013-03-08 00:50:45.000000000 +0330 -+++ new/src/mlib/regex.h 2015-11-20 18:37:26.167057488 +0330 +diff -ruN old/src/mlib/regex.h new/src/mlib/regex.h +--- old/src/mlib/regex.h 2016-04-10 15:15:39.000000000 +0430 ++++ new/src/mlib/regex.h 2016-06-18 11:02:30.666528235 +0430 @@ -185,7 +185,7 @@ #define RG_EW "\\>" // конец слова #define RG_SPS "[[:space:]]*" // пробелы @@ -9,8 +10,9 @@ #define RG_CMD_BEG RG_BW // "^"RG_SPS // начало команды bool ExtractDouble(double& val, const re::match_results& what, int idx = 1); ---- bombono-dvd-1.2.2/src/mgui/author/burn.cpp 2013-03-08 00:50:45.000000000 +0330 -+++ new/src/mgui/author/burn.cpp 2015-11-20 18:44:47.940364110 +0330 +diff -ruN old/src/mgui/author/burn.cpp new/src/mgui/author/burn.cpp +--- old/src/mgui/author/burn.cpp 2016-04-10 15:15:39.000000000 +0430 ++++ new/src/mgui/author/burn.cpp 2016-06-18 11:04:08.113189012 +0430 @@ -85,7 +85,7 @@ return bd; } @@ -38,8 +40,9 @@ bool is_found = re::search(out_info, what, media_status_re); ASSERT_RTL( is_found ); ---- bombono-dvd-1.2.2/src/mgui/author/execute.cpp 2013-03-08 00:50:45.000000000 +0330 -+++ new/src/mgui/author/execute.cpp 2015-11-20 18:47:25.260354601 +0330 +diff -ruN old/src/mgui/author/execute.cpp new/src/mgui/author/execute.cpp +--- old/src/mgui/author/execute.cpp 2016-04-10 15:15:39.000000000 +0430 ++++ new/src/mgui/author/execute.cpp 2016-06-18 11:07:03.359845082 +0430 @@ -64,9 +64,9 @@ tag->property_foreground() = "darkgreen"; } @@ -82,8 +85,9 @@ if( re::search(line, what, ch_error_re) ) { std::string& err_str = of.firstError; ---- bombono-dvd-1.2.2/src/mgui/author/render.cpp 2013-03-08 00:50:45.000000000 +0330 -+++ new/src/mgui/author/render.cpp 2015-11-20 18:50:40.550342794 +0330 +diff -ruN old/src/mgui/author/render.cpp new/src/mgui/author/render.cpp +--- old/src/mgui/author/render.cpp 2016-04-10 15:15:39.000000000 +0430 ++++ new/src/mgui/author/render.cpp 2016-06-18 11:08:43.919839004 +0430 @@ -866,7 +866,7 @@ // // :KLUDGE: (только) в ffmpeg, avformat 53.13.0, поменяли . на : => надо @@ -123,8 +127,9 @@ % avlib_name % bf::stop; re::pattern avfilter_version(reg_str.c_str()); return FindVersion(conts, avfilter_version, AVCnvBin(), avlib_name); ---- bombono-dvd-1.2.2/src/mgui/author/script.cpp 2015-11-20 18:40:35.770379359 +0330 -+++ new/src/mgui/author/script.cpp 2015-11-20 19:02:42.020299175 +0330 +diff -ruN old/src/mgui/author/script.cpp new/src/mgui/author/script.cpp +--- old/src/mgui/author/script.cpp 2016-04-10 15:15:39.000000000 +0430 ++++ new/src/mgui/author/script.cpp 2016-06-18 11:09:54.899834712 +0430 @@ -755,9 +755,9 @@ // ffmpeg выводит статистику первого создаваемого файла каждые полсекунды, // см. print_report() (при verbose=1, по умолчанию) @@ -155,8 +160,9 @@ if( IsVersionGE(FindVersion(help_str, spumux_version, "spumux"), TripleVersion(0, 7, 0)) ) AddFormatAttr(sp); ---- bombono-dvd-1.2.2/src/mgui/project/browser.cpp 2013-03-08 00:50:45.000000000 +0330 -+++ new/src/mgui/project/browser.cpp 2015-11-20 19:03:52.983628220 +0330 +diff -ruN old/src/mgui/project/browser.cpp new/src/mgui/project/browser.cpp +--- old/src/mgui/project/browser.cpp 2016-04-10 15:15:39.000000000 +0430 ++++ new/src/mgui/project/browser.cpp 2016-06-18 11:10:21.113166461 +0430 @@ -328,7 +328,7 @@ return hb; } diff --git a/fix_crefoftemp_bug.patch b/fix_crefoftemp_bug.patch deleted file mode 100644 index c322a05c4484..000000000000 --- a/fix_crefoftemp_bug.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- bombono-dvd-1.2.2/src/mgui/project/menu-actions.cpp 2013-03-08 00:50:45.000000000 +0330 -+++ new/src/mgui/project/menu-actions.cpp 2015-11-20 19:17:23.516912549 +0330 -@@ -187,7 +187,7 @@ - txt.MediaItem().ClearLink(); - } - --void UpdateMenuRegionObject(Comp::Object* obj, const Point& menu_sz, RectListRgn& lst) -+void UpdateMenuRegionObject(Comp::Object* obj, Point menu_sz, RectListRgn& lst) - { - MenuRegionEraserVis vis(obj, menu_sz, lst); - //PrimaryRegionEraserVis vis(obj, false); -@@ -198,7 +198,7 @@ - { - CanvasBuf& cb = mp.thRgn.GetCanvasBuf(); - ForeachLinked(mp.Owner(), bb::bind(&UpdateMenuRegionObject, -- _1, boost::cref(cb.Size()), -+ _1, cb.Size(), - boost::ref(cb.RenderList()))); - } - diff --git a/fix_deprecated_boost_api.patch b/fix_deprecated_boost_api.patch index 82d694f78ba3..f14a2c6ca031 100644 --- a/fix_deprecated_boost_api.patch +++ b/fix_deprecated_boost_api.patch @@ -1,6 +1,6 @@ -diff -ru bombono-dvd-1.2.2/src/mbase/project/table.cpp new/src/mbase/project/table.cpp ---- bombono-dvd-1.2.2/src/mbase/project/table.cpp 2013-03-08 00:50:45.000000000 +0330 -+++ new/src/mbase/project/table.cpp 2016-01-19 13:02:00.117338769 +0330 +diff -ruN old/src/mbase/project/table.cpp new/src/mbase/project/table.cpp +--- old/src/mbase/project/table.cpp 2016-06-18 11:19:57.649798271 +0430 ++++ new/src/mbase/project/table.cpp 2016-06-18 11:26:53.226439812 +0430 @@ -154,7 +154,7 @@ void SerializePath(Archieve& ar, const char* tag_name, std::string& fpath) { @@ -10,9 +10,18 @@ diff -ru bombono-dvd-1.2.2/src/mbase/project/table.cpp new/src/mbase/project/tab if( ar.IsLoad() ) { ar >> NameValue(tag_name, fpath); -diff -ru bombono-dvd-1.2.2/src/mgui/author/script.cpp new/src/mgui/author/script.cpp ---- bombono-dvd-1.2.2/src/mgui/author/script.cpp 2016-01-19 12:54:07.640700667 +0330 -+++ new/src/mgui/author/script.cpp 2016-01-19 12:59:52.407346489 +0330 +@@ -162,7 +162,7 @@ + if( !fpath.empty() ) + { + fs::path pth(fpath); +- if( !pth.is_complete() ) ++ if( !pth.is_absolute() ) + fpath = (rel_to_dir/fpath).string(); + } + } +diff -ruN old/src/mgui/author/script.cpp new/src/mgui/author/script.cpp +--- old/src/mgui/author/script.cpp 2016-06-18 11:19:57.656464937 +0430 ++++ new/src/mgui/author/script.cpp 2016-06-18 11:24:46.063114167 +0430 @@ -676,7 +676,7 @@ if( !fs::exists(font_path) ) { @@ -22,9 +31,9 @@ diff -ru bombono-dvd-1.2.2/src/mgui/author/script.cpp new/src/mgui/author/script Error(err_str.c_str()); fs::copy_file(DataDirPath("copy-n-paste/FreeSans.ttf"), font_path); } -diff -ru bombono-dvd-1.2.2/src/mgui/mux.cpp new/src/mgui/mux.cpp ---- bombono-dvd-1.2.2/src/mgui/mux.cpp 2013-03-08 00:50:45.000000000 +0330 -+++ new/src/mgui/mux.cpp 2016-01-19 12:58:22.840685236 +0330 +diff -ruN old/src/mgui/mux.cpp new/src/mgui/mux.cpp +--- old/src/mgui/mux.cpp 2016-06-18 11:19:57.653131605 +0430 ++++ new/src/mgui/mux.cpp 2016-06-18 11:25:09.986446054 +0430 @@ -162,7 +162,7 @@ fs::path pth = GetFilename(v_btn); if( pth.empty() ) @@ -34,9 +43,9 @@ diff -ru bombono-dvd-1.2.2/src/mgui/mux.cpp new/src/mgui/mux.cpp if( a_btn.get_filename().empty() ) a_btn.set_current_folder(folder); -diff -ru bombono-dvd-1.2.2/src/mgui/project/add.cpp new/src/mgui/project/add.cpp ---- bombono-dvd-1.2.2/src/mgui/project/add.cpp 2016-01-19 12:54:07.634034002 +0330 -+++ new/src/mgui/project/add.cpp 2016-01-19 13:00:49.220676388 +0330 +diff -ruN old/src/mgui/project/add.cpp new/src/mgui/project/add.cpp +--- old/src/mgui/project/add.cpp 2016-06-18 11:19:57.656464937 +0430 ++++ new/src/mgui/project/add.cpp 2016-06-18 11:25:30.836444794 +0430 @@ -479,7 +479,7 @@ MessageBox(BF_("The file \"%1%\" looks like VOB from DVD.\nRun import?") % leaf % bf::stop, Gtk::MESSAGE_QUESTION, Gtk::BUTTONS_OK_CANCEL) == Gtk::RESPONSE_OK ) @@ -46,9 +55,9 @@ diff -ru bombono-dvd-1.2.2/src/mgui/project/add.cpp new/src/mgui/project/add.cpp return; } } -diff -ru bombono-dvd-1.2.2/src/mgui/project/serialize.cpp new/src/mgui/project/serialize.cpp ---- bombono-dvd-1.2.2/src/mgui/project/serialize.cpp 2013-03-08 00:50:45.000000000 +0330 -+++ new/src/mgui/project/serialize.cpp 2016-01-19 13:00:29.230677594 +0330 +diff -ruN old/src/mgui/project/serialize.cpp new/src/mgui/project/serialize.cpp +--- old/src/mgui/project/serialize.cpp 2016-06-18 11:19:57.656464937 +0430 ++++ new/src/mgui/project/serialize.cpp 2016-06-18 11:25:56.913109885 +0430 @@ -73,7 +73,7 @@ fs::path full_path(db.GetProjectFName()); std::string res_str = fs::name_str(full_path); @@ -58,9 +67,9 @@ diff -ru bombono-dvd-1.2.2/src/mgui/project/serialize.cpp new/src/mgui/project/s return res_str; } -diff -ru bombono-dvd-1.2.2/src/mgui/timeline/select.cpp new/src/mgui/timeline/select.cpp ---- bombono-dvd-1.2.2/src/mgui/timeline/select.cpp 2013-03-08 00:50:45.000000000 +0330 -+++ new/src/mgui/timeline/select.cpp 2016-01-19 12:59:12.187348923 +0330 +diff -ruN old/src/mgui/timeline/select.cpp new/src/mgui/timeline/select.cpp +--- old/src/mgui/timeline/select.cpp 2016-06-18 11:19:57.659798271 +0430 ++++ new/src/mgui/timeline/select.cpp 2016-06-18 11:26:26.869774739 +0430 @@ -152,7 +152,7 @@ mon.FramePixbuf()->save(fnam, ext); @@ -70,21 +79,9 @@ diff -ru bombono-dvd-1.2.2/src/mgui/timeline/select.cpp new/src/mgui/timeline/se if( add_btn.get_active() ) Project::TryAddMediaQuiet(fnam, "SaveFrame"); } -diff -ru bombono-dvd-1.2.2/src/mbase/project/table.cpp new/src/mbase/project/table.cpp ---- bombono-dvd-1.2.2/src/mbase/project/table.cpp 2016-01-19 13:11:42.883970202 +0330 -+++ new/src/mbase/project/table.cpp 2016-01-19 13:42:58.317190146 +0330 -@@ -162,7 +162,7 @@ - if( !fpath.empty() ) - { - fs::path pth(fpath); -- if( !pth.is_complete() ) -+ if( !pth.is_absolute() ) - fpath = (rel_to_dir/fpath).string(); - } - } -diff -ru bombono-dvd-1.2.2/src/mbase/project/tests/test_table.cpp new/src/mbase/project/tests/test_table.cpp ---- bombono-dvd-1.2.2/src/mbase/project/tests/test_table.cpp 2013-03-08 00:50:45.000000000 +0330 -+++ new/src/mbase/project/tests/test_table.cpp 2016-01-19 13:42:16.977192649 +0330 +diff -ruN old/src/mbase/project/tests/test_table.cpp new/src/mbase/project/tests/test_table.cpp +--- old/src/mbase/project/tests/test_table.cpp 2016-06-18 11:19:57.649798271 +0430 ++++ new/src/mbase/project/tests/test_table.cpp 2016-06-18 11:27:15.263105145 +0430 @@ -129,7 +129,7 @@ // проверка чтения/записи путей boost::intrusive_ptr<StillImageMD> pict2 = ptr::dynamic_pointer_cast<StillImageMD>(ml[2]); @@ -94,9 +91,9 @@ diff -ru bombono-dvd-1.2.2/src/mbase/project/tests/test_table.cpp new/src/mbase/ BOOST_CHECK( fs::exists(pth) ); // проверка ссылок -diff -ru bombono-dvd-1.2.2/src/mlib/tests/test_utils.cpp new/src/mlib/tests/test_utils.cpp ---- bombono-dvd-1.2.2/src/mlib/tests/test_utils.cpp 2013-03-08 00:50:45.000000000 +0330 -+++ new/src/mlib/tests/test_utils.cpp 2016-01-19 13:23:58.830592369 +0330 +diff -ruN old/src/mlib/tests/test_utils.cpp new/src/mlib/tests/test_utils.cpp +--- old/src/mlib/tests/test_utils.cpp 2016-06-18 11:19:57.663131604 +0430 ++++ new/src/mlib/tests/test_utils.cpp 2016-06-18 11:28:13.619768287 +0430 @@ -139,17 +139,17 @@ #endif } @@ -120,9 +117,9 @@ diff -ru bombono-dvd-1.2.2/src/mlib/tests/test_utils.cpp new/src/mlib/tests/test } // MakeRelativeToDir -diff -ru bombono-dvd-1.2.2/src/mlib/filesystem.cpp new/src/mlib/filesystem.cpp ---- bombono-dvd-1.2.2/src/mlib/filesystem.cpp 2013-03-08 00:50:45.000000000 +0330 -+++ new/src/mlib/filesystem.cpp 2016-01-19 14:02:05.303787474 +0330 +diff -ruN old/src/mlib/filesystem.cpp new/src/mlib/filesystem.cpp +--- old/src/mlib/filesystem.cpp 2016-06-18 11:19:57.659798271 +0430 ++++ new/src/mlib/filesystem.cpp 2016-06-18 11:30:15.303094263 +0430 @@ -161,25 +161,16 @@ fs::path MakeAbsolutePath(const fs::path& pth, const fs::path& cur_dir) diff --git a/fix_ffmpeg30.patch b/fix_ffmpeg30.patch index 0d8367df57cc..e66667edb0d3 100644 --- a/fix_ffmpeg30.patch +++ b/fix_ffmpeg30.patch @@ -1,6 +1,6 @@ -diff -ruN bombono-dvd-1.2.2.orig/src/mgui/ffviewer.cpp bombono-dvd-1.2.2/src/mgui/ffviewer.cpp ---- bombono-dvd-1.2.2.orig/src/mgui/ffviewer.cpp 2016-03-12 08:58:15.027051299 +0330 -+++ bombono-dvd-1.2.2/src/mgui/ffviewer.cpp 2016-03-12 10:47:50.869987067 +0330 +diff -ruN old/src/mgui/ffviewer.cpp new/src/mgui/ffviewer.cpp +--- old/src/mgui/ffviewer.cpp 2016-06-18 11:37:10.409735832 +0430 ++++ new/src/mgui/ffviewer.cpp 2016-06-18 11:45:40.343038336 +0430 @@ -36,6 +36,10 @@ #define AVFORMAT_54 #endif @@ -12,39 +12,7 @@ diff -ruN bombono-dvd-1.2.2.orig/src/mgui/ffviewer.cpp bombono-dvd-1.2.2/src/mgu // разрабы libav считают себя самыми умными и потому решили // закрыть простым смертным доступ к ffurl_register_protocol() // (бывшая av_register_protocol2()),- https://bugzilla.libav.org/show_bug.cgi?id=224 -@@ -639,7 +643,9 @@ - // лучшая оптимизация выбирается на этапе выполнения, а не сборке; однако для 0.6 времени - // maverick оно еще не доделано, см. http://ffmpeg.arrozcru.org/forum/viewtopic.php?f=1&t=1185 - // :KLUDGE: потому добавляем явно -- sws_flags |= SWS_CPU_CAPS_MMX|SWS_CPU_CAPS_MMX2; -+ -+ // CPU_CAPS are now auto-detected -+ //sws_flags |= SWS_CPU_CAPS_MMX|SWS_CPU_CAPS_MMX2; - - // :TRICKY: почему-то ffmpeg'у "нравится" BGR24 и не нравиться RGB24 в плане использования - // MMX (ускорения); цена по времени неизвестна,- используем только ради того, чтобы не было -@@ -647,15 +653,16 @@ - // Другой вариант - PIX_FMT_RGB32, но там зависимый порядок байтов (в GdkPixbuf - нет) и - // мы нацелены на RGB24 - // :TODO: с версии LIBSWSCALE_VERSION_INT >= 0.8.11 появился прямой yuv -> rgb24, поправить -- PixelFormat dst_pf = PIX_FMT_BGR24; // PIX_FMT_RGB24; -+ AVPixelFormat dst_pf = AV_PIX_FMT_BGR24; // PIX_FMT_RGB24; - rgbCnvCtx = sws_getContext(sz.x, sz.y, GetVideoCtx(*this)->pix_fmt, sz.x, sz.y, - dst_pf, sws_flags, 0, 0, 0); - ASSERT( rgbCnvCtx ); - - Point dst_sz(sz); -- rgbBuf = (uint8_t*)av_malloc(avpicture_get_size(dst_pf, dst_sz.x, dst_sz.y) * sizeof(uint8_t)); -- avcodec_get_frame_defaults(&rgbFrame); // не помешает -- avpicture_fill((AVPicture*)&rgbFrame, rgbBuf, dst_pf, dst_sz.x, dst_sz.y); -+ rgbBuf = (uint8_t*)av_malloc (av_image_get_buffer_size (dst_pf, dst_sz.x, dst_sz.y, 1)); -+ av_frame_unref (&rgbFrame); -+ av_image_fill_arrays (rgbFrame.data, rgbFrame.linesize, -+ rgbBuf, dst_pf, dst_sz.x, dst_sz.y, 1); - } - else - // защита от неполных открытий -@@ -765,7 +772,7 @@ +@@ -807,7 +811,7 @@ #ifdef AVFRAME_INIT_CHANGE // avcodec_get_frame_defaults() перенесли в avcodec_decode_video2() #else @@ -53,16 +21,3 @@ diff -ruN bombono-dvd-1.2.2.orig/src/mgui/ffviewer.cpp bombono-dvd-1.2.2/src/mgu #endif #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52,25,00) -@@ -841,7 +848,11 @@ - - DoVideoDecode(ffv, got_picture, &pkt); - } -- av_free_packet(&pkt); -+ if (pkt.buf) -+ av_buffer_unref (&pkt.buf); -+ pkt.data = nullptr; -+ pkt.size = 0; -+ av_packet_free_side_data (&pkt); - } - else if( av_res == (int)AVERROR_EOF ) // для mpegts также -EIO приходит - { diff --git a/fix_ffmpeg_codecid.patch b/fix_ffmpeg_codecid.patch index 08abbd0bebe3..c68d30457521 100644 --- a/fix_ffmpeg_codecid.patch +++ b/fix_ffmpeg_codecid.patch @@ -1,7 +1,7 @@ diff -u -r -N old/src/mgui/ffviewer.cpp new/src/mgui/ffviewer.cpp ---- old/src/mgui/ffviewer.cpp 2013-03-07 22:20:45.000000000 +0100 -+++ new/src/mgui/ffviewer.cpp 2013-08-14 08:56:12.917285000 +0200 -@@ -62,7 +62,7 @@ +--- old/src/mgui/ffviewer.cpp 2016-04-10 15:15:39.000000000 +0430 ++++ new/src/mgui/ffviewer.cpp 2016-06-18 10:40:26.789941610 +0430 +@@ -74,7 +74,7 @@ typedef struct AVCodecTag { #if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(52,39,00) @@ -10,7 +10,7 @@ diff -u -r -N old/src/mgui/ffviewer.cpp new/src/mgui/ffviewer.cpp #else int id; #endif -@@ -70,14 +70,14 @@ +@@ -82,14 +82,14 @@ } AVCodecTag; #if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(52,34,00) @@ -27,7 +27,7 @@ diff -u -r -N old/src/mgui/ffviewer.cpp new/src/mgui/ffviewer.cpp { unsigned int codec_get_tag(const AVCodecTag *tags, int id); extern const AVCodecTag codec_bmp_tags[]; -@@ -388,7 +388,7 @@ +@@ -400,7 +400,7 @@ return (tag>>bit_begin) & 0xFF; } @@ -36,12 +36,3 @@ diff -u -r -N old/src/mgui/ffviewer.cpp new/src/mgui/ffviewer.cpp { #ifdef _MSC_VER std::string tag_str = boost::format("%1%") % codec_id % bf::stop; -@@ -406,7 +406,7 @@ - - #else // CALC_FF_TAG - --static std::string CodecID2Str(CodecID codec_id) -+static std::string CodecID2Str(AVCodecID codec_id) - { - return Int2Str(codec_id); - } diff --git a/fix_ptr2bool_cast.patch b/fix_ptr2bool_cast.patch index ddee08836fec..e502a3779af5 100644 --- a/fix_ptr2bool_cast.patch +++ b/fix_ptr2bool_cast.patch @@ -1,77 +1,12 @@ ---- bombono-dvd-1.2.2/src/mgui/dvdimport.cpp 2015-11-20 18:22:23.123778752 +0330 -+++ new/src/mgui/dvdimport.cpp 2015-11-20 18:22:11.813779436 +0330 +diff -ruN old/src/mgui/dvdimport.cpp new/src/mgui/dvdimport.cpp +--- old/src/mgui/dvdimport.cpp 2016-04-10 15:15:39.000000000 +0430 ++++ new/src/mgui/dvdimport.cpp 2016-06-18 10:52:35.713230871 +0430 @@ -275,7 +275,7 @@ id.errLbl.hide(); id.reader = rd; - SetCurPageComplete(id.ast, id.reader); -+ SetCurPageComplete(id.ast, id.reader != nullptr); ++ SetCurPageComplete(id.ast, bool(id.reader)); return rd; } ---- bombono-dvd-1.2.2/src/mgui/author/script.cpp 2013-03-08 00:50:45.000000000 +0330 -+++ new/src/mgui/author/script.cpp 2015-11-20 18:29:40.877085620 +0330 -@@ -279,7 +279,7 @@ - - ASSERT_RTL( vi || mn ); - // VTS domain -- bool is_video = vi; -+ bool is_video = vi != nullptr; - const PostAction& pa = is_video ? vi->PAction() : mn->MtnData().pAct ; - - std::string jnt_cmd; ---- bombono-dvd-1.2.2/src/mgui/project/add.cpp 2013-03-08 00:50:45.000000000 +0330 -+++ new/src/mgui/project/add.cpp 2015-11-20 18:40:01.493714764 +0330 -@@ -415,7 +415,7 @@ - { - std::string err_str; - Gtk::TreePath pth; -- bool res = TryAddMedia(fname.c_str(), pth, err_str); -+ bool res = TryAddMedia(fname.c_str(), pth, err_str) != nullptr; - if( !res ) - { - LOG_ERR << "TryAddMediaQuiet error (" << desc << "): " << err_str << io::endl; -@@ -538,7 +538,7 @@ - continue; - } - -- bool res = TryAddMedia(fpath.c_str(), brw_pth, err_str, insert_after); -+ bool res = TryAddMedia(fpath.c_str(), brw_pth, err_str, insert_after) != nullptr; - if( res ) - { - insert_after = true; // вставляем друг за другом ---- bombono-dvd-1.2.2/src/mgui/project/media-browser.cpp 2013-03-08 00:50:45.000000000 +0330 -+++ new/src/mgui/project/media-browser.cpp 2015-11-20 19:06:49.926950853 +0330 -@@ -854,7 +854,7 @@ - Gtk::MenuItem& ea_itm = AppendMI(mn, NewManaged<Gtk::MenuItem>(_("End Action"))); - // только видео - VideoItem vi = IsVideo(mi); -- if( SetEnabled(ea_itm, vi) ) -+ if( SetEnabled(ea_itm, vi != nullptr) ) - ea_itm.set_submenu(EndActionMenuBld(vi->PAction(), boost::function_identity, - VideoAddConstantChoice).Create()); - -@@ -863,10 +863,10 @@ - // калькулятор - AddDialogItem(mn, DialogParams(_("Bitrate Calculator"), bb::bind(&RunBitrateCalc, vi, _1, b::ref(brw)), - 350, &brw), tr_enabled); -- AddEnabledItem(mn, _("Reason For Transcoding"), bb::bind(&ShowDVDCompliantStatus, vi), vi); -+ AddEnabledItem(mn, _("Reason For Transcoding"), bb::bind(&ShowDVDCompliantStatus, vi), vi != nullptr); - AppendSeparator(mn); - -- AddDialogItem(mn, SubtitlesDialog(vi, &brw), vi); -+ AddDialogItem(mn, SubtitlesDialog(vi, &brw), vi != nullptr); - - Popup(mn, event, true); - } ---- bombono-dvd-1.2.2/src/mgui/project/thumbnail.cpp 2013-03-08 00:50:45.000000000 +0330 -+++ new/src/mgui/project/thumbnail.cpp 2015-11-20 19:22:23.963561051 +0330 -@@ -410,7 +410,7 @@ - { - if( AData().FirstPlayItem() != mi ) - return; -- bool is_menu = IsMenu(mi); -+ bool is_menu = IsMenu(mi) != nullptr; - RefPtr<Gdk::Pixbuf> emblem = GetCheckEmblem(pix, is_menu - ? "copy-n-paste/HelixPlayer_Activity-watch-listen/28.png" - : "copy-n-paste/HelixPlayer_Activity-watch-listen/16.png"); diff --git a/stream_bool_cast.patch b/stream_bool_cast.patch deleted file mode 100644 index 51c9132ca87c..000000000000 --- a/stream_bool_cast.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- bombono-dvd-1.2.2/src/mgui/stream_utils.h 2013-03-08 00:50:45.000000000 +0330 -+++ new/src/mgui/stream_utils.h 2015-11-26 20:37:42.780113771 +0330 -@@ -42,8 +42,8 @@ - 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) |