From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Mar 14 18:20:04 2012 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 855FE1065674 for ; Wed, 14 Mar 2012 18:20:04 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 621548FC14 for ; Wed, 14 Mar 2012 18:20:04 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q2EIK47K074409 for ; Wed, 14 Mar 2012 18:20:04 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q2EIK4VO074408; Wed, 14 Mar 2012 18:20:04 GMT (envelope-from gnats) Resent-Date: Wed, 14 Mar 2012 18:20:04 GMT Resent-Message-Id: <201203141820.q2EIK4VO074408@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, "4721@hushmail.com" <4721@hushmail.com> Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 32ECA106566B for ; Wed, 14 Mar 2012 18:15:47 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22]) by mx1.freebsd.org (Postfix) with ESMTP id 222888FC1B for ; Wed, 14 Mar 2012 18:15:47 +0000 (UTC) Received: from red.freebsd.org (localhost [127.0.0.1]) by red.freebsd.org (8.14.4/8.14.4) with ESMTP id q2EIFkxM024806 for ; Wed, 14 Mar 2012 18:15:46 GMT (envelope-from nobody@red.freebsd.org) Received: (from nobody@localhost) by red.freebsd.org (8.14.4/8.14.4/Submit) id q2EIFkql024805; Wed, 14 Mar 2012 18:15:46 GMT (envelope-from nobody) Message-Id: <201203141815.q2EIFkql024805@red.freebsd.org> Date: Wed, 14 Mar 2012 18:15:46 GMT From: "4721@hushmail.com" <4721@hushmail.com> To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/166104: [patch] upgrade multimedia/avidemux2 to 2.5.6 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 14 Mar 2012 18:20:04 -0000 >Number: 166104 >Category: ports >Synopsis: [patch] upgrade multimedia/avidemux2 to 2.5.6 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Wed Mar 14 18:20:04 UTC 2012 >Closed-Date: >Last-Modified: >Originator: 4721@hushmail.com >Release: >Organization: >Environment: >Description: update avidemux2 to 2.5.6 removed file: ports/multimedia/avidemux2/files/patch-x264_encoder.cpp >How-To-Repeat: >Fix: Patch attached with submission follows: diff -r -u ports.orig/multimedia/avidemux2/Makefile.common ports/multimedia/avidemux2/Makefile.common --- ports.orig/multimedia/avidemux2/Makefile.common +++ ports/multimedia/avidemux2/Makefile.common @@ -1,8 +1,8 @@ # $FreeBSD: ports/multimedia/avidemux2/Makefile.common,v 1.10 2012/02/16 20:22:58 ashish Exp $ # -AVIDEMUX2_VERSION= 2.5.5 -PORTREVISION= 4 +AVIDEMUX2_VERSION= 2.5.6 +PORTREVISION= 0 MASTER_SITES= BERLIOS \ SF/avidemux/avidemux/${PORTVERSION} DISTNAME= avidemux_${PORTVERSION} @@ -31,7 +31,7 @@ CMAKE_USE_PTHREAD=yes CMAKE_ARGS+= -DTHREADS_HAVE_PTHREAD_ARG:STRING="${PTHREAD_LIBS}" CMAKE_OUTSOURCE= yes -MAKE_JOBS_SAFE= yes +MAKE_JOBS_UNSAFE= yes BUILD_DEPENDS+= ${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils CONFIGURE_ENV+= COMPILER_PATH=${LOCALBASE}/bin diff -r -u ports.orig/multimedia/avidemux2/distinfo ports/multimedia/avidemux2/distinfo --- ports.orig/multimedia/avidemux2/distinfo +++ ports/multimedia/avidemux2/distinfo @@ -1,2 +1,2 @@ -SHA256 (avidemux_2.5.5.tar.gz) = c5bf45298911e00b06cf48ae4a936525d28cc2dddd4f41ee22e689b023b4923a -SIZE (avidemux_2.5.5.tar.gz) = 15738941 +SHA256 (avidemux_2.5.6.tar.gz) = d6da7f2c4304368bd9c367a74a464b47d42fee9cada2960e70053d61c1ef9b8b +SIZE (avidemux_2.5.6.tar.gz) = 14914123 diff -r -u ports.orig/multimedia/avidemux2/files/ffmpeg-libavcodec-Makefile.patch ports/multimedia/avidemux2/files/ffmpeg-libavcodec-Makefile.patch --- ports.orig/multimedia/avidemux2/files/ffmpeg-libavcodec-Makefile.patch +++ ports/multimedia/avidemux2/files/ffmpeg-libavcodec-Makefile.patch @@ -1,11 +1,11 @@ --- libavcodec/Makefile.orig +++ libavcodec/Makefile -@@ -619,7 +619,7 @@ OBJS-$(CONFIG_MLIB) + +@@ -703,7 +703,7 @@ # well. OBJS-$(!CONFIG_SMALL) += inverse.o ---include $(SUBDIR)$(ARCH)/Makefile -+-include $(SUBDIR)$(FFMPEG_ARCH)/Makefile +--include $(SRC_PATH)/$(SUBDIR)$(ARCH)/Makefile ++-include $(SRC_PATH)/$(SUBDIR)$(FFMPEG_ARCH)/Makefile - SKIPHEADERS = %_tablegen.h - SKIPHEADERS-$(CONFIG_DXVA2) += dxva2.h dxva2_internal.h + SKIPHEADERS += %_tablegen.h \ + %_tables.h \ diff -r -u ports.orig/multimedia/avidemux2/files/patch-x264_encoder.cpp ports/multimedia/avidemux2/files/patch-x264_encoder.cpp --- ports.orig/multimedia/avidemux2/files/patch-x264_encoder.cpp +++ ports/multimedia/avidemux2/files/patch-x264_encoder.cpp @@ -1,14 +0,0 @@ ---- plugins/ADM_videoEncoder/ADM_vidEnc_x264/encoder.cpp.orig 2011-06-24 13:04:17.000000000 +0200 -+++ plugins/ADM_videoEncoder/ADM_vidEnc_x264/encoder.cpp 2011-06-24 13:05:22.000000000 +0200 -@@ -488,8 +488,10 @@ void x264Encoder::printParam(x264_param_ - printf("[x264] analyse.b_transform_8x8 = %d\n", x264Param->analyse.b_transform_8x8); - printf("[x264] analyse.inter = %d\n", x264Param->analyse.inter); - printf("[x264] b_cabac = %d\n", x264Param->b_cabac); --#if X264_BUILD > 101 -+#if X264_BUILD > 101 && X264_BUILD < 115 - printf("[x264] i_open_gop = %d\n", x264Param->i_open_gop); -+#else X264_BUILD > 114 -+ printf("[x264] b_open_gop = %d\n", x264Param->b_open_gop); - #endif - printf("[x264] b_interlaced = %d\n", x264Param->b_interlaced); - #if X264_BUILD > 88 diff -r -u ports.orig/multimedia/avidemux2/pkg-plist ports/multimedia/avidemux2/pkg-plist --- ports.orig/multimedia/avidemux2/pkg-plist +++ ports/multimedia/avidemux2/pkg-plist @@ -1,9 +1,9 @@ bin/avidemux2_cli -lib/libADM5avcodec.so.52 -lib/libADM5avformat.so.52 -lib/libADM5avutil.so.50 +lib/libADM5avcodec.so.53 +lib/libADM5avformat.so.53 +lib/libADM5avutil.so.51 lib/libADM5postproc.so.51 -lib/libADM5swscale.so.0 +lib/libADM5swscale.so.2 lib/libADM_UICli.so lib/libADM_core.so lib/libADM_coreAudio.so >Release-Note: >Audit-Trail: >Unformatted: