Update of /cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/graphics
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11890/10.4-transitional/unstable/main/finkinfo/graphics
Modified Files:
mjpegtools.info mjpegtools.patch
Log Message:
fix mjpegtools on gcc4 (and backport to 10.3/10.4-t for maintainability)
Index: mjpegtools.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/graphics/mjpegtools.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- mjpegtools.patch 8 May 2005 08:02:23 -0000 1.3
+++ mjpegtools.patch 1 Feb 2006 04:52:54 -0000 1.4
@@ -1,6 +1,6 @@
-diff -Naur mjpegtools-1.6.2/lavtools/Makefile.in
mjpegtools-new/lavtools/Makefile.in
+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-new/lavtools/Makefile.in 2005-05-04 23:50:31.000000000
-0400
++++ mjpegtools-1.6.2-new/lavtools/Makefile.in 2006-01-31 22:47:50.000000000
-0500
@@ -236,7 +236,6 @@
LAV_ALL_LIB_OPTS = \
@@ -9,9 +9,9 @@
-export-dynamic
-diff -Naur mjpegtools-1.6.2/lavtools/lavpipe.c
mjpegtools-new/lavtools/lavpipe.c
+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-new/lavtools/lavpipe.c 2005-05-04 23:50:56.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);
@@ -21,9 +21,52 @@
}
}
}
-diff -Naur mjpegtools-1.6.2/yuvdenoise/Makefile.in
mjpegtools-new/yuvdenoise/Makefile.in
+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-new/yuvdenoise/Makefile.in 2005-05-05 00:23:36.000000000
-0400
++++ 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 \
@@ -33,3 +76,37 @@
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);
Index: mjpegtools.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/graphics/mjpegtools.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- mjpegtools.info 29 Nov 2005 00:58:46 -0000 1.4
+++ mjpegtools.info 1 Feb 2006 04:52:54 -0000 1.5
@@ -1,9 +1,9 @@
Package: mjpegtools
Version: 1.6.2
-Revision: 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
+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
@@ -14,16 +14,25 @@
Patch: %n.patch
PatchScript: <<
### Fix relink
- perl -pi.bak -e 's,need_relink=yes,need_relink=no,g' ltmain.sh
+ perl -pi -e 's,need_relink=yes,need_relink=no,g' ltmain.sh
### Fix fink libs last
- perl -pi.bak -e 's,hardcode_direct=yes,hardcode_direct=no,g' configure
+ 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
-------------------------------------------------------
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
