old

Package-Manager: portage-2.2_rc38/cvs/Linux x86_64

4 files changed, 4 insertions, 471 deletions

diff --git a/media-video/camstream/camstream-20070315.ebuild b/media-video/camstream/camstream-20070315.ebuild
index 825ac00070b4..35cbf169de4c 100644
--- a/media-video/camstream/camstream-20070315.ebuild
+++ b/media-video/camstream/camstream-20070315.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/camstream/camstream-20070315.ebuild,v 1.9 2008/10/08 10:06:45 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/camstream/camstream-20070315.ebuild,v 1.10 2009/08/21 16:05:07 ssuominen Exp $
 
 inherit eutils libtool autotools
 
@@ -19,18 +19,13 @@ RDEPEND="=x11-libs/qt-3*
 		media-libs/alsa-lib"
 DEPEND="${RDEPEND}"
 
-S="${WORKDIR}/${PN}-${MY_PV}"
+S=${WORKDIR}/${PN}-${MY_PV}
 
 src_unpack () {
 	unpack ${A}
 	cd "${S}"
-	epatch "${FILESDIR}/${PV}.patch"
+	epatch "${FILESDIR}"/${PV}.patch
 	eautoreconf
-
-	# Camstream has 32 bit asssembler normally.
-	# patch has to be adapted
-	#use amd64 && epatch ${FILESDIR}/x86_64-asm.patch
-	#disabling mmx for amd64 as a workaround
 }
 
 src_compile () {
diff --git a/media-video/camstream/files/x86_64-asm.patch b/media-video/camstream/files/x86_64-asm.patch
deleted file mode 100644
index 9e633b85c5ff..000000000000
--- a/media-video/camstream/files/x86_64-asm.patch
+++ /dev/null
@@ -1,374 +0,0 @@
---- ./camstream/video/video_asm.S.old	2004-04-17 18:22:08.977932552 +0100
-+++ ./camstream/video/video_asm.S	2004-04-17 18:23:37.614457752 +0100
-@@ -17,52 +17,52 @@
- 	
- ENTRY(calc_diff128)
- 	enter $0, $0
--	push %ebx
--	push %esi
--	push %edi
--	
--	mov Number, %ecx	# number of pixels
--	mov Dst, %edi		# destination
--	mov Src1, %esi		# src_new
--	mov Src2, %ebx		# src_old
-+	push %rbx
-+	push %rsi
-+	push %rdi
-+	
-+	mov Number, %rcx	# number of pixels
-+	mov Dst, %rdi		# destination
-+	mov Src1, %rsi		# src_new
-+	mov Src2, %rbx		# src_old
- 	
- 0:	lodsb			# load byte
--	mov (%ebx), %ah		# load second byte
-+	mov (%rbx), %ah		# load second byte
- 	shr $1, %al		# /2 by shift-right both values
- 	shr $1, %ah
- 	sub %ah, %al		# substract old value
- 	add $128, %al		# add virtual 0-point
- 	stosb
--	inc %ebx
-+	inc %rbx
- 	loop 0b
- 
--9:	pop %edi
--	pop %esi
--	pop %ebx
-+9:	pop %rdi
-+	pop %rsi
-+	pop %rbx
- 	leave
- 	ret
- 	
- 
- ENTRY(calc_diff128_mmx)
- 	enter $0, $0
--	push %ebx
--	push %esi
--	push %edi
--	
--	mov Number, %ecx	# number of pixels
--	mov Dst, %edi		# destination
--	mov Src1, %esi		# src_new
--	mov Src2, %ebx		# src_old
-+	push %rbx
-+	push %rsi
-+	push %rdi
-+	
-+	mov Number, %rcx	# number of pixels
-+	mov Dst, %rdi		# destination
-+	mov Src1, %rsi		# src_new
-+	mov Src2, %rbx		# src_old
- 
--	shr $2, %ecx		# MMX uses 4 bytes in a row; too bad MMX 
-+	shr $2, %rcx		# MMX uses 4 bytes in a row; too bad MMX 
- 				# doesnt have carry-bits or shift-right byte, 
- 				# or we could have grabbed 8 bytes in a row
- 	movq mm_128w, %mm7
- 	
--0:	movd (%esi), %mm0	# 00 00 00 00 b3 b2 b1 b0
-+0:	movd (%rsi), %mm0	# 00 00 00 00 b3 b2 b1 b0
- 	punpcklbw mm_0, %mm0	# 00 b3 00 b2 00 b1 00 b0
- 	
--	movd (%ebx), %mm1	# 00 00 00 00 c3 c2 c1 c0
-+	movd (%rbx), %mm1	# 00 00 00 00 c3 c2 c1 c0
- 	punpcklbw mm_0, %mm1	# 00 c3 00 c2 00 c1 00 c0
- 
- 	psraw $1, %mm0		# shift, then substract; this eliminates a
-@@ -71,17 +71,17 @@
- 	psubw %mm1, %mm0	# subtract
- 	paddw %mm7, %mm0	# add virtual 0-point
- 	packuswb mm_0, %mm0	# pack, unsigned saturation 00 00 00 00 d3 d2 d1 d0
--	movd %mm0, (%edi)	# store
-+	movd %mm0, (%rdi)	# store
- 
--	add $4, %ebx
--	add $4, %esi
--	add $4, %edi
-+	add $4, %rbx
-+	add $4, %rsi
-+	add $4, %rdi
- 	loop 0b
- 
- 9:	emms			# empty MMX state
--	pop %edi
--	pop %esi
--	pop %ebx
-+	pop %rdi
-+	pop %rsi
-+	pop %rbx
- 	leave
- 	ret
- 	
-@@ -89,24 +89,24 @@
- # calc_intg: perform Integrator step, that is, add a buffer to another
- ENTRY(calc_intg128)
- 	enter $0, $0
--	push %ebx
--	push %esi
--	push %edi
--	
--	mov  8(%ebp), %ecx	# number of pixels
--	mov 12(%ebp), %edi	# destination
--	mov 16(%ebp), %esi	# 2nd buffer
-+	push %rbx
-+	push %rsi
-+	push %rdi
-+	
-+	mov  8(%rbp), %rcx	# number of pixels
-+	mov 12(%rbp), %rdi	# destination
-+	mov 16(%rbp), %rsi	# 2nd buffer
- 
- 0:	lodsb
- 	sub $128, %al		# s - 128
- 	shl $1, %al		# *2
--	add %al, (%edi)		# add to destination
--	inc %edi
-+	add %al, (%rdi)		# add to destination
-+	inc %rdi
- 	loop 0b
- 	
--9:	pop %edi
--	pop %esi
--	pop %ebx
-+9:	pop %rdi
-+	pop %rsi
-+	pop %rbx
- 	leave
- 	ret
- 
-@@ -116,36 +116,36 @@
- # Perform Integrator step with MMX instructions
- ENTRY(calc_intg128_smx)
- 	enter $0, $0
--	push %ebx
--	push %esi
--	push %edi
--	
--	mov  8(%ebp), %ecx	# number of pixels
--	mov 12(%ebp), %edi	# destination
--	mov 16(%ebp), %esi	# 2nd buffer
--	shr $2, %ecx		# divide by 4 (again, we must use word operands)
-+	push %rbx
-+	push %rsi
-+	push %rdi
-+	
-+	mov  8(%rbp), %rcx	# number of pixels
-+	mov 12(%rbp), %rdi	# destination
-+	mov 16(%rbp), %rsi	# 2nd buffer
-+	shr $2, %rcx		# divide by 4 (again, we must use word operands)
- 	
- 	movq mm_128w, %mm7	# load constant
- 
- 				# The following instructions are hopefully mixed
- 				#  to optimize execution
--0:	movd (%edi), %mm0	# 00 00 00 00 b3 b2 b1 b0
-+0:	movd (%rdi), %mm0	# 00 00 00 00 b3 b2 b1 b0
- 	punpcklbw mm_0, %mm0	# 00 b3 00 b2 00 b1 00 b0
--	movd (%esi), %mm1	# 00 00 00 00 c3 c2 c1 c0
-+	movd (%rsi), %mm1	# 00 00 00 00 c3 c2 c1 c0
- 	punpcklbw mm_0, %mm1	# 00 c3 00 c2 00 c1 00 c0
--	add $4, %esi		# keep CPU busy
-+	add $4, %rsi		# keep CPU busy
- 	psubw %mm7, %mm1	# src - 128
- 	psllw $1, %mm1		# * 2
- 	paddw %mm1, %mm0	# dst += src
- 	packuswb mm_0, %mm0	# pack, unsigned saturation 00 00 00 00 d3 d2 d1 d0
--	movd %mm0, (%edi)	# store back
--	add $4, %edi
-+	movd %mm0, (%rdi)	# store back
-+	add $4, %rdi
- 	loop 0b
- 		
- 9:	emms			# clear MMX state
--	pop %edi
--	pop %esi
--	pop %ebx
-+	pop %rdi
-+	pop %rsi
-+	pop %rbx
- 	leave
- 	ret
- 
---- ./camstream/video/video_asm_add.S.old	2004-04-17 18:22:17.121694512 +0100
-+++ ./camstream/video/video_asm_add.S	2004-04-17 18:23:54.272925280 +0100
-@@ -4,102 +4,102 @@
- 
- ENTRY(calc_add)
- 	enter $0, $0
--	push %ebx
--	push %esi
--	push %edi
--
--	mov Number, %ecx
--	mov Dst, %edi
--	mov Src1, %esi
-+	push %rbx
-+	push %rsi
-+	push %rdi
-+
-+	mov Number, %rcx
-+	mov Dst, %rdi
-+	mov Src1, %rsi
- 
- 0:	lodsb
--	add %al, (%edi)
--	inc %edi
-+	add %al, (%rdi)
-+	inc %rdi
- 	loop 0b
- 
--9:	pop %edi
--	pop %esi
--	pop %ebx
-+9:	pop %rdi
-+	pop %rsi
-+	pop %rbx
- 	leave
- 	ret
- 
- ENTRY(calc_add_mmx)
- 	enter $0, $0
--	push %ebx
--	push %esi
--	push %edi
--
--	mov Number, %ecx
--	mov Dst, %edi
--	mov Src1, %esi
-+	push %rbx
-+	push %rsi
-+	push %rdi
-+
-+	mov Number, %rcx
-+	mov Dst, %rdi
-+	mov Src1, %rsi
- 	
--	shr $3, %ecx		# Divide by 8 (!)
-+	shr $3, %rcx		# Divide by 8 (!)
- 
--0:	movq (%esi), %mm0
--	add $8, %esi
--	movq (%edi), %mm1
-+0:	movq (%rsi), %mm0
-+	add $8, %rsi
-+	movq (%rdi), %mm1
- 	paddb %mm1, %mm0	# add, with overflow
--	movq %mm0, (%edi)
--	add $8, %edi
-+	movq %mm0, (%rdi)
-+	add $8, %rdi
- 	loop 0
- 
--9:	pop %edi
--	pop %esi
--	pop %ebx
-+9:	pop %rdi
-+	pop %rsi
-+	pop %rbx
- 	leave
- 	ret
- 
- 
- ENTRY(calc_add_mmxs)
- 	enter $0, $0
--	push %ebx
--	push %esi
--	push %edi
--
--	mov Number, %ecx
--	mov Dst, %edi
--	mov Src1, %esi
-+	push %rbx
-+	push %rsi
-+	push %rdi
-+
-+	mov Number, %rcx
-+	mov Dst, %rdi
-+	mov Src1, %rsi
- 	
--	shr $3, %ecx		# Divide by 8 (!)
-+	shr $3, %rcx		# Divide by 8 (!)
- 
--0:	movq (%esi), %mm0
--	add $8, %esi
--	movq (%edi), %mm1
-+0:	movq (%rsi), %mm0
-+	add $8, %rsi
-+	movq (%rdi), %mm1
- 	paddsb %mm1, %mm0	# add, with saturation
--	movq %mm0, (%edi)
--	add $8, %edi
-+	movq %mm0, (%rdi)
-+	add $8, %rdi
- 	loop 0
- 
--9:	pop %edi
--	pop %esi
--	pop %ebx
-+9:	pop %rdi
-+	pop %rsi
-+	pop %rbx
- 	leave
- 	ret
- 
- ENTRY(calc_add128_mmx)
- 	enter $0, $0
--	push %ebx
--	push %esi
--	push %edi
--
--	mov Number, %ecx
--	mov Dst, %edi
--	mov Src1, %esi
-+	push %rbx
-+	push %rsi
-+	push %rdi
-+
-+	mov Number, %rcx
-+	mov Dst, %rdi
-+	mov Src1, %rsi
- 	
--	shr $3, %ecx		# Divide by 8 (!)
-+	shr $3, %rcx		# Divide by 8 (!)
- 	movq mm_128b, %mm7	# load constant
- 
--0:	movq (%esi), %mm0
--	add $8, %esi
-+0:	movq (%rsi), %mm0
-+	add $8, %rsi
- 	psubb %mm7, %mm0	# compensate null-point
--	movq (%edi), %mm1
-+	movq (%rdi), %mm1
- 	paddb %mm1, %mm0	# add, with overflow
--	movq %mm0, (%edi)
--	add $8, %edi
-+	movq %mm0, (%rdi)
-+	add $8, %rdi
- 	loop 0
- 
--9:	pop %edi
--	pop %esi
--	pop %ebx
-+9:	pop %rdi
-+	pop %rsi
-+	pop %rbx
- 	leave
- 	ret
---- ./camstream/video/video_def.h.old	2004-04-17 18:22:25.357442488 +0100
-+++ ./camstream/video/video_def.h	2004-04-17 18:24:14.037920544 +0100
-@@ -1,8 +1,8 @@
- #define __ASSEMBLY__
- #include <linux/linkage.h>
- 
--#define Number 8(%ebp)
--#define Dst    12(%ebp)
--#define Src1   16(%ebp)
--#define Src2   20(%ebp)
-+#define Number 8(%rbp)
-+#define Dst    12(%rbp)
-+#define Src1   16(%rbp)
-+#define Src2   20(%rbp)
- 
diff --git a/media-video/coriander/Manifest b/media-video/coriander/Manifest
index 6a9c96fff0b7..380ef7105169 100644
--- a/media-video/coriander/Manifest
+++ b/media-video/coriander/Manifest
@@ -1,4 +1,3 @@
-AUX coriander-2.0.0_rc1-ffmpeg-configure.patch 2812 RMD160 5670ae9c81024be22c406375973fec066b803009 SHA1 cff65cfa383a0df7bdb0275455f3a56b89079b2f SHA256 b26b9e659c4a190ab8e9db729076309999de8f0f3773ae49dd8b1ae7b087dc5a
 DIST coriander-2.0.0-rc6.tar.gz 298298 RMD160 9e1c803524e58988fd7c96373af0d616acfcac19 SHA1 e869057d120793b76bc37b16f8e6460cac925179 SHA256 8c8ad8bba08c97cc7945c796fe8d0914a037bc302267be8ebeae05e1e9dd6e05
 DIST coriander-2.0.0.tar.gz 309365 RMD160 085893a7cd49230990bff6ef82080004e1ec5180 SHA1 8a71763b5d72fd70eec479da801526ce541755dc SHA256 e248a5adf836cc7e103abb0d95cee826cabd1982d8faf96a5cc2c610529d09f0
 EBUILD coriander-2.0.0.ebuild 1220 RMD160 e373c3efecaf5fa69d3b69e722e3cb4649b7c58f SHA1 0260ed1a73b2032193fc2b6a2b906f4c26847747 SHA256 d0d5dfd08f1d584d24847628cfe5eda975ecec70ea4e42198ed9fbd9c508607e
diff --git a/media-video/coriander/files/coriander-2.0.0_rc1-ffmpeg-configure.patch b/media-video/coriander/files/coriander-2.0.0_rc1-ffmpeg-configure.patch
deleted file mode 100644
index 597e3ea68a74..000000000000
--- a/media-video/coriander/files/coriander-2.0.0_rc1-ffmpeg-configure.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-Index: coriander-2.0.0-rc1/configure.in
-===================================================================
---- coriander-2.0.0-rc1.orig/configure.in
-+++ coriander-2.0.0-rc1/configure.in
-@@ -315,34 +315,43 @@ AC_DEFUN([AC_CHECK_LFS],[
- ])
- 
- AC_DEFUN([AC_CHECK_FFMPEG],[
-+	PKG_CHECK_MODULES(FFMPEG, libavformat libavcodec,
-+		have_ffmpeg=yes, have_ffmpeg=no)
- 	AC_SUBST(FFMPEG_CFLAGS)
- 	AC_SUBST(FFMPEG_LIBS)
--	AC_CHECK_PROG(have_ffmpeg_config, ffmpeg-config, "found", "no")
--	if test x$have_ffmpeg_config = xfound; then 
--	     AC_MSG_CHECKING(ffmpeg version)    
--	     AC_TRY_COMPILE([
--	     #include <ffmpeg/avformat.h>
--	     ],[
--	     int main(void) {
--               AVFormatContext *oc;
--	       AVCodecContext *c;
--               AVStream *st;
--               st = av_new_stream(oc, 0);
--  	       c = st->codec;
--               return 0;
--	     }
--	     ],ffmpeg=ok,ffmpeg=outdated);
--	     AC_MSG_RESULT($ffmpeg)
-- 	     if test x$ffmpeg = xok; then
--	          FFMPEG_LIBS=`ffmpeg-config --libs avformat avcodec`
--	          FFMPEG_CFLAGS=`ffmpeg-config --cflags`
--	          AC_DEFINE(HAVE_FFMPEG,1,[defined if ffmpeg is available])
--	     else
--                  AC_ERROR([ffmpeg is too old. 
-+
-+	# Older ffmpeg releases have ffmpeg-config rather than installing .pc files
-+	if test x$have_ffmpeg = xno; then
-+		AC_CHECK_PROG(have_ffmpeg, ffmpeg-config, "yes", "no")
-+		if test x$have_ffmpeg = xyes; then
-+			FFMPEG_LIBS=`ffmpeg-config --libs avformat avcodec`
-+			FFMPEG_CFLAGS=`ffmpeg-config --cflags`
-+		fi
-+	fi
-+
-+	if test x$have_ffmpeg = xyes; then
-+		AC_MSG_CHECKING(ffmpeg version)
-+		AC_TRY_COMPILE([#include <ffmpeg/avformat.h>],[
-+			int main(void) {
-+			AVFormatContext *oc;
-+			AVCodecContext *c;
-+			AVStream *st;
-+			st = av_new_stream(oc, 0);
-+			c = st->codec;
-+			return 0;
-+			}
-+			],ffmpeg=ok,ffmpeg=outdated);
-+		AC_MSG_RESULT($ffmpeg)
-+		if test x$ffmpeg = xok; then
-+			AC_DEFINE(HAVE_FFMPEG,1,[defined if ffmpeg is available])
-+		else
-+			if test "x$want_ffmpeg" = "xyes"; then
-+				AC_ERROR([ffmpeg is too old.
- **************************************************************************
- **   Please install ffmpeg version 0.4.9 minimum                        **
- **************************************************************************])
--             fi
-+			fi
-+		fi
- 	else
- 	  AC_MSG_RESULT([ffmpeg required for MPEG video saving.
- **************************************************************************
-@@ -371,7 +380,14 @@ AC_CHECK_LIBRAW
- AC_CHECK_LIBDC
- AC_CHECK_FTPLIB
- AC_CHECK_SDLLIB
--AC_CHECK_FFMPEG
-+
-+AC_ARG_ENABLE(ffmpeg,
-+	AS_HELP_STRING(--enable-ffmpeg, [enable MPEG video saving (default auto)]),
-+	want_ffmpeg=$enableval, want_ffmpeg=auto)
-+
-+if test "x$want_ffmpeg" != "xno"; then
-+	AC_CHECK_FFMPEG
-+fi
- 
- dnl deprecated:
- dnl AC_CHECK_GDK_PIXBUF