From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Mar 12 01:30:03 2005 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2B53D16A4CF for ; Sat, 12 Mar 2005 01:30:03 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id B9B6343D7C for ; Sat, 12 Mar 2005 01:30:02 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id j2C1U2uO070357 for ; Sat, 12 Mar 2005 01:30:02 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id j2C1U2Ml070356; Sat, 12 Mar 2005 01:30:02 GMT (envelope-from gnats) Resent-Date: Sat, 12 Mar 2005 01:30:02 GMT Resent-Message-Id: <200503120130.j2C1U2Ml070356@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, "Anish Mistry" Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 32FA416A4CE for ; Sat, 12 Mar 2005 01:24:51 +0000 (GMT) Received: from pimout2-ext.prodigy.net (pimout2-ext.prodigy.net [207.115.63.101]) by mx1.FreeBSD.org (Postfix) with ESMTP id 25C5E43D1D for ; Sat, 12 Mar 2005 01:24:50 +0000 (GMT) (envelope-from amistry@am-productions.biz) Received: from bigguy.am-productions.biz (adsl-68-252-59-28.dsl.wotnoh.ameritech.net [68.252.59.28]) j2C1OhMW039138; Fri, 11 Mar 2005 20:24:43 -0500 Message-Id: <1110590940.0@bigguy.am-productions.biz> Date: Fri, 11 Mar 2005 20:29:00 -0500 From: "Anish Mistry" To: "FreeBSD gnats submit" X-Send-Pr-Version: gtk-send-pr 0.4.4 cc: Randy Pratt Subject: ports/78717: Avidemux2 Fix 2.0.38rc1 Build for 4.x and amd64 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Mar 2005 01:30:03 -0000 >Number: 78717 >Category: ports >Synopsis: Avidemux2 Fix 2.0.38rc1 Build for 4.x and amd64 >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: Sat Mar 12 01:30:02 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Anish Mistry >Release: FreeBSD 5.3-STABLE i386 >Organization: AM Productions >Environment: System: FreeBSD 5.3-STABLE #0: Sun Mar 6 15:54:13 EST 2005 amistry@bigguy.am-productions.biz:/usr/obj/usr/src/sys/BIGGUY >Description: Fix 4.x build and amd64 build. >How-To-Repeat: >Fix: --- avidemux-2.0.38rc1_1.patch begins here --- diff -ruN avidemux2.orig/Makefile avidemux2/Makefile --- avidemux2.orig/Makefile Fri Mar 11 19:55:52 2005 +++ avidemux2/Makefile Fri Mar 11 20:24:14 2005 @@ -7,6 +7,7 @@ PORTNAME= avidemux2 PORTVERSION= 2.0.38 +PORTREVISION= 1 CATEGORIES= multimedia MASTER_SITES= http://fixounet.free.fr/avidemux/ \ http://download.berlios.de/avidemux/ diff -ruN avidemux2.orig/files/patch-ab avidemux2/files/patch-ab --- avidemux2.orig/files/patch-ab Wed Dec 31 19:00:00 1969 +++ avidemux2/files/patch-ab Fri Mar 11 19:58:03 2005 @@ -0,0 +1,11 @@ +--- adm_lavcodec/common.h.orig Tue Mar 8 23:22:48 2005 ++++ adm_lavcodec/common.h Tue Mar 8 23:21:07 2005 +@@ -249,7 +249,7 @@ + # ifdef DEBUG + # define dprintf(fmt,...) av_log(NULL, AV_LOG_DEBUG, fmt, ##args) + # else +-# define dprintf(fmt,...) ++# define dprintf(fmt,a...) + # endif + + # endif /* !CONFIG_WIN32 */ diff -ruN avidemux2.orig/files/patch-ac avidemux2/files/patch-ac --- avidemux2.orig/files/patch-ac Wed Dec 31 19:00:00 1969 +++ avidemux2/files/patch-ac Fri Mar 11 19:58:03 2005 @@ -0,0 +1,62 @@ +--- avidemux/ADM_mplex/ADM_mplexin.cpp.jsc Thu Mar 10 21:12:52 2005 ++++ avidemux/ADM_mplex/ADM_mplexin.cpp Thu Mar 10 21:13:19 2005 +@@ -17,6 +17,7 @@ + #include + #include + ++#include "interact.hpp" + + #undef malloc + #undef realloc +@@ -36,7 +37,6 @@ + #include "mjpeg_logging.h" + #include "mpegconsts.h" + +-#include "interact.hpp" + #include "bits.hpp" + #include "outputstrm.hpp" + #include "multiplexor.hpp" +--- avidemux/ADM_mplex/ADM_mplexmuxer.cpp.jsc Thu Mar 10 07:59:46 2005 ++++ avidemux/ADM_mplex/ADM_mplexmuxer.cpp Thu Mar 10 08:00:08 2005 +@@ -37,6 +37,8 @@ + #include + #include + ++#include "interact.hpp" ++ + #undef malloc + #undef realloc + #undef free +@@ -65,7 +67,6 @@ + #include "mjpeg_logging.h" + #include "mpegconsts.h" + +-#include "interact.hpp" + #include "bits.hpp" + #include "outputstrm.hpp" + #include "multiplexor.hpp" +--- avidemux/ADM_mplex/ADM_mplexout.cpp.orig Tue Jan 25 14:26:47 2005 ++++ avidemux/ADM_mplex/ADM_mplexout.cpp Fri Mar 11 19:32:32 2005 +@@ -6,6 +6,7 @@ + #include + #include + ++#include "interact.hpp" + + #undef malloc + #undef realloc +@@ -26,7 +27,6 @@ + #include "mjpeg_logging.h" + #include "mpegconsts.h" + +-#include "interact.hpp" + #include "bits.hpp" + #include "outputstrm.hpp" + #include "multiplexor.hpp" +@@ -94,4 +94,4 @@ + return _transfert->read(buf,number); + } + //EOF +- +\ No newline at end of file ++ diff -ruN avidemux2.orig/files/patch-ad avidemux2/files/patch-ad --- avidemux2.orig/files/patch-ad Wed Dec 31 19:00:00 1969 +++ avidemux2/files/patch-ad Fri Mar 11 20:11:37 2005 @@ -0,0 +1,33 @@ +--- configure.orig Fri Mar 11 20:10:04 2005 ++++ configure Fri Mar 11 20:10:21 2005 +@@ -21779,7 +21779,7 @@ + else + touch adm_lavcodec/config.cpu + fi;; +- x86_64) ++ x86_64|amd64) + have_little_endian=yes; + echo "TARGET_X86_64=yes" >> adm_lavcodec/config.cpu + +--- configure.in.orig Fri Mar 11 20:09:53 2005 ++++ configure.in Fri Mar 11 20:10:38 2005 +@@ -717,7 +717,7 @@ + else + touch adm_lavcodec/config.cpu + fi;; +- x86_64) ++ x86_64|amd64) + have_little_endian=yes; + echo "TARGET_X86_64=yes" >> adm_lavcodec/config.cpu + AC_DEFINE(HAVE_X86_64,1,"X86_64 amd64 assembly") +--- configure.in.in.orig Fri Mar 11 20:09:59 2005 ++++ configure.in.in Fri Mar 11 20:10:54 2005 +@@ -717,7 +717,7 @@ + else + touch adm_lavcodec/config.cpu + fi;; +- x86_64) ++ x86_64|amd64) + have_little_endian=yes; + echo "TARGET_X86_64=yes" >> adm_lavcodec/config.cpu + AC_DEFINE(HAVE_X86_64,1,"X86_64 amd64 assembly") --- avidemux-2.0.38rc1_1.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: