ports/50377: maintainer-update: graphics/transcode
Hendrik Scholz
hendrik at scholz.net
Thu Mar 27 23:10:09 UTC 2003
>Number: 50377
>Category: ports
>Synopsis: maintainer-update: graphics/transcode
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Thu Mar 27 15:10:05 PST 2003
>Closed-Date:
>Last-Modified:
>Originator: Hendrik Scholz
>Release: FreeBSD 5.0-CURRENT i386
>Organization:
NetUSE AG
>Environment:
System: FreeBSD goanna.lan.raisdorf.net 5.0-CURRENT FreeBSD 5.0-CURRENT #3: Tue Mar 25 21:50:08 CET 2003 hscholz at goanna.lan.raisdorf.net:/usr/src/sys/i386/compile/GOANNA i386
>Description:
This update fixes many problems and depends on a NASM update needed for
the export_mpeg module. So apply ports/50373 before adding this.
Changes:
- update MASTER_SITES since the maintainer changed
- add %%WITH_NASM%% knob to Makefile and pkg-plist to honor WITH_NASM
option correctly. Attention: WITH_NASM gets set if bin/nasm is
found but this may not be enough for transcode as nasm >= 0.98.34
is needed. Checking for bin/nasm-0.98.35 might be a way of achieving
this but leads to more work when updating nasm itself.
- add WITH_SUBRIP knob suggested by Michael Nottebrock in
ports/47923 and implemented in ports/48649.
- incorporate dvd_reader.c patch by Atte Peltomaeki which has already
been added in ports/48649
- remove the transcode.c patch from ports/48649 since it made its way
into the main distribution
- add threading patch by Andriy Gapon in ports/48126
- pkg-plist update
Since this pr includes all patches previously sent and still open the
following problem reports can be closed in favour of this one:
- ports/47923: subripper patch
- ports/48126: threading patch
- ports/45829: former transcode update (outdated)
- ports/48649: another update which didn't make it into the tree
>How-To-Repeat:
>Fix:
--- transcode-0.6.4.diff begins here ---
diff -urP transcode-0.6.3/Makefile transcode/Makefile
--- transcode-0.6.3/Makefile Thu Mar 27 18:54:43 2003
+++ transcode/Makefile Thu Mar 27 22:30:23 2003
@@ -6,9 +6,10 @@
#
PORTNAME= transcode
-PORTVERSION= 0.6.3
+PORTVERSION= 0.6.4
CATEGORIES= graphics
-MASTER_SITES= http://www.theorie.physik.uni-goettingen.de/~ostreich/transcode/pre/
+MASTER_SITES= http://www.zebra.fh-weingarten.de/~transcode/pre/
+DISTNAME= ${PORTNAME}-${PORTVERSION}.20030325
MAINTAINER= hendrik at scholz.net
COMMENT= A text-console utility for video stream processing
@@ -89,7 +90,7 @@
WITH_OGG= yes
.endif
-.if exists(${LOCALBASE}/lib/liblavplay.so)
+.if exists(${LOCALBASE}/include/mjpegtools/yuv4mpeg.h)
WITH_MJPEG= yes
.endif
@@ -104,6 +105,9 @@
.if defined(WITH_NASM)
BUILD_DEPENDS+= ${LOCALBASE}/bin/nasm:${PORTSDIR}/devel/nasm
ONLY_FOR_ARCHS= i386
+PLIST_SUB+= WITH_NASM=""
+.else
+PLIST_SUB+= WITH_NASM="@comment"
.endif
.if defined(WITH_AVIFILE)
@@ -202,6 +206,12 @@
PLIST_SUB+= WITH_MJPEG="@comment "
.endif
+.if defined(WITH_SUBRIP)
+PLIST_SUB+= WITH_SUBRIP=""
+.else
+PLIST_SUB+= WITH_SUBRIP="@comment "
+.endif
+
pre-everything::
.if !defined(WITH_OPTIMIZED_CFLAGS)
@${ECHO_MSG}
@@ -273,7 +283,11 @@
.endif
.if !defined(WITH_MJPEG)
@${ECHO_MSG}
- @${ECHO_MSG} "You can enable support for the MJPEG toolkit by defining WITH_MJPEG"
+ @${ECHO_MSG} "You can enable support for the MJPEG toolkit by defining WITH_MJPEG."
+.endif
+.if !defined(WITH_SUBRIP)
+ @${ECHO_MSG}
+ @${ECHO_MSG} "You can enable compilation of subtitleripper by defining WITH_SUBRIP."
.endif
post-patch:
@@ -301,6 +315,12 @@
@${LN} -sf ${LOCALBASE}/lib/libxvidcore.so \
${PREFIX}/lib/transcode/libxvidcore.so
.endif
+
+.if defined(WITH_SUBRIP)
+ @cd ${WRKSRC}/contrib/subrip; ${GMAKE} clean all; \
+ ${INSTALL_PROGRAM} srttool subtitle2pgm subtitle2vobsub ${PREFIX}/bin
+.endif
+
@${RM} ${PREFIX}/lib/transcode/*.la
.include <bsd.port.post.mk>
diff -urP transcode-0.6.3/distinfo transcode/distinfo
--- transcode-0.6.3/distinfo Thu Mar 27 18:54:43 2003
+++ transcode/distinfo Thu Mar 27 18:58:21 2003
@@ -1 +1 @@
-MD5 (transcode-0.6.3.tar.gz) = 65f0982c73821add9b6b78b662496da0
+MD5 (transcode-0.6.4.20030325.tar.gz) = 8a635c3d262fcafe1055af440a964c1b
diff -urP transcode-0.6.3/files/patch-contrib:subrip:Makefile transcode/files/patch-contrib:subrip:Makefile
--- transcode-0.6.3/files/patch-contrib:subrip:Makefile Thu Jan 1 01:00:00 1970
+++ transcode/files/patch-contrib:subrip:Makefile Thu Mar 27 19:05:17 2003
@@ -0,0 +1,13 @@
+--- 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 -urP transcode-0.6.3/files/patch-dvdread:dvd_reader.c transcode/files/patch-dvdread:dvd_reader.c
--- transcode-0.6.3/files/patch-dvdread:dvd_reader.c Thu Jan 1 01:00:00 1970
+++ transcode/files/patch-dvdread:dvd_reader.c Thu Mar 27 19:05:17 2003
@@ -0,0 +1,19 @@
+--- 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 -urP transcode-0.6.3/files/patch-import:clone.c transcode/files/patch-import:clone.c
--- transcode-0.6.3/files/patch-import:clone.c Thu Jan 1 01:00:00 1970
+++ transcode/files/patch-import:clone.c Thu Mar 27 19:19:40 2003
@@ -0,0 +1,21 @@
+--- 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 -urP transcode-0.6.3/files/patch-import:ioaux.c transcode/files/patch-import:ioaux.c
--- transcode-0.6.3/files/patch-import:ioaux.c Thu Jan 1 01:00:00 1970
+++ transcode/files/patch-import:ioaux.c Thu Mar 27 19:22:27 2003
@@ -0,0 +1,35 @@
+--- 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 -urP transcode-0.6.3/pkg-plist transcode/pkg-plist
--- transcode-0.6.3/pkg-plist Thu Mar 27 18:54:43 2003
+++ transcode/pkg-plist Thu Mar 27 22:01:13 2003
@@ -2,6 +2,9 @@
bin/avimerge
bin/avisplit
bin/avisync
+%%WITH_SUBRIP%%bin/srttool
+%%WITH_SUBRIP%%bin/subtitle2pgm
+%%WITH_SUBRIP%%bin/subtitle2vobsub
bin/tccat
bin/tcdecode
bin/tcdemux
@@ -13,6 +16,7 @@
bin/transcode
%%WITH_LIBA52%%lib/transcode/a52_decore.so
lib/transcode/af6_decore.so
+lib/transcode/export_ac3.so
lib/transcode/export_af6.conf
%%WITH_AVIFILE%%lib/transcode/export_af6.so
lib/transcode/export_divx4.so
@@ -20,6 +24,7 @@
lib/transcode/export_divx5.so
lib/transcode/export_divx5raw.so
lib/transcode/export_ffmpeg.so
+lib/transcode/export_jpg.so
lib/transcode/export_lame.so
lib/transcode/export_sampeg.so
%%WITH_LIBDV%%lib/transcode/export_dv.so
@@ -27,7 +32,9 @@
%%WITH_FAME%%lib/transcode/export_fame.so
%%WITH_IMAGEMAGICK%%lib/transcode/export_im.so
%%WITH_MJPEG%%lib/transcode/export_mjpeg.so
-lib/transcode/export_mpeg.so
+%%WITH_NASM%%lib/transcode/export_mpeg.so
+lib/transcode/export_mpeg2enc.so
+lib/transcode/export_mp2enc.so
lib/transcode/export_net.so
lib/transcode/export_null.so
%%WITH_OGG%%lib/transcode/export_ogg.so
@@ -39,6 +46,7 @@
lib/transcode/export_xvid.so
lib/transcode/export_xvidcvs.so
lib/transcode/export_xvidraw.so
+lib/transcode/export_yuv4mpeg.so
lib/transcode/filter_29to23.so
lib/transcode/filter_32detect.so
lib/transcode/filter_32drop.so
@@ -88,7 +96,6 @@
%%WITH_IMAGEMAGICK%%lib/transcode/import_imlist.so
lib/transcode/import_ffmpeg.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
@@ -118,6 +125,7 @@
share/doc/transcode/export-API.txt
share/doc/transcode/filter_dnr.txt
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-API.txt
--- transcode-0.6.4.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list