cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Support CC/CXX/CFLAGS/CXXFLAGS/MAKE properly

Browse Source 
- Support NOPORTDOCS
- Remove USE_GMAKE
- Add WWW: line into pkg/DESCR
- Add pnm.1 LIB_DEPENDS

PR:		19344
Submitted by:	KATO Tsuguru <tkato@prontomail.ne.jp>
This commit is contained in:
Alexander Langer 2000-06-28 13:34:38 +00:00
parent 880e802fac
commit 0d731daf26
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=29938
28 changed files with 712 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
graphics/mpegedit/Makefile
View File

@ -1,6 +1,6 @@
# New ports collection makefile for: mpegedit
# Date created: Thu Aug 1 10:50:57 CDT 1996
# Whom: erich@FreeBSD.org
# New ports collection makefile for: mpegedit
# Date created: Thu Aug 1 10:50:57 CDT 1996
# Whom: erich@FreeBSD.org
#
# $FreeBSD$
#
@ -13,9 +13,19 @@ DISTNAME= ${PORTNAME}_v${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
BUILD_DEPENDS= ${LOCALBASE}/include/pbmplus.h:${PORTSDIR}/graphics/netpbm
LIB_DEPENDS= pnm.1:${PORTSDIR}/graphics/netpbm
USE_X_PREFIX= yes
USE_GMAKE= yes
post-extract:
@find ${WRKSRC} -name '.depend' | xargs ${RM} -f
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/mpeg_edit ${PREFIX}/bin
.if !defined(NOPORTDOCS)
@${MKDIR} ${PREFIX}/share/doc/mpeg_edit
${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/mpeg_edit
${INSTALL_DATA} ${WRKSRC}/manual.ps ${PREFIX}/share/doc/mpeg_edit
.endif
.include <bsd.port.mk>

79
graphics/mpegedit/files/patch-aj
View File

@ -1,31 +1,26 @@
--- Makefile.orig Sun Jul 23 11:00:40 1995
+++ Makefile Sun Oct 11 23:07:08 1998
@@ -23,17 +23,17 @@
--- 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++
- RM = rm -f
+CC = gcc -O -I$(X11BASE)/include
+CPP = g++ -O -I$(X11BASE)/include
+RM = rm -f
+# CC = gcc
+ CPP = ${CXX}
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
@@ -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,9 +55,9 @@
@@ -55,11 +55,11 @@
# PBMDIR The location of the pbmplus header files, which is
# /usr/include/gr on my Linux machine.
@ -33,38 +28,37 @@
+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
-CPPFLAGS = -Wall -pipe -O4
-CFLAGS = -Wall -pipe -O4
+ -IMpegCodec/encoder -Ieditor -I$(X11BASE)/include
+CPPFLAGS = ${CXXFLAGS}
+#CFLAGS = -Wall -pipe -O4
SHMEM = -DSH_MEM
@@ -70,22 +70,27 @@
CACHE_FLAGS = -DCACHE_SIZE=12288 -DCACHE_GRANULARITY=5
@@ -70,22 +70,22 @@
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
+
- cd ui && make ui.a EXTRA="$(EXTRA)" CPPFLAGS="$(CPPFLAGS)" \
+ui/ui.a:
cd ui && make ui.a EXTRA="$(EXTRA)" CPPFLAGS="$(CPPFLAGS)" \
+ 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)" \
+ 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)" \
+ 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)
@ -73,7 +67,24 @@
$(CPP) -o ppmtorle ppmtorle.o MpegCodec/frame.o editor/yuv.o $(LIBS)
globals/version.o: $(ARCHIVES)
@@ -107,10 +112,10 @@
@@ -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

58
graphics/mpegedit/files/patch-ar Normal file
View File

@ -0,0 +1,58 @@
--- 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

10
graphics/mpegedit/files/patch-as Normal file
View File

@ -0,0 +1,10 @@
--- 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>

11
graphics/mpegedit/files/patch-at Normal file
View File

@ -0,0 +1,11 @@
--- 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;

42
graphics/mpegedit/files/patch-au Normal file
View File

@ -0,0 +1,42 @@
--- 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

11
graphics/mpegedit/files/patch-av Normal file
View File

@ -0,0 +1,11 @@
--- 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];

11
graphics/mpegedit/files/patch-aw Normal file
View File

@ -0,0 +1,11 @@
--- 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 */

11
graphics/mpegedit/files/patch-ax Normal file
View File

@ -0,0 +1,11 @@
--- 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"

26
graphics/mpegedit/files/patch-ay Normal file
View File

@ -0,0 +1,26 @@
--- 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

39
graphics/mpegedit/files/patch-az Normal file
View File

@ -0,0 +1,39 @@
--- 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

42
graphics/mpegedit/files/patch-ba Normal file
View File

@ -0,0 +1,42 @@
--- 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

33
graphics/mpegedit/files/patch-bb Normal file
View File

