mirror of
https://git.FreeBSD.org/ports.git
synced 2024-11-04 22:33:27 +00:00
259 lines
6.0 KiB
Plaintext
259 lines
6.0 KiB
Plaintext
|
diff -c -r ../splay-0.2-orig/Makefile ./Makefile
|
||
|
|
*** ../splay-0.2-orig/Makefile Sat Mar 15 00:00:00 1997
|
||
|
|
--- ./Makefile Wed Mar 19 19:19:58 1997
|
||
|
|
***************
|
||
|
|
*** 1,4 ****
|
||
|
|
! CC = gcc
|
||
|
|
#CC = pgcc
|
||
|
|
AR = ar
|
||
|
|
|
||
|
|
--- 1,4 ----
|
||
|
|
! CC = cc
|
||
|
|
#CC = pgcc
|
||
|
|
AR = ar
|
||
|
|
|
||
|
|
***************
|
||
|
|
*** 7,14 ****
|
||
|
|
WFLAGS = -Wstrict-prototypes -Wall
|
||
|
|
OFLAGS = -O2 -m486
|
||
|
|
#OFLAGS = -O6 -mpentium
|
||
|
|
! TFLAGS = -D_REENTRANT -DPTHREADEDMPEG
|
||
|
|
! TLIBFLAGS = -lpthread
|
||
|
|
CFLAGS = $(OFLAGS) $(WFLAGS) $(IFLAGS) $(DEBUG) $(TFLAGS)
|
||
|
|
OBJECTS = splay.o
|
||
|
|
LIBRARY = -lm $(TLIBFLAGS) \
|
||
|
|
--- 7,14 ----
|
||
|
|
WFLAGS = -Wstrict-prototypes -Wall
|
||
|
|
OFLAGS = -O2 -m486
|
||
|
|
#OFLAGS = -O6 -mpentium
|
||
|
|
! TFLAGS = #-D_REENTRANT -DPTHREADEDMPEG
|
||
|
|
! TLIBFLAGS = #-lpthread
|
||
|
|
CFLAGS = $(OFLAGS) $(WFLAGS) $(IFLAGS) $(DEBUG) $(TFLAGS)
|
||
|
|
OBJECTS = splay.o
|
||
|
|
LIBRARY = -lm $(TLIBFLAGS) \
|
||
|
|
diff -c -r ../splay-0.2-orig/bbitstream/Makefile ./bbitstream/Makefile
|
||
|
|
*** ../splay-0.2-orig/bbitstream/Makefile Sat Mar 15 00:00:00 1997
|
||
|
|
--- ./bbitstream/Makefile Wed Mar 19 19:17:17 1997
|
||
|
|
***************
|
||
|
|
*** 1,7 ****
|
||
|
|
! CC = gcc
|
||
|
|
#CC = pgcc
|
||
|
|
AR = ar
|
||
|
|
RM = \rm -f
|
||
|
|
|
||
|
|
OBJLIB = bbitstream.a
|
||
|
|
OBJECTS = input.o output.o
|
||
|
|
--- 1,8 ----
|
||
|
|
! CC = cc
|
||
|
|
#CC = pgcc
|
||
|
|
AR = ar
|
||
|
|
RM = \rm -f
|
||
|
|
+ RANLIB = ranlib
|
||
|
|
|
||
|
|
OBJLIB = bbitstream.a
|
||
|
|
OBJECTS = input.o output.o
|
||
|
|
***************
|
||
|
|
*** 21,27 ****
|
||
|
|
|
||
|
|
$(OBJLIB): $(OBJECTS)
|
||
|
|
$(RM) $(OBJLIB)
|
||
|
|
! $(AR) rcs $(OBJLIB) $(OBJECTS)
|
||
|
|
|
||
|
|
.cc.o :
|
||
|
|
$(CC) -c $(CFLAGS) -o $*.o $<
|
||
|
|
--- 22,29 ----
|
||
|
|
|
||
|
|
$(OBJLIB): $(OBJECTS)
|
||
|
|
$(RM) $(OBJLIB)
|
||
|
|
! $(AR) rc $(OBJLIB) $(OBJECTS)
|
||
|
|
! $(RANLIB) $(OBJLIB)
|
||
|
|
|
||
|
|
.cc.o :
|
||
|
|
$(CC) -c $(CFLAGS) -o $*.o $<
|
||
|
|
diff -c -r ../splay-0.2-orig/sound/Makefile ./sound/Makefile
|
||
|
|
*** ../splay-0.2-orig/sound/Makefile Sat Mar 15 00:00:00 1997
|
||
|
|
--- ./sound/Makefile Wed Mar 19 19:18:57 1997
|
||
|
|
***************
|
||
|
|
*** 1,7 ****
|
||
|
|
! CC = gcc
|
||
|
|
#CC = pgcc
|
||
|
|
AR = ar
|
||
|
|
RM = \rm -f
|
||
|
|
|
||
|
|
OBJLIB = mpegsound.a
|
||
|
|
OBJECTS = rawplayer.o wavetoraw.o \
|
||
|
|
--- 1,8 ----
|
||
|
|
! CC = cc
|
||
|
|
#CC = pgcc
|
||
|
|
AR = ar
|
||
|
|
RM = \rm -f
|
||
|
|
+ RANLIB = ranlib
|
||
|
|
|
||
|
|
OBJLIB = mpegsound.a
|
||
|
|
OBJECTS = rawplayer.o wavetoraw.o \
|
||
|
|
***************
|
||
|
|
*** 15,29 ****
|
||
|
|
DEBUG = -g
|
||
|
|
IFLAGS = -I../bbitstream/
|
||
|
|
AFLAGS = -malign-loops=2 -malign-jumps=2 -malign-functions=2
|
||
|
|
! TFLAGS = -D_REENTRANT -DPTHREADEDMPEG
|
||
|
|
! TLIBFLAGS = -lpthread
|
||
|
|
OFLAGS = -O3 -fomit-frame-pointer -fno-strength-reduce -m486 $(AFLAG)
|
||
|
|
#OFLAGS = -O6 -mpentium
|
||
|
|
WFLAGS = -Wstrict-prototypes -Wall
|
||
|
|
CFLAGS = $(DEBUG) $(IFLAGS) $(OFLAGS) $(WFLAGS) $(TFLAGS)
|
||
|
|
LIBS = $(OBJLIB) -lm $(TLIBFLAGS) ../bbitstream/bbitstream.a
|
||
|
|
|
||
|
|
! all: $(OBJLIB) test
|
||
|
|
|
||
|
|
clean:
|
||
|
|
$(RM) *.a test *.o *~
|
||
|
|
--- 16,30 ----
|
||
|
|
DEBUG = -g
|
||
|
|
IFLAGS = -I../bbitstream/
|
||
|
|
AFLAGS = -malign-loops=2 -malign-jumps=2 -malign-functions=2
|
||
|
|
! TFLAGS = #-D_REENTRANT -DPTHREADEDMPEG
|
||
|
|
! TLIBFLAGS = #-lpthread
|
||
|
|
OFLAGS = -O3 -fomit-frame-pointer -fno-strength-reduce -m486 $(AFLAG)
|
||
|
|
#OFLAGS = -O6 -mpentium
|
||
|
|
WFLAGS = -Wstrict-prototypes -Wall
|
||
|
|
CFLAGS = $(DEBUG) $(IFLAGS) $(OFLAGS) $(WFLAGS) $(TFLAGS)
|
||
|
|
LIBS = $(OBJLIB) -lm $(TLIBFLAGS) ../bbitstream/bbitstream.a
|
||
|
|
|
||
|
|
! all: $(OBJLIB) #test
|
||
|
|
|
||
|
|
clean:
|
||
|
|
$(RM) *.a test *.o *~
|
||
|
|
***************
|
||
|
|
*** 36,42 ****
|
||
|
|
|
||
|
|
$(OBJLIB): $(OBJECTS)
|
||
|
|
$(RM) $(OBJLIB)
|
||
|
|
! $(AR) rcs $(OBJLIB) $(OBJECTS)
|
||
|
|
|
||
|
|
.cc.o:
|
||
|
|
$(CC) -c $(CFLAGS) -o $*.o $<
|
||
|
|
--- 37,44 ----
|
||
|
|
|
||
|
|
$(OBJLIB): $(OBJECTS)
|
||
|
|
$(RM) $(OBJLIB)
|
||
|
|
! $(AR) rc $(OBJLIB) $(OBJECTS)
|
||
|
|
! $(RANLIB) $(OBJLIB)
|
||
|
|
|
||
|
|
.cc.o:
|
||
|
|
$(CC) -c $(CFLAGS) -o $*.o $<
|
||
|
|
***************
|
||
|
|
*** 54,57 ****
|
||
|
|
|
||
|
|
bitwindow.o : mpegsound.h bitwindow.cc
|
||
|
|
huffman.o : mpegsound.h huffman.cc
|
||
|
|
! huffmantable.o : mpegsound.h huffmantable.cc
|
||
|
|
--- 56,59 ----
|
||
|
|
|
||
|
|
bitwindow.o : mpegsound.h bitwindow.cc
|
||
|
|
huffman.o : mpegsound.h huffman.cc
|
||
|
|
! huffmantable.o : mpegsound.h huffmantable.cc
|
||
|
|
diff -c -r ../splay-0.2-orig/sound/mpegsound.h ./sound/mpegsound.h
|
||
|
|
*** ../splay-0.2-orig/sound/mpegsound.h Sat Mar 15 00:00:00 1997
|
||
|
|
--- ./sound/mpegsound.h Wed Mar 19 20:02:22 1997
|
||
|
|
***************
|
||
|
|
*** 11,17 ****
|
||
|
|
/* Inlcude default library packages */
|
||
|
|
/************************************/
|
||
|
|
#include <stdio.h>
|
||
|
|
! #include <malloc.h>
|
||
|
|
#include <unistd.h>
|
||
|
|
|
||
|
|
#ifdef PTHREADEDMPEG
|
||
|
|
--- 11,17 ----
|
||
|
|
/* Inlcude default library packages */
|
||
|
|
/************************************/
|
||
|
|
#include <stdio.h>
|
||
|
|
! #include <stdlib.h>
|
||
|
|
#include <unistd.h>
|
||
|
|
|
||
|
|
#ifdef PTHREADEDMPEG
|
||
|
|
diff -c -r ../splay-0.2-orig/sound/rawplayer.cc ./sound/rawplayer.cc
|
||
|
|
*** ../splay-0.2-orig/sound/rawplayer.cc Sat Mar 15 00:00:00 1997
|
||
|
|
--- ./sound/rawplayer.cc Wed Mar 19 19:16:56 1997
|
||
|
|
***************
|
||
|
|
*** 8,14 ****
|
||
|
|
|
||
|
|
#include <fcntl.h>
|
||
|
|
#include <sys/ioctl.h>
|
||
|
|
! #include <sys/soundcard.h>
|
||
|
|
|
||
|
|
#include "mpegsound.h"
|
||
|
|
|
||
|
|
--- 8,14 ----
|
||
|
|
|
||
|
|
#include <fcntl.h>
|
||
|
|
#include <sys/ioctl.h>
|
||
|
|
! #include <machine/soundcard.h>
|
||
|
|
|
||
|
|
#include "mpegsound.h"
|
||
|
|
|
||
|
|
diff -c -r ../splay-0.2-orig/sound/test.cc ./sound/test.cc
|
||
|
|
*** ../splay-0.2-orig/sound/test.cc Sat Mar 15 00:00:00 1997
|
||
|
|
--- ./sound/test.cc Wed Mar 19 19:18:03 1997
|
||
|
|
***************
|
||
|
|
*** 2,8 ****
|
||
|
|
|
||
|
|
#include <stdio.h>
|
||
|
|
#include <string.h>
|
||
|
|
! #include <getopt.h>
|
||
|
|
#include <unistd.h>
|
||
|
|
|
||
|
|
#include "mpegsound.h"
|
||
|
|
--- 2,8 ----
|
||
|
|
|
||
|
|
#include <stdio.h>
|
||
|
|
#include <string.h>
|
||
|
|
! //#include <getopt.h>
|
||
|
|
#include <unistd.h>
|
||
|
|
|
||
|
|
#include "mpegsound.h"
|
||
|
|
diff -c -r ../splay-0.2-orig/sound/wavetoraw.cc ./sound/wavetoraw.cc
|
||
|
|
*** ../splay-0.2-orig/sound/wavetoraw.cc Sat Mar 15 00:00:00 1997
|
||
|
|
--- ./sound/wavetoraw.cc Wed Mar 19 20:02:48 1997
|
||
|
|
***************
|
||
|
|
*** 5,11 ****
|
||
|
|
// Wavetoraw.cc
|
||
|
|
// Server which strips wave header.
|
||
|
|
|
||
|
|
! #include <malloc.h>
|
||
|
|
|
||
|
|
#include "mpegsound.h"
|
||
|
|
|
||
|
|
--- 5,11 ----
|
||
|
|
// Wavetoraw.cc
|
||
|
|
// Server which strips wave header.
|
||
|
|
|
||
|
|
! #include <stdlib.h>
|
||
|
|
|
||
|
|
#include "mpegsound.h"
|
||
|
|
|
||
|
|
diff -c -r ../splay-0.2-orig/splay.cc ./splay.cc
|
||
|
|
*** ../splay-0.2-orig/splay.cc Sat Mar 15 00:00:00 1997
|
||
|
|
--- ./splay.cc Wed Mar 19 19:20:52 1997
|
||
|
|
***************
|
||
|
|
*** 42,47 ****
|
||
|
|
--- 42,48 ----
|
||
|
|
return;
|
||
|
|
}
|
||
|
|
|
||
|
|
+ #ifdef PTHREADEDMPEG
|
||
|
|
void playingthread(Mpegfileplayer *player)
|
||
|
|
{
|
||
|
|
if(player->geterrorcode()>0)error(player->geterrorcode());
|
||
|
|
***************
|
||
|
|
*** 52,57 ****
|
||
|
|
--- 53,59 ----
|
||
|
|
if(player->geterrorcode()>0)error(player->geterrorcode());
|
||
|
|
}
|
||
|
|
}
|
||
|
|
+ #endif
|
||
|
|
|
||
|
|
void playing(Fileplayer *player)
|
||
|
|
{
|