Date: Wed, 15 Nov 2006 03:53:08 +0800 (CST) From: Gea-Suan Lin <gslin@gslin.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: gslin@gslin.org, lioux@FreeBSD.org Subject: ports/105538: [PATCH] multimedia/ffmpeg-devel: Update to 2006/11/14 cvs version Message-ID: <20061114195308.6225E3E@netnews.NCTU.edu.tw> Resent-Message-ID: <200611142000.kAEK05Lo093365@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 105538
>Category: ports
>Synopsis: [PATCH] multimedia/ffmpeg-devel: Update to 2006/11/14 cvs version
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Tue Nov 14 20:00:05 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Gea-Suan Lin
>Release: FreeBSD 6.1-RELEASE-p8 i386
>Organization:
>Environment:
System: FreeBSD netnews.NCTU.edu.tw 6.1-RELEASE-p8 FreeBSD 6.1-RELEASE-p8 #0: Fri Sep 29 03:41:50 CST 2006
>Description:
- Update to 2006/11/14 cvs version
- REQUEST FOR LOCAL DISTFILES
Removed file(s):
- files/patch-Makefile
- files/patch-configure
- files/patch-libavcodec::libpostproc::Makefile
- files/patch-libavcodec_x264.c
- files/patch-libavformat::udp.c
- files/patch-libavformat_movenc.c
- files/patch-libavutil__bswap.h
- files/patch-vhook__Makefile
Port maintainer (lioux@FreeBSD.org) is cc'd.
Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:
--- ffmpeg-devel-0.4.9.2006111500.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/multimedia/ffmpeg-devel/Makefile /home/staff/gslin/work/ports/ffmpeg-devel/Makefile
--- /usr/ports/multimedia/ffmpeg-devel/Makefile Mon Oct 9 03:16:20 2006
+++ /home/staff/gslin/work/ports/ffmpeg-devel/Makefile Wed Nov 15 03:51:38 2006
@@ -6,620 +6,172 @@
#
PORTNAME= ffmpeg
-DISTVERSION= 0.4.9.cvs.${RELEASE_DATE}
-PORTREVISION= 4
+PORTVERSION= 0.4.9.${RELEASE_DATE}
CATEGORIES= multimedia audio ipv6 net
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-# http://mplayerhq.hu/MPlayer/cvs/
-MASTER_SITE_SUBDIR= lioux
+MASTER_SITES= http://netnews.nctu.edu.tw/~gslin/tmp/
PKGNAMESUFFIX= -devel
DISTNAME= FFMpeg-${RELEASE_DATE}
MAINTAINER= lioux@FreeBSD.org
COMMENT= Hyper fast realtime audio/video encoder/converter, streaming server
+BUILD_DEPENDS= texi2html:${PORTSDIR}/textproc/texi2html
+
+CONFIGURE_ARGS+= --cc="${CC}" --make="${GMAKE}" \
+ --extra-cflags="${ECFLAGS}" --extra-ldflags=${ELDFLAGS} \
+ --extra-libs=${ELIBS} --disable-debug
+CONFLICTS= ffmpeg-[0-9]*-*
HAS_CONFIGURE= yes
+NO_LATEST_LINK= yes
USE_BZIP2= yes
+USE_GCC= 3.4+
USE_GMAKE= yes
-WANT_SDL= yes
-CONFIGURE_ARGS= --cc="${CC}" --prefix="${PREFIX}" \
- --make="${GMAKE}" \
- --disable-debug \
- --enable-memalign-hack \
- --enable-shared \
- --source-path=${WRKSRC}
-MAKE_ENV= INSTALL="${INSTALL}"
-
-FFMPEG_CFLAGS= \
- -I${WRKSRC}/libavcodec \
- -I${WRKSRC}/libavcodec/i386 \
- -I${WRKSRC}/libavformat \
- -I${WRKSRC}/libavutil \
- -I${LOCALBASE}/include \
- -I${X11BASE}/include \
- -I. -I.. \
- -L${LOCALBASE}/lib \
- -L${X11BASE}/lib \
- ${CFLAGS}
-FFMPEG_LDFLAGS= \
- -L${WRKSRC}/libavcodec/libpostproc \
- -L${WRKSRC}/libavcodec \
- -L${WRKSRC}/libavformat \
- -L${WRKSRC}/libavutil \
- -L${LOCALBASE}/lib \
- -L${X11BASE}/lib \
- ${LDFLAGS} \
- -lm \
- -fpie \
- -fPIE
-
-PLIST_SUB= SHLIB_VERSION=${SHLIB_VERSION}
USE_LDCONFIG= yes
+USE_RC_SUBR= ffserver
+USE_SDL= sdl
+WANT_SDL= yes
-NO_LATEST_LINK= yes
-CONFLICTS= ffmpeg-[0-9]*-*
-
-RELEASE_DATE= 2006032300
-SHLIB_VERSION= 1
-
-MAN1= ffmpeg.1
-
-##
+DOC_DOTFILES= TODO faq.html ffmpeg-doc.html \
+ ffmpeg_powerpc_performance_evaluation_howto.txt \
+ ffplay-doc.html ffserver-doc.html hooks.html \
+ optimization.txt soc.txt
DOC_FILES= COPYING Changelog README
-# under subdir doc
-DOC_DOCFILES= TODO faq.html ffmpeg-doc.html \
- ffplay-doc.html ffserver-doc.html \
- hooks.html optimization.txt
-#
-PORTDOCS= *
-
-## headers
-HEADER_FILES= libavcodec/avcodec.h \
- libavcodec/dsputil.h \
- libavutil/common.h
-#
-# libraries
-LIB_FILES= libavcodec/libavcodec.a \
- libavformat/libavformat.a \
- libavutil/libavutil.a
-
-.include <bsd.port.pre.mk>
+ECFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} ${CFLAGS}
+ELDFLAGS+= ${PTHREAD_LIBS} ${LDFLAGS}
+ELIBS+= -L${LOCALBASE}/lib ${LIBS}
+RELEASE_DATE= 2006111500
+
+OPTIONS+= A52 "Enable GPLed A52 support" off \
+ DTS "Enable GPLed DTS support" off \
+ FAAC "Enable FAAC support" off \
+ FAAD "Enable GPLed FAAD support" off \
+ GPL "Allow libav* and ffmpeg GPLize" off \
+ GSM "Enable GSM support" off \
+ IPV6 "Enable IPV6 support" on \
+ MP3LAME "Enable libmp3lame support" off \
+ MMX "Enable MMX support (i386 only)" on \
+ NETWORK "Enable Network support" on \
+ OGG "Enable Ogg support" off \
+ OPTIMIZED_CFLAGS "Build with optimized CFLAGS" on \
+ PP "Enable GPLed postprocessing support" off \
+ SSE "Enable SSE support in CFLAGS (i386 only)" on \
+ SSE2 "Enable SSE2 support in CFLAGS (i386 only)" on \
+ VORBIS "Enable Vorbis support" off \
+ X264 "Enable GPLed H.264 support" off \
+ XVID "Enable GPLed XviD support" off \
+ ZLIB "Enable zlib support" on
-.if ${ARCH} == "ia64"
-BROKEN= Does not compile on ${ARCH}
-.endif
+MAN1= ffmpeg.1 ffplay.1 ffserver.1
-##
-## default options
-##
-GPLLIBS=yes
-WITHOUT_LIBA52=yes
-
-##
-## support detection
-##
-.if !defined(WITHOUT_IPV6) && ${OSVERSION} >= 400014
-WITH_IPV6= yes
-.endif
-
-##
-## arch detection
-##
-.if ${ARCH} != "i386"
-WITHOUT_MMX= yes
-.else
-#EXTRA_PATCHES+= ${FILESDIR}/extra-bktr-patch-libavformat::Makefile
-.endif
-## sse hardware vector support
-.if (defined(MACHINE_CPU) && ${MACHINE_CPU:Msse} == "sse")
-WITH_BUILTIN_VECTOR= yes
-.endif
-# !i386 does not like bktr
-.if ${ARCH} != "i386"
-CONFIGURE_ARGS+= --disable-bktr
-.endif
-
-##
-## lib detection
-##
-## dts
-.if exists(${LOCALBASE}/lib/libdts.a)
-WITH_DTS=yes
-.endif
-## faac
-.if exists(${LOCALBASE}/lib/libfaac.so)
-WITH_FAAC=yes
-.endif
-## faad
-.if exists(${LOCALBASE}/lib/libfaad.so)
-WITH_FAAD=yes
-.endif
-## freetype2
-.if exists(${LOCALBASE}/lib/libfreetype.so)
-WITH_FREETYPE2=yes
-.endif
-## gsm
-.if exists(${LOCALBASE}/lib/libgsm.so)
-WITH_GSM=yes
-.endif
-## imlib2
-.if exists(${LOCALBASE}/lib/libImlib2.so)
-WITH_IMLIB2=yes
-.endif
-## lame mp3
-.if exists(${LOCALBASE}/lib/libmp3lame.so)
-WITH_MP3=yes
-.endif
-## ogg
-.if exists(${LOCALBASE}/lib/libogg.so)
-WITH_OGG=yes
-.endif
-## sdl
-.if ${HAVE_SDL:Msdl}
-WITH_SDL=yes
-.endif
-## theora
-.if exists(${LOCALBASE}/lib/libtheora.so)
-## XXX theora does not work for the time being
-WITH_THEORA=yes
-.endif
-## vorbis
-.if exists(${LOCALBASE}/lib/libvorbisenc.so)
-WITH_VORBIS=yes
-.endif
-# x264
-.if exists(${LOCALBASE}/lib/libx264.so)
-WITH_X264=yes
-.endif
-# xvid
-.if exists(${LOCALBASE}/lib/libxvidcore.so)
-WITH_XVID=yes
-.endif
-
-##
-## support activation
-##
-## PORTDOCS
-.ifndef(NOPORTDOCS)
-BUILD_DEPENDS+= texi2html:${PORTSDIR}/textproc/texi2html
-.endif
-## optimization
-# breaks ffmpeg build if defined
-FFMPEG_CFLAGS+= -fno-force-addr
+.include <bsd.port.pre.mk>
-.ifdef(WITH_OPTIMIZED_CFLAGS)
-FFMPEG_CFLAGS+= -O3 -ffast-math -fomit-frame-pointer
-. if ${OSVERSION} > 502124
-FFMPEG_CFLAGS+= -fno-unit-at-a-time
-. endif
+.ifdef(WITH_A52)
+CONFIGURE_ARGS+= --enable-a52 --enable-a52bin
+LIB_DEPENDS+= a52:${PORTSDIR}/audio/liba52
.endif
-## a52
-.ifndef(WITHOUT_LIBA52)
-LIB_DEPENDS+= a52.0:${PORTSDIR}/audio/liba52
-
-CONFIGURE_ARGS+= --enable-a52 \
- --enable-a52bin
-
-# libavcodec needs it
-FFMPEG_LDFLAGS+= -la52
-.else
-CONFIGURE_ARGS+= --enable-a52
-.endif
-## dts
.ifdef(WITH_DTS)
BUILD_DEPENDS+= ${LOCALBASE}/lib/libdts.a:${PORTSDIR}/multimedia/libdts
-
CONFIGURE_ARGS+= --enable-dts
+RUN_DEPENDS+= ${LOCALBASE}/lib/libdts.a:${PORTSDIR}/multimedia/libdts
.endif
-## faac
-.ifdef(WITH_FAAC)
-LIB_DEPENDS+= faac.0:${PORTSDIR}/audio/faac
+.ifdef(WITH_FAAC)
CONFIGURE_ARGS+= --enable-faac
+LIB_DEPENDS+= faac:${PORTSDIR}/audio/faac
.endif
-## faad
-.ifdef(WITH_FAAD)
-LIB_DEPENDS+= faad.0:${PORTSDIR}/audio/faad
-CONFIGURE_ARGS+= --enable-faad \
- --enable-faadbin
+.ifdef(WITH_FAAD)
+CONFIGURE_ARGS+= --enable-faad --enable-faadbin
+LIB_DEPENDS+= faac:${PORTSDIR}/audio/faad
.endif
-## ffserver
-.ifdef(WITHOUT_FFMPEG_FFSERVER)
-CONFIGURE_ARGS+= --disable-ffserver
-.else
-USE_RC_SUBR= ffserver
-MAN1+= ffserver.1
+.ifdef(WITH_GPL)
+CONFIGURE_ARGS+= --enable-gpl
+.endif
-PLIST_FILES+= bin/ffserver \
- etc/ffserver.conf.sample
+.ifdef(WITH_GSM)
+CONFIGURE_ARGS+= --enable-libgsm
+LIB_DEPENDS+= gsm:${PORTSDIR}/audio/gsm
.endif
-## gpl libs
-.ifdef(GPLLIBS)
-CONFIGURE_ARGS+= --enable-gpl
+
+.ifdef(WITHOUT_IPV6)
+CONFIGURE_ARGS+= --disable-ipv6
.endif
-## disable mmx
+
.ifdef(WITHOUT_MMX)
CONFIGURE_ARGS+= --disable-mmx
-
-WITHOUT_BUILTIN_VECTOR= yes
.endif
-## gsm
-.ifdef(WITH_GSM)
-LIB_DEPENDS+= gsm.1:${PORTSDIR}/audio/gsm
-CONFIGURE_ARGS+= --enable-libgsm
+.ifdef(WITHOUT_NETWORK)
+CONFIGURE_ARGS+= --disable-network
.endif
-## mp3
-.ifdef(WITH_MP3)
-LIB_DEPENDS+= mp3lame.0:${PORTSDIR}/audio/lame
+.ifdef(WITH_MP3LAME)
CONFIGURE_ARGS+= --enable-mp3lame
+LIB_DEPENDS+= mp3lame:${PORTSDIR}/audio/lame
.endif
-## ogg
-.ifdef(WITH_OGG)
-LIB_DEPENDS+= ogg.5:${PORTSDIR}/audio/libogg
+.ifdef(WITH_OGG)
CONFIGURE_ARGS+= --enable-libogg
+LIB_DEPENDS+= ogg:${PORTSDIR}/audio/libogg
.endif
-## post processing
-.ifndef(WITHOUT_POSTPROCESS)
-CONFIGURE_ARGS+= --enable-pp
-LIB_FILES+= libavcodec/libpostproc/libpostproc.a
-PLIST_DIRS+= include/ffmpeg/postproc
-PLIST_FILES+= include/ffmpeg/postproc/postprocess.h \
- lib/libpostproc.a \
- lib/libpostproc.so \
- lib/libpostproc.so.0 \
- lib/libpostproc.so.%%SHLIB_VERSION%% \
- libdata/pkgconfig/libpostproc.pc
-.endif
-## pthreads
-.ifndef(WITHOUT_PTHREADS)
-CONFIGURE_ARGS+= --enable-pthreads
+.ifndef(WITHOUT_OPTIMIZED_CFLAGS)
+ECFLAGS+= -O3 -ffast-math -fomit-frame-pointer
+. if ${OSVERSION} > 502124
+ECFLAGS+= -fno-unit-at-a-time
+. endif
.endif
-## SDL
-.ifdef(WITH_SDL)
-USE_SDL= sdl
-MAN1+= ffplay.1
-
-PLIST_FILES+= bin/ffplay
+.ifdef(WITH_PP)
+CONFIGURE_ARGS+= --enable-pp
+PLIST_SUB+= FFMPEG_POSTPROCESS=""
.else
-CONFIGURE_ARGS+= --disable-ffplay
+PLIST_SUB+= FFMPEG_POSTPROCESS="@comment "
.endif
-## theora
-.ifdef(WITH_THEORA)
-LIB_DEPENDS+= theora.2:${PORTSDIR}/multimedia/libtheora
-CONFIGURE_ARGS+= --enable-theora
+.ifndef(WITHOUT_SSE)
+ECFLAGS+= -msse
.endif
-## vorbis
-.ifdef(WITH_VORBIS)
-LIB_DEPENDS+= vorbisenc.2:${PORTSDIR}/audio/libvorbis
+.ifndef(WITHOUT_SSE2)
+ECFLAGS+= -msse2
+.endif
+
+.ifdef(WITH_VORBIS)
CONFIGURE_ARGS+= --enable-vorbis
-FFMPEG_CFLAGS+= -I${LOCALBASE}/include/vorbis
+LIB_DEPENDS+= vorbis:${PORTSDIR}/audio/libvorbis
.endif
-# x264
-.ifdef(WITH_X264)
-LIB_DEPENDS+= x264.50:${PORTSDIR}/multimedia/x264
+.ifdef(WITH_X264)
CONFIGURE_ARGS+= --enable-x264
+LIB_DEPENDS+= x264:${PORTSDIR}/multimedia/x264
.endif
-## builtin vector, requires mmx
-.if !defined(WITHOUT_BUILTIN_VECTOR) && defined(WITH_BUILTIN_VECTOR)
-FFMPEG_CFLAGS+= -msse
-.endif
-## vhook
-.ifndef(WITHOUT_VHOOK)
-PLIST_DIRS+= lib/vhook
-PLIST_FILES+= \
- lib/vhook/fish.so \
- lib/vhook/null.so \
- lib/vhook/ppm.so \
- lib/vhook/watermark.so
-
-# enable freetype2
-. ifdef(WITH_FREETYPE2)
-LIB_DEPENDS+= freetype.9:${PORTSDIR}/print/freetype2
-
-PLIST_FILES+= lib/vhook/drawtext.so
-. endif # freetype2
-
-# enable imlib2
-. ifdef(WITH_IMLIB2)
-LIB_DEPENDS+= Imlib2.3:${PORTSDIR}/graphics/imlib2
-
-PLIST_FILES+= lib/vhook/imlib2.so
-. else
-WITHOUT_IMLIB2= yes
-. endif # imlib2
-.else
-CONFIGURE_ARGS+= --disable-vhook
-.endif ## WITHOUT_VHOOK
-## xvid
.ifdef(WITH_XVID)
-LIB_DEPENDS+= xvidcore.4:${PORTSDIR}/multimedia/xvid
-
CONFIGURE_ARGS+= --enable-xvid
+LIB_DEPENDS+= xvidcore:${PORTSDIR}/multimedia/xvid
.endif
-###
-### XXX - PLIST_DIRS come after PLIST entries so some aforementioned
-### entries breaks PLIST
-###
-PLIST_DIRS+= include/ffmpeg
-
-pre-everything::
-.ifndef(WITHOUT_LIBA52)
- @${ECHO_MSG} 'You can disable liba52 support by defining WITHOUT_LIBA52'
- @${ECHO_MSG}
-.endif
-.if !defined(WITHOUT_BUILTIN_VECTOR) && !defined(WITH_BUILTIN_VECTOR)
- @${ECHO_MSG} 'Define WITH_BUILTIN_VECTOR if your system supports SSE'
- @${ECHO_MSG}
-.endif
-.ifndef(WITH_DTS)
- @${ECHO_MSG} 'Define WITH_DTS to enable DTS codec'
- @${ECHO_MSG}
-.endif
-.ifndef(WITH_FAAC)
- @${ECHO_MSG} 'Define WITH_FAAC to enable FAAC codec'
- @${ECHO_MSG}
-.endif
-.ifndef(WITH_FAAD)
- @${ECHO_MSG} 'Define WITH_FAAD to enable FAAD codec'
- @${ECHO_MSG}
-.endif
-.ifndef(WITHOUT_FFMPEG_FFSERVER)
- @${ECHO_MSG} 'Define WITHOUT_FFMPEG_FFSERVER to disable ffserver build'
- @${ECHO_MSG}
-.endif
-.ifndef(WITH_FREETYPE2)
- @${ECHO_MSG} 'Define WITH_FREETYPE2 to enable VHOOK drawtext FREETYPE2 codec'
- @${ECHO_MSG}
-.endif
-.ifndef(WITHOUT_IPV6)
- @${ECHO_MSG} 'Define WITHOUT_IPV6 to disable IPV6 network support'
- @${ECHO_MSG}
-.endif
-.ifndef(WITH_GSM)
- @${ECHO_MSG} 'Define WITH_GSM to enable GSM codec'
- @${ECHO_MSG}
-.endif
-.ifndef(WITHOUT_MMX)
- @${ECHO_MSG} 'Define WITHOUT_MMX if your system does not support MMX'
- @${ECHO_MSG}
-.endif
-.ifndef(WITH_MP3)
- @${ECHO_MSG} 'Define WITH_MP3 to enable lame MP3 codec'
- @${ECHO_MSG}
-.endif
-.ifndef(WITH_OGG)
- @${ECHO_MSG} 'Define WITH_OGG to enable OGG codec'
- @${ECHO_MSG}
-.endif
-.ifndef(WITH_OPTIMIZED_CFLAGS)
- @${ECHO_MSG} 'You can enable additional compilation optimizations'
- @${ECHO_MSG} 'by defining WITH_OPTIMIZED_CFLAGS'
- @${ECHO_MSG}
-.endif
-.ifndef(WITHOUT_PTHREADS)
- @${ECHO_MSG} 'Define WITHOUT_PTHREADS to disable threading support'
- @${ECHO_MSG}
-.endif
-.ifndef(WITHOUT_POSTPROCESS)
- @${ECHO_MSG} 'You can disable post process support by defining'
- @${ECHO_MSG} 'WITHOUT_POSTPROCESS'
- @${ECHO_MSG} 'Beware that this might break some ports that require it'
- @${ECHO_MSG}
-.endif
-.ifndef(WITH_SDL)
- @${ECHO_MSG} 'Define WITH_SDL to enable ffplay SDL version'
- @${ECHO_MSG}
-.endif
-.ifndef(WITH_THEORA)
- @${ECHO_MSG} 'Define WITH_THEORA to enable THEORA codec'
- @${ECHO_MSG}
-.endif
-.ifndef(WITHOUT_VHOOK)
- @${ECHO_MSG} 'You can disable vhook support by defining WITHOUT_VHOOK'
- @${ECHO_MSG}
-.endif
-.ifndef(WITH_VORBIS)
- @${ECHO_MSG} 'Define WITH_VORBIS to enable libvorbisenc VORBIS codec'
- @${ECHO_MSG}
-.endif
-.ifndef(WITH_X264)
- @${ECHO_MSG} 'Define WITH_X264 to enable X264 codec'
- @${ECHO_MSG}
-.endif
-.ifndef(WITH_XVID)
- @${ECHO_MSG} 'Define WITH_XVID to enable XVID codec'
- @${ECHO_MSG}
-.endif
-.if ${ARCH} == "i386"
-. ifndef(WITH_VIDEO_CAPTURE)
- @${ECHO_MSG} 'Define WITH_VIDEO_CAPTURE to enable bktr(4) driver'
- @${ECHO_MSG} 'video capture'
- @${ECHO_MSG}
-. else
-.if !(defined(WITH_BKTR_FORMAT) && defined(WITH_BKTR_DEV))
- @${ECHO_MSG}
- @${ECHO_MSG} 'If you want to capture from a bktr(4) supported card'
- @${ECHO_MSG} 'you will probably need to set the input device and format'
- @${ECHO_MSG} 'You can set WITH_BKTR_FORMAT to NTSC or PAL and you can set'
- @${ECHO_MSG} 'WITH_BKTR_DEV to 0, 1, 2 or 3 (1 is usually the tuner)'
- @${ECHO_MSG} 'so for a PAL tuner make WITH_BKTR_FORMAT=PAL WITH_BKTR_DEV=1'
- @${ECHO_MSG}
- @${ECHO_MSG} 'Warning: invalid settings will probably dump cores'
- @${ECHO_MSG}
-.endif
-. endif # WITH_VIDEO_CAPTURE
-.endif # ${ARCH} == i386
-
-post-extract:
-.if ${ARCH} == "i386"
-# install booktree extension
-# @${CP} ${FILESDIR}/grab_bsdbktr.c ${WRKSRC}/libavformat/
-.endif # ${ARCH} == i386
+.ifdef(WITHOUT_ZLIB)
+CONFIGURE_ARGS+= --disable-zlib
+.endif
post-patch:
-# {C,LD}FLAGS safeness
- @${FIND} ${WRKDIR} -type f -name "Makefile" -print0 | \
- ${XARGS} -0 -n 5 -x \
- ${REINPLACE_CMD} -E \
- -e 's@^(CFLAGS.+)$$@\1 ${FFMPEG_CFLAGS}@' \
- -e 's@^(FFLIBS|LDFLAGS)(.+)$$@\1\2 ${FFMPEG_LDFLAGS}@'
-# fix x264 math, use correct log base 2 from math(3)
- @${REINPLACE_CMD} -E \
- -e 's| log2| log|' \
- ${WRKSRC}/libavcodec/x264.c
- @${REINPLACE_CMD} -E \
- -e "s|(EXTRALIBS[[:space:]]*=)|\1-L${LOCALBASE}/lib |g" \
- ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
-# force detection of texi2html
-.ifndef(NOPORTDOCS)
- @${REINPLACE_CMD} -E \
- -e 's|^(texi2html=)no|\1yes|' \
- ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
-.endif
-.if ${ARCH} == "i386"
-.ifdef(WITH_VIDEO_CAPTURE)
-# set proper audio device
-.ifdef(WITH_AUDIO_DEV)
- @${REINPLACE_CMD} -E \
- -e 's!/dev/dsp!${WITH_AUDIO_DEV:Q}!' \
- ${WRKSRC}/libavformat/audio.c
-.endif
-.ifdef(WITH_BKTR_DEV)
- @${REINPLACE_CMD} -E \
- -e "s!idev = 0!idev = ${WITH_BKTR_DEV}!" \
- ${WRKSRC}/libavformat/grab_bsdbktr.c
-.endif
-.ifdef(WITH_BKTR_FORMAT)
- @${REINPLACE_CMD} -E \
- -e "s!VIDEO_FORMAT NTSC!VIDEO_FORMAT ${WITH_BKTR_FORMAT}!" \
- ${WRKSRC}/libavformat/grab_bsdbktr.c
-.endif
-.endif # WITH_VIDEO_CAPTURE
-.endif # ${ARCH} == i386
-# malloc.h was deprecated in favor of stdlib.h
-# do not shadow fprintf(3) with bogus statement
- @${FIND} ${WRKSRC} -type f -print0 | \
- ${XARGS} -0 -n 5 -x ${REINPLACE_CMD} -E \
- -e 's|malloc\.h|stdlib\.h|' \
- -e 's|^.*please_use_av_log.*$$||'
-.ifndef(WITHOUT_LIBA52)
- @${REINPLACE_CMD} -e 's|-ldl||' \
- ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
- @${REINPLACE_CMD} -E \
- -e 's|../(avcodec.h)|\1|' \
- ${WRKSRC}/libavcodec/liba52/a52.h
-.endif
-.ifndef(WITHOUT_FFMPEG_FFSERVER)
- @${REINPLACE_CMD} -e "s!/etc/ffserver.conf!${PREFIX}/etc/ffserver.conf!g" \
- ${WRKSRC}/ffserver.c ${WRKSRC}/doc/ffserver-doc.texi
- @${REINPLACE_CMD} -e 's!NoDaemon!# NoDaemon!g' \
- ${WRKSRC}/doc/ffserver.conf
-.endif
-.if defined(WITH_IMLIB2) && !defined(WITHOUT_IMLIB2)
- @${REINPLACE_CMD} -E \
- -e 's|^(imlib2).*$$|\1=yes|' \
- ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
- @${REINPLACE_CMD} -E \
- -e 's|(-lImlib2)|-L ${LOCALBASE}/lib \1|' \
- ${WRKSRC}/vhook/Makefile
-.endif
-.if defined(WITH_IPV6) && ${OSVERSION} >= 400014
- @${REINPLACE_CMD} -E \
- -e 's|^(ipv6).*$$|\1=yes|' \
- ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
-.endif
-.ifdef(WITH_SDL)
- @${REINPLACE_CMD} -E \
- -e 's|sdl-config|${SDL_CONFIG}|g' \
- ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
- @${FIND} ${WRKSRC} -type f | \
- ${XARGS} -n 10 ${REINPLACE_CMD} -E \
- -e 's|#include <SDL|#include <SDL/SDL|'
-.endif
-.ifndef(WITHOUT_POSTPROCESS)
- @${LN} -sf libpostproc.so \
- ${WRKSRC}/libavcodec/libpostproc/libpostproc.so.${SHLIB_VERSION}
-.endif
-.if !defined(WITHOUT_BUILTIN_VECTOR) && defined(WITH_BUILTIN_VECTOR)
- @${REINPLACE_CMD} -E \
- -e 's|^([[:space:]]+builtin_vector).*$$|\1=yes|' \
- ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
-.else
- @${REINPLACE_CMD} -E \
- -e 's|^([[:space:]]+builtin_vector).*$$|\1=no|' \
- ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
-.endif
+ @${REINPLACE_CMD} -e 's/log2/log/' ${WRKSRC}/libavcodec/imc.c
-post-configure:
-# FreeBSD 5.4-STABLE and later have lrintf()
-.if ${OSVERSION} >= 504100
- @${ECHO_CMD} '#define HAVE_LRINTF' >> ${WRKSRC}/config.h
-.endif
-.ifdef(WITH_DTS)
- @${REINPLACE_CMD} -E \
- -e 's|-ldts|${LOCALBASE}/lib/libdts_pic.a|' \
- -e 's|(-lx264)|-L${LOCALBASE}/lib \1|' \
- ${WRKSRC}/config.mak \
- ${WRKSRC}/libavcodec/Makefile
-.endif
-.ifndef(WITH_THEORA)
- @${REINPLACE_CMD} -E \
- -e 's|^(CONFIG_LIBTHEORA).*$$|\1=no|' \
- ${WRKSRC}/config.mak
-.endif
-# shared libraries PIC
- @${REINPLACE_CMD} -E \
- -e 's|^(PIC[[:space:]]*=.*)$$|\1 -fpic -fPIC -DPIC|' \
- ${WRKSRC}/config.mak
post-install:
-.ifndef(NOPORTDOCS)
- @${MKDIR} ${DOCSDIR}
-.for file in ${DOC_FILES}
- @${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
-.endfor
-.for file in ${DOC_DOCFILES}
- @${INSTALL_DATA} ${WRKSRC}/doc/${file} ${DOCSDIR}
-.endfor
-.endif
-.ifndef(WITHOUT_FFMPEG_FFSERVER)
- @${INSTALL_DATA} ${WRKSRC}/doc/ffserver.conf \
+ ${INSTALL_DATA} ${WRKSRC}/doc/ffserver.conf \
${PREFIX}/etc/ffserver.conf.sample
-.endif
-.for file in ${HEADER_FILES}
-# fix header references prior to installation
- @${REINPLACE_CMD} -e 's|"common.h"|<ffmpeg/common.h>|; \
- s|"avcodec.h"|<ffmpeg/avcodec.h>|' \
- ${WRKSRC}/${file}
- @${INSTALL_DATA} ${WRKSRC}/${file} \
- ${PREFIX}/include/ffmpeg/${file:T}
-# change headers back so reinstall target works
- @${REINPLACE_CMD} -e 's|<ffmpeg/common.h>|"common.h"|; \
- s|<ffmpeg/avcodec.h>|"avcodec.h"|' \
- ${WRKSRC}/${file}
-.endfor
-.for file in ${LIB_FILES}
- @${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/lib/${file:T}
- @${LN} -sf ${file:T:R}.so \
- ${PREFIX}/lib/${file:T:R}.so.${SHLIB_VERSION}
-.endfor
-.ifndef(WITHOUT_POSTPROCESS)
-# XXX - libavcodec.so needs libpostproc.so but looks for libpostproc.so.0
-# existence instead of libpostproc.so.${SHLIB_VERSION}
- @${LN} -sf libpostproc.so \
- ${PREFIX}/lib/libpostproc.so.0
+.ifndef(NOPORTDOCS)
+ ${MKDIR} ${DOCSDIR}
+. for f in ${DOC_FILES}
+ ${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
+. endfor
+. for f in ${DOC_DOTFILES}
+ ${INSTALL_DATA} ${WRKSRC}/doc/${f} ${DOCSDIR}
+. endfor
.endif
.include <bsd.port.post.mk>
diff -ruN --exclude=CVS /usr/ports/multimedia/ffmpeg-devel/distinfo /home/staff/gslin/work/ports/ffmpeg-devel/distinfo
--- /usr/ports/multimedia/ffmpeg-devel/distinfo Fri Mar 24 21:53:05 2006
+++ /home/staff/gslin/work/ports/ffmpeg-devel/distinfo Wed Nov 15 01:03:56 2006
@@ -1,3 +1,3 @@
-MD5 (FFMpeg-2006032300.tar.bz2) = 09fc4f533b0c0a8cc004d1fd1761772d
-SHA256 (FFMpeg-2006032300.tar.bz2) = 782c61e789960c6fd6763cab7df46baa530a4c6e2fc4e8a7d0055b1fb6bc3e4f
-SIZE (FFMpeg-2006032300.tar.bz2) = 1767400
+MD5 (FFMpeg-2006111500.tar.bz2) = 531235113be70e52320b3e1ae9a46bcf
+SHA256 (FFMpeg-2006111500.tar.bz2) = 243e814b51edcac788e7967ba2f792ada230d6416717f275a8eff4eeb2f6838b
+SIZE (FFMpeg-2006111500.tar.bz2) = 2043644
diff -ruN --exclude=CVS /usr/ports/multimedia/ffmpeg-devel/files/patch-Makefile /home/staff/gslin/work/ports/ffmpeg-devel/files/patch-Makefile
--- /usr/ports/multimedia/ffmpeg-devel/files/patch-Makefile Fri Mar 24 21:53:05 2006
+++ /home/staff/gslin/work/ports/ffmpeg-devel/files/patch-Makefile Thu Jan 1 08:00:00 1970
@@ -1,31 +0,0 @@
---- Makefile.orig Wed Mar 15 21:15:07 2006
-+++ Makefile Thu Mar 23 14:49:50 2006
-@@ -59,7 +59,7 @@
-
- OBJS = ffmpeg.o ffserver.o cmdutils.o $(FFPLAY_O)
- SRCS = $(OBJS:.o=.c) $(ASM_OBJS:.o=.s)
--FFLIBS = -L./libavformat -lavformat$(BUILDSUF) -L./libavcodec -lavcodec$(BUILDSUF) -L./libavutil -lavutil$(BUILDSUF)
-+FFLIBS = -L./libavutil -lavutil$(BUILDSUF) -L./libavformat -lavformat$(BUILDSUF) -L./libavcodec -lavcodec$(BUILDSUF)
-
- all: lib $(PROG_G) $(PROG) $(PROGTEST) $(VHOOK) $(QTFASTSTART) $(DOC)
-
-@@ -118,8 +118,7 @@
- else
- install-progs: $(PROG)
- endif
-- install -d "$(bindir)"
-- install -c $(INSTALLSTRIP) -m 755 $(PROG) "$(bindir)"
-+ ${BSD_INSTALL_PROGRAM} $(PROG) "$(bindir)"
-
- # create the window installer
- wininstaller: all install
-@@ -129,8 +128,7 @@
- install-man:
- ifneq ($(CONFIG_WIN32),yes)
- if [ -f doc/ffmpeg.1 ] ; then \
-- install -d "$(mandir)/man1" ; \
-- install -m 644 $(MANPAGE) "$(mandir)/man1" ; \
-+ ${BSD_INSTALL_MAN} $(MANPAGE) "${MANPREFIX}/man/man1" ; \
- fi
- endif
-
diff -ruN --exclude=CVS /usr/ports/multimedia/ffmpeg-devel/files/patch-common.mak /home/staff/gslin/work/ports/ffmpeg-devel/files/patch-common.mak
--- /usr/ports/multimedia/ffmpeg-devel/files/patch-common.mak Fri Mar 24 21:53:05 2006
+++ /home/staff/gslin/work/ports/ffmpeg-devel/files/patch-common.mak Wed Nov 15 01:27:46 2006
@@ -1,36 +1,23 @@
---- common.mak.orig Thu Mar 23 14:55:10 2006
-+++ common.mak Thu Mar 23 15:01:13 2006
-@@ -71,27 +71,20 @@
- install-libs: $(INSTLIBTARGETS)
-
- install-lib-shared: $(SLIBNAME)
-- install -d "$(libdir)"
- ifeq ($(CONFIG_WIN32),yes)
- install $(INSTALLSTRIP) -m 755 $(SLIBNAME) "$(prefix)"
- else
-- install $(INSTALLSTRIP) -m 755 $(SLIBNAME) \
-- $(libdir)/$(SLIBNAME_WITH_VERSION)
-- ln -sf $(SLIBNAME_WITH_VERSION) \
-- $(libdir)/$(SLIBNAME_WITH_MAJOR)
-- ln -sf $(SLIBNAME_WITH_VERSION) \
-- $(libdir)/$(SLIBNAME)
-+ ${BSD_INSTALL_DATA} $(SLIBNAME) \
-+ $(libdir)
- endif
-
- install-lib-static: $(LIB)
-- install -d "$(libdir)"
-- install -m 644 $(LIB) "$(libdir)"
-+ ${BSD_INSTALL_DATA} $(LIB) "$(libdir)"
+--- common.mak.orig Wed Nov 8 08:02:15 2006
++++ common.mak Wed Nov 15 01:27:43 2006
+@@ -77,9 +77,9 @@
install-headers:
-- install -d "$(incdir)"
+ install -d "$(incdir)"
- install -d "$(libdir)/pkgconfig"
-- install -m 644 $(addprefix "$(SRC_DIR)"/,$(HEADERS)) "$(incdir)"
++ install -d "$(prefix)/libdata/pkgconfig"
+ install -m 644 $(addprefix $(SRC_DIR)/,$(HEADERS)) "$(incdir)"
- install -m 644 $(BUILD_ROOT)/lib$(NAME).pc "$(libdir)/pkgconfig"
-+ ${INSTALL} -d "$(incdir)"
-+ ${BSD_INSTALL_DATA} $(addprefix "$(SRC_DIR)"/,$(HEADERS)) "$(incdir)"
-+ ${BSD_INSTALL_DATA} $(BUILD_ROOT)/lib$(NAME).pc "$(prefix)/libdata/pkgconfig"
++ install -m 644 $(BUILD_ROOT)/lib$(NAME).pc "$(prefix)/libdata/pkgconfig"
+
+ uninstall: uninstall-libs uninstall-headers
+
+@@ -91,7 +91,7 @@
+
+ uninstall-headers:
+ rm -f $(addprefix "$(incdir)/",$(HEADERS))
+- rm -f "$(libdir)/pkgconfig/lib$(NAME).pc"
++ rm -f "$(prefix)/libdata/pkgconfig/lib$(NAME).pc"
+
+ .PHONY: all depend dep clean distclean install* uninstall*
- #
- # include dependency files if they exist
diff -ruN --exclude=CVS /usr/ports/multimedia/ffmpeg-devel/files/patch-configure /home/staff/gslin/work/ports/ffmpeg-devel/files/patch-configure
--- /usr/ports/multimedia/ffmpeg-devel/files/patch-configure Sun Oct 8 03:27:16 2006
+++ /home/staff/gslin/work/ports/ffmpeg-devel/files/patch-configure Thu Jan 1 08:00:00 1970
@@ -1,48 +0,0 @@
---- configure.orig Sun Mar 19 01:31:55 2006
-+++ configure Thu Sep 28 20:27:49 2006
-@@ -138,7 +138,7 @@
- cpu="x86"
- ;;
- x86_64|amd64)
-- cpu="x86"
-+ cpu="x86_64"
- canon_arch="`cc -dumpmachine | sed -e 's,\([^-]*\)-.*,\1,'`"
- if [ x"$canon_arch" = x"x86_64" -o x"$canon_arch" = x"amd64" ]; then
- if [ -z "`echo $CFLAGS | grep -- -m32`" ]; then
-@@ -1107,6 +1107,8 @@
- builtin_vector=no
- if $cc -msse -o $TMPO $TMPC 2> /dev/null ; then
- builtin_vector=yes
-+else
-+ builtin_vector=no
- fi
-
- # test for mm3dnow.h
-@@ -1597,13 +1599,13 @@
- echo "#define BUILD_SHARED_AV 1" >> $TMPH
- echo "BUILD_SHARED=yes" >> config.mak
- echo "PIC=-fPIC -DPIC" >> config.mak
-- echo "SPPMAJOR=${lavc_version%%.*}" >> config.mak
-- echo "SPPVERSION=$lavc_version" >> config.mak
-- echo "LAVCMAJOR=${lavc_version%%.*}" >> config.mak
-+ echo "SPPMAJOR=1" >> config.mak
-+ echo "SPPVERSION=1" >> config.mak
-+ echo "LAVCMAJOR=1" >> config.mak
- echo "LAVCVERSION=$lavc_version" >> config.mak
-- echo "LAVFMAJOR=${lavf_version%%.*}" >> config.mak
-+ echo "LAVFMAJOR=1" >> config.mak
- echo "LAVFVERSION=$lavf_version" >> config.mak
-- echo "LAVUMAJOR=${lavu_version%%.*}" >> config.mak
-+ echo "LAVUMAJOR=1" >> config.mak
- echo "LAVUVERSION=$lavu_version" >> config.mak
- echo "SLIBNAME=${SLIBNAME}" >> config.mak
- echo "SLIBNAME_WITH_VERSION=${SLIBNAME_WITH_VERSION}" >> config.mak
-@@ -2075,7 +2077,7 @@
- Requires:
- Conflicts:
- Libs: -L\${libdir} -lpostproc
--Cflags: -I\${includedir} -I\${includedir}/postproc
-+Cflags: -I\${includedir} -I\${includedir}/ffmpeg/postproc
- EOF
-
- cat <<EOF >libpostproc-uninstalled.pc
diff -ruN --exclude=CVS /usr/ports/multimedia/ffmpeg-devel/files/patch-libavcodec::libpostproc::Makefile /home/staff/gslin/work/ports/ffmpeg-devel/files/patch-libavcodec::libpostproc::Makefile
--- /usr/ports/multimedia/ffmpeg-devel/files/patch-libavcodec::libpostproc::Makefile Fri Mar 24 21:53:05 2006
+++ /home/staff/gslin/work/ports/ffmpeg-devel/files/patch-libavcodec::libpostproc::Makefile Thu Jan 1 08:00:00 1970
@@ -1,11 +0,0 @@
---- libavcodec/libpostproc/Makefile.orig Thu Mar 23 15:07:08 2006
-+++ libavcodec/libpostproc/Makefile Thu Mar 23 15:07:13 2006
-@@ -2,7 +2,7 @@
- include ../../config.mak
-
- # Overload incdir, postproc include files go in a different directory.
--incdir=$(prefix)/include/postproc
-+incdir=$(prefix)/include/ffmpeg/postproc
-
- NAME=postproc
- SUBDIR=libavcodec/libpostproc
diff -ruN --exclude=CVS /usr/ports/multimedia/ffmpeg-devel/files/patch-libavcodec_x264.c /home/staff/gslin/work/ports/ffmpeg-devel/files/patch-libavcodec_x264.c
--- /usr/ports/multimedia/ffmpeg-devel/files/patch-libavcodec_x264.c Wed Nov 15 03:15:05 2006
+++ /home/staff/gslin/work/ports/ffmpeg-devel/files/patch-libavcodec_x264.c Thu Jan 1 08:00:00 1970
@@ -1,22 +0,0 @@
---- libavcodec/x264.c.orig Mon Feb 20 14:01:29 2006
-+++ libavcodec/x264.c Mon Nov 13 10:29:53 2006
-@@ -142,13 +142,17 @@
- x4->params.rc.b_stat_write = (avctx->flags & CODEC_FLAG_PASS1);
- if(avctx->flags & CODEC_FLAG_PASS2) x4->params.rc.b_stat_read = 1;
- else{
-- if(avctx->crf) x4->params.rc.i_rf_constant = avctx->crf;
-+#if X264_BUILD >= 54
-+ if(avctx->crf) x4->params.rc.f_rf_constant = avctx->crf;
-+#else
-+ if(avctx->crf) x4->params.rc.i_rf_constant = avctx->crf;
-+#endif
- else if(avctx->cqp > -1) x4->params.rc.i_qp_constant = avctx->cqp;
- }
-
- // if neither crf nor cqp modes are selected we have to enable the RC
- // we do it this way because we cannot check if the bitrate has been set
-- if(!(avctx->crf || (avctx->cqp > -1))) x4->params.rc.b_cbr = 1;
-+ if(!(avctx->crf || (avctx->cqp > -1))) x4->params.rc.i_rc_method = 1;
-
- x4->params.i_bframe = avctx->max_b_frames;
- x4->params.b_cabac = avctx->coder_type == FF_CODER_TYPE_AC;
diff -ruN --exclude=CVS /usr/ports/multimedia/ffmpeg-devel/files/patch-libavformat::udp.c /home/staff/gslin/work/ports/ffmpeg-devel/files/patch-libavformat::udp.c
--- /usr/ports/multimedia/ffmpeg-devel/files/patch-libavformat::udp.c Thu May 12 10:54:48 2005
+++ /home/staff/gslin/work/ports/ffmpeg-devel/files/patch-libavformat::udp.c Thu Jan 1 08:00:00 1970
@@ -1,13 +0,0 @@
---- libavformat/udp.c.orig Tue May 10 01:08:33 2005
-+++ libavformat/udp.c Tue May 10 01:09:27 2005
-@@ -27,6 +27,10 @@
- # include "barpainet.h"
- #endif
- #include <netdb.h>
-+#ifndef IPV6_ADD_MEMBERSHIP
-+#define IPV6_ADD_MEMBERSHIP IPV6_JOIN_GROUP
-+#define IPV6_DROP_MEMBERSHIP IPV6_LEAVE_GROUP
-+#endif
-
- typedef struct {
- int udp_fd;
diff -ruN --exclude=CVS /usr/ports/multimedia/ffmpeg-devel/files/patch-libavformat_movenc.c /home/staff/gslin/work/ports/ffmpeg-devel/files/patch-libavformat_movenc.c
--- /usr/ports/multimedia/ffmpeg-devel/files/patch-libavformat_movenc.c Mon Sep 25 08:47:40 2006
+++ /home/staff/gslin/work/ports/ffmpeg-devel/files/patch-libavformat_movenc.c Thu Jan 1 08:00:00 1970
@@ -1,13 +0,0 @@
---- libavformat/movenc.c.orig Wed Mar 22 16:49:05 2006
-+++ libavformat/movenc.c Wed Aug 23 12:37:33 2006
-@@ -22,6 +22,10 @@
- #include "avio.h"
- #include "mov.h"
-
-+#ifndef UINT32_MAX
-+#define UINT32_MAX 0xffffffffU
-+#endif
-+
- #undef NDEBUG
- #include <assert.h>
-
diff -ruN --exclude=CVS /usr/ports/multimedia/ffmpeg-devel/files/patch-libavutil__bswap.h /home/staff/gslin/work/ports/ffmpeg-devel/files/patch-libavutil__bswap.h
--- /usr/ports/multimedia/ffmpeg-devel/files/patch-libavutil__bswap.h Tue Nov 29 11:11:41 2005
+++ /home/staff/gslin/work/ports/ffmpeg-devel/files/patch-libavutil__bswap.h Thu Jan 1 08:00:00 1970
@@ -1,21 +0,0 @@
---- libavutil/bswap.h.orig Mon Nov 28 22:16:18 2005
-+++ libavutil/bswap.h Mon Nov 28 22:21:22 2005
-@@ -6,8 +6,18 @@
- #ifndef __BSWAP_H__
- #define __BSWAP_H__
-
-+/* to detect __FreeBSD_version */
-+#if (defined(__unix__) || defined(unix)) && !defined(USG)
-+#include <sys/param.h>
-+#endif
-+
- #ifdef HAVE_BYTESWAP_H
- #include <byteswap.h>
-+#elif (defined(__FreeBSD__) && __FreeBSD_version >= 500000)
-+# include <sys/endian.h>
-+# define bswap_16(x) bswap16(x)
-+# define bswap_32(x) bswap32(x)
-+# define bswap_64(x) bswap64(x)
- #else
-
- #ifdef ARCH_X86_64
diff -ruN --exclude=CVS /usr/ports/multimedia/ffmpeg-devel/files/patch-vhook__Makefile /home/staff/gslin/work/ports/ffmpeg-devel/files/patch-vhook__Makefile
--- /usr/ports/multimedia/ffmpeg-devel/files/patch-vhook__Makefile Fri Mar 24 21:53:05 2006
+++ /home/staff/gslin/work/ports/ffmpeg-devel/files/patch-vhook__Makefile Thu Jan 1 08:00:00 1970
@@ -1,13 +0,0 @@
---- vhook/Makefile.orig Thu Mar 23 14:34:08 2006
-+++ vhook/Makefile Thu Mar 23 14:35:12 2006
-@@ -27,8 +27,8 @@
- $(CC) -MM $(CFLAGS) $^ 1>.depend
-
- install:
-- install -d "$(libdir)/vhook"
-- install -m 755 $(HOOKS) "$(libdir)/vhook"
-+ ${INSTALL} -d "$(libdir)/vhook"
-+ ${BSD_INSTALL_DATA} $(HOOKS) "$(libdir)/vhook"
-
- imlib2$(SLIBSUF): imlib2.o
- $(CC) $(LDFLAGS) -g -o $@ $(SHFLAGS) $< -L /usr/local/lib -lImlib2
diff -ruN --exclude=CVS /usr/ports/multimedia/ffmpeg-devel/pkg-plist /home/staff/gslin/work/ports/ffmpeg-devel/pkg-plist
--- /usr/ports/multimedia/ffmpeg-devel/pkg-plist Fri Mar 24 21:53:05 2006
+++ /home/staff/gslin/work/ports/ffmpeg-devel/pkg-plist Wed Nov 15 03:50:48 2006
@@ -1,26 +1,55 @@
+@comment $FreeBSD$
+%%FFMPEG_POSTPROCESS%%include/postproc/postprocess.h
+%%FFMPEG_POSTPROCESS%%lib/libpostproc.a
+%%FFMPEG_POSTPROCESS%%libdata/pkgconfig/libpostproc.pc
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/Changelog
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%PORTDOCS%%%%DOCSDIR%%/faq.html
+%%PORTDOCS%%%%DOCSDIR%%/ffmpeg-doc.html
+%%PORTDOCS%%%%DOCSDIR%%/ffmpeg_powerpc_performance_evaluation_howto.txt
+%%PORTDOCS%%%%DOCSDIR%%/ffplay-doc.html
+%%PORTDOCS%%%%DOCSDIR%%/ffserver-doc.html
+%%PORTDOCS%%%%DOCSDIR%%/hooks.html
+%%PORTDOCS%%%%DOCSDIR%%/optimization.txt
+%%PORTDOCS%%%%DOCSDIR%%/soc.txt
bin/ffmpeg
+bin/ffplay
+bin/ffserver
+include/ffmpeg/adler32.h
include/ffmpeg/avcodec.h
include/ffmpeg/avformat.h
include/ffmpeg/avio.h
include/ffmpeg/avutil.h
include/ffmpeg/common.h
-include/ffmpeg/dsputil.h
+include/ffmpeg/fifo.h
include/ffmpeg/integer.h
include/ffmpeg/intfloat_readwrite.h
+include/ffmpeg/log.h
include/ffmpeg/mathematics.h
+include/ffmpeg/md5.h
+include/ffmpeg/opt.h
include/ffmpeg/rational.h
+include/ffmpeg/rgb2rgb.h
include/ffmpeg/rtp.h
include/ffmpeg/rtsp.h
include/ffmpeg/rtspcodes.h
+include/ffmpeg/swscale.h
lib/libavcodec.a
-lib/libavcodec.so
-lib/libavcodec.so.%%SHLIB_VERSION%%
lib/libavformat.a
-lib/libavformat.so
-lib/libavformat.so.%%SHLIB_VERSION%%
lib/libavutil.a
-lib/libavutil.so
-lib/libavutil.so.%%SHLIB_VERSION%%
+lib/vhook/drawtext.so
+lib/vhook/fish.so
+lib/vhook/null.so
+lib/vhook/ppm.so
+lib/vhook/watermark.so
libdata/pkgconfig/libavcodec.pc
libdata/pkgconfig/libavformat.pc
libdata/pkgconfig/libavutil.pc
+libdata/pkgconfig/libswscale.pc
+@dirrmtry libdata/pkgconfig
+@dirrmtry lib/vhook
+@dirrmtry include/ffmpeg
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%FFMPEG_POSTPROCESS%%@dirrmtry include/postproc
--- ffmpeg-devel-0.4.9.2006111500.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?20061114195308.6225E3E>