diff --git a/multimedia/transcode/Makefile b/multimedia/transcode/Makefile index 063221497d75..7b5d3b097c31 100644 --- a/multimedia/transcode/Makefile +++ b/multimedia/transcode/Makefile @@ -6,10 +6,9 @@ # PORTNAME= transcode -PORTVERSION= 0.6.4 +PORTVERSION= 0.6.7 CATEGORIES= multimedia MASTER_SITES= http://www.zebra.fh-weingarten.de/~transcode/pre/ -DISTNAME= ${PORTNAME}-${PORTVERSION}.20030325 MAINTAINER= hendrik@scholz.net COMMENT= A text-console utility for video stream processing @@ -25,6 +24,7 @@ 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" +CONFIGURE_ARGS= --program-transform-name="" USE_REINPLACE= yes MAN1= avifix.1 avimerge.1 avisplit.1 avisync.1 tccat.1 tcdemux.1 \ @@ -93,6 +93,10 @@ WITH_OGG= yes WITH_MJPEG= yes .endif +.if exists(${LOCALBASE}/lib/liblzo.so) +WITH_LZO= yes +.endif + .if defined(WITH_IMAGEMAGICK) LIB_DEPENDS+= Magick.5:${PORTSDIR}/graphics/ImageMagick PLIST_SUB+= WITH_IMAGEMAGICK="" @@ -205,6 +209,13 @@ PLIST_SUB+= WITH_MJPEG="" PLIST_SUB+= WITH_MJPEG="@comment " .endif +.if defined(WITH_LZO) +LIB_DEPENDS+= lzo.1:${PORTSDIR}/archivers/lzo +PLIST_SUB+= WITH_LZO="" +.else +PLIST_SUB+= WITH_LZO="@comment " +.endif + .if defined(WITH_SUBRIP) PLIST_SUB+= WITH_SUBRIP="" .else @@ -280,6 +291,10 @@ pre-everything:: @${ECHO_MSG} @${ECHO_MSG} "You can enable libogg support by defining WITH_OGG." .endif +.if !defined(WITH_LZO) + @${ECHO_MSG} + @${ECHO_MSG} "You can enable liblzo support by defining WITH_LZO." +.endif .if !defined(WITH_MJPEG) @${ECHO_MSG} @${ECHO_MSG} "You can enable support for the MJPEG toolkit by defining WITH_MJPEG." diff --git a/multimedia/transcode/distinfo b/multimedia/transcode/distinfo index faff59120d2f..9691faecb82f 100644 --- a/multimedia/transcode/distinfo +++ b/multimedia/transcode/distinfo @@ -1 +1 @@ -MD5 (transcode-0.6.4.20030325.tar.gz) = 8a635c3d262fcafe1055af440a964c1b +MD5 (transcode-0.6.7.tar.gz) = 4bc8e2fe983cf0d9bf64892119228b95 diff --git a/multimedia/transcode/files/patch-bbmpeg:mplex.h b/multimedia/transcode/files/patch-bbmpeg:mplex.h deleted file mode 100644 index 01f870c6a162..000000000000 --- a/multimedia/transcode/files/patch-bbmpeg:mplex.h +++ /dev/null @@ -1,11 +0,0 @@ ---- bbmpeg/mplex.h.orig Thu Jan 30 19:26:07 2003 -+++ bbmpeg/mplex.h Thu Jan 30 19:26:18 2003 -@@ -50,6 +50,8 @@ - Definitionen - *************************************************************************/ - -+#include -+ - #define USER_DATA_START 0x000001b2 - #define SEQUENCE_HEADER 0x000001b3 - #define SEQUENCE_END 0x000001b7 diff --git a/multimedia/transcode/files/patch-contrib:subrip:Makefile b/multimedia/transcode/files/patch-contrib:subrip:Makefile deleted file mode 100644 index 461565adcdd8..000000000000 --- a/multimedia/transcode/files/patch-contrib:subrip:Makefile +++ /dev/null @@ -1,13 +0,0 @@ ---- contrib/subrip/Makefile.orig Wed Feb 5 02:23:45 2003 -+++ contrib/subrip/Makefile Wed Feb 5 02:23:56 2003 -@@ -8,8 +8,8 @@ - INCLUDES := - - ### enable ppm support ### --DEFINES += -D_HAVE_LIB_PPM_ --LIBS += -lppm -+#DEFINES += -D_HAVE_LIB_PPM_ -+#LIBS += -lppm - - ### enable zlib support ### - DEFINES += -D_HAVE_ZLIB_ diff --git a/multimedia/transcode/files/patch-dvdread:dvd_reader.c b/multimedia/transcode/files/patch-dvdread:dvd_reader.c deleted file mode 100644 index 623c2512ba73..000000000000 --- a/multimedia/transcode/files/patch-dvdread:dvd_reader.c +++ /dev/null @@ -1,19 +0,0 @@ ---- dvdread/dvd_reader.c.orig Wed Feb 19 10:27:09 2003 -+++ dvdread/dvd_reader.c Wed Feb 19 10:27:36 2003 -@@ -140,15 +140,7 @@ - dvdcss_error = (char* (*)(dvdcss_handle)) - dlsym( dvdcss_library, U_S "dvdcss_error" ); - -- if( dlsym( dvdcss_library, U_S "dvdcss_crack" ) ) { -- fprintf( stderr, "libdvdread: Old (pre-0.0.2) version of " -- "libdvdcss found.\n" -- "libdvdread: You should get the " -- "latest version from " -- "http://www.videolan.org/\n" ); -- dlclose( dvdcss_library ); -- dvdcss_library = 0; -- } else if( !dvdcss_open || !dvdcss_close || !dvdcss_seek || -+ if( !dvdcss_open || !dvdcss_close || !dvdcss_seek || - !dvdcss_title || !dvdcss_read || !dvdcss_error ) { - - fprintf( stderr, "libdvdread: Unknown incompatible version " diff --git a/multimedia/transcode/files/patch-ffmpeg:libavcodec:mem.c b/multimedia/transcode/files/patch-ffmpeg:libavcodec:mem.c deleted file mode 100644 index a82054ab658e..000000000000 --- a/multimedia/transcode/files/patch-ffmpeg:libavcodec:mem.c +++ /dev/null @@ -1,11 +0,0 @@ ---- ffmpeg/libavcodec/mem.c.orig Thu Jan 30 19:58:35 2003 -+++ ffmpeg/libavcodec/mem.c Thu Jan 30 19:58:45 2003 -@@ -18,7 +18,7 @@ - */ - #include "avcodec.h" - #ifdef HAVE_MALLOC_H --#include -+#include - #endif - - /* you can redefine av_malloc and av_free in your project to use your diff --git a/multimedia/transcode/files/patch-import:clone.c b/multimedia/transcode/files/patch-import:clone.c deleted file mode 100644 index 90bc190a4e8d..000000000000 --- a/multimedia/transcode/files/patch-import:clone.c +++ /dev/null @@ -1,21 +0,0 @@ ---- import/clone.c.orig Thu Mar 27 19:17:57 2003 -+++ import/clone.c Thu Mar 27 19:19:16 2003 -@@ -74,6 +74,8 @@ - perror("open file"); - return(-1); - } -+ fcntl(sfd, F_SETFD, FD_CLOEXEC); -+ - - if(verbose & TC_DEBUG) fprintf(stderr, "(%s) reading video frame sync data from %s\n", __FILE__, logfile); - -@@ -349,7 +351,8 @@ - if(verbose & TC_SYNC) fprintf(stderr, "READ (%d)\n", i); - - if((j=p_read(sfd, (char *) ptr->sync_info, sizeof(sync_info_t))) != sizeof(sync_info_t)) { -- -+ -+ if(j < 0) perror("p_read failed"); - if(verbose & TC_DEBUG) fprintf(stderr, "(%s) p_read error (%d/%d)\n", __FILE__, j, sizeof(sync_info_t)); - pthread_mutex_lock(&buffer_fill_lock); - clone_read_thread_flag=0; diff --git a/multimedia/transcode/files/patch-import:ioaux.c b/multimedia/transcode/files/patch-import:ioaux.c deleted file mode 100644 index c7d69cc3dcbf..000000000000 --- a/multimedia/transcode/files/patch-import:ioaux.c +++ /dev/null @@ -1,35 +0,0 @@ ---- import/ioaux.c.orig Thu Mar 27 19:14:55 2003 -+++ import/ioaux.c Thu Mar 27 19:17:21 2003 -@@ -36,8 +36,14 @@ - while (r < len) { - n = read (fd, buf + r, len - r); - -- if (n <= 0) -- return r; -+ if (n == 0) -+ break; -+ if (n < 0) { -+ if (errno == EINTR) -+ continue; -+ else -+ break; -+ } - r += n; - } - -@@ -51,9 +57,12 @@ - - while (r < len) { - n = write (fd, buf + r, len - r); -- if (n < 0) -- return n; -- -+ if (n < 0) { -+ if (errno == EINTR) -+ continue; -+ else -+ break; -+ } - r += n; - } - return r; diff --git a/multimedia/transcode/files/patch-libtool b/multimedia/transcode/files/patch-libtool index 01d2a2defb72..09726a809477 100644 --- a/multimedia/transcode/files/patch-libtool +++ b/multimedia/transcode/files/patch-libtool @@ -1,6 +1,6 @@ ---- libtool.orig Thu Oct 10 17:56:49 2002 -+++ libtool Mon Oct 28 21:56:19 2002 -@@ -2727,7 +2727,7 @@ +--- libtool.orig Sun Jun 1 11:30:47 2003 ++++ libtool Sun Jun 1 11:31:28 2003 +@@ -2730,7 +2730,7 @@ *-*-netbsd*) # Don't link with libc until the a.out ld.so is fixed. ;; @@ -9,11 +9,11 @@ # Do not include libc due to us having libc/libc_r. ;; *) -@@ -4496,10 +4496,12 @@ +@@ -4499,10 +4499,12 @@ fi # Install the pseudo-library for information purposes. -+ if /usr/bin/false; then ++ if /usr/bin/false ; then name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` instname="$dir/$name"i $show "$install_prog $instname $destdir/$name" diff --git a/multimedia/transcode/files/patch-src:filter:preview:display.h b/multimedia/transcode/files/patch-src:filter:preview:display.h deleted file mode 100644 index 907a66ab40cb..000000000000 --- a/multimedia/transcode/files/patch-src:filter:preview:display.h +++ /dev/null @@ -1,16 +0,0 @@ ---- 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 deleted file mode 100644 index 4b26f7234b1d..000000000000 --- a/multimedia/transcode/files/patch-src:filter:preview:filter_preview.h +++ /dev/null @@ -1,11 +0,0 @@ ---- 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/files/patch-src:filter:preview:pv.c b/multimedia/transcode/files/patch-src:filter:preview:pv.c deleted file mode 100644 index 8c74a4a84c6e..000000000000 --- a/multimedia/transcode/files/patch-src:filter:preview:pv.c +++ /dev/null @@ -1,29 +0,0 @@ ---- filter/preview/pv.c.orig Mon Nov 4 18:38:27 2002 -+++ filter/preview/pv.c Mon Nov 4 18:39:27 2002 -@@ -38,7 +38,7 @@ - #include - - #ifdef __FreeBSD__ /* We don't have on_exit() */ --dv_display_t *dv_dpy_on_exit_hack = NULL; -+xv_display_t *xv_dpy_on_exit_hack = NULL; - #endif - - #define XV_FORMAT_MASK 0x03 -@@ -128,7 +128,7 @@ - free(dv_dpy); - dv_dpy = NULL; - #ifdef __FreeBSD__ -- dv_dpy_on_exit_hack = NULL; -+ xv_dpy_on_exit_hack = NULL; - #endif - } // xv_display_exit - -@@ -536,7 +536,7 @@ - } - - #ifdef __FreeBSD__ -- dv_dpy_on_exit_hack = dv_dpy; -+ xv_dpy_on_exit_hack = dv_dpy; - atexit(xv_display_on_exit_hack_handler); - #else - on_exit(xv_display_exit_handler, dv_dpy); diff --git a/multimedia/transcode/files/patch-src:filter:subtitler:frame_list.c b/multimedia/transcode/files/patch-src:filter:subtitler:frame_list.c deleted file mode 100644 index e4823a2b8dad..000000000000 --- a/multimedia/transcode/files/patch-src:filter:subtitler:frame_list.c +++ /dev/null @@ -1,13 +0,0 @@ ---- filter/subtitler/frame_list.c.orig Thu May 23 10:53:06 2002 -+++ filter/subtitler/frame_list.c Thu May 23 10:53:34 2002 -@@ -33,8 +33,8 @@ - - char *strsave(char *s) /*save char array s somewhere*/ - { --char *p, *malloc(); --if(p = malloc( strlen(s) + 1) ) strcpy(p, s); -+char *p; -+if(p = (char *)malloc( strlen(s) + 1) ) strcpy(p, s); - return(p); - } - diff --git a/multimedia/transcode/pkg-plist b/multimedia/transcode/pkg-plist index 93622a11a60c..63c4951d0d1d 100644 --- a/multimedia/transcode/pkg-plist +++ b/multimedia/transcode/pkg-plist @@ -13,6 +13,7 @@ bin/tcmodinfo bin/tcmplex bin/tcprobe bin/tcscan +bin/tcxmlcheck bin/transcode %%WITH_LIBA52%%lib/transcode/a52_decore.so lib/transcode/af6_decore.so @@ -29,6 +30,7 @@ lib/transcode/export_lame.so lib/transcode/export_sampeg.so %%WITH_LIBDV%%lib/transcode/export_dv.so %%WITH_LIBDV%%lib/transcode/export_dvraw.so +%%WITH_LZO%%lib/transcode/export_lzo.so %%WITH_FAME%%lib/transcode/export_fame.so %%WITH_IMAGEMAGICK%%lib/transcode/export_im.so lib/transcode/export_mjpeg.so @@ -53,11 +55,13 @@ lib/transcode/filter_32drop.so lib/transcode/filter_aclip.so lib/transcode/filter_astat.so lib/transcode/filter_clone.so +lib/transcode/filter_cpaudio.so lib/transcode/filter_cshift.so lib/transcode/filter_cut.so lib/transcode/filter_decimate.so lib/transcode/filter_dilyuvmmx.so lib/transcode/filter_divxkey.so +lib/transcode/filter_doublefps.so lib/transcode/filter_dnr.so lib/transcode/filter_extsub.so lib/transcode/filter_extsub2.so @@ -66,6 +70,7 @@ lib/transcode/filter_invert.so lib/transcode/filter_ivtc.so %%WITH_IMAGEMAGICK%%lib/transcode/filter_logo.so %%WITH_IMAGEMAGICK%%lib/transcode/filter_logoaway.so +lib/transcode/filter_lowpass.so lib/transcode/filter_mask.so lib/transcode/filter_normalize.so lib/transcode/filter_null.so @@ -75,7 +80,7 @@ lib/transcode/filter_resample.so lib/transcode/filter_skip.so lib/transcode/filter_smartdeinter.so lib/transcode/filter_smooth.so -lib/transcode/filter_subtitler.so +%%WITH_SUBRIP%%lib/transcode/filter_subtitler.so lib/transcode/filter_tc_audio.so lib/transcode/filter_tc_video.so lib/transcode/filter_test.so @@ -97,6 +102,7 @@ lib/transcode/import_dvd.so %%WITH_IMAGEMAGICK%%lib/transcode/import_imlist.so lib/transcode/import_ffmpeg.so lib/transcode/import_lav.so +%%WITH_LZO%%lib/transcode/import_lzo.so lib/transcode/import_mpeg2.so %%WITH_LAME%%lib/transcode/import_mp3.so lib/transcode/import_mplayer.so @@ -113,15 +119,16 @@ lib/transcode/import_vob.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 -lib/transcode/libioaux.so +share/doc/transcode/README.Inverse.Telecine.txt share/doc/transcode/README.cluster share/doc/transcode/README.rip share/doc/transcode/README.sync share/doc/transcode/README.vcd +share/doc/transcode/OPTIMIZERS share/doc/transcode/clone.txt +share/doc/transcode/export_ffmpeg.txt share/doc/transcode/export_mpeg.txt share/doc/transcode/export-API.txt share/doc/transcode/filter_dnr.txt @@ -129,6 +136,7 @@ share/doc/transcode/filter_logo.txt share/doc/transcode/filter_logoaway.txt share/doc/transcode/filter_yuvdenoise.txt share/doc/transcode/filter-socket.txt +share/doc/transcode/filter_text.txt share/doc/transcode/filter-API.txt share/doc/transcode/html/about.html share/doc/transcode/html/anim.html