summaryrefslogtreecommitdiff
path: root/graphics/mpegedit
diff options
context:
space:
mode:
authorMichael Haro <mharo@FreeBSD.org>2000-04-02 04:17:23 +0000
committerMichael Haro <mharo@FreeBSD.org>2000-04-02 04:17:23 +0000
commit2c6f2fc033f3dd807b8737d8919a8b498f9045b8 (patch)
tree9bfacda2083a0d842817666f41279a84f1cb8e28 /graphics/mpegedit
parentFix patch error. (diff)
make this build again
Diffstat (limited to 'graphics/mpegedit')
-rw-r--r--graphics/mpegedit/files/patch-aj88
-rw-r--r--graphics/mpegedit/files/patch-aq69
2 files changed, 157 insertions, 0 deletions
diff --git a/graphics/mpegedit/files/patch-aj b/graphics/mpegedit/files/patch-aj
new file mode 100644
index 000000000000..817fa6897b42
--- /dev/null
+++ b/graphics/mpegedit/files/patch-aj
@@ -0,0 +1,88 @@
+--- Makefile.orig Sun Jul 23 11:00:40 1995
++++ Makefile Sun Oct 11 23:07:08 1998
+@@ -23,17 +23,17 @@
+ #
+ # Mr A S R Ashley B.Eng (Hons) 23rd July 1995
+
+- CC = gcc
+- CPP = g++
+- RM = rm -f
++CC = gcc -O -I$(X11BASE)/include
++CPP = g++ -O -I$(X11BASE)/include
++RM = rm -f
+
+ DEPFILE = Dependancies
+- SUBDIRS = ui MpegCodec editor xuseless
++SUBDIRS = ui MpegCodec editor xuseless
+ HEADERS =
+-SOURCES = main.C globals/version.c
+-OBJS = main.o globals/version.o
++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,9 +55,9 @@
+ # 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
++ -IMpegCodec/encoder -Ieditor -I$(X11BASE)/include
+ CPPFLAGS = -Wall -pipe -O4
+ CFLAGS = -Wall -pipe -O4
+ SHMEM = -DSH_MEM
+@@ -70,22 +70,27 @@
+
+ all: mpeg_edit
+
+-ui.a:
++install:
++ install -cs mpeg_edit $(PREFIX)/bin
++ mkdir -p $(PREFIX)/share/doc/mpeg_edit
++ install -c -m 644 README manual.ps $(PREFIX)/share/doc/mpeg_edit
++
++ui/ui.a:
+ cd ui && make ui.a EXTRA="$(EXTRA)" CPPFLAGS="$(CPPFLAGS)" \
+ CFLAGS="$(CFLAGS)" && cd ..
+-
+-mpeg.a:
++
++MpegCodec/mpeg.a:
+ cd MpegCodec && make mpeg.a EXTRA="$(EXTRA)" CPPFLAGS="$(CPPFLAGS)" \
+ CFLAGS="$(CFLAGS)" CACHE_FLAGS="$(CACHE_FLAGS)" && cd ..
+-
+-editor.a:
++
++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)
+@@ -107,10 +112,10 @@
+
+ $(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/graphics/mpegedit/files/patch-aq b/graphics/mpegedit/files/patch-aq
new file mode 100644
index 000000000000..f2975dbae576
--- /dev/null
+++ b/graphics/mpegedit/files/patch-aq
@@ -0,0 +1,69 @@
+--- editor/editor.C.orig Sun Jun 18 04:27:07 1995
++++ editor/editor.C Sat Apr 1 20:10:46 2000
+@@ -45,11 +45,14 @@
+ #include <stdio.h>
+ #include <time.h>
+ #include <unistd.h>
++#include <string.h>
+ #include <sys/time.h>
+ #include <sys/types.h>
+ #include <sys/wait.h>
++extern "C" {
+ #include "pbmplus.h"
+ #include "pnm.h"
++}
+
+ #define del(x) delete x; x = NULL;
+
+@@ -3249,17 +3252,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 +3271,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 +3286,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 +3302,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