Attachment 58437 Details for Bug 88075 – exportvideo-1.0a.patch

[patch] exportvideo-1.0a.patch

exportvideo-1.0a.patch (text/plain), 5.40 KB, created by Frank W. Josellis on 2005-10-27 11:20:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Frank W. Josellis

Created: 2005-10-27 11:20:19 UTC

Size: 5.40 KB

patch

obsolete

>diff -Nur exportvideo.BAK/Makefile exportvideo/Makefile
>--- exportvideo.BAK/Makefile	Mon Oct 24 23:04:07 2005
>+++ exportvideo/Makefile	Wed Oct 26 22:03:23 2005
>@@ -7,6 +7,7 @@
> 
> PORTNAME=	exportvideo
> PORTVERSION=	1.0
>+PORTREVISION=	1
> CATEGORIES=	multimedia
> MASTER_SITES=	http://tigerente.htu.tuwien.ac.at/~aoe/mystuff/mpeg2_movie-avipatch/
> DISTNAME=	${PORTNAME}.7e-pre9
>@@ -21,7 +22,7 @@
> USE_XLIB=	yes
> USE_GMAKE=	yes
> HAS_CONFIGURE=	yes
>-CONFIGURE_ARGS=	--no-avi
>+CONFIGURE_ARGS=	--no-avi --prefix=${PREFIX}
> 
> WRKSRC=		${WRKDIR}/${DISTNAME}
> 
>diff -Nur exportvideo.BAK/files/patch-configure exportvideo/files/patch-configure
>--- exportvideo.BAK/files/patch-configure	Mon Oct 24 23:04:07 2005
>+++ exportvideo/files/patch-configure	Wed Oct 26 22:03:23 2005
>@@ -1,5 +1,5 @@
>---- configure.orig	Tue Oct  9 18:14:28 2001
>-+++ configure	Mon Nov  1 09:41:06 2004
>+--- configure.orig	Tue Oct  9 18:14:50 2001
>++++ configure	Wed Oct 26 21:44:35 2005
> @@ -1,7 +1,9 @@
> +#!/bin/sh
> +
>@@ -11,12 +11,23 @@
>  PREFIX=/usr/local
>  LDSTATIC=
>  
>-@@ -168,6 +170,8 @@
>- if [ "x$LDSTATIC" != "x" ]; then                                
>- 	echo >> global_config "LDFLAGS += $LDSTATIC" 
>+@@ -178,15 +180,15 @@
>+ cd libmpeg3
>+ 
>+ if [ ${USE_MMX} = 1 ]; then
>+-	./configure --no-css
>++	./configure --no-css --prefix=${PREFIX}
>+ else
>+-	./configure --no-css --no-mmx
>++	./configure --no-css --no-mmx --prefix=${PREFIX}
>  fi
>-+
>-+egrep "^LDFLAGS|^DONT_USE_AVI|^VIDEO_EXPORT_ONLY" global_config > video/global_config
>  
>- echo "done"
>+ cd ../quicktime
>  
>+ if [ ${USE_MMX} = 1 ]; then
>+-	./configure $NOFIREWIRE
>++	./configure $NOFIREWIRE --prefix=${PREFIX}
>+ else
>+-	./configure $NOFIREWIRE --no-mmx
>++	./configure $NOFIREWIRE --no-mmx --prefix=${PREFIX}
>+ fi
>diff -Nur exportvideo.BAK/files/patch-libmpeg3_configure exportvideo/files/patch-libmpeg3_configure
>--- exportvideo.BAK/files/patch-libmpeg3_configure	Mon Oct 24 23:04:07 2005
>+++ exportvideo/files/patch-libmpeg3_configure	Wed Oct 26 22:03:23 2005
>@@ -1,13 +1,24 @@
>---- libmpeg3/configure.orig	Mon Feb 12 22:35:19 2001
>-+++ libmpeg3/configure	Mon Nov  1 09:41:06 2004
>-@@ -43,8 +43,8 @@
>+--- 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 = $CFLAGS -D_FILE_OFFSET_BITS=64 -I/usr/local/include"
>++	echo >> global_config "CFLAGS += -D_FILE_OFFSET_BITS=64 -I${PREFIX}/include"
>  fi
>  
>  cat >> global_config << EOF
>diff -Nur exportvideo.BAK/files/patch-quicktime_configure exportvideo/files/patch-quicktime_configure
>--- exportvideo.BAK/files/patch-quicktime_configure	Mon Oct 24 23:04:07 2005
>+++ exportvideo/files/patch-quicktime_configure	Wed Oct 26 22:03:23 2005
>@@ -1,13 +1,24 @@
>---- quicktime/configure.orig	Mon Feb 12 22:35:19 2001
>-+++ quicktime/configure	Mon Nov  1 09:41:06 2004
>-@@ -39,8 +39,8 @@
>+--- 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 = $CFLAGS -I/usr/local/include"
>++	echo >> global_config "CFLAGS += -I${PREFIX}/include"
>  fi
>  
>  if [ ${USE_FIREWIRE} = 1 ]; then
>diff -Nur exportvideo.BAK/files/patch-video_Makefile exportvideo/files/patch-video_Makefile
>--- exportvideo.BAK/files/patch-video_Makefile	Mon Oct 24 23:04:07 2005
>+++ exportvideo/files/patch-video_Makefile	Wed Oct 26 22:03:23 2005
>@@ -1,11 +1,5 @@
>---- video/Makefile.orig	Fri Oct 26 03:26:40 2001
>-+++ video/Makefile	Mon Nov  1 09:41:06 2004
>-@@ -1,4 +1,4 @@
>--include ../global_config
>-+include ./global_config
>- CC = gcc
>- #CFLAGS += -g -I../libmpeg3 -I../quicktime
>- CFLAGS += -I../libmpeg3 -I../quicktime 
>+--- video/Makefile.orig	Fri Oct 26 03:27:02 2001
>++++ video/Makefile	Wed Oct 26 20:51:35 2005
> @@ -17,7 +17,8 @@
>   ifneq ($(strip $(DYNAMIC_LOADING)),)
>    PLUGINS+= codecs/rtjpeg_input.so 
>@@ -22,7 +16,7 @@
>  
> -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)
>++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:
>diff -Nur exportvideo.BAK/pkg-plist exportvideo/pkg-plist
>--- exportvideo.BAK/pkg-plist	Mon Oct 24 23:04:07 2005
>+++ exportvideo/pkg-plist	Wed Oct 26 22:03:23 2005
>@@ -1,4 +1,3 @@
> bin/exportvideo
> bin/nuv4dvd
> %%PORTDOCS%%%%DOCSDIR%%/README.FreeBSD
>-%%PORTDOCS%%@dirrm %%DOCSDIR%%

Actions: View | Diff

Attachments on bug 88075: 58437