Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18733
Modified Files:
avidemux.info
Added Files:
avidemux.patch
Log Message:
gcc4 and intel ok
--- NEW FILE: avidemux.patch ---
diff -Naur avidemux-2.0.40/avidemux/ADM_colorspace/yv12_rgb.cpp
avidemux-new/avidemux/ADM_colorspace/yv12_rgb.cpp
--- avidemux-2.0.40/avidemux/ADM_colorspace/yv12_rgb.cpp 2005-05-08
11:42:50.000000000 -0400
+++ avidemux-new/avidemux/ADM_colorspace/yv12_rgb.cpp 2006-03-27
02:08:20.000000000 -0500
@@ -45,7 +45,7 @@
* the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
*
- 2²21=
2097152
+ 2�21=
2097152
R = Y + 1.402V 2940207
G = Y - 0.344U - 0.714V 721420 1497366
B = Y + 1.772U 3716153
@@ -233,7 +233,7 @@
void fastYV12RGB_mmx ( uint8_t * py,
uint8_t * pu, uint8_t * pv, uint8_t * image,
- int h_size)
+ uint32_t h_size)
{
int i_x = 0; //, i_y = 0; //,even=1;
volatile uint8_t *cy,*cu,*cv,*o; //,*line;
diff -Naur avidemux-2.0.40/avidemux/ADM_colorspace/yv12rgb_altivec.cpp
avidemux-new/avidemux/ADM_colorspace/yv12rgb_altivec.cpp
--- avidemux-2.0.40/avidemux/ADM_colorspace/yv12rgb_altivec.cpp 2004-09-26
07:30:42.000000000 -0400
+++ avidemux-new/avidemux/ADM_colorspace/yv12rgb_altivec.cpp 2006-03-27
02:08:20.000000000 -0500
@@ -6,7 +6,7 @@
this is my first altivec simd, probably less than optimal
- 2²21=2097152
+� 2�21=2097152
R = Y + 1.402V 2940207
G = Y - 0.344U - 0.714V 721420 1497366
B = Y + 1.772U 3716153
@@ -53,7 +53,7 @@
#define vecbyte vector unsigned char
#define vecshort vector unsigned short
-uint8_t altivecYV12RGB(uint8_t * ptr_y,
+void altivecYV12RGB(uint8_t * ptr_y,
uint8_t * ptr_u,
uint8_t * ptr_v, uint8_t * ptr2, uint32_t w);
@@ -78,7 +78,7 @@
// We handle 8 pixels at a time
// My first altivec code :)
//____________________________________
-uint8_t altivecYV12RGB(uint8_t * ptr_y,
+void altivecYV12RGB(uint8_t * ptr_y,
uint8_t * ptr_u,
uint8_t * ptr_v, uint8_t * ptr2, uint32_t w)
{
@@ -280,7 +280,6 @@
}
- return 1;
}
//
diff -Naur avidemux-2.0.40/avidemux/ADM_colorspace/yv2bmp.cpp
avidemux-new/avidemux/ADM_colorspace/yv2bmp.cpp
--- avidemux-2.0.40/avidemux/ADM_colorspace/yv2bmp.cpp 2005-05-08
11:42:50.000000000 -0400
+++ avidemux-new/avidemux/ADM_colorspace/yv2bmp.cpp 2006-03-27
02:08:20.000000000 -0500
@@ -29,7 +29,7 @@
#include "colorspace.h"
#include "ADM_toolkit/ADM_cpuCap.h"
#ifdef HAVE_ALTIVEC
-extern uint8_t altivecYV12RGB(uint8_t * ptr_y,
+extern void altivecYV12RGB(uint8_t * ptr_y,
uint8_t * ptr_u,
uint8_t * ptr_v, uint8_t * ptr2, uint32_t w);
#endif
@@ -42,7 +42,7 @@
extern void fastYV12RGB_mmx ( uint8_t * py,
uint8_t * pu, uint8_t * pv, uint8_t * image,
- int h_size);
+ uint32_t h_size);
static uint8_t Clip[256+64+64];
/**
@@ -115,7 +115,7 @@
Y 4 bits U 4 bits V 4 bits
- 2²21=2097152
+� 2�21=2097152
R = Y + 1.402V 2940207
G = Y - 0.344U - 0.714V 721420 1497366
B = Y + 1.772U 3716153
@@ -204,7 +204,7 @@
//____________________________________________________________
// YUYV Version
//____________________________________________________________
-typedef void (proto_yuv) ( uint8_t * py, uint8_t * pu, uint8_t * pv, uint8_t
* image, int h_size);
+typedef void (proto_yuv) ( uint8_t * py, uint8_t * pu, uint8_t * pv, uint8_t
* image, uint32_t h_size);
uint8_t COL_yv12rgb(uint32_t w, uint32_t h,uint8_t * ptr, uint8_t * ptr2 )
{
diff -Naur avidemux-2.0.40/configure avidemux-new/configure
--- avidemux-2.0.40/configure 2005-05-25 04:32:18.000000000 -0400
+++ avidemux-new/configure 2006-03-27 02:07:58.000000000 -0500
@@ -21660,20 +21660,20 @@
have_little_endian=yes;
cat >>confdefs.h <<\_ACEOF
-#define ARCH_X86 1
+#undef ARCH_X86
_ACEOF
cat >>confdefs.h <<\_ACEOF
-#define HAVE_MMX 1
+#undef HAVE_MMX
_ACEOF
cat >>confdefs.h <<\_ACEOF
-#define RUNTIME_CPUDETECT 1
+#undef RUNTIME_CPUDETECT
_ACEOF
- use_mmx=1
+ use_mmx=0
echo "X86 is ON"
;;
x86_64|amd64)
Index: avidemux.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics/avidemux.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- avidemux.info 3 Feb 2006 16:41:50 -0000 1.3
+++ avidemux.info 28 Mar 2006 01:06:03 -0000 1.4
@@ -1,7 +1,6 @@
Package: avidemux
Version: 2.0.40
-Revision: 1012
-Architecture: powerpc
+Revision: 1013
Maintainer: Dave Vasilevsky <[EMAIL PROTECTED]>
Homepage: http://fixounet.free.fr/avidemux
@@ -10,17 +9,17 @@
Source: http://download.berlios.de/%N/%N-%v.tar.gz
Source-MD5: eed30487a2ae62f927c8a84dbc889e6d
-GCC: 3.3
+Patch: %n.patch
-SetCC: gcc-3.3
-SetCXX: g++-3.3
+GCC: 4.0
# From configure.darwin
-ConfigureParams: --with-debug --with-extra-includes=%p/include
--with-extra-libs=%p/lib --enable-altivec
+ConfigureParams: --with-debug --with-extra-includes=%p/include
--with-extra-libs=%p/lib (%m = powerpc) --enable-altivec
# For undefined symbols
SetLDFLAGS: -lSystemStubs
+# We only depend on the non-C++ parts of faad and faac
Depends: <<
gtk+2-shlibs, atk1-shlibs, glib2-shlibs (>= 2.6.6-1111),
pango1-xft2-shlibs,
libiconv, libgettext3-shlibs,
@@ -28,33 +27,30 @@
libgnugetopt-shlibs,
x11, freetype2-shlibs | freetype2-hinting-shlibs,
sdl-shlibs (>= 1.2.9-1001),
- arts-shlibs,
- libmad-shlibs, lame-shlibs, libfaad1-shlibs, faac-shlibs, a52dec-shlibs,
+ arts-shlibs (>= 1.5.1-1021),
+ libmad-shlibs, lame-shlibs, libfaad1-shlibs,
+ faac-shlibs, a52dec-shlibs,
libvorbis-shlibs, libogg-shlibs,
xvidcore-shlibs (>= 1.0.0-1)
<<
BuildDepends: <<
- pkgconfig, gcc3.3,
+ pkgconfig,
gtk+2-dev, atk1, glib2-dev (>= 2.6.6-1111), pango1-xft2-dev,
libiconv-dev, libgettext3-dev,
libxml2,
libgnugetopt,
x11-dev, freetype2-dev | freetype2-hinting-dev,
sdl (>= 1.2.9-1001),
- arts-dev,
- libmad, lame-dev, libfaad1-dev, faac-dev, a52dec-dev, libvorbis0,
libogg,
- xvidcore (>= 1.0.0-1), libavcodec1-dev, ffmpeg-dev
+ arts-dev (>= 1.5.1-1021),
+ libmad, lame-dev, libfaad1-dev,
+ faac-dev, a52dec-dev, libvorbis0, libogg,
+ xvidcore (>= 1.0.0-1), libavcodec1-dev,
+ ffmpeg-dev
<<
DocFiles: AUTHORS COPYING ChangeLog History INSTALL README TODO
Description: Graphical video-editing tool
-DescPackaging: <<
- This version is compiled with g++-3.3, even in the 10.4 tree. If it is
- ever updated to a more recent compiler, the group of packages avidemux,
- faad, and ffmpeg (and any packages which depend on any of them) must all
- be updated at the same time.
-<<
DescDetail: <<
Can understand MPEG and DivX; cut, crop and filter video; and re-encode to
AVI or MPEG. Also has a command-line mode.
-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits
