Update of /cvsroot/fink/experimental/rangerrick/3rdparty/main/finkinfo/graphics
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6785/3rdparty/main/finkinfo/graphics
Added Files:
mjpegtools.info mjpegtools.patch
Log Message:
work-in-progress
--- NEW FILE: mjpegtools.patch ---
diff -uNr mjpegtools-1.6.2/lavtools/Makefile.in
mjpegtools-1.6.2-new/lavtools/Makefile.in
--- mjpegtools-1.6.2/lavtools/Makefile.in 2004-02-03 17:58:30.000000000
-0500
+++ mjpegtools-1.6.2-new/lavtools/Makefile.in 2006-01-31 22:47:50.000000000
-0500
@@ -236,7 +236,6 @@
LAV_ALL_LIB_OPTS = \
-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
- -release $(LT_RELEASE) \
-export-dynamic
diff -uNr mjpegtools-1.6.2/lavtools/lavpipe.c
mjpegtools-1.6.2-new/lavtools/lavpipe.c
--- mjpegtools-1.6.2/lavtools/lavpipe.c 2002-09-23 15:46:43.000000000 -0400
+++ mjpegtools-1.6.2-new/lavtools/lavpipe.c 2006-01-31 22:47:50.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 -uNr mjpegtools-1.6.2/mpeg2enc/picture.cc
mjpegtools-1.6.2-new/mpeg2enc/picture.cc
--- mjpegtools-1.6.2/mpeg2enc/picture.cc 2003-10-25 13:36:32.000000000
-0400
+++ mjpegtools-1.6.2-new/mpeg2enc/picture.cc 2006-01-31 22:47:50.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 -uNr mjpegtools-1.6.2/mpeg2enc/ratectl.cc
mjpegtools-1.6.2-new/mpeg2enc/ratectl.cc
--- mjpegtools-1.6.2/mpeg2enc/ratectl.cc 2004-01-19 12:35:53.000000000
-0500
+++ mjpegtools-1.6.2-new/mpeg2enc/ratectl.cc 2006-01-31 22:48:22.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 -uNr mjpegtools-1.6.2/mpeg2enc/ratectl.hh
mjpegtools-1.6.2-new/mpeg2enc/ratectl.hh
--- mjpegtools-1.6.2/mpeg2enc/ratectl.hh 2004-01-13 14:53:25.000000000
-0500
+++ mjpegtools-1.6.2-new/mpeg2enc/ratectl.hh 2006-01-31 22:48:10.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 -uNr mjpegtools-1.6.2/yuvdenoise/Makefile.in
mjpegtools-1.6.2-new/yuvdenoise/Makefile.in
--- mjpegtools-1.6.2/yuvdenoise/Makefile.in 2004-02-03 17:58:33.000000000
-0500
+++ mjpegtools-1.6.2-new/yuvdenoise/Makefile.in 2006-01-31 22:47:50.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 -uNr mjpegtools-1.6.2/yuvdenoise/denoise.c
mjpegtools-1.6.2-new/yuvdenoise/denoise.c
--- mjpegtools-1.6.2/yuvdenoise/denoise.c 2003-12-21 02:57:25.000000000
-0500
+++ mjpegtools-1.6.2-new/yuvdenoise/denoise.c 2006-01-31 23:02:42.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 -uNr mjpegtools-1.6.2/yuvdenoise/global.h
mjpegtools-1.6.2-new/yuvdenoise/global.h
--- mjpegtools-1.6.2/yuvdenoise/global.h 2003-10-02 13:33:31.000000000
-0400
+++ mjpegtools-1.6.2-new/yuvdenoise/global.h 2006-01-31 23:10:10.000000000
-0500
@@ -104,6 +104,4 @@
uint32_t SAD;
};
-uint8_t luma_contrast_vector[256];
-
#endif
diff -uNr mjpegtools-1.6.2/yuvdenoise/main.c
mjpegtools-1.6.2-new/yuvdenoise/main.c
--- mjpegtools-1.6.2/yuvdenoise/main.c 2004-01-01 14:18:48.000000000 -0500
+++ mjpegtools-1.6.2-new/yuvdenoise/main.c 2006-01-31 23:02:42.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: 3
###
Depends: %N2-shlibs, x11, libdv4-shlibs, glib-shlibs, gtk+-shlibs,
libjpeg-shlibs, libpng3-shlibs, sdl-shlibs, libiconv, gettext
BuildDepends: libiconv-dev, gettext-dev, libdv4, glib, gtk+, libjpeg, libpng3,
libmovtar, sdl, x11-dev, libtool14 (>= 1.5.10-1)
# liquicktime0 (>= 0.9.4-13)
###
Source: mirror:sourceforge:mjpeg/%n-%v.tar.gz
Source-MD5: 01c0120b0182de67f182ef99ad855daa
###
GCC: 3.3
###
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
###
DocFiles: AUTHORS BUGS CHANGES COPYING ChangeLog HINTS INSTALL NEWS PLANS
INSTALL README* TODO
###
ConfigureParams: --enable-cmov-extension --disable-xfree-ext
--enable-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
<<
###
SplitOff: <<
Package: %N2-dev
BuildDependsOnly: True
Depends: %N2-shlibs
Replaces: %N-dev
Files: <<
bin/mjpegtools-config
include
lib/liblavfile.{a,la,dylib}
lib/liblavjpeg.{a,la,dylib}
lib/liblavplay.{a,la,dylib}
lib/libmjpegutils.a
lib/pkgconfig
<<
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
<<
###
License: GPL
Maintainer: James Watson <[EMAIL PROTECTED]>
Homepage: http://mjpeg.sourceforge.net/
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
