FreeBSD Mail Archives

Date:      Tue, 28 Nov 2006 01:13:41 -0500
From:      "Anish Mistry" <amistry@am-productions.biz>
To:        "FreeBSD gnats submit" <FreeBSD-gnats-submit@FreeBSD.org>
Subject:   ports/105938: Update multimedia/avidemux2 to 2.3.0
Message-ID:  <1164694421.24972@bigguy.am-productions.biz>
Resent-Message-ID: <200611280630.kAS6UHdX034419@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help


>Number:         105938
>Category:       ports
>Synopsis:       Update multimedia/avidemux2 to 2.3.0
>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:   Tue Nov 28 06:30:16 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     Anish Mistry
>Release:        FreeBSD 6.2-PRERELEASE i386
>Organization:
AM Productions 
>Environment:


System: FreeBSD 6.2-PRERELEASE #1: Mon Nov 13 19:07:00 EST 2006
    amistry@bigguy.am-productions.biz:/usr/home/amistry/storage/temp/usr/home/amistry/windows-share/build/src/sys/BIGGUY



>Description:


Update to 2.3.0.


>How-To-Repeat:





>Fix:


--- avidemux-2.3.0.patch begins here ---
diff -ruN avidemux2.orig/Makefile avidemux2/Makefile
--- avidemux2.orig/Makefile	Tue Nov 28 01:08:09 2006
+++ avidemux2/Makefile	Tue Nov 28 01:09:49 2006
@@ -2,26 +2,26 @@
 # Date created:         16 April 2003
 # Whom:                 Anish Mistry
 #                       with help from mean
-# $FreeBSD: ports/multimedia/avidemux2/Makefile,v 1.41 2006/10/03 04:04:32 rafan Exp $
+# $FreeBSD: ports/multimedia/avidemux2/Makefile,v 1.36 2006/05/19 05:57:24 itetcu Exp $
 #
 
 PORTNAME=	avidemux2
-PORTVERSION=	2.1.2
-PORTREVISION=	4
+PORTVERSION=	2.3.0
 CATEGORIES=	multimedia
 MASTER_SITES=	http://fixounet.free.fr/avidemux/ \
 		${MASTER_SITE_BERLIOS}
 MASTER_SITE_SUBDIR=	avidemux
-DISTNAME=	avidemux-${PORTVERSION}
+DISTNAME=	avidemux_${PORTVERSION}
 
 MAINTAINER=	amistry@am-productions.biz
 COMMENT=	Simple GUI based video editor
 
 PATCH_DEPENDS=	${ACLOCAL}:${PORTSDIR}/devel/automake19
-LIB_DEPENDS=	mp3lame.0:${PORTSDIR}/audio/lame \
-		mad.2:${PORTSDIR}/audio/libmad \
-		xml2.5:${PORTSDIR}/textproc/libxml2 \
-		js.1:${PORTSDIR}/lang/spidermonkey
+BUILD_DEPENDS=	spidermonkey>=1.5_3:${PORTSDIR}/lang/spidermonkey
+LIB_DEPENDS=	mp3lame:${PORTSDIR}/audio/lame \
+		mad:${PORTSDIR}/audio/libmad \
+		js:${PORTSDIR}/lang/spidermonkey \
+		xml2:${PORTSDIR}/textproc/libxml2
 
 USE_AUTOTOOLS=	automake:19:env autoconf:259:env libtool:15 aclocal:19:env
 USE_X_PREFIX=	yes
@@ -44,6 +44,7 @@
 		XVID "Xvid video" off \
 		SDL "SDL audio/video framework" off \
 		VORBIS "OGG/Vorbis audio support" off
+PLIST_FILES=	bin/avidemux2
 
 .include <bsd.port.pre.mk>
 
@@ -63,25 +64,25 @@
 WITH_FAAC=	yes
 .endif
 
-.if exists(${LOCALBASE}/lib/libfaad.so.0)
+.if exists(${LOCALBASE}/lib/libfaad.so)
 WITH_FAAD=	yes
 .endif
 
