Date: Fri, 24 Jun 2011 07:21:36 GMT From: Barbara <barbara.xxx1975@libero.it> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/158247: multimedia/avidemux2-plugins: fix build after x264 upgrade Message-ID: <201106240721.p5O7La4J039827@red.freebsd.org> Resent-Message-ID: <201106240730.p5O7UBVc070573@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 158247 >Category: ports >Synopsis: multimedia/avidemux2-plugins: fix build after x264 upgrade >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Fri Jun 24 07:30:10 UTC 2011 >Closed-Date: >Last-Modified: >Originator: Barbara >Release: RELENG_8 >Organization: >Environment: FreeBSD satanasso.local.net 8.2-STABLE FreeBSD 8.2-STABLE #0: Sat Jun 11 15:14:16 CEST 2011 root@satanasso.local.net:/usr/obj/usr/src/sys/SATANASSO i386 >Description: After upgrading x264, multimedia/avidemux2-plugins is failing at about 94%. I've found a fix for Gentoo Linux and tested it successfully. I've created in multimedia/avidemux2/files the following files: patch-plugins_ADM_videoEncoder_ADM_vidEnc_x264_encoder.cpp.txt http://pastebin.com/L3qTG4bF patch-plugins_ADM_videoEncoder_ADM_vidEnc_x264_x264Options.cpp.txt http://pastebin.com/ASYZMmz4 I'm trying to attach a shar archive with the two files, that should be extracted in /usr/ports >How-To-Repeat: # after upgrading multimedia/x264 to x264-0.115.2000 cd /usr/ports/multimedia/avidemux2-plugins && make >Fix: Patch attached with submission follows: # This is a shell archive. Save it in a file, remove anything before # this line, and then unpack it by entering "sh file". Note, it may # create directories; files and directories will be owned by you and # have default permissions. # # This archive contains: # # multimedia/avidemux2/files/patch-plugins_ADM_videoEncoder_ADM_vidEnc_x264_encoder.cpp.txt # multimedia/avidemux2/files/patch-plugins_ADM_videoEncoder_ADM_vidEnc_x264_x264Options.cpp.txt # echo x - multimedia/avidemux2/files/patch-plugins_ADM_videoEncoder_ADM_vidEnc_x264_encoder.cpp.txt sed 's/^X//' >multimedia/avidemux2/files/patch-plugins_ADM_videoEncoder_ADM_vidEnc_x264_encoder.cpp.txt << '9775aa46eeed6da0d46af06fdac2c00e' X--- plugins/ADM_videoEncoder/ADM_vidEnc_x264/encoder.cpp.orig 2010-10-03 18:54:51.000000000 +0200 X+++ plugins/ADM_videoEncoder/ADM_vidEnc_x264/encoder.cpp 2011-06-24 08:48:53.000000000 +0200 X@@ -488,8 +488,10 @@ X printf("[x264] analyse.b_transform_8x8 = %d\n", x264Param->analyse.b_transform_8x8); X printf("[x264] analyse.inter = %d\n", x264Param->analyse.inter); X printf("[x264] b_cabac = %d\n", x264Param->b_cabac); X-#if X264_BUILD > 101 X+#if X264_BUILD > 101 && X264_BUILD < 115 X printf("[x264] i_open_gop = %d\n", x264Param->i_open_gop); X+#elif X264_BUILD > 114 X+ printf("[x264] i_open_gop = %d\n", x264Param->b_open_gop); X #endif X printf("[x264] b_interlaced = %d\n", x264Param->b_interlaced); X #if X264_BUILD > 88 9775aa46eeed6da0d46af06fdac2c00e echo x - multimedia/avidemux2/files/patch-plugins_ADM_videoEncoder_ADM_vidEnc_x264_x264Options.cpp.txt sed 's/^X//' >multimedia/avidemux2/files/patch-plugins_ADM_videoEncoder_ADM_vidEnc_x264_x264Options.cpp.txt << '7b20785be80732736be4681dbb5a55b3' X--- plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp.orig 2010-12-31 22:23:09.000000000 +0100 X+++ plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp 2011-06-24 08:53:51.000000000 +0200 X@@ -417,7 +417,7 @@ X _param.b_cabac = cabac; X } X X-#if X264_BUILD > 101 X+#if X264_BUILD > 101 && X264_BUILD < 115 X unsigned int x264Options::getOpenGopMode(void) X { X return _param.i_open_gop; X@@ -428,6 +428,17 @@ X if (openGopMode < 3) X _param.i_open_gop = openGopMode; X } X+#elif X264_BUILD > 114 X+unsigned int x264Options::getOpenGopMode(void) X+{ X+ return _param.b_open_gop; X+} X+void x264Options::setOpenGopMode(unsigned int openGopMode) X+{ X+ if (openGopMode < 3) X+ _param.b_open_gop = openGopMode; X+} X+ X #endif X X unsigned int x264Options::getInterlaced(void) 7b20785be80732736be4681dbb5a55b3 exit >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201106240721.p5O7La4J039827>