| 1 |
commit: 025a2e666894624c585168d57545e47c9ba8b5e4 |
| 2 |
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Nov 1 10:37:21 2015 +0000 |
| 4 |
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Nov 1 10:37:21 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=025a2e66 |
| 7 |
|
| 8 |
media-video/dvdstyler: Fix ffmpeg patch and make it unconditional. |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.23 |
| 11 |
|
| 12 |
media-video/dvdstyler/dvdstyler-2.9.4-r1.ebuild | 6 ++--- |
| 13 |
.../dvdstyler/files/dvdstyler-2.9.4-ffmpeg29.patch | 31 ++++++++++++++++++++++ |
| 14 |
2 files changed, 34 insertions(+), 3 deletions(-) |
| 15 |
|
| 16 |
diff --git a/media-video/dvdstyler/dvdstyler-2.9.4-r1.ebuild b/media-video/dvdstyler/dvdstyler-2.9.4-r1.ebuild |
| 17 |
index 2c5c994..8e6f47d 100644 |
| 18 |
--- a/media-video/dvdstyler/dvdstyler-2.9.4-r1.ebuild |
| 19 |
+++ b/media-video/dvdstyler/dvdstyler-2.9.4-r1.ebuild |
| 20 |
@@ -24,8 +24,8 @@ COMMON_DEPEND=">=app-cdr/dvd+rw-tools-7.1 |
| 21 |
>=media-video/dvdauthor-0.7.1 |
| 22 |
>=media-video/xine-ui-0.99.7 |
| 23 |
virtual/cdrtools |
| 24 |
- libav? ( media-video/libav:0=[encode] ) |
| 25 |
- !libav? ( media-video/ffmpeg:0=[encode] ) |
| 26 |
+ libav? ( >=media-video/libav-9:0=[encode] ) |
| 27 |
+ !libav? ( >=media-video/ffmpeg-2.6:0=[encode] ) |
| 28 |
virtual/jpeg:0 |
| 29 |
x11-libs/wxGTK:${WX_GTK_VER}=[gstreamer,X] |
| 30 |
sys-apps/dbus |
| 31 |
@@ -54,7 +54,7 @@ src_prepare() { |
| 32 |
sed -i \ |
| 33 |
-e '/Icon/s:.png::' -e '/^Encoding/d' -e '/Categories/s:Application;::' \ |
| 34 |
data/dvdstyler.desktop || die |
| 35 |
- has_version '>=media-video/ffmpeg-2.9' && epatch "${FILESDIR}/ffmpeg29.patch" |
| 36 |
+ epatch "${FILESDIR}/${PN}-2.9.4-ffmpeg29.patch" |
| 37 |
} |
| 38 |
|
| 39 |
src_configure() { |
| 40 |
|
| 41 |
diff --git a/media-video/dvdstyler/files/dvdstyler-2.9.4-ffmpeg29.patch b/media-video/dvdstyler/files/dvdstyler-2.9.4-ffmpeg29.patch |
| 42 |
new file mode 100644 |
| 43 |
index 0000000..2ddd414 |
| 44 |
--- /dev/null |
| 45 |
+++ b/media-video/dvdstyler/files/dvdstyler-2.9.4-ffmpeg29.patch |
| 46 |
@@ -0,0 +1,31 @@ |
| 47 |
+Index: DVDStyler-2.9.4/src/mediaenc_ffmpeg.cpp |
| 48 |
+=================================================================== |
| 49 |
+--- DVDStyler-2.9.4.orig/src/mediaenc_ffmpeg.cpp |
| 50 |
++++ DVDStyler-2.9.4/src/mediaenc_ffmpeg.cpp |
| 51 |
+@@ -179,7 +179,7 @@ bool wxFfmpegMediaEncoder::addVideoStrea |
| 52 |
+ c->time_base.den = isNTSC(videoFormat) ? 30000 : 25; |
| 53 |
+ c->time_base.num = isNTSC(videoFormat) ? 1001 : 1; |
| 54 |
+ c->gop_size = m_gopSize > 0 ? m_gopSize : (isNTSC(videoFormat) ? 15 : 12); |
| 55 |
+- c->pix_fmt = PIX_FMT_YUV420P; |
| 56 |
++ c->pix_fmt = AV_PIX_FMT_YUV420P; |
| 57 |
+ c->rc_buffer_size = VIDEO_BUF_SIZE; |
| 58 |
+ c->rc_max_rate = 9000000; |
| 59 |
+ c->rc_min_rate = 0; |
| 60 |
+@@ -280,7 +280,7 @@ void wxFfmpegMediaEncoder::CloseAudioEnc |
| 61 |
+ m_audioStm = NULL; |
| 62 |
+ } |
| 63 |
+ |
| 64 |
+-AVFrame* allocPicture(PixelFormat pix_fmt, int width, int height) { |
| 65 |
++AVFrame* allocPicture(AVPixelFormat pix_fmt, int width, int height) { |
| 66 |
+ AVFrame* frame = av_frame_alloc(); |
| 67 |
+ if (!frame) |
| 68 |
+ return NULL; |
| 69 |
+@@ -329,7 +329,7 @@ bool wxFfmpegMediaEncoder::OpenVideoEnco |
| 70 |
+ return false; |
| 71 |
+ } |
| 72 |
+ |
| 73 |
+- m_imgConvertCtx = sws_getContext(c->width, c->height, PIX_FMT_RGB24, c->width, c->height, c->pix_fmt, SWS_BICUBIC, |
| 74 |
++ m_imgConvertCtx = sws_getContext(c->width, c->height, AV_PIX_FMT_RGB24, c->width, c->height, c->pix_fmt, SWS_BICUBIC, |
| 75 |
+ NULL, NULL, NULL); |
| 76 |
+ if (!m_imgConvertCtx) { |
| 77 |
+ wxLogError(wxT("Cannot initialize the conversion context")); |
Archives