From 4cbcc855382a06088e2f016f62cafdbcb7e40665 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 20 Mar 2022 00:40:44 +0000 Subject: gentoo resync : 20.03.2022 --- media-video/dvdstyler/Manifest | 4 ++ media-video/dvdstyler/dvdstyler-3.2.1.ebuild | 70 ++++++++++++++++++++++ media-video/dvdstyler/files/ffmpeg5.patch | 89 ++++++++++++++++++++++++++++ media-video/dvdstyler/files/wx30.patch | 14 +++++ 4 files changed, 177 insertions(+) create mode 100644 media-video/dvdstyler/dvdstyler-3.2.1.ebuild create mode 100644 media-video/dvdstyler/files/ffmpeg5.patch create mode 100644 media-video/dvdstyler/files/wx30.patch (limited to 'media-video/dvdstyler') diff --git a/media-video/dvdstyler/Manifest b/media-video/dvdstyler/Manifest index b651a41e401e..18af0dc1c6ce 100644 --- a/media-video/dvdstyler/Manifest +++ b/media-video/dvdstyler/Manifest @@ -1,4 +1,8 @@ AUX ffmpeg4.patch 541 BLAKE2B ff2ad556e881009ff5ba79b252fd55eb9054ea273f20d4af1bd76440b70d351b03f204ad1ff7648694cab950c49082728b6370a93610dd40c09c10a8609ae5bd SHA512 3ad427f51e5ab24231309f01d410e213df874d01567417ea66bcb88cd39e60d672b4771d8c3f210690eb6d145f3d6f7ff81bca8e1b9c841fb2b895f63070ed11 +AUX ffmpeg5.patch 3209 BLAKE2B fdf3f68d7cc292c37ca7b8cbc023de80b696c3b01b9326d6cde609b8cf6909e51a9356fa2a96294bb5ee8844c1673049e0165521ad158298acc1897d31c8a62d SHA512 a47b6335905fa0c6fd38e6156c8a974f896062dcb2c0a7fee9ff2d3013b4a1f8c34081d292602e1dcdae1fe28482643d204c1a79d3caad6467d014ab3eb8a6b5 +AUX wx30.patch 624 BLAKE2B fa464a7e39d721e52eec106794ecee23e802e7b57d2448d2d95c5cb932864615cf6e969d7a31ee3c1154265aeb1725c8fd65bd30271085bb782adf351df8d7f8 SHA512 aa2404bcca318e5fc5adea98bf1efa4a91128a3067e0ed1a4313f61ac55c17b4b9524655221c7d3107f1264a7ed5dcde33bc8c9bc63ff5a5bb3006a2e9cabfa0 DIST DVDStyler-3.0.4.tar.bz2 8870498 BLAKE2B c1ec7651d90613cebbd8d4e62b4626b8a7e2069eadc07bfe9a91e51bf33638135ca975f4857242b3f9ff34606a4e6084200059c82ebc3aa146f446f9b77483ae SHA512 2747e6a494d331b6f35405d7d2ed47789f4452bb3d4e86b0c68cf0fafffb4e6de452b28fac0e9995c312017c7e4e8a3f89ad42bf0a0c99ce19c5d6c0ca6e351a +DIST DVDStyler-3.2.1.tar.bz2 9040634 BLAKE2B f6c3ec5d6595b650ead167ae6532a0849cc6545e1531f10483a7dd2f9962ea6cd4494b7eb8224bbc6e70588b1054fc13a13a5e2f5d977b5b80692c7cc2553d53 SHA512 09124a6c8db2b8d8072bfe2f7de98474d736a36a66d5124eab1b925da9ca830901f554ca80d9a4403365616001d869237002a2cb467cf3cc11b37aea12ff9d90 EBUILD dvdstyler-3.0.4.ebuild 1661 BLAKE2B 4046cb106b79f8ae7b20668cae1dd0204700fbef3ee119bca1c16346d238a0482981e08219e18467e9e5d81d2052564cea1f7c4089989853528d1afd94c8c7a2 SHA512 9dde872a63b2ad3cbe8c5c04b20207239dac4782b5f9fd50f9071d8085a0dfbea2fd8d0e8aa5cd150e5b8203e3edb6b95fb3cce0c6db729407a195294a5d8702 +EBUILD dvdstyler-3.2.1.ebuild 1691 BLAKE2B 052f8dce89f3f62406ebe2e7c4055f13265f9c0b546c1b6b5503b997519738a154d2bef7931caa4fdbbfe72722abb5d47097c4d510ae1a64429e0e25c878d1cc SHA512 12371645c60df5f799a5cea268b6a654109a4f770c7d253fc4c3f198754515314ea4a6a8f9e5d6f5fd4197713baf65977eabaf06a6b8a8a37741261e55375aca MISC metadata.xml 303 BLAKE2B 968311b2bad01107bc5da7eb9357989f0d9030ee07696d1ba676a4d5cc59773b8b474bae5167f0cdf1b39e5e182f41aec3b64dd7ac0df04302024ae75481c551 SHA512 8cb99add5aa709b0f9b14bc8c5fab09c958fa0b04f20bf4657e7a125761bec3e59fa6893a4b4633b8dc1d84c598ba518f757adef2ab1a5866a45f8c7cd59cf61 diff --git a/media-video/dvdstyler/dvdstyler-3.2.1.ebuild b/media-video/dvdstyler/dvdstyler-3.2.1.ebuild new file mode 100644 index 000000000000..b42c542e370e --- /dev/null +++ b/media-video/dvdstyler/dvdstyler-3.2.1.ebuild @@ -0,0 +1,70 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +MY_P=${P/dvds/DVDS} +WX_GTK_VER=3.0-gtk3 + +inherit wxwidgets + +DESCRIPTION="A cross-platform free DVD authoring application" +HOMEPAGE="https://www.dvdstyler.org/" +SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2" +S="${WORKDIR}/${MY_P}" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="debug +udev" + +DEPEND=" + app-cdr/cdrtools + >=app-cdr/dvd+rw-tools-7.1 + media-libs/libexif:= + >=media-libs/wxsvg-1.5.23:= + >=media-video/dvdauthor-0.7.1 + >=media-video/ffmpeg-2.6:0=[encode] + >=media-video/xine-ui-0.99.7 + virtual/jpeg:0 + x11-libs/wxGTK:${WX_GTK_VER}=[gstreamer,X] + sys-apps/dbus + udev? ( >=virtual/libudev-215:= )" +RDEPEND="${DEPEND} + >=app-cdr/dvdisaster-0.72.4 + media-video/mjpegtools" +BDEPEND=" + app-arch/zip + app-text/xmlto + sys-devel/gettext + virtual/yacc + virtual/pkgconfig" + +PATCHES=( "${FILESDIR}"/ffmpeg5.patch "${FILESDIR}"/wx30.patch ) + +src_prepare() { + default + + # disable obsolete GNOME 2.x libraries wrt #508854 + sed -i -e '/PKG_CONFIG/s:libgnomeui-2.0:dIsAbLeAuToMaGiC&:' configure || die + # rmdir: failed to remove `tempfoobar': Directory not empty + sed -i -e '/rmdir "$$t"/d' docs/Makefile.in || die + # fix underlinking wrt #367863 + sed -i -e 's:@LIBS@:& -ljpeg:' wxVillaLib/Makefile.in || die + # silence desktop-file-validate QA check + sed -i \ + -e '/Icon/s:.png::' -e '/^Encoding/d' -e '/Categories/s:Application;::' \ + data/dvdstyler.desktop || die +} + +src_configure() { + setup-wxwidgets unicode + econf \ + $(use_enable debug) \ + --with-wx-config="${WX_CONFIG}" +} + +src_install() { + default + rm "${ED}"/usr/share/doc/${PF}/{COPYING*,INSTALL*} || die +} diff --git a/media-video/dvdstyler/files/ffmpeg5.patch b/media-video/dvdstyler/files/ffmpeg5.patch new file mode 100644 index 000000000000..c7ef02833076 --- /dev/null +++ b/media-video/dvdstyler/files/ffmpeg5.patch @@ -0,0 +1,89 @@ +Index: DVDStyler-3.2.1/src/mediaenc_ffmpeg.cpp +=================================================================== +--- DVDStyler-3.2.1.orig/src/mediaenc_ffmpeg.cpp ++++ DVDStyler-3.2.1/src/mediaenc_ffmpeg.cpp +@@ -26,10 +26,12 @@ + extern "C" { + #define __STDC_CONSTANT_MACROS + #define __STDC_LIMIT_MACROS ++#include + #include + #include + #include + #include ++#include + } + + #define AUDIO_BUF_SIZE 524288 +@@ -74,6 +76,9 @@ void print_error(const char *filename, i + bool wxFfmpegMediaEncoder::BeginEncode(const wxString& fileName, VideoFormat videoFormat, AudioFormat audioFormat, + AspectRatio aspectRatio, int videoBitrate, bool cbr) { + EndEncode(); ++#if LIBAVCODEC_VERSION_MAJOR >= 59 ++ const ++#endif + AVOutputFormat* outputFormat = NULL; + if (videoFormat == vfNONE || audioFormat == afNONE) + outputFormat = av_guess_format(NULL, (const char*) fileName.ToUTF8(), NULL); +@@ -83,13 +88,16 @@ bool wxFfmpegMediaEncoder::BeginEncode(c + wxLogError(wxT("Cannot open output format")); + return false; + } +- outputFormat->video_codec = videoFormat == vfNONE ? AV_CODEC_ID_NONE : AV_CODEC_ID_MPEG2VIDEO; ++ enum AVCodecID video_codec, audio_codec; ++ ++ video_codec = videoFormat == vfNONE ? AV_CODEC_ID_NONE : AV_CODEC_ID_MPEG2VIDEO; ++ + if (audioFormat == afNONE) +- outputFormat->audio_codec = AV_CODEC_ID_NONE; ++ audio_codec = AV_CODEC_ID_NONE; + else if (audioFormat == afAC3) +- outputFormat->audio_codec = AV_CODEC_ID_AC3; ++ audio_codec = AV_CODEC_ID_AC3; + else +- outputFormat->audio_codec = AV_CODEC_ID_MP2; ++ audio_codec = AV_CODEC_ID_MP2; + + m_outputCtx = NULL; + avformat_alloc_output_context2(&m_outputCtx, outputFormat, NULL, (const char*) fileName.ToUTF8()); +@@ -101,9 +109,9 @@ bool wxFfmpegMediaEncoder::BeginEncode(c + m_outputCtx->packet_size = 2048; + + // add video and audio streams +- if (!addVideoStream(outputFormat->video_codec, videoFormat, aspectRatio, videoBitrate, cbr)) ++ if (!addVideoStream(video_codec, videoFormat, aspectRatio, videoBitrate, cbr)) + return false; +- if (!addAudioStream(outputFormat->audio_codec)) ++ if (!addAudioStream(audio_codec)) + return false; + + // open the output file +@@ -170,6 +178,9 @@ bool wxFfmpegMediaEncoder::addVideoStrea + m_videoStm->id = 0; + + // find the video encoder and open it ++#if LIBAVCODEC_VERSION_MAJOR >= 59 ++ const ++#endif + AVCodec* encoder = avcodec_find_encoder((AVCodecID) codecId); + if (!encoder) { + wxLogError(wxT("Video codec not found")); +@@ -235,7 +246,7 @@ bool wxFfmpegMediaEncoder::addVideoStrea + return true; + } + +-bool hasSampleFmt(AVCodec* codec, AVSampleFormat sample_fmt) { ++bool hasSampleFmt(const AVCodec* codec, AVSampleFormat sample_fmt) { + if (codec != NULL && codec->sample_fmts != NULL) { + int fIdx = 0; + while (codec->sample_fmts[fIdx] >= 0) { +@@ -260,6 +271,9 @@ bool wxFfmpegMediaEncoder::addAudioStrea + m_audioStm->id = 1; + + // find the audio encoder and open it ++#if LIBAVCODEC_VERSION_MAJOR >= 59 ++ const ++#endif + AVCodec* encoder = NULL; + AVSampleFormat sampleFmt = AV_SAMPLE_FMT_S16; + if ((AVCodecID) codecId == AV_CODEC_ID_AC3) { diff --git a/media-video/dvdstyler/files/wx30.patch b/media-video/dvdstyler/files/wx30.patch new file mode 100644 index 000000000000..1ffde52696f0 --- /dev/null +++ b/media-video/dvdstyler/files/wx30.patch @@ -0,0 +1,14 @@ +Index: DVDStyler-3.2.1/wxVillaLib/PropDlg.cpp +=================================================================== +--- DVDStyler-3.2.1.orig/wxVillaLib/PropDlg.cpp ++++ DVDStyler-3.2.1/wxVillaLib/PropDlg.cpp +@@ -760,7 +760,9 @@ void wxPropDlg::OnSelectColour(wxCommand + ((wxButton*) event.GetEventObject())->GetName().Mid(12).ToLong(&index); + ColourPanel* panel = ((ColourPanel*) m_controls[index]); + m_colourData.SetColour(panel->GetColour()); ++#if wxMAJOR_VERSION >= 3 && wxMINOR_VERSION >= 1 + m_colourData.SetChooseAlpha(true); ++#endif + #ifdef __WXMSW__ + wxGenericColourDialog dialog(propWindow, &m_colourData); + #else -- cgit v1.2.3