-.if exists(${LOCALBASE}/lib/liba52.so.0)
+.if exists(${LOCALBASE}/lib/liba52.so)
 WITH_A52=	yes
 .endif
 
-.if exists(${LOCALBASE}/lib/libxvidcore.so.4)
+.if exists(${LOCALBASE}/lib/libxvidcore.so)
 WITH_XVID=	yes
 .endif
 
 .if defined(WITH_XVID)
-LIB_DEPENDS+=	xvidcore.4:${PORTSDIR}/multimedia/xvid
+LIB_DEPENDS+=	xvidcore:${PORTSDIR}/multimedia/xvid
 CONFIGURE_ARGS+=	--with-xvid-as-decoder
 .endif
 
 .if defined(WITH_A52)
-LIB_DEPENDS+=	a52.0:${PORTSDIR}/audio/liba52
+LIB_DEPENDS+=	a52:${PORTSDIR}/audio/liba52
 .endif
 
 .if defined(WITH_SDL)
@@ -89,19 +90,19 @@
 .endif
 
 .if defined(WITH_FAAC)
-LIB_DEPENDS+=	faac.0:${PORTSDIR}/audio/faac
+LIB_DEPENDS+=	faac:${PORTSDIR}/audio/faac
 .endif
 
 .if defined(WITH_FAAD)
-LIB_DEPENDS+=	faad.0:${PORTSDIR}/audio/faad
+LIB_DEPENDS+=	faad:${PORTSDIR}/audio/faad
 .endif
 
 .if defined(WITH_X264)
-LIB_DEPENDS+=	x264.50:${PORTSDIR}/multimedia/x264
+LIB_DEPENDS+=	x264:${PORTSDIR}/multimedia/x264
 .endif
 
 .if defined(WITH_VORBIS)
-LIB_DEPENDS+=	vorbis.3:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS+=	vorbis:${PORTSDIR}/audio/libvorbis
 .endif
 
 .if ${OSVERSION} < 500000
@@ -119,24 +120,24 @@
 post-patch:
 	@${TOUCH} ${WRKSRC}/*
 	@${REINPLACE_CMD} 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure ${WRKSRC}/*/*/Makefile
-	@${REINPLACE_CMD} 's|<malloc.h>|<stdlib.h>|g' ${WRKSRC}/adm_lavcodec/*.c
-	@${REINPLACE_CMD} 's|<malloc.h>|<stdlib.h>|g' ${WRKSRC}/adm_lavcodec/*/*.c
+	@${REINPLACE_CMD} 's|<malloc.h>|<stdlib.h>|g' ${WRKSRC}/avidemux/ADM_lavcodec/*.c
+	@${REINPLACE_CMD} 's|<malloc.h>|<stdlib.h>|g' ${WRKSRC}/avidemux/ADM_lavcodec/*/*.c
 	@${REINPLACE_CMD} 's|ADM_LOCALEDIR=$${datadir}/locale|ADM_LOCALEDIR=${PREFIX}/share/locale|' ${WRKSRC}/configure
 	@${REINPLACE_CMD} "s|-O2|${CFLAGS}|" ${WRKSRC}/configure
 .if !defined(WITH_OPTIMIZED_CFLAGS)
-	@${REINPLACE_CMD} "s|-O3|${CFLAGS}|" ${WRKSRC}/adm_lavcodec/Makefile.am
+	@${REINPLACE_CMD} "s|-O3|${CFLAGS}|" ${WRKSRC}/avidemux/ADM_lavcodec/Makefile.am
 .endif
 .if ${OSVERSION} < 500000
 	@${REINPLACE_CMD} 's|-falign-loops=16||' ${WRKSRC}/configure \
-		${WRKSRC}/adm_lavcodec/Makefile.in \
-		${WRKSRC}/adm_lavcodec/Makefile.in \
-		${WRKSRC}/adm_lavcodec/libpostproc/Makefile.in \
-		${WRKSRC}/adm_lavcodec/libpostproc/Makefile.am
+		${WRKSRC}/avidemux/ADM_lavcodec/Makefile.in \
+		${WRKSRC}/avidemux/ADM_lavcodec/Makefile.in \
+		${WRKSRC}/avidemux/ADM_lavcodec/libpostproc/Makefile.in \
+		${WRKSRC}/avidemux/ADM_lavcodec/libpostproc/Makefile.am
 	@${REINPLACE_CMD} 's|-msse||' ${WRKSRC}/configure \
-		${WRKSRC}/adm_lavcodec/Makefile.in \
-		${WRKSRC}/adm_lavcodec/Makefile.am \
-		${WRKSRC}/adm_lavcodec/libpostproc/Makefile.in \
-		${WRKSRC}/adm_lavcodec/libpostproc/Makefile.am
+		${WRKSRC}/avidemux/ADM_lavcodec/Makefile.in \
+		${WRKSRC}/avidemux/ADM_lavcodec/Makefile.am \
+		${WRKSRC}/avidemux/ADM_lavcodec/libpostproc/Makefile.in \
+		${WRKSRC}/avidemux/ADM_lavcodec/libpostproc/Makefile.am
 .endif
 
 .include <bsd.port.post.mk>
diff -ruN avidemux2.orig/distinfo avidemux2/distinfo
--- avidemux2.orig/distinfo	Tue Nov 28 01:08:09 2006
+++ avidemux2/distinfo	Tue Nov 28 01:10:54 2006
@@ -1,3 +1,3 @@
-MD5 (avidemux-2.1.2.tar.gz) = 727214aacdf729506a13d0e0117f01de
-SHA256 (avidemux-2.1.2.tar.gz) = d76bff4e92e76a79785a8649e6350a1af9de13efc67f9871e287f4e662733910
-SIZE (avidemux-2.1.2.tar.gz) = 3830241
+MD5 (avidemux_2.3.0.tar.gz) = 14c58c14fc9757d36e4d72498431da42
+SHA256 (avidemux_2.3.0.tar.gz) = ef083ab24e3ec612b10c8a0163845ff680fea845d5eade21d60d47e843b4c623
+SIZE (avidemux_2.3.0.tar.gz) = 4750919
diff -ruN avidemux2.orig/files/patch-avidemux_ADM_codecs_ADM_x264.cpp avidemux2/files/patch-avidemux_ADM_codecs_ADM_x264.cpp
--- avidemux2.orig/files/patch-avidemux_ADM_codecs_ADM_x264.cpp	Tue Nov 28 01:08:09 2006
+++ avidemux2/files/patch-avidemux_ADM_codecs_ADM_x264.cpp	Wed Dec 31 19:00:00 1969
@@ -1,20 +0,0 @@
---- avidemux/ADM_codecs/ADM_x264.cpp.orig	Thu Aug 10 07:44:45 2006
-+++ avidemux/ADM_codecs/ADM_x264.cpp	Thu Aug 10 07:45:53 2006
-@@ -200,7 +200,7 @@
- {
-   memset(&param,0,sizeof(param));
-   x264_param_default( &param );
--  param.rc.b_cbr=1;
-+  param.rc.i_rc_method = X264_RC_CQP;
-   param.rc.i_bitrate=val/1000;  
- //  param.rc.i_rc_buffer_size=val/1000;
- //  param.rc.i_rc_init_buffer=(val/1000)>>1;
-@@ -234,7 +234,7 @@
-   memset(&param,0,sizeof(param));
-   x264_param_default( &param );
-   
--  param.rc.b_cbr=1;
-+  param.rc.i_rc_method = X264_RC_CQP;
-   param.rc.i_bitrate=val;  
-   //param.rc.i_rc_buffer_size=val;
-   //param.rc.i_rc_init_buffer=val>>1;
--- avidemux-2.3.0.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?1164694421.24972>

Header And Logo

Peripheral Links

Site Navigation

Header And Logo

Peripheral Links

Search

Site Navigation