Date: Mon, 6 Dec 2004 15:33:50 +1300 From: Andrew Thompson <andy@fud.org.nz> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/74754: [maintainer-update] free() fix for multimedia/handbrake Message-ID: <20041206023350.GC30563@thingy.tbd.co.nz> Resent-Message-ID: <200412060240.iB62eL4a040615@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 74754 >Category: ports >Synopsis: [maintainer-update] free() fix for multimedia/handbrake >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Mon Dec 06 02:40:21 GMT 2004 >Closed-Date: >Last-Modified: >Originator: Andrew Thompson >Release: FreeBSD 5.3-BETA6 i386 >Organization: >Environment: System: FreeBSD hudson.fire.org.nz 5.3-BETA6 FreeBSD 5.3-BETA6 #0: Sat Oct 16 09:21:06 NZDT 2004 root@hudson.fire.org.nz:/usr/obj/usr/src/sys/HUDSON i386 >Description: 1. libavcodec will modify the pointer from avcodec_alloc_frame() to align the memory. handbrake will free this pointer without taking this into account and cause "modified (chunk-) pointer" warnings. Use av_free() to fix this. 2. Depend on mpeg4ip-libmp4v2 now that the headers are fixed. 3. Link to gnugetopt on 4.x to fix the build. I have had 4.x users email me and this *is* required (i've submitted this before). The build uses jam so the USE_GETOPT_LONG magic doesnt apply. >How-To-Repeat: >Fix: 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; + } >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20041206023350.GC30563>