Attachment 48879 Details for Bug 74754 – file.diff

[patch] file.diff

file.diff (text/plain), 2.60 KB, created by Andrew Thompson on 2004-12-06 02:40:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andrew Thompson

Created: 2004-12-06 02:40:21 UTC

Size: 2.60 KB

patch

obsolete

>diff -burN multimedia/handbrake.orig/Makefile multimedia/handbrake/Makefile
>--- multimedia/handbrake.orig/Makefile	Mon Dec  6 14:51:23 2004
>+++ multimedia/handbrake/Makefile	Mon Dec  6 15:09:48 2004
>@@ -7,6 +7,7 @@
> 
> PORTNAME=	handbrake
> PORTVERSION=	0.6.2
>+PORTREVISION=	1
> CATEGORIES=	multimedia
> MASTER_SITES=	http://people.via.ecp.fr/~titer/handbrake/ \
> 		http://download.videolan.org/pub/videolan/vlc/0.8.1/contrib/:ffmpeg
>@@ -24,7 +25,7 @@
> 		dvdread.3:${PORTSDIR}/multimedia/libdvdread \
> 		faac.0:${PORTSDIR}/audio/faac \
> 		mp3lame.0:${PORTSDIR}/audio/lame \
>-		mp4.0:${PORTSDIR}/multimedia/mpeg4ip \
>+		mp4v2.0:${PORTSDIR}/multimedia/mpeg4ip-libmp4v2 \
> 		mpeg2.0:${PORTSDIR}/multimedia/libmpeg2 \
> 		ogg.5:${PORTSDIR}/audio/libogg \
> 		samplerate.1:${PORTSDIR}/audio/libsamplerate \
>@@ -62,7 +63,7 @@
> 
> .if ${OSVERSION} < 500000
> USE_GETOPT_LONG=	yes
>-MAKE_ENV=		EXTRA_LIBS="-lcipher"
>+MAKE_ENV=		EXTRA_LIBS="-lcipher -lgnugetopt"
> WITH_DVD_DEVICE?=	acd0c
> .else
> WITH_DVD_DEVICE?=	acd0
>diff -burN multimedia/handbrake.orig/files/patch-Jamfile multimedia/handbrake/files/patch-Jamfile
>--- multimedia/handbrake.orig/files/patch-Jamfile	Mon Dec  6 14:51:23 2004
>+++ multimedia/handbrake/files/patch-Jamfile	Mon Dec  6 14:53:46 2004
>@@ -1,6 +1,6 @@
> --- Jamfile.orig	Wed May 26 05:51:32 2004
>-+++ Jamfile	Mon Nov 22 20:29:09 2004
>-@@ -54,6 +54,20 @@
>++++ Jamfile	Tue Nov 30 23:08:28 2004
>+@@ -54,6 +54,21 @@
>      ObjectCcFlags   $(GTK2_SRC) : `pkg-config gtk+-2.0 --cflags` ;
>      Main            $(GTK2_BIN) : $(GTK2_SRC) ;
>  }
>@@ -15,6 +15,7 @@
> +    		-L%%PREFIX%%/lib %%PTHREAD_LIBS%% $(EXTRA_LIBS) `pkg-config gtk+-2.0 --libs`
> +    		-la52 -ldvdcss -ldvdread -lfaac -lmp3lame -lmp4v2
> +		-lmpeg2 -logg -lsamplerate -lvorbis -lvorbisenc -lxvidcore ;
>++    ObjectCcFlags   $(TEST_SRC) : -I%%PREFIX%%/include ;
> +    ObjectCcFlags   $(GTK2_SRC) : `pkg-config gtk+-2.0 --cflags` ;
> +    Main            $(GTK2_BIN) : $(GTK2_SRC) ;
> +}
>diff -burN multimedia/handbrake.orig/files/patch-core_FfmpegEnc.c multimedia/handbrake/files/patch-core_FfmpegEnc.c
>--- multimedia/handbrake.orig/files/patch-core_FfmpegEnc.c	Mon Dec  6 14:51:23 2004
>+++ multimedia/handbrake/files/patch-core_FfmpegEnc.c	Mon Dec  6 14:53:27 2004
>@@ -1,5 +1,5 @@
>---- core/FfmpegEnc.c.orig	Mon Nov 22 21:55:47 2004
>-+++ core/FfmpegEnc.c	Mon Nov 22 21:28:42 2004
>+--- core/FfmpegEnc.c.orig	Wed May 26 05:51:32 2004
>++++ core/FfmpegEnc.c	Mon Dec  6 14:40:28 2004
> @@ -7,7 +7,7 @@
>  #include "HBInternal.h"
> 
>@@ -9,3 +9,12 @@
> 
>  struct HBWork
>  {
>+@@ -132,7 +132,7 @@
>+     }
>+ 
>+     HBBufferClose( &scaledBuffer );
>+-    free( frame );
>++    av_free( frame );
>+ 
>+     return 1;
>+ }

Actions: View | Diff

Attachments on bug 74754: 48879