Attachment 103796 Details for Bug 143816 – file.diff

[patch] file.diff

file.diff (text/plain), 9.90 KB, created by tkato432 on 2010-02-11 18:10:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2010-02-11 18:10:02 UTC

Size: 9.90 KB

patch

obsolete

>diff -urN /usr/ports/multimedia/mjpegtools/Makefile multimedia/mjpegtools/Makefile
>--- /usr/ports/multimedia/mjpegtools/Makefile	2010-02-05 23:06:16.000000000 +0900
>+++ multimedia/mjpegtools/Makefile	2010-02-11 04:14:05.000000000 +0900
>@@ -6,30 +6,36 @@
> #
> 
> PORTNAME=	mjpegtools
>-DISTVERSION=	1.9.0rc3
>-PORTREVISION=	4
>+PORTVERSION=	1.9.0
> CATEGORIES=	multimedia
>-MASTER_SITES=	SF/mjpeg/OldFiles
>+MASTER_SITES=	SF/${PORTNAME:S/tools//}/${PORTNAME}/${PORTVERSION}
> 
> MAINTAINER=	multimedia@FreeBSD.org
> COMMENT=	Set of tools to record/playback/edit videos in MPEG format
> 
> LIB_DEPENDS=	jpeg.11:${PORTSDIR}/graphics/jpeg
>-BUILD_DEPENDS=	nasm:${PORTSDIR}/devel/nasm
>+
>+OPTIONS=	GTK2        "Build GTK+2 player (needs SDL)"              on  \
>+		SDL         "Enable SDL support"                          on  \
>+		PNG         "Enable libPNG support"                       on  \
>+		DV          "Enable libDV support"                        off \
>+		QUICKTIME   "Enable libQuickTime support"                 off \
>+		SIMD 	    "Use cpu-specific optimizations if possible"  off
> 
> CONFLICTS=	mplex-[0-9]*
> 
>+USE_GNOME=	gnomehack
>+WANT_GNOME=	yes
> WANT_SDL=	yes
> USE_GMAKE=	yes
>-USE_GNOME=	gnomehack gnometarget
>-WANT_GNOME=	yes
> USE_AUTOTOOLS=	libtool:22
>+CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
>+		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
>+		PTHREAD_LIBS="${PTHREAD_LIBS}" \
>+		ac_cv_lib_Xxf86dga_XF86DGAQueryExtension=no
>+CONFIGURE_ARGS=	--without-x
> USE_LDCONFIG=	yes
>-GNU_CONFIGURE=	yes
>-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
>-		LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
> 
>-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 png2yuv.1 pnmtoy4m.1 ppmtoy4m.1 y4mcolorbars.1 \
>@@ -37,118 +43,78 @@
> 		yuvdenoise.1 yuvfps.1 yuvinactive.1 yuvkineco.1 \
> 		yuvmedianfilter.1 yuvplay.1 yuvscaler.1 yuvycsnoise.1
> MAN5=		yuv4mpeg.5
>-DOC_FILES=	AUTHORS BUGS CHANGES COPYING ChangeLog HINTS NEWS PLANS README \
>+INFO=		mjpeg-howto
>+
>+DOC_FILES=	AUTHORS BUGS CHANGES ChangeLog HINTS NEWS PLANS README \
> 		README.DV README.avilib README.glav README.AltiVec \
> 		README.lavpipe README.transist TODO
> 
>-.include <bsd.port.pre.mk>
>+CPPFLAGS=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
>+LDFLAGS=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
> 
>-.if !defined(WITHOUT_PNG)
>-LIB_DEPENDS+=	png.5:${PORTSDIR}/graphics/png
>-CONFIGURE_ARGS+=--with-libpng
>-PLIST_SUB+=	PNG:=""
>-.else
>-CONFIGURE_ARGS+=--without-libpng
>-PLIST_SUB+=	PNG:="@comment "
>-.endif
>+.include <bsd.port.pre.mk>
> 
>-.if !defined(WITHOUT_X11)
>-USE_XORG=	x11
>-CONFIGURE_ARGS+=--with-x
>-.else
>-CONFIGURE_ARGS+=--without-x
>-WITHOUT_DV=	yes
>-WITHOUT_GTK2=	yes
>-WITHOUT_SDL=	yes
>-WITHOUT_QUICKTIME=yes
>-.endif
>-
>-.if exists(${LOCALBASE}/lib/libdv.so)
>-WITH_DV=	yes
>-.endif
>-
>-.if exists(${LOCALBASE}/lib/libquicktime.so.0)
>-WITH_QUICKTIME=	yes
>-.endif
>+.if !defined(WITHOUT_GTK2) && defined(WITHOUT_SDL)
>+IGNORE=		GTK+2 player needs SDL
>+.endif # GTK2/SDL
> 
>-.if (${HAVE_GNOME:Mgtk20}!="" || defined(WITH_GTK2)) && !defined(WITHOUT_GTK2)
>+.if defined(WITHOUT_GTK2)
>+PLIST_SUB+=	GTK2:="@comment "
>+_HAVE_GTK=	false
>+.else
> USE_GNOME+=	gtk20
> PLIST_SUB+=	GTK2:=""
>-ENABLE_GTK2=	yes
>-.else
>-PLIST_SUB+=	GTK2:="@comment "
>-DISABLE_GTK2=	yes
>-.endif
>+_HAVE_GTK=	true
>+.endif # GTK2
> 
>-# The GTK player required SDL support, so add ENABLE_GTK2 in here.
>-.if (${HAVE_SDL:Msdl}!="" || defined(WITH_SDL)) && (!defined(WITHOUT_SDL) || defined(ENABLE_GTK2))
>-USE_SDL+=	sdl
>-PLIST_SUB+=	SDL:=""
>+.if defined(WITHOUT_SDL)
>+CONFIGURE_ENV+=	ac_cv_path_SDL_CONFIG=no
>+PLIST_SUB+=	SDL:="@comment "
> .else
>+USE_SDL+=	gfx sdl
> PLIST_SUB+=	SDL:="@comment "
>-DISABLE_SDL=	yes
>-.endif
>+.endif # SDL
>+
>+.if defined(WITHOUT_PNG)
>+CONFIGURE_ARGS+=--without-libpng
>+PLIST_SUB+=	PNG:="@comment "
>+.else
>+LIB_DEPENDS+=	png.5:${PORTSDIR}/graphics/png
>+CONFIGURE_ARGS+=--with-libpng
>+PLIST_SUB+=	PNG:=""
>+.endif # PNG
> 
>-.if defined(WITH_DV) && !defined(WITHOUT_DV)
>+.if defined(WITH_DV)
> LIB_DEPENDS+=	dv.4:${PORTSDIR}/multimedia/libdv
> CONFIGURE_ARGS+=--with-libdv
> .else
> CONFIGURE_ARGS+=--without-libdv
>-.endif
>+.endif # DV
> 
>-.if defined(WITH_QUICKTIME) && !defined(WITHOUT_QUICKTIME)
>+.if defined(WITH_QUICKTIME)
> LIB_DEPENDS+=	quicktime.0:${PORTSDIR}/multimedia/libquicktime
> CONFIGURE_ARGS+=--with-libquicktime
> .else
>-#CONFIGURE_ARGS+=--without-libquicktime # Does not work, patch it instead...
>-DISABLE_QUICKTIME=yes
>-.endif
>-
>-pre-everything::
>-	@${ECHO_MSG} "You may specify the following on the command line:"
>-	@${ECHO_MSG} " "
>-.if !defined(WITH_DV)
>-	@${ECHO_MSG} "WITH_DV=yes to enable DV support."
>-.endif
>-.if !defined(WITH_GTK2)
>-	@${ECHO_MSG} "WITH_GTK2=yes to enable GTK+2 support (required SDL)."
>-.endif
>-.if !defined(WITH_QUICKTIME)
>-	@${ECHO_MSG} "WITH_QUICKTIME=yes to enable quicktime support."
>-.endif
>-.if !defined(WITH_SDL)
>-	@${ECHO_MSG} "WITH_SDL=yes to enable SDL support."
>-.endif
>-.if !defined(WITHOUT_PNG)
>-	@${ECHO_MSG} "WITHOUT_PNG=yes to disable png support."
>-.endif
>-.if !defined(WITHOUT_X11)
>-	@${ECHO_MSG} "WITHOUT_X11=yes to disable X11 (included DV, GTK2, QUICKTIME and SDL) support."
>-.endif
>+CONFIGURE_ARGS+=--without-libquicktime
>+.endif # QUICKTIME
>+
>+.if defined(WITH_SIMD)
>+CONFIGURE_ARGS+=--enable-simd-accel
>+.else
>+CONFIGURE_ARGS+=--disable-simd-accel
>+.endif # SIMD
> 
> post-patch:
>-	@${REINPLACE_CMD} -e 's|-l$$flag|${PTHREAD_LIBS}|g' \
>-		${WRKSRC}/configure
>-.if defined(DISABLE_GTK2)
>-	@${REINPLACE_CMD} -e 's|have_gtk="true"|have_gtk="false"|g' \
>-		${WRKSRC}/configure
>-.endif
>-.if defined(DISABLE_QUICKTIME)
>-	@${REINPLACE_CMD} -e 's|have_libquicktime=true|have_libquicktime=false|g' \
>-		${WRKSRC}/configure
>-.endif
>-.if defined(DISABLE_SDL)
>-	@${REINPLACE_CMD} -e 's|have_sdl=true|have_sdl=false|g' \
>-		${WRKSRC}/configure
>-.endif
>+	@${REINPLACE_CMD} -e 's|have_gtk="true"|have_gtk="${_HAVE_GTK}"|g ; \
>+		 /^CFLAGS=/s|$$ARCHFLAGS||g ; \
>+		 /^CXXFLAGS=/s|$$ARCHFLAGS||g' ${WRKSRC}/configure
> 
> post-install:
>-	${INSTALL_DATA} ${WRKSRC}/mpeg2enc/mpeg2syntaxcodes.h ${PREFIX}/include/mjpegtools/mpeg2enc
> .if !defined(NOPORTDOCS)
> 	@${MKDIR} ${DOCSDIR}
> .for i in ${DOC_FILES}
> 	@${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
> .endfor
>-.endif
>+.endif # NOPORTDOCS
> 
> .include <bsd.port.post.mk>
>diff -urN /usr/ports/multimedia/mjpegtools/distinfo multimedia/mjpegtools/distinfo
>--- /usr/ports/multimedia/mjpegtools/distinfo	2008-02-06 15:28:07.000000000 +0900
>+++ multimedia/mjpegtools/distinfo	2010-01-09 05:52:10.000000000 +0900
>@@ -1,3 +1,3 @@
>-MD5 (mjpegtools-1.9.0rc3.tar.gz) = d38dad44333e3236ccc0dc1efdb27910
>-SHA256 (mjpegtools-1.9.0rc3.tar.gz) = 8b1e3e85289cb9d58a7b98d032cf2587ea957f866416a335918667b1dac76ff7
>-SIZE (mjpegtools-1.9.0rc3.tar.gz) = 2537088
>+MD5 (mjpegtools-1.9.0.tar.gz) = 309a6fcf0900a010d6a9c1e91afc2f5c
>+SHA256 (mjpegtools-1.9.0.tar.gz) = a9322aaab1e0835fbaa00fc10e58e885833454fa0ad6f57c60c89a78f7ed1711
>+SIZE (mjpegtools-1.9.0.tar.gz) = 1718063
>diff -urN /usr/ports/multimedia/mjpegtools/files/patch-mplex__lpcmstrm_in.cpp multimedia/mjpegtools/files/patch-mplex__lpcmstrm_in.cpp
>--- /usr/ports/multimedia/mjpegtools/files/patch-mplex__lpcmstrm_in.cpp	1970-01-01 09:00:00.000000000 +0900
>+++ multimedia/mjpegtools/files/patch-mplex__lpcmstrm_in.cpp	2010-01-09 17:13:20.000000000 +0900
>@@ -0,0 +1,11 @@
>+--- mplex/lpcmstrm_in.cpp.orig	2005-10-14 01:43:10.000000000 +0900
>++++ mplex/lpcmstrm_in.cpp	2010-01-09 17:12:17.000000000 +0900
>+@@ -53,7 +53,7 @@
>+ 
>+ bool LPCMStream::Probe(IBitStream &bs )
>+ {
>+-    char *last_dot = strrchr( bs.StreamName(), '.' );
>++    const char *last_dot = strrchr( bs.StreamName(), '.' );
>+     return 
>+         last_dot != NULL 
>+         && strcmp( last_dot+1, "lpcm") == 0;
>diff -urN /usr/ports/multimedia/mjpegtools/pkg-plist multimedia/mjpegtools/pkg-plist
>--- /usr/ports/multimedia/mjpegtools/pkg-plist	2008-02-06 15:28:07.000000000 +0900
>+++ multimedia/mjpegtools/pkg-plist	2010-01-13 22:31:42.000000000 +0900
>@@ -9,8 +9,8 @@
> bin/lavinfo
> bin/lavpipe
> %%SDL:%%bin/lavplay
>-bin/lavtrans
> bin/lavtc.sh
>+bin/lavtrans
> bin/matteblend.flt
> bin/mjpeg_simd_helper
> bin/mp2enc
>@@ -24,11 +24,11 @@
> bin/ppmtoy4m
> bin/transist.flt
> bin/y4mblack
>-bin/y4mivtc
> bin/y4mcolorbars
> bin/y4mdenoise
> bin/y4mhist
> bin/y4minterlace
>+bin/y4mivtc
> bin/y4mshift
> bin/y4mspatialfilter
> bin/y4mstabilizer
>@@ -62,6 +62,7 @@
> include/mjpegtools/liblavrec.h
> include/mjpegtools/mjpeg_logging.h
> include/mjpegtools/mjpeg_types.h
>+include/mjpegtools/motionsearch.h
> include/mjpegtools/mpeg2enc/elemstrmwriter.hh
> include/mjpegtools/mpeg2enc/encoderparams.hh
> include/mjpegtools/mpeg2enc/encodertypes.h
>@@ -87,7 +88,6 @@
> include/mjpegtools/mpeg2enc/syntaxconsts.h
> include/mjpegtools/mpegconsts.h
> include/mjpegtools/mpegtimecode.h
>-include/mjpegtools/motionsearch.h
> include/mjpegtools/mplex/audiostrm.hpp
> include/mjpegtools/mplex/aunit.hpp
> include/mjpegtools/mplex/aunitbuffer.hpp
>@@ -105,32 +105,32 @@
> include/mjpegtools/mplex/videostrm.hpp
> include/mjpegtools/yuv4mpeg.h
> lib/liblavfile-1.9.so
>-lib/liblavfile-1.9.so.1
>+lib/liblavfile-1.9.so.0
> lib/liblavfile.a
> lib/liblavfile.la
> lib/liblavfile.so
> lib/liblavjpeg-1.9.so
>-lib/liblavjpeg-1.9.so.1
>+lib/liblavjpeg-1.9.so.0
> lib/liblavjpeg.a
> lib/liblavjpeg.la
> lib/liblavjpeg.so
> %%SDL:%%lib/liblavplay-1.9.so
>-%%SDL:%%lib/liblavplay-1.9.so.1
>+%%SDL:%%lib/liblavplay-1.9.so.0
> %%SDL:%%lib/liblavplay.a
> %%SDL:%%lib/liblavplay.la
> %%SDL:%%lib/liblavplay.so
> lib/libmjpegutils-1.9.so
>-lib/libmjpegutils-1.9.so.1
>+lib/libmjpegutils-1.9.so.0
> lib/libmjpegutils.a
> lib/libmjpegutils.la
> lib/libmjpegutils.so
> lib/libmpeg2encpp-1.9.so
>-lib/libmpeg2encpp-1.9.so.1
>+lib/libmpeg2encpp-1.9.so.0
> lib/libmpeg2encpp.a
> lib/libmpeg2encpp.la
> lib/libmpeg2encpp.so
> lib/libmplex2-1.9.so
>-lib/libmplex2-1.9.so.1
>+lib/libmplex2-1.9.so.0
> lib/libmplex2.a
> lib/libmplex2.la
> lib/libmplex2.so
>@@ -138,7 +138,6 @@
> %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
> %%PORTDOCS%%%%DOCSDIR%%/BUGS
> %%PORTDOCS%%%%DOCSDIR%%/CHANGES
>-%%PORTDOCS%%%%DOCSDIR%%/COPYING
> %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
> %%PORTDOCS%%%%DOCSDIR%%/HINTS
> %%PORTDOCS%%%%DOCSDIR%%/NEWS

Actions: View | Diff

Attachments on bug 143816: 103796