ports/185934: multimedia/mjpegtools: Update to version 2.1.0
KATO Tsuguru
tkato432 at yahoo.com
Mon Jan 20 18:40:01 UTC 2014
>Number: 185934
>Category: ports
>Synopsis: multimedia/mjpegtools: Update to version 2.1.0
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Mon Jan 20 18:40:00 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: FreeBSD 8.4-RELEASE-p7 i386
>Organization:
>Environment:
>Description:
- Update to version 2.1.0
New file:
files/patch-lavtools__lavrec.c
files/patch-lavtools__lavvideo.c
files/patch-lavtools__liblavplay.c
files/patch-lavtools__liblavrec.c
Remove file:
files/patch-y4mdenoise__MotionSercher.hh
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/multimedia/mjpegtools/Makefile multimedia/mjpegtools/Makefile
--- /usr/ports/multimedia/mjpegtools/Makefile 2013-12-14 17:57:52.000000000 +0900
+++ multimedia/mjpegtools/Makefile 2014-01-21 00:00:00.000000000 +0900
@@ -2,97 +2,51 @@
# $FreeBSD: head/multimedia/mjpegtools/Makefile 336409 2013-12-14 00:58:19Z bapt $
PORTNAME= mjpegtools
-PORTVERSION= 2.0.0
-PORTREVISION= 4
+PORTVERSION= 2.1.0
CATEGORIES= multimedia
MASTER_SITES= SF/${PORTNAME:S/tools//}/${PORTNAME}/${PORTVERSION}
MAINTAINER= multimedia at FreeBSD.org
COMMENT= Set of tools to record/playback/edit videos in MPEG format
-LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg
+LICENSE= GPLv2 # (or later)
-OPTIONS_DEFINE= GTK2 SDL PNG DV QUICKTIME SIMD DOCS
-OPTIONS_DEFAULT=GTK2 SDL PNG
-QUICKTIME_DESC= Enable libQuickTime support
+BUILD_DEPENDS= v4l_compat>0:${PORTSDIR}/multimedia/v4l_compat
+LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg
CONFLICTS= mplex-[0-9]*
USES= gmake pkgconfig
USE_AUTOTOOLS= libtoolize aclocal autoheader automake autoconf
LIBTOOLIZE_ARGS=--force
-ACLOCAL_ARGS= -I ${LOCALBASE}/share/aclocal
-AUTOMAKEL_ARGS= --add-missing --foreign
-CONFIGURE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
- PTHREAD_LIBS="${PTHREAD_LIBS}" \
- ac_cv_lib_Xxf86dga_XF86DGAQueryExtension=no
-CONFIGURE_ARGS= --without-x
+ACLOCAL_ARGS= --automake-acdir=${ACLOCAL_DIR} \
+ -I ${LOCALBASE}/share/aclocal
+AUTOMAKE_ARGS= --add-missing --foreign
+CONFIGURE_ARGS= --without-dga --without-x
USE_LDCONFIG= yes
-INFO= mjpeg-howto
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
-DOC_FILES= AUTHORS BUGS CHANGES ChangeLog HINTS NEWS PLANS README \
- README.DV README.avilib README.glav README.AltiVec \
- README.lavpipe README.transist TODO
+INFO= mjpeg-howto
-CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
+OPTIONS_DEFINE= DOCS DV GTK2 PNG QUICKTIME SDL SIMD
+OPTIONS_DEFAULT= GTK2 PNG SDL
+OPTIONS_SUB= yes
+
+DV_LIB_DEPENDS= libdv.so:${PORTSDIR}/multimedia/libdv
+DV_CONFIGURE_WITH= libdv
+GTK2_USE= GNOME=gtk20
+GTK2_CONFIGURE_WITH= gtk
+PNG_LIB_DEPENDS= libpng15.so:${PORTSDIR}/graphics/png
+PNG_CONFIGURE_WITH= libpng
+QUICKTIME_LIB_DEPENDS= libquicktime.so:${PORTSDIR}/multimedia/libquicktime
+QUICKTIME_CONFIGURE_WITH= libquicktime
+SDL_USE= SDL=gfx,sdl
+SDL_CONFIGURE_OFF= --without-libsdl --without-sdlgfx
+SIMD_CONFIGURE_ENABLE= simd-accel
.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MGTK2}
-
-.if empty(PORT_OPTIONS:MSDL)
-IGNORE= GTK+2 player needs SDL
-.endif # GTK2/SDL
-
-USE_GNOME+= gtk20
-PLIST_SUB+= GTK2:=""
-.else
-PLIST_SUB+= GTK2:="@comment "
-CONFIGURE_ARGS+=--without-gtk
-.endif # GTK2
-
-.if ${PORT_OPTIONS:MSDL}
-USE_SDL+= gfx sdl
-PLIST_SUB+= SDL:=""
-.else
-CONFIGURE_ENV+= ac_cv_path_SDL_CONFIG=no
-PLIST_SUB+= SDL:="@comment "
-CONFIGURE_ARGS+=--without-libsdl
-.endif # SDL
-
-.if ${PORT_OPTIONS:MPNG}
-LIB_DEPENDS+= libpng15.so:${PORTSDIR}/graphics/png
-CONFIGURE_ARGS+=--with-libpng
-PLIST_SUB+= PNG:=""
-.else
-CONFIGURE_ARGS+=--without-libpng
-PLIST_SUB+= PNG:="@comment "
-.endif # PNG
-
-.if ${PORT_OPTIONS:MDV}
-LIB_DEPENDS+= libdv.so:${PORTSDIR}/multimedia/libdv
-CONFIGURE_ARGS+=--with-libdv
-.else
-CONFIGURE_ARGS+=--without-libdv
-.endif # DV
-
-.if ${PORT_OPTIONS:MQUICKTIME}
-PLIST_SUB+= QUICKTIME=""
-LIB_DEPENDS+= libquicktime.so:${PORTSDIR}/multimedia/libquicktime
-CONFIGURE_ARGS+=--with-libquicktime
-.else
-PLIST_SUB+= QUICKTIME="@comment "
-CONFIGURE_ARGS+=--without-libquicktime
-.endif # QUICKTIME
-
-.if ${PORT_OPTIONS:MSIMD}
-CONFIGURE_ARGS+=--enable-simd-accel
-.else
-CONFIGURE_ARGS+=--disable-simd-accel
-.endif # SIMD
-
.include <bsd.port.pre.mk>
.if ${ARCH} == "i386"
@@ -105,14 +59,20 @@
post-patch:
@${REINPLACE_CMD} -e \
- '/ARCHFLAGS=/s|^|#|g' ${WRKSRC}/configure.ac
+ 's| \*-\*-linux\*)| *-*-*)| ; \
+ /ARCHFLAGS=/s|^|#|g' ${WRKSRC}/configure.ac
@${REINPLACE_CMD} -e \
'/^pkgconfigdir/s|$$(libdir)|$$(prefix)/libdata|g' ${WRKSRC}/Makefile.am
+pre-configure:
+ @${RM} -f ${WRKSRC}/missing
+
post-install:
@${MKDIR} ${STAGEDIR}${DOCSDIR}
-.for i in ${DOC_FILES}
- @${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
+.for i in AUTHORS BUGS CHANGES ChangeLog HINTS NEWS PLANS README README.DV \
+ README.avilib README.glav README.AltiVec README.lavpipe \
+ README.transist TODO
+ (cd ${WRKSRC} && ${INSTALL_DATA} ${i} ${STAGEDIR}${DOCSDIR})
.endfor
.include <bsd.port.post.mk>
diff -urN /usr/ports/multimedia/mjpegtools/distinfo multimedia/mjpegtools/distinfo
--- /usr/ports/multimedia/mjpegtools/distinfo 2013-11-06 21:59:27.000000000 +0900
+++ multimedia/mjpegtools/distinfo 2014-01-21 00:00:00.000000000 +0900
@@ -1,2 +1,2 @@
-SHA256 (mjpegtools-2.0.0.tar.gz) = bf3541593e71602f7b440c2e7d81b433f53d0511e74642f35bea9b3feded7a97
-SIZE (mjpegtools-2.0.0.tar.gz) = 1749671
+SHA256 (mjpegtools-2.1.0.tar.gz) = 864f143d7686377f8ab94d91283c696ebd906bf256b2eacc7e9fb4dddcedc407
+SIZE (mjpegtools-2.1.0.tar.gz) = 1844336
diff -urN /usr/ports/multimedia/mjpegtools/files/patch-lavtools__lavrec.c multimedia/mjpegtools/files/patch-lavtools__lavrec.c
--- /usr/ports/multimedia/mjpegtools/files/patch-lavtools__lavrec.c 1970-01-01 09:00:00.000000000 +0900
+++ multimedia/mjpegtools/files/patch-lavtools__lavrec.c 2014-01-21 00:00:00.000000000 +0900
@@ -0,0 +1,28 @@
+--- lavtools/lavrec.c.orig
++++ lavtools/lavrec.c
+@@ -196,7 +196,9 @@
+ #include <stdlib.h>
+ #include <unistd.h>
+ #include <termios.h>
++#ifdef __linux
+ #include <sys/fsuid.h>
++#endif
+ #include <signal.h>
+ #include <fcntl.h>
+ #include <errno.h>
+@@ -1149,6 +1151,7 @@
+ sigset_t sigmask;
+ pthread_t input_thread;
+
++#ifdef __linux
+ /* no root please (only during audio setup) */
+ if (getuid() != geteuid())
+ {
+@@ -1159,6 +1162,7 @@
+ return 0;
+ }
+ }
++#endif
+
+ info = lavrec_malloc();
+ info->state_changed = statechanged;
diff -urN /usr/ports/multimedia/mjpegtools/files/patch-lavtools__lavvideo.c multimedia/mjpegtools/files/patch-lavtools__lavvideo.c
--- /usr/ports/multimedia/mjpegtools/files/patch-lavtools__lavvideo.c 1970-01-01 09:00:00.000000000 +0900
+++ multimedia/mjpegtools/files/patch-lavtools__lavvideo.c 2014-01-21 00:00:00.000000000 +0900
@@ -0,0 +1,18 @@
+--- lavtools/lavvideo.c.orig
++++ lavtools/lavvideo.c
+@@ -49,6 +49,7 @@
+ #include <sys/stat.h>
+ #include <sys/ioctl.h>
+
++#ifdef __linux
+ #include <linux/types.h>
+ /* Because of some really cool feature in video4linux1, also known as
+ * 'not including sys/types.h and sys/time.h', we had to include it
+@@ -63,6 +64,7 @@
+ * errors here, check your linux/time.h && sys/time.h header setup.
+ */
+ #define _LINUX_TIME_H
++#endif
+ #include <linux/videodev.h>
+
+ #include <videodev_mjpeg.h>
diff -urN /usr/ports/multimedia/mjpegtools/files/patch-lavtools__liblavplay.c multimedia/mjpegtools/files/patch-lavtools__liblavplay.c
--- /usr/ports/multimedia/mjpegtools/files/patch-lavtools__liblavplay.c 1970-01-01 09:00:00.000000000 +0900
+++ multimedia/mjpegtools/files/patch-lavtools__liblavplay.c 2014-01-21 00:00:00.000000000 +0900
@@ -0,0 +1,15 @@
+--- lavtools/liblavplay.c.orig
++++ lavtools/liblavplay.c
+@@ -43,7 +43,12 @@
+ #include <sys/resource.h>
+ #include <sys/wait.h>
+ #ifdef HAVE_V4L
++#ifdef __linux
+ #include <sys/vfs.h>
++#else
++#include <sys/param.h>
++#include <sys/mount.h>
++#endif
+ #endif
+
+ #ifndef X_DISPLAY_MISSING
diff -urN /usr/ports/multimedia/mjpegtools/files/patch-lavtools__liblavrec.c multimedia/mjpegtools/files/patch-lavtools__liblavrec.c
--- /usr/ports/multimedia/mjpegtools/files/patch-lavtools__liblavrec.c 1970-01-01 09:00:00.000000000 +0900
+++ multimedia/mjpegtools/files/patch-lavtools__liblavrec.c 2014-01-21 00:00:00.000000000 +0900
@@ -0,0 +1,30 @@
+--- lavtools/liblavrec.c.orig
++++ lavtools/liblavrec.c
+@@ -45,9 +45,14 @@
+ #include <sys/time.h>
+ #include <sys/resource.h>
+ #include <sys/wait.h>
++#ifdef __linux
+ #include <sys/statfs.h>
+-#include <mjpeg_types.h>
+ #include <sys/vfs.h>
++#else
++#include <sys/param.h>
++#include <sys/mount.h>
++#endif
++#include <mjpeg_types.h>
+ #include <stdlib.h>
+
+ /* Because of some really cool feature in video4linux1, also known as
+@@ -758,7 +763,11 @@
+ {
+ int fd = lav_fileno( settings->video_file );
+ if( fd >= 0 )
++#ifdef __linux
+ fdatasync(fd);
++#else
++ fsync(fd);
++#endif
+ }
+ return 1;
+ }
diff -urN /usr/ports/multimedia/mjpegtools/files/patch-y4mdenoise__MotionSercher.hh multimedia/mjpegtools/files/patch-y4mdenoise__MotionSercher.hh
--- /usr/ports/multimedia/mjpegtools/files/patch-y4mdenoise__MotionSercher.hh 2013-11-06 21:59:27.000000000 +0900
+++ multimedia/mjpegtools/files/patch-y4mdenoise__MotionSercher.hh 1970-01-01 09:00:00.000000000 +0900
@@ -1,11 +0,0 @@
---- y4mdenoise/MotionSearcher.hh.orig 2010-07-26 05:06:56.000000000 +0900
-+++ y4mdenoise/MotionSearcher.hh 2012-06-12 19:23:18.000000000 +0900
-@@ -2196,7 +2196,7 @@
- {
- // This region is too small to be bothered with.
- // Just get rid of it.
-- DeleteRegion (a_pRegion);
-+ this->DeleteRegion (a_pRegion);
- }
- else
- {
diff -urN /usr/ports/multimedia/mjpegtools/pkg-plist multimedia/mjpegtools/pkg-plist
--- /usr/ports/multimedia/mjpegtools/pkg-plist 2013-12-14 17:57:52.000000000 +0900
+++ multimedia/mjpegtools/pkg-plist 2014-01-21 00:00:00.000000000 +0900
@@ -1,5 +1,5 @@
bin/anytovcd.sh
-%%GTK2:%%bin/glav
+%%GTK2%%bin/glav
bin/jpeg2yuv
bin/lav2avi.sh
bin/lav2mpeg
@@ -8,9 +8,11 @@
bin/lavaddwav
bin/lavinfo
bin/lavpipe
-%%SDL:%%bin/lavplay
+bin/lavplay
+bin/lavrec
bin/lavtc.sh
bin/lavtrans
+bin/lavvideo
bin/matteblend.flt
bin/mjpeg_simd_helper
bin/mp2enc
@@ -19,7 +21,7 @@
bin/mplex
bin/multiblend.flt
bin/pgmtoy4m
-%%PNG:%%bin/png2yuv
+%%PNG%%bin/png2yuv
bin/pnmtoy4m
bin/ppmtoy4m
%%QUICKTIME%%bin/qttoy4m
@@ -30,6 +32,7 @@
bin/y4mhist
bin/y4minterlace
bin/y4mivtc
+bin/y4mscaler
bin/y4mshift
bin/y4mspatialfilter
bin/y4mstabilizer
@@ -49,7 +52,7 @@
bin/yuvinactive
bin/yuvkineco
bin/yuvmedianfilter
-%%SDL:%%bin/yuvplay
+%%SDL%%bin/yuvplay
bin/yuvscaler
bin/yuvycsnoise
bin/yuyvtoy4m
@@ -75,8 +78,8 @@
include/mjpegtools/mpeg2enc/mpeg2encoptions.hh
include/mjpegtools/mpeg2enc/mpeg2encparams.h
include/mjpegtools/mpeg2enc/mpeg2syntaxcodes.h
-include/mjpegtools/mpeg2enc/ontheflyratectlpass2.hh
include/mjpegtools/mpeg2enc/ontheflyratectlpass1.hh
+include/mjpegtools/mpeg2enc/ontheflyratectlpass2.hh
include/mjpegtools/mpeg2enc/picture.hh
include/mjpegtools/mpeg2enc/picturereader.hh
include/mjpegtools/mpeg2enc/predict_ref.h
@@ -105,33 +108,38 @@
include/mjpegtools/mplex/systems.hpp
include/mjpegtools/mplex/videostrm.hpp
include/mjpegtools/yuv4mpeg.h
-lib/liblavfile-2.0.so
-lib/liblavfile-2.0.so.0
+lib/liblavfile-2.1.so
+lib/liblavfile-2.1.so.0
lib/liblavfile.a
lib/liblavfile.la
lib/liblavfile.so
-lib/liblavjpeg-2.0.so
-lib/liblavjpeg-2.0.so.0
+lib/liblavjpeg-2.1.so
+lib/liblavjpeg-2.1.so.0
lib/liblavjpeg.a
lib/liblavjpeg.la
lib/liblavjpeg.so
-%%SDL:%%lib/liblavplay-2.0.so
-%%SDL:%%lib/liblavplay-2.0.so.0
-%%SDL:%%lib/liblavplay.a
-%%SDL:%%lib/liblavplay.la
-%%SDL:%%lib/liblavplay.so
-lib/libmjpegutils-2.0.so
-lib/libmjpegutils-2.0.so.0
+lib/liblavplay-2.1.so
+lib/liblavplay-2.1.so.0
+lib/liblavplay.a
+lib/liblavplay.la
+lib/liblavplay.so
+lib/liblavrec-2.1.so
+lib/liblavrec-2.1.so.0
+lib/liblavrec.a
+lib/liblavrec.la
+lib/liblavrec.so
+lib/libmjpegutils-2.1.so
+lib/libmjpegutils-2.1.so.0
lib/libmjpegutils.a
lib/libmjpegutils.la
lib/libmjpegutils.so
-lib/libmpeg2encpp-2.0.so
-lib/libmpeg2encpp-2.0.so.0
+lib/libmpeg2encpp-2.1.so
+lib/libmpeg2encpp-2.1.so.0
lib/libmpeg2encpp.a
lib/libmpeg2encpp.la
lib/libmpeg2encpp.so
-lib/libmplex2-2.0.so
-lib/libmplex2-2.0.so.0
+lib/libmplex2-2.1.so
+lib/libmplex2-2.1.so.0
lib/libmplex2.a
lib/libmplex2.la
lib/libmplex2.so
@@ -154,6 +162,7 @@
man/man1/ppmtoy4m.1.gz
man/man1/y4mcolorbars.1.gz
man/man1/y4mdenoise.1.gz
+man/man1/y4mscaler.1.gz
man/man1/y4mtopnm.1.gz
man/man1/y4mtoppm.1.gz
man/man1/y4munsharp.1.gz
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list