1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-01 01:17:02 +00:00

- Update to 1.6.3-rc1

This commit is contained in:
Michael Johnson 2005-07-14 07:32:44 +00:00
parent 56c327c698
commit 368b294f53
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=139177
6 changed files with 33 additions and 75 deletions

View File

@ -6,8 +6,7 @@
#
PORTNAME= mjpegtools
PORTVERSION= 1.6.2
PORTREVISION= 2
DISTVERSION= 1.6.3-rc1
CATEGORIES= multimedia
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= mjpeg
@ -24,9 +23,9 @@ USE_LIBTOOL_VER=15
USE_REINPLACE= yes
USE_XLIB= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --program-transform-name=""
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
USE_GNOME= gnomehack gnometarget
WANT_GNOME= yes
WANT_SDL= yes
INSTALLS_SHLIB= yes
@ -34,7 +33,8 @@ INSTALLS_SHLIB= yes
INFO= mjpeg-howto
MAN1= jpeg2yuv.1 lav2mpeg.1 lav2wav.1 lav2yuv.1 \
lavpipe.1 lavplay.1 lavrec.1 lavtrans.1 mjpegtools.1 mp2enc.1 \
mpeg2enc.1 mplex.1 pgmtoy4m.1 ppmtoy4m.1 y4mcolorbars.1 y4mtoppm.1 \
mpeg2enc.1 mplex.1 pgmtoy4m.1 png2yuv.1 pnmtoy4m.1 ppmtoy4m.1 \
y4mcolorbars.1 y4mdenoise.1 y4munsharp.1 y4mtopnm.1 y4mtoppm.1 \
yuv2lav.1 yuvdenoise.1 yuvfps.1 yuvinactive.1 yuvkineco.1 \
yuvmedianfilter.1 yuvplay.1 yuvscaler.1 yuvycsnoise.1
MAN5= yuv4mpeg.5
@ -169,16 +169,10 @@ pre-everything::
.endif
post-patch:
@${REINPLACE_CMD} -E -e 's|^(pkgconfigdir = )\$$\(libdir\)/(pkgconfig)|\1${PREFIX}/libdata/\2|' \
${WRKSRC}/Makefile.in
@${REINPLACE_CMD} -E -e 's@(-l(jpeg|png))@-L${LOCALBASE}/lib \1@; \
s,-ldl([[:space:]]|"),\1,; \
s|(-ldv)|-L${LOCALBASE}/lib \1 ${PTHREAD_LIBS:S/"//g}|; \
s|-pthread||' \
${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
@${REINPLACE_CMD} -e 's|SDL/|SDL11/|' \
${WRKSRC}/lavtools/liblavplay.c \
${WRKSRC}/lavtools/yuvplay.c
${WRKSRC}/lavtools/yuvplay.c \
${WRKSRC}/lavtools/lavplay.c
@${REINPLACE_CMD} -e 's|/bin/bash|${LOCALBASE}/bin/bash|' \
${WRKSRC}/scripts/lav2avi.sh \
${WRKSRC}/scripts/lav2mpeg ${WRKSRC}/scripts/mpegtranscode
@ -197,7 +191,4 @@ post-patch:
@${REINPLACE_CMD} -E -e 's|(AVIPLAY_LIBS \=.*)|\1 ${PTHREAD_LIBS}|' \
${WRKSRC}/lavtools/Makefile.in
post-configure:
@${CP} -f ${LIBTOOL} ${WRKSRC}
.include <bsd.port.post.mk>

View File

@ -1,2 +1,2 @@
MD5 (mjpegtools-1.6.2.tar.gz) = 01c0120b0182de67f182ef99ad855daa
SIZE (mjpegtools-1.6.2.tar.gz) = 1256280
MD5 (mjpegtools-1.6.3-rc1.tar.gz) = 2728937f33bc71d6537d3ae68ebbbe86
SIZE (mjpegtools-1.6.3-rc1.tar.gz) = 1499593

View File

@ -1,23 +0,0 @@
--- configure.orig Thu Jul 22 18:15:58 2004
+++ configure Thu Jul 22 18:16:36 2004
@@ -25858,16 +25858,16 @@
fi
have_cmov=false
case $arch in
- i786) ARCHFLAGS="-mcpu=i786 -march=$arch"
+ i786) ARCHFLAGS=""
have_cmov=true
;;
- i686) ARCHFLAGS="-mcpu=i686 -march=$arch"
+ i686) ARCHFLAGS=""
have_cmov=true
;;
- i586) ARCHFLAGS="-mcpu=i586 -march=$arch"
+ i586) ARCHFLAGS=""
have_cmov=false
;;
- *) ARCHFLAGS="-mcpu=i686 -march=$arch"
+ *) ARCHFLAGS=""
have_cmov=true
;;
esac

View File

@ -1,10 +0,0 @@
--- lavtools/lavpipe.c.orig Thu Jul 22 18:17:47 2004
+++ lavtools/lavpipe.c Thu Jul 22 18:18:08 2004
@@ -582,6 +582,7 @@
mjpeg_info( "closing input %d (source %d)", i, current_index);
decommission_pipe_source(source);
KEEP_SOURCE:
+ ;
}
}
}

