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: ports/91898: Update Avidemux to fix a build problem on some systems Message-ID: <1137470169.93752@bigguy.am-productions.biz> Resent-Message-ID: <200601170400.k0H40JOK059047@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 91898
>Category: ports
>Synopsis: Update Avidemux to fix a build problem on some systems
>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: Tue Jan 17 04:00:18 GMT 2006
>Closed-Date:
>Last-Modified:
>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:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1137470169.93752>