diff options
Diffstat (limited to 'multimedia/mpegedit')
25 files changed, 0 insertions, 820 deletions
diff --git a/multimedia/mpegedit/Makefile b/multimedia/mpegedit/Makefile deleted file mode 100644 index 975422aac4d1..000000000000 --- a/multimedia/mpegedit/Makefile +++ /dev/null @@ -1,31 +0,0 @@ -# New ports collection makefile for: mpegedit -# Date created: Thu Aug 1 10:50:57 CDT 1996 -# Whom: erich@FreeBSD.org -# -# $FreeBSD$ -# - -PORTNAME= mpegedit -PORTVERSION= 2.2 -CATEGORIES= graphics -MASTER_SITES= http://www.netsw.org/graphic/movie/mpeg/mpegedit/ -DISTNAME= ${PORTNAME}_v${PORTVERSION} - -MAINTAINER= ports@FreeBSD.org - -LIB_DEPENDS= pnm.1:${PORTSDIR}/graphics/netpbm - -USE_X_PREFIX= yes - -post-extract: - @find ${WRKSRC} -name '.depend' | xargs ${RM} -f - -do-install: - @${INSTALL_PROGRAM} ${WRKSRC}/mpeg_edit ${PREFIX}/bin -.if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} - @${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR} - @${INSTALL_DATA} ${WRKSRC}/manual.ps ${DOCSDIR} -.endif - -.include <bsd.port.mk> diff --git a/multimedia/mpegedit/distinfo b/multimedia/mpegedit/distinfo deleted file mode 100644 index 7d1307bf1c7c..000000000000 --- a/multimedia/mpegedit/distinfo +++ /dev/null @@ -1 +0,0 @@ -MD5 (mpegedit_v2.2.tar.gz) = 00f7dd986f4bcdccf20f6f4cf59d7f4c diff --git a/multimedia/mpegedit/files/patch-ac b/multimedia/mpegedit/files/patch-ac deleted file mode 100644 index 231ee33b70e4..000000000000 --- a/multimedia/mpegedit/files/patch-ac +++ /dev/null @@ -1,47 +0,0 @@ ---- editor/2x2_window.C.orig Mon May 8 16:08:35 1995 -+++ editor/2x2_window.C Thu Feb 3 21:24:19 2000 -@@ -25,6 +25,8 @@ - #include <iostream.h> - #include <stdlib.h> - -+extern "C" int XShmGetEventBase(Display *); -+ - DblWindow::DblWindow(UI_Globals *parent, world_c x, world_c y, - unsigned int height, unsigned int width, void (*cb)(void) ) - : YUV_Window(parent,x,y,height*2,width*2,this, ButtonPressMask | -@@ -139,7 +141,7 @@ - - ximage = XCreateImage(DispPointer(),None,8,ZPixmap,0,&dummy,width*2, - height*2,8,0); -- ximage->data = new byte[ximage->bytes_per_line*height*2]; -+ ximage->data = (char *) new byte[ximage->bytes_per_line*height*2]; - assert(ximage->data!=NULL); - - #ifdef SH_MEM -@@ -160,7 +162,7 @@ - for(int j = 0; j < ncolors; j ++) - { - tmp_pixel = col_array[j]; -- XFreeColors(DispPointer(), Colourmap, &tmp_pixel, 1, 0); -+ XFreeColors(DispPointer(), Colourmap, (long unsigned int *) &tmp_pixel, 1, 0); - } - - #ifdef SH_MEM -@@ -259,7 +261,7 @@ - for(int j = 0; j < i; j ++) - { - tmp_pixel = col_array[j]; -- XFreeColors(DispPointer(), Colourmap, &tmp_pixel, 1, 0); -+ XFreeColors(DispPointer(), Colourmap, (long unsigned int *) &tmp_pixel, 1, 0); - } - cerr << "Unable to allocate the colours required to make the\n" - << "colour window. Please re-run with the option -private cols\n"; -@@ -363,7 +365,7 @@ - { - assert(Frame.width()==ximage->width/2); - assert(Frame.height()==ximage->height/2); -- DitherImage(Frame.lum_ptr(),Frame.Cr_ptr(),Frame.Cb_ptr(),ximage->data, -+ DitherImage(Frame.lum_ptr(),Frame.Cr_ptr(),Frame.Cb_ptr(),(unsigned char *)ximage->data, - Frame.width(),Frame.height()); - if(nicely) - { diff --git a/multimedia/mpegedit/files/patch-ad b/multimedia/mpegedit/files/patch-ad deleted file mode 100644 index 083a71b4700e..000000000000 --- a/multimedia/mpegedit/files/patch-ad +++ /dev/null @@ -1,47 +0,0 @@ ---- editor/mono_window.C.orig Sat May 20 17:47:32 1995 -+++ editor/mono_window.C Thu Feb 3 21:27:07 2000 -@@ -24,6 +24,8 @@ - #include <assert.h> - #include <stdlib.h> - -+extern "C" int XShmGetEventBase(Display *); -+ - MonoWindow::MonoWindow(UI_Globals *parent,world_c x,world_c y, - unsigned int height,unsigned int width, - void (*cb)(void) ) -@@ -137,7 +139,7 @@ - - ximage=XCreateImage(DispPointer(),None,8,ZPixmap,0,&dummy, - width,height,8,0); -- ximage->data = new byte[ximage->bytes_per_line*height]; -+ ximage->data = (char *) new byte[ximage->bytes_per_line*height]; - assert(ximage->data!=NULL); - #ifdef SH_MEM - } -@@ -154,7 +156,7 @@ - for(int j = 0; j < GRAY_RANGE; j ++) - { - tmp_pixel = col_array[j]; -- XFreeColors(DispPointer(), Colourmap, &tmp_pixel, 1, 0); -+ XFreeColors(DispPointer(), Colourmap, (unsigned long int *) &tmp_pixel, 1, 0); - } - XFreeGC(DispPointer(),gc); - -@@ -222,7 +224,7 @@ - for(int j = 0; j < i; j ++) - { - tmp_pixel = col_array[j]; -- XFreeColors(DispPointer(), Colourmap, &tmp_pixel, 1, 0); -+ XFreeColors(DispPointer(), Colourmap, (unsigned long int *) &tmp_pixel, 1, 0); - } - cerr << "Unable to allocate the colours required to make the\n" - << "monochrome window. Please re-run with the option " -@@ -254,7 +256,7 @@ - { - assert(Frame.width()==ximage->width); - assert(Frame.height()==ximage->height); -- DitherImage(Frame.lum_ptr(),ximage->data,ximage->width*ximage->height); -+ DitherImage(Frame.lum_ptr(),(unsigned char *)ximage->data,ximage->width*ximage->height); - if(nicely) - { - XEvent Event; diff --git a/multimedia/mpegedit/files/patch-ae b/multimedia/mpegedit/files/patch-ae deleted file mode 100644 index 0d0c423b6547..000000000000 --- a/multimedia/mpegedit/files/patch-ae +++ /dev/null @@ -1,29 +0,0 @@ ---- editor/bw_window.C.orig Mon May 8 16:15:00 1995 -+++ editor/bw_window.C Thu Feb 3 21:29:23 2000 -@@ -24,6 +24,8 @@ - #include <assert.h> - #include <stdlib.h> - -+extern "C" int XShmGetEventBase(Display *); -+ - BwWindow::BwWindow(UI_Globals *parent,world_c x,world_c y,unsigned int height, - unsigned int width, void (*cb)(void) ) - : YUV_Window(parent,x,y,height,width,this, ButtonPressMask | -@@ -143,7 +145,7 @@ - height,8,0); - ximage->byte_order = MSBFirst; - ximage->bitmap_bit_order = MSBFirst; -- ximage->data = new byte[ximage->bytes_per_line*height]; -+ ximage->data = (char *) new byte[ximage->bytes_per_line*height]; - assert(ximage->data!=NULL); - #ifdef SH_MEM - } -@@ -213,7 +215,7 @@ - { - assert(Frame.width()==ximage->width); - assert(Frame.height()==ximage->height); -- DitherImage(Frame.lum_ptr(),ximage->data,ximage->height,ximage->width); -+ DitherImage(Frame.lum_ptr(),(unsigned char*)ximage->data,ximage->height,ximage->width); - if(nicely) - { - XEvent Event; diff --git a/multimedia/mpegedit/files/patch-af b/multimedia/mpegedit/files/patch-af deleted file mode 100644 index ce70f30e1a7a..000000000000 --- a/multimedia/mpegedit/files/patch-af +++ /dev/null @@ -1,31 +0,0 @@ ---- MpegCodec/mpeg.H.orig Sat May 20 19:11:43 1995 -+++ MpegCodec/mpeg.H Thu Feb 3 21:31:00 2000 -@@ -59,7 +59,7 @@ - status Write(const frame &); // Overwrites the current frame - status Undo(void); // Undoes the last write to current frame - status Delete(void); // Deletes current frame -- status Insert(int no_of_frames,const frame **); -+ status Insert(int no_of_frames, frame **); - // Inserts a number of frames - unsigned int Height(void) const; // Returns the height of the frames - unsigned int Width(void) const; // Returns the width of the frames -@@ -128,14 +128,14 @@ - long file_length; // The length of the (virtual) file, in frames - long cache_size; // Number of frames that cache will fit - static const int fps_table[16]; //The table of valid frames per second values -- const int min_frame_type=1; // Min number for a valid frame type -- const int max_frame_type=4; // Max number for a valid frame type -+ static const int min_frame_type=1; // Min number for a valid frame type -+ static const int max_frame_type=4; // Max number for a valid frame type - static const frame_type FrameTypes[max_frame_type+1]; - // The list of valid frame types -- const long gopSize=10; // The number of frames between GOP headers -- const int pattern_size=8; // The size of the IBBPBBI pattern -+ static const long gopSize=10; // The number of frames between GOP headers -+ static const int pattern_size=8; // The size of the IBBPBBI pattern - static const char pattern[pattern_size]; // The IBBPBBI pattern -- const int mpegcache_size=12; // The size of the mpeg frame cache -+ static const int mpegcache_size=12; // The size of the mpeg frame cache - mpg_cache MpegCache[mpegcache_size]; // The mpeg frame cache - int cache_curpos; // Current position in the cache - void (*callback)(byte *,abs_addr); // Stores the callback function diff --git a/multimedia/mpegedit/files/patch-ag b/multimedia/mpegedit/files/patch-ag deleted file mode 100644 index dc90768c2832..000000000000 --- a/multimedia/mpegedit/files/patch-ag +++ /dev/null @@ -1,47 +0,0 @@ ---- editor/tiny_window.C.orig Mon May 8 16:09:07 1995 -+++ editor/tiny_window.C Thu Feb 3 21:33:57 2000 -@@ -24,6 +24,8 @@ - #include <assert.h> - #include <stdlib.h> - -+extern "C" int XShmGetEventBase(Display *); -+ - TinyWindow::TinyWindow(UI_Globals *parent,world_c x,world_c y, - unsigned int height,unsigned int width, - void (*cb)(void) ) -@@ -137,7 +139,7 @@ - - ximage=XCreateImage(DispPointer(),None,8,ZPixmap,0,&dummy, - width/2,height/2,8,0); -- ximage->data = new byte[ximage->bytes_per_line*height/2]; -+ ximage->data = (char *) new byte[ximage->bytes_per_line*height/2]; - assert(ximage->data!=NULL); - #ifdef SH_MEM - } -@@ -154,7 +156,7 @@ - for(int j = 0; j < GRAY_RANGE; j ++) - { - tmp_pixel = col_array[j]; -- XFreeColors(DispPointer(), Colourmap, &tmp_pixel, 1, 0); -+ XFreeColors(DispPointer(), Colourmap, (unsigned long int *) &tmp_pixel, 1, 0); - } - XFreeGC(DispPointer(),gc); - -@@ -222,7 +224,7 @@ - for(int j = 0; j < i; j ++) - { - tmp_pixel = col_array[j]; -- XFreeColors(DispPointer(), Colourmap, &tmp_pixel, 1, 0); -+ XFreeColors(DispPointer(), Colourmap, (unsigned long int*) &tmp_pixel, 1, 0); - } - cerr << "Unable to allocate the colours required to make the\n" - << "monochrome window. Please re-run with the option " -@@ -254,7 +256,7 @@ - { - assert(Frame.width()/2==ximage->width); - assert(Frame.height()/2==ximage->height); -- DitherImage(Frame.lum_ptr(),ximage->data,ximage->height,ximage->width); -+ DitherImage(Frame.lum_ptr(),(unsigned char *)ximage->data,ximage->height,ximage->width); - if(nicely) - { - XEvent Event; diff --git a/multimedia/mpegedit/files/patch-ah b/multimedia/mpegedit/files/patch-ah deleted file mode 100644 index 4e523734127b..000000000000 --- a/multimedia/mpegedit/files/patch-ah +++ /dev/null @@ -1,47 +0,0 @@ ---- editor/colour_window.C.orig Tue May 9 21:41:30 1995 -+++ editor/colour_window.C Thu Feb 3 21:35:30 2000 -@@ -24,6 +24,8 @@ - #include <assert.h> - #include <stdlib.h> - -+extern "C" int XShmGetEventBase(Display *); -+ - ColourWindow::ColourWindow(UI_Globals *parent,world_c x,world_c y, - unsigned int height,unsigned int width, - void (*cb)(void) ) -@@ -137,7 +139,7 @@ - - ximage=XCreateImage(DispPointer(),None,8,ZPixmap,0,&dummy, - width,height,8,0); -- ximage->data = new byte[ximage->bytes_per_line*height]; -+ ximage->data = (char *) new byte[ximage->bytes_per_line*height]; - assert(ximage->data!=NULL); - #ifdef SH_MEM - } -@@ -158,7 +160,7 @@ - for(j = 0; j < ncolors; j ++) - { - tmp_pixel = col_array[j]; -- XFreeColors(DispPointer(), Colourmap, &tmp_pixel, 1, 0); -+ XFreeColors(DispPointer(), Colourmap, (unsigned long int *) &tmp_pixel, 1, 0); - } - - XFreeGC(DispPointer(),gc); -@@ -253,7 +255,7 @@ - for(int j = 0; j < i; j ++) - { - tmp_pixel = col_array[j]; -- XFreeColors(DispPointer(), Colourmap, &tmp_pixel, 1, 0); -+ XFreeColors(DispPointer(), Colourmap, (unsigned long int *) &tmp_pixel, 1, 0); - } - cerr << "Unable to allocate the colours required to make the\n" - << "colour window. Please re-run with the option -private cols\n"; -@@ -359,7 +361,7 @@ - { - assert(Frame.width()==ximage->width); - assert(Frame.height()==ximage->height); -- DitherImage(Frame.lum_ptr(),Frame.Cr_ptr(),Frame.Cb_ptr(),ximage->data, -+ DitherImage(Frame.lum_ptr(),Frame.Cr_ptr(),Frame.Cb_ptr(),(unsigned char *)ximage->data, - Frame.width(),Frame.height()); - if(nicely) - { diff --git a/multimedia/mpegedit/files/patch-ai b/multimedia/mpegedit/files/patch-ai deleted file mode 100644 index 3b0835efc17d..000000000000 --- a/multimedia/mpegedit/files/patch-ai +++ /dev/null @@ -1,65 +0,0 @@ ---- ui/main_win.C.orig Mon May 8 16:16:44 1995 -+++ ui/main_win.C Thu Feb 3 21:39:37 2000 -@@ -137,8 +137,8 @@ - // Call XWMGeometry. It will decide the actual geometry of the window - - int bitmask = XWMGeometry(DispPointer(),DefaultScreen(DispPointer()), geom, -- def_geom,BorderWidth,&xsh,&main_x,&main_y, -- &main_width,&main_height,&main_gravity); -+ def_geom,BorderWidth,&xsh,(int *) &main_x,(int *) &main_y, -+ (int *) &main_width, (int *) &main_height,&main_gravity); - - // bitmask will hold the values that need to be changed to reflect the - // suggestions made by XWMGeometry. This will be done by the window -@@ -167,7 +167,7 @@ - - // Have a little chat with the window manager.... - -- win_name.value = name; -+ win_name.value = (unsigned char *) name; - win_name.encoding = XA_STRING; - win_name.format = 8; - win_name.nitems = strlen(name); -@@ -276,6 +276,7 @@ - - MainWindow::status MainWindow::event_handler(XEvent *Event) - { -+#if 0 - switch(Event->type) - { - case Expose: -@@ -309,6 +310,7 @@ - default: - break; - } -+#endif - return(okay); - } - -@@ -348,7 +350,7 @@ - Window root; - unsigned int x,y,width,height; - unsigned int bd_width, depth; -- XGetGeometry(DispPointer(),WinId(),&root,&x,&y,&width,&height, -+ XGetGeometry(DispPointer(),WinId(),&root,(int *) &x,(int *) &y,&width,&height, - &bd_width,&depth); - return depth; - } -@@ -359,7 +361,7 @@ - Window root2; - unsigned int x,y,width,height; - unsigned int bd_width, depth; -- XGetGeometry(DispPointer(),root,&root2,&x,&y,&width,&height, -+ XGetGeometry(DispPointer(),root,&root2,(int *) &x,(int *) &y,&width,&height, - &bd_width,&depth); - return height; - } -@@ -370,7 +372,7 @@ - Window root2; - unsigned int x,y,width,height; - unsigned int bd_width, depth; -- XGetGeometry(DispPointer(),root,&root2,&x,&y,&width,&height, -+ XGetGeometry(DispPointer(),root,&root2,(int *) &x, (int *) &y,&width,&height, - &bd_width,&depth); - return width; - } diff --git a/multimedia/mpegedit/files/patch-aj b/multimedia/mpegedit/files/patch-aj deleted file mode 100644 index 99b05d98e172..000000000000 --- a/multimedia/mpegedit/files/patch-aj +++ /dev/null @@ -1,99 +0,0 @@ ---- Makefile.orig Mon Jul 24 01:00:40 1995 -+++ Makefile Thu Jun 15 08:53:48 2000 -@@ -23,8 +23,8 @@ - # - # Mr A S R Ashley B.Eng (Hons) 23rd July 1995 - -- CC = gcc -- CPP = g++ -+# CC = gcc -+ CPP = ${CXX} - RM = rm -f - - DEPFILE = Dependancies -@@ -33,7 +33,7 @@ - SOURCES = main.C globals/version.c - OBJS = main.o globals/version.o - ARCHIVES = editor/editor.a ui/ui.a MpegCodec/mpeg.a -- LIBS = -lXext -lX11 -lpnm -lppm -lpbm -lpgm -lm -+ LIBS = -L$(X11BASE)/lib -L$(LOCALBASE)/lib -lXext -lX11 -lpnm -lppm -lpbm -lpgm -lm - # - # CPPFLAGS -Wall all warnings - # -pipe speeds up compilation (remove only if not using g++) -@@ -55,11 +55,11 @@ - # PBMDIR The location of the pbmplus header files, which is - # /usr/include/gr on my Linux machine. - --PBMDIR = /usr/include/X11R5/X11 -+PBMDIR = $(LOCALBASE)/include - INCLUDES = -Iglobals -Iui -IMpegCodec -IMpegCodec/decoder \ -- -IMpegCodec/encoder -Ieditor --CPPFLAGS = -Wall -pipe -O4 --CFLAGS = -Wall -pipe -O4 -+ -IMpegCodec/encoder -Ieditor -I$(X11BASE)/include -+CPPFLAGS = ${CXXFLAGS} -+#CFLAGS = -Wall -pipe -O4 - SHMEM = -DSH_MEM - CACHE_FLAGS = -DCACHE_SIZE=12288 -DCACHE_GRANULARITY=5 - -@@ -70,22 +70,22 @@ - - all: mpeg_edit - --ui.a: -- cd ui && make ui.a EXTRA="$(EXTRA)" CPPFLAGS="$(CPPFLAGS)" \ -+ui/ui.a: -+ cd ui && $(MAKE) ui.a EXTRA="$(EXTRA)" CPPFLAGS="$(CPPFLAGS)" \ - CFLAGS="$(CFLAGS)" && cd .. - --mpeg.a: -- cd MpegCodec && make mpeg.a EXTRA="$(EXTRA)" CPPFLAGS="$(CPPFLAGS)" \ -+MpegCodec/mpeg.a: -+ cd MpegCodec && $(MAKE) mpeg.a EXTRA="$(EXTRA)" CPPFLAGS="$(CPPFLAGS)" \ - CFLAGS="$(CFLAGS)" CACHE_FLAGS="$(CACHE_FLAGS)" && cd .. - --editor.a: -- cd editor && make editor.a EXTRA="$(EXTRA)" CPPFLAGS="$(CPPFLAGS)" \ -+editor/editor.a: -+ cd editor && $(MAKE) editor.a EXTRA="$(EXTRA)" CPPFLAGS="$(CPPFLAGS)" \ - CFLAGS="$(CFLAGS)" SHMEM="$(SHMEM)" PBMDIR="$(PBMDIR)" && cd .. - --mpeg_edit: ui.a mpeg.a editor.a $(DEPFILE) $(OBJS) -+mpeg_edit: $(ARCHIVES) $(DEPFILE) $(OBJS) - $(CPP) -o mpeg_edit $(OBJS) $(ARCHIVES) $(LIBS) - --ppmtorle: mpeg.a editor.a $(DEPFILE) ppmtorle.o -+ppmtorle: MpegCodec/mpeg.a editor/editor.a $(DEPFILE) ppmtorle.o - $(CPP) -o ppmtorle ppmtorle.o MpegCodec/frame.o editor/yuv.o $(LIBS) - - globals/version.o: $(ARCHIVES) -@@ -93,24 +93,24 @@ - - clean: - $(RM) mpeg_edit main.o globals/version.o -- set -e; for i in $(SUBDIRS); do cd $$i && make clean && cd .. ; done -+ set -e; for i in $(SUBDIRS); do cd $$i && $(MAKE) clean && cd .. ; done - - dep: FORCE -- set -e; for i in $(SUBDIRS) ; do cd $$i && make dep EXTRA="$(EXTRA)" \ -+ set -e; for i in $(SUBDIRS) ; do cd $$i && $(MAKE) dep EXTRA="$(EXTRA)" \ - CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" SHMEM="$(SHMEM)" \ - PBMDIR="$(PBMDIR)" && cd .. ; done - $(RM) $(DEPFILE) -- make $(DEPFILE) -+ $(MAKE) $(DEPFILE) - - FORCE: - - - $(DEPFILE): - set -e; for i in $(SOURCES) ; do $(CPP) $(INCLUDES) -M $$i >>$(DEPFILE) ; done -- -+ - # - # include a dependency file if one exists - # - #ifeq ($(DEPFILE),$(wildcard $(DEPFILE))) --include $(DEPFILE) -+#include $(DEPFILE) - #endif diff --git a/multimedia/mpegedit/files/patch-aq b/multimedia/mpegedit/files/patch-aq deleted file mode 100644 index f2eb9431e9b4..000000000000 --- a/multimedia/mpegedit/files/patch-aq +++ /dev/null @@ -1,69 +0,0 @@ ---- editor/editor.C.orig Sun Jun 18 07:27:07 1995 -+++ editor/editor.C Fri Dec 7 21:02:51 2001 -@@ -45,11 +45,13 @@ - #include <stdio.h> - #include <time.h> - #include <unistd.h> -+#include <string.h> - #include <sys/time.h> - #include <sys/types.h> - #include <sys/wait.h> --#include "pbmplus.h" -+extern "C" { - #include "pnm.h" -+} - - #define del(x) delete x; x = NULL; - -@@ -3249,17 +3251,17 @@ - wins[0] = play_btn->WinId(); - play_btn->RestrictEvents(wins,1); - -- gettimeofday(&target,(timezone *)NULL); // Time a read, to -+ gettimeofday(&target,(struct timezone *)NULL); // Time a read, to - ret_stat = Codec_stream->Read(temp_frame); // find out how long -- gettimeofday(&clk,(timezone *)NULL); // it takes -+ gettimeofday(&clk,(struct timezone *)NULL); // it takes - - decode_delay = clk.tv_usec + 1000000*clk.tv_sec; - decode_delay -= target.tv_usec + 1000000*target.tv_sec; - -- gettimeofday(&target,(timezone *)NULL); // Time a dither, to -+ gettimeofday(&target,(struct timezone *)NULL); // Time a dither, to - MajorWin.win->DisplayFrame(temp_frame,false); // find out how long - time_win->SetTime(Codec_stream->GetPos_hms(),false); // it takes -- gettimeofday(&clk,(timezone *)NULL); -+ gettimeofday(&clk,(struct timezone *)NULL); - - dither_delay = clk.tv_usec + 1000000*clk.tv_sec; - dither_delay -= target.tv_usec + 1000000*target.tv_sec; -@@ -3268,9 +3270,9 @@ - - for(int a=0; a<5; a++) - { -- gettimeofday(&target,(timezone *)NULL); // Time usleep, to -+ gettimeofday(&target,(struct timezone *)NULL); // Time usleep, to - usleep(10000); // find out how long -- gettimeofday(&clk,(timezone *)NULL); // it takes -+ gettimeofday(&clk,(struct timezone *)NULL); // it takes - - usleep_delay += clk.tv_usec + 1000000*clk.tv_sec - 10000; - usleep_delay -= target.tv_usec + 1000000*target.tv_sec; -@@ -3283,7 +3285,7 @@ - - // Calculate when the frame _should_ finish - -- gettimeofday(&target,(timezone *)NULL); -+ gettimeofday(&target,(struct timezone *)NULL); - target.tv_usec += usec_per_frame - dither_delay - decode_delay; - if(target.tv_usec >= 1000000) - { -@@ -3299,7 +3301,7 @@ - - // See if we're ahead by more than a decode delay (for the next frame) - -- gettimeofday(&clk,(timezone *)NULL); -+ gettimeofday(&clk,(struct timezone *)NULL); - diff = target.tv_usec - clk.tv_usec; - diff += 1000000*(target.tv_sec - clk.tv_sec); - if(diff>usleep_delay) // If we are ahead, sleep for a while diff --git a/multimedia/mpegedit/files/patch-ar b/multimedia/mpegedit/files/patch-ar deleted file mode 100644 index 0ce818430deb..000000000000 --- a/multimedia/mpegedit/files/patch-ar +++ /dev/null @@ -1,58 +0,0 @@ ---- MpegCodec/Makefile.orig Mon Jul 24 00:03:22 1995 -+++ MpegCodec/Makefile Thu Jun 15 09:01:03 2000 -@@ -25,12 +25,12 @@ - # - - AR = ar r --CC = gcc --CPP = g++ -+#CC = gcc -+CPP = ${CXX} - RM = rm -f - RANLIB = ranlib - --INCLUDES = -I../ui -I../editor -I../globals -Iencoder -Idecoder -+INCLUDES = -I../ui -I../editor -I../globals -Iencoder -Idecoder -I$(X11BASE)/include - DEPFILE = Dependancies - SUBDIRS = decoder encoder - HEADERS = bstream.H frame.H mpeg.H -@@ -48,32 +48,32 @@ - - force: - $(RM) mpeg.a -- make mpeg.a -+ $(MAKE) mpeg.a - - mpeg.a: $(DEPFILE) $(OBJS) - $(RM) $@ - $(AR) $@ $(OBJS) -- set -e; for i in $(SUBDIRS); do cd $$i && make ar CFLAGS="$(CFLAGS)" ; cd ..; done -+ set -e; for i in $(SUBDIRS); do cd $$i && $(MAKE) ar CFLAGS="$(CFLAGS)" ; cd ..; done - $(RANLIB) $@ - - clean: -- set -e; for i in $(SUBDIRS); do cd $$i && make clean && cd ..; done -+ set -e; for i in $(SUBDIRS); do cd $$i && $(MAKE) clean && cd ..; done - rm -f mpeg.a $(OBJS) $(DEPFILE) - - FORCE: - - - dep: FORCE -- set -e; for i in $(SUBDIRS); do cd $$i && make dep && cd ..; done -+ set -e; for i in $(SUBDIRS); do cd $$i && $(MAKE) dep && cd ..; done - $(RM) $(DEPFILE) -- make $(DEPFILE) -+ $(MAKE) $(DEPFILE) - - $(DEPFILE): - set -e; for i in $(SOURCES) ; do $(CC) $(INCLUDES) -M $$i >>$(DEPFILE) ; done -- -+ - # - # include a dependency file if one exists - # - #ifeq ($(DEPFILE),$(wildcard $(DEPFILE))) --include $(DEPFILE) -+#include $(DEPFILE) - #endif diff --git a/multimedia/mpegedit/files/patch-as b/multimedia/mpegedit/files/patch-as deleted file mode 100644 index ee6461c1fc6e..000000000000 --- a/multimedia/mpegedit/files/patch-as +++ /dev/null @@ -1,10 +0,0 @@ ---- MpegCodec/frame.C.orig Sun May 21 02:14:48 1995 -+++ MpegCodec/frame.C Thu Jun 15 08:37:49 2000 -@@ -25,6 +25,7 @@ - #include "frame.H" - #include <string.h> - #include <iostream.h> -+#include <sys/param.h> - - #ifndef NO_INET - #include <netinet/in.h> diff --git a/multimedia/mpegedit/files/patch-at b/multimedia/mpegedit/files/patch-at deleted file mode 100644 index 8098b8055d2f..000000000000 --- a/multimedia/mpegedit/files/patch-at +++ /dev/null @@ -1,11 +0,0 @@ ---- MpegCodec/mpeg.C.orig Sun May 21 04:19:44 1995 -+++ MpegCodec/mpeg.C Thu Jun 15 08:37:49 2000 -@@ -890,7 +890,7 @@ - * - *-------------------------------------------------------------- - */ --Mpeg::status Mpeg::Insert(int no_of_frames, const frame **f_array) -+Mpeg::status Mpeg::Insert(int no_of_frames, frame **f_array) - { - Fstruct Fs; - TempFrame TF; diff --git a/multimedia/mpegedit/files/patch-au b/multimedia/mpegedit/files/patch-au deleted file mode 100644 index f514b164212e..000000000000 --- a/multimedia/mpegedit/files/patch-au +++ /dev/null @@ -1,42 +0,0 @@ ---- MpegCodec/decoder/Makefile.orig Sun Jul 23 17:03:05 1995 -+++ MpegCodec/decoder/Makefile Wed Jun 28 15:18:39 2000 -@@ -27,9 +27,10 @@ - - AR = ar r - RM = rm -f --CC = gcc --CPP = g++ -+#CC = gcc -+CPP = ${CXX} - RANLIB = ranlib -+INCLUDES = -I$(X11BASE)/include - DEPFILE = Dependencies - CCOPTIMISATIONS = -O6 -funroll-loops -fomit-frame-pointer - ANALYSIS = -DANALYSIS -@@ -43,7 +44,7 @@ - ALL = ar - - .c.o: -- $(CC) $(CFLAGS) $(DEFINES) $(EXTRA) -c $< -+ $(CC) $(CFLAGS) $(INCLUDES) $(DEFINES) $(EXTRA) -c $< - - all: $(ALL) - -@@ -58,14 +59,14 @@ - - dep: FORCE - $(RM) $(DEPFILE) -- make $(DEPFILE) -+ $(MAKE) $(DEPFILE) - - $(DEPFILE): -- set -e; for i in $(SOURCES); do $(CC) -M $$i >>$(DEPFILE); done -+ set -e; for i in $(SOURCES); do $(CC) $(INCLUDES) -M $$i >>$(DEPFILE); done - - # - # include a dependency file if one exists - # - #ifeq ($(DEPFILE),$(wildcard $(DEPFILE))) --include $(DEPFILE) -+#include $(DEPFILE) - #endif diff --git a/multimedia/mpegedit/files/patch-av b/multimedia/mpegedit/files/patch-av deleted file mode 100644 index 9f66335dc847..000000000000 --- a/multimedia/mpegedit/files/patch-av +++ /dev/null @@ -1,11 +0,0 @@ ---- MpegCodec/decoder/huffman.c.orig Mon Aug 15 00:08:13 1994 -+++ MpegCodec/decoder/huffman.c Thu Jun 15 08:37:50 2000 -@@ -31,7 +31,7 @@ - #include "huffman.h" - #include "util.h" - #include "dmpeg.h" --#include "proto.h" -+/* #include "proto.h" */ - - /* Decoding table for macroblock_address_increment */ - mb_addr_inc_entry mb_addr_inc[2048]; diff --git a/multimedia/mpegedit/files/patch-aw b/multimedia/mpegedit/files/patch-aw deleted file mode 100644 index 4b9dce1ff50c..000000000000 --- a/multimedia/mpegedit/files/patch-aw +++ /dev/null @@ -1,11 +0,0 @@ ---- MpegCodec/decoder/jrevdct.c.orig Mon Aug 15 00:13:39 1994 -+++ MpegCodec/decoder/jrevdct.c Thu Jun 15 08:37:50 2000 -@@ -28,7 +28,7 @@ - - #include <string.h> - #include "dmpeg.h" --#include "proto.h" -+/* #include "proto.h" */ - - #define GLOBAL /* a function referenced thru EXTERNs */ - diff --git a/multimedia/mpegedit/files/patch-ax b/multimedia/mpegedit/files/patch-ax deleted file mode 100644 index 5580a00b4afe..000000000000 --- a/multimedia/mpegedit/files/patch-ax +++ /dev/null @@ -1,11 +0,0 @@ ---- MpegCodec/decoder/motionvector.c.orig Mon Aug 15 00:12:03 1994 -+++ MpegCodec/decoder/motionvector.c Thu Jun 15 08:37:50 2000 -@@ -19,7 +19,7 @@ - * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. - */ - #include "dmpeg.h" --#include "proto.h" -+/* #include "proto.h" */ - #include "util.h" - - diff --git a/multimedia/mpegedit/files/patch-ay b/multimedia/mpegedit/files/patch-ay deleted file mode 100644 index 07b62a2016ac..000000000000 --- a/multimedia/mpegedit/files/patch-ay +++ /dev/null @@ -1,26 +0,0 @@ ---- MpegCodec/encoder/Makefile.orig Mon Jul 24 00:03:48 1995 -+++ MpegCodec/encoder/Makefile Thu Jun 15 08:56:34 2000 -@@ -26,8 +26,8 @@ - - AR = ar r - RM = rm -f --CC = gcc --CPP = g++ -+#CC = gcc -+CPP = ${CXX} - DEPFILE = Dependencies - CCOPTIMISATIONS = -O6 -funroll-loops -fomit-frame-pointer - -@@ -73,10 +73,10 @@ - - $(DEPFILE): - set -e; for i in $(SOURCES); do $(CC) -M $$i $(DEFINES) >>$(DEPFILE); done -- -+ - # - # include a dependency file if one exists - # - #ifeq ($(DEPFILE),$(wildcard $(DEPFILE))) --include $(DEPFILE) -+#include $(DEPFILE) - #endif diff --git a/multimedia/mpegedit/files/patch-az b/multimedia/mpegedit/files/patch-az deleted file mode 100644 index a0a3117b1d5f..000000000000 --- a/multimedia/mpegedit/files/patch-az +++ /dev/null @@ -1,39 +0,0 @@ ---- editor/Makefile.orig Mon Jul 24 00:01:16 1995 -+++ editor/Makefile Thu Jun 15 09:02:18 2000 -@@ -25,12 +25,12 @@ - # Mr A S R Ashley B.Eng (Hons) 23rd July 1995 - - AR = ar r --CC = gcc --CPP = g++ -+#CC = gcc -+CPP = ${CXX} - RANLIB = ranlib - RM = rm -f - INCLUDES = -I../globals -I../ui -I../MpegCodec -I../MpegCodec/decoder \ -- -I../MpegCodec/encoder -I$(PBMDIR) -+ -I../MpegCodec/encoder -I$(PBMDIR) -I$(X11BASE)/include - - DEPFILE = Dependancies - HEADERS = yuv.H 2x2_window.H mono_window.H bw_window.H effects.H \ -@@ -62,17 +62,17 @@ - - dep: FORCE - $(RM) $(DEPFILE) -- make $(DEPFILE) -+ $(MAKE) $(DEPFILE) - - FORCE: - - - $(DEPFILE): - set -e; for i in $(SOURCES) ; do $(CC) $(INCLUDES) -M $$i >>$(DEPFILE) ; done -- -+ - # - # include a dependency file if one exists - # - #ifeq ($(DEPFILE),$(wildcard $(DEPFILE))) --include $(DEPFILE) -+#include $(DEPFILE) - #endif diff --git a/multimedia/mpegedit/files/patch-ba b/multimedia/mpegedit/files/patch-ba deleted file mode 100644 index 041f337d9935..000000000000 --- a/multimedia/mpegedit/files/patch-ba +++ /dev/null @@ -1,42 +0,0 @@ ---- ui/Makefile.orig Mon Jul 24 00:01:36 1995 -+++ ui/Makefile Thu Jun 15 09:04:16 2000 -@@ -26,9 +26,10 @@ - # - - AR = ar r --CPP = g++ -+CPP = ${CXX} - RANLIB = ranlib - RM = rm -f -+INCLUDES = -I../globals -I$(X11BASE)/include - - # CPPFLAGS -Wall all warnings - # -pipe speeds up compilation (remove only if not using g++) -@@ -48,7 +49,7 @@ - .SUFFIXES: .C $(SUFFIXES) - - .C.o: -- $(CPP) $(CPPFLAGS) $(EXTRA) -I../globals -c $< -+ $(CPP) $(CPPFLAGS) $(INCLUDES) $(EXTRA) -c $< - - all: $(ALL) - -@@ -65,14 +66,14 @@ - - dep: FORCE - $(RM) $(DEPFILE) -- make $(DEPFILE) -+ $(MAKE) $(DEPFILE) - - $(DEPFILE): -- set -e; for i in $(SOURCES) ; do $(CPP) -M $$i -I../globals >>$(DEPFILE) ; done -- -+ set -e; for i in $(SOURCES) ; do $(CPP) $(INCLUDES) -M $$i >>$(DEPFILE) ; done -+ - # - # include a dependency file if one exists - # - #ifeq ($(DEPFILE),$(wildcard $(DEPFILE))) --include $(DEPFILE) -+#include $(DEPFILE) - #endif diff --git a/multimedia/mpegedit/files/patch-bb b/multimedia/mpegedit/files/patch-bb deleted file mode 100644 index 01c44c3e83c8..000000000000 --- a/multimedia/mpegedit/files/patch-bb +++ /dev/null @@ -1,33 +0,0 @@ ---- ui/text_win.C.orig Sun Jun 18 19:56:57 1995 -+++ ui/text_win.C Thu Jun 15 08:37:50 2000 -@@ -17,6 +17,7 @@ - */ - - #include "text_win.H" -+#include <sys/time.h> - #include <assert.h> - #include <stdlib.h> - -@@ -407,14 +408,22 @@ - long time_elapsed; - long speed; - -+#ifdef __FreeBSD__ -+ gettimeofday(&clk,(struct timezone *)NULL); -+#else - gettimeofday(&clk,(timezone *)NULL); -+#endif - time_elapsed = (clk.tv_sec - last_click.tv_sec)*100; - time_elapsed+=(clk.tv_usec - last_click.tv_usec)/10000; - speed = atol(click_speed); - if((time_elapsed<speed) && (callback!=NULL)) - retval = (*(callback))(callback_data); - } -+#ifdef __FreeBSD__ -+ gettimeofday(&last_click,(struct timezone *)NULL); -+#else - gettimeofday(&last_click,(timezone *)NULL); -+#endif - text.inverse=true; - TList.Write(text); - if(!SendEventFlag) diff --git a/multimedia/mpegedit/pkg-comment b/multimedia/mpegedit/pkg-comment deleted file mode 100644 index b9670c907ae0..000000000000 --- a/multimedia/mpegedit/pkg-comment +++ /dev/null @@ -1 +0,0 @@ -A program to edit encoded mpeg streams diff --git a/multimedia/mpegedit/pkg-descr b/multimedia/mpegedit/pkg-descr deleted file mode 100644 index f25cbbf23e67..000000000000 --- a/multimedia/mpegedit/pkg-descr +++ /dev/null @@ -1,8 +0,0 @@ -mpeg_edit will edit and apply some effects to an already -encoded mpeg video stream. - -The program has several bugs, but I've been able to use it. Expect -core-dumps. It has problems with displays >8 bits too. - -eric. -erich@FreeBSD.org diff --git a/multimedia/mpegedit/pkg-plist b/multimedia/mpegedit/pkg-plist deleted file mode 100644 index 19f822c08176..000000000000 --- a/multimedia/mpegedit/pkg-plist +++ /dev/null @@ -1,4 +0,0 @@ -bin/mpeg_edit -%%PORTDOCS%%share/doc/mpegedit/README -%%PORTDOCS%%share/doc/mpegedit/manual.ps -%%PORTDOCS%%@dirrm share/doc/mpegedit |