sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 01:39:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Unbreak on -CURRENT [1]

Browse source 
- Add patch to add assert header [1]
- Add patch to make assembly routine gcc3 friendly (obtained from Gentoo) [1]
- Patch path to bash in two scripts
- Remove USE_SIZE=yes it's default now and Portlint

PR:		ports/63745
Submitted by:	michael johnson <ahze@ahze.net>
This commit is contained in:
Pav Lucistnik 2004-03-06 10:55:07 +00:00
parent f46bfbafb9
commit 2a1355948a
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=103083
3 changed files with 75 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
multimedia/mjpegtools/Makefile
View file

@ -23,15 +23,14 @@ USE_GNOME= glib12
USE_GMAKE= yes
USE_LIBTOOL= yes
USE_REINPLACE= yes
USE_SIZE= yes
USE_XLIB= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} ${PTHREAD_CFLAGS}" \
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} ${PTHREAD_CFLAGS}" \
LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS:S/"//g}" \
PTHREAD_LIBS="${PTHREAD_LIBS:S/"//g}"
WANT_GNOME= yes
MAN1= divxdec.1 jpeg2yuv.1 lav2divx.1 lav2mpeg.1 lav2wav.1 lav2yuv.1 \
MAN1= divxdec.1 jpeg2yuv.1 lav2divx.1 lav2mpeg.1 lav2wav.1 lav2yuv.1 \
lavpipe.1 lavplay.1 lavrec.1 lavtrans.1 mjpegtools.1 mp2enc.1 \
mpeg2enc.1 mplex.1 ppmtoy4m.1 y4mcolorbars.1 y4mtoppm.1 \
yuv2divx.1 yuv2lav.1 yuvdenoise.1 yuvkineco.1 yuvmedianfilter.1 \
@ -54,10 +53,6 @@ post-install:
.include <bsd.port.pre.mk>
.if ${OSVERSION} >= 502102
BROKEN= "Does not compile"
.endif
.if ${ARCH} != "i386"
PLIST_SUB+= DIVX='@comment '
.else
@ -160,6 +155,8 @@ post-patch:
@${REINPLACE_CMD} -e 's|SDL/|SDL11/|' \
${WRKSRC}/lavtools/liblavplay.c \
${WRKSRC}/lavtools/yuvplay.c
@${REINPLACE_CMD} -e 's|/bin/bash|${LOCALBASE}/bin/bash|' \
${WRKSRC}/scripts/lav2mpeg ${WRKSRC}/scripts/mpegtranscode
.ifdef(WITH_QUICKTIME)
@${REINPLACE_CMD} -E -e 's|^(have_openquicktime=).+$$|\1true|' \
${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}

60
multimedia/mjpegtools/files/patch-gcc3-yuvdenoise::motion.c Normal file
View file

@ -0,0 +1,60 @@
diff -uNr yuvdenoise/motion.c yuvdenoise/motion.c.orig
--- yuvdenoise/motion.c 2002-05-06 04:13:37.000000000 -0400
+++ yuvdenoise/motion.c.orig 2003-07-25 01:52:38.339744992 -0400
@@ -251,6 +251,9 @@
" movl %1 , %%eax; /* load frameadress into eax */\n"
" movl %2 , %%ebx; /* load frameadress into ebx */\n"
" movl %3 , %%ecx; /* load width into ecx */\n"
+ " shrl $1 , %%ecx; /* shift width to scale it in the asm. */\n"
+ " /* why? we need an lvalue as input... gcc33... */\n"
+ " /* (carrbc1@wfu.edu) */\n"
" /* */\n"
".rept 4 ; /* Loop for 4 lines */\n"
" movd (%%eax), %%mm1; /* 4 Pixels from filtered frame to mm1 */\n"
@@ -270,7 +273,7 @@
" /* */\n"
" movq %%mm0 , %0 ; /* make mm0 available to gcc ... */\n"
:"=m" (a)
- :"m" (frm), "m" (ref), "m" (denoiser.frame.w/2)
+ :"m" (frm), "m" (ref), "m" (denoiser.frame.w)
:"%eax", "%ebx", "%ecx"
);
#endif
@@ -295,7 +298,10 @@
" movl %1 , %%eax; /* load frameadress into eax */\n"
" movl %2 , %%ebx; /* load frameadress into ebx */\n"
" movl %3 , %%ecx; /* load width into ecx */\n"
- " ; /* */\n"
+ " shrl $1 , %%ecx; /* shift width to scale it in the asm. */\n"
+ " /* why? we need an lvalue as input... gcc33... */\n"
+ " /* (carrbc1@wfu.edu) */\n"
+ " /* */\n"
" .rept 4 ; /* */\n"
" movd (%%eax), %%mm1; /* 4 Pixels from filtered frame to mm1 */\n"
" movd (%%ebx), %%mm2; /* 4 Pixels from filtered frame to mm2 */\n"
@@ -307,7 +313,7 @@
" /* */\n"
" movq %%mm0 , %0 ; /* make mm0 available to gcc ... */\n"
:"=m" (a)
- :"m" (frm), "m" (ref), "m" (denoiser.frame.w/2)
+ :"m" (frm), "m" (ref), "m" (denoiser.frame.w)
:"%eax", "%ebx", "%ecx"
);
#endif
@@ -349,6 +355,7 @@
static uint32_t a;
#ifdef HAVE_ASM_MMX
static uint32_t bit_mask[2] = {0x7f7f7f7f,0x7f7f7f7f};
+ static uint32_t* bit_mask_addr = bit_mask;
__asm__ __volatile__
(
@@ -380,7 +387,7 @@
" /* */"
" movq %%mm0 , %0 ; /* make mm0 available to gcc ... */"
:"=m" (a)
- :"m" (frm1),"m" (frm2), "m" (ref), "m" (denoiser.frame.w), "m" (bit_mask)
+ :"m" (frm1),"m" (frm2), "m" (ref), "m" (denoiser.frame.w), "m" (bit_mask_addr)
:"%eax", "%ebx", "%ecx", "%edx"
);
#endif

11
multimedia/mjpegtools/files/patch-mplex::systems.hh Normal file
View file

@ -0,0 +1,11 @@
--- mplex/systems.hh.orig Thu Mar 4 01:45:50 2004
+++ mplex/systems.hh Thu Mar 4 01:46:04 2004
@@ -4,6 +4,8 @@
#include <sys/param.h>
#include "inputstrm.hh"
+#include <cassert>
+
#include <vector>
using std::vector;