Gentoo Archives: gentoo-commits

From: Alexis Ballier <aballier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/wxsvg/files/, media-libs/wxsvg/
Date: Sun, 01 Nov 2015 12:10:38
Message-Id: 1446379815.f60e9bea867de26a864256ad091bd2610cf0f789.aballier@gentoo
1 commit: f60e9bea867de26a864256ad091bd2610cf0f789
2 Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
3 AuthorDate: Sun Nov 1 12:09:55 2015 +0000
4 Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
5 CommitDate: Sun Nov 1 12:10:15 2015 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f60e9bea
7
8 media-libs/wxsvg: Bump to 1.5.5. Fix build with ffmpeg git master. Add USE=libav and := deps on ffmpeg/libav.
9
10 Package-Manager: portage-2.2.23
11
12 media-libs/wxsvg/Manifest | 1 +
13 media-libs/wxsvg/files/ffmpeg29.patch | 13 ++++++++++
14 media-libs/wxsvg/wxsvg-1.5.5.ebuild | 47 +++++++++++++++++++++++++++++++++++
15 3 files changed, 61 insertions(+)
16
17 diff --git a/media-libs/wxsvg/Manifest b/media-libs/wxsvg/Manifest
18 index 54ae158..7ef7f18 100644
19 --- a/media-libs/wxsvg/Manifest
20 +++ b/media-libs/wxsvg/Manifest
21 @@ -1,3 +1,4 @@
22 DIST wxsvg-1.1.13.tar.bz2 669378 SHA256 ebaecb322bb7fad97a3cd686bed9827b00afe84063cf2784a7e19891dabd805e SHA512 6c8dddbb274d1d9cd32fdec1c4ac6f73d3497fd2a29ecbe2d6640c2a65a290940faa92fba954c3990b32f713dc89de74e31484263bbd9c2718dc436ca19d2397 WHIRLPOOL 643aa93161028436c30014cb3a2e36cfab53b5f9341d1e21c129eab6e86b756150dc491cc4cf2be0ef6ff956eb7a5ff5c67f8ee1d26879b228e8af18459e9601
23 DIST wxsvg-1.4.2.tar.bz2 461580 SHA256 c7555eacb786583dda4288fa6f3e914a14ec175be0a02b31d9c4e19f173bd760 SHA512 6b6c8c5bf5b369da75ee9d034f6be8611019f48066d352b7268a127f1d9f9487c4aa694b0f0529efa3c0b63d51f7c38ba503d7cf83f9e930b876ebc4bcbce9e1 WHIRLPOOL 84cc8a7b849cac5ad1045572c5ee0aa267d8a6e0e97db0c61f2896def7e347055330a61bf89cfb64360411681c15e0df567c05b5efe4bc5dc456ba9285d9d219
24 DIST wxsvg-1.5.4.tar.bz2 478568 SHA256 5ca0ce0fcb45a3f0801b645000e9b5179bab4d62fb56df51f027d75cbef5a655 SHA512 89d909c1db975dcbca464e3d7850277b72e596bb6020d3c796cb235c55fcb9282472b522a1a3a15cc773eb98e8e2c69f463c5085cfc1b66221316d19ca87cf46 WHIRLPOOL c2caf28102c908e6efdaff413224afde2d83a0e24b199b7904696a334b8b9e64f51f91ab6d3a2ed57c69f3ebaaef96bf1ba890d1af600adb92db47ccfcfbf4cf
25 +DIST wxsvg-1.5.5.tar.bz2 478828 SHA256 e6664de4ee2a0481f47f8b718793ef7c14d296ebe7aee4edbf099258cd9525fc SHA512 4b42ba6ea5675f5794e0450809980030175583813db7e4e216dd5d53e92f43c67c0e62208c77e8e455703d62d1e30606a001b28b924c17ed26fd949638340a1b WHIRLPOOL abc95e7b14d0e298d44b0b7d36731f5099de10bd095400ca9c90af67957bc138c2dc0d91c7477b381a88debf6c24a000fb94ebd0b73d31c4d31ff96dc693dcc2
26
27 diff --git a/media-libs/wxsvg/files/ffmpeg29.patch b/media-libs/wxsvg/files/ffmpeg29.patch
28 new file mode 100644
29 index 0000000..5f19102
30 --- /dev/null
31 +++ b/media-libs/wxsvg/files/ffmpeg29.patch
32 @@ -0,0 +1,13 @@
33 +Index: wxsvg-1.5.5/src/mediadec_ffmpeg.cpp
34 +===================================================================
35 +--- wxsvg-1.5.5.orig/src/mediadec_ffmpeg.cpp
36 ++++ wxsvg-1.5.5/src/mediadec_ffmpeg.cpp
37 +@@ -263,7 +263,7 @@ wxImage wxFfmpegMediaDecoder::GetNextFra
38 + avcodec_decode_video2(m_codecCtx, m_frame, &frameFinished, &packet);
39 + if (frameFinished) {
40 + SwsContext* imgConvertCtx = sws_getContext(m_codecCtx->width, m_codecCtx->height, m_codecCtx->pix_fmt,
41 +- m_width, m_height, PIX_FMT_RGB24, SWS_BICUBIC, NULL, NULL, NULL);
42 ++ m_width, m_height, AV_PIX_FMT_RGB24, SWS_BICUBIC, NULL, NULL, NULL);
43 + if (imgConvertCtx == NULL) {
44 + av_free_packet(&packet);
45 + return wxImage();
46
47 diff --git a/media-libs/wxsvg/wxsvg-1.5.5.ebuild b/media-libs/wxsvg/wxsvg-1.5.5.ebuild
48 new file mode 100644
49 index 0000000..aee66de
50 --- /dev/null
51 +++ b/media-libs/wxsvg/wxsvg-1.5.5.ebuild
52 @@ -0,0 +1,47 @@
53 +# Copyright 1999-2015 Gentoo Foundation
54 +# Distributed under the terms of the GNU General Public License v2
55 +# $Id$
56 +
57 +EAPI=5
58 +WX_GTK_VER=3.0
59 +inherit eutils wxwidgets
60 +
61 +DESCRIPTION="C++ library to create, manipulate and render SVG files"
62 +HOMEPAGE="http://wxsvg.sourceforge.net/"
63 +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
64 +
65 +LICENSE="wxWinLL-3"
66 +SLOT="0/3" # based on SONAME of libwxsvg.so
67 +KEYWORDS="~amd64 ~x86"
68 +IUSE="static-libs libav"
69 +
70 +RDEPEND=">=dev-libs/expat-2:=
71 + >=dev-libs/glib-2.28:2=
72 + dev-libs/libxml2:=
73 + media-libs/fontconfig:=
74 + media-libs/freetype:2=
75 + x11-libs/cairo:=
76 + x11-libs/pango:=
77 + x11-libs/wxGTK:${WX_GTK_VER}=[X]
78 + libav? ( >=media-video/libav-9:0= )
79 + !libav? ( >=media-video/ffmpeg-2.6:0= )"
80 +DEPEND="${RDEPEND}
81 + virtual/pkgconfig"
82 +
83 +DOCS=( AUTHORS ChangeLog TODO )
84 +
85 +src_prepare() {
86 + epatch "${FILESDIR}/ffmpeg29.patch"
87 +}
88 +
89 +src_configure() {
90 + need-wxwidgets base-unicode
91 + econf \
92 + $(use_enable static-libs static) \
93 + --with-wx-config=${WX_CONFIG}
94 +}
95 +
96 +src_install() {
97 + default
98 + prune_libtool_files
99 +}