summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Seifert <soap@gentoo.org>2016-01-24 23:08:10 +0100
committerDavid Seifert <soap@gentoo.org>2016-01-24 23:08:47 +0100
commitd401688e98ab5bf83c95eccf313c9bacc6a0ccb5 (patch)
treef917e93dec2e04a8de8ac03a2147493e7fef9ea1
parentapp-admin/consul-template: add gopkg.in/yaml.v2 mapping to get_archive_go_pac... (diff)
downloadgentoo-d401688e98ab5bf83c95eccf313c9bacc6a0ccb5.tar.gz
gentoo-d401688e98ab5bf83c95eccf313c9bacc6a0ccb5.tar.bz2
gentoo-d401688e98ab5bf83c95eccf313c9bacc6a0ccb5.zip
media-libs/iulib: Fix wrong declaration of default arguments
Gentoo-Bug: 570102 * EAPI=6 * Make patch -p1 compatible Package-Manager: portage-2.2.27
-rw-r--r--media-libs/iulib/files/iulib-0.4-default-arguments-declaration.patch25
-rw-r--r--media-libs/iulib/files/iulib-0.4-scons-build-env.patch4
-rw-r--r--media-libs/iulib/iulib-0.4-r1.ebuild58
3 files changed, 85 insertions, 2 deletions
diff --git a/media-libs/iulib/files/iulib-0.4-default-arguments-declaration.patch b/media-libs/iulib/files/iulib-0.4-default-arguments-declaration.patch
new file mode 100644
index 00000000000..cbffdee0d54
--- /dev/null
+++ b/media-libs/iulib/files/iulib-0.4-default-arguments-declaration.patch
@@ -0,0 +1,25 @@
+Default arguments need to be specified in the class declaration and cannot be redeclared.
+https://bugs.gentoo.org/show_bug.cgi?id=570102
+
+--- iulib-0.4/imglib/imgops.cc
++++ iulib-0.4/imglib/imgops.cc
+@@ -133,7 +133,7 @@
+
+ template<class T,class V>
+ void addscaled(narray<T> &dest,narray<T> &src,
+- V scale=1,int dx=0,int dy=0) {
++ V scale,int dx,int dy) {
+ for (int i=0; i<dest.dim(0); i++)
+ for (int j=0; j<dest.dim(1); j++)
+ dest.unsafe_at(i,j) += (T)(scale*xref(src,i+dx,j+dy));
+--- iulib-0.4/imglib/imgops.h
++++ iulib-0.4/imglib/imgops.h
+@@ -67,7 +67,7 @@
+ }
+
+ template<class T, class V>
+- void addscaled(colib::narray<T> &, colib::narray<T> &, V, int, int);
++ void addscaled(colib::narray<T> &dest, colib::narray<T> &src, V scale=1, int dx=0, int dy=0);
+ template<class T>
+ void tighten(colib::narray<T> &image);
+ template<class T>
diff --git a/media-libs/iulib/files/iulib-0.4-scons-build-env.patch b/media-libs/iulib/files/iulib-0.4-scons-build-env.patch
index 3983d9c820b..766795c8c15 100644
--- a/media-libs/iulib/files/iulib-0.4-scons-build-env.patch
+++ b/media-libs/iulib/files/iulib-0.4-scons-build-env.patch
@@ -1,5 +1,5 @@
---- SConstruct
-+++ SConstruct
+--- iulib-0.4/SConstruct
++++ iulib-0.4/SConstruct
@@ -36,12 +36,25 @@
### Options exposed via SCons
diff --git a/media-libs/iulib/iulib-0.4-r1.ebuild b/media-libs/iulib/iulib-0.4-r1.ebuild
new file mode 100644
index 00000000000..2d57f637a09
--- /dev/null
+++ b/media-libs/iulib/iulib-0.4-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit scons-utils toolchain-funcs
+
+DESCRIPTION="easy-to-use image and video I/O functions"
+HOMEPAGE="https://github.com/tmbdev/iulib"
+SRC_URI="https://iulib.googlecode.com/files/${P}.tgz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="sdl"
+
+RDEPEND="sys-libs/zlib
+ media-libs/libpng:0=
+ virtual/jpeg:0
+ media-libs/tiff:0
+ sdl? (
+ media-libs/libsdl
+ media-libs/sdl-gfx
+ )"
+DEPEND="${RDEPEND}
+ dev-util/scons"
+
+PATCHES=(
+ "${FILESDIR}/${P}-scons-build-env.patch"
+ "${FILESDIR}/${P}-default-arguments-declaration.patch"
+)
+
+src_prepare() {
+ default
+ sed -i \
+ -e "/^have_sdl = 1/s:1:$(usex sdl 1 0):" \
+ -e '/tiff/s:inflate:TIFFOpen:' \
+ -e '/progs.Append(LIBS=libiulib)/s:Append:Prepend:' \
+ -e "/^libdir/s:/lib:/$(get_libdir):" \
+ SConstruct || die #297326 #308955 #310439
+ sed -i '/SDL.SDL_image.h/d' utils/dgraphics.cc || die #310443
+ tc-export AR CC CXX RANLIB
+}
+
+src_configure() {
+ # Avoid configure as we build/install with scons
+ :
+}
+
+src_compile() {
+ escons prefix=/usr
+}
+
+src_install() {
+ escons prefix="${D}"/usr install
+ dodoc CHANGES README TODO
+}