Import new "mplex" package:

Multiplexes MPEG component streams into system layers

This package is based on the package contributed by
<collver@linuxfreemail.com> in PR pkg/14030.

9 files changed, 213 insertions, 0 deletions

diff --git a/graphics/mplex/Makefile b/graphics/mplex/Makefile
new file mode 100644
index 00000000000..d2df90622fb
--- /dev/null
+++ b/graphics/mplex/Makefile
@@ -0,0 +1,17 @@
+# $NetBSD: Makefile,v 1.1.1.1 2001/09/23 20:37:35 tron Exp $
+
+DISTNAME=	mplex-1.1
+CATEGORIES=	graphics
+MASTER_SITES=	ftp://ftp.leo.org/pub/comp/general/graphics/mpeg/mplex/
+
+MAINTAINER=	collver@linuxfreemail.com
+COMMENT=	Multiplexes MPEG component streams into system layers
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/mplex ${PREFIX}/bin
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/mplex
+	for FILE in COPYING INSTRUCT README; do \
+	  ${INSTALL_DATA} ${WRKSRC}/$$FILE ${PREFIX}/share/doc/mplex; \
+	done
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/mplex/distinfo b/graphics/mplex/distinfo
new file mode 100644
index 00000000000..22e37a6232e
--- /dev/null
+++ b/graphics/mplex/distinfo
@@ -0,0 +1,9 @@
+$NetBSD: distinfo,v 1.1.1.1 2001/09/23 20:37:35 tron Exp $
+
+SHA1 (mplex-1.1.tar.gz) = 7ec708cc6b00d6e8e8f897bce964588132ec14ad
+Size (mplex-1.1.tar.gz) = 34902 bytes
+SHA1 (patch-ab) = 5e0e2f25d101bb746cb06e3e17e7c8e63611cc84
+SHA1 (patch-ac) = 11af0e69112c8090db4d0c31b8dc55c2381b0c05
+SHA1 (patch-ad) = efc9107ddb55e610d4f1207a9cf3e4e4b7b86e99
+SHA1 (patch-ae) = 599b4ad7fbd01db6ab2b4f79dfdd5e450b8f02de
+SHA1 (patch-af) = 61736884ba8d487baf8606e639d95c22642d4395
diff --git a/graphics/mplex/patches/patch-ab b/graphics/mplex/patches/patch-ab
new file mode 100644
index 00000000000..5643458ec58
--- /dev/null
+++ b/graphics/mplex/patches/patch-ab
@@ -0,0 +1,19 @@
+$NetBSD: patch-ab,v 1.1.1.1 2001/09/23 20:37:35 tron Exp $
+
+--- Makefile.orig	Tue Apr 11 00:46:13 1995
++++ Makefile
+@@ -19,10 +19,12 @@
+ 
+ #CFLAGS =  -g
+ 
+-CFLAGS =  -O
++CFLAGS?=  -O
+ LDFLAGS=  -lm
+-CC     =  cc
++CC     ?=  cc
+ RM     =  /bin/rm -f
++
++CFLAGS+= -DTIMER
+ 
+ OBJS = main.o bitstrm.o buffer.o inits.o inptstrm.o interact.o multplex.o systems.o timecode.o
+ 
diff --git a/graphics/mplex/patches/patch-ac b/graphics/mplex/patches/patch-ac
new file mode 100644
index 00000000000..a7a96917c8d
--- /dev/null
+++ b/graphics/mplex/patches/patch-ac
@@ -0,0 +1,26 @@
+$NetBSD: patch-ac,v 1.1.1.1 2001/09/23 20:37:35 tron Exp $
+
+--- inptstrm.c.orig	Wed May 31 06:04:11 1995
++++ inptstrm.c
+@@ -1,4 +1,5 @@
+ #include "main.h"
++extern int Interactive;
+ /*************************************************************************
+     MPEG Streams Kontrolle
+ 
+@@ -310,6 +311,7 @@
+     fclose (info_file);
+     output_info_video (video_info);
+ 
++  if( Interactive )
+     ask_continue ();
+ }
+ 
+@@ -565,6 +567,7 @@
+     close_bit_stream_r (&audio_bs);
+     fclose (info_file);
+     output_info_audio (audio_info);
++  if( Interactive )
+     ask_continue ();
+ 
+ }
diff --git a/graphics/mplex/patches/patch-ad b/graphics/mplex/patches/patch-ad
new file mode 100644
index 00000000000..bd3932b9339
--- /dev/null
+++ b/graphics/mplex/patches/patch-ad
@@ -0,0 +1,61 @@
+$NetBSD: patch-ad,v 1.1.1.1 2001/09/23 20:37:35 tron Exp $
+
+--- multplex.c.orig	Tue Jun  6 05:16:52 1995
++++ multplex.c
+@@ -1,4 +1,5 @@
+ #include "main.h"
++extern int Interactive;
+ #ifdef TIMER
+     extern long total_sec;
+     extern long total_usec;
+@@ -129,6 +130,7 @@
+ 	picture_start = TRUE;
+     }
+ 
++if( Interactive ) {
+ printf("\nMerging elementary streams to MPEG/SYSTEMS multiplexed stream.\n");
+ printf("\n+------------------ MPEG/SYSTEMS INFORMATION -----------------+\n");
+     
+@@ -144,6 +146,12 @@
+     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;
++}
+ 
+     write_pack = packets_per_pack;
+     video_buffer_size *= 1024;
+@@ -197,6 +205,7 @@
+ 		 (double)(packets_per_pack-1.))) / (double)(packets_per_pack) );
+     data_rate = ceil(dmux_rate/50.)*50;
+ 
++if( Interactive ) {
+     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 +215,21 @@
+     scanf  ("%u", &video_delay_ms);
+     printf ("audio stream startup offset (ms)         : ");
+     scanf  ("%u", &audio_delay_ms);
++} else {
++    dmux_rate=data_rate;
++    sectors_delay=8;
++    video_delay_ms=0;
++    audio_delay_ms=0;
++}
+ 
+     video_delay = (double)video_delay_ms*(double)(CLOCKS/1000);
+     audio_delay = (double)audio_delay_ms*(double)(CLOCKS/1000);
+ 
++if( Interactive ) {
+     verbose=ask_verbose();
+     printf ("\n");
++} else
++    verbose=1;
+ 
+ #ifdef TIMER
+     gettimeofday (&tp_global_start,NULL);
diff --git a/graphics/mplex/patches/patch-ae b/graphics/mplex/patches/patch-ae
new file mode 100644
index 00000000000..7c6bee094f7
--- /dev/null
+++ b/graphics/mplex/patches/patch-ae
@@ -0,0 +1,22 @@
+$NetBSD: patch-ae,v 1.1.1.1 2001/09/23 20:37:35 tron Exp $
+
+--- interact.c.orig	Wed May 31 04:18:33 1995
++++ interact.c
+@@ -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);
diff --git a/graphics/mplex/patches/patch-af b/graphics/mplex/patches/patch-af
new file mode 100644
index 00000000000..da9266d138a
--- /dev/null
+++ b/graphics/mplex/patches/patch-af
@@ -0,0 +1,36 @@
+$NetBSD: patch-af,v 1.1.1.1 2001/09/23 20:37:35 tron Exp $
+
+--- main.c.orig	Wed Apr  5 01:51:53 1995
++++ main.c
+@@ -59,6 +59,7 @@
+ *************************************************************************/
+ 
+ #include "main.h"
++#include <unistd.h>
+ 
+ /*************************************************************************
+     Main
+@@ -75,6 +76,8 @@
+     struct timeval  tp_global_end;
+ #endif
+ 
++int Interactive=0;
++
+ int main (argc, argv)
+ 
+ int argc;
+@@ -93,6 +96,14 @@
+     unsigned int which_streams=0;
+     double	startup_delay=0;
+ 
++    int tmp;
++
++    if( getopt( argc, argv, "i" ) == 'i' )
++      Interactive=1;
++
++    optind -= 1;
++    argc -= optind;
++    argv += optind;
+ 
+     intro (argc);
+     check_files (argc, argv, &audio_file, &video_file, &multi_file,
diff --git a/graphics/mplex/pkg/DESCR b/graphics/mplex/pkg/DESCR
new file mode 100644
index 00000000000..cb425039c23
--- /dev/null
+++ b/graphics/mplex/pkg/DESCR
@@ -0,0 +1,17 @@
+The mplex multiplexes MPEG audio and video streams into system layers.
+
+From INSTRUCT (in the mplex source):
+>
+> Please note that I do not have a comprehensive instruction manual for this
+> release. I suggest you try the program out with some default values and
+> learn something more about ISO/IEC 11172-1 (aka MPEG1/Systems).
+>
+>
+> Christoph.
+> moar@heaven.zfe.siemens.de
+> +---------------------------------------+--------------------------------+
+> | http://www.informatik.tu-muenchen.de/ |                 Christoph Moar |
+> | cgi-bin/nph-gateway/hphalle6/~moar/   |                Kaulbachstr.29a |
+> | index.html                            |                   80539 Munich |
+> | email:moar@informatik.tu-muenchen.de  |   voice: ++49 - 89 -  23862874 |
+> +---------------------------------------+--------------------------------+
diff --git a/graphics/mplex/pkg/PLIST b/graphics/mplex/pkg/PLIST
new file mode 100644
index 00000000000..eb3dd284ac2
--- /dev/null
+++ b/graphics/mplex/pkg/PLIST
@@ -0,0 +1,6 @@
+@comment $NetBSD: PLIST,v 1.1.1.1 2001/09/23 20:37:35 tron Exp $
+bin/mplex
+share/doc/mplex/COPYING
+share/doc/mplex/INSTRUCT
+share/doc/mplex/README
+@dirrm share/doc/mplex