diff options
| -rw-r--r-- | .SRCINFO | 14 | ||||
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | PKGBUILD | 18 | ||||
| -rw-r--r-- | fix_ffmpeg5.patch | 159 | ||||
| -rw-r--r-- | inc_boost_header.patch | 116 |
5 files changed, 297 insertions, 11 deletions
@@ -1,15 +1,15 @@ # Generated by mksrcinfo v8 -# Sat Oct 12 15:36:34 UTC 2019 +# Thu Nov 9 06:16:16 UTC 2023 pkgbase = bombono-dvd pkgdesc = DVD authoring program with nice and clean GUI pkgver = 1.2.4 - pkgrel = 4 - url = http://www.bombono.org + pkgrel = 9 + url = https://bombono.com/ install = bombono-dvd.install arch = i686 arch = x86_64 license = GPL - makedepends = python2-scons + makedepends = scons2 depends = gtk2 depends = gtkmm depends = mjpegtools @@ -24,24 +24,28 @@ pkgbase = bombono-dvd depends = cdrkit optdepends = gvfs: web browser integration conflicts = bombono-dvd-git - source = https://github.com/muravjov/bombono-dvd/archive/1.2.4.tar.gz + source = https://github.com/bombono-dvd/bombono-dvd/archive/refs/tags/1.2.4.tar.gz source = fix_ffmpeg_codecid.patch source = fix_ptr2bool_cast.patch source = fix_c++11_literal_warnings.patch source = autoptr2uniqueptr.patch + source = inc_boost_header.patch source = fix_deprecated_boost_api.patch source = fix_throw_specifications.patch source = fix_operator_ambiguity.patch source = fix_ffmpeg30.patch + source = fix_ffmpeg5.patch sha256sums = 4f8c882a0c359ca8c182a627885c64aa271820eead2f9a64b34f1625c3b0a9d7 sha256sums = 63e47ffb812acb33a4d1f5d7f421eb2ccdf3ee1ce1b7f75267c32079dbc9dea1 sha256sums = b0ff83b2fad27e39dfd77d12e00c25e554fe86ee1894c2f8fbe1915a2c46dd88 sha256sums = 28be98eb36eb6422717df7048c8ee74927495e7d7829e17cb54d746befc238c4 sha256sums = 4c29e9b19ba3bcf8c42c46aaea6c1411580629e581307a91f4d085fcdaa6eab6 + sha256sums = 49f61bb2db0498440ec8926c17a88a993081a583337f41c0d9fd8f1b11b0b0ac sha256sums = a69f51f9d5bd6ebe26c13abeece9de012d110dcec944c76efbab59b6bc0ef915 sha256sums = 72b3d6c76cbf98fb9287f7ee5b7a57b6febe2a635d50758c2451e376e3e6ca02 sha256sums = 9d56f7d16c55a506b092dbec00789e4767963d6202d3d92b79ad389393d43c69 sha256sums = f6fd3a309987ac08b6f70132686c5a06bc7496fb6e1097539d6348f558d09502 + sha256sums = bab551ef9733eb67c1e036becec0600c31479fbdf49f6e3b4380efdcbdae726c pkgname = bombono-dvd diff --git a/.gitignore b/.gitignore index b101a9aeac20..3b71fba5add5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ bombono-dvd-*.tar.bz2 +*.pkg.tar.zst *.pkg.tar.xz *.tar.gz pkg/ @@ -3,35 +3,39 @@ pkgname=bombono-dvd pkgver=1.2.4 -pkgrel=4 +pkgrel=9 pkgdesc="DVD authoring program with nice and clean GUI" arch=('i686' 'x86_64') -url="http://www.bombono.org" +url="https://bombono.com/" license=('GPL') depends=('gtk2' 'gtkmm' 'mjpegtools' 'ffmpeg' 'libdvdread' 'dvdauthor' \ 'dvd+rw-tools' 'twolame' 'libxml++2.6' 'boost' 'enca' 'cdrkit') -makedepends=('python2-scons') +makedepends=('scons2') optdepends=('gvfs: web browser integration') conflicts=('bombono-dvd-git') -source=("https://github.com/muravjov/${pkgname}/archive/${pkgver}.tar.gz" +source=("https://github.com/${pkgname}/${pkgname}/archive/refs/tags/${pkgver}.tar.gz" "fix_ffmpeg_codecid.patch" "fix_ptr2bool_cast.patch" "fix_c++11_literal_warnings.patch" "autoptr2uniqueptr.patch" + "inc_boost_header.patch" "fix_deprecated_boost_api.patch" "fix_throw_specifications.patch" "fix_operator_ambiguity.patch" - "fix_ffmpeg30.patch") + "fix_ffmpeg30.patch" + "fix_ffmpeg5.patch") install=bombono-dvd.install sha256sums=('4f8c882a0c359ca8c182a627885c64aa271820eead2f9a64b34f1625c3b0a9d7' '63e47ffb812acb33a4d1f5d7f421eb2ccdf3ee1ce1b7f75267c32079dbc9dea1' 'b0ff83b2fad27e39dfd77d12e00c25e554fe86ee1894c2f8fbe1915a2c46dd88' '28be98eb36eb6422717df7048c8ee74927495e7d7829e17cb54d746befc238c4' '4c29e9b19ba3bcf8c42c46aaea6c1411580629e581307a91f4d085fcdaa6eab6' + '49f61bb2db0498440ec8926c17a88a993081a583337f41c0d9fd8f1b11b0b0ac' 'a69f51f9d5bd6ebe26c13abeece9de012d110dcec944c76efbab59b6bc0ef915' '72b3d6c76cbf98fb9287f7ee5b7a57b6febe2a635d50758c2451e376e3e6ca02' '9d56f7d16c55a506b092dbec00789e4767963d6202d3d92b79ad389393d43c69' - 'f6fd3a309987ac08b6f70132686c5a06bc7496fb6e1097539d6348f558d09502') + 'f6fd3a309987ac08b6f70132686c5a06bc7496fb6e1097539d6348f558d09502' + 'bab551ef9733eb67c1e036becec0600c31479fbdf49f6e3b4380efdcbdae726c') prepare() { cd "${pkgname}-${pkgver}" @@ -43,6 +47,8 @@ prepare() { patch -Np1 -i "${srcdir}/fix_ffmpeg30.patch" patch -Np1 -i "${srcdir}/fix_throw_specifications.patch" patch -Np1 -i "${srcdir}/fix_operator_ambiguity.patch" + patch -Np1 -i "${srcdir}/inc_boost_header.patch" + patch -Np1 -i "${srcdir}/fix_ffmpeg5.patch" # python2 fix for file in $(find . -name '*.py' -print); do sed -i 's_#!.*/usr/bin/python_#!/usr/bin/python2_' $file diff --git a/fix_ffmpeg5.patch b/fix_ffmpeg5.patch new file mode 100644 index 000000000000..371afa0388b2 --- /dev/null +++ b/fix_ffmpeg5.patch @@ -0,0 +1,159 @@ +diff -ruN old/src/mgui/ffviewer.cpp new/src/mgui/ffviewer.cpp +--- old/src/mgui/ffviewer.cpp 2022-08-26 15:51:35.995797128 +0430 ++++ new/src/mgui/ffviewer.cpp 2022-08-26 15:56:06.538840475 +0430 +@@ -37,6 +37,7 @@ + #endif + + C_LINKAGE_BEGIN ++#include <libavcodec/avcodec.h> + #include <libavutil/imgutils.h> + C_LINKAGE_END + +@@ -111,7 +112,7 @@ + + AVCodecContext* GetVideoCtx(FFData& ffv) + { +- return VideoStream(ffv)->codec; ++ return ffv.videoCtx; + } + + static bool IsValidRational(const AVRational& r) +@@ -294,6 +295,7 @@ + #else + av_close_input_file(ffi.iCtx); + #endif ++ avcodec_free_context(&ffi.videoCtx); + ffi.iCtx = 0; + } + } +@@ -437,8 +439,6 @@ + { + std::string& err_str = diag.errStr; + +- av_register_all(); +- + ASSERT( !ffi.IsOpened() ); + bool res = false; + +@@ -508,14 +508,14 @@ + for( int i=0; i < (int)ic->nb_streams; i++ ) + { + AVStream* strm = ic->streams[i]; +- AVCodecContext* avctx = strm->codec; +- if( SetIndex(video_idx, i, avctx->codec_type == AVMEDIA_TYPE_VIDEO) ) ++ AVCodecParameters* avcp = strm->codecpar; ++ if( SetIndex(video_idx, i, avcp->codec_type == AVMEDIA_TYPE_VIDEO) ) + ; + else + // для демиксера имеет значение только NONE и ALL + strm->discard = AVDISCARD_ALL; + +- SetIndex(audio_idx, i, avctx->codec_type == AVMEDIA_TYPE_AUDIO); ++ SetIndex(audio_idx, i, avcp->codec_type == AVMEDIA_TYPE_AUDIO); + } + + if( video_idx == -1 ) +@@ -562,23 +562,29 @@ + } + + // открытие кодека +- AVCodecContext* dec = ic->streams[video_idx]->codec; +- // для H.264 и плохих TS +- dec->strict_std_compliance = FF_COMPLIANCE_STRICT; ++ AVCodecParameters* decp = ic->streams[video_idx]->codecpar; + + // Chromium зачем-то выставляет явно, но такие значения уже по умолчанию + //dec->error_concealment = FF_EC_GUESS_MVS | FF_EC_DEBLOCK; + //dec->error_recognition = FF_ER_CAREFUL; + +- std::string tag_str = CodecID2Str(dec->codec_id); ++ std::string tag_str = CodecID2Str(decp->codec_id); + // AVCodec - это одиночка, а AVCodecContext - состояние для него + // в соответ. потоке контейнера +- AVCodec* codec = avcodec_find_decoder(dec->codec_id); ++ const AVCodec* codec = avcodec_find_decoder(decp->codec_id); + if( !codec ) + { + err_str = BF_("No decoder found for the stream: %1%") % tag_str % bf::stop; + return false; + } ++ AVCodecContext *dec; ++ ffi.videoCtx = dec = avcodec_alloc_context3(codec); ++ if( avcodec_parameters_to_context(dec, decp) < 0 ) ++ { ++ err_str = _("Can't copy codec parameters"); ++ return false; ++ } ++ dec->strict_std_compliance = FF_COMPLIANCE_STRICT; + + // :TRICKY: вся полезна инфо о дорожке, включая размеры видео, реально парсится + // в av_find_stream_info(), а в avcodec_open() - кодек только привязывается к +@@ -824,7 +830,15 @@ + pkt->data = 0; + pkt->size = 0; + } +- int av_res = avcodec_decode_video2(GetVideoCtx(ffv), &picture, &got_picture, pkt); ++ int av_res = avcodec_send_packet(GetVideoCtx(ffv), pkt); ++ if( av_res >= 0 ) ++ { ++ av_res = avcodec_receive_frame(GetVideoCtx(ffv), &picture); ++ if( av_res >= 0 ) ++ { ++ got_picture = 1; ++ } ++ } + #else + const uint8_t* buf = 0; + int buf_sz = 0; +@@ -870,7 +884,8 @@ + // в идеале длительность уже была рассчитана в предыдущем pkt->duration; + // пока же сделаем копипаст как в ffmpeg.c - см. особенности ffmpeg (compute_pkt_fields()) + AVStream* st = VideoStream(ffv); +- int ticks = st->parser ? st->parser->repeat_pict + 1 : dec->ticks_per_frame ; ++ AVCodecParserContext *pctx = av_stream_get_parser(st); ++ int ticks = pctx ? pctx->repeat_pict + 1 : dec->ticks_per_frame; + next_pts += VideoFrameLength(dec, ticks); + } + +@@ -1082,7 +1097,7 @@ + // переход по позиции не работает для avi, mkv - см. особенности ffmpeg + // однако для без-заголовочных демиксеров (MPEG-PS, MPEG-TS) требуется + +- typedef std::map<std::string, AVInputFormat*> Map; ++ typedef std::map<std::string, const AVInputFormat*> Map; + static Map map; + if( map.empty() ) + { +diff -ruN old/src/mgui/ffviewer.h new/src/mgui/ffviewer.h +--- old/src/mgui/ffviewer.h 2016-04-10 15:15:39.000000000 +0430 ++++ new/src/mgui/ffviewer.h 2022-08-26 16:00:47.375606645 +0430 +@@ -53,6 +53,7 @@ + // + typedef FFViewer VideoViewer; + ++struct AVCodecContext; + struct FFData; + double FrameFPS(FFData& ffv); + double Duration(FFData& ffv); +@@ -70,6 +71,7 @@ + struct FFData: public boost::noncopyable + { + AVFormatContext* iCtx; ++ AVCodecContext* videoCtx; + int videoIdx; + Point vidSz; // первоначальный размер + +diff -ruN old/src/mgui/project/media-browser.cpp new/src/mgui/project/media-browser.cpp +--- old/src/mgui/project/media-browser.cpp 2016-04-10 15:15:39.000000000 +0430 ++++ new/src/mgui/project/media-browser.cpp 2022-08-26 15:56:06.538840475 +0430 +@@ -240,8 +240,8 @@ + a_cnt = 0; + for( int i=0; i < (int)ic->nb_streams; i++ ) + { +- AVCodecContext* avctx = ic->streams[i]->codec; +- if( avctx->codec_type == AVMEDIA_TYPE_AUDIO ) ++ AVCodecParameters* avp = ic->streams[i]->codecpar; ++ if( avp->codec_type == AVMEDIA_TYPE_AUDIO ) + a_cnt++; + } + diff --git a/inc_boost_header.patch b/inc_boost_header.patch new file mode 100644 index 000000000000..74a0387ec06e --- /dev/null +++ b/inc_boost_header.patch @@ -0,0 +1,116 @@ +diff -ruN old/src/mbase/project/table.cpp new/src/mbase/project/table.cpp +--- old/src/mbase/project/table.cpp 2022-02-04 22:35:45.903951084 +0330 ++++ new/src/mbase/project/table.cpp 2022-02-04 22:33:44.542891731 +0330 +@@ -29,6 +29,7 @@ + #include "theme.h" + + #include <mbase/resources.h> ++#include <boost/filesystem/directory.hpp> + + + const char* APROJECT_VERSION = "1.2.4"; +diff -ruN old/src/mgui/editor/toolbar.cpp new/src/mgui/editor/toolbar.cpp +--- old/src/mgui/editor/toolbar.cpp 2016-04-10 15:15:39.000000000 +0430 ++++ new/src/mgui/editor/toolbar.cpp 2022-02-04 22:33:44.542891731 +0330 +@@ -45,6 +45,8 @@ + #include <mlib/sdk/logger.h> + #include <mlib/range/enumerate.h> + ++#include <boost/filesystem/directory.hpp> ++ + namespace Editor + { + +diff -ruN old/src/mgui/project/mconstructor.cpp new/src/mgui/project/mconstructor.cpp +--- old/src/mgui/project/mconstructor.cpp 2016-04-10 15:15:39.000000000 +0430 ++++ new/src/mgui/project/mconstructor.cpp 2022-02-04 22:33:44.542891731 +0330 +@@ -52,6 +52,8 @@ + // COPY_N_PASTE_ETALON из go-file.c, проект Gnumeric, http://projects.gnome.org/gnumeric/ + // + ++#include <boost/filesystem/directory.hpp> ++ + #ifndef GOFFICE_WITH_GNOME + static char * + check_program (char const *prog) +diff -ruN old/src/mlib/filesystem.cpp new/src/mlib/filesystem.cpp +--- old/src/mlib/filesystem.cpp 2022-02-04 22:35:45.907284447 +0330 ++++ new/src/mlib/filesystem.cpp 2022-02-04 22:33:44.542891731 +0330 +@@ -30,6 +30,7 @@ + #if BOOST_MINOR_VERSION >= 51 + #define BOOST_FS_3 boost::filesystem + #include <boost/filesystem/path_traits.hpp> // boost::filesystem::convert() ++#include <boost/filesystem/directory.hpp> + #else + #define BOOST_FS_3 boost::filesystem3 + #include <boost/filesystem/v3/path_traits.hpp> +diff -ruN old/src/mlib/read_stream.h new/src/mlib/read_stream.h +--- old/src/mlib/read_stream.h 2016-04-10 15:15:39.000000000 +0430 ++++ new/src/mlib/read_stream.h 2022-02-04 22:33:44.542891731 +0330 +@@ -22,6 +22,8 @@ + #ifndef __MLIB_READ_STREAM_H__ + #define __MLIB_READ_STREAM_H__ + ++#include <boost/mpl/bool.hpp> ++ + #include "stream.h" + #include "filesystem.h" + +diff -ruN old/src/mlib/regex.cpp new/src/mlib/regex.cpp +--- old/src/mlib/regex.cpp 2016-04-10 15:15:39.000000000 +0430 ++++ new/src/mlib/regex.cpp 2022-02-04 22:33:44.542891731 +0330 +@@ -22,7 +22,7 @@ + #include "regex.h" + #include "string.h" + +-#include <boost/regex.hpp> ++#include <boost/regex/v4/regex.hpp> + + namespace re + { +diff -ruN old/src/mlib/regex.h new/src/mlib/regex.h +--- old/src/mlib/regex.h 2022-02-04 22:35:35.320525320 +0330 ++++ new/src/mlib/regex.h 2022-02-04 22:34:29.913287618 +0330 +@@ -27,6 +27,7 @@ + #include <boost/regex/v4/regbase.hpp> + #include <boost/regex/v4/match_flags.hpp> + ++#include <boost/mpl/bool.hpp> + #include <mlib/ptr.h> + + #include <string> +diff -ruN old/src/mlib/sdk/bfs.h new/src/mlib/sdk/bfs.h +--- old/src/mlib/sdk/bfs.h 2016-04-10 15:15:39.000000000 +0430 ++++ new/src/mlib/sdk/bfs.h 2022-02-04 22:33:44.542891731 +0330 +@@ -7,6 +7,7 @@ + //#define BOOST_FILESYSTEM_NO_DEPRECATED + + #include <boost/filesystem/path.hpp> ++#include <boost/filesystem/exception.hpp> + #include <boost/filesystem/operations.hpp> + #include <boost/filesystem/convenience.hpp> // fs::create_directories() + +diff -ruN old/src/mlib/tech.h new/src/mlib/tech.h +--- old/src/mlib/tech.h 2016-04-10 15:15:39.000000000 +0430 ++++ new/src/mlib/tech.h 2022-02-04 22:33:44.542891731 +0330 +@@ -26,7 +26,7 @@ + // Технические вещи + // + #include <boost/current_function.hpp> // для BOOST_CURRENT_FUNCTION +-#include <boost/detail/endian.hpp> // для BOOST_XXX_ENDIAN ++#include <boost/predef/other/endian.h> // BOOST_ENDIAN_*_BYTE + #include <boost/version.hpp> // для BOOST_MINOR_VERSION + + // для С-шного кода в С++ +@@ -78,9 +78,9 @@ + long line, const char* function); + + // endianness +-#if defined(BOOST_BIG_ENDIAN) ++#if defined(BOOST_ENDIAN_BIG_BYTE) + # define HAS_BIG_ENDIAN +-#elif defined(BOOST_LITTLE_ENDIAN) ++#elif defined(BOOST_ENDIAN_LITTLE_BYTE) + # define HAS_LITTLE_ENDIAN + #else + # error mlib/tech.h: unknown endianness (legacy PDP arch?) |