Date: Mon, 16 May 2005 16:17:59 -0400 From: "Anish Mistry" <amistry@am-productions.biz> To: "FreeBSD gnats submit" <FreeBSD-gnats-submit@FreeBSD.org> Subject: ports/81131: Update to 3.0.38 Message-ID: <1116274679.0@bigguy.am-productions.biz> Resent-Message-ID: <200505162020.j4GKK1hk026240@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 81131
>Category: ports
>Synopsis: Update to 3.0.38
>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 May 16 20:20:01 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: Anish Mistry
>Release: FreeBSD 5.4-STABLE i386
>Organization:
AM Productions
>Environment:
System: FreeBSD 5.4-STABLE #0: Wed May 11 12:25:42 EDT 2005
amistry@bigguy.am-productions.biz:/usr/obj/usr/src/sys/BIGGUY
>Description:
Update avidemux2 to 3.0.38 release. Remove the old ffmpeg dependancy since a version has been included for a while. Remove nasm since that dependancy is also gone. Bump port revision and platform specific configure flags since the authors says that these are now autodetected.
>How-To-Repeat:
Apply patch and rebuild
>Fix:
--- avidemux-2.0.38.patch begins here ---
diff -ruN avidemux2.orig/Makefile avidemux2/Makefile
--- avidemux2.orig/Makefile Mon May 16 15:51:08 2005
+++ avidemux2/Makefile Mon May 16 15:57:51 2005
@@ -7,11 +7,11 @@
PORTNAME= avidemux2
PORTVERSION= 2.0.38
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= multimedia
MASTER_SITES= http://fixounet.free.fr/avidemux/ \
http://download.berlios.de/avidemux/
-DISTNAME= avidemux-${PORTVERSION}rc1
+DISTNAME= avidemux-${PORTVERSION}
MAINTAINER= amistry@am-productions.biz
COMMENT= Simple GUI based video editor
@@ -31,7 +31,6 @@
USE_GNOME= gnomeprefix gnomehack gtk20
WANT_SDL= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include \
- -I${LOCALBASE}/include/ffmpeg \
-I${LOCALBASE}/include/a52dec" \
LIBFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
@@ -80,12 +79,6 @@
.if defined(WITH_XVID)
LIB_DEPENDS+= xvidcore.4:${PORTSDIR}/multimedia/xvid
CONFIGURE_ARGS+= --with-xvid-as-decoder
-.endif
-
-.if ${ARCH} != "i386"
-CONFIGURE_ARGS+= --disable-mmx
-.else
-BUILD_DEPENDS+= nasm:${PORTSDIR}/devel/nasm
.endif
.if defined(WITH_A52)
diff -ruN avidemux2.orig/distinfo avidemux2/distinfo
--- avidemux2.orig/distinfo Mon May 16 15:51:08 2005
+++ avidemux2/distinfo Mon May 16 15:47:16 2005
@@ -1,2 +1,2 @@
-MD5 (avidemux-2.0.38rc1.tar.gz) = 59f0cfff83a7a04bfadaf51fe35fd225
-SIZE (avidemux-2.0.38rc1.tar.gz) = 3177994
+MD5 (avidemux-2.0.38.tar.gz) = 23a34f138518ae646d4173e0a32e48ac
+SIZE (avidemux-2.0.38.tar.gz) = 3503709
diff -ruN avidemux2.orig/files/patch-aa avidemux2/files/patch-aa
--- avidemux2.orig/files/patch-aa Mon May 16 15:51:08 2005
+++ avidemux2/files/patch-aa Wed Dec 31 19:00:00 1969
@@ -1,29 +0,0 @@
-Index: avidemux/ADM_audio/audio_mpegidentify.cpp
-===================================================================
-RCS file: /cvsroot/avidemux/avidemux/avidemux/ADM_audio/audio_mpegidentify.cpp,v
-retrieving revision 1.4
-diff -u -r1.4 audio_mpegidentify.cpp
---- avidemux/ADM_audio/audio_mpegidentify.cpp 19 Feb 2005 16:07:20 -0000 1.4
-+++ avidemux/ADM_audio/audio_mpegidentify.cpp 20 Feb 2005 15:35:11 -0000
-@@ -33,7 +33,7 @@
- #include "fourcc.h"
- #include "aviaudio.hxx"
-
--#include "ADM_audio/ADM_mp3info.h"
-+#include "ADM_audio/ADM_mp3info.h"
-
-
- uint8_t mpegAudioIdentify(uint8_t *ptr, uint32_t maxLookUp, WAVHeader *header, uint8_t *tokens)
-@@ -58,9 +58,12 @@
- if(info.layer==3) header->encoding=WAV_MP3;
- else header->encoding=WAV_MP2;
-
-+ if(tokens)
-+ {
- tokens[0]=ptr[offset+1];
- tokens[1]=ptr[offset+2]&0xfd;
- tokens[2]=ptr[offset+3];
-+ }
- #define DUMPX(x) printf(#x": %d\n",info.x);
- DUMPX( level);
- DUMPX( layer);
diff -ruN avidemux2.orig/files/patch-ab avidemux2/files/patch-ab
--- avidemux2.orig/files/patch-ab Mon May 16 15:51:08 2005
+++ avidemux2/files/patch-ab Wed Dec 31 19:00:00 1969
@@ -1,11 +0,0 @@
---- 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 Mon May 16 15:51:08 2005
+++ avidemux2/files/patch-ac Wed Dec 31 19:00:00 1969
@@ -1,62 +0,0 @@
---- 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 <string.h>
- #include <sys/stat.h>
-
-+#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 <sys/stat.h>
- #include <pthread.h>
-
-+#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 <string.h>
- #include <sys/stat.h>
-
-+#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 Mon May 16 15:51:08 2005
+++ avidemux2/files/patch-ad Wed Dec 31 19:00:00 1969
@@ -1,33 +0,0 @@
---- 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.38.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1116274679.0>