Attachment #58437 for bug #88075

View | Details | Raw Unified | Return to bug 88075
Collapse All | Expand All

Lines 7-12 Link Here

(-)exportvideo/Makefile (-1 / +2 lines)
7		7
8	PORTNAME= exportvideo	8	PORTNAME= exportvideo
9	PORTVERSION= 1.0	9	PORTVERSION= 1.0
		10	PORTREVISION= 1
10	CATEGORIES= multimedia	11	CATEGORIES= multimedia
11	MASTER_SITES= http://tigerente.htu.tuwien.ac.at/~aoe/mystuff/mpeg2_movie-avipatch/	12	MASTER_SITES= http://tigerente.htu.tuwien.ac.at/~aoe/mystuff/mpeg2_movie-avipatch/
12	DISTNAME= ${PORTNAME}.7e-pre9	13	DISTNAME= ${PORTNAME}.7e-pre9
Lines 21-27 Link Here
21	USE_XLIB= yes	22	USE_XLIB= yes
22	USE_GMAKE= yes	23	USE_GMAKE= yes
23	HAS_CONFIGURE= yes	24	HAS_CONFIGURE= yes
24	CONFIGURE_ARGS= --no-avi	25	CONFIGURE_ARGS= --no-avi --prefix=${PREFIX}
25		26
26	WRKSRC= ${WRKDIR}/${DISTNAME}	27	WRKSRC= ${WRKDIR}/${DISTNAME}
27		28

Lines 1-5 Link Here

(-)exportvideo/files/patch-configure (-8 / +19 lines)
1	--- configure.orig Tue Oct 9 18:14:28 2001	1	--- configure.orig Tue Oct 9 18:14:50 2001
2	+++ configure Mon Nov 1 09:41:06 2004	2	+++ configure Wed Oct 26 21:44:35 2005
3	@@ -1,7 +1,9 @@	3	@@ -1,7 +1,9 @@
4	+#!/bin/sh	4	+#!/bin/sh
5	+	5	+
Lines 11-22 Link Here
11	PREFIX=/usr/local	11	PREFIX=/usr/local
12	LDSTATIC=	12	LDSTATIC=
13		13
14	@@ -168,6 +170,8 @@	14	@@ -178,15 +180,15 @@
15	if [ "x$LDSTATIC" != "x" ]; then	15	cd libmpeg3
16	echo >> global_config "LDFLAGS += $LDSTATIC"	16
		17	if [ ${USE_MMX} = 1 ]; then
		18	- ./configure --no-css
		19	+ ./configure --no-css --prefix=${PREFIX}
		20	else
		21	- ./configure --no-css --no-mmx
		22	+ ./configure --no-css --no-mmx --prefix=${PREFIX}
17	fi	23	fi
18	+
19	+egrep "^LDFLAGS\|^DONT_USE_AVI\|^VIDEO_EXPORT_ONLY" global_config > video/global_config
20		24
21	echo "done"	25	cd ../quicktime
22		26
		27	if [ ${USE_MMX} = 1 ]; then
		28	- ./configure $NOFIREWIRE
		29	+ ./configure $NOFIREWIRE --prefix=${PREFIX}
		30	else
		31	- ./configure $NOFIREWIRE --no-mmx
		32	+ ./configure $NOFIREWIRE --no-mmx --prefix=${PREFIX}
		33	fi




--- libmpeg3/configure.orig	Mon Feb 12 22:35:41 2001
+++ libmpeg3/configure	Wed Oct 26 21:42:33 2005
@@ -6,6 +6,10 @@
 for ac_option
 do
 case "$ac_option" in
+	--prefix=*)
+		PREFIX=`echo $ac_option|sed -e 's/.*=//'` 
+		;;
+
 	--alpha)
 		USE_MMX=0
 		USE_CSS=0
@@ -43,8 +47,8 @@
 EOF
 
 
-if test -z "$CFLAGS"; then
-	echo >> global_config "CFLAGS = -O2 -D_FILE_OFFSET_BITS=64 -funroll-loops -fomit-frame-pointer -malign-loops=2 -malign-jumps=2 -malign-functions=2 -march=i486 -I/usr/local/include"
+if true; then
+	echo >> global_config "CFLAGS += -D_FILE_OFFSET_BITS=64 -I${PREFIX}/include"
 fi
 
 cat >> global_config << EOF




--- quicktime/configure.orig	Mon Feb 12 22:35:41 2001
+++ quicktime/configure	Wed Oct 26 21:40:17 2005
@@ -6,6 +6,10 @@
 for ac_option
 do
 case "$ac_option" in
+	--prefix=*)
+		PREFIX=`echo $ac_option|sed -e 's/.*=//'` 
+		;;
+
 	--alpha)
 		USE_MMX=0
 		;;
@@ -39,8 +43,8 @@
 # DO NOT EDIT.  EDIT ./configure INSTEAD AND RERUN IT.
 EOF
 
-if test -z "$CFLAGS"; then
-	echo >> global_config "CFLAGS = -O2 -fomit-frame-pointer -malign-loops=2 -malign-jumps=2 -malign-functions=2 -march=i486 -I/usr/local/include"
+if true; then
+	echo >> global_config "CFLAGS += -I${PREFIX}/include"
 fi
 
 if [ ${USE_FIREWIRE} = 1 ]; then




--- video/Makefile.orig	Fri Oct 26 03:27:02 2001
+++ video/Makefile	Wed Oct 26 20:51:35 2005
@@ -1,4 +1,4 @@
-include ../global_config
+include ./global_config
 CC = gcc
 #CFLAGS += -g -I../libmpeg3 -I../quicktime
 CFLAGS += -I../libmpeg3 -I../quicktime 
@@ -17,7 +17,8 @@
  ifneq ($(strip $(DYNAMIC_LOADING)),)
   PLUGINS+= codecs/rtjpeg_input.so 

 
-exportvideo: $(PLUGINS) $(OBJ) ../global_config 
-	if [ \"x$(VIDEO_EXPORT_ONLY)\" = \"x\" ]; then VIDEO_EXPORT_ONLY=1 make exportvideo; else $(CXX) $(CFLAGS) -o $@ $(OBJ) ../libmpeg3/libmpeg3.a ../quicktime/libquicktime.a -lpthread -lpng -lz -lm -L/usr/local/lib $(LIBAVIPLAYORNOT) $(LDFLAGS); fi
+exportvideo: $(PLUGINS) $(OBJ) ../global_config
+	$(CXX) $(CFLAGS) -o $@ $(OBJ) ../libmpeg3/libmpeg3.a ../quicktime/libquicktime.a -pthread -lpng -lz -lm -L/usr/local/lib $(LIBAVIPLAYORNOT) $(LDFLAGS)
 
 .s.o:

Lines 1-4 Link Here

(-)exportvideo/pkg-plist (-1 lines)
1	bin/exportvideo	1	bin/exportvideo
2	bin/nuv4dvd	2	bin/nuv4dvd
3	%%PORTDOCS%%%%DOCSDIR%%/README.FreeBSD	3	%%PORTDOCS%%%%DOCSDIR%%/README.FreeBSD
4	%%PORTDOCS%%@dirrm %%DOCSDIR%%

Return to bug 88075

Lines 1-13 Link Here

(-)exportvideo/files/patch-libmpeg3_configure (-4 / +15 lines)
1	--- libmpeg3/configure.orig Mon Feb 12 22:35:19 2001	1	--- libmpeg3/configure.orig Mon Feb 12 22:35:41 2001
2	+++ libmpeg3/configure Mon Nov 1 09:41:06 2004	2	+++ libmpeg3/configure Wed Oct 26 21:42:33 2005
3	@@ -43,8 +43,8 @@	3	@@ -6,6 +6,10 @@
		4	for ac_option
		5	do
		6	case "$ac_option" in
		7	+ --prefix=*)
		8	+ PREFIX=`echo $ac_option\|sed -e 's/.*=//'`
		9	+ ;;
		10	+
		11	--alpha)
		12	USE_MMX=0
		13	USE_CSS=0
		14	@@ -43,8 +47,8 @@
4	EOF	15	EOF
5		16
6		17
7	-if test -z "$CFLAGS"; then	18	-if test -z "$CFLAGS"; then
8	- echo >> global_config "CFLAGS = -O2 -D_FILE_OFFSET_BITS=64 -funroll-loops -fomit-frame-pointer -malign-loops=2 -malign-jumps=2 -malign-functions=2 -march=i486 -I/usr/local/include"	19	- echo >> global_config "CFLAGS = -O2 -D_FILE_OFFSET_BITS=64 -funroll-loops -fomit-frame-pointer -malign-loops=2 -malign-jumps=2 -malign-functions=2 -march=i486 -I/usr/local/include"
9	+if true; then	20	+if true; then
10	+ echo >> global_config "CFLAGS = $CFLAGS -D_FILE_OFFSET_BITS=64 -I/usr/local/include"	21	+ echo >> global_config "CFLAGS += -D_FILE_OFFSET_BITS=64 -I${PREFIX}/include"
11	fi	22	fi
12		23
13	cat >> global_config << EOF	24	cat >> global_config << EOF

Lines 1-13 Link Here

