Version bump. Fix build with libav (bug #384281 by DaggyStyle). Remove old.

(Portage version: 2.2.0_alpha59/cvs/Linux x86_64)

4 files changed, 31 insertions, 54 deletions

diff --git a/media-libs/wxsvg/ChangeLog b/media-libs/wxsvg/ChangeLog
index da294e45d484..87eeaaebb14b 100644
--- a/media-libs/wxsvg/ChangeLog
+++ b/media-libs/wxsvg/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/wxsvg
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/wxsvg/ChangeLog,v 1.27 2011/08/13 07:43:44 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/wxsvg/ChangeLog,v 1.28 2011/09/29 03:19:43 dirtyepic Exp $
+
+*wxsvg-1.1.2 (29 Sep 2011)
+
+  29 Sep 2011; Ryan Hill <dirtyepic@gentoo.org> -wxsvg-1.0.ebuild,
+  -wxsvg-1.0.5.ebuild, +wxsvg-1.1.2.ebuild, +files/wxsvg-1.1.2-libav.patch:
+  Version bump. Fix build with libav (bug #384281 by DaggyStyle). Remove old.
 
   13 Aug 2011; Kacper Kowalik <xarthisius@gentoo.org> wxsvg-1.0.ebuild,
   wxsvg-1.0.5.ebuild, wxsvg-1.0.8.ebuild:
diff --git a/media-libs/wxsvg/files/wxsvg-1.1.2-libav.patch b/media-libs/wxsvg/files/wxsvg-1.1.2-libav.patch
new file mode 100644
index 000000000000..31a552843e47
--- /dev/null
+++ b/media-libs/wxsvg/files/wxsvg-1.1.2-libav.patch
@@ -0,0 +1,13 @@
+Include mathematics.h for av_rescale().
+https://bugs.gentoo.org/384281
+
+--- a/src/mediadec_ffmpeg.cpp
++++ b/src/mediadec_ffmpeg.cpp
+@@ -29,6 +29,7 @@ extern "C" {
+ #include <swscale.h>
+ #else
+ #include <libavformat/avformat.h>
++#include <libavutil/mathematics.h>
+ #include <libswscale/swscale.h>
+ #endif
+ }
diff --git a/media-libs/wxsvg/wxsvg-1.0.ebuild b/media-libs/wxsvg/wxsvg-1.0.ebuild
deleted file mode 100644
index e6d20a5f36ea..000000000000
--- a/media-libs/wxsvg/wxsvg-1.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/wxsvg/wxsvg-1.0.ebuild,v 1.7 2011/08/13 07:43:44 xarthisius Exp $
-
-EAPI=2
-WX_GTK_VER="2.8"
-inherit autotools wxwidgets
-
-DESCRIPTION="C++ library to create, manipulate and render SVG files."
-HOMEPAGE="http://wxsvg.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="wxWinLL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="ffmpeg"
-
-RDEPEND="x11-libs/wxGTK:2.8[X]
-	>=dev-libs/glib-2.12
-	>=dev-libs/libxml2-2.6.26
-	>=media-libs/fontconfig-2.4
-	>=media-libs/freetype-2.2.0
-	>=media-libs/libart_lgpl-2.3.17
-	>=x11-libs/pango-1.14.9
-	ffmpeg? ( virtual/ffmpeg )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-src_prepare() {
-	AT_M4DIR="${S}" eautoreconf
-}
-
-src_configure() {
-	econf \
-		--with-wx-config="${WXCONFIG}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS ChangeLog TODO
-}
diff --git a/media-libs/wxsvg/wxsvg-1.0.5.ebuild b/media-libs/wxsvg/wxsvg-1.1.2.ebuild
index 4d7c2812f631..53200ea8a7f7 100644
--- a/media-libs/wxsvg/wxsvg-1.0.5.ebuild
+++ b/media-libs/wxsvg/wxsvg-1.1.2.ebuild
@@ -1,11 +1,12 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/wxsvg/wxsvg-1.0.5.ebuild,v 1.5 2011/08/13 07:43:44 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/wxsvg/wxsvg-1.1.2.ebuild,v 1.1 2011/09/29 03:19:43 dirtyepic Exp $
 
-EAPI=2
+EAPI="3"
 WX_GTK_VER="2.8"
+AUTOTOOLS_IN_SOURCE_BUILD="1"
 
-inherit wxwidgets
+inherit autotools-utils wxwidgets
 
 DESCRIPTION="C++ library to create, manipulate and render SVG files."
 HOMEPAGE="http://wxsvg.sourceforge.net/"
@@ -13,22 +14,20 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="wxWinLL-3"
 SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
+KEYWORDS="~amd64 ~x86"
+IUSE="static-libs"
 
-RDEPEND="x11-libs/wxGTK:2.8[X]
+RDEPEND="x11-libs/cairo
+	x11-libs/wxGTK:2.8[X]
 	>=dev-libs/expat-2.0.1-r3
-	>=dev-libs/glib-2.12
+	>=dev-libs/glib-2.12:2
 	>=dev-libs/libxml2-2.6.26
 	>=media-libs/fontconfig-2.4
 	>=media-libs/freetype-2.2.0
-	>=media-libs/libart_lgpl-2.3.17
 	virtual/ffmpeg
 	>=x11-libs/pango-1.14.9"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS ChangeLog TODO
-}
+DOCS=(AUTHORS ChangeLog TODO)
+PATCHES=("${FILESDIR}"/${P}-libav.patch)