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

Package-Manager: portage-2.2.0_alpha59/cvs/Linux x86_64

diff --git a/media-libs/wxsvg/ChangeLog b/media-libs/wxsvg/ChangeLog
index da294e45d4843fc6a02c7bb519859a75b471f6be..87eeaaebb14b281bdd941a9f91ffcb5a1d9c1937 100644 (file)
--- 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/Manifest b/media-libs/wxsvg/Manifest
index de54f61a3eeecc84755cf48478b51bf34cb65062..d533abdd17a48f12fae8ad317944e91942ad2749 100644 (file)
--- a/media-libs/wxsvg/Manifest
+++ b/media-libs/wxsvg/Manifest
@@ -1,20 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST wxsvg-1.0.5.tar.bz2 639450 RMD160 ccf8fdd6fcf22f42df7ea48b6d3028b4f4c3e31f SHA1 8d20506dcc183d22c7745fafc5d35f37018ad8be SHA256 816ee1922b11edab450903c99ba46cd49fdc4991c2f493e3d4470b14df11871b
+AUX wxsvg-1.1.2-libav.patch 307 RMD160 dca28d293c9817f3881c59b7292895d92e778b47 SHA1 b1de493621681b278be5aefbe71f7e62dd06230c SHA256 80fa7c297b50c64dbc1cff9f885e790abab0936d8932410df86f9f67dfbae7d7
 DIST wxsvg-1.0.8.tar.bz2 645612 RMD160 c5294077b9fe9dc197b075afffe84d4285cc236e SHA1 f2539b8c1875b8a599c75eb8babca78e36b19c5d SHA256 63baf16dd1427b26daeabbea7ccb32daf15a96a5777b3fbd36756f8bf6cb79fd
-DIST wxsvg-1.0.tar.bz2 230705 RMD160 1cd43162fe3c86c63696404d4c92eea2287a370d SHA1 f1db01c964494eff9f58aab86d8ea1fdc33cf44d SHA256 77971b88ac54b47a9ab25b5615be6a29c021a495ca3e61a38d1839a2e589b34f
-EBUILD wxsvg-1.0.5.ebuild 876 RMD160 1af22f99fabda5d180fcb891d8bae91624db5dcc SHA1 86724b8504899a6f445a20ac80ee07d608a47cc7 SHA256 2f3b953e1dc2e80bc59d17a028f7ca7b4c16730ec96e28b787a2fe39e37c8b48
+DIST wxsvg-1.1.2.tar.bz2 639515 RMD160 98ec495be7e8dde63956d6196d83ad9f86aaa1cb SHA1 a10c2d903b0e1aff19b2562edc390d01e0d5de4b SHA256 07fe579f45f6ba89716fb966a0024f68447b5593234699c84e3ad5497b89e211
 EBUILD wxsvg-1.0.8.ebuild 859 RMD160 14359b143c18f39b12bf8860ee0877404b45cb4e SHA1 53abb8bf802283e2c196d37254da89786a6a8820 SHA256 da3439174f7370d125c08f2ac5090d70c2b92f0428078d8d1580ba6ed7078080
-EBUILD wxsvg-1.0.ebuild 985 RMD160 5d09dc45d38b05b21f5f7ad9e1d5cbfae83bc478 SHA1 b6d2cbfbe83845bced61770bb7492b14917526ff SHA256 c9926f17e0678a52e632223c0461f5c0c054c79c53f7b1da9c6470d8eb640470
-MISC ChangeLog 3626 RMD160 71a9467745740a26b2f2ee6167e0fb779c7d5a72 SHA1 1b05260fc495093912967449772c95ac503018b4 SHA256 e595018dbdb5ac718c5f262278dddb81b0c12e3bfd990ed4ffc225647761d149
+EBUILD wxsvg-1.1.2.ebuild 884 RMD160 33a5829c2a5c71f9cc8a2d6c347f455f33289244 SHA1 56f31bdb269c087d98841450e6e2edfb3fc04c2f SHA256 8a0b8f88024cce221494e918d2ce8edd8fd4d28b9faa1773056af42ab45df382
+MISC ChangeLog 3875 RMD160 17225eb0b8f0d7f66d87bf9ea51e571caaf4134f SHA1 b298577639d8a66330d6d65dc1751df2ee3aff39 SHA256 eb8adbd57aa9bad5b55a6972ba2fe0d816ae84b69e633cc7d3b1286945065728
 MISC metadata.xml 162 RMD160 c039a69ee8efb8cbbbf4b67df25a6e8506ae2610 SHA1 ef137d109c76b893201870840b179f4c42c0f3ff SHA256 fab42f6a31209847529447a2bea2b9dd746521fe5d59d967470736120712f093
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iJwEAQECAAYFAk5GKzcACgkQIiMqcbOVdxTjfgP9EJJoANFXdVqNubIRFIpNnjDF
-8axEHAB7ng4P18849PV9FPTXtSdGVx1u/tMlAuPhs3xEKuC5T7sUynPPvumOw+FF
-o69j+7vNjUx5oA1MR5JosDexhpwgPCc94wkbXeZa1fP8F3IRYfeT7U2nRZpBwWVB
-XjntT5h5xjdNB2sPMaY=
-=crDp
+iEYEARECAAYFAk6D5hQACgkQiqiDRvmkBmKeVgCgsKHpxzeKBlWzXrF5/Tf/zEsB
+Y4wAn3uL5QOPsUrD/tFgs/BXdAYjEOH5
+=sZ82
 -----END PGP SIGNATURE-----

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 (file)
index 0000000..31a5528
--- /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 (file)
index e6d20a5..0000000
--- 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
similarity index 58%
rename from media-libs/wxsvg/wxsvg-1.0.5.ebuild
rename to media-libs/wxsvg/wxsvg-1.1.2.ebuild
index 4d7c2812f6315ab4cfe51f69d8a8438c0a2c2f59..53200ea8a7f7703761806165c73ea5bd586064bb 100644 (file)
--- 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)