@ -0,0 +1,33 @@
--- 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)

2
graphics/mpegedit/pkg-descr
View File

@ -4,5 +4,7 @@ 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.
WWW: http://www.ripley.demon.co.uk/mpeg/index.html
eric.
erich@FreeBSD.org

20
multimedia/mpegedit/Makefile
View File

@ -1,6 +1,6 @@
# New ports collection makefile for: mpegedit
# Date created: Thu Aug 1 10:50:57 CDT 1996
# Whom: erich@FreeBSD.org
# New ports collection makefile for: mpegedit
# Date created: Thu Aug 1 10:50:57 CDT 1996
# Whom: erich@FreeBSD.org
#
# $FreeBSD$
#
@ -13,9 +13,19 @@ DISTNAME= ${PORTNAME}_v${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
BUILD_DEPENDS= ${LOCALBASE}/include/pbmplus.h:${PORTSDIR}/graphics/netpbm
LIB_DEPENDS= pnm.1:${PORTSDIR}/graphics/netpbm
USE_X_PREFIX= yes
USE_GMAKE= yes
post-extract:
@find ${WRKSRC} -name '.depend' | xargs ${RM} -f
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/mpeg_edit ${PREFIX}/bin
.if !defined(NOPORTDOCS)
@${MKDIR} ${PREFIX}/share/doc/mpeg_edit
${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/mpeg_edit
${INSTALL_DATA} ${WRKSRC}/manual.ps ${PREFIX}/share/doc/mpeg_edit
.endif
.include <bsd.port.mk>

79
multimedia/mpegedit/files/patch-aj
View File

@ -1,31 +1,26 @@
--- Makefile.orig Sun Jul 23 11:00:40 1995
+++ Makefile Sun Oct 11 23:07:08 1998
@@ -23,17 +23,17 @@
--- 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++
- RM = rm -f
+CC = gcc -O -I$(X11BASE)/include
+CPP = g++ -O -I$(X11BASE)/include
+RM = rm -f
+# CC = gcc
+ CPP = ${CXX}
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
@@ -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,9 +55,9 @@
@@ -55,11 +55,11 @@
# PBMDIR The location of the pbmplus header files, which is
# /usr/include/gr on my Linux machine.
@ -33,38 +28,37 @@
+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
-CPPFLAGS = -Wall -pipe -O4
-CFLAGS = -Wall -pipe -O4
+ -IMpegCodec/encoder -Ieditor -I$(X11BASE)/include
+CPPFLAGS = ${CXXFLAGS}
+#CFLAGS = -Wall -pipe -O4
SHMEM = -DSH_MEM
@@ -70,22 +70,27 @@
CACHE_FLAGS = -DCACHE_SIZE=12288 -DCACHE_GRANULARITY=5
@@ -70,22 +70,22 @@
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
+
- cd ui && make ui.a EXTRA="$(EXTRA)" CPPFLAGS="$(CPPFLAGS)" \
+ui/ui.a:
cd ui && make ui.a EXTRA="$(EXTRA)" CPPFLAGS="$(CPPFLAGS)" \
+ 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)" \
+ 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)" \
+ 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)
@ -73,7 +67,24 @@
$(CPP) -o ppmtorle ppmtorle.o MpegCodec/frame.o editor/yuv.o $(LIBS)
globals/version.o: $(ARCHIVES)
@@ -107,10 +112,10 @@
@@ -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

58
multimedia/mpegedit/files/patch-ar Normal file
View File

@ -0,0 +1,58 @@
--- 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

10
multimedia/mpegedit/files/patch-as Normal file
View File

@ -0,0 +1,10 @@
--- 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>

11
multimedia/mpegedit/files/patch-at Normal file
View File

@ -0,0 +1,11 @@
--- 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;

42
multimedia/mpegedit/files/patch-au Normal file
View File

@ -0,0 +1,42 @@
--- 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

11
multimedia/mpegedit/files/patch-av Normal file
View File

@ -0,0 +1,11 @@
--- 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];

11
multimedia/mpegedit/files/patch-aw Normal file
View File

@ -0,0 +1,11 @@
--- 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 */

11
multimedia/mpegedit/files/patch-ax Normal file
View File

@ -0,0 +1,11 @@
--- 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"

26
multimedia/mpegedit/files/patch-ay Normal file
View File

@ -0,0 +1,26 @@
--- 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

39
multimedia/mpegedit/files/patch-az Normal file
View File

@ -0,0 +1,39 @@
--- 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

42
multimedia/mpegedit/files/patch-ba Normal file
View File

@ -0,0 +1,42 @@
--- 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

33
multimedia/mpegedit/files/patch-bb Normal file
View File

@ -0,0 +1,33 @@
--- 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)

2
multimedia/mpegedit/pkg-descr
View File

@ -4,5 +4,7 @@ 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.
WWW: http://www.ripley.demon.co.uk/mpeg/index.html
eric.
erich@FreeBSD.org