From amistry@am-productions.biz  Tue Jan 17 03:53:26 2006
Return-Path: <amistry@am-productions.biz>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 9F36216A41F
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 17 Jan 2006 03:53:26 +0000 (GMT)
	(envelope-from amistry@am-productions.biz)
Received: from smtp2.fuse.net (mail-out2.fuse.net [216.68.8.175])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 6E45943D4C
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 17 Jan 2006 03:53:25 +0000 (GMT)
	(envelope-from amistry@am-productions.biz)
Received: from gx6.fuse.net ([69.61.164.22]) by smtp2.fuse.net
          (InterMail vM.6.01.04.04 201-2131-118-104-20050224) with ESMTP
          id <20060117035324.RNSH1908.smtp2.fuse.net@gx6.fuse.net>
          for <FreeBSD-gnats-submit@freebsd.org>;
          Mon, 16 Jan 2006 22:53:24 -0500
Received: from bigguy.am-productions.biz ([69.61.164.22]) by gx6.fuse.net
          (InterMail vG.1.02.00.02 201-2136-104-102-20041210) with ESMTP
          id <20060117035323.TAPO24344.gx6.fuse.net@bigguy.am-productions.biz>
          for <FreeBSD-gnats-submit@freebsd.org>;
          Mon, 16 Jan 2006 22:53:23 -0500
Message-Id: <1137470169.93752@bigguy.am-productions.biz>
Date: Mon, 16 Jan 2006 22:56:09 -0500
From: "Anish Mistry" <amistry@am-productions.biz>
To: "FreeBSD gnats submit" <FreeBSD-gnats-submit@freebsd.org>
Subject: Update Avidemux to fix a build problem on some systems
X-Send-Pr-Version: gtk-send-pr 0.4.7 
X-GNATS-Notify:

>Number:         91898
>Category:       ports
>Synopsis:       Update Avidemux to fix a build problem on some systems
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    anray
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Jan 17 04:00:18 GMT 2006
>Closed-Date:    Tue Jan 17 13:14:07 GMT 2006
>Last-Modified:  Tue Jan 17 13:14:07 GMT 2006
>Originator:     Anish Mistry
>Release:        FreeBSD 6.0-STABLE i386
>Organization:
AM Productions 
>Environment:


System: FreeBSD 6.0-STABLE #10: Fri Jan  6 17:53:21 EST 2006
    amistry@bigguy.am-productions.biz:/usr/obj/usr/src/sys/BIGGUY



>Description:


Fix a problem with -pthread not being picked up by some systems.  Also add Ogg Vorbis detection and inclusion, as well as remove the old aclocal hack and use the method described in the PR.


>How-To-Repeat:





>Fix:


--- avidemux-vorbis-update.ptach begins here ---
diff -ruN avidemux2.orig/Makefile avidemux2/Makefile
--- avidemux2.orig/Makefile	Mon Jan 16 22:08:45 2006
+++ avidemux2/Makefile	Mon Jan 16 22:52:28 2006
@@ -7,6 +7,7 @@
 
 PORTNAME=	avidemux2
 PORTVERSION=	2.1.0
+PORTREVISION=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	http://fixounet.free.fr/avidemux/ \
 		http://download.berlios.de/avidemux/
@@ -22,6 +23,7 @@
 BUILD_DEPENDS=	${LOCALBASE}/lib/libjs.so:${PORTSDIR}/lang/spidermonkey
 
 USE_AUTOTOOLS=	automake:19:env autoconf:259:env libtool:15
+USE_ACLOCAL_VER=19
 USE_REINPLACE=	yes
 USE_X_PREFIX=	yes
 USE_GNOME=	gnomeprefix gnomehack gtk20
@@ -29,7 +31,7 @@
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include \
 		-I${LOCALBASE}/include/a52dec" \
 		LIBFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
-		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
+		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}" \
 		PTHREAD_LIBS=${PTHREAD_LIBS} \
 		PTHREAD_CFLAGS=${PTHREAD_CFLAGS}
 CONFIGURE_ARGS=	--disable-warnings \
@@ -41,7 +43,8 @@
 		X264 "H.264 encoding" off \
 		A52 "A52 audio" off \
 		XVID "Xvid video" off \
-		SDL "SDL audio/video framework" off
+		SDL "SDL audio/video framework" off \
+		VORBIS "OGG/Vorbis audio support" off
 
 .include <bsd.port.pre.mk>
 
@@ -49,6 +52,10 @@
 #WITH_SDL=	yes
 #.endif
 
+.if exists(${LOCALBASE}/lib/libvorbis.so)
+WITH_VORBIS=	yes
+.endif
+
 .if exists(${LOCALBASE}/lib/libx264.so)
 WITH_X264=	yes
 .endif
@@ -94,6 +101,10 @@
 LIB_DEPENDS+=	x264.1:${PORTSDIR}/multimedia/x264
 .endif
 
+.if defined(WITH_VORBIS)
+LIB_DEPENDS+=   vorbis.3:${PORTSDIR}/audio/libvorbis
+.endif
+
 .if ${OSVERSION} < 500000
 BROKEN=		"does not compile"
 .endif
@@ -116,9 +127,6 @@
 		${WRKSRC}/avidemux/ADM_audiodevice/ADM_deviceSDL.cpp \
 		${WRKSRC}/avidemux/ADM_gui2/GUI_sdlDraw.cpp \
 		${WRKSRC}/avidemux/main.cpp
-#	 ACLOCAL hack see PR ports/41945
-	@(cd ${CONFIGURE_WRKSRC} && ${SETENV} ${AUTOMAKE_ENV} ${ACLOCAL} \
-		--acdir=${ACLOCAL_DIR})
 .if ${OSVERSION} < 500000
 	@${REINPLACE_CMD} 's|-falign-loops=16||' ${WRKSRC}/configure \
 		${WRKSRC}/adm_lavcodec/Makefile.in \
--- avidemux-vorbis-update.ptach ends here ---



>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->anray 
Responsible-Changed-By: anray 
Responsible-Changed-When: Tue Jan 17 12:32:07 UTC 2006 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=91898 
State-Changed-From-To: open->closed 
State-Changed-By: anray 
State-Changed-When: Tue Jan 17 13:14:05 UTC 2006 
State-Changed-Why:  
Committed, with minor changes. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=91898 
>Unformatted:
