diff options
9 files changed, 73 insertions, 167 deletions
diff --git a/multimedia/bombono-dvd/bombono-dvd.SlackBuild b/multimedia/bombono-dvd/bombono-dvd.SlackBuild index 5b90d4d6d9..3febf0b17f 100644 --- a/multimedia/bombono-dvd/bombono-dvd.SlackBuild +++ b/multimedia/bombono-dvd/bombono-dvd.SlackBuild @@ -23,13 +23,13 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=bombono-dvd -VERSION=${VERSION:-1.2.2} -BUILD=${BUILD:-2} +VERSION=${VERSION:-1.2.4} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -40,8 +40,8 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" TARGET="i386" elif [ "$ARCH" = "i686" ]; then @@ -60,17 +60,15 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.?z* +tar xvf $CWD/$PRGNAM-$VERSION.tar.gz cd $PRGNAM-$VERSION chown -R root:root . find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ + -o -perm 511 \) -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -# Fix for glib>=2.31 -#sed -i "s|^\#include <glib/.*\.h>$||" src/mgui/author/gb_devices.c # Let us specify our CFLAGS sed -i "s|-O2||" SConstruct # Allow use of cdrtools as an alternative to cdrkit, thanks gentoo @@ -78,21 +76,21 @@ patch -p1 < $CWD/patches/bombono-dvd-1.2.0-cdrtools.patch # Fix for the newer ffmpeg - thanks ArchLinux patch -p1 < $CWD/patches/fix_ffmpeg_codecid.patch -# Fix for ffmpeg-2.6.3 - thanks to Gentoo and John Vogel -patch -p1 < $CWD/patches/bombono-dvd-1.2.2-ffmpeg26.patch + # Credit to ARCH Linux patch -p1 < $CWD/patches/fix_ptr2bool_cast.patch patch -p1 < $CWD/patches/fix_c++11_literal_warnings.patch -patch -p1 < $CWD/patches/fix_crefoftemp_bug.patch patch -p1 < $CWD/patches/autoptr2uniqueptr.patch -patch -p1 < $CWD/patches/stream_bool_cast.patch patch -p1 < $CWD/patches/boost.patch +# Fix for ffmpeg-3 +patch -p1 < $CWD/patches/ffmpeg3.patch + # Build package scons \ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS -Wno-unused-local-typedefs" \ - CPPFLAGS="-std=c++11 \ + CPPFLAGS="-std=c++14 \ -DBOOST_SYSTEM_NO_DEPRECATED \ -DBOOST_FILESYSTEM_NO_DEPRECATED \ -DBOOST_FILESYSTEM_VERSION=3" \ @@ -112,7 +110,7 @@ scons \ DESTDIR=$PKG \ install -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ +find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true mv $PKG/usr/share/man $PKG/usr/ @@ -120,11 +118,8 @@ mv $PKG/usr/share/man $PKG/usr/ find $PKG/usr/man -type f -exec gzip -9 {} \; for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done -# Copy documentation mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a \ - COPYING README \ - $PKG/usr/doc/$PRGNAM-$VERSION +cp -a COPYING README $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/multimedia/bombono-dvd/bombono-dvd.info b/multimedia/bombono-dvd/bombono-dvd.info index 23dd13e18a..74b458e16e 100644 --- a/multimedia/bombono-dvd/bombono-dvd.info +++ b/multimedia/bombono-dvd/bombono-dvd.info @@ -1,8 +1,8 @@ PRGNAM="bombono-dvd" -VERSION="1.2.2" +VERSION="1.2.4" HOMEPAGE="http://www.bombono.org/" -DOWNLOAD="http://downloads.sourceforge.net/bombono/bombono-dvd-1.2.2.tar.bz2" -MD5SUM="b4fd43025cab3bbf76275f7b87952a93" +DOWNLOAD="https://github.com/muravjov/bombono-dvd/archive/1.2.4/bombono-dvd-1.2.4.tar.gz" +MD5SUM="76c70125fc1de553f7b46ac09aaedba2" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="dvdauthor ffmpeg libxml++ mjpegtools twolame" diff --git a/multimedia/bombono-dvd/patches/bombono-dvd-1.2.2-ffmpeg26.patch b/multimedia/bombono-dvd/patches/bombono-dvd-1.2.2-ffmpeg26.patch deleted file mode 100644 index b511a9d4eb..0000000000 --- a/multimedia/bombono-dvd/patches/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/multimedia/bombono-dvd/patches/ffmpeg3.patch b/multimedia/bombono-dvd/patches/ffmpeg3.patch new file mode 100644 index 0000000000..ccf726cd1f --- /dev/null +++ b/multimedia/bombono-dvd/patches/ffmpeg3.patch @@ -0,0 +1,24 @@ +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 + ++C_LINKAGE_BEGIN ++#include <libavutil/imgutils.h> ++C_LINKAGE_END ++ + // разрабы libav считают себя самыми умными и потому решили + // закрыть простым смертным доступ к ffurl_register_protocol() + // (бывшая av_register_protocol2()),- https://bugzilla.libav.org/show_bug.cgi?id=224 +@@ -807,7 +811,7 @@ + #ifdef AVFRAME_INIT_CHANGE + // avcodec_get_frame_defaults() перенесли в avcodec_decode_video2() + #else +- avcodec_get_frame_defaults(&picture); // ffmpeg.c очищает каждый раз ++ av_frame_unref (&picture); + #endif + + #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52,25,00) + diff --git a/multimedia/bombono-dvd/patches/fix_c++11_literal_warnings.patch b/multimedia/bombono-dvd/patches/fix_c++11_literal_warnings.patch index b8fe387679..5cfc96f47e 100644 --- a/multimedia/bombono-dvd/patches/fix_c++11_literal_warnings.patch +++ b/multimedia/bombono-dvd/patches/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/multimedia/bombono-dvd/patches/fix_crefoftemp_bug.patch b/multimedia/bombono-dvd/patches/fix_crefoftemp_bug.patch deleted file mode 100644 index 0ef7f942a8..0000000000 --- a/multimedia/bombono-dvd/patches/fix_crefoftemp_bug.patch +++ /dev/null @@ -1,21 +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/multimedia/bombono-dvd/patches/fix_ffmpeg_codecid.patch b/multimedia/bombono-dvd/patches/fix_ffmpeg_codecid.patch index 08abbd0beb..6474693db4 100644 --- a/multimedia/bombono-dvd/patches/fix_ffmpeg_codecid.patch +++ b/multimedia/bombono-dvd/patches/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,4 @@ 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/multimedia/bombono-dvd/patches/fix_ptr2bool_cast.patch b/multimedia/bombono-dvd/patches/fix_ptr2bool_cast.patch index ac67dc8731..4999db1ca4 100644 --- a/multimedia/bombono-dvd/patches/fix_ptr2bool_cast.patch +++ b/multimedia/bombono-dvd/patches/fix_ptr2bool_cast.patch @@ -1,77 +1,13 @@ ---- 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/multimedia/bombono-dvd/patches/stream_bool_cast.patch b/multimedia/bombono-dvd/patches/stream_bool_cast.patch deleted file mode 100644 index b5bf9c1d4c..0000000000 --- a/multimedia/bombono-dvd/patches/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) |