diff options
| author | lioux <lioux@FreeBSD.org> | 2002-06-08 00:12:48 +0800 |
|---|---|---|
| committer | lioux <lioux@FreeBSD.org> | 2002-06-08 00:12:48 +0800 |
| commit | e624229e9794cd17b140329ea782cea3a094e338 (patch) | |
| tree | c9e411ff6545528f96749b383079e2dce7f1e90f | |
| parent | 84a75c97e45e3247557f6657e7e722d0bbd2c15c (diff) | |
| download | freebsd-ports-graphics-e624229e9794cd17b140329ea782cea3a094e338.tar.gz freebsd-ports-graphics-e624229e9794cd17b140329ea782cea3a094e338.tar.zst freebsd-ports-graphics-e624229e9794cd17b140329ea782cea3a094e338.zip | |
o Add AVI support which incidently means both DiVX ;-) and DiVX4
support in i386 platforms
o Bump PORTREVISION
| -rw-r--r-- | graphics/mjpegtools/Makefile | 11 | ||||
| -rw-r--r-- | graphics/mjpegtools/pkg-plist | 3 | ||||
| -rw-r--r-- | multimedia/mjpegtools/Makefile | 11 | ||||
| -rw-r--r-- | multimedia/mjpegtools/pkg-plist | 3 |
4 files changed, 24 insertions, 4 deletions
diff --git a/graphics/mjpegtools/Makefile b/graphics/mjpegtools/Makefile index 4068e340d0a..1de6d3d507b 100644 --- a/graphics/mjpegtools/Makefile +++ b/graphics/mjpegtools/Makefile @@ -7,6 +7,7 @@ PORTNAME= mjpegtools PORTVERSION= 1.6.0 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= mjpeg @@ -14,13 +15,13 @@ MASTER_SITE_SUBDIR= mjpeg MAINTAINER= lioux@FreeBSD.org BUILD_DEPENDS= nasm:${PORTSDIR}/devel/nasm -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg +LIB_DEPENDS= aviplay.6:${PORTSDIR}/graphics/avifile \ + jpeg.9:${PORTSDIR}/graphics/jpeg USE_GLIB= yes USE_GMAKE= yes USE_XLIB= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS= --without-aviplay CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} ${PTHREAD_CFLAGS}" \ LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS}" \ PTHREAD_LIBS="${PTHREAD_LIBS}" @@ -49,6 +50,12 @@ post-install: .include <bsd.port.pre.mk> +.if ${ARCH} != "i386" +PLIST_SUB+= DIVX='@comment ' +.else +PLIST_SUB+= DIVX='' +.endif + # pre-detection # LIBDV .if exists(${LOCALBASE}/lib/libdv.so.1) diff --git a/graphics/mjpegtools/pkg-plist b/graphics/mjpegtools/pkg-plist index 9c6d641b4fb..6681a5ab063 100644 --- a/graphics/mjpegtools/pkg-plist +++ b/graphics/mjpegtools/pkg-plist @@ -1,5 +1,7 @@ +%%DIVX%%bin/divxdec bin/glav bin/jpeg2yuv +%%DIVX%%bin/lav2divx bin/lav2mpeg bin/lav2wav bin/lav2yuv @@ -19,6 +21,7 @@ bin/transist.flt bin/y4mcolorbars bin/y4mtoppm bin/ypipe +%%DIVX%%bin/yuv2divx bin/yuv2lav bin/yuvdenoise bin/yuvkineco diff --git a/multimedia/mjpegtools/Makefile b/multimedia/mjpegtools/Makefile index 4068e340d0a..1de6d3d507b 100644 --- a/multimedia/mjpegtools/Makefile +++ b/multimedia/mjpegtools/Makefile @@ -7,6 +7,7 @@ PORTNAME= mjpegtools PORTVERSION= 1.6.0 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= mjpeg @@ -14,13 +15,13 @@ MASTER_SITE_SUBDIR= mjpeg MAINTAINER= lioux@FreeBSD.org BUILD_DEPENDS= nasm:${PORTSDIR}/devel/nasm -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg +LIB_DEPENDS= aviplay.6:${PORTSDIR}/graphics/avifile \ + jpeg.9:${PORTSDIR}/graphics/jpeg USE_GLIB= yes USE_GMAKE= yes USE_XLIB= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS= --without-aviplay CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} ${PTHREAD_CFLAGS}" \ LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS}" \ PTHREAD_LIBS="${PTHREAD_LIBS}" @@ -49,6 +50,12 @@ post-install: .include <bsd.port.pre.mk> +.if ${ARCH} != "i386" +PLIST_SUB+= DIVX='@comment ' +.else +PLIST_SUB+= DIVX='' +.endif + # pre-detection # LIBDV .if exists(${LOCALBASE}/lib/libdv.so.1) diff --git a/multimedia/mjpegtools/pkg-plist b/multimedia/mjpegtools/pkg-plist index 9c6d641b4fb..6681a5ab063 100644 --- a/multimedia/mjpegtools/pkg-plist +++ b/multimedia/mjpegtools/pkg-plist @@ -1,5 +1,7 @@ +%%DIVX%%bin/divxdec bin/glav bin/jpeg2yuv +%%DIVX%%bin/lav2divx bin/lav2mpeg bin/lav2wav bin/lav2yuv @@ -19,6 +21,7 @@ bin/transist.flt bin/y4mcolorbars bin/y4mtoppm bin/ypipe +%%DIVX%%bin/yuv2divx bin/yuv2lav bin/yuvdenoise bin/yuvkineco |