Attachment 53479 Details for Bug 80884 – transcode-1.0.0beta2-to-3.diff

[patch] transcode-1.0.0beta2-to-3.diff

transcode-1.0.0beta2-to-3.diff (text/plain), 20.95 KB, created by hendrik on 2005-05-11 11:20:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: hendrik

Created: 2005-05-11 11:20:11 UTC

Size: 20.95 KB

patch

obsolete

>Index: transcode/Makefile
>===================================================================
>RCS file: /home/ncvs/ports/multimedia/transcode/Makefile,v
>retrieving revision 1.57
>diff -u -u -r1.57 Makefile
>--- transcode/Makefile	4 May 2005 11:44:31 -0000	1.57
>+++ transcode/Makefile	11 May 2005 10:02:34 -0000
>@@ -6,8 +6,7 @@
> #
> 
> PORTNAME=	transcode
>-DISTVERSION=	1.0.0beta2
>-PORTREVISION=	1
>+DISTVERSION=	1.0.0beta3
> CATEGORIES=	multimedia
> MASTER_SITES=	http://dl.fkb.wormulon.net/transcode/ \
> 		http://dl.kel.wormulon.net/transcode/ \
>@@ -118,6 +117,10 @@
> WITH_JPEGMMX=	yes
> .endif
> 
>+.if exists(${LOCALBASE}/lib/liblavjpeg.so)
>+WITH_MJPEG=	yes
>+.endif
>+
> .if defined(WITH_FREETYPE)
> LIB_DEPENDS+=	freetype.9:${PORTSDIR}/print/freetype2
> CONFIGURE_ARGS+=	--with-ft-prefix=${LOCALBASE} --enable-freetype2
>@@ -163,12 +166,22 @@
> 
> .if defined(WITH_JPEGMMX)
> LIB_DEPENDS+=	jpeg-mmx.62:${PORTSDIR}/graphics/jpeg-mmx
>-
>+CONFIGURE_ARGS+=	--enable-libjpegmmx
> PLIST_SUB+=	WITH_JPEGMMX=""
> .else
>+CONFIGURE_ARGS+=	--enable-libjpegmmx=no
> PLIST_SUB+=	WITH_JPEGMMX="@comment "
> .endif
> 
>+.if defined(WITH_MJPEG)
>+LIB_DEPENDS+=	lavjpeg-1.6.2:${PORTSDIR}/multimedia/mjpegtools
>+CONFIGURE_ARGS+=	--enable-mjpegtools
>+PLIST_SUB+=	WITH_MJPEG=""
>+.else
>+CONFIGURE_ARGS+=	--enable-mjpegtools=no
>+PLIST_SUB+=	WITH_MJPEG="@comment "
>+.endif
>+
> .if defined(WITH_AVIFILE)
> LIB_DEPENDS+=	aviplay:${PORTSDIR}/multimedia/avifile
> PLIST_SUB+=	WITH_AVIFILE=""
>@@ -181,8 +194,10 @@
> .if defined(WITH_SDL)
> USE_SDL=	sdl
> WITH_LIBDV=	yes
>+CONFIGURE_ARGS+=	--enable-sdl --with-sdl-prefix=${LOCALBASE}
> PLIST_SUB+=	WITH_SDL=""
> .else
>+CONFIGURE_ARGS+=	--enable-sdl=no
> PLIST_SUB+=	WITH_SDL="@comment "
> .endif
> 
>@@ -232,13 +247,17 @@
> PLIST_SUB+=	WITH_XVID="@comment "
> .endif
> 
>+.if defined(WITH_LIBA52_DEFAULT)
>+WITH_LIBA52=	yes
>+CONFIGURE_ARGS+=	--enable-a52-default-decoder
>+.endif
>+
> .if defined(WITH_LIBA52)
> LIB_DEPENDS+=	a52.0:${PORTSDIR}/audio/liba52
>-CONFIGURE_ARGS+=	--enable-liba52=yes
>+CONFIGURE_ARGS+=	--enable-a52
> PLIST_SUB+=	WITH_LIBA52=""
> .else
>-CONFIGURE_ARGS+=	--with-a52=no \
>-			--enable-liba52=no
>+CONFIGURE_ARGS+=	--with-a52=no
> PLIST_SUB+=	WITH_LIBA52="@comment "
> .endif
> 
>@@ -266,6 +285,14 @@
> .else
> .endif
> 
>+.if defined(WITH_GTK)
>+CONFIGURE_ARGS+=	--enable-gtk
>+PLIST_SUB+=	WITH_GTK=""
>+.else
>+CONFIGURE_ARGS+=	--enable-gtk=no
>+PLIST_SUB+=	WITH_GTK="@comment "
>+.endif
>+
> pre-everything::
> .if !defined(WITH_OPTIMIZED_CFLAGS)
> 	@${ECHO_MSG}
>@@ -291,6 +318,10 @@
> 	@${ECHO_MSG}
> 	@${ECHO_MSG} "You can enable JPEG with MMX by defining WITH_JPEGMMX."
> .endif
>+.if !defined(WITH_MJPEG)
>+	@${ECHO_MSG}
>+	@${ECHO_MSG} "You can enable MJPEG portions by defining WITH_JPEGMMX."
>+.endif
> .if !defined(WITH_IMAGEMAGICK)
> 	@${ECHO_MSG}
> 	@${ECHO_MSG} "You can enable ImageMagick-dependent modules by defining WITH_IMAGEMAGICK."
>@@ -322,6 +353,12 @@
> 	@${ECHO_MSG} "You will probably want to enable this, if you plan to"
> 	@${ECHO_MSG} "rip DVDs."
> .endif
>+.if !defined(WIH_LIBA52_DEFAULT)
>+	@${ECHO_MSG}
>+	@${ECHO_MSG} "You can use liba52 as default audio encoder by defining WITH_LIBA52_DEFAULT."
>+	@${ECHO_MSG} "This implies WITH_LIBA52."
>+	@${ECHO_MSG}
>+.endif
> .if !defined(WITH_AVIFILE)
> 	@${ECHO_MSG}
> 	@${ECHO_MSG} "You can enable avifile-dependent modules by defining WITH_AVIFILE."
>@@ -360,6 +397,7 @@
> .endif
> 	@${REINPLACE_CMD} -E -e 's|(seek)64|\1|' ${WRKSRC}/avilib/avidump.c
> 	@${REINPLACE_CMD} -E -e 's|<SDL/|<|' ${WRKSRC}/filter/preview/display.h
>+	@${REINPLACE_CMD} -E -e 's|sdl-config|sdl11-config|g' ${WRKSRC}/configure
> 
> 	@${REINPLACE_CMD} -E -e 's|(-la52)|\1 ${LIBA52_DEP_LIBS}|' \
> 		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
>Index: transcode/distinfo
>===================================================================
>RCS file: /home/ncvs/ports/multimedia/transcode/distinfo,v
>retrieving revision 1.12
>diff -u -u -r1.12 distinfo
>--- transcode/distinfo	23 Feb 2005 18:06:15 -0000	1.12
>+++ transcode/distinfo	11 May 2005 10:02:34 -0000
>@@ -1,2 +1,2 @@
>-MD5 (transcode-1.0.0beta2.tar.gz) = 17c370e2b6a1e88045b9e5c8c4e70760
>-SIZE (transcode-1.0.0beta2.tar.gz) = 11028480
>+MD5 (transcode-1.0.0beta3.tar.gz) = 963645ae3c08363d8035e874dffc89e7
>+SIZE (transcode-1.0.0beta3.tar.gz) = 2346963
>Index: transcode/pkg-plist
>===================================================================
>RCS file: /home/ncvs/ports/multimedia/transcode/pkg-plist,v
>retrieving revision 1.23
>diff -u -u -r1.23 pkg-plist
>--- transcode/pkg-plist	23 Feb 2005 18:34:42 -0000	1.23
>+++ transcode/pkg-plist	11 May 2005 10:02:34 -0000
>@@ -16,6 +16,7 @@
> bin/tcxpm2rgb
> bin/transcode
> lib/transcode/af6_decore.so
>+%%WITH_LIBA52%%lib/transcode/a52_decore.so
> lib/transcode/export_ac3.so
> lib/transcode/export_af6.conf
> %%WITH_AVIFILE%%lib/transcode/export_af6.so
>@@ -35,6 +36,8 @@
> lib/transcode/export_mjpeg.so
> lib/transcode/export_mp1e.so
> lib/transcode/export_mp2.so
>+%%WITH_MJPEG%%lib/transcode/export_mp2enc.so
>+%%WITH_MJPEG%%lib/transcode/export_mpeg2enc.so
> %%WITH_QUICKTIME%%lib/transcode/export_mov.so
> lib/transcode/export_null.so
> lib/transcode/export_ogg.so
>@@ -48,6 +51,7 @@
> lib/transcode/export_xvid2.so
> lib/transcode/export_xvid3.so
> lib/transcode/export_xvid4.so
>+%%WITH_MJPEG%%lib/transcode/export_yuv4mpeg.so
> lib/transcode/filter_29to23.so
> lib/transcode/filter_32detect.so
> lib/transcode/filter_32drop.so
>@@ -118,6 +122,7 @@
> lib/transcode/import_divx.so
> lib/transcode/import_dv.so
> lib/transcode/import_dvd.so
>+lib/transcode/import_ffbin.so
> lib/transcode/import_ffmpeg.so
> lib/transcode/import_fraps.so
> %%WITH_IMAGEMAGICK%%lib/transcode/import_im.so
>@@ -148,99 +153,87 @@
> lib/transcode/xvid2.cfg
> lib/transcode/xvid3.cfg
> lib/transcode/xvid4.cfg
>-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
>-%%PORTDOCS%%%%DOCSDIR%%/DV-to-DVD-HOWTO.txt
>-%%PORTDOCS%%%%DOCSDIR%%/README.Inverse.Telecine.txt
>-%%PORTDOCS%%%%DOCSDIR%%/README.cluster
>-%%PORTDOCS%%%%DOCSDIR%%/README.dv
>-%%PORTDOCS%%%%DOCSDIR%%/README.filter.modfps
>-%%PORTDOCS%%%%DOCSDIR%%/README.rip
>-%%PORTDOCS%%%%DOCSDIR%%/README.sync
>-%%PORTDOCS%%%%DOCSDIR%%/README.vcd
>-%%PORTDOCS%%%%DOCSDIR%%/README.xvid-credits
>-%%PORTDOCS%%%%DOCSDIR%%/OPTIMIZERS
>-%%PORTDOCS%%%%DOCSDIR%%/architecture.txt
>-%%PORTDOCS%%%%DOCSDIR%%/avi_comments.txt
>-%%PORTDOCS%%%%DOCSDIR%%/clone.txt
>-%%PORTDOCS%%%%DOCSDIR%%/export_ffmpeg.txt
>-%%PORTDOCS%%%%DOCSDIR%%/export_mp2.txt
>-%%PORTDOCS%%%%DOCSDIR%%/export_mpeg.txt
>-%%PORTDOCS%%%%DOCSDIR%%/export_pvm.txt
>-%%PORTDOCS%%%%DOCSDIR%%/export-API.txt
>-%%PORTDOCS%%%%DOCSDIR%%/faq
>-%%PORTDOCS%%%%DOCSDIR%%/filter_dnr.txt
>-%%PORTDOCS%%%%DOCSDIR%%/filter_logo.txt
>-%%PORTDOCS%%%%DOCSDIR%%/filter_logoaway.txt
>+%%PORTDOCS%%%%DOCSDIR%%/template.cfg.txt
>+%%PORTDOCS%%%%DOCSDIR%%/release-notes/README-0.6.13
>+%%PORTDOCS%%%%DOCSDIR%%/pvm.cfg
>+%%PORTDOCS%%%%DOCSDIR%%/import_yuv.txt
>+%%PORTDOCS%%%%DOCSDIR%%/import_v4l2.txt
>+%%PORTDOCS%%%%DOCSDIR%%/import_nvrec.txt
>+%%PORTDOCS%%%%DOCSDIR%%/import-xml.txt
>+%%PORTDOCS%%%%DOCSDIR%%/import-API.txt
>+%%PORTDOCS%%%%DOCSDIR%%/ibp_support.txt
>+%%PORTDOCS%%%%DOCSDIR%%/html/tc.png
>+%%PORTDOCS%%%%DOCSDIR%%/html/table.php
>+%%PORTDOCS%%%%DOCSDIR%%/html/subtitles.html
>+%%PORTDOCS%%%%DOCSDIR%%/html/sub3-00000.png
>+%%PORTDOCS%%%%DOCSDIR%%/html/sub2-00000.png
>+%%PORTDOCS%%%%DOCSDIR%%/html/sub1-00000.png
>+%%PORTDOCS%%%%DOCSDIR%%/html/sub0-00000.png
>+%%PORTDOCS%%%%DOCSDIR%%/html/sorry.html
>+%%PORTDOCS%%%%DOCSDIR%%/html/smart.html
>+%%PORTDOCS%%%%DOCSDIR%%/html/pre.html
>+%%PORTDOCS%%%%DOCSDIR%%/html/post.html
>+%%PORTDOCS%%%%DOCSDIR%%/html/other.html
>+%%PORTDOCS%%%%DOCSDIR%%/html/new.png
>+%%PORTDOCS%%%%DOCSDIR%%/html/mpeg.html
>+%%PORTDOCS%%%%DOCSDIR%%/html/modules.html
>+%%PORTDOCS%%%%DOCSDIR%%/html/misc.html
>+%%PORTDOCS%%%%DOCSDIR%%/html/mes7-00000.png
>+%%PORTDOCS%%%%DOCSDIR%%/html/mes6-00000.png
>+%%PORTDOCS%%%%DOCSDIR%%/html/mes5-00000.png
>+%%PORTDOCS%%%%DOCSDIR%%/html/mes4-00000.png
>+%%PORTDOCS%%%%DOCSDIR%%/html/mes0-00000.png
>+%%PORTDOCS%%%%DOCSDIR%%/html/intro.html
>+%%PORTDOCS%%%%DOCSDIR%%/html/index.html
>+%%PORTDOCS%%%%DOCSDIR%%/html/import_yuv4mpeg.html
>+%%PORTDOCS%%%%DOCSDIR%%/html/import_vob.html
>+%%PORTDOCS%%%%DOCSDIR%%/html/import_raw.html
>+%%PORTDOCS%%%%DOCSDIR%%/html/import_ogg.php
>+%%PORTDOCS%%%%DOCSDIR%%/html/import_nuv.html
>+%%PORTDOCS%%%%DOCSDIR%%/html/import_null.html
>+%%PORTDOCS%%%%DOCSDIR%%/html/import_mpeg3.html
>+%%PORTDOCS%%%%DOCSDIR%%/html/import_mpeg2.html
>+%%PORTDOCS%%%%DOCSDIR%%/html/import_mp3.html
>+%%PORTDOCS%%%%DOCSDIR%%/html/import_dvd.html
>+%%PORTDOCS%%%%DOCSDIR%%/html/import_dv.html
>+%%PORTDOCS%%%%DOCSDIR%%/html/import_avi.html
>+%%PORTDOCS%%%%DOCSDIR%%/html/export_xvid.php
>+%%PORTDOCS%%%%DOCSDIR%%/html/export_opendivx.php
>+%%PORTDOCS%%%%DOCSDIR%%/html/export_ogg.php
>+%%PORTDOCS%%%%DOCSDIR%%/html/export_fame.php
>+%%PORTDOCS%%%%DOCSDIR%%/html/export_divx5.php
>+%%PORTDOCS%%%%DOCSDIR%%/html/export_divx4.php
>+%%PORTDOCS%%%%DOCSDIR%%/html/export_divx.html
>+%%PORTDOCS%%%%DOCSDIR%%/html/dvd.html
>+%%PORTDOCS%%%%DOCSDIR%%/html/dv.html
>+%%PORTDOCS%%%%DOCSDIR%%/framerate.txt
> %%PORTDOCS%%%%DOCSDIR%%/filter_yuvdenoise.txt
>-%%PORTDOCS%%%%DOCSDIR%%/filter-socket.txt
> %%PORTDOCS%%%%DOCSDIR%%/filter_text.txt
>+%%PORTDOCS%%%%DOCSDIR%%/filter_logoaway.txt
>+%%PORTDOCS%%%%DOCSDIR%%/filter_logo.txt
>+%%PORTDOCS%%%%DOCSDIR%%/filter_dnr.txt
>+%%PORTDOCS%%%%DOCSDIR%%/filter-socket.txt
> %%PORTDOCS%%%%DOCSDIR%%/filter-API.txt
>-%%PORTDOCS%%%%DOCSDIR%%/framerate.txt
>-%%PORTDOCS%%%%DOCSDIR%%/html/about.html
>-%%PORTDOCS%%%%DOCSDIR%%/html/anim.html
>-%%PORTDOCS%%%%DOCSDIR%%/html/cluster_guide.txt
>-%%PORTDOCS%%%%DOCSDIR%%/html/core.html
>-%%PORTDOCS%%%%DOCSDIR%%/html/dv.html
>-%%PORTDOCS%%%%DOCSDIR%%/html/dvd.html
>-%%PORTDOCS%%%%DOCSDIR%%/html/export_af6.html
>-%%PORTDOCS%%%%DOCSDIR%%/html/export_divx.html
>-%%PORTDOCS%%%%DOCSDIR%%/html/export_iv50.html
>-%%PORTDOCS%%%%DOCSDIR%%/html/export_null.html
>-%%PORTDOCS%%%%DOCSDIR%%/html/export_raw.html
>-%%PORTDOCS%%%%DOCSDIR%%/html/export_divx4.php
>-%%PORTDOCS%%%%DOCSDIR%%/html/export_divx5.php
>-%%PORTDOCS%%%%DOCSDIR%%/html/export_fame.php
>-%%PORTDOCS%%%%DOCSDIR%%/html/export_ogg.php
>-%%PORTDOCS%%%%DOCSDIR%%/html/export_opendivx.php
>-%%PORTDOCS%%%%DOCSDIR%%/html/export_xvid.php
>-%%PORTDOCS%%%%DOCSDIR%%/html/faq.html
>-%%PORTDOCS%%%%DOCSDIR%%/html/filter.html
>-%%PORTDOCS%%%%DOCSDIR%%/html/import_ac3.html
>-%%PORTDOCS%%%%DOCSDIR%%/html/import_avi.html
>-%%PORTDOCS%%%%DOCSDIR%%/html/import_dv.html
>-%%PORTDOCS%%%%DOCSDIR%%/html/import_dvd.html
>-%%PORTDOCS%%%%DOCSDIR%%/html/import_mp3.html
>-%%PORTDOCS%%%%DOCSDIR%%/html/import_mpeg2.html
>-%%PORTDOCS%%%%DOCSDIR%%/html/import_mpeg3.html
>-%%PORTDOCS%%%%DOCSDIR%%/html/import_null.html
>-%%PORTDOCS%%%%DOCSDIR%%/html/import_nuv.html
>-%%PORTDOCS%%%%DOCSDIR%%/html/import_ogg.php
>-%%PORTDOCS%%%%DOCSDIR%%/html/import_raw.html
>-%%PORTDOCS%%%%DOCSDIR%%/html/import_vob.html
>-%%PORTDOCS%%%%DOCSDIR%%/html/import_yuv4mpeg.html
>-%%PORTDOCS%%%%DOCSDIR%%/html/index.html
>-%%PORTDOCS%%%%DOCSDIR%%/html/intro.html
>-%%PORTDOCS%%%%DOCSDIR%%/html/mes0-00000.png
>-%%PORTDOCS%%%%DOCSDIR%%/html/mes4-00000.png
>-%%PORTDOCS%%%%DOCSDIR%%/html/mes5-00000.png
>-%%PORTDOCS%%%%DOCSDIR%%/html/mes6-00000.png
>-%%PORTDOCS%%%%DOCSDIR%%/html/mes7-00000.png
>-%%PORTDOCS%%%%DOCSDIR%%/html/misc.html
>-%%PORTDOCS%%%%DOCSDIR%%/html/modules.html
>-%%PORTDOCS%%%%DOCSDIR%%/html/mpeg.html
>-%%PORTDOCS%%%%DOCSDIR%%/html/new.png
>-%%PORTDOCS%%%%DOCSDIR%%/html/options.html
>-%%PORTDOCS%%%%DOCSDIR%%/html/other.html
>-%%PORTDOCS%%%%DOCSDIR%%/html/post.html
>-%%PORTDOCS%%%%DOCSDIR%%/html/pre.html
>-%%PORTDOCS%%%%DOCSDIR%%/html/smart.html
>-%%PORTDOCS%%%%DOCSDIR%%/html/sorry.html
>-%%PORTDOCS%%%%DOCSDIR%%/html/sub0-00000.png
>-%%PORTDOCS%%%%DOCSDIR%%/html/sub1-00000.png
>-%%PORTDOCS%%%%DOCSDIR%%/html/sub2-00000.png
>-%%PORTDOCS%%%%DOCSDIR%%/html/sub3-00000.png
>-%%PORTDOCS%%%%DOCSDIR%%/html/subtitles.html
>-%%PORTDOCS%%%%DOCSDIR%%/html/table.php
>-%%PORTDOCS%%%%DOCSDIR%%/html/tc.png
>-%%PORTDOCS%%%%DOCSDIR%%/ibp_support.txt
>-%%PORTDOCS%%%%DOCSDIR%%/import-API.txt
>-%%PORTDOCS%%%%DOCSDIR%%/import-xml.txt
>-%%PORTDOCS%%%%DOCSDIR%%/import_nvrec.txt
>-%%PORTDOCS%%%%DOCSDIR%%/import_v4l2.txt
>-%%PORTDOCS%%%%DOCSDIR%%/import_yuv.txt
>-%%PORTDOCS%%%%DOCSDIR%%/pvm.cfg
>-%%PORTDOCS%%%%DOCSDIR%%/release-notes/README-0.6.13
>-%%PORTDOCS%%%%DOCSDIR%%/template.cfg.txt
>+%%PORTDOCS%%%%DOCSDIR%%/faq
>+%%PORTDOCS%%%%DOCSDIR%%/export_pvm.txt
>+%%PORTDOCS%%%%DOCSDIR%%/export_mpeg.txt
>+%%PORTDOCS%%%%DOCSDIR%%/export_mp2.txt
>+%%PORTDOCS%%%%DOCSDIR%%/export_ffmpeg.txt
>+%%PORTDOCS%%%%DOCSDIR%%/export-API.txt
>+%%PORTDOCS%%%%DOCSDIR%%/clone.txt
>+%%PORTDOCS%%%%DOCSDIR%%/avi_comments.txt
>+%%PORTDOCS%%%%DOCSDIR%%/architecture.txt
>+%%PORTDOCS%%%%DOCSDIR%%/README.xvid-credits
>+%%PORTDOCS%%%%DOCSDIR%%/README.vcd
>+%%PORTDOCS%%%%DOCSDIR%%/README.sync
>+%%PORTDOCS%%%%DOCSDIR%%/README.rip
>+%%PORTDOCS%%%%DOCSDIR%%/README.filter.modfps
>+%%PORTDOCS%%%%DOCSDIR%%/README.dv
>+%%PORTDOCS%%%%DOCSDIR%%/README.cluster
>+%%PORTDOCS%%%%DOCSDIR%%/README.Inverse.Telecine.txt
>+%%PORTDOCS%%%%DOCSDIR%%/OPTIMIZERS
>+%%PORTDOCS%%%%DOCSDIR%%/DV-to-DVD-HOWTO.txt
>+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
> %%PORTDOCS%%@dirrm %%DOCSDIR%%/html
> %%PORTDOCS%%@dirrm %%DOCSDIR%%/release-notes
> %%PORTDOCS%%@dirrm %%DOCSDIR%%
>Index: transcode/files/patch-filter:filter_modfps.c
>===================================================================
>RCS file: /home/ncvs/ports/multimedia/transcode/files/patch-filter:filter_modfps.c,v
>retrieving revision 1.1
>diff -u -u -r1.1 patch-filter:filter_modfps.c
>--- transcode/files/patch-filter:filter_modfps.c	11 Oct 2004 23:12:03 -0000	1.1
>+++ transcode/files/patch-filter:filter_modfps.c	11 May 2005 10:02:34 -0000
>@@ -1,16 +1,17 @@
>---- filter/filter_modfps.c.old	Sat Aug 21 13:11:20 2004
>-+++ filter/filter_modfps.c	Sat Aug 21 13:13:33 2004
>-@@ -77,6 +77,13 @@
>- #include "framebuffer.h"
>- #include "optstr.h"
>+--- filter/filter_modfps.c.orig	Sun May  8 16:55:54 2005
>++++ filter/filter_modfps.c	Sun May  8 16:57:01 2005
>+@@ -62,7 +62,14 @@
>+ //#define DEBUG 1
>  
>-+#if !defined(HAVE_LRINTF)
>+ // FIXME
>++#if !defined(HAV_LRINTF)
> +static inline long int lrint(double x)
> +{
>-+    return (long)(rint(x));
>++	return (long)(rint(x));
> +}
>++#else
>+ extern long int lrint(double x);
> +#endif
>-+
>+ 
>  static int show_results=0;
>  
>- /*-------------------------------------------------
>Index: transcode/files/patch-filter_Makefile.in
>===================================================================
>RCS file: /home/ncvs/ports/multimedia/transcode/files/patch-filter_Makefile.in,v
>retrieving revision 1.1
>diff -u -u -r1.1 patch-filter_Makefile.in
>--- transcode/files/patch-filter_Makefile.in	23 Feb 2005 18:06:15 -0000	1.1
>+++ transcode/files/patch-filter_Makefile.in	11 May 2005 10:02:34 -0000
>@@ -1,30 +1,11 @@
>---- filter/Makefile.in.orig
>-+++ filter/Makefile.in	Sat Feb 19 21:30:33 2005
>-@@ -335,7 +335,7 @@
>+--- filter/Makefile.in.orig	Sun May  8 16:54:37 2005
>++++ filter/Makefile.in	Sun May  8 16:55:06 2005
>+@@ -356,7 +356,7 @@
>  	uninstall-recursive
>  ETAGS = etags
>  CTAGS = ctags
>--DIST_SUBDIRS = pp divxkey extsub resample test yuvdenoise ivtc \
>-+DIST_SUBDIRS = divxkey extsub resample test yuvdenoise ivtc \
>- 	tomsmocomp preview subtitler
>+-DIST_SUBDIRS = pp divxkey extsub yuvdenoise tomsmocomp preview \
>++DIST_SUBDIRS = divxkey extsub yuvdenoise tomsmocomp preview \
>+ 	subtitler
>  DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
>  A52_CFLAGS = @A52_CFLAGS@
>-@@ -835,7 +835,6 @@
>- 
>- @HAVE_FREETYPE2_TRUE@@HAVE_LIBICONV_TRUE@@HAVE_LIBXPM_TRUE@@HAVE_XAW_SIMPLE_TRUE@ADD2 = subtitler
>- @HAVE_X11_FALSE@SUBDIRS = \
>--@HAVE_X11_FALSE@	pp \
>- @HAVE_X11_FALSE@	divxkey \
>- @HAVE_X11_FALSE@	extsub \
>- @HAVE_X11_FALSE@	resample \
>-@@ -845,7 +844,6 @@
>- @HAVE_X11_FALSE@	$(F_TOMSMOCOMP)
>- 
>- @HAVE_X11_TRUE@SUBDIRS = \
>--@HAVE_X11_TRUE@	pp \
>- @HAVE_X11_TRUE@	divxkey \
>- @HAVE_X11_TRUE@	extsub \
>- @HAVE_X11_TRUE@	resample \
>---- transcode-1.0.0beta2.diff ends here ---
>-
>-
>Index: transcode/files/patch-libvo_yuv2rgv.c
>===================================================================
>RCS file: /home/ncvs/ports/multimedia/transcode/files/patch-libvo_yuv2rgv.c,v
>retrieving revision 1.1
>diff -u -u -r1.1 patch-libvo_yuv2rgv.c
>--- transcode/files/patch-libvo_yuv2rgv.c	23 Feb 2005 18:06:15 -0000	1.1
>+++ transcode/files/patch-libvo_yuv2rgv.c	11 May 2005 10:02:34 -0000
>@@ -1,11 +1,11 @@
>---- libvo/yuv2rgb.c.orig	Wed Feb 23 05:08:14 2005
>-+++ libvo/yuv2rgb.c	Wed Feb 23 05:09:12 2005
>-@@ -71,7 +71,7 @@
>- void yuv2rgb_init (int bpp, int mode) 
>+--- libvo/yuv2rgb.c.orig	Sun May  8 16:57:56 2005
>++++ libvo/yuv2rgb.c	Sun May  8 16:58:18 2005
>+@@ -72,7 +72,7 @@
>  {
>      yuv2rgb = NULL;
>--#if defined(ARCH_X86) || defined(ARCH_X86_64)
>-+#if defined(ARCH_X86)
>+ #ifdef HAVE_MMX
>+-# if defined(ARCH_X86) || defined(ARCH_X86_64)
>++# if defined(ARCH_X86)
>      if ((yuv2rgb == NULL) && (vo_mm_accel & MM_ACCEL_X86_MMXEXT)) {
>  	yuv2rgb = yuv2rgb_init_mmxext (bpp, mode);
>  	if (yuv2rgb != NULL)
>
>
>
>this is files/patch-configure
>
>
>--- configure.orig	Mon May  9 16:11:35 2005
>+++ configure	Mon May  9 16:13:00 2005
>@@ -37743,7 +37743,7 @@
>   for l in $a52_ll ; do
>     case $l in
>       -L*) lpaths="$lpaths $l" ;;
>-      -l*) test x"$l" != x"-la52" && xlibs="$xlibs $l" ;;
>+      -l*) test x"$l" != x"-la52  -L/usr/local/lib -ldjbfft -lm" && xlibs="$xlibs $l" ;;
>         *) xlf="$xlf $l" ;;
>     esac
>   done
>@@ -37759,13 +37759,13 @@
>   if test x"a52" != x"none" ; then
>     save_LDFLAGS="$LDFLAGS"
>     LDFLAGS="$LDFLAGS $a52_ll"
>-    echo "$as_me:$LINENO: checking for a52_init in -la52" >&5
>-echo $ECHO_N "checking for a52_init in -la52... $ECHO_C" >&6
>+    echo "$as_me:$LINENO: checking for a52_init in -la52  -L/usr/local/lib -ldjbfft -lm" >&5
>+echo $ECHO_N "checking for a52_init in -la52  -L/usr/local/lib -ldjbfft -lm... $ECHO_C" >&6
> if test "${ac_cv_lib_a52_a52_init+set}" = set; then
>   echo $ECHO_N "(cached) $ECHO_C" >&6
> else
>   ac_check_lib_save_LIBS=$LIBS
>-LIBS="-la52 $A52_EXTRA_LIBS $LIBS"
>+LIBS="-la52  -L/usr/local/lib -ldjbfft -lm $A52_EXTRA_LIBS $LIBS"
> cat >conftest.$ac_ext <<_ACEOF
> /* confdefs.h.  */
> _ACEOF
>@@ -37824,7 +37824,7 @@
> echo "$as_me:$LINENO: result: $ac_cv_lib_a52_a52_init" >&5
> echo "${ECHO_T}$ac_cv_lib_a52_a52_init" >&6
> if test $ac_cv_lib_a52_a52_init = yes; then
>-  A52_LIBS="$a52_ll -la52 $A52_EXTRA_LIBS"
>+  A52_LIBS="$a52_ll -la52  -L/usr/local/lib -ldjbfft -lm $A52_EXTRA_LIBS"
> else
> 
> tc_pkg_err="yes"
>@@ -40561,14 +40561,14 @@
> echo "${ECHO_T}$pkg_config_sdl" >&6
> 
> 
>-  if test x"sdl-config" != x"no" ; then
>+  if test x"sdl11-config" != x"no" ; then
>     if test x"$w_sdl_p" != x"" ; then
>-      if test -x $w_sdl_p/bin/sdl-config ; then
>-        sdl_config="$w_sdl_p/bin/sdl-config"
>+      if test -x $w_sdl_p/bin/sdl11-config ; then
>+        sdl_config="$w_sdl_p/bin/sdl11-config"
>       fi
>     fi
>-    # Extract the first word of "sdl-config", so it can be a program name with args.
>-set dummy sdl-config; ac_word=$2
>+    # Extract the first word of "sdl11-config", so it can be a program name with args.
>+set dummy sdl11-config; ac_word=$2
> echo "$as_me:$LINENO: checking for $ac_word" >&5
> echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
> if test "${ac_cv_path_sdl_config+set}" = set; then
>@@ -40856,7 +40856,7 @@
>   for l in $sdl_ll ; do
>     case $l in
>       -L*) lpaths="$lpaths $l" ;;
>-      -l*) test x"$l" != x"-lSDL" && xlibs="$xlibs $l" ;;
>+      -l*) test x"$l" != x"-lSDL-1.1" && xlibs="$xlibs $l" ;;
>         *) xlf="$xlf $l" ;;
>     esac
>   done
>@@ -40872,13 +40872,13 @@
>   if test x"SDL" != x"none" ; then
>     save_LDFLAGS="$LDFLAGS"
>     LDFLAGS="$LDFLAGS $sdl_ll"
>-    echo "$as_me:$LINENO: checking for SDL_Init in -lSDL" >&5
>-echo $ECHO_N "checking for SDL_Init in -lSDL... $ECHO_C" >&6
>+    echo "$as_me:$LINENO: checking for SDL_Init in -lSDL-1.1" >&5
>+echo $ECHO_N "checking for SDL_Init in -lSDL-1.1... $ECHO_C" >&6
> if test "${ac_cv_lib_SDL_SDL_Init+set}" = set; then
>   echo $ECHO_N "(cached) $ECHO_C" >&6
> else
>   ac_check_lib_save_LIBS=$LIBS
>-LIBS="-lSDL $SDL_EXTRA_LIBS $LIBS"
>+LIBS="-lSDL-1.1 $SDL_EXTRA_LIBS $LIBS"
> cat >conftest.$ac_ext <<_ACEOF
> /* confdefs.h.  */
> _ACEOF
>@@ -40937,7 +40937,7 @@
> echo "$as_me:$LINENO: result: $ac_cv_lib_SDL_SDL_Init" >&5
> echo "${ECHO_T}$ac_cv_lib_SDL_SDL_Init" >&6
> if test $ac_cv_lib_SDL_SDL_Init = yes; then
>-  SDL_LIBS="$sdl_ll -lSDL $SDL_EXTRA_LIBS"
>+  SDL_LIBS="$sdl_ll -lSDL-1.1 $SDL_EXTRA_LIBS"
> else
> 
> tc_pkg_err="yes"
>@@ -41429,7 +41429,7 @@
>   for l in $gtk_ll ; do
>     case $l in
>       -L*) lpaths="$lpaths $l" ;;
>-      -l*) test x"$l" != x"-lgtk" && xlibs="$xlibs $l" ;;
>+      -l*) test x"$l" != x"-lgtk12" && xlibs="$xlibs $l" ;;
>         *) xlf="$xlf $l" ;;
>     esac
>   done
>@@ -41445,13 +41445,13 @@
>   if test x"gtk" != x"none" ; then
>     save_LDFLAGS="$LDFLAGS"
>     LDFLAGS="$LDFLAGS $gtk_ll"
>-    echo "$as_me:$LINENO: checking for gtk_init in -lgtk" >&5
>-echo $ECHO_N "checking for gtk_init in -lgtk... $ECHO_C" >&6
>+    echo "$as_me:$LINENO: checking for gtk_init in -lgtk12" >&5
>+echo $ECHO_N "checking for gtk_init in -lgtk12... $ECHO_C" >&6
> if test "${ac_cv_lib_gtk_gtk_init+set}" = set; then
>   echo $ECHO_N "(cached) $ECHO_C" >&6
> else
>   ac_check_lib_save_LIBS=$LIBS
>-LIBS="-lgtk $GTK_EXTRA_LIBS $LIBS"
>+LIBS="-lgtk12 $GTK_EXTRA_LIBS $LIBS"
> cat >conftest.$ac_ext <<_ACEOF
> /* confdefs.h.  */
> _ACEOF
>@@ -41510,7 +41510,7 @@
> echo "$as_me:$LINENO: result: $ac_cv_lib_gtk_gtk_init" >&5
> echo "${ECHO_T}$ac_cv_lib_gtk_gtk_init" >&6
> if test $ac_cv_lib_gtk_gtk_init = yes; then
>-  GTK_LIBS="$gtk_ll -lgtk $GTK_EXTRA_LIBS"
>+  GTK_LIBS="$gtk_ll -lgtk12 $GTK_EXTRA_LIBS"
> else
> 
> tc_pkg_err="yes"

Actions: View | Diff

Attachments on bug 80884: 53479