[bombono-dvd] patch for boost, ffmpeg and c++11 changes
Leigh Scott
leigh123linux at rpmfusion.org
Sun Jul 3 15:02:41 CEST 2016
commit deee5414f19b048acd4c99712061d8335756c73b
Author: leigh123linux <leigh123linux at googlemail.com>
Date: Sun Jul 3 14:02:31 2016 +0100
patch for boost, ffmpeg and c++11 changes
0001-ffmpeg-has-renamed-CodecID-AVCodecID.patch | 60 ---
0003-fixes-for-ffmpeg-3.0.1.patch | 140 ++++++
0005-fix-for-CXX11-Boost.patch | 125 ++++++
0006-fix-for-old-ffmpeg.patch | 33 ++
0007-fixes.patch | 66 +++
0008-add-std-c-11-by-default.patch | 26 ++
0009-deprecation-warning-hiding-auto_ptr.patch | 40 ++
bombono-dvd-boost-1.51.0-fix.patch | 537 ------------------------
bombono-dvd-buildflags.patch | 9 -
bombono-dvd.spec | 34 +-
10 files changed, 454 insertions(+), 616 deletions(-)
---
diff --git a/0003-fixes-for-ffmpeg-3.0.1.patch b/0003-fixes-for-ffmpeg-3.0.1.patch
new file mode 100644
index 0000000..de9092a
--- /dev/null
+++ b/0003-fixes-for-ffmpeg-3.0.1.patch
@@ -0,0 +1,140 @@
+From 282273b8a58160d881b74711475b51ec99fed02a Mon Sep 17 00:00:00 2001
+From: Ilya Murav'jov <muravev at yandex.ru>
+Date: Thu, 7 Apr 2016 15:21:19 +0300
+Subject: [PATCH 03/12] fixes for ffmpeg 3.0.1
+
+---
+ src/mgui/ffviewer.cpp | 62 ++++++++++++++++++++++++++++++++++++++++++++++-----
+ 1 file changed, 57 insertions(+), 5 deletions(-)
+
+diff --git a/src/mgui/ffviewer.cpp b/src/mgui/ffviewer.cpp
+index 92d76a4..1a536cb 100644
+--- a/src/mgui/ffviewer.cpp
++++ b/src/mgui/ffviewer.cpp
+@@ -48,6 +48,18 @@ C_LINKAGE_BEGIN
+ C_LINKAGE_END
+ #endif
+
++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57,05,00)
++C_LINKAGE_BEGIN
++#include <libavutil/imgutils.h>
++C_LINKAGE_END
++static int bmd_avpicture_get_size(enum AVPixelFormat pix_fmt, int width, int height)
++{
++ return av_image_get_buffer_size(pix_fmt, width, height, 1);
++}
++#else
++#define bmd_avpicture_get_size avpicture_get_size
++#endif
++
+ // Прямой доступ к ff_codec_bmp_tags, в частности, закрыл, некий
+ // Anton Khirnov, см. libavformat/libavformat.v (из него генерится скрипт
+ // для опции --version-script=<script_file> линковщика ld)
+@@ -406,7 +418,11 @@ static std::string CodecID2Str(CodecID codec_id)
+
+ #else // CALC_FF_TAG
+
+-static std::string CodecID2Str(CodecID codec_id)
++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(55,00,00)
++//#define CodecID AVCodecID
++#endif
++
++static std::string CodecID2Str(AVCodecID codec_id)
+ {
+ return Int2Str(codec_id);
+ }
+@@ -617,6 +633,13 @@ FFInfo::~FFInfo()
+ CloseInfo(*this);
+ }
+
++static int bmd_avpicture_fill(AVFrame *picture, const uint8_t *ptr,
++ AVPixelFormat pix_fmt, int width, int height)
++{
++ return av_image_fill_arrays(picture->data, picture->linesize,
++ ptr, pix_fmt, width, height, 1);
++}
++
+ bool FFViewer::Open(const char* fname, std::string& err_str)
+ {
+ // * закрываем открытое ранее
+@@ -635,11 +658,14 @@ bool FFViewer::Open(const char* fname, std::string& err_str)
+ // opt_default(); // обновление sws_opts по -sws_flags
+ // sws_flags = av_get_int(sws_opts, "sws_flags", NULL); // = sws_opts.flags
+ int sws_flags = SWS_BICUBIC;
++
++#if !(LIBSWSCALE_VERSION_INT >= AV_VERSION_INT(3,0,0))
+ // при сборке с --enable-runtime-cpudetect (появилось после 0.5), который полюбили пакетировщики,
+ // лучшая оптимизация выбирается на этапе выполнения, а не сборке; однако для 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;
++#endif
+
+ // :TRICKY: почему-то ffmpeg'у "нравится" BGR24 и не нравиться RGB24 в плане использования
+ // MMX (ускорения); цена по времени неизвестна,- используем только ради того, чтобы не было
+@@ -647,15 +673,27 @@ bool FFViewer::Open(const char* fname, std::string& err_str)
+ // Другой вариант - PIX_FMT_RGB32, но там зависимый порядок байтов (в GdkPixbuf - нет) и
+ // мы нацелены на RGB24
+ // :TODO: с версии LIBSWSCALE_VERSION_INT >= 0.8.11 появился прямой yuv -> rgb24, поправить
++#if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(54,17,00)
++ AVPixelFormat dst_pf = AV_PIX_FMT_BGR24; // AV_PIX_FMT_RGB24;
++#else
+ PixelFormat dst_pf = PIX_FMT_BGR24; // PIX_FMT_RGB24;
++#endif
++
+ 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(bmd_avpicture_get_size(dst_pf, dst_sz.x, dst_sz.y) * sizeof(uint8_t));
++
++ // не помешает
++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(56,35,01)
++ av_frame_unref(&rgbFrame);
++#else
++ avcodec_get_frame_defaults(&rgbFrame);
++#endif
++
++ bmd_avpicture_fill(&rgbFrame, rgbBuf, dst_pf, dst_sz.x, dst_sz.y);
+ }
+ else
+ // защита от неполных открытий
+@@ -841,7 +879,11 @@ static bool DoDecode(FFViewer& ffv)
+
+ DoVideoDecode(ffv, got_picture, &pkt);
+ }
++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57,8,00)
++ av_packet_unref(&pkt);
++#else
+ av_free_packet(&pkt);
++#endif
+ }
+ else if( av_res == (int)AVERROR_EOF ) // для mpegts также -EIO приходит
+ {
+@@ -1119,8 +1161,18 @@ static bool SeekSetTime(FFViewer& ffv, double time)
+ {
+ bool seek_ok = TimeSeek(ffv, start_time, time);
+ if( !seek_ok && CanByteSeek(ffv.iCtx) )
++ {
+ // тогда переходим в начало файла
+- seek_ok = DoSeek(ffv, ffv.iCtx->data_offset, true);
++#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(56,11,00)
++ // автор 9deaec782810d098bca11c9332fab2d2f4c5fb78 уверяет, что
++ // сокрытие AVFormatContext.internal в internal.h - это нормально
++ //int64_t data_offset = ffv.iCtx->internal->data_offset;
++ int64_t data_offset = 0;
++#else
++ int64_t data_offset = ffv.iCtx->data_offset;
++#endif
++ seek_ok = DoSeek(ffv, data_offset, true);
++ }
+
+ // некоторое видео глючит в начале (Hellboy), из-за чего
+ // последовательный доступ выполняется с перескоками -
+--
+2.7.4
+
diff --git a/0005-fix-for-CXX11-Boost.patch b/0005-fix-for-CXX11-Boost.patch
new file mode 100644
index 0000000..7cc7f55
--- /dev/null
+++ b/0005-fix-for-CXX11-Boost.patch
@@ -0,0 +1,125 @@
+From 9d40d4501cd104e7b0c52d28eeeb0f5c2fd4b13c Mon Sep 17 00:00:00 2001
+From: Ilya Murav'jov <muravev at yandex.ru>
+Date: Sat, 9 Apr 2016 11:52:11 +0300
+Subject: [PATCH 05/12] fix for CXX11 & Boost
+
+---
+ src/mgui/author/script.cpp | 2 +-
+ src/mgui/project/add.cpp | 4 ++--
+ src/mgui/project/media-browser.cpp | 6 +++---
+ src/mgui/project/menu-actions.cpp | 6 ++++--
+ src/mgui/project/thumbnail.cpp | 2 +-
+ src/mlib/ptr.h | 5 +++++
+ 6 files changed, 16 insertions(+), 9 deletions(-)
+
+diff --git a/src/mgui/author/script.cpp b/src/mgui/author/script.cpp
+index 526b244..ccfd32f 100644
+--- a/src/mgui/author/script.cpp
++++ b/src/mgui/author/script.cpp
+@@ -279,7 +279,7 @@ static void AddPostCmd(xmlpp::Element* pgc_node, MediaItem mi)
+
+ ASSERT_RTL( vi || mn );
+ // VTS domain
+- bool is_video = vi;
++ bool is_video = bool(vi);
+ const PostAction& pa = is_video ? vi->PAction() : mn->MtnData().pAct ;
+
+ std::string jnt_cmd;
+diff --git a/src/mgui/project/add.cpp b/src/mgui/project/add.cpp
+index cb8c792..9454578 100644
+--- a/src/mgui/project/add.cpp
++++ b/src/mgui/project/add.cpp
+@@ -415,7 +415,7 @@ void TryAddMediaQuiet(const std::string& fname, const std::string& desc)
+ {
+ std::string err_str;
+ Gtk::TreePath pth;
+- bool res = TryAddMedia(fname.c_str(), pth, err_str);
++ bool res = bool(TryAddMedia(fname.c_str(), pth, err_str));
+ if( !res )
+ {
+ LOG_ERR << "TryAddMediaQuiet error (" << desc << "): " << err_str << io::endl;
+@@ -538,7 +538,7 @@ void TryAddMedias(const Str::List& paths, MediaBrowser& brw,
+ continue;
+ }
+
+- bool res = TryAddMedia(fpath.c_str(), brw_pth, err_str, insert_after);
++ bool res = bool(TryAddMedia(fpath.c_str(), brw_pth, err_str, insert_after));
+ if( res )
+ {
+ insert_after = true; // вставляем друг за другом
+diff --git a/src/mgui/project/media-browser.cpp b/src/mgui/project/media-browser.cpp
+index ebe10a1..3daaa3e 100644
+--- a/src/mgui/project/media-browser.cpp
++++ b/src/mgui/project/media-browser.cpp
+@@ -854,7 +854,7 @@ static void OnMBButtonPress(ObjectBrowser& brw, MediaItem mi, GdkEventButton* ev
+ Gtk::MenuItem& ea_itm = AppendMI(mn, NewManaged<Gtk::MenuItem>(_("End Action")));
+ // только видео
+ VideoItem vi = IsVideo(mi);
+- if( SetEnabled(ea_itm, vi) )
++ if( SetEnabled(ea_itm, bool(vi)) )
+ ea_itm.set_submenu(EndActionMenuBld(vi->PAction(), boost::function_identity,
+ VideoAddConstantChoice).Create());
+
+@@ -863,10 +863,10 @@ static void OnMBButtonPress(ObjectBrowser& brw, MediaItem mi, GdkEventButton* ev
+ // калькулятор
+ 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), bool(vi));
+ AppendSeparator(mn);
+
+- AddDialogItem(mn, SubtitlesDialog(vi, &brw), vi);
++ AddDialogItem(mn, SubtitlesDialog(vi, &brw), bool(vi));
+
+ Popup(mn, event, true);
+ }
+diff --git a/src/mgui/project/menu-actions.cpp b/src/mgui/project/menu-actions.cpp
+index 95636de..7da1ece 100644
+--- a/src/mgui/project/menu-actions.cpp
++++ b/src/mgui/project/menu-actions.cpp
+@@ -197,9 +197,11 @@ void UpdateMenuRegionObject(Comp::Object* obj, const Point& menu_sz, RectListRgn
+ void EraseLinkedMenus(MenuPack& mp)
+ {
+ CanvasBuf& cb = mp.thRgn.GetCanvasBuf();
++ const Point& menu_sz = cb.Size();
++ RectListRgn& lst = cb.RenderList();
+ ForeachLinked(mp.Owner(), bb::bind(&UpdateMenuRegionObject,
+- _1, boost::cref(cb.Size()),
+- boost::ref(cb.RenderList())));
++ _1, boost::cref(menu_sz),
++ boost::ref(lst)));
+ }
+
+ void RegionEraserVis::ProcessImpl(bool exceed)
+diff --git a/src/mgui/project/thumbnail.cpp b/src/mgui/project/thumbnail.cpp
+index d4f6411..4311399 100644
+--- a/src/mgui/project/thumbnail.cpp
++++ b/src/mgui/project/thumbnail.cpp
+@@ -410,7 +410,7 @@ void StampFPEmblem(MediaItem mi, RefPtr<Gdk::Pixbuf> pix)
+ {
+ if( AData().FirstPlayItem() != mi )
+ return;
+- bool is_menu = IsMenu(mi);
++ bool is_menu = bool(IsMenu(mi));
+ 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/src/mlib/ptr.h b/src/mlib/ptr.h
+index 4891fa1..9d72615 100644
+--- a/src/mlib/ptr.h
++++ b/src/mlib/ptr.h
+@@ -153,6 +153,11 @@ class shared: public boost::shared_ptr<T>
+ return *this;
+ }
+
++ operator bool () const
++ {
++ return this->get() != 0;
++ }
++
+ #if 0
+ // кострукторы приведения
+ template<class Y>
+--
+2.7.4
+
diff --git a/0006-fix-for-old-ffmpeg.patch b/0006-fix-for-old-ffmpeg.patch
new file mode 100644
index 0000000..2392371
--- /dev/null
+++ b/0006-fix-for-old-ffmpeg.patch
@@ -0,0 +1,33 @@
+From 2d72b907a81aa6a96bffaeabd78a1d546891e97d Mon Sep 17 00:00:00 2001
+From: Ilya Murav'jov <muravev at yandex.ru>
+Date: Sat, 9 Apr 2016 12:17:56 +0300
+Subject: [PATCH 06/12] fix for old ffmpeg
+
+---
+ src/mgui/ffviewer.cpp | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/mgui/ffviewer.cpp b/src/mgui/ffviewer.cpp
+index 1a536cb..c0677c2 100644
+--- a/src/mgui/ffviewer.cpp
++++ b/src/mgui/ffviewer.cpp
+@@ -633,12 +633,16 @@ FFInfo::~FFInfo()
+ CloseInfo(*this);
+ }
+
++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57,5,00)
+ static int bmd_avpicture_fill(AVFrame *picture, const uint8_t *ptr,
+ AVPixelFormat pix_fmt, int width, int height)
+ {
+ return av_image_fill_arrays(picture->data, picture->linesize,
+ ptr, pix_fmt, width, height, 1);
+ }
++#else
++#define bmd_avpicture_fill avpicture_fill
++#endif
+
+ bool FFViewer::Open(const char* fname, std::string& err_str)
+ {
+--
+2.7.4
+
diff --git a/0007-fixes.patch b/0007-fixes.patch
new file mode 100644
index 0000000..ad78ed0
--- /dev/null
+++ b/0007-fixes.patch
@@ -0,0 +1,66 @@
+From 11f8b5a9cb2fc36c42103ddc6866836b4bf57f58 Mon Sep 17 00:00:00 2001
+From: Ilya Murav'jov <muravev at yandex.ru>
+Date: Sat, 9 Apr 2016 12:48:10 +0300
+Subject: [PATCH 07/12] fixes
+
+---
+ src/mgui/ffviewer.cpp | 6 +++---
+ src/mgui/stream_utils.h | 4 ++--
+ src/mgui/tests/test_compile.cpp | 2 +-
+ 3 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/src/mgui/ffviewer.cpp b/src/mgui/ffviewer.cpp
+index c0677c2..64ea813 100644
+--- a/src/mgui/ffviewer.cpp
++++ b/src/mgui/ffviewer.cpp
+@@ -633,16 +633,16 @@ FFInfo::~FFInfo()
+ CloseInfo(*this);
+ }
+
+-#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57,5,00)
+ static int bmd_avpicture_fill(AVFrame *picture, const uint8_t *ptr,
+ AVPixelFormat pix_fmt, int width, int height)
+ {
++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57,5,00)
+ return av_image_fill_arrays(picture->data, picture->linesize,
+ ptr, pix_fmt, width, height, 1);
+-}
+ #else
+-#define bmd_avpicture_fill avpicture_fill
++ return avpicture_fill((AVPicture*)picture, ptr, pix_fmt, width, height);
+ #endif
++}
+
+ bool FFViewer::Open(const char* fname, std::string& err_str)
+ {
+diff --git a/src/mgui/stream_utils.h b/src/mgui/stream_utils.h
+index 3caa492..6f91600 100644
+--- a/src/mgui/stream_utils.h
++++ b/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 void*() const { return (void*)io_strm; }
++ //bool operator!() const { return !operator void*(); }
+ stream& seekg(streamoff off, ios_base::seekdir dir)
+ { io_strm.seekg(off, dir); return *this; }
+ stream& seekp(streamoff off, ios_base::seekdir dir)
+diff --git a/src/mgui/tests/test_compile.cpp b/src/mgui/tests/test_compile.cpp
+index 95f91be..0bbc364 100644
+--- a/src/mgui/tests/test_compile.cpp
++++ b/src/mgui/tests/test_compile.cpp
+@@ -44,7 +44,7 @@ BOOST_AUTO_TEST_CASE( test_lambda )
+ std::for_each(r_lst.begin(), r_lst.end(), (
+ lambda::var(cut_rct) = lambda::bind(Intersection<int>, lambda::_1, ref(plc_rct)),
+ lambda::if_then( !lambda::bind(&RectT<int>::IsNull, lambda::var(cut_rct)),
+- lambda::bind(&DrwFunctor::operator(), ref(drw_fnr), lambda::var(cut_rct)) )
++ lambda::bind(&DrwFunctor::operator(), drw_fnr, lambda::var(cut_rct)) )
+ ) );
+ }
+
+--
+2.7.4
+
diff --git a/0008-add-std-c-11-by-default.patch b/0008-add-std-c-11-by-default.patch
new file mode 100644
index 0000000..4e9f38e
--- /dev/null
+++ b/0008-add-std-c-11-by-default.patch
@@ -0,0 +1,26 @@
+From b964f9e9af92047f4e884d2eb2347b870fbf086e Mon Sep 17 00:00:00 2001
+From: Ilya Murav'jov <muravev at yandex.ru>
+Date: Sat, 9 Apr 2016 13:11:12 +0300
+Subject: [PATCH 08/12] add -std=c++11 by default
+
+---
+ SConstruct | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/SConstruct b/SConstruct
+index 38c3acd..d893f63 100644
+--- a/SConstruct
++++ b/SConstruct
+@@ -69,7 +69,8 @@ def CalcCommonFlags():
+ global common_warn_flags, cxx_warn_flags, debug_flags, defines
+ if BV.IsGccCompiler():
+ # GCC
+- common_warn_flags = ['-ansi']
++ # -std=c++11 is required by sigc++, shit
++ common_warn_flags = ['-ansi', '-std=c++11']
+ # -Wno-reorder - not to warn if not accurate order in ctor (let compiler do!)
+ # :TODO: why
+ # CXXCOM = $CXX -o $TARGET -c $CXXFLAGS $CCFLAGS ...
+--
+2.7.4
+
diff --git a/0009-deprecation-warning-hiding-auto_ptr.patch b/0009-deprecation-warning-hiding-auto_ptr.patch
new file mode 100644
index 0000000..0ef0ac5
--- /dev/null
+++ b/0009-deprecation-warning-hiding-auto_ptr.patch
@@ -0,0 +1,40 @@
+From f17e29ed98655385abc0888eebcdf75ef5a7db29 Mon Sep 17 00:00:00 2001
+From: Ilya Murav'jov <muravev at yandex.ru>
+Date: Sat, 9 Apr 2016 13:33:40 +0300
+Subject: [PATCH 09/12] deprecation warning hiding (auto_ptr)
+
+---
+ SConstruct | 9 ++++++---
+ 1 file changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/SConstruct b/SConstruct
+index d893f63..7cd7762 100644
+--- a/SConstruct
++++ b/SConstruct
+@@ -69,8 +69,11 @@ def CalcCommonFlags():
+ global common_warn_flags, cxx_warn_flags, debug_flags, defines
+ if BV.IsGccCompiler():
+ # GCC
++ common_warn_flags = ['-ansi']
+ # -std=c++11 is required by sigc++, shit
+- common_warn_flags = ['-ansi', '-std=c++11']
++ # and auto_ptr is deprecated, so
++ common_warn_flags.extend(['-std=c++11', "-Wno-deprecated-declarations"])
++
+ # -Wno-reorder - not to warn if not accurate order in ctor (let compiler do!)
+ # :TODO: why
+ # CXXCOM = $CXX -o $TARGET -c $CXXFLAGS $CCFLAGS ...
+@@ -207,8 +210,8 @@ def ParseVariables(user_options):
+ 'Set to 1 if you want to build and run tests.',
+ 'false')),
+ (BoolVariable('USE_EXT_BOOST',
+- 'Leave this setting 0 to use embedded Boost library version (recommended).',
+- 'false')),
++ 'Leave this setting 0 to use embedded Boost library version (not recommended).',
++ 'true')),
+ ('BOOST_INCLUDE', 'Set to include path for external(not embedded) version of the Boost library.', ''),
+ ('BOOST_LIBPATH', 'Set to library dir path for external(not embedded) version of the Boost library.', ''),
+ ('DVDREAD_INCLUDE', 'Set to include path for libdvdread header files.', ''),
+--
+2.7.4
+
diff --git a/bombono-dvd.spec b/bombono-dvd.spec
index 34ac4d2..6d21a68 100644
--- a/bombono-dvd.spec
+++ b/bombono-dvd.spec
@@ -2,7 +2,7 @@
Name: bombono-dvd
Version: 1.2.2
-Release: 11%{?rel_tag}%{?dist}
+Release: 12%{?rel_tag}%{?dist}
Summary: DVD authoring program with nice and clean GUI
# License breakdown in README.
License: GPLv2 and GPLv2+ and Boost and Python and LGPLv2+
@@ -16,7 +16,14 @@ Url: http://www.bombono.org
Source: http://sourceforge.net/projects/bombono/files/bombono-dvd/1.2/bombono-dvd-1.2.2.tar.bz2
Patch0: filesys-include-path.patch
# https://sourceforge.net/apps/trac/bombono/ticket/98
-Patch1: 0001-ffmpeg-has-renamed-CodecID-AVCodecID.patch
+
+# Upstream patches
+Patch1: 0003-fixes-for-ffmpeg-3.0.1.patch
+Patch2: 0005-fix-for-CXX11-Boost.patch
+Patch3: 0006-fix-for-old-ffmpeg.patch
+Patch4: 0007-fixes.patch
+Patch5: 0008-add-std-c-11-by-default.patch
+Patch6: 0009-deprecation-warning-hiding-auto_ptr.patch
# needs to match TBB - from adobe-source-libraries
ExclusiveArch: i686 x86_64 ia64
@@ -71,10 +78,13 @@ re-authoring by importing video from DVD discs is also supported.
%prep
%setup -q
-%if %{fedora} > 17
%patch0 -p1
%patch1 -p1
-%endif
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
sed -i '\;#![ ]*/usr/bin/env;d' $(find . -name SCons\*)
rm -r debian libs/boost-lib src/mlib/tests libs/mpeg2dec ./libs/asl/adobe
@@ -92,21 +102,22 @@ desktop-file-validate \
%postun
/usr/bin/update-desktop-database &> /dev/null || :
if [ $1 -eq 0 ] ; then
- /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null
- /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+ /bin/touch --no-create %{_datadir}/icons/hicolor &> /dev/null
+ /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
fi
%post
/usr/bin/update-desktop-database &> /dev/null || :
-/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+/bin/touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
%posttrans
-/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
%files -f bombono-dvd.lang
-%doc README COPYING docs
+%doc README docs
+%license COPYING
%{_bindir}/*
-%{_datadir}/bombono
+%{_datadir}/bombono/
%{_datadir}/applications/bombono-dvd.desktop
%{_datadir}/pixmaps/bombono-dvd.png
%{_datadir}/icons/hicolor/*/apps/bombono-dvd.png
@@ -114,6 +125,9 @@ fi
%{_mandir}/man1/*
%changelog
+* Sun Jul 03 2016 Leigh Scott <leigh123linux at googlemail.com> - 1.2.2-12
+- patch for boost, ffmpeg and c++11 changes
+
* Sun Oct 19 2014 Sérgio Basto <sergio at serjux.com> - 1.2.2-11
- Rebuilt for FFmpeg 2.4.3
More information about the rpmfusion-commits
mailing list