From 1b555bf85a4fba1368d3adf52fa2de19d1d04dfb Mon Sep 17 00:00:00 2001 From: lioux Date: Tue, 29 Oct 2002 17:16:55 +0000 Subject: o Update to 0.6.2 CVS snapshot o USE_REINPLACE o Fix libfame problems [1] o Optional ogg and mjpeg [1] o Remove libmpeg2 o Use distfile supplied ffmpeg instead of ports' ffmpeg (should be revised later) PR: 43379 [1], 44008 Submitted by: adam@vectors.cx [1], MAINTAINER Reviewed by: MAINTAINER --- multimedia/transcode/Makefile | 96 ++++++---- multimedia/transcode/distinfo | 2 +- multimedia/transcode/files/patch-libtool | 24 +++ .../transcode/files/patch-src:export:Makefile.in | 13 ++ .../files/patch-src:filter:preview:display.h | 16 ++ .../patch-src:filter:preview:filter_preview.h | 11 ++ multimedia/transcode/pkg-plist | 208 +++++++++++++++------ 7 files changed, 267 insertions(+), 103 deletions(-) create mode 100644 multimedia/transcode/files/patch-libtool create mode 100644 multimedia/transcode/files/patch-src:export:Makefile.in create mode 100644 multimedia/transcode/files/patch-src:filter:preview:display.h create mode 100644 multimedia/transcode/files/patch-src:filter:preview:filter_preview.h (limited to 'multimedia/transcode') diff --git a/multimedia/transcode/Makefile b/multimedia/transcode/Makefile index 88866917adca..f495d74f8aec 100644 --- a/multimedia/transcode/Makefile +++ b/multimedia/transcode/Makefile @@ -6,28 +6,29 @@ # PORTNAME= transcode -PORTVERSION= 0.6.0.5 -PORTREVISION= 1 +PORTVERSION= 0.6.2 +DISTNAME= ${PORTNAME}-${PORTVERSION}.20021010 CATEGORIES= graphics MASTER_SITES= http://www.theorie.physik.uni-goettingen.de/~ostreich/transcode/pre/ -DISTNAME= ${PORTNAME}-${PORTVERSION:S/.5$//g}pre5 -EXTRACT_SUFX= .tgz MAINTAINER= hendrik@scholz.net LIB_DEPENDS= dvdread.2:${PORTSDIR}/graphics/libdvdread \ - gnugetopt.1:${PORTSDIR}/devel/libgnugetopt + gnugetopt.1:${PORTSDIR}/devel/libgnugetopt \ + jpeg.9:${PORTSDIR}/graphics/jpeg USE_XLIB= yes USE_GNOMENG= yes -USE_GNOME= glib12 +USE_GNOME= gtk12 USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ENV= CFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lgnugetopt" \ SDL_CONFIG="${LOCALBASE}/bin/sdl11-config" +USE_REINPLACE= yes -MAN1= transcode.1 tccat.1 avisplit.1 avimerge.1 avifix.1 +MAN1= avifix.1 avimerge.1 avisplit.1 avisync.1 tccat.1 tcdemux.1 \ + tcprobe.1 tcscan.1 transcode.1 .include @@ -39,7 +40,7 @@ WITH_IMAGEMAGICK= yes WITH_NASM= yes .endif -.if exists(${LOCALBASE}/lib/libaviplay-0.7.so) +.if exists(${LOCALBASE}/lib/libaviplay.so) WITH_AVIFILE= yes .endif @@ -63,12 +64,8 @@ WITH_LIBDV= yes WITH_OPENQUICKTIME= yes .endif -.if exists(${LOCALBASE}/lib/libmpeg2.so) -WITH_LIBMPEG2= yes -.endif - .if exists(${LOCALBASE}/lib/libfame.so) -WITH_LIBFAME= yes +WITH_FAME= yes .endif .if exists(${LOCALBASE}/lib/libxvidcore.so) @@ -88,6 +85,14 @@ WITH_LIBA52= yes WITH_LAME= yes .endif +.if exists(${LOCALBASE}/lib/libogg.so) +WITH_OGG= yes +.endif + +.if exists(${LOCALBASE}/lib/liblavplay.so) +WITH_MJPEG= yes +.endif + .if defined(WITH_IMAGEMAGICK) LIB_DEPENDS+= Magick.5:${PORTSDIR}/graphics/ImageMagick PLIST_SUB+= WITH_IMAGEMAGICK="" @@ -102,7 +107,7 @@ ONLY_FOR_ARCHS= i386 .endif .if defined(WITH_AVIFILE) -LIB_DEPENDS+= aviplay-0.7.0:${PORTSDIR}/graphics/avifile +LIB_DEPENDS+= aviplay:${PORTSDIR}/graphics/avifile PLIST_SUB+= WITH_AVIFILE="" .else CONFIGURE_ARGS+= --with-avifile-mods=no \ @@ -126,7 +131,7 @@ PLIST_SUB+= WITH_LIBXML2="" PLIST_SUB+= WITH_LIBXML2="@comment " .endif -.if defined(WITH_FFMPEG) +.if defined(WITH_FFMPEG) && !defined(WITHOUT_FFMPEG) BUILD_DEPENDS+= ${LOCALBASE}/bin/ffmpeg:${PORTSDIR}/graphics/ffmpeg PLIST_SUB+= WITH_FFMPEG="" .else @@ -136,6 +141,7 @@ PLIST_SUB+= WITH_FFMPEG="@comment " .if defined(WITH_LIBDV) LIB_DEPENDS+= dv.2:${PORTSDIR}/graphics/libdv PLIST_SUB+= WITH_LIBDV="" +CONFIGURE_ARGS+= --with-pal-yuv=YV12 .else CONFIGURE_ARGS+= --with-dv=no PLIST_SUB+= WITH_LIBDV="@comment " @@ -147,11 +153,8 @@ LIB_DEPENDS+= openquicktime.0:${PORTSDIR}/graphics/openquicktime CONFIGURE_ARGS+= --with-openqt=no .endif -.if defined(WITH_LIBMPEG2) -LIB_DEPENDS+= mpeg2.0:${PORTSDIR}/graphics/libmpeg2 -.endif .if defined(WITH_FAME) -LIB_DEPENDS+= fame.10:${PORTSDIR}/graphics/libfame +LIB_DEPENDS+= fame-0.9:${PORTSDIR}/graphics/libfame PLIST_SUB+= WITH_FAME="" .else PLIST_SUB+= WITH_FAME="@comment " @@ -183,11 +186,25 @@ CONFIGURE_ARGS+= --with-lame=no PLIST_SUB+= WITH_LAME="@comment " .endif +.if defined(WITH_OGG) +LIB_DEPENDS+= ogg.4:${PORTSDIR}/audio/libogg +CONFIGURE_ARGS+= --with-ogg=yes +PLIST_SUB+= WITH_OGG="" +.else +PLIST_SUB+= WITH_OGG="@comment " +.endif + +.if defined(WITH_MJPEG) +LIB_DEPENDS+= lavplay-1.6.0:${PORTSDIR}/graphics/mjpegtools +PLIST_SUB+= WITH_MJPEG="" +.else +PLIST_SUB+= WITH_MJPEG="@comment " +.endif + pre-everything:: .if !defined(WITH_OPTIMIZED_CFLAGS) @${ECHO_MSG} - @${ECHO_MSG} "You can enable extra optimizations by defining" - @${ECHO_MSG} "WITH_OPTIMIZED_CFLAGS." + @${ECHO_MSG} "You can enable extra optimizations by defining WITH_OPTIMIZED_CFLAGS." .endif .if !defined(WITH_IMAGEMAGICK) @${ECHO_MSG} @@ -203,7 +220,7 @@ pre-everything:: @${ECHO_MSG} @${ECHO_MSG} "You can enable libxml2-dependent modules by defining WITH_LIBXML2." .endif -.if !defined(WITH_FFMPEG) +.if !defined(WITH_FFMPEG) || defined(WITHOUT_FFMEG) @${ECHO_MSG} @${ECHO_MSG} "You can enable ffmpeg-dependent modules by defining WITH_FFMPEG." .endif @@ -240,13 +257,7 @@ pre-everything:: .endif .if !defined(WITH_FAME) @${ECHO_MSG} - @${ECHO_MSG} "You can enable libfame-support by defining WITH_LIBFAME." -.endif -.if !defined(WITH_LIBMPEG2) - @${ECHO_MSG} - @${ECHO_MSG} "You can enable libmpeg2-dependent modules by defining WITH_LIBMPEG2." - @${ECHO_MSG} "You will probably want to enable this, if you plan to" - @${ECHO_MSG} "rip DVDs." + @${ECHO_MSG} "You can enable libfame-support by defining WITH_FAME." .endif .if !defined(WITH_XVID) @${ECHO_MSG} @@ -255,25 +266,34 @@ pre-everything:: @${ECHO_MSG} "You will probably want to enable this, if you plan to" @${ECHO_MSG} "rip DVDs." .endif +.if !defined(WITH_OGG) + @${ECHO_MSG} + @${ECHO_MSG} "You can enable libogg support by defining WITH_OGG." +.endif +.if !defined(WITH_MJPEG) + @${ECHO_MSG} + @${ECHO_MSG} "You can enable support for the MJPEG toolkit by defining WITH_MJPEG" +.endif post-patch: .if ${OSVERSION} <= 500027 - @${FIND} ${WRKSRC} -type f | ${XARGS} -n 10 -x ${PERL} -pi \ + @${FIND} ${WRKSRC} -type f | ${XARGS} -n 10 -x ${REINPLACE_CMD} \ -e 's|||' .endif .if !defined(WITH_OPTIMIZED_CFLAGS) - @${FIND} ${WRKSRC} -type f | ${XARGS} -n 10 -x ${PERL} -pi \ + @${FIND} ${WRKSRC} -type f | ${XARGS} -n 10 -x ${REINPLACE_CMD} \ -e 's|-O[236]|${CFLAGS}|' .endif - @${PERL} -pi -e 's|(seek)64|\1|' ${WRKSRC}/avilib/avidump.c - @${PERL} -pi -e 's| diff --git a/multimedia/transcode/distinfo b/multimedia/transcode/distinfo index 4fef5e99ea6f..197de96e4c0e 100644 --- a/multimedia/transcode/distinfo +++ b/multimedia/transcode/distinfo @@ -1 +1 @@ -MD5 (transcode-0.6.0pre5.tgz) = f791b1aac090312459e3e9cec2d1fd6e +MD5 (transcode-0.6.2.20021010.tar.gz) = 97b46fe8d7d650c8d0b57096bce162a1 diff --git a/multimedia/transcode/files/patch-libtool b/multimedia/transcode/files/patch-libtool new file mode 100644 index 000000000000..01d2a2defb72 --- /dev/null +++ b/multimedia/transcode/files/patch-libtool @@ -0,0 +1,24 @@ +--- libtool.orig Thu Oct 10 17:56:49 2002 ++++ libtool Mon Oct 28 21:56:19 2002 +@@ -2727,7 +2727,7 @@ + *-*-netbsd*) + # Don't link with libc until the a.out ld.so is fixed. + ;; +- *-*-openbsd*) ++ *-*-openbsd* | *-*-freebsd*) + # Do not include libc due to us having libc/libc_r. + ;; + *) +@@ -4496,10 +4496,12 @@ + fi + + # Install the pseudo-library for information purposes. ++ if /usr/bin/false; then + name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` + instname="$dir/$name"i + $show "$install_prog $instname $destdir/$name" + $run eval "$install_prog $instname $destdir/$name" || exit $? ++ fi + + # Maybe install the static library, too. + test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" diff --git a/multimedia/transcode/files/patch-src:export:Makefile.in b/multimedia/transcode/files/patch-src:export:Makefile.in new file mode 100644 index 000000000000..94ed7e8b264d --- /dev/null +++ b/multimedia/transcode/files/patch-src:export:Makefile.in @@ -0,0 +1,13 @@ +--- export/Makefile.in.orig Tue Sep 3 23:56:33 2002 ++++ export/Makefile.in Tue Sep 3 23:58:12 2002 +@@ -536,7 +536,9 @@ + export_ffmpeg.la: $(export_ffmpeg_la_OBJECTS) $(export_ffmpeg_la_DEPENDENCIES) + $(LINK) -rpath $(pkgdir) $(export_ffmpeg_la_LDFLAGS) $(export_ffmpeg_la_OBJECTS) $(export_ffmpeg_la_LIBADD) $(LIBS) + export_ffmpeg4.la: $(export_ffmpeg4_la_OBJECTS) $(export_ffmpeg4_la_DEPENDENCIES) +- $(LINK) -rpath $(pkgdir) $(export_ffmpeg4_la_LDFLAGS) $(export_ffmpeg4_la_OBJECTS) $(export_ffmpeg4_la_LIBADD) $(LIBS) ++ $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) \ ++ $(AM_LDFLAGS) -o $@ -IWRKSRC/ffmpeg/libavcodec -rpath \ ++ $(pkgdir) $(export_ffmpeg4_la_LDFLAGS) $(export_ffmpeg4_la_OBJECTS) $(export_ffmpeg4_la_LIBADD) $(LIBS) + export_im.la: $(export_im_la_OBJECTS) $(export_im_la_DEPENDENCIES) + $(LINK) -rpath $(pkgdir) $(export_im_la_LDFLAGS) $(export_im_la_OBJECTS) $(export_im_la_LIBADD) $(LIBS) + export_iv50.la: $(export_iv50_la_OBJECTS) $(export_iv50_la_DEPENDENCIES) diff --git a/multimedia/transcode/files/patch-src:filter:preview:display.h b/multimedia/transcode/files/patch-src:filter:preview:display.h new file mode 100644 index 000000000000..907a66ab40cb --- /dev/null +++ b/multimedia/transcode/files/patch-src:filter:preview:display.h @@ -0,0 +1,16 @@ +--- filter/preview/display.h.orig Fri Aug 9 10:41:59 2002 ++++ filter/preview/display.h Fri Aug 9 10:41:59 2002 +@@ -39,9 +39,11 @@ + #endif // HAVE_LIBXV + + #if HAVE_SDL +-#include +-#include ++#include ++#include + #endif // HAVE_SDL ++ ++#include + + #if HAVE_GTK + #include diff --git a/multimedia/transcode/files/patch-src:filter:preview:filter_preview.h b/multimedia/transcode/files/patch-src:filter:preview:filter_preview.h new file mode 100644 index 000000000000..4b26f7234b1d --- /dev/null +++ b/multimedia/transcode/files/patch-src:filter:preview:filter_preview.h @@ -0,0 +1,11 @@ +--- filter/preview/filter_preview.h.orig Fri Aug 9 10:41:59 2002 ++++ filter/preview/filter_preview.h Fri Aug 9 10:41:59 2002 +@@ -10,6 +10,8 @@ + #include + #include + ++#include ++ + #include + #include + #include "display.h" diff --git a/multimedia/transcode/pkg-plist b/multimedia/transcode/pkg-plist index f4ea949caeca..35e81bec2373 100644 --- a/multimedia/transcode/pkg-plist +++ b/multimedia/transcode/pkg-plist @@ -1,80 +1,164 @@ -bin/tcmplex -bin/tcextract -bin/tcdecode -bin/tcscan -bin/tcdemux -bin/tccat -bin/tcprobe +bin/avifix bin/avimerge bin/avisplit -bin/avifix bin/avisync +bin/tccat +bin/tcdecode +bin/tcdemux +bin/tcextract +bin/tcmplex +bin/tcprobe +bin/tcscan bin/transcode -lib/transcode/import_nuv.so -%%WITH_AVIFILE%%lib/transcode/import_af6.so -lib/transcode/import_net.so -lib/transcode/import_avi.so -lib/transcode/import_mpeg2.so -lib/transcode/import_vdrac3.so -lib/transcode/import_ac3.so -lib/transcode/import_dv.so -lib/transcode/import_vob.so -lib/transcode/import_raw.so -lib/transcode/import_yuv4mpeg.so -lib/transcode/import_yuv.so -lib/transcode/import_nvrec.so -lib/transcode/import_lav.so -lib/transcode/import_null.so -lib/transcode/import_divx.so %%WITH_LIBA52%%lib/transcode/a52_decore.so -%%WITH_LAME%%lib/transcode/import_mp3.so -lib/transcode/import_dvd.so -%%WITH_IMAGEMAGICK%%lib/transcode/import_im.so -%%WITH_IMAGEMAGICK%%lib/transcode/import_imlist.so -lib/transcode/import_mjpeg.so lib/transcode/af6_decore.so -%%WITH_LIBXML2%%lib/transcode/import_xml.so -lib/transcode/filter_null.so +lib/transcode/export_af6.conf +%%WITH_AVIFILE%%lib/transcode/export_af6.so +lib/transcode/export_divx4.so +lib/transcode/export_divx4raw.so +lib/transcode/export_divx5.so +%%WITH_LIBDV%%lib/transcode/export_dv.so +%%WITH_LIBDV%%lib/transcode/export_dvraw.so +%%WITH_FAME%%lib/transcode/export_fame.so +lib/transcode/export_ffmpeg4.so +%%WITH_IMAGEMAGICK%%lib/transcode/export_im.so +%%WITH_MJPEG%%lib/transcode/export_mjpeg.so +lib/transcode/export_mpeg.so +lib/transcode/export_net.so +lib/transcode/export_null.so +%%WITH_OGG%%lib/transcode/export_ogg.so +%%WITH_XVID%%lib/transcode/export_opendivx.so +lib/transcode/export_pcm.so +lib/transcode/export_ppm.so +lib/transcode/export_raw.so +lib/transcode/export_toolame.so +lib/transcode/export_wav.so +lib/transcode/export_xvid.so +lib/transcode/export_xvidcvs.so +lib/transcode/export_xvidraw.so +lib/transcode/filter_29to23.so lib/transcode/filter_32detect.so lib/transcode/filter_32drop.so -lib/transcode/filter_yuy2toyv12.so -lib/transcode/filter_skip.so -lib/transcode/filter_cshift.so -lib/transcode/filter_mask.so +lib/transcode/filter_aclip.so lib/transcode/filter_astat.so +lib/transcode/filter_clone.so +lib/transcode/filter_cshift.so lib/transcode/filter_cut.so -lib/transcode/filter_dnr.so -lib/transcode/filter_xsharpen.so -lib/transcode/filter_smartdeinter.so -lib/transcode/filter_testframe.so +lib/transcode/filter_decimate.so lib/transcode/filter_dilyuvmmx.so -lib/transcode/filter_logo.so lib/transcode/filter_divxkey.so +lib/transcode/filter_dnr.so lib/transcode/filter_extsub.so lib/transcode/filter_extsub2.so -lib/transcode/filter_resample.so -lib/transcode/filter_test.so +lib/transcode/filter_fields.so +lib/transcode/filter_invert.so +lib/transcode/filter_ivtc.so +%%WITH_IMAGEMAGICK%%lib/transcode/filter_logo.so +lib/transcode/filter_mask.so +lib/transcode/filter_normalize.so +lib/transcode/filter_null.so %%WITH_SDL%%lib/transcode/filter_preview.so +lib/transcode/filter_pv.so +lib/transcode/filter_resample.so +lib/transcode/filter_skip.so +lib/transcode/filter_smartdeinter.so lib/transcode/filter_subtitler.so -lib/transcode/export_null.so -lib/transcode/export_wav.so -%%WITH_AVIFILE%%lib/transcode/export_af6.so -lib/transcode/export_opendivx.so -lib/transcode/export_raw.so -lib/transcode/export_divx4.so -lib/transcode/export_divx4raw.so -lib/transcode/export_divx5.so -lib/transcode/export_pcm.so -lib/transcode/export_ppm.so -lib/transcode/export_xvid.so -lib/transcode/export_xvidcvs.so -lib/transcode/export_net.so -lib/transcode/export_toolame.so -%%WITH_LIBDV%%lib/transcode/export_dvraw.so -%%WITH_LIBDV%%lib/transcode/export_dv.so -lib/transcode/export_mpeg.so -%%WITH_FAME%%lib/transcode/export_fame.so -%%WITH_IMAGEMAGICK%%lib/transcode/export_im.so -lib/transcode/export_af6.conf +lib/transcode/filter_tc_audio.so +lib/transcode/filter_tc_video.so +lib/transcode/filter_test.so +lib/transcode/filter_testframe.so +lib/transcode/filter_xsharpen.so +lib/transcode/filter_yuvdenoise.so +lib/transcode/filter_yuy2toyv12.so +lib/transcode/import_ac3.so +%%WITH_AVIFILE%%lib/transcode/import_af6.so +lib/transcode/import_avi.so +lib/transcode/import_divx.so +lib/transcode/import_dv.so +lib/transcode/import_dvd.so +%%WITH_IMAGEMAGICK%%lib/transcode/import_im.so +%%WITH_IMAGEMAGICK%%lib/transcode/import_imlist.so +lib/transcode/import_lav.so +%%WITH_MJPEG%%lib/transcode/import_mjpeg.so +lib/transcode/import_mpeg2.so +%%WITH_LAME%%lib/transcode/import_mp3.so +lib/transcode/import_mplayer.so +lib/transcode/import_net.so +lib/transcode/import_null.so +lib/transcode/import_nuv.so +lib/transcode/import_nvrec.so +%%WITH_OGG%%lib/transcode/import_ogg.so +lib/transcode/import_raw.so +lib/transcode/import_rawlist.so +lib/transcode/import_vdrac3.so +lib/transcode/import_vob.so +%%WITH_LIBXML2%%lib/transcode/import_xml.so +lib/transcode/import_xvid.so +lib/transcode/import_yuv.so +lib/transcode/import_yuv4mpeg.so +lib/transcode/libioaux.so.0 %%WITH_XVID%%lib/transcode/libxvidcore.so +lib/transcode/xvid.cfg +share/doc/transcode/README.cluster +share/doc/transcode/README.rip +share/doc/transcode/README.sync +share/doc/transcode/README.vcd +share/doc/transcode/clone.txt +share/doc/transcode/export_mpeg.txt +share/doc/transcode/filter_dnr.txt +share/doc/transcode/filter_logo.txt +share/doc/transcode/filter_yuvdenoise.txt +share/doc/transcode/html/Smart.html +share/doc/transcode/html/about.html +share/doc/transcode/html/anim.html +share/doc/transcode/html/cluster_guide.txt +share/doc/transcode/html/core.html +share/doc/transcode/html/dv.html +share/doc/transcode/html/dvd.html +share/doc/transcode/html/export_af6.html +share/doc/transcode/html/export_divx.html +share/doc/transcode/html/export_iv50.html +share/doc/transcode/html/export_null.html +share/doc/transcode/html/export_raw.html +share/doc/transcode/html/faq.html +share/doc/transcode/html/filter.html +share/doc/transcode/html/import_ac3.html +share/doc/transcode/html/import_avi.html +share/doc/transcode/html/import_dv.html +share/doc/transcode/html/import_dvd.html +share/doc/transcode/html/import_mp3.html +share/doc/transcode/html/import_mpeg2.html +share/doc/transcode/html/import_mpeg3.html +share/doc/transcode/html/import_null.html +share/doc/transcode/html/import_nuv.html +share/doc/transcode/html/import_raw.html +share/doc/transcode/html/import_vob.html +share/doc/transcode/html/import_yuv4mpeg.html +share/doc/transcode/html/index.html +share/doc/transcode/html/intro.html +share/doc/transcode/html/mes0-00000.png +share/doc/transcode/html/mes4-00000.png +share/doc/transcode/html/mes5-00000.png +share/doc/transcode/html/mes6-00000.png +share/doc/transcode/html/mes7-00000.png +share/doc/transcode/html/misc.html +share/doc/transcode/html/modules.html +share/doc/transcode/html/mpeg.html +share/doc/transcode/html/new.png +share/doc/transcode/html/options.html +share/doc/transcode/html/other.html +share/doc/transcode/html/post.html +share/doc/transcode/html/pre.html +share/doc/transcode/html/sorry.html +share/doc/transcode/html/sub0-00000.png +share/doc/transcode/html/sub1-00000.png +share/doc/transcode/html/sub2-00000.png +share/doc/transcode/html/sub3-00000.png +share/doc/transcode/html/subtitles.html +share/doc/transcode/html/tc.png +share/doc/transcode/import-xml.txt +share/doc/transcode/import_nvrec.txt +share/doc/transcode/template.cfg.txt +@dirrm share/doc/transcode/html +@dirrm share/doc/transcode @dirrm lib/transcode -- cgit