* [gentoo-commits] repo/gentoo:master commit in: media-video/dvdstyler/files/, media-video/dvdstyler/
@ 2015-11-01 10:37 Alexis Ballier
0 siblings, 0 replies; 2+ messages in thread
From: Alexis Ballier @ 2015-11-01 10:37 UTC (permalink / raw
To: gentoo-commits
commit: 025a2e666894624c585168d57545e47c9ba8b5e4
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 1 10:37:21 2015 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Sun Nov 1 10:37:21 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=025a2e66
media-video/dvdstyler: Fix ffmpeg patch and make it unconditional.
Package-Manager: portage-2.2.23
media-video/dvdstyler/dvdstyler-2.9.4-r1.ebuild | 6 ++---
.../dvdstyler/files/dvdstyler-2.9.4-ffmpeg29.patch | 31 ++++++++++++++++++++++
2 files changed, 34 insertions(+), 3 deletions(-)
diff --git a/media-video/dvdstyler/dvdstyler-2.9.4-r1.ebuild b/media-video/dvdstyler/dvdstyler-2.9.4-r1.ebuild
index 2c5c994..8e6f47d 100644
--- a/media-video/dvdstyler/dvdstyler-2.9.4-r1.ebuild
+++ b/media-video/dvdstyler/dvdstyler-2.9.4-r1.ebuild
@@ -24,8 +24,8 @@ COMMON_DEPEND=">=app-cdr/dvd+rw-tools-7.1
>=media-video/dvdauthor-0.7.1
>=media-video/xine-ui-0.99.7
virtual/cdrtools
- libav? ( media-video/libav:0=[encode] )
- !libav? ( media-video/ffmpeg:0=[encode] )
+ libav? ( >=media-video/libav-9:0=[encode] )
+ !libav? ( >=media-video/ffmpeg-2.6:0=[encode] )
virtual/jpeg:0
x11-libs/wxGTK:${WX_GTK_VER}=[gstreamer,X]
sys-apps/dbus
@@ -54,7 +54,7 @@ src_prepare() {
sed -i \
-e '/Icon/s:.png::' -e '/^Encoding/d' -e '/Categories/s:Application;::' \
data/dvdstyler.desktop || die
- has_version '>=media-video/ffmpeg-2.9' && epatch "${FILESDIR}/ffmpeg29.patch"
+ epatch "${FILESDIR}/${PN}-2.9.4-ffmpeg29.patch"
}
src_configure() {
diff --git a/media-video/dvdstyler/files/dvdstyler-2.9.4-ffmpeg29.patch b/media-video/dvdstyler/files/dvdstyler-2.9.4-ffmpeg29.patch
new file mode 100644
index 0000000..2ddd414
--- /dev/null
+++ b/media-video/dvdstyler/files/dvdstyler-2.9.4-ffmpeg29.patch
@@ -0,0 +1,31 @@
+Index: DVDStyler-2.9.4/src/mediaenc_ffmpeg.cpp
+===================================================================
+--- DVDStyler-2.9.4.orig/src/mediaenc_ffmpeg.cpp
++++ DVDStyler-2.9.4/src/mediaenc_ffmpeg.cpp
+@@ -179,7 +179,7 @@ bool wxFfmpegMediaEncoder::addVideoStrea
+ c->time_base.den = isNTSC(videoFormat) ? 30000 : 25;
+ c->time_base.num = isNTSC(videoFormat) ? 1001 : 1;
+ c->gop_size = m_gopSize > 0 ? m_gopSize : (isNTSC(videoFormat) ? 15 : 12);
+- c->pix_fmt = PIX_FMT_YUV420P;
++ c->pix_fmt = AV_PIX_FMT_YUV420P;
+ c->rc_buffer_size = VIDEO_BUF_SIZE;
+ c->rc_max_rate = 9000000;
+ c->rc_min_rate = 0;
+@@ -280,7 +280,7 @@ void wxFfmpegMediaEncoder::CloseAudioEnc
+ m_audioStm = NULL;
+ }
+
+-AVFrame* allocPicture(PixelFormat pix_fmt, int width, int height) {
++AVFrame* allocPicture(AVPixelFormat pix_fmt, int width, int height) {
+ AVFrame* frame = av_frame_alloc();
+ if (!frame)
+ return NULL;
+@@ -329,7 +329,7 @@ bool wxFfmpegMediaEncoder::OpenVideoEnco
+ return false;
+ }
+
+- m_imgConvertCtx = sws_getContext(c->width, c->height, PIX_FMT_RGB24, c->width, c->height, c->pix_fmt, SWS_BICUBIC,
++ m_imgConvertCtx = sws_getContext(c->width, c->height, AV_PIX_FMT_RGB24, c->width, c->height, c->pix_fmt, SWS_BICUBIC,
+ NULL, NULL, NULL);
+ if (!m_imgConvertCtx) {
+ wxLogError(wxT("Cannot initialize the conversion context"));
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/dvdstyler/files/, media-video/dvdstyler/
@ 2023-11-24 13:54 Pacho Ramos
0 siblings, 0 replies; 2+ messages in thread
From: Pacho Ramos @ 2023-11-24 13:54 UTC (permalink / raw
To: gentoo-commits
commit: fb8c1c5112e4a1dc4d53a79a3defd5853b3cf9b4
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 24 13:53:18 2023 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Fri Nov 24 13:54:05 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb8c1c51
media-video/dvdstyler: port to wxGTK 3.2
Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>
media-video/dvdstyler/dvdstyler-3.2.1-r1.ebuild | 77 +++++++++++++++++++++++++
media-video/dvdstyler/files/wx32.patch | 12 ++++
2 files changed, 89 insertions(+)
diff --git a/media-video/dvdstyler/dvdstyler-3.2.1-r1.ebuild b/media-video/dvdstyler/dvdstyler-3.2.1-r1.ebuild
new file mode 100644
index 000000000000..d8a814c94575
--- /dev/null
+++ b/media-video/dvdstyler/dvdstyler-3.2.1-r1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_P=${P/dvds/DVDS}
+WX_GTK_VER=3.2-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
+ app-alternatives/yacc
+ virtual/pkgconfig
+"
+
+PATCHES=(
+ "${FILESDIR}"/ffmpeg5.patch
+ "${FILESDIR}"/wx30.patch
+ "${FILESDIR}"/wx32.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/wx32.patch b/media-video/dvdstyler/files/wx32.patch
new file mode 100644
index 000000000000..1391fb3c1a83
--- /dev/null
+++ b/media-video/dvdstyler/files/wx32.patch
@@ -0,0 +1,12 @@
+Index: b/wxVillaLib/PropDlg.cpp
+===================================================================
+--- a/wxVillaLib/PropDlg.cpp 2021-11-07 10:42:36.000000000 +0200
++++ b/wxVillaLib/PropDlg.cpp 2022-08-01 09:06:10.548828062 +0200
+@@ -12,7 +12,6 @@
+ #include "utils.h"
+ #include <wx/fontdlg.h>
+ #include <wx/colordlg.h>
+-#include <wx/generic/colrdlgg.h>
+ #include <wx/filedlg.h>
+ #include <wx/dirdlg.h>
+ #include <wx/grid.h>
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-11-24 13:54 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-11-01 10:37 [gentoo-commits] repo/gentoo:master commit in: media-video/dvdstyler/files/, media-video/dvdstyler/ Alexis Ballier
-- strict thread matches above, loose matches on Subject: below --
2023-11-24 13:54 Pacho Ramos
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox