Date: Sun, 13 Feb 2000 07:38:20 +0900 From: tkato@prontomail.ne.jp To: FreeBSD-gnats-submit@freebsd.org Subject: ports/16674: Update port: graphics/mplex Message-ID: <BA1CEF15431E3D11787300807CFDCBC0@tkato.prontomail.ne.jp>
next in thread | raw e-mail | index | archive | help
>Number: 16674 >Category: ports >Synopsis: Update port: graphics/mplex >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sat Feb 12 14:50:06 PST 2000 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: FreeBSD 3.4-RELEASE i386 >Organization: >Environment: >Description: - Fix MASTER_SITES - Support CC/CFLAGS properly New file: patches/patch-ab patches/patch-ac patches/patch-ad patches/patch-ae Remove file: patches/patch-aa >How-To-Repeat: >Fix: diff -urN /usr/ports/graphics/mplex/Makefile graphics/mplex/Makefile --- /usr/ports/graphics/mplex/Makefile Wed Aug 25 19:16:19 1999 +++ graphics/mplex/Makefile Fri Feb 11 09:47:39 2000 @@ -1,7 +1,7 @@ -# New ports collection makefile for: mplex -# Version required: 1.1 -# Date created: Wed Jul 31 20:54:54 CDT 1996 -# Whom: erich@FreeBSD.org +# New ports collection makefile for: mplex +# Version required: 1.1 +# Date created: Wed Jul 31 20:54:54 CDT 1996 +# Whom: erich@FreeBSD.org # # $FreeBSD: ports/graphics/mplex/Makefile,v 1.5 1999/08/25 06:14:31 obrien Exp $ # @@ -9,14 +9,14 @@ DISTNAME= mplex-1.1 CATEGORIES= graphics -MASTER_SITES= ftp://ftp.informatik.tu-muenchen.de/pub/comp/graphics/mpeg/mplex/ +MASTER_SITES= ftp://ftp.leo.org/pub/comp/general/graphics/mpeg/mplex/ MAINTAINER= erich@FreeBSD.org MAN1= mplex.1 do-install: - @${INSTALL_PROGRAM} ${WRKSRC}/mplex ${PREFIX}/bin - @${INSTALL_MAN} ${FILESDIR}/mplex.1 ${PREFIX}/man/man1 + ${INSTALL_PROGRAM} ${WRKSRC}/mplex ${PREFIX}/bin + ${INSTALL_MAN} ${FILESDIR}/mplex.1 ${PREFIX}/man/man1 .include <bsd.port.mk> diff -urN /usr/ports/graphics/mplex/patches/patch-aa graphics/mplex/patches/patch-aa --- /usr/ports/graphics/mplex/patches/patch-aa Mon Aug 24 19:17:12 1998 +++ graphics/mplex/patches/patch-aa Thu Jan 1 09:00:00 1970 @@ -1,98 +0,0 @@ -Only in /src/build/Mpeg/mplex-1.1: TAGS -diff -ru ./inptstrm.c /src/build/Mpeg/mplex-1.1/inptstrm.c ---- ./inptstrm.c Wed May 31 08:04:11 1995 -+++ /src/build/Mpeg/mplex-1.1/inptstrm.c Wed Apr 3 17:25:49 1996 -@@ -310,7 +310,9 @@ - fclose (info_file); - output_info_video (video_info); - -+#if 0 - ask_continue (); -+#endif - } - - /************************************************************************* -@@ -565,7 +567,9 @@ - close_bit_stream_r (&audio_bs); - fclose (info_file); - output_info_audio (audio_info); -+#if 0 - ask_continue (); -+#endif - - } - -Only in /src/build/Mpeg/mplex-1.1: mplex.core -diff -ru ./multplex.c /src/build/Mpeg/mplex-1.1/multplex.c ---- ./multplex.c Tue Jun 6 07:16:52 1995 -+++ /src/build/Mpeg/mplex-1.1/multplex.c Wed Apr 3 17:23:53 1996 -@@ -129,21 +129,28 @@ - picture_start = TRUE; - } - -+#ifdef ASK_FOR_PARAMS - printf("\nMerging elementary streams to MPEG/SYSTEMS multiplexed stream.\n"); - printf("\n+------------------ MPEG/SYSTEMS INFORMATION -----------------+\n"); -- -+ - do -+ - { - printf ("\nsector size (CD-ROM 2324 bytes) : "); - scanf ("%ld", §or_size); - } while (sector_size>MAX_SECTOR_SIZE); -- - printf ("packs to packets ratio 1 : "); - scanf ("%ld", &packets_per_pack); - printf ("\nSTD video buffer in kB (CSPS: max 46 kB) : "); - scanf ("%ld", &video_buffer_size); - printf ("STD audio buffer in kB (CSPS: max 4 kB) : "); - scanf ("%ld", &audio_buffer_size); -+#else -+ sector_size=2324; -+ packets_per_pack=1; -+ video_buffer_size=46; -+ audio_buffer_size=4; -+#endif - - write_pack = packets_per_pack; - video_buffer_size *= 1024; -@@ -197,6 +204,7 @@ - (double)(packets_per_pack-1.))) / (double)(packets_per_pack) ); - data_rate = ceil(dmux_rate/50.)*50; - -+#ifdef ASK_FOR_PARAMS - printf ("\ncomputed multiplexed stream data rate : %7.3f\n",dmux_rate); - printf ("target data rate (e.g. %6u) : ",data_rate); - scanf ("%lf", &dmux_rate); -@@ -206,12 +214,22 @@ - scanf ("%u", &video_delay_ms); - printf ("audio stream startup offset (ms) : "); - scanf ("%u", &audio_delay_ms); -+#else -+ dmux_rate=data_rate; -+ sectors_delay=0; -+ video_delay_ms=0; -+ audio_delay_ms=0; -+#endif - - video_delay = (double)video_delay_ms*(double)(CLOCKS/1000); - audio_delay = (double)audio_delay_ms*(double)(CLOCKS/1000); - -+#ifdef ASK_FOR_PARAMS - verbose=ask_verbose(); - printf ("\n"); -+#else -+ verbose=1; -+#endif - - #ifdef TIMER - gettimeofday (&tp_global_start,NULL); ---- Makefile.orig Thu Aug 1 10:02:56 1996 -+++ Makefile Thu Aug 1 10:02:39 1996 -@@ -19,6 +19,6 @@ - - #CFLAGS = -g - --CFLAGS = -O -+CFLAGS?= -O diff -urN /usr/ports/graphics/mplex/patches/patch-ab graphics/mplex/patches/patch-ab --- /usr/ports/graphics/mplex/patches/patch-ab Thu Jan 1 09:00:00 1970 +++ graphics/mplex/patches/patch-ab Fri Feb 11 09:53:53 2000 @@ -0,0 +1,14 @@ +--- Makefile.orig Tue Apr 11 16:46:13 1995 ++++ Makefile Fri Feb 11 09:53:49 2000 +@@ -19,9 +19,9 @@ + + #CFLAGS = -g + +-CFLAGS = -O ++CFLAGS?= -O + LDFLAGS= -lm +-CC = cc ++CC ?= cc + RM = /bin/rm -f + + OBJS = main.o bitstrm.o buffer.o inits.o inptstrm.o interact.o multplex.o systems.o timecode.o diff -urN /usr/ports/graphics/mplex/patches/patch-ac graphics/mplex/patches/patch-ac --- /usr/ports/graphics/mplex/patches/patch-ac Thu Jan 1 09:00:00 1970 +++ graphics/mplex/patches/patch-ac Fri Feb 11 09:53:12 2000 @@ -0,0 +1,22 @@ +--- inptstrm.c.orig Wed May 31 22:04:11 1995 ++++ inptstrm.c Fri Feb 11 09:52:17 2000 +@@ -310,7 +310,9 @@ + fclose (info_file); + output_info_video (video_info); + ++#if 0 + ask_continue (); ++#endif + } + + /************************************************************************* +@@ -565,7 +567,9 @@ + close_bit_stream_r (&audio_bs); + fclose (info_file); + output_info_audio (audio_info); ++#if 0 + ask_continue (); ++#endif + + } + diff -urN /usr/ports/graphics/mplex/patches/patch-ad graphics/mplex/patches/patch-ad --- /usr/ports/graphics/mplex/patches/patch-ad Thu Jan 1 09:00:00 1970 +++ graphics/mplex/patches/patch-ad Fri Feb 11 09:53:22 2000 @@ -0,0 +1,64 @@ +--- multplex.c.orig Tue Jun 6 21:16:52 1995 ++++ multplex.c Fri Feb 11 09:52:17 2000 +@@ -129,21 +129,28 @@ + picture_start = TRUE; + } + ++#ifdef ASK_FOR_PARAMS + printf("\nMerging elementary streams to MPEG/SYSTEMS multiplexed stream.\n"); + printf("\n+------------------ MPEG/SYSTEMS INFORMATION -----------------+\n"); +- ++ + do ++ + { + printf ("\nsector size (CD-ROM 2324 bytes) : "); + scanf ("%ld", §or_size); + } while (sector_size>MAX_SECTOR_SIZE); +- + printf ("packs to packets ratio 1 : "); + scanf ("%ld", &packets_per_pack); + printf ("\nSTD video buffer in kB (CSPS: max 46 kB) : "); + scanf ("%ld", &video_buffer_size); + printf ("STD audio buffer in kB (CSPS: max 4 kB) : "); + scanf ("%ld", &audio_buffer_size); ++#else ++ sector_size=2324; ++ packets_per_pack=1; ++ video_buffer_size=46; ++ audio_buffer_size=4; ++#endif + + write_pack = packets_per_pack; + video_buffer_size *= 1024; +@@ -197,6 +204,7 @@ + (double)(packets_per_pack-1.))) / (double)(packets_per_pack) ); + data_rate = ceil(dmux_rate/50.)*50; + ++#ifdef ASK_FOR_PARAMS + printf ("\ncomputed multiplexed stream data rate : %7.3f\n",dmux_rate); + printf ("target data rate (e.g. %6u) : ",data_rate); + scanf ("%lf", &dmux_rate); +@@ -206,12 +214,22 @@ + scanf ("%u", &video_delay_ms); + printf ("audio stream startup offset (ms) : "); + scanf ("%u", &audio_delay_ms); ++#else ++ dmux_rate=data_rate; ++ sectors_delay=0; ++ video_delay_ms=0; ++ audio_delay_ms=0; ++#endif + + video_delay = (double)video_delay_ms*(double)(CLOCKS/1000); + audio_delay = (double)audio_delay_ms*(double)(CLOCKS/1000); + ++#ifdef ASK_FOR_PARAMS + verbose=ask_verbose(); + printf ("\n"); ++#else ++ verbose=1; ++#endif + + #ifdef TIMER + gettimeofday (&tp_global_start,NULL); diff -urN /usr/ports/graphics/mplex/patches/patch-ae graphics/mplex/patches/patch-ae --- /usr/ports/graphics/mplex/patches/patch-ae Thu Jan 1 09:00:00 1970 +++ graphics/mplex/patches/patch-ae Fri Feb 11 10:04:13 2000 @@ -0,0 +1,20 @@ +--- interact.c.orig Wed May 31 20:18:33 1995 ++++ interact.c Fri Feb 11 10:04:07 2000 +@@ -67,7 +67,7 @@ + char input[20]; + + printf ("\nContinue processing (y/n) : "); +- do gets (input); ++ do fgets (input, sizeof(input), stdin); + while (input[0]!='N'&&input[0]!='n'&&input[0]!='y'&&input[0]!='Y'); + + if (input[0]=='N' || input[0]=='n') +@@ -92,7 +92,7 @@ + char input[20]; + + printf ("\nVery verbose mode (y/n) : "); +- do gets (input); ++ do fgets (input, sizeof(input), stdin); + while (input[0]!='N'&&input[0]!='n'&&input[0]!='y'&&input[0]!='Y'); + + if (input[0]=='N' || input[0]=='n') return (FALSE); else return (TRUE); Sent by Japanese ProntoMail >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?BA1CEF15431E3D11787300807CFDCBC0>