diff options
| author |   Markos Chandras <hwoarang@gentoo.org> | 2014-04-03 19:47:41 +0000 |
|---|---|---|
| committer | Markos Chandras <hwoarang@gentoo.org> | 2014-04-03 19:47:41 +0000 |
| commit | 8ac2cf14e2d7d72ac79535d918c1522288ce3f0c (patch) | |
| tree | b4faa8de081c03dd5f4e01d97949cf6ac5fbbfe1 /media-video/imagination | |
| parent | gnupg-2.0.22: Add ~ppc-aix keyword. (diff) | |
| download | gentoo-2-8ac2cf14e2d7d72ac79535d918c1522288ce3f0c.tar.gz gentoo-2-8ac2cf14e2d7d72ac79535d918c1522288ce3f0c.tar.bz2 gentoo-2-8ac2cf14e2d7d72ac79535d918c1522288ce3f0c.zip | |
Re-apply patch from bug #505188
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 09BF4F54C2BA7F3C!)
Diffstat (limited to 'media-video/imagination')
| -rw-r--r-- | media-video/imagination/ChangeLog | 6 | ||||
| -rw-r--r-- | media-video/imagination/files/imagination-3.0-cflags.patch | 66 |
2 files changed, 39 insertions, 33 deletions
diff --git a/media-video/imagination/ChangeLog b/media-video/imagination/ChangeLog index 2047c49a1368..a8cdd0c3c1de 100644 --- a/media-video/imagination/ChangeLog +++ b/media-video/imagination/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-video/imagination # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/imagination/ChangeLog,v 1.5 2014/04/02 18:50:25 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/imagination/ChangeLog,v 1.6 2014/04/03 19:47:41 hwoarang Exp $ + + 03 Apr 2014; Markos Chandras <hwoarang@gentoo.org> + files/imagination-3.0-cflags.patch: + Re-apply patch from bug #505188 28 Mar 2014; Markos Chandras <hwoarang@gentoo.org> files/imagination-3.0-cflags.patch: diff --git a/media-video/imagination/files/imagination-3.0-cflags.patch b/media-video/imagination/files/imagination-3.0-cflags.patch index 03e72626cb13..1b38a9aeff71 100644 --- a/media-video/imagination/files/imagination-3.0-cflags.patch +++ b/media-video/imagination/files/imagination-3.0-cflags.patch @@ -1,32 +1,34 @@ ---- imagination-3.0-cflags-old.patch 2014-03-28 21:29:05.208684625 +0100 -+++ imagination-3.0-cflags.patch 2014-03-28 21:42:45.880726226 +0100 -@@ -5,7 +5,28 @@ - index 0be7802..d19c8ec 100644 - --- a/configure.in - +++ b/configure.in --@@ -46,7 +46,7 @@ fi -+@@ -24,7 +24,7 @@ -+ AM_PROG_LIBTOOL -+ LIBTOOL="$LIBTOOL --silent" -+ -+-pkg_modules="gtk+-2.0 >= 2.14.0 gthread-2.0" -++pkg_modules="gtk+-2.0 >= 2.14.0 gthread-2.0 gmodule-2.0" -+ PKG_CHECK_MODULES(PACKAGE, [$pkg_modules]) -+ -+ sox_modules="sox >= 14.2.0" -+@@ -33,6 +33,11 @@ -+ plugins_modules="cairo >= 1.6 glib-2.0 > 2.18.0" -+ PKG_CHECK_MODULES(PLUGINS, [$plugins_modules]) -+ -++dnl Check for libm for sqrtf() -++AC_SEARCH_LIBS([sqrtf], [m], [], [ -++ AC_MSG_ERROR([unable to find the sqrtf() function]) -++]) -++ -+ # get svn revision -+ REVISION="r0" -+ if test "x${REVISION}" = "xr0" -+@@ -46,7 +51,7 @@ - if test "x${REVISION}" != "xr0" - then - # force debug mode for a SVN working copy +diff --git a/configure.in b/configure.in +index 0be7802..d19c8ec 100644 +--- a/configure.in ++++ b/configure.in +@@ -24,7 +24,7 @@ + AM_PROG_LIBTOOL + LIBTOOL="$LIBTOOL --silent" + +-pkg_modules="gtk+-2.0 >= 2.14.0 gthread-2.0" ++pkg_modules="gtk+-2.0 >= 2.14.0 gthread-2.0 gmodule-2.0" + PKG_CHECK_MODULES(PACKAGE, [$pkg_modules]) + + sox_modules="sox >= 14.2.0" +@@ -33,6 +33,11 @@ + plugins_modules="cairo >= 1.6 glib-2.0 > 2.18.0" + PKG_CHECK_MODULES(PLUGINS, [$plugins_modules]) + ++dnl Check for libm for sqrtf() ++AC_SEARCH_LIBS([sqrtf], [m], [], [ ++ AC_MSG_ERROR([unable to find the sqrtf() function]) ++]) ++ + # get svn revision + REVISION="r0" + if test "x${REVISION}" = "xr0" +@@ -46,7 +51,7 @@ + if test "x${REVISION}" != "xr0" + then + # force debug mode for a SVN working copy +- CFLAGS="-g -Wall" ++ CFLAGS +="-Wall" + else + REVISION="-1" + fi |