summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris White <chriswhite@gentoo.org>2005-02-19 05:30:53 +0000
committerChris White <chriswhite@gentoo.org>2005-02-19 05:30:53 +0000
commit4749aca1b6075323583ea1b6722909724a4ad92d (patch)
treef0f9c7b080b8ce91b69624e320a0215f4c7c408c /media-video
parentModified to work on ppc-macos (diff)
downloadgentoo-2-4749aca1b6075323583ea1b6722909724a4ad92d.tar.gz
gentoo-2-4749aca1b6075323583ea1b6722909724a4ad92d.tar.bz2
gentoo-2-4749aca1b6075323583ea1b6722909724a4ad92d.zip
Fixed endianess issues with jack output. Fixed gcc being detected improperly.
(Portage version: 2.0.51-r15)
Diffstat (limited to 'media-video')
-rw-r--r--media-video/mplayer/ChangeLog7
-rw-r--r--media-video/mplayer/files/mplayer-gcc_detection.patch11
-rw-r--r--media-video/mplayer/files/mplayer-jack.patch11
-rw-r--r--media-video/mplayer/mplayer-1.0_pre6.ebuild9
4 files changed, 36 insertions, 2 deletions
diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index f3b58f6ebcd9..e6c0e07b23a0 100644
--- a/media-video/mplayer/ChangeLog
+++ b/media-video/mplayer/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for media-video/mplayer
# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.273 2005/02/07 20:31:18 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.274 2005/02/19 05:30:53 chriswhite Exp $
+
+ 19 Feb 2005; Chris White <chriswhite@gentoo.org>
+ +files/mplayer-gcc_detection.patch, +files/mplayer-jack.patch,
+ mplayer-1.0_pre6.ebuild:
+ Fixed endianess issues with jack output. Fixed gcc being detected improperly.
07 Feb 2005; Jan Brinkmann <luckyduck@gentoo.org>
mplayer-1.0_pre5-r5.ebuild:
diff --git a/media-video/mplayer/files/mplayer-gcc_detection.patch b/media-video/mplayer/files/mplayer-gcc_detection.patch
new file mode 100644
index 000000000000..380d4a8c7530
--- /dev/null
+++ b/media-video/mplayer/files/mplayer-gcc_detection.patch
@@ -0,0 +1,11 @@
+--- configure.old 2005-02-19 13:11:58.000000000 +0900
++++ configure 2005-02-19 13:20:22.538154224 +0900
+@@ -586,7 +586,7 @@
+ echocheck "$_cc version"
+ cc_vendor=gnu
+ cc_name=`( $_cc -v ) 2>&1 | _tail 1 | cut -d ' ' -f 1`
+- cc_version=`( $_cc -dumpversion ) 2>&1`
++ cc_version=`( $_cc -dumpversion | cut -f1,2 -d.) 2>&1`
+ if test "$?" -gt 0; then
+ cc_version="not found"
+ fi
diff --git a/media-video/mplayer/files/mplayer-jack.patch b/media-video/mplayer/files/mplayer-jack.patch
new file mode 100644
index 000000000000..c35b48a750e1
--- /dev/null
+++ b/media-video/mplayer/files/mplayer-jack.patch
@@ -0,0 +1,11 @@
+--- libao2/ao_jack.c_old 2005-02-13 20:59:19.789628272 +0000
++++ libao2/ao_jack.c 2005-02-13 20:59:32.437705472 +0000
+@@ -103,7 +103,7 @@
+ m = 1;
+ break;
+ default:
+- format = AFMT_S16_LE;
++ format = AFMT_S16_NE;
+ bits_per_sample = 16;
+ m = 2;
+ break;
diff --git a/media-video/mplayer/mplayer-1.0_pre6.ebuild b/media-video/mplayer/mplayer-1.0_pre6.ebuild
index 465455c72bc6..a578183c639f 100644
--- a/media-video/mplayer/mplayer-1.0_pre6.ebuild
+++ b/media-video/mplayer/mplayer-1.0_pre6.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre6.ebuild,v 1.27 2005/02/07 06:58:57 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre6.ebuild,v 1.28 2005/02/19 05:30:53 chriswhite Exp $
inherit eutils flag-o-matic kernel-mod
@@ -132,6 +132,13 @@ src_unpack() {
# fixes bug #78337
epatch ${FILESDIR}/${PN}-avi_crash.patch
+
+ # fixes mplayer not seeing gcc 3.4-blahetc type
+ # gcc versions. Half stolen from toolchain-funcs
+ epatch ${FILESDIR}/${PN}-gcc_detection.patch
+
+ #fixes endian issues with jack output
+ epatch ${FILESDIR}/${PN}-jack.patch
}
linguas_warn() {