* [gentoo-commits] repo/gentoo:master commit in: media-video/dvdstyler/, media-video/dvdstyler/files/
@ 2015-09-16 10:32 Alexis Ballier
0 siblings, 0 replies; 4+ messages in thread
From: Alexis Ballier @ 2015-09-16 10:32 UTC (permalink / raw
To: gentoo-commits
commit: 2a941b98a6cca524a92ab046f04b5d2c0a13ed28
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 16 10:31:13 2015 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Wed Sep 16 10:31:13 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a941b98
media-video/dvdstyler: fix build with ffmpeg git master.
Package-Manager: portage-2.2.20.1
media-video/dvdstyler/dvdstyler-2.9.3.ebuild | 3 ++-
media-video/dvdstyler/files/ffmpeg29.patch | 31 ++++++++++++++++++++++++++++
2 files changed, 33 insertions(+), 1 deletion(-)
diff --git a/media-video/dvdstyler/dvdstyler-2.9.3.ebuild b/media-video/dvdstyler/dvdstyler-2.9.3.ebuild
index c5bc193..914cefe 100644
--- a/media-video/dvdstyler/dvdstyler-2.9.3.ebuild
+++ b/media-video/dvdstyler/dvdstyler-2.9.3.ebuild
@@ -7,7 +7,7 @@ EAPI=5
MY_P=${P/dvds/DVDS}
WX_GTK_VER=2.8
-inherit wxwidgets
+inherit wxwidgets eutils
DESCRIPTION="A cross-platform free DVD authoring application"
HOMEPAGE="http://www.dvdstyler.org/"
@@ -51,6 +51,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"
}
src_configure() {
diff --git a/media-video/dvdstyler/files/ffmpeg29.patch b/media-video/dvdstyler/files/ffmpeg29.patch
new file mode 100644
index 0000000..22ab9a6
--- /dev/null
+++ b/media-video/dvdstyler/files/ffmpeg29.patch
@@ -0,0 +1,31 @@
+Index: DVDStyler-2.9.3/src/mediaenc_ffmpeg.cpp
+===================================================================
+--- DVDStyler-2.9.3.orig/src/mediaenc_ffmpeg.cpp
++++ DVDStyler-2.9.3/src/mediaenc_ffmpeg.cpp
+@@ -178,7 +178,7 @@ bool wxFfmpegMediaEncoder::addVideoStrea
+ c->time_base.den = isNTSC(videoFormat) ? 30000 : 25;
+ c->time_base.num = isNTSC(videoFormat) ? 1001 : 1;
+ c->gop_size = 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;
+@@ -279,7 +279,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;
+@@ -318,7 +318,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] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/dvdstyler/, media-video/dvdstyler/files/
@ 2016-02-26 21:32 Pacho Ramos
0 siblings, 0 replies; 4+ messages in thread
From: Pacho Ramos @ 2016-02-26 21:32 UTC (permalink / raw
To: gentoo-commits
commit: 1d5cf02e8a8f673e444bbecffd99f9ba5ce703e9
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 26 21:32:20 2016 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Fri Feb 26 21:32:20 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d5cf02e
media-video/dvdstyler: Drop old
Package-Manager: portage-2.2.27
media-video/dvdstyler/Manifest | 5 --
media-video/dvdstyler/dvdstyler-2.7.2.ebuild | 66 --------------------
media-video/dvdstyler/dvdstyler-2.9.2.ebuild | 66 --------------------
media-video/dvdstyler/dvdstyler-2.9.3.ebuild | 67 ---------------------
media-video/dvdstyler/dvdstyler-2.9.4-r1.ebuild | 70 ----------------------
media-video/dvdstyler/dvdstyler-2.9.4.ebuild | 68 ---------------------
media-video/dvdstyler/dvdstyler-2.9.5.ebuild | 69 ---------------------
media-video/dvdstyler/dvdstyler-2.9.6.ebuild | 69 ---------------------
.../dvdstyler/files/dvdstyler-2.9.4-ffmpeg29.patch | 31 ----------
media-video/dvdstyler/files/ffmpeg29.patch | 31 ----------
10 files changed, 542 deletions(-)
diff --git a/media-video/dvdstyler/Manifest b/media-video/dvdstyler/Manifest
index abf606a..8bb8aa2 100644
--- a/media-video/dvdstyler/Manifest
+++ b/media-video/dvdstyler/Manifest
@@ -1,6 +1 @@
-DIST DVDStyler-2.7.2.tar.bz2 5982155 SHA256 b30df3870b9cfcac5bc4387d276aec10e0913ce66c63007f1393123afda180be SHA512 f4913ff5ed11e7cedccb8408bea9adbfae7494afde9062c4acc7e65014af821d4b5acacbce57fd07225cf3af8c21ba552897b50be67f21e242fb6f4baeed000d WHIRLPOOL 070254838db445175401c6d2fb05dc6ee5d79620a598f5a5f0c6d4d8bf9cb5b3ecfc1ad0e708b6289b37b0a5cd0a5c2b0c089c87951b60fe0d48eab85cc9410f
-DIST DVDStyler-2.9.2.tar.bz2 7861116 SHA256 88abd17b0dcdfccbdfffe6e80bcfa59df023f1ff2eed782e58d1f793a81dbd1f SHA512 5688f383b03cb0ec6c57659494d1f4f98f72c21e3e125e16ec3adfeac20555d6f26a12d3629417b46f833933f504e1d55a7fcdb2c0926643e0bfadcab8c998be WHIRLPOOL cd857c39a5de581b201b2d78d7a676b05f5dbdef3592fe835158cceb05d8b8e37cf5a4f88514469bbfac908f827843718b733566cac6fd86f6c7700bc49e0431
-DIST DVDStyler-2.9.3.tar.bz2 7861272 SHA256 ffbc22454e210ba8fcad9a7954b426d9dc5ff933527a6e39391d310101128c39 SHA512 c39a1c08ea5e86e05c25443685524c61c26a5fe11e66240884db6b54c117f1cc446634145bc99673eb7de2ed44e3d03277686470dfde3ab78a5943b2667e7b73 WHIRLPOOL d08202272c5ec9fbaec7b049e854cdb413a929b59ee047a99a4d70699f80a2a0a47786335a9bc05d8d7ca905f9137d4f81bc31fd56a78943c71b169999cc0cd3
-DIST DVDStyler-2.9.4.tar.bz2 7863263 SHA256 8b15ec98e3e5ec8c5a1f23eee316f646476e76b86b80d44b7c842887946a39e0 SHA512 8ef8e0241f31957b6c1695876a2067510750b3e997d57c688ceed640110488c2989af12d23147a5b439625cafc5bf7f2d3a8cdda8304b96555f48b6f5553cde4 WHIRLPOOL 07f3a96f83e0d7bbaea4cf01f9c440d63590f632de3ebbb516d7551ced21c9597790149f252f517f627c5d8800e5a1d8737ad15a015eb1f76e7fef4d7dc15dbf
-DIST DVDStyler-2.9.5.tar.bz2 7864947 SHA256 4717a58fc5980e1007624be7c14ebb8b1ace7839ad38fe7fbfdc0db4e26d3e1b SHA512 fef02eb3a10b46fe6345610aa49e40a8a47e8a4fce35541f23762e75546788ab628ad70a76bf9362bdd5161101ac6be8057222f4bdcc84fb9f1eb49042de1526 WHIRLPOOL 70ffac3ca9ca9c1b38224f66a32d893ab1c92f3129be815d7b4cfec0cebf53098cee3f7169ddc942f58efc1268ea8553a3444df63a69e307df2d4a0851bd1edf
DIST DVDStyler-2.9.6.tar.bz2 8373340 SHA256 d9ac1c2fa8812c194d4a79a5954f96919a4823498a4200018964df549270c6e3 SHA512 7e45a61ecc5df29957c6ff71bf7d5032bc1cba3b43b8444f7cd065aabf3991961f998e220d41c05c3d4e9a3bc213c96bc484b467a40d1b10ab33630ea4cbbcea WHIRLPOOL d7b6f714fcde76c74f5f4dee66918ddfb17066f85147a7efd355fe19d057d3c56bf0f1116595cfa361b09f1d82ebc09ab0fad6f5fc8ab029df01a9abe267b564
diff --git a/media-video/dvdstyler/dvdstyler-2.7.2.ebuild b/media-video/dvdstyler/dvdstyler-2.7.2.ebuild
deleted file mode 100644
index 5c30788..0000000
--- a/media-video/dvdstyler/dvdstyler-2.7.2.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MY_P=${P/dvds/DVDS}
-WX_GTK_VER=2.8
-
-inherit wxwidgets
-
-DESCRIPTION="A cross-platform free DVD authoring application"
-HOMEPAGE="http://www.dvdstyler.org/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug +udev"
-
-COMMON_DEPEND=">=app-cdr/dvd+rw-tools-7.1
- media-libs/libexif:=
- >=media-libs/wxsvg-1.2:=
- >=media-video/dvdauthor-0.7.1
- >=media-video/xine-ui-0.99.7
- virtual/cdrtools
- >=virtual/ffmpeg-9-r1[encode]
- virtual/jpeg:0
- >=x11-libs/wxGTK-2.8.7:2.8=[gstreamer,X]
- udev? ( >=virtual/libudev-215:= )"
-RDEPEND="${COMMON_DEPEND}
- >=app-cdr/dvdisaster-0.72.4
- media-video/mjpegtools"
-DEPEND="${COMMON_DEPEND}
- app-arch/zip
- app-text/xmlto
- sys-devel/gettext
- virtual/yacc
- virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
- # 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() {
- econf \
- --docdir=/usr/share/doc/${PF} \
- $(use_enable debug) \
- --with-wx-config=${WX_CONFIG}
-}
-
-src_install() {
- default
- rm -f "${ED}"/usr/share/doc/${PF}/{COPYING*,INSTALL*}
-}
diff --git a/media-video/dvdstyler/dvdstyler-2.9.2.ebuild b/media-video/dvdstyler/dvdstyler-2.9.2.ebuild
deleted file mode 100644
index c5bc193..0000000
--- a/media-video/dvdstyler/dvdstyler-2.9.2.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MY_P=${P/dvds/DVDS}
-WX_GTK_VER=2.8
-
-inherit wxwidgets
-
-DESCRIPTION="A cross-platform free DVD authoring application"
-HOMEPAGE="http://www.dvdstyler.org/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug +udev"
-
-COMMON_DEPEND=">=app-cdr/dvd+rw-tools-7.1
- media-libs/libexif:=
- >=media-libs/wxsvg-1.2:=
- >=media-video/dvdauthor-0.7.1
- >=media-video/xine-ui-0.99.7
- virtual/cdrtools
- >=virtual/ffmpeg-9-r1[encode]
- virtual/jpeg:0
- >=x11-libs/wxGTK-2.8.7:2.8=[gstreamer,X]
- udev? ( >=virtual/libudev-215:= )"
-RDEPEND="${COMMON_DEPEND}
- >=app-cdr/dvdisaster-0.72.4
- media-video/mjpegtools"
-DEPEND="${COMMON_DEPEND}
- app-arch/zip
- app-text/xmlto
- sys-devel/gettext
- virtual/yacc
- virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
- # 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() {
- econf \
- --docdir=/usr/share/doc/${PF} \
- $(use_enable debug) \
- --with-wx-config=${WX_CONFIG}
-}
-
-src_install() {
- default
- rm -f "${ED}"/usr/share/doc/${PF}/{COPYING*,INSTALL*}
-}
diff --git a/media-video/dvdstyler/dvdstyler-2.9.3.ebuild b/media-video/dvdstyler/dvdstyler-2.9.3.ebuild
deleted file mode 100644
index 914cefe..0000000
--- a/media-video/dvdstyler/dvdstyler-2.9.3.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MY_P=${P/dvds/DVDS}
-WX_GTK_VER=2.8
-
-inherit wxwidgets eutils
-
-DESCRIPTION="A cross-platform free DVD authoring application"
-HOMEPAGE="http://www.dvdstyler.org/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug +udev"
-
-COMMON_DEPEND=">=app-cdr/dvd+rw-tools-7.1
- media-libs/libexif:=
- >=media-libs/wxsvg-1.2:=
- >=media-video/dvdauthor-0.7.1
- >=media-video/xine-ui-0.99.7
- virtual/cdrtools
- >=virtual/ffmpeg-9-r1[encode]
- virtual/jpeg:0
- >=x11-libs/wxGTK-2.8.7:2.8=[gstreamer,X]
- udev? ( >=virtual/libudev-215:= )"
-RDEPEND="${COMMON_DEPEND}
- >=app-cdr/dvdisaster-0.72.4
- media-video/mjpegtools"
-DEPEND="${COMMON_DEPEND}
- app-arch/zip
- app-text/xmlto
- sys-devel/gettext
- virtual/yacc
- virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
- # 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
- has_version '>=media-video/ffmpeg-2.9' && epatch "${FILESDIR}/ffmpeg29.patch"
-}
-
-src_configure() {
- econf \
- --docdir=/usr/share/doc/${PF} \
- $(use_enable debug) \
- --with-wx-config=${WX_CONFIG}
-}
-
-src_install() {
- default
- rm -f "${ED}"/usr/share/doc/${PF}/{COPYING*,INSTALL*}
-}
diff --git a/media-video/dvdstyler/dvdstyler-2.9.4-r1.ebuild b/media-video/dvdstyler/dvdstyler-2.9.4-r1.ebuild
deleted file mode 100644
index 8e6f47d..0000000
--- a/media-video/dvdstyler/dvdstyler-2.9.4-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MY_P=${P/dvds/DVDS}
-WX_GTK_VER=3.0
-
-inherit wxwidgets eutils
-
-DESCRIPTION="A cross-platform free DVD authoring application"
-HOMEPAGE="http://www.dvdstyler.org/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug libav +udev"
-
-COMMON_DEPEND=">=app-cdr/dvd+rw-tools-7.1
- media-libs/libexif:=
- >=media-libs/wxsvg-1.3:=
- >=media-video/dvdauthor-0.7.1
- >=media-video/xine-ui-0.99.7
- virtual/cdrtools
- 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
- udev? ( >=virtual/libudev-215:= )"
-RDEPEND="${COMMON_DEPEND}
- >=app-cdr/dvdisaster-0.72.4
- media-video/mjpegtools"
-DEPEND="${COMMON_DEPEND}
- app-arch/zip
- app-text/xmlto
- sys-devel/gettext
- virtual/yacc
- virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
- need-wxwidgets unicode
- # 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
- epatch "${FILESDIR}/${PN}-2.9.4-ffmpeg29.patch"
-}
-
-src_configure() {
- econf \
- --docdir=/usr/share/doc/${PF} \
- $(use_enable debug) \
- --with-wx-config=${WX_CONFIG}
-}
-
-src_install() {
- default
- rm -f "${ED}"/usr/share/doc/${PF}/{COPYING*,INSTALL*}
-}
diff --git a/media-video/dvdstyler/dvdstyler-2.9.4.ebuild b/media-video/dvdstyler/dvdstyler-2.9.4.ebuild
deleted file mode 100644
index 8587dc4..0000000
--- a/media-video/dvdstyler/dvdstyler-2.9.4.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MY_P=${P/dvds/DVDS}
-WX_GTK_VER=2.8
-
-inherit wxwidgets eutils
-
-DESCRIPTION="A cross-platform free DVD authoring application"
-HOMEPAGE="http://www.dvdstyler.org/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug +udev"
-
-COMMON_DEPEND=">=app-cdr/dvd+rw-tools-7.1
- media-libs/libexif:=
- >=media-libs/wxsvg-1.3:=
- >=media-video/dvdauthor-0.7.1
- >=media-video/xine-ui-0.99.7
- virtual/cdrtools
- >=virtual/ffmpeg-9-r1[encode]
- virtual/jpeg:0
- >=x11-libs/wxGTK-2.8.7:2.8=[gstreamer,X]
- sys-apps/dbus
- udev? ( >=virtual/libudev-215:= )"
-RDEPEND="${COMMON_DEPEND}
- >=app-cdr/dvdisaster-0.72.4
- media-video/mjpegtools"
-DEPEND="${COMMON_DEPEND}
- app-arch/zip
- app-text/xmlto
- sys-devel/gettext
- virtual/yacc
- virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
- # 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
- has_version '>=media-video/ffmpeg-2.9' && epatch "${FILESDIR}/ffmpeg29.patch"
-}
-
-src_configure() {
- econf \
- --docdir=/usr/share/doc/${PF} \
- $(use_enable debug) \
- --with-wx-config=${WX_CONFIG}
-}
-
-src_install() {
- default
- rm -f "${ED}"/usr/share/doc/${PF}/{COPYING*,INSTALL*}
-}
diff --git a/media-video/dvdstyler/dvdstyler-2.9.5.ebuild b/media-video/dvdstyler/dvdstyler-2.9.5.ebuild
deleted file mode 100644
index b5f8e7b..0000000
--- a/media-video/dvdstyler/dvdstyler-2.9.5.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MY_P=${P/dvds/DVDS}
-WX_GTK_VER=3.0
-
-inherit wxwidgets eutils
-
-DESCRIPTION="A cross-platform free DVD authoring application"
-HOMEPAGE="http://www.dvdstyler.org/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug libav +udev"
-
-COMMON_DEPEND=">=app-cdr/dvd+rw-tools-7.1
- media-libs/libexif:=
- >=media-libs/wxsvg-1.3:=
- >=media-video/dvdauthor-0.7.1
- >=media-video/xine-ui-0.99.7
- virtual/cdrtools
- 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
- udev? ( >=virtual/libudev-215:= )"
-RDEPEND="${COMMON_DEPEND}
- >=app-cdr/dvdisaster-0.72.4
- media-video/mjpegtools"
-DEPEND="${COMMON_DEPEND}
- app-arch/zip
- app-text/xmlto
- sys-devel/gettext
- virtual/yacc
- virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
- need-wxwidgets unicode
- # 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() {
- econf \
- --docdir=/usr/share/doc/${PF} \
- $(use_enable debug) \
- --with-wx-config=${WX_CONFIG}
-}
-
-src_install() {
- default
- rm -f "${ED}"/usr/share/doc/${PF}/{COPYING*,INSTALL*}
-}
diff --git a/media-video/dvdstyler/dvdstyler-2.9.6.ebuild b/media-video/dvdstyler/dvdstyler-2.9.6.ebuild
deleted file mode 100644
index b5f8e7b..0000000
--- a/media-video/dvdstyler/dvdstyler-2.9.6.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MY_P=${P/dvds/DVDS}
-WX_GTK_VER=3.0
-
-inherit wxwidgets eutils
-
-DESCRIPTION="A cross-platform free DVD authoring application"
-HOMEPAGE="http://www.dvdstyler.org/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug libav +udev"
-
-COMMON_DEPEND=">=app-cdr/dvd+rw-tools-7.1
- media-libs/libexif:=
- >=media-libs/wxsvg-1.3:=
- >=media-video/dvdauthor-0.7.1
- >=media-video/xine-ui-0.99.7
- virtual/cdrtools
- 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
- udev? ( >=virtual/libudev-215:= )"
-RDEPEND="${COMMON_DEPEND}
- >=app-cdr/dvdisaster-0.72.4
- media-video/mjpegtools"
-DEPEND="${COMMON_DEPEND}
- app-arch/zip
- app-text/xmlto
- sys-devel/gettext
- virtual/yacc
- virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
- need-wxwidgets unicode
- # 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() {
- econf \
- --docdir=/usr/share/doc/${PF} \
- $(use_enable debug) \
- --with-wx-config=${WX_CONFIG}
-}
-
-src_install() {
- default
- rm -f "${ED}"/usr/share/doc/${PF}/{COPYING*,INSTALL*}
-}
diff --git a/media-video/dvdstyler/files/dvdstyler-2.9.4-ffmpeg29.patch b/media-video/dvdstyler/files/dvdstyler-2.9.4-ffmpeg29.patch
deleted file mode 100644
index 2ddd414..0000000
--- a/media-video/dvdstyler/files/dvdstyler-2.9.4-ffmpeg29.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-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"));
diff --git a/media-video/dvdstyler/files/ffmpeg29.patch b/media-video/dvdstyler/files/ffmpeg29.patch
deleted file mode 100644
index 22ab9a6..0000000
--- a/media-video/dvdstyler/files/ffmpeg29.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Index: DVDStyler-2.9.3/src/mediaenc_ffmpeg.cpp
-===================================================================
---- DVDStyler-2.9.3.orig/src/mediaenc_ffmpeg.cpp
-+++ DVDStyler-2.9.3/src/mediaenc_ffmpeg.cpp
-@@ -178,7 +178,7 @@ bool wxFfmpegMediaEncoder::addVideoStrea
- c->time_base.den = isNTSC(videoFormat) ? 30000 : 25;
- c->time_base.num = isNTSC(videoFormat) ? 1001 : 1;
- c->gop_size = 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;
-@@ -279,7 +279,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;
-@@ -318,7 +318,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] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/dvdstyler/, media-video/dvdstyler/files/
@ 2018-04-20 18:12 Alexis Ballier
0 siblings, 0 replies; 4+ messages in thread
From: Alexis Ballier @ 2018-04-20 18:12 UTC (permalink / raw
To: gentoo-commits
commit: 8478b2adcc1c58c77e882f6230832a7c2555a500
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 20 17:21:33 2018 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Fri Apr 20 18:11:56 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8478b2ad
media-video/dvdstyler: fix build with ffmpeg4
Package-Manager: Portage-2.3.31, Repoman-2.3.9
media-video/dvdstyler/dvdstyler-3.0.4.ebuild | 2 ++
media-video/dvdstyler/files/ffmpeg4.patch | 13 +++++++++++++
2 files changed, 15 insertions(+)
diff --git a/media-video/dvdstyler/dvdstyler-3.0.4.ebuild b/media-video/dvdstyler/dvdstyler-3.0.4.ebuild
index 668ddd64d8d..3df313a5bb0 100644
--- a/media-video/dvdstyler/dvdstyler-3.0.4.ebuild
+++ b/media-video/dvdstyler/dvdstyler-3.0.4.ebuild
@@ -46,6 +46,8 @@ DEPEND="${COMMON_DEPEND}
S="${WORKDIR}/${MY_P}"
src_prepare() {
+ epatch "${FILESDIR}/ffmpeg4.patch"
+
need-wxwidgets unicode
# disable obsolete GNOME 2.x libraries wrt #508854
sed -i -e '/PKG_CONFIG/s:libgnomeui-2.0:dIsAbLeAuToMaGiC&:' configure || die
diff --git a/media-video/dvdstyler/files/ffmpeg4.patch b/media-video/dvdstyler/files/ffmpeg4.patch
new file mode 100644
index 00000000000..39966dd1dfb
--- /dev/null
+++ b/media-video/dvdstyler/files/ffmpeg4.patch
@@ -0,0 +1,13 @@
+Index: DVDStyler-3.0.4/src/mediaenc_ffmpeg.cpp
+===================================================================
+--- DVDStyler-3.0.4.orig/src/mediaenc_ffmpeg.cpp
++++ DVDStyler-3.0.4/src/mediaenc_ffmpeg.cpp
+@@ -223,7 +223,7 @@ bool wxFfmpegMediaEncoder::addAudioStrea
+ c->time_base = (AVRational){ 1, c->sample_rate };
+ // some formats want stream headers to be separate
+ if(m_outputCtx->oformat->flags & AVFMT_GLOBALHEADER)
+- c->flags |= CODEC_FLAG_GLOBAL_HEADER;
++ c->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
+
+ return true;
+ }
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/dvdstyler/, media-video/dvdstyler/files/
@ 2022-02-28 9:48 Alexis Ballier
0 siblings, 0 replies; 4+ messages in thread
From: Alexis Ballier @ 2022-02-28 9:48 UTC (permalink / raw
To: gentoo-commits
commit: eeba8be174a1d795b2a7bea5d050fd95f4751f03
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 28 09:48:38 2022 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Mon Feb 28 09:48:47 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eeba8be1
media-video/dvdstyler: bump to 3.2.1
use gtk3, fix build with ffmpeg 5
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org>
media-video/dvdstyler/Manifest | 1 +
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, 174 insertions(+)
diff --git a/media-video/dvdstyler/Manifest b/media-video/dvdstyler/Manifest
index 685628c2b439..1bfc852cc5dc 100644
--- a/media-video/dvdstyler/Manifest
+++ b/media-video/dvdstyler/Manifest
@@ -1 +1,2 @@
DIST DVDStyler-3.0.4.tar.bz2 8870498 BLAKE2B c1ec7651d90613cebbd8d4e62b4626b8a7e2069eadc07bfe9a91e51bf33638135ca975f4857242b3f9ff34606a4e6084200059c82ebc3aa146f446f9b77483ae SHA512 2747e6a494d331b6f35405d7d2ed47789f4452bb3d4e86b0c68cf0fafffb4e6de452b28fac0e9995c312017c7e4e8a3f89ad42bf0a0c99ce19c5d6c0ca6e351a
+DIST DVDStyler-3.2.1.tar.bz2 9040634 BLAKE2B f6c3ec5d6595b650ead167ae6532a0849cc6545e1531f10483a7dd2f9962ea6cd4494b7eb8224bbc6e70588b1054fc13a13a5e2f5d977b5b80692c7cc2553d53 SHA512 09124a6c8db2b8d8072bfe2f7de98474d736a36a66d5124eab1b925da9ca830901f554ca80d9a4403365616001d869237002a2cb467cf3cc11b37aea12ff9d90
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 <libavcodec/avcodec.h>
+ #include <libavformat/avformat.h>
+ #include <libswscale/swscale.h>
+ #include <libavutil/mathematics.h>
+ #include <libavutil/avstring.h>
++#include <libavutil/channel_layout.h>
+ }
+
+ #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
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-02-28 9:48 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-04-20 18:12 [gentoo-commits] repo/gentoo:master commit in: media-video/dvdstyler/, media-video/dvdstyler/files/ Alexis Ballier
-- strict thread matches above, loose matches on Subject: below --
2022-02-28 9:48 Alexis Ballier
2016-02-26 21:32 Pacho Ramos
2015-09-16 10:32 Alexis Ballier
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox