mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-23 00:43:28 +00:00
Code Issues Releases Activity

- Fix MASTER_SITES

Browse Source 
- Support CC/CFLAGS properly

PR:		16674
Submitted by:	KATO Tsuguru <tkato@prontomail.ne.jp>
This commit is contained in:
Steve Price 2000-05-29 23:54:42 +00:00
parent 2b2f39c6e8
commit 1bdc5ad345
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=28962
10 changed files with 246 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
graphics/mplex/Makefile
View File

@ -8,14 +8,14 @@
PORTNAME= mplex
PORTVERSION= 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= ports@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>

14
graphics/mplex/files/patch-ab Normal file
View File

@ -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

22
graphics/mplex/files/patch-ac Normal file
View File

@ -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
}

64
graphics/mplex/files/patch-ad Normal file
View File

@ -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", &sector_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);

20
graphics/mplex/files/patch-ae Normal file
View File

@ -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);

6
multimedia/mplex/Makefile
View File

@ -8,14 +8,14 @@
PORTNAME= mplex
PORTVERSION= 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= ports@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>

14
multimedia/mplex/files/patch-ab Normal file
View File

@ -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

22
multimedia/mplex/files/patch-ac Normal file
View File

@ -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
}

64
multimedia/mplex/files/patch-ad Normal file
View File

@ -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", &sector_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);

20
multimedia/mplex/files/patch-ae Normal file
View File

@ -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);