media-libs/libomxil-bellagio: Fix build with GCC-5

Gentoo-bug: 597706

Package-Manager: portage-2.3.0
Closes: https://github.com/gentoo/gentoo/pull/2885

2 files changed, 25 insertions, 4 deletions

diff --git a/media-libs/libomxil-bellagio/files/libomxil-bellagio-0.9.3-gcc5.patch b/media-libs/libomxil-bellagio/files/libomxil-bellagio-0.9.3-gcc5.patch
new file mode 100644
index 000000000000..65ba90859980
--- /dev/null
+++ b/media-libs/libomxil-bellagio/files/libomxil-bellagio-0.9.3-gcc5.patch
@@ -0,0 +1,19 @@
+Description: Fix FTBFS for GCC-5
+ With -Werror=logical-not-parentheses enabled, a line such as the
+ following causes the build to fail:
+ if(!omx_video_scheduler_component_Private->eState==OMX_TIME_ClockStateRunning)
+Author: Linn Crosetto <linn@hp.com>
+Bug-Debian: https://bugs.debian.org/777961
+Forwarded: no
+
+--- libomxil-bellagio-0.9.3.orig/src/components/videoscheduler/omx_video_scheduler_component.c
++++ libomxil-bellagio-0.9.3/src/components/videoscheduler/omx_video_scheduler_component.c
+@@ -313,7 +313,7 @@ OMX_BOOL omx_video_scheduler_component_C
+   }
+ 
+   /* do not send the data to sink and return back, if the clock is not running*/
+-  if(!omx_video_scheduler_component_Private->eState==OMX_TIME_ClockStateRunning){
++  if(omx_video_scheduler_component_Private->eState!=OMX_TIME_ClockStateRunning){
+     pInputBuffer->nFilledLen=0;
+     SendFrame = OMX_FALSE;
+     return SendFrame;
diff --git a/media-libs/libomxil-bellagio/libomxil-bellagio-0.9.3.ebuild b/media-libs/libomxil-bellagio/libomxil-bellagio-0.9.3.ebuild
index 53430d7c6e05..3870ff62ba27 100644
--- a/media-libs/libomxil-bellagio/libomxil-bellagio-0.9.3.ebuild
+++ b/media-libs/libomxil-bellagio/libomxil-bellagio-0.9.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -8,7 +8,7 @@ XORG_EAUTORECONF=yes
 
 inherit xorg-2
 
-DESCRIPTION="An Open Source implementation of the OpenMAX Integration Layer"
+DESCRIPTION="Open Source implementation of the OpenMAX Integration Layer"
 HOMEPAGE="http://omxil.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN:3:5}/${P}.tar.gz mirror://ubuntu/pool/universe/${PN:0:4}/${PN}/${PN}_${PV}-1ubuntu2.debian.tar.gz"
 
@@ -18,8 +18,9 @@ KEYWORDS="amd64 x86"
 IUSE="+audioeffects +clocksrc debug doc +videoscheduler"
 
 RDEPEND=""
-DEPEND="doc? ( app-doc/doxygen )
-	${RDEPEND}"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )
+"
 
 src_prepare() {
 	PATCHES=(
@@ -27,6 +28,7 @@ src_prepare() {
 		"${FILESDIR}"/${P}-dynamicloader-linking.patch
 		"${FILESDIR}"/${P}-parallel-build.patch
 		"${FILESDIR}"/${P}-version.patch
+		"${FILESDIR}"/${P}-gcc5.patch
 	)
 	xorg-2_src_prepare
 }