diff options
author | 2013-04-15 16:16:57 +0000 | |
---|---|---|
committer | 2013-04-15 16:16:57 +0000 | |
commit | 9b70d45ee5ee4d05baf036e1aa7dcc3aa03224d2 (patch) | |
tree | 98d8e9f4a811a30bd5cfb3a3eaf518749de7b7c3 /media-libs | |
parent | Backport patch from upstream adding an option to restore previous behaviour w... (diff) | |
download | gentoo-2-9b70d45ee5ee4d05baf036e1aa7dcc3aa03224d2.tar.gz gentoo-2-9b70d45ee5ee4d05baf036e1aa7dcc3aa03224d2.tar.bz2 gentoo-2-9b70d45ee5ee4d05baf036e1aa7dcc3aa03224d2.zip |
Fix build with libpng-1.6. Add subslot dependency on libpng.
(Portage version: 2.1.11.62/cvs/Linux x86_64, signed Manifest commit with key 675D0D2C)
Diffstat (limited to 'media-libs')
-rw-r--r-- | media-libs/opengtl/ChangeLog | 6 | ||||
-rw-r--r-- | media-libs/opengtl/files/opengtl-0.9.18-memcpy.patch | 11 | ||||
-rw-r--r-- | media-libs/opengtl/opengtl-0.9.18.ebuild | 5 |
3 files changed, 19 insertions, 3 deletions
diff --git a/media-libs/opengtl/ChangeLog b/media-libs/opengtl/ChangeLog index 29e2b0f87f6b..61dbe96bfade 100644 --- a/media-libs/opengtl/ChangeLog +++ b/media-libs/opengtl/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-libs/opengtl # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/opengtl/ChangeLog,v 1.16 2013/03/14 15:24:40 kensington Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/opengtl/ChangeLog,v 1.17 2013/04/15 16:16:57 kensington Exp $ + + 15 Apr 2013; Michael Palimaka <kensington@gentoo.org> + +files/opengtl-0.9.18-memcpy.patch, opengtl-0.9.18.ebuild: + Fix build with libpng-1.6. Add subslot dependency on libpng. *opengtl-0.9.18 (14 Mar 2013) diff --git a/media-libs/opengtl/files/opengtl-0.9.18-memcpy.patch b/media-libs/opengtl/files/opengtl-0.9.18-memcpy.patch new file mode 100644 index 000000000000..3e6ecd557f41 --- /dev/null +++ b/media-libs/opengtl/files/opengtl-0.9.18-memcpy.patch @@ -0,0 +1,11 @@ +diff -r 99a2017746c0 Extensions/PngDC/PngDC.cpp +--- a/Extensions/PngDC/PngDC.cpp Wed Jan 30 05:28:12 2013 +1100 ++++ b/Extensions/PngDC/PngDC.cpp Tue Apr 16 01:59:10 2013 +1000 +@@ -20,6 +20,7 @@ + #include "PngDC.h" + + #include <png.h> ++#include <string.h> + + #include <config-endian.h> + diff --git a/media-libs/opengtl/opengtl-0.9.18.ebuild b/media-libs/opengtl/opengtl-0.9.18.ebuild index da9c1d631679..3afab88b8e7c 100644 --- a/media-libs/opengtl/opengtl-0.9.18.ebuild +++ b/media-libs/opengtl/opengtl-0.9.18.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/opengtl/opengtl-0.9.18.ebuild,v 1.1 2013/03/14 15:24:40 kensington Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/opengtl/opengtl-0.9.18.ebuild,v 1.2 2013/04/15 16:16:57 kensington Exp $ EAPI=5 @@ -18,7 +18,7 @@ KEYWORDS="~amd64 ~arm ~x86" IUSE="debug test" RDEPEND=" - media-libs/libpng:0 + media-libs/libpng:0= >=sys-devel/llvm-3.1 <sys-devel/llvm-3.3 " @@ -31,6 +31,7 @@ RESTRICT="test" S=${WORKDIR}/${MY_P} PATCHES=( + "${FILESDIR}/${PN}-0.9.18-memcpy.patch" "${FILESDIR}/${PN}-0.9.18-underlinking.patch" ) |