Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/graphics
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv9608
Added Files:
mjpegtools.info mjpegtools.patch
Log Message:
move to stable to satisfy dependencies
--- NEW FILE: mjpegtools.patch ---
diff -ru mjpegtools-1.6.2.orig/configure mjpegtools-1.6.2/configure
--- mjpegtools-1.6.2.orig/configure 2004-02-03 17:58:37.000000000 -0500
+++ mjpegtools-1.6.2/configure 2006-03-03 00:13:24.000000000 -0500
@@ -25867,7 +25867,12 @@
i586) ARCHFLAGS="-mcpu=i586 -march=$arch"
have_cmov=false
;;
- *) ARCHFLAGS="-mcpu=i686 -march=$arch"
+ *) case $host in
+ *-*-darwin*) ARCHFLAGS=" "
+ ;;
+ *) ARCHFLAGS="-mcpu=i686 -march=$arch"
+ ;;
+ esac
have_cmov=true
;;
esac
diff -ru mjpegtools-1.6.2.orig/lavtools/Makefile.in
mjpegtools-1.6.2/lavtools/Makefile.in
--- mjpegtools-1.6.2.orig/lavtools/Makefile.in 2004-02-03 17:58:30.000000000
-0500
+++ mjpegtools-1.6.2/lavtools/Makefile.in 2006-03-02 23:44:30.000000000
-0500
@@ -236,7 +236,6 @@
LAV_ALL_LIB_OPTS = \
-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
- -release $(LT_RELEASE) \
-export-dynamic
diff -ru mjpegtools-1.6.2.orig/lavtools/lavpipe.c
mjpegtools-1.6.2/lavtools/lavpipe.c
--- mjpegtools-1.6.2.orig/lavtools/lavpipe.c 2002-09-23 15:46:43.000000000
-0400
+++ mjpegtools-1.6.2/lavtools/lavpipe.c 2006-03-02 23:44:30.000000000 -0500
@@ -581,7 +581,7 @@
}
mjpeg_info( "closing input %d (source %d)", i, current_index);
decommission_pipe_source(source);
- KEEP_SOURCE:
+ KEEP_SOURCE: ;
}
}
}
diff -ru mjpegtools-1.6.2.orig/mpeg2enc/picture.cc
mjpegtools-1.6.2/mpeg2enc/picture.cc
--- mjpegtools-1.6.2.orig/mpeg2enc/picture.cc 2003-10-25 13:36:32.000000000
-0400
+++ mjpegtools-1.6.2/mpeg2enc/picture.cc 2006-03-02 23:44:30.000000000
-0500
@@ -83,9 +83,9 @@
}
- curref = new (uint8_t *)[5];
- curorg = new (uint8_t *)[5];
- pred = new (uint8_t *)[5];
+ curref = new uint8_t *[5];
+ curorg = new uint8_t *[5];
+ pred = new uint8_t *[5];
for( i = 0 ; i<3; i++)
{
diff -ru mjpegtools-1.6.2.orig/mpeg2enc/ratectl.cc
mjpegtools-1.6.2/mpeg2enc/ratectl.cc
--- mjpegtools-1.6.2.orig/mpeg2enc/ratectl.cc 2004-01-19 12:35:53.000000000
-0500
+++ mjpegtools-1.6.2/mpeg2enc/ratectl.cc 2006-03-02 23:44:30.000000000
-0500
@@ -62,7 +62,9 @@
/* private prototypes */
-
+static const double K_AVG_WINDOW_I = 4.0;
+static const double K_AVG_WINDOW_P = 10.0;
+static const double K_AVG_WINDOW_B = 20.0;
static double scale_quantf( int q_scale_type, double quant )
{
diff -ru mjpegtools-1.6.2.orig/mpeg2enc/ratectl.hh
mjpegtools-1.6.2/mpeg2enc/ratectl.hh
--- mjpegtools-1.6.2.orig/mpeg2enc/ratectl.hh 2004-01-13 14:53:25.000000000
-0500
+++ mjpegtools-1.6.2/mpeg2enc/ratectl.hh 2006-03-02 23:44:30.000000000
-0500
@@ -144,9 +144,6 @@
double avg_KI;
double avg_KB;
double avg_KP;
- static const double K_AVG_WINDOW_I = 4.0;
- static const double K_AVG_WINDOW_P = 10.0;
- static const double K_AVG_WINDOW_B = 20.0;
double bits_per_mb;
bool fast_tune;
diff -ru mjpegtools-1.6.2.orig/strip_fPIC.sh mjpegtools-1.6.2/strip_fPIC.sh
--- mjpegtools-1.6.2.orig/strip_fPIC.sh 2003-12-20 12:33:38.000000000 -0500
+++ mjpegtools-1.6.2/strip_fPIC.sh 2006-03-03 00:04:26.000000000 -0500
@@ -8,6 +8,9 @@
-?PIC)
# Ignore -fPIC and -DPIC options
;;
+ -fno-common)
+ # Ignore -fno-common option
+ ;;
*)
command="$command $1"
;;
Only in mjpegtools-1.6.2/utils: .DS_Store
Only in mjpegtools-1.6.2/utils/mmxsse: .DS_Store
diff -ru mjpegtools-1.6.2.orig/utils/mmxsse/mblock_bsad_mmx.s
mjpegtools-1.6.2/utils/mmxsse/mblock_bsad_mmx.s
--- mjpegtools-1.6.2.orig/utils/mmxsse/mblock_bsad_mmx.s 2003-11-03
13:51:32.000000000 -0500
+++ mjpegtools-1.6.2/utils/mmxsse/mblock_bsad_mmx.s 2006-03-03
00:13:40.000000000 -0500
@@ -57,7 +57,7 @@
%define pbc [esp+24]
SECTION .text
-global bsad_mmx:function
+global bsad_mmx
align 32
bsad_mmx:
diff -ru mjpegtools-1.6.2.orig/utils/mmxsse/mblock_bsumsq_mmx.s
mjpegtools-1.6.2/utils/mmxsse/mblock_bsumsq_mmx.s
--- mjpegtools-1.6.2.orig/utils/mmxsse/mblock_bsumsq_mmx.s 2003-11-03
13:51:32.000000000 -0500
+++ mjpegtools-1.6.2/utils/mmxsse/mblock_bsumsq_mmx.s 2006-03-03
00:13:50.000000000 -0500
@@ -58,7 +58,7 @@
%define pbc [esp+24]
SECTION .text
-global bsumsq_mmx:function
+global bsumsq_mmx
align 32
bsumsq_mmx:
diff -ru mjpegtools-1.6.2.orig/utils/mmxsse/mblock_sad_mmx.s
mjpegtools-1.6.2/utils/mmxsse/mblock_sad_mmx.s
--- mjpegtools-1.6.2.orig/utils/mmxsse/mblock_sad_mmx.s 2003-11-03
13:51:32.000000000 -0500
+++ mjpegtools-1.6.2/utils/mmxsse/mblock_sad_mmx.s 2006-03-03
00:18:34.000000000 -0500
@@ -27,7 +27,7 @@
SECTION .text
-global sad_00_mmx:function
+global sad_00_mmx
; int sad_mmx(unsigned char *blk1,unsigned char *blk2,int lx,int h, int
distlim);
; N.b. distlim is *ignored* as testing for it is more expensive than the
@@ -164,7 +164,7 @@
;
-global sad_01_mmx:function
+global sad_01_mmx
; int sad_01_mmx(unsigned char *p1,unsigned char *p2,int lx,int h);
@@ -402,7 +402,7 @@
;
-global sad_10_mmx:function
+global sad_10_mmx
; int sad_10_mmx(unsigned char *p1,unsigned char *p2,int lx,int h);
@@ -637,7 +637,7 @@
;
-global sad_11_mmx:function
+global sad_11_mmx
; int sad_11_mmx(unsigned char *p1,unsigned char *p2,int lx,int h);
@@ -883,7 +883,7 @@
ret ; we now return you to your regular programming
-global sad_sub22_mmx:function
+global sad_sub22_mmx
; int sad_sub22_mmx(unsigned char *blk1,unsigned char *blk2,int lx,int h);
@@ -986,7 +986,7 @@
-global sad_sub44_mmx:function
+global sad_sub44_mmx
; int sad_sub44_mmx(unsigned char *blk1,unsigned char *blk2,int qlx,int qh);
diff -ru mjpegtools-1.6.2.orig/utils/mmxsse/mblock_sad_mmxe.s
mjpegtools-1.6.2/utils/mmxsse/mblock_sad_mmxe.s
--- mjpegtools-1.6.2.orig/utils/mmxsse/mblock_sad_mmxe.s 2003-11-03
13:51:32.000000000 -0500
+++ mjpegtools-1.6.2/utils/mmxsse/mblock_sad_mmxe.s 2006-03-03
00:19:06.000000000 -0500
@@ -30,7 +30,7 @@
SECTION .text
-global sad_00_mmxe:function
+global sad_00_mmxe
; int sad_00(char *blk1,char *blk2,int lx,int h,int distlim);
; distlim unused - costs more to check than the savings of
@@ -106,7 +106,7 @@
-global sad_00_Ammxe:function
+global sad_00_Ammxe
;; This is a special version that only does aligned accesses...
;; Wonder if it'll make it faster on a P-III
;; ANSWER: NO its slower hence no longer used.
@@ -193,7 +193,7 @@
ret
-global sad_01_mmxe:function
+global sad_01_mmxe
; int sad_01(char *blk1,char *blk2,int lx,int h);
@@ -271,7 +271,7 @@
ret ; we now return you to your regular programming
-global sad_10_mmxe:function
+global sad_10_mmxe
; int sad_10(char *blk1,char *blk2,int lx,int h);
@@ -356,7 +356,7 @@
ret ; we now return you to your regular programming
-global sad_11_mmxe:function
+global sad_11_mmxe
; int sad_11(char *blk1,char *blk2,int lx,int h);
@@ -452,7 +452,7 @@
emms ; clear mmx registers
ret ; we now return you to your regular programming
-global sad_sub22_mmxe:function
+global sad_sub22_mmxe
; int sad_sub22_mmxe(unsigned char *blk1,unsigned char *blk2,int flx,int fh);
@@ -520,7 +520,7 @@
-global sad_sub44_mmxe:function
+global sad_sub44_mmxe
; int sad_sub44_mmxe(unsigned char *blk1,unsigned char *blk2,int qlx,int qh);
@@ -617,7 +617,7 @@
;;; CURRENTLY not used but used in testing as reference for tweaks...
-global mblockq_sad_REF:function
+global mblockq_sad_REF
; void mblockq_sad_REF(char *blk1,char *blk2,int lx,int h,int *weightvec);
; eax = p1
@@ -757,7 +757,7 @@
-global mblock_nearest4_sads_mmxe:function
+global mblock_nearest4_sads_mmxe
; void mblock_nearest4_sads_mmxe(char *blk1,char *blk2,int lx,int h,int
*weightvec);
@@ -905,7 +905,7 @@
emms
ret
-global mblock_sub22_nearest4_sads_mmxe:function
+global mblock_sub22_nearest4_sads_mmxe
; void mblock_sub22_nearest4_sads_mmxe(unsigned char *blk1,unsigned char
*blk2,int flx,int fh, int* resvec);
diff -ru mjpegtools-1.6.2.orig/utils/mmxsse/mblock_sumsq_mmx.s
mjpegtools-1.6.2/utils/mmxsse/mblock_sumsq_mmx.s
--- mjpegtools-1.6.2.orig/utils/mmxsse/mblock_sumsq_mmx.s 2003-11-03
13:51:32.000000000 -0500
+++ mjpegtools-1.6.2/utils/mmxsse/mblock_sumsq_mmx.s 2006-03-03
00:19:23.000000000 -0500
@@ -26,7 +26,7 @@
; h: height of block (usually 8 or 16)
; mmX version
-global sumsq_mmx:function
+global sumsq_mmx
; int sumsq_mmx(unsigned char *blk1, unsigned char *blk2,
; int lx, int hx, int hy, int h)
@@ -439,7 +439,7 @@
; h: height of block (usually 4, or 8)
; mmX version
-global sumsq_sub22_mmx:function
+global sumsq_sub22_mmx
; int sumsq_sub22_mmx(unsigned char *blk1, unsigned char *blk2,
; int lx, int h)
@@ -508,7 +508,7 @@
; h: height of block (usually 4, or 8)
; mmX version
-global bsumsq_sub22_mmx:function
+global bsumsq_sub22_mmx
; int bsumsq_sub22_mmx(unsigned char *blk1f, unsigned char*blk1b,
; unsigned char *blk2,
; int lx, int h)
@@ -581,7 +581,7 @@
jmp d2exit
-global variance_mmx:function
+global variance_mmx
;;; variance of a (size*size) block, multiplied by 256
;;; p: address of top left pel of block
diff -ru mjpegtools-1.6.2.orig/yuvdenoise/Makefile.in
mjpegtools-1.6.2/yuvdenoise/Makefile.in
--- mjpegtools-1.6.2.orig/yuvdenoise/Makefile.in 2004-02-03
17:58:33.000000000 -0500
+++ mjpegtools-1.6.2/yuvdenoise/Makefile.in 2006-03-02 23:44:30.000000000
-0500
@@ -207,7 +207,7 @@
# (Ronald) do we have to do this?
AM_CFLAGS = -funroll-all-loops -finline-functions \
-ffast-math -frerun-cse-after-loop -frerun-loop-opt \
- -fexpensive-optimizations -fmove-all-movables
+ -fexpensive-optimizations
bin_PROGRAMS = yuvdenoise
diff -ru mjpegtools-1.6.2.orig/yuvdenoise/denoise.c
mjpegtools-1.6.2/yuvdenoise/denoise.c
--- mjpegtools-1.6.2.orig/yuvdenoise/denoise.c 2003-12-21 02:57:25.000000000
-0500
+++ mjpegtools-1.6.2/yuvdenoise/denoise.c 2006-03-02 23:44:30.000000000
-0500
@@ -12,6 +12,8 @@
#include "stdio.h"
#include "denoise.h"
+extern uint8_t luma_contrast_vector[256];
+
extern struct DNSR_GLOBAL denoiser;
extern struct DNSR_VECTOR vector;
extern struct DNSR_VECTOR varray44[8];
diff -ru mjpegtools-1.6.2.orig/yuvdenoise/global.h
mjpegtools-1.6.2/yuvdenoise/global.h
--- mjpegtools-1.6.2.orig/yuvdenoise/global.h 2003-10-02 13:33:31.000000000
-0400
+++ mjpegtools-1.6.2/yuvdenoise/global.h 2006-03-02 23:44:30.000000000
-0500
@@ -104,6 +104,4 @@
uint32_t SAD;
};
-uint8_t luma_contrast_vector[256];
-
#endif
diff -ru mjpegtools-1.6.2.orig/yuvdenoise/main.c
mjpegtools-1.6.2/yuvdenoise/main.c
--- mjpegtools-1.6.2.orig/yuvdenoise/main.c 2004-01-01 14:18:48.000000000
-0500
+++ mjpegtools-1.6.2/yuvdenoise/main.c 2006-03-02 23:44:30.000000000 -0500
@@ -27,6 +27,8 @@
#include "denoise.h"
#include "deinterlace.h"
+uint8_t luma_contrast_vector[256];
+
void allc_buffers(void);
void free_buffers(void);
void display_greeting(void);
--- NEW FILE: mjpegtools.info ---
Package: mjpegtools
Version: 1.6.2
Revision: 1005
###
Depends: %N2-shlibs (>= %v-%r), x11, libdv4-shlibs, glib-shlibs, gtk+-shlibs,
libjpeg-shlibs, libpng3-shlibs, sdl-shlibs, libiconv, libgettext3-shlibs
BuildDepends: libiconv-dev, libgettext3-dev, libdv4, glib, gtk+, libjpeg,
libpng3, libmovtar, sdl, x11-dev, libtool14 (>= 1.5.22-1000)
# liquicktime0 (>= 0.9.4-13)
###
Source: mirror:sourceforge:mjpeg/%n-%v.tar.gz
Source-MD5: 01c0120b0182de67f182ef99ad855daa
###
GCC: 4.0
###
Patch: %n.patch
PatchScript: <<
### Fix relink
perl -pi -e 's,need_relink=yes,need_relink=no,g' ltmain.sh
### Fix fink libs last
perl -pi -e 's,hardcode_direct=yes,hardcode_direct=no,g' configure
### fix twolevel stuff
perl -pi -e 's,-flat_namespace -undefined suppress,-undefined dynamic_lookup
-multiply_defined suppress,g' configure
<<
NoSetMAKEFLAGS: true
SetMAKEFLAGS: -j1
#SetCPPLAGS: -fno-common
SetCFLAGS: -fno-common
SetCXXFLAGS: -fno-common
SetLDFLAGS: -dylib_file
/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib
###
DocFiles: AUTHORS BUGS CHANGES COPYING ChangeLog HINTS INSTALL NEWS PLANS
INSTALL README* TODO
###
ConfigureParams: --enable-cmov-extension --disable-xfree-ext (%m = powerpc)
--enable-simd-accel (%m = i386) --disable-simd-accel --with-glib-prefix=%p
--with-gtk-prefix=%p --with-movtar-prefix=%p --with-sdl-prefix=%p
--without-quicktime --with-dv=%p --with-dv-yv12 --without-aviplay
--without-jpeg-mmx --with-x --enable-shared --enable-static
--mandir=%i/share/man --infodir=%p/share/info --libexecdir=%p/lib
--disable-sdltest --disable-dependency-tracking
CompileScript: <<
./configure %c
make LIBTOOL=%p/bin/glibtool ASFLAGS="-f macho"
<<
###
SplitOff3: <<
Package: %N2-dev
BuildDependsOnly: True
Depends: %N2-shlibs (= %v-%r)
Replaces: %N-dev, %N
Conflicts: %N-dev
Files: <<
bin/mjpegtools-config
include
lib
<<
DocFiles: AUTHORS BUGS CHANGES COPYING ChangeLog HINTS INSTALL NEWS PLANS
INSTALL README* TODO
Description: Development files for MJPEG/MPEG capture/editing/compression
<<
SplitOff2: <<
Package: %N2-shlibs
Replaces: %N
Depends: libjpeg-shlibs, libdv4-shlibs, glib-shlibs
Files: <<
lib/liblavfile.*.dylib
lib/liblavjpeg.*.dylib
lib/liblavplay.*.dylib
lib/libmpeg2encpp-1.6.*.dylib
lib/libmplex2-1.6.*.dylib
<<
Shlibs: <<
%p/lib/liblavfile.0.dylib 3.0.0 %n (>= 1.6.2-2)
%p/lib/liblavjpeg.0.dylib 3.0.0 %n (>= 1.6.2-2)
%p/lib/liblavplay.0.dylib 3.0.0 %n (>= 1.6.2-2)
%p/lib/libmpeg2encpp-1.6.0.dylib 3.0.0 %n (>= 1.6.2-1)
%p/lib/libmplex2-1.6.0.dylib 3.0.0 %n (>= 1.6.2-1)
<<
DocFiles: AUTHORS BUGS CHANGES COPYING ChangeLog HINTS INSTALL NEWS PLANS
INSTALL README* TODO
Description: Libraries for MJPEG/MPEG capture/editing/compression
<<
###
Description: MJPEG/MPEG capture/editing/compression tools
DescDetail: <<
Mjpeg tools is a suite of programs which support video capture, basic
editing, playback, and compression to MPEG-1/2 of MJPEG video. The capture
software allows MJPEG video streams in AVI, Quicktime, and movtar format to
be produced using the Iomega Buz, Miro DC10+, Matrox Marvel, and similar
hardware. The editing and playback tools are hardware independent, with
support for hardware accelerated playback if present. The MPEG compression
tools are based on MPEG Software Simulation Group's reference encoder with
enhancements to provide far faster compression and significant quality
improvements.
<<
DescPort: <<
quicktime support uses libquicktime_read_audio, which has been
removed from the libquicktime0 ABI by version 0.9.4
Patched to build on Intel. Have to --disable-simd-accel on Intel or
bad code gets generated. :( --danielj7
Set LDFLAGS to avoid the infamous 10.5 "cycle in dylib" error. --akh
<<
###
License: GPL
Maintainer: James Watson <[EMAIL PROTECTED]>
Homepage: http://mjpeg.sourceforge.net/
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
