Attachment #48879 for bug #74754

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





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

		dvdread.3:${PORTSDIR}/multimedia/libdvdread \
		faac.0:${PORTSDIR}/audio/faac \
		mp3lame.0:${PORTSDIR}/audio/lame \
		mp4v2.0:${PORTSDIR}/multimedia/mpeg4ip-libmp4v2 \
		mpeg2.0:${PORTSDIR}/multimedia/libmpeg2 \
		ogg.5:${PORTSDIR}/audio/libogg \
		samplerate.1:${PORTSDIR}/audio/libsamplerate \


.if ${OSVERSION} < 500000
USE_GETOPT_LONG=	yes
MAKE_ENV=		EXTRA_LIBS="-lcipher -lgnugetopt"
WITH_DVD_DEVICE?=	acd0c
.else
WITH_DVD_DEVICE?=	acd0

Lines 1-6 Link Here

(-)multimedia/handbrake/files/patch-Jamfile (-2 / +3 lines)
1	--- Jamfile.orig Wed May 26 05:51:32 2004	1	--- Jamfile.orig Wed May 26 05:51:32 2004
2	+++ Jamfile Mon Nov 22 20:29:09 2004	2	+++ Jamfile Tue Nov 30 23:08:28 2004
3	@@ -54,6 +54,20 @@	3	@@ -54,6 +54,21 @@
4	ObjectCcFlags $(GTK2_SRC) : `pkg-config gtk+-2.0 --cflags` ;	4	ObjectCcFlags $(GTK2_SRC) : `pkg-config gtk+-2.0 --cflags` ;
5	Main $(GTK2_BIN) : $(GTK2_SRC) ;	5	Main $(GTK2_BIN) : $(GTK2_SRC) ;
6	}	6	}
Lines 15-20 Link Here
15	+ -L%%PREFIX%%/lib %%PTHREAD_LIBS%% $(EXTRA_LIBS) `pkg-config gtk+-2.0 --libs`	15	+ -L%%PREFIX%%/lib %%PTHREAD_LIBS%% $(EXTRA_LIBS) `pkg-config gtk+-2.0 --libs`
16	+ -la52 -ldvdcss -ldvdread -lfaac -lmp3lame -lmp4v2	16	+ -la52 -ldvdcss -ldvdread -lfaac -lmp3lame -lmp4v2
17	+ -lmpeg2 -logg -lsamplerate -lvorbis -lvorbisenc -lxvidcore ;	17	+ -lmpeg2 -logg -lsamplerate -lvorbis -lvorbisenc -lxvidcore ;
		18	+ ObjectCcFlags $(TEST_SRC) : -I%%PREFIX%%/include ;
18	+ ObjectCcFlags $(GTK2_SRC) : `pkg-config gtk+-2.0 --cflags` ;	19	+ ObjectCcFlags $(GTK2_SRC) : `pkg-config gtk+-2.0 --cflags` ;
19	+ Main $(GTK2_BIN) : $(GTK2_SRC) ;	20	+ Main $(GTK2_BIN) : $(GTK2_SRC) ;
20	+}	21	+}




--- 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"



 struct HBWork
 {
@@ -132,7 +132,7 @@
     }
 
     HBBufferClose( &scaledBuffer );
-    free( frame );
+    av_free( frame );
 
     return 1;
 }

Return to bug 74754

Lines 7-12 Link Here

(-)multimedia/handbrake/Makefile (-2 / +3 lines)
7		7
8	PORTNAME= handbrake	8	PORTNAME= handbrake
9	PORTVERSION= 0.6.2	9	PORTVERSION= 0.6.2
		10	PORTREVISION= 1
10	CATEGORIES= multimedia	11	CATEGORIES= multimedia
11	MASTER_SITES= http://people.via.ecp.fr/~titer/handbrake/ \	12	MASTER_SITES= http://people.via.ecp.fr/~titer/handbrake/ \
12	http://download.videolan.org/pub/videolan/vlc/0.8.1/contrib/:ffmpeg	13	http://download.videolan.org/pub/videolan/vlc/0.8.1/contrib/:ffmpeg
Lines 24-30 Link Here
24	dvdread.3:${PORTSDIR}/multimedia/libdvdread \	25	dvdread.3:${PORTSDIR}/multimedia/libdvdread \
25	faac.0:${PORTSDIR}/audio/faac \	26	faac.0:${PORTSDIR}/audio/faac \
26	mp3lame.0:${PORTSDIR}/audio/lame \	27	mp3lame.0:${PORTSDIR}/audio/lame \
27	mp4.0:${PORTSDIR}/multimedia/mpeg4ip \	28	mp4v2.0:${PORTSDIR}/multimedia/mpeg4ip-libmp4v2 \
28	mpeg2.0:${PORTSDIR}/multimedia/libmpeg2 \	29	mpeg2.0:${PORTSDIR}/multimedia/libmpeg2 \
29	ogg.5:${PORTSDIR}/audio/libogg \	30	ogg.5:${PORTSDIR}/audio/libogg \
30	samplerate.1:${PORTSDIR}/audio/libsamplerate \	31	samplerate.1:${PORTSDIR}/audio/libsamplerate \
Lines 62-68 Link Here
62		63
63	.if ${OSVERSION} < 500000	64	.if ${OSVERSION} < 500000
64	USE_GETOPT_LONG= yes	65	USE_GETOPT_LONG= yes
65	MAKE_ENV= EXTRA_LIBS="-lcipher"	66	MAKE_ENV= EXTRA_LIBS="-lcipher -lgnugetopt"
66	WITH_DVD_DEVICE?= acd0c	67	WITH_DVD_DEVICE?= acd0c
67	.else	68	.else
68	WITH_DVD_DEVICE?= acd0	69	WITH_DVD_DEVICE?= acd0

Lines 1-5 Link Here

(-)multimedia/handbrake/files/patch-core_FfmpegEnc.c (-2 / +11 lines)
1	--- core/FfmpegEnc.c.orig Mon Nov 22 21:55:47 2004	1	--- core/FfmpegEnc.c.orig Wed May 26 05:51:32 2004
2	+++ core/FfmpegEnc.c Mon Nov 22 21:28:42 2004	2	+++ core/FfmpegEnc.c Mon Dec 6 14:40:28 2004
3	@@ -7,7 +7,7 @@	3	@@ -7,7 +7,7 @@
4	#include "HBInternal.h"	4	#include "HBInternal.h"
5		5
Lines 9-11 Link Here
9		9
10	struct HBWork	10	struct HBWork
11	{	11	{
		12	@@ -132,7 +132,7 @@
		13	}
		14
		15	HBBufferClose( &scaledBuffer );
		16	- free( frame );
		17	+ av_free( frame );
		18
		19	return 1;
		20	}