(-)exportvideo/files/patch-quicktime_configure (-4 / +15 lines)
1	--- quicktime/configure.orig Mon Feb 12 22:35:19 2001	1	--- quicktime/configure.orig Mon Feb 12 22:35:41 2001
2	+++ quicktime/configure Mon Nov 1 09:41:06 2004	2	+++ quicktime/configure Wed Oct 26 21:40:17 2005
3	@@ -39,8 +39,8 @@	3	@@ -6,6 +6,10 @@
		4	for ac_option
		5	do
		6	case "$ac_option" in
		7	+ --prefix=*)
		8	+ PREFIX=`echo $ac_option\|sed -e 's/.*=//'`
		9	+ ;;
		10	+
		11	--alpha)
		12	USE_MMX=0
		13	;;
		14	@@ -39,8 +43,8 @@
4	# DO NOT EDIT. EDIT ./configure INSTEAD AND RERUN IT.	15	# DO NOT EDIT. EDIT ./configure INSTEAD AND RERUN IT.
5	EOF	16	EOF
6		17
7	-if test -z "$CFLAGS"; then	18	-if test -z "$CFLAGS"; then
8	- echo >> global_config "CFLAGS = -O2 -fomit-frame-pointer -malign-loops=2 -malign-jumps=2 -malign-functions=2 -march=i486 -I/usr/local/include"	19	- echo >> global_config "CFLAGS = -O2 -fomit-frame-pointer -malign-loops=2 -malign-jumps=2 -malign-functions=2 -march=i486 -I/usr/local/include"
9	+if true; then	20	+if true; then
10	+ echo >> global_config "CFLAGS = $CFLAGS -I/usr/local/include"	21	+ echo >> global_config "CFLAGS += -I${PREFIX}/include"
11	fi	22	fi
12		23
13	if [ ${USE_FIREWIRE} = 1 ]; then	24	if [ ${USE_FIREWIRE} = 1 ]; then

Lines 1-11 Link Here

(-)exportvideo/files/patch-video_Makefile (-9 / +3 lines)
1	--- video/Makefile.orig Fri Oct 26 03:26:40 2001	1	--- video/Makefile.orig Fri Oct 26 03:27:02 2001
2	+++ video/Makefile Mon Nov 1 09:41:06 2004	2	+++ video/Makefile Wed Oct 26 20:51:35 2005
3	@@ -1,4 +1,4 @@
4	-include ../global_config
5	+include ./global_config
6	CC = gcc
7	#CFLAGS += -g -I../libmpeg3 -I../quicktime
8	CFLAGS += -I../libmpeg3 -I../quicktime
9	@@ -17,7 +17,8 @@	3	@@ -17,7 +17,8 @@
10	ifneq ($(strip $(DYNAMIC_LOADING)),)	4	ifneq ($(strip $(DYNAMIC_LOADING)),)
11	PLUGINS+= codecs/rtjpeg_input.so	5	PLUGINS+= codecs/rtjpeg_input.so
Lines 22-28 Link Here
22		16
23	-exportvideo: $(PLUGINS) $(OBJ) ../global_config	17	-exportvideo: $(PLUGINS) $(OBJ) ../global_config
24	- if [ \"x$(VIDEO_EXPORT_ONLY)\" = \"x\" ]; then VIDEO_EXPORT_ONLY=1 make exportvideo; else $(CXX) $(CFLAGS) -o $@ $(OBJ) ../libmpeg3/libmpeg3.a ../quicktime/libquicktime.a -lpthread -lpng -lz -lm -L/usr/local/lib $(LIBAVIPLAYORNOT) $(LDFLAGS); fi	18	- if [ \"x$(VIDEO_EXPORT_ONLY)\" = \"x\" ]; then VIDEO_EXPORT_ONLY=1 make exportvideo; else $(CXX) $(CFLAGS) -o $@ $(OBJ) ../libmpeg3/libmpeg3.a ../quicktime/libquicktime.a -lpthread -lpng -lz -lm -L/usr/local/lib $(LIBAVIPLAYORNOT) $(LDFLAGS); fi
25	+exportvideo: $(PLUGINS) $(OBJ)	19	+exportvideo: $(PLUGINS) $(OBJ) ../global_config
26	+ $(CXX) $(CFLAGS) -o $@ $(OBJ) ../libmpeg3/libmpeg3.a ../quicktime/libquicktime.a -pthread -lpng -lz -lm -L/usr/local/lib $(LIBAVIPLAYORNOT) $(LDFLAGS)	20	+ $(CXX) $(CFLAGS) -o $@ $(OBJ) ../libmpeg3/libmpeg3.a ../quicktime/libquicktime.a -pthread -lpng -lz -lm -L/usr/local/lib $(LIBAVIPLAYORNOT) $(LDFLAGS)
27		21
28	.s.o:	22	.s.o: