Changeset 17157 for trunk/dports
- Timestamp:
- Mar 24, 2006, 10:52:06 PM (18 years ago)
- Location:
- trunk/dports/multimedia/mjpegtools
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/dports/multimedia/mjpegtools/Portfile
r12426 r17157 1 # $Id: Portfile,v 1. 1 2005/05/26 05:48:20 olegbExp $1 # $Id: Portfile,v 1.2 2006/03/24 22:52:06 takanori Exp $ 2 2 3 3 PortSystem 1.0 4 4 name mjpegtools 5 5 version 1.6.2 6 revision 1 6 7 categories multimedia 7 8 maintainers filippo.natali@gmail.com … … 16 17 checksums md5 01c0120b0182de67f182ef99ad855daa 17 18 19 depends_build port:libtool 18 20 depends_lib lib:libpng:libpng lib:libjpeg:jpeg 19 21 20 configure.args --mandir=${prefix}/share/man --disable-glibtest --disable-gtktest --disable-sdltest 22 patch.pre_args -p1 23 24 configure.args --mandir=${prefix}/share/man --disable-glibtest --disable-gtktest --disable-sdltest 21 25 22 26 configure.env CPPFLAGS="-L${prefix}/lib -I${prefix}/include" \ 23 CFLAGS="-L${prefix}/lib" CC=gcc-3.3 CXX=g++-3.3 27 CFLAGS="-L${prefix}/lib" CC=gcc CXX=g++ 28 29 build.args LIBTOOL=${prefix}/bin/glibtool ASFLAGS="-f macho" 24 30 25 31 platform darwin 8 { 26 32 patchfiles mjpegtools.patch 33 } 34 35 platform i386 { 36 configure.args-append --disable-simd-accel 37 } 38 39 platform powerpc { 40 configure.args-append --enable-simd-accel 27 41 } 28 42 -
trunk/dports/multimedia/mjpegtools/files/mjpegtools.patch
r12426 r17157 1 --- lavtools/Makefile.in 2004-02-03 17:58:30.000000000 -0500 2 +++ lavtools/Makefile.in 2005-05-04 23:50:31.000000000 -0400 1 diff -ru mjpegtools-1.6.2.orig/configure mjpegtools-1.6.2/configure 2 --- mjpegtools-1.6.2.orig/configure 2004-02-03 17:58:37.000000000 -0500 3 +++ mjpegtools-1.6.2/configure 2006-03-03 00:13:24.000000000 -0500 4 @@ -25867,7 +25867,12 @@ 5 i586) ARCHFLAGS="-mcpu=i586 -march=$arch" 6 have_cmov=false 7 ;; 8 - *) ARCHFLAGS="-mcpu=i686 -march=$arch" 9 + *) case $host in 10 + *-*-darwin*) ARCHFLAGS=" " 11 + ;; 12 + *) ARCHFLAGS="-mcpu=i686 -march=$arch" 13 + ;; 14 + esac 15 have_cmov=true 16 ;; 17 esac 18 diff -ru mjpegtools-1.6.2.orig/lavtools/Makefile.in mjpegtools-1.6.2/lavtools/Makefile.in 19 --- mjpegtools-1.6.2.orig/lavtools/Makefile.in 2004-02-03 17:58:30.000000000 -0500 20 +++ mjpegtools-1.6.2/lavtools/Makefile.in 2006-03-02 23:44:30.000000000 -0500 3 21 @@ -236,7 +236,6 @@ 4 22 … … 9 27 10 28 11 --- lavtools/lavpipe.c 2002-09-23 15:46:43.000000000 -0400 12 +++ lavtools/lavpipe.c 2005-05-04 23:50:56.000000000 -0400 29 diff -ru mjpegtools-1.6.2.orig/lavtools/lavpipe.c mjpegtools-1.6.2/lavtools/lavpipe.c 30 --- mjpegtools-1.6.2.orig/lavtools/lavpipe.c 2002-09-23 15:46:43.000000000 -0400 31 +++ mjpegtools-1.6.2/lavtools/lavpipe.c 2006-03-02 23:44:30.000000000 -0500 13 32 @@ -581,7 +581,7 @@ 14 33 } … … 20 39 } 21 40 } 22 --- yuvdenoise/Makefile.in 2004-02-03 17:58:33.000000000 -0500 23 +++ yuvdenoise/Makefile.in 2005-05-05 00:23:36.000000000 -0400 41 diff -ru mjpegtools-1.6.2.orig/mpeg2enc/picture.cc mjpegtools-1.6.2/mpeg2enc/picture.cc 42 --- mjpegtools-1.6.2.orig/mpeg2enc/picture.cc 2003-10-25 13:36:32.000000000 -0400 43 +++ mjpegtools-1.6.2/mpeg2enc/picture.cc 2006-03-02 23:44:30.000000000 -0500 44 @@ -83,9 +83,9 @@ 45 } 46 47 48 - curref = new (uint8_t *)[5]; 49 - curorg = new (uint8_t *)[5]; 50 - pred = new (uint8_t *)[5]; 51 + curref = new uint8_t *[5]; 52 + curorg = new uint8_t *[5]; 53 + pred = new uint8_t *[5]; 54 55 for( i = 0 ; i<3; i++) 56 { 57 diff -ru mjpegtools-1.6.2.orig/mpeg2enc/ratectl.cc mjpegtools-1.6.2/mpeg2enc/ratectl.cc 58 --- mjpegtools-1.6.2.orig/mpeg2enc/ratectl.cc 2004-01-19 12:35:53.000000000 -0500 59 +++ mjpegtools-1.6.2/mpeg2enc/ratectl.cc 2006-03-02 23:44:30.000000000 -0500 60 @@ -62,7 +62,9 @@ 61 62 /* private prototypes */ 63 64 - 65 +static const double K_AVG_WINDOW_I = 4.0; 66 +static const double K_AVG_WINDOW_P = 10.0; 67 +static const double K_AVG_WINDOW_B = 20.0; 68 69 static double scale_quantf( int q_scale_type, double quant ) 70 { 71 diff -ru mjpegtools-1.6.2.orig/mpeg2enc/ratectl.hh mjpegtools-1.6.2/mpeg2enc/ratectl.hh 72 --- mjpegtools-1.6.2.orig/mpeg2enc/ratectl.hh 2004-01-13 14:53:25.000000000 -0500 73 +++ mjpegtools-1.6.2/mpeg2enc/ratectl.hh 2006-03-02 23:44:30.000000000 -0500 74 @@ -144,9 +144,6 @@ 75 double avg_KI; 76 double avg_KB; 77 double avg_KP; 78 - static const double K_AVG_WINDOW_I = 4.0; 79 - static const double K_AVG_WINDOW_P = 10.0; 80 - static const double K_AVG_WINDOW_B = 20.0; 81 82 double bits_per_mb; 83 bool fast_tune; 84 diff -ru mjpegtools-1.6.2.orig/strip_fPIC.sh mjpegtools-1.6.2/strip_fPIC.sh 85 --- mjpegtools-1.6.2.orig/strip_fPIC.sh 2003-12-20 12:33:38.000000000 -0500 86 +++ mjpegtools-1.6.2/strip_fPIC.sh 2006-03-03 00:04:26.000000000 -0500 87 @@ -8,6 +8,9 @@ 88 -?PIC) 89 # Ignore -fPIC and -DPIC options 90 ;; 91 + -fno-common) 92 + # Ignore -fno-common option 93 + ;; 94 *) 95 command="$command $1" 96 ;; 97 Only in mjpegtools-1.6.2/utils: .DS_Store 98 Only in mjpegtools-1.6.2/utils/mmxsse: .DS_Store 99 diff -ru mjpegtools-1.6.2.orig/utils/mmxsse/mblock_bsad_mmx.s mjpegtools-1.6.2/utils/mmxsse/mblock_bsad_mmx.s 100 --- mjpegtools-1.6.2.orig/utils/mmxsse/mblock_bsad_mmx.s 2003-11-03 13:51:32.000000000 -0500 101 +++ mjpegtools-1.6.2/utils/mmxsse/mblock_bsad_mmx.s 2006-03-03 00:13:40.000000000 -0500 102 @@ -57,7 +57,7 @@ 103 %define pbc [esp+24] 104 105 SECTION .text 106 -global bsad_mmx:function 107 +global bsad_mmx 108 109 align 32 110 bsad_mmx: 111 diff -ru mjpegtools-1.6.2.orig/utils/mmxsse/mblock_bsumsq_mmx.s mjpegtools-1.6.2/utils/mmxsse/mblock_bsumsq_mmx.s 112 --- mjpegtools-1.6.2.orig/utils/mmxsse/mblock_bsumsq_mmx.s 2003-11-03 13:51:32.000000000 -0500 113 +++ mjpegtools-1.6.2/utils/mmxsse/mblock_bsumsq_mmx.s 2006-03-03 00:13:50.000000000 -0500 114 @@ -58,7 +58,7 @@ 115 %define pbc [esp+24] 116 117 SECTION .text 118 -global bsumsq_mmx:function 119 +global bsumsq_mmx 120 121 align 32 122 bsumsq_mmx: 123 diff -ru mjpegtools-1.6.2.orig/utils/mmxsse/mblock_sad_mmx.s mjpegtools-1.6.2/utils/mmxsse/mblock_sad_mmx.s 124 --- mjpegtools-1.6.2.orig/utils/mmxsse/mblock_sad_mmx.s 2003-11-03 13:51:32.000000000 -0500 125 +++ mjpegtools-1.6.2/utils/mmxsse/mblock_sad_mmx.s 2006-03-03 00:18:34.000000000 -0500 126 @@ -27,7 +27,7 @@ 127 128 SECTION .text 129 130 -global sad_00_mmx:function 131 +global sad_00_mmx 132 133 ; int sad_mmx(unsigned char *blk1,unsigned char *blk2,int lx,int h, int distlim); 134 ; N.b. distlim is *ignored* as testing for it is more expensive than the 135 @@ -164,7 +164,7 @@ 136 ; 137 138 139 -global sad_01_mmx:function 140 +global sad_01_mmx 141 142 ; int sad_01_mmx(unsigned char *p1,unsigned char *p2,int lx,int h); 143 144 @@ -402,7 +402,7 @@ 145 ; 146 147 148 -global sad_10_mmx:function 149 +global sad_10_mmx 150 151 ; int sad_10_mmx(unsigned char *p1,unsigned char *p2,int lx,int h); 152 153 @@ -637,7 +637,7 @@ 154 ; 155 156 157 -global sad_11_mmx:function 158 +global sad_11_mmx 159 160 ; int sad_11_mmx(unsigned char *p1,unsigned char *p2,int lx,int h); 161 162 @@ -883,7 +883,7 @@ 163 ret ; we now return you to your regular programming 164 165 166 -global sad_sub22_mmx:function 167 +global sad_sub22_mmx 168 169 ; int sad_sub22_mmx(unsigned char *blk1,unsigned char *blk2,int lx,int h); 170 171 @@ -986,7 +986,7 @@ 172 173 174 175 -global sad_sub44_mmx:function 176 +global sad_sub44_mmx 177 178 ; int sad_sub44_mmx(unsigned char *blk1,unsigned char *blk2,int qlx,int qh); 179 180 diff -ru mjpegtools-1.6.2.orig/utils/mmxsse/mblock_sad_mmxe.s mjpegtools-1.6.2/utils/mmxsse/mblock_sad_mmxe.s 181 --- mjpegtools-1.6.2.orig/utils/mmxsse/mblock_sad_mmxe.s 2003-11-03 13:51:32.000000000 -0500 182 +++ mjpegtools-1.6.2/utils/mmxsse/mblock_sad_mmxe.s 2006-03-03 00:19:06.000000000 -0500 183 @@ -30,7 +30,7 @@ 184 185 SECTION .text 186 187 -global sad_00_mmxe:function 188 +global sad_00_mmxe 189 190 ; int sad_00(char *blk1,char *blk2,int lx,int h,int distlim); 191 ; distlim unused - costs more to check than the savings of 192 @@ -106,7 +106,7 @@ 193 194 195 196 -global sad_00_Ammxe:function 197 +global sad_00_Ammxe 198 ;; This is a special version that only does aligned accesses... 199 ;; Wonder if it'll make it faster on a P-III 200 ;; ANSWER: NO its slower hence no longer used. 201 @@ -193,7 +193,7 @@ 202 ret 203 204 205 -global sad_01_mmxe:function 206 +global sad_01_mmxe 207 208 ; int sad_01(char *blk1,char *blk2,int lx,int h); 209 210 @@ -271,7 +271,7 @@ 211 ret ; we now return you to your regular programming 212 213 214 -global sad_10_mmxe:function 215 +global sad_10_mmxe 216 217 ; int sad_10(char *blk1,char *blk2,int lx,int h); 218 219 @@ -356,7 +356,7 @@ 220 ret ; we now return you to your regular programming 221 222 223 -global sad_11_mmxe:function 224 +global sad_11_mmxe 225 226 ; int sad_11(char *blk1,char *blk2,int lx,int h); 227 228 @@ -452,7 +452,7 @@ 229 emms ; clear mmx registers 230 ret ; we now return you to your regular programming 231 232 -global sad_sub22_mmxe:function 233 +global sad_sub22_mmxe 234 235 ; int sad_sub22_mmxe(unsigned char *blk1,unsigned char *blk2,int flx,int fh); 236 237 @@ -520,7 +520,7 @@ 238 239 240 241 -global sad_sub44_mmxe:function 242 +global sad_sub44_mmxe 243 244 ; int sad_sub44_mmxe(unsigned char *blk1,unsigned char *blk2,int qlx,int qh); 245 246 @@ -617,7 +617,7 @@ 247 248 249 ;;; CURRENTLY not used but used in testing as reference for tweaks... 250 -global mblockq_sad_REF:function 251 +global mblockq_sad_REF 252 253 ; void mblockq_sad_REF(char *blk1,char *blk2,int lx,int h,int *weightvec); 254 ; eax = p1 255 @@ -757,7 +757,7 @@ 256 257 258 259 -global mblock_nearest4_sads_mmxe:function 260 +global mblock_nearest4_sads_mmxe 261 262 ; void mblock_nearest4_sads_mmxe(char *blk1,char *blk2,int lx,int h,int *weightvec); 263 264 @@ -905,7 +905,7 @@ 265 emms 266 ret 267 268 -global mblock_sub22_nearest4_sads_mmxe:function 269 +global mblock_sub22_nearest4_sads_mmxe 270 271 ; void mblock_sub22_nearest4_sads_mmxe(unsigned char *blk1,unsigned char *blk2,int flx,int fh, int* resvec); 272 273 diff -ru mjpegtools-1.6.2.orig/utils/mmxsse/mblock_sumsq_mmx.s mjpegtools-1.6.2/utils/mmxsse/mblock_sumsq_mmx.s 274 --- mjpegtools-1.6.2.orig/utils/mmxsse/mblock_sumsq_mmx.s 2003-11-03 13:51:32.000000000 -0500 275 +++ mjpegtools-1.6.2/utils/mmxsse/mblock_sumsq_mmx.s 2006-03-03 00:19:23.000000000 -0500 276 @@ -26,7 +26,7 @@ 277 ; h: height of block (usually 8 or 16) 278 ; mmX version 279 280 -global sumsq_mmx:function 281 +global sumsq_mmx 282 ; int sumsq_mmx(unsigned char *blk1, unsigned char *blk2, 283 ; int lx, int hx, int hy, int h) 284 285 @@ -439,7 +439,7 @@ 286 ; h: height of block (usually 4, or 8) 287 ; mmX version 288 289 -global sumsq_sub22_mmx:function 290 +global sumsq_sub22_mmx 291 ; int sumsq_sub22_mmx(unsigned char *blk1, unsigned char *blk2, 292 ; int lx, int h) 293 294 @@ -508,7 +508,7 @@ 295 ; h: height of block (usually 4, or 8) 296 ; mmX version 297 298 -global bsumsq_sub22_mmx:function 299 +global bsumsq_sub22_mmx 300 ; int bsumsq_sub22_mmx(unsigned char *blk1f, unsigned char*blk1b, 301 ; unsigned char *blk2, 302 ; int lx, int h) 303 @@ -581,7 +581,7 @@ 304 jmp d2exit 305 306 307 -global variance_mmx:function 308 +global variance_mmx 309 310 ;;; variance of a (size*size) block, multiplied by 256 311 ;;; p: address of top left pel of block 312 diff -ru mjpegtools-1.6.2.orig/yuvdenoise/Makefile.in mjpegtools-1.6.2/yuvdenoise/Makefile.in 313 --- mjpegtools-1.6.2.orig/yuvdenoise/Makefile.in 2004-02-03 17:58:33.000000000 -0500 314 +++ mjpegtools-1.6.2/yuvdenoise/Makefile.in 2006-03-02 23:44:30.000000000 -0500 24 315 @@ -207,7 +207,7 @@ 25 316 # (Ronald) do we have to do this? … … 31 322 32 323 bin_PROGRAMS = yuvdenoise 324 diff -ru mjpegtools-1.6.2.orig/yuvdenoise/denoise.c mjpegtools-1.6.2/yuvdenoise/denoise.c 325 --- mjpegtools-1.6.2.orig/yuvdenoise/denoise.c 2003-12-21 02:57:25.000000000 -0500 326 +++ mjpegtools-1.6.2/yuvdenoise/denoise.c 2006-03-02 23:44:30.000000000 -0500 327 @@ -12,6 +12,8 @@ 328 #include "stdio.h" 329 #include "denoise.h" 330 331 +extern uint8_t luma_contrast_vector[256]; 332 + 333 extern struct DNSR_GLOBAL denoiser; 334 extern struct DNSR_VECTOR vector; 335 extern struct DNSR_VECTOR varray44[8]; 336 diff -ru mjpegtools-1.6.2.orig/yuvdenoise/global.h mjpegtools-1.6.2/yuvdenoise/global.h 337 --- mjpegtools-1.6.2.orig/yuvdenoise/global.h 2003-10-02 13:33:31.000000000 -0400 338 +++ mjpegtools-1.6.2/yuvdenoise/global.h 2006-03-02 23:44:30.000000000 -0500 339 @@ -104,6 +104,4 @@ 340 uint32_t SAD; 341 }; 342 343 -uint8_t luma_contrast_vector[256]; 344 - 345 #endif 346 diff -ru mjpegtools-1.6.2.orig/yuvdenoise/main.c mjpegtools-1.6.2/yuvdenoise/main.c 347 --- mjpegtools-1.6.2.orig/yuvdenoise/main.c 2004-01-01 14:18:48.000000000 -0500 348 +++ mjpegtools-1.6.2/yuvdenoise/main.c 2006-03-02 23:44:30.000000000 -0500 349 @@ -27,6 +27,8 @@ 350 #include "denoise.h" 351 #include "deinterlace.h" 352 353 +uint8_t luma_contrast_vector[256]; 354 + 355 void allc_buffers(void); 356 void free_buffers(void); 357 void display_greeting(void);
Note: See TracChangeset
for help on using the changeset viewer.