Index: head/multimedia/avidemux2/Makefile =================================================================== --- head/multimedia/avidemux2/Makefile (revision 123573) +++ head/multimedia/avidemux2/Makefile (revision 123574) @@ -1,140 +1,136 @@ # New ports collection makefile for: avidemux2 # Date created: 16 April 2003 # Whom: Anish Mistry # with help from mean # $FreeBSD$ # PORTNAME= avidemux2 -PORTVERSION= 2.0.32 -PORTREVISION= 2 +PORTVERSION= 2.0.34 CATEGORIES= multimedia MASTER_SITES= http://fixounet.free.fr/avidemux/ \ http://download.berlios.de/avidemux/ -DISTNAME= avidemux-${PORTVERSION} +DISTNAME= avidemux-${PORTVERSION}-test1 MAINTAINER= amistry@am-productions.biz COMMENT= Simple GUI based video editor LIB_DEPENDS= mp3lame.0:${PORTSDIR}/audio/lame \ mad.2:${PORTSDIR}/audio/libmad \ xml2.5:${PORTSDIR}/textproc/libxml2 -BUILD_DEPENDS= \ - ${X11BASE}/include/X11/extensions/Xvlib.h:${PORTSDIR}/graphics/xv +WANT_AUTOCONF_VER=259 +WANT_AUTOCONF_RUN=yes +WANT_AUTOMAKE_VER=19 +WANT_AUTOMAKE_RUN=yes USE_REINPLACE= yes USE_X_PREFIX= yes USE_LIBTOOL_VER=15 USE_GNOME= gnomeprefix gnomehack gtk20 WANT_SDL= yes GNU_CONFIGURE= 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" \ PTHREAD_LIBS=${PTHREAD_LIBS} \ PTHREAD_CFLAGS=${PTHREAD_CFLAGS} CONFIGURE_ARGS= --disable-warnings USE_GMAKE= yes +OPTIONS= OPTIMIZED_CFLAGS "build with -O3 for lavcodec" off \ + FAAC "FAAC (mpeg4/aac encoder)" off \ + FAAD "FAAD (mpeg4/aac decoder)" off \ + MPEGENC "MPEG/MJPEG video" off \ + A52 "A52 audio" off \ + XVID "Xvid video" off \ + SDL "SDL audio/video framework" off .include #.if ${HAVE_SDL:Msdl}!="" #WITH_SDL= yes #.endif .if exists(${LOCALBASE}/lib/libfaac.so) WITH_FAAC= yes .endif .if exists(${LOCALBASE}/lib/libfaad.so.0) WITH_FAAD= yes .endif .if exists(${LOCALBASE}/bin/mpeg2enc) WITH_MPEGENC= yes .endif .if exists(${LOCALBASE}/lib/liba52.so.0) WITH_A52= yes .endif .if exists(${LOCALBASE}/lib/libxvidcore.so.4) WITH_XVID= yes .endif .if defined(WITH_MPEGENC) RUN_DEPENDS+= mpeg2enc:${PORTSDIR}/multimedia/mjpegtools .endif .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) LIB_DEPENDS+= a52.0:${PORTSDIR}/audio/liba52 .endif .if defined(WITH_SDL) USE_SDL+= sdl .endif .if defined(WITH_FAAC) LIB_DEPENDS+= faac.0:${PORTSDIR}/audio/faac .endif .if defined(WITH_FAAD) LIB_DEPENDS+= faad.0:${PORTSDIR}/audio/faad .endif -pre-everything:: -.if !defined(WITH_MPEGENC) - @${ECHO_MSG} "To enable mpeg support define WITH_MPEGENC." -.endif - -.if !defined(WITH_XVID) - @${ECHO_MSG} "To enable xvid as the decoder define WITH_XVID." -.endif - -.if !defined(WITH_A52) - @${ECHO_MSG} "To enable A/52 support define WITH_A52." -.endif - -.if !defined(WITH_SDL) - @${ECHO_MSG} "To enable SDL support define WITH_SDL." -.endif - -.if !defined(WITH_FAAC) - @${ECHO_MSG} "To enable FAAC (mpeg4/aac encoder) support define WITH_FAAC." -.endif - -.if !defined(WITH_FAAD) - @${ECHO_MSG} "To enable FAAD (mpeg4/aac decoder) support define WITH_FAAD." -.endif - post-patch: @${TOUCH} ${WRKSRC}/* @${REINPLACE_CMD} 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure ${WRKSRC}/*/*/Makefile @${REINPLACE_CMD} 's|||g' ${WRKSRC}/adm_lavcodec/*.c @${REINPLACE_CMD} 's|||g' ${WRKSRC}/adm_lavcodec/*/*.c @${REINPLACE_CMD} 's|ADM_LOCALEDIR=$${datadir}/locale|ADM_LOCALEDIR=${PREFIX}/share/locale|' ${WRKSRC}/configure - @${REINPLACE_CMD} "s|-O2|${CFLAGS}|" ${WRKSRC}/adm_lavcodec/Makefile - @${REINPLACE_CMD} "s|-O2||" ${WRKSRC}/configure + @${REINPLACE_CMD} "s|-O2|${CFLAGS}|" ${WRKSRC}/configure +.if !defined(WITH_OPTIMIZED_CFLAGS) + @${REINPLACE_CMD} "s|-O3|${CFLAGS}|" ${WRKSRC}/adm_lavcodec/Makefile.am +.endif @${REINPLACE_CMD} 's|SDL/|SDL11/|' \ ${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||g ; s|-msse||g' ${WRKSRC}/configure \ - ${WRKSRC}/adm_lavcodec/Makefile.in ${WRKSRC}/adm_lavcodec/libpostproc/Makefile.in + @${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 + @${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 .endif .include Property changes on: head/multimedia/avidemux2/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.16 \ No newline at end of property +1.17 \ No newline at end of property Index: head/multimedia/avidemux2/distinfo =================================================================== --- head/multimedia/avidemux2/distinfo (revision 123573) +++ head/multimedia/avidemux2/distinfo (revision 123574) @@ -1,2 +1,2 @@ -MD5 (avidemux-2.0.32.tar.gz) = 0ea965267d1a6500603b1f4ad3f9708a -SIZE (avidemux-2.0.32.tar.gz) = 3160138 +MD5 (avidemux-2.0.34-test1.tar.gz) = 327307dfdf3bcb19cd7a06fefea5df35 +SIZE (avidemux-2.0.34-test1.tar.gz) = 2869582 Property changes on: head/multimedia/avidemux2/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.7 \ No newline at end of property +1.8 \ No newline at end of property