View File

@ -1,15 +0,0 @@
--- mpeg2enc/picture.cc.orig Thu Jul 22 18:23:54 2004
+++ mpeg2enc/picture.cc Thu Jul 22 18:24:32 2004
@@ -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++)
{

View File

@ -1,4 +1,5 @@
%%GTK%%bin/glav
bin/anytovcd.sh
%%GTK%%bbin/glav
bin/jpeg2yuv
bin/lav2avi.sh
bin/lav2mpeg
@ -10,26 +11,34 @@ bin/lavpipe
bin/lavplay
bin/lavtrans
bin/matteblend.flt
bin/mjpegtools-config
bin/mjpeg_simd_helper
bin/mp2enc
bin/mpeg2enc
bin/mpegtranscode
bin/mplex
bin/multiblend.flt
bin/pgmtoy4m
bin/png2yuv
bin/pnmtoy4m
bin/ppmtoy4m
bin/transist.flt
bin/y4mblack
bin/y4mcolorbars
bin/y4mdenoise
bin/y4mhist
bin/y4minterlace
bin/y4mshift
bin/y4mspatialfilter
bin/y4mstabilizer
bin/y4mtopnm
bin/y4mtoppm
bin/y4mtoyuv
bin/y4munsharp
bin/ypipe
bin/yuv2lav
bin/yuv4mpeg
bin/yuvcorrect
bin/yuvcorrect_tune
bin/yuvdeinterlace
bin/yuvdenoise
bin/yuvfps
bin/yuvinactive
@ -38,6 +47,7 @@ bin/yuvmedianfilter
bin/yuvplay
bin/yuvscaler
bin/yuvycsnoise
bin/yuyvtoy4m
include/mjpegtools/audiolib.h
include/mjpegtools/avilib.h
include/mjpegtools/editlist.h
@ -51,6 +61,7 @@ include/mjpegtools/mjpeg_logging.h
include/mjpegtools/mjpeg_types.h
include/mjpegtools/mpeg2enc/elemstrmwriter.hh
include/mjpegtools/mpeg2enc/encoderparams.hh
include/mjpegtools/mpeg2enc/encodertypes.h
include/mjpegtools/mpeg2enc/macroblock.hh
include/mjpegtools/mpeg2enc/mpeg2coder.hh
include/mjpegtools/mpeg2enc/mpeg2encoder.hh
@ -63,14 +74,16 @@ include/mjpegtools/mpeg2enc/quantize.hh
include/mjpegtools/mpeg2enc/quantize_ref.h
include/mjpegtools/mpeg2enc/ratectl.hh
include/mjpegtools/mpeg2enc/seqencoder.hh
include/mjpegtools/mpeg2enc/streamstate.h
include/mjpegtools/mpeg2enc/synchrolib.h
include/mjpegtools/mpeg2enc/syntaxconsts.h
include/mjpegtools/mpegconsts.h
include/mjpegtools/mpegtimecode.h
include/mjpegtools/mplex/audiostrm.hpp
include/mjpegtools/mplex/aunit.hpp
include/mjpegtools/mplex/aunitbuffer.hpp
include/mjpegtools/mplex/bits.hpp
include/mjpegtools/mplex/buffer.hpp
include/mjpegtools/mplex/decodebufmodel.hpp
include/mjpegtools/mplex/inputstrm.hpp
include/mjpegtools/mplex/interact.hpp
include/mjpegtools/mplex/mplexconsts.hpp
@ -80,28 +93,30 @@ include/mjpegtools/mplex/padstrm.hpp
include/mjpegtools/mplex/stillsstream.hpp
include/mjpegtools/mplex/stream_params.hpp
include/mjpegtools/mplex/systems.hpp
include/mjpegtools/mplex/vector.hpp
include/mjpegtools/mplex/videostrm.hpp
include/mjpegtools/yuv4mpeg.h
lib/liblavfile-1.6.so
lib/liblavfile-1.6.so.2
lib/liblavfile-1.6.so.3
lib/liblavfile.a
lib/liblavfile.so
lib/liblavjpeg-1.6.so
lib/liblavjpeg-1.6.so.2
lib/liblavjpeg-1.6.so.3
lib/liblavjpeg.a
lib/liblavjpeg.so
lib/liblavplay-1.6.so
lib/liblavplay-1.6.so.2
lib/liblavplay-1.6.so.3
lib/liblavplay.a
lib/liblavplay.so
lib/libmjpegutils-1.6.so
lib/libmjpegutils-1.6.so.3
lib/libmjpegutils.a
lib/libmjpegutils.so
lib/libmpeg2encpp-1.6.so
lib/libmpeg2encpp-1.6.so.2
lib/libmpeg2encpp-1.6.so.3
lib/libmpeg2encpp.a
lib/libmpeg2encpp.so
lib/libmplex2-1.6.so
lib/libmplex2-1.6.so.2
lib/libmplex2-1.6.so.3
lib/libmplex2.a
lib/libmplex2.so
libdata/pkgconfig/mjpegtools.pc