summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoseph Jezak <josejx@gentoo.org>2010-06-03 14:43:07 +0000
committerJoseph Jezak <josejx@gentoo.org>2010-06-03 14:43:07 +0000
commit2e1a0f9295a4cd4848d41358de072612346a3e35 (patch)
tree550e6b8810eda41d2ada865811878254d641d1ea /media-video/avidemux
parentConvert to EAPI="2". (diff)
downloadgentoo-2-2e1a0f9295a4cd4848d41358de072612346a3e35.tar.gz
gentoo-2-2e1a0f9295a4cd4848d41358de072612346a3e35.tar.bz2
gentoo-2-2e1a0f9295a4cd4848d41358de072612346a3e35.zip
Add fix for altivec on ppc.
(Portage version: 2.1.8.3/cvs/Linux x86_64)
Diffstat (limited to 'media-video/avidemux')
-rw-r--r--media-video/avidemux/ChangeLog6
-rw-r--r--media-video/avidemux/avidemux-2.5.2.ebuild14
-rw-r--r--media-video/avidemux/files/avidemux-2.5.2-altivec-bool.patch12
3 files changed, 27 insertions, 5 deletions
diff --git a/media-video/avidemux/ChangeLog b/media-video/avidemux/ChangeLog
index 8c024691bf5b..9348cec27e8b 100644
--- a/media-video/avidemux/ChangeLog
+++ b/media-video/avidemux/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-video/avidemux
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.161 2010/01/09 15:36:42 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.162 2010/06/03 14:43:07 josejx Exp $
+
+ 03 Jun 2010; Joseph Jezak <josejx@gentoo.org> avidemux-2.5.2.ebuild,
+ +files/avidemux-2.5.2-altivec-bool.patch:
+ Add fix for altivec on ppc.
09 Jan 2010; Christian Faulhammer <fauli@gentoo.org>
avidemux-2.5.1_p5428.ebuild:
diff --git a/media-video/avidemux/avidemux-2.5.2.ebuild b/media-video/avidemux/avidemux-2.5.2.ebuild
index 4ac4ad59a716..aa20ef224930 100644
--- a/media-video/avidemux/avidemux-2.5.2.ebuild
+++ b/media-video/avidemux/avidemux-2.5.2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.5.2.ebuild,v 1.1 2009/12/22 16:49:52 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.5.2.ebuild,v 1.2 2010/06/03 14:43:07 josejx Exp $
EAPI="2"
-inherit cmake-utils
+inherit cmake-utils flag-o-matic
MY_P=${PN}_${PV}
@@ -55,7 +55,8 @@ done
PATCHES=( "${WORKDIR}/patches/2.5.1-i18n.patch"
"${WORKDIR}/patches/2.5.1-coreImage-parallel-build.patch"
- "${FILESDIR}/avidemux-2.5.1-build-plugins-fix.patch" )
+ "${FILESDIR}/avidemux-2.5.1-build-plugins-fix.patch"
+ "${FILESDIR}/avidemux-2.5.2-altivec-bool.patch" )
src_prepare() {
base_src_prepare
@@ -85,6 +86,11 @@ src_prepare() {
}
src_configure() {
+ ### Add lax vector typing for PowerPC
+ if use ppc || use ppc64; then
+ append-cflags "-flax-vector-conversions"
+ fi
+
mycmakeargs="${mycmakeargs}
-DAVIDEMUX_SOURCE_DIR='${S}'
-DAVIDEMUX_INSTALL_PREFIX='${S}_build'
diff --git a/media-video/avidemux/files/avidemux-2.5.2-altivec-bool.patch b/media-video/avidemux/files/avidemux-2.5.2-altivec-bool.patch
new file mode 100644
index 000000000000..3e817fcdd6ee
--- /dev/null
+++ b/media-video/avidemux/files/avidemux-2.5.2-altivec-bool.patch
@@ -0,0 +1,12 @@
+--- avidemux/ADM_libraries/ADM_libmpeg2enc/mjpeg_types.h 2010-06-03 14:35:59.449422885 +0000
++++ mavidemux/ADM_libraries/ADM_libmpeg2enc/jpeg_types.h 2010-06-03 14:35:49.612757527 +0000
+@@ -76,7 +76,9 @@
+
+ # define false false
+ # define true true
++#ifndef HAVE_ALTIVEC_H
+ # define bool locBool
++#endif
+ # endif
+ #endif
+