Date: Thu, 20 Mar 2008 04:15:25 GMT From: mark burdett <mfburdett@gmail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/121896: Typo in ffmpeg Makefile disables AMR support Message-ID: <200803200415.m2K4FPTC022946@www.freebsd.org> Resent-Message-ID: <200803200420.m2K4K1Dq091036@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 121896
>Category: ports
>Synopsis: Typo in ffmpeg Makefile disables AMR support
>Confidential: no
>Severity: serious
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Thu Mar 20 04:20:01 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator: mark burdett
>Release:
>Organization:
>Environment:
>Description:
Two typos in the Makefile for the ffmpeg port prevent AMR library support from being compiled into ffmpeg.
>How-To-Repeat:
>Fix:
Unpack the shar which fixes the typos.
Patch attached with submission follows:
# This is a shell archive. Save it in a file, remove anything before
# this line, and then unpack it by entering "sh file". Note, it may
# create directories; files and directories will be owned by you and
# have default permissions.
#
# This archive contains:
#
# ffmpeg/
# ffmpeg/Makefile
# ffmpeg/distinfo
# ffmpeg/pkg-descr
# ffmpeg/pkg-plist
# ffmpeg/files
# ffmpeg/files/patch-libavcode_imgconvert.c
# ffmpeg/files/patch-configure
# ffmpeg/files/patch-libavutil__bswap.h
# ffmpeg/files/ffserver.in
#
echo c - ffmpeg/
mkdir -p ffmpeg/ > /dev/null 2>&1
echo x - ffmpeg/Makefile
sed 's/^X//' >ffmpeg/Makefile << 'END-of-ffmpeg/Makefile'
X# New ports collection makefile for: ffmpeg cvs
X# Date created: Sun May 1 20:46:59 UTC 2005
X# Whom: Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org>
X#
X# $FreeBSD: ports/multimedia/ffmpeg/Makefile,v 1.78 2008/03/13 14:28:27 miwi Exp $
X# $Id: Makefile 66 2007-10-09 17:50:49Z buhnux $
X
XPORTNAME= ffmpeg
XDISTVERSION= 2007-10-04
XPORTREVISION= 3
XCATEGORIES= multimedia audio ipv6 net
XMASTER_SITES= ${MASTER_SITE_LOCAL}
XMASTER_SITE_SUBDIR= ahze
X
XMAINTAINER= multimedia@FreeBSD.org
XCOMMENT= Hyper fast realtime audio/video encoder/converter, streaming server
X
XHAS_CONFIGURE= yes
XCONFIGURE_LOG= config.err
XUSE_BZIP2= yes
XUSE_GMAKE= yes
XWANT_SDL= yes
X
X.include <bsd.port.pre.mk>
X
XCONFIGURE_ARGS+=--cc="${CC}" --prefix="${PREFIX}" \
X --make="${GMAKE}" \
X --disable-debug \
X --enable-memalign-hack \
X --enable-shared \
X --enable-pp \
X --extra-cflags="${FFMPEG_CFLAGS} -I${LOCALBASE}/include" \
X --extra-ldflags="-L${LOCALBASE}/lib ${FFMPEG_LDFLAGS}" \
X --extra-libs="${PTHREAD_LIBS}" \
X --enable-gpl \
X --enable-pthreads \
X --mandir=${PREFIX}/man
XCONFIGURE_ENV+= LANG=C
XMAKE_ENV+= INSTALL="${INSTALL}"
XSHLIB_VER= 1
XPLIST_SUB= SHLIB_VER=${SHLIB_VER}
XUSE_LDCONFIG= yes
X
X##
XDOC_FILES= Changelog README
X# under subdir doc
XDOC_DOCFILES= TODO faq.html ffmpeg-doc.html \
X ffplay-doc.html ffserver-doc.html \
X hooks.html optimization.txt
XPORTDOCS= *
X
X## sse hardware vector support
X.if (defined(MACHINE_CPU) && ${MACHINE_CPU:Msse} == "sse")
XWITH_BUILTIN_VECTOR= yes
X.endif
X
X##
X## support activation
X##
X## PORTDOCS
X.ifndef(NOPORTDOCS)
XBUILD_DEPENDS+= texi2html:${PORTSDIR}/textproc/texi2html
XMAN1+= ffmpeg.1 ffserver.1
X.endif
X
X.ifdef(WITH_OPTIMIZED_CFLAGS)
XCFLAGS:= ${CFLAGS:N-O*} -O3 -ffast-math -fomit-frame-pointer
X.else
XCFLAGS:= ${CFLAGS:N-O0} -O2
XDEBUG_FLAGS+= -O2
X.endif
X
X## a52
X.if !defined(WITHOUT_LIBA52) && !defined(WITHOUT_A52)
XLIB_DEPENDS+= a52.0:${PORTSDIR}/audio/liba52
X
XCONFIGURE_ARGS+= --enable-liba52 \
X --enable-liba52bin
XFFMPEG_LDFLAGS+= -la52
X.else
XCONFIGURE_ARGS+= --disable-liba52
X.endif
X## dts
X#.ifdef(WITH_DTS) || exists(${LOCALBASE}/lib/libdca.a)
X#LIB_DEPENDS+= dca.0:${PORTSDIR}/multimedia/libdca
X#CONFIGURE_ARGS+= --enable-libdts
X#.endif
X## faac
X.ifdef(WITH_FAAC) || exists(${LOCALBASE}/lib/libfaac.so)
XLIB_DEPENDS+= faac.0:${PORTSDIR}/audio/faac
X
XCONFIGURE_ARGS+= --enable-libfaac
X.endif
X## faad
X.ifndef(WITHOUT_FAAD) || exists(${LOCALBASE}/lib/libfaad.so)
XLIB_DEPENDS+= faad.0:${PORTSDIR}/audio/faad
X
XCONFIGURE_ARGS+= --enable-libfaad \
X --enable-libfaadbin
X.endif
X## amr
X.ifdef(WITH_AMR_NB) || exists({$LOCALBASE}/lib/libamrnb.so)
XLIB_DEPENDS+= amrnb.3:${PORTSDIR}/audio/libamrnb
X
XCONFIGURE_ARGS+= --enable-libamr-nb
X.endif
X.ifdef(WITH_AMR_WB) || exists({$LOCALBASE}/lib/libamrwb.so)
XLIB_DEPENDS+= amrwb.3:${PORTSDIR}/audio/libamrwb
X
XCONFIGURE_ARGS+= --enable-libamr-wb
X.endif
XUSE_RC_SUBR= ffserver
X
X.if ${MACHINE_CPU:Mmmx}==""
XCONFIGURE_ARGS+= --disable-mmx
X
XWITHOUT_BUILTIN_VECTOR= yes
X.endif
X## gsm
X.ifdef(WITH_GSM) || exists(${LOCALBASE}/lib/libgsm.so)
XLIB_DEPENDS+= gsm.1:${PORTSDIR}/audio/gsm
X
XCONFIGURE_ARGS+= --enable-libgsm
X.endif
X## mp3
X.ifdef(WITH_LAME) || exists(${LOCALBASE}/lib/libmp3lame.so) || defined(WITH_MP3)
XLIB_DEPENDS+= mp3lame.0:${PORTSDIR}/audio/lame
X
XCONFIGURE_ARGS+= --enable-libmp3lame
X.endif
X## ogg
X.ifndef(WITHOUT_OGG) || exists(${LOCALBASE}/lib/libogg.so)
XLIB_DEPENDS+= ogg.5:${PORTSDIR}/audio/libogg
X
XCONFIGURE_ARGS+= --enable-libogg
X.endif
X
X## SDL
X.ifdef(WITH_SDL) || ${HAVE_SDL:Msdl}
XUSE_SDL+= sdl
X
XPLIST_FILES+= bin/ffplay
X.if !defined(NOPORTDOCS)
XMAN1+= ffplay.1
X.endif
X.else
XCONFIGURE_ARGS+= --disable-ffplay
X.endif
X
X## swscaler
X.if defined(WITH_SWSCALER)
XCONFIGURE_ARGS+= --enable-swscaler
XPLIST_SUB+= SWSCAL=""
X.else
XPLIST_SUB+= SWSCAL="@comment "
X.endif
X
X## theora
X.if !defined(WITHOUT_THEORA)
XWITH_OGG= yes
XLIB_DEPENDS+= theora.0:${PORTSDIR}/multimedia/libtheora
X
XCONFIGURE_ARGS+= --enable-libtheora
X.endif
X## vorbis
X.if !defined(WITHOUT_VORBIS)
XWITH_OGG= yes
XLIB_DEPENDS+= vorbisenc.2:${PORTSDIR}/audio/libvorbis
X
XCONFIGURE_ARGS+= --enable-libvorbis
XFFMPEG_CFLAGS+= -I${LOCALBASE}/include/vorbis
X.endif
X# x264
X.ifndef(WITHOUT_X264)
XLIB_DEPENDS+= x264.50:${PORTSDIR}/multimedia/x264
X
XCONFIGURE_ARGS+= --enable-libx264
X.else
XCONFIGURE_ARGS+= --disable-libx264
X.endif
X## builtin vector, requires mmx
X.if !defined(WITHOUT_BUILTIN_VECTOR) && defined(WITH_BUILTIN_VECTOR)
XFFMPEG_CFLAGS+= -msse
X.endif
X. ifdef(WITH_FREETYPE2) || exists(${LOCALBASE}/lib/libfreetype.so)
XLIB_DEPENDS+= freetype.9:${PORTSDIR}/print/freetype2
X
XPLIST_FILES+= lib/vhook/drawtext.so
X. endif # freetype2
X. ifdef(WITH_IMLIB2) || exists(${LOCALBASE}/lib/libImlib2.so)
XUSE_EFL+= imlib2
X
XPLIST_FILES+= lib/vhook/imlib2.so
X. else
XWITHOUT_IMLIB2= yes
X. endif # imlib2
X
X## xvid
X.ifdef(WITH_XVID) || exists(${LOCALBASE}/lib/libxvidcore.so)
XLIB_DEPENDS+= xvidcore.4:${PORTSDIR}/multimedia/xvid
X
XCONFIGURE_ARGS+= --enable-libxvid
X.endif
X
Xpre-everything::
X.ifndef(WITHOUT_A52)
X @${ECHO_MSG} 'You can disable liba52 support by defining WITHOUT_LIBA52'
X @${ECHO_MSG}
X.endif
X#.ifndef(WITH_DTS)
X# @${ECHO_MSG} 'Define WITH_DTS to enable DTS codec'
X# @${ECHO_MSG}
X#.endif
X.ifndef(WITH_FAAC)
X @${ECHO_MSG} 'Define WITH_FAAC to enable FAAC mp4/aac audio encoder'
X @${ECHO_MSG}
X.endif
X.ifndef(WITHOUT_FAAD)
X @${ECHO_MSG} 'Define WITHOUT_FAAD to disable FAAD mp4/aac audio decoder'
X @${ECHO_MSG}
X.endif
X.ifndef(WITH_FREETYPE2)
X @${ECHO_MSG} 'Define WITH_FREETYPE2 to enable VHOOK drawtext FREETYPE2 codec'
X @${ECHO_MSG}
X.endif
X.ifndef(WITHOUT_IPV6)
X @${ECHO_MSG} 'Define WITHOUT_IPV6 to disable IPV6 network support'
X @${ECHO_MSG}
X.endif
X.ifndef(WITH_LAME)
X @${ECHO_MSG} 'Define WITH_LAME to enable lame MP3 codec'
X @${ECHO_MSG}
X.endif
X.ifndef(WITH_OGG)
X @${ECHO_MSG} 'Define WITH_OGG to enable OGG codec'
X @${ECHO_MSG}
X.endif
X.ifndef(WITH_OPTIMIZED_CFLAGS)
X @${ECHO_MSG} 'You can enable additional compilation optimizations'
X @${ECHO_MSG} 'by defining WITH_OPTIMIZED_CFLAGS'
X @${ECHO_MSG}
X.endif
X.ifndef(WITH_SWSCALER)
X @${ECHO_MSG} 'Define WITH_SWSCALER to enable software scaler support'
X @${ECHO_MSG} 'Warning: swscaler does not work with VLC!'
X @${ECHO_MSG}
X.endif
X.ifndef(WITHOUT_THEORA)
X @${ECHO_MSG} 'Define WITHOUT_THEORA to disable libtheora support'
X @${ECHO_MSG}
X.endif
X.ifndef(WITHOUT_VORBIS)
X @${ECHO_MSG} 'Define WITHOUT_VORBIS to enable libvorbisenc VORBIS codec'
X @${ECHO_MSG}
X.endif
X.ifndef(WITHOUT_X264)
X @${ECHO_MSG} 'Define WITHOUT_X264 to disable X264 codec'
X @${ECHO_MSG}
X.endif
X.ifndef(WITH_XVID)
X @${ECHO_MSG} 'Define WITH_XVID to enable XVID codec'
X @${ECHO_MSG}
X.endif
X
Xpost-patch:
X# Faad compat
X @${REINPLACE_CMD} -e 's|faacD|NeAACD|' ${WRKSRC}/libavcodec/libfaad.c
X# {C,LD}FLAGS safeness
X# fix x264 math, use correct log base 2 from math(3)
X.if ${OSVERSION} <= 601000
X @${REINPLACE_CMD} -E \
X -e 's| log2| log|' \
X ${WRKSRC}/libavcodec/libx264.c
X.endif
X @${REINPLACE_CMD} -e 's|$$(libdir)/pkgconfig|${PREFIX}/libdata/pkgconfig|' \
X ${WRKSRC}/common.mak
X @${REINPLACE_CMD} -e 's|/etc/ffserver.conf|${PREFIX}/etc/ffserver.conf|' \
X ${WRKSRC}/ffserver.c
X @${REINPLACE_CMD} -E \
X -e "s|(EXTRALIBS[[:space:]]*=)|\1-L${LOCALBASE}/lib |g; \
X s|%%LOCALBASE%%|${LOCALBASE}|g; s|%%SHLIB_VER%%|${SHLIB_VER}|g; \
X s|-pthread|${PTHREAD_LIBS}|g" \
X ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
X# force detection of texi2html
X.ifndef(NOPORTDOCS)
X @${REINPLACE_CMD} -E \
X -e 's|^(texi2html=)no|\1yes|' \
X ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
X.endif
X @${REINPLACE_CMD} -e 's|-ldl||' \
X ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
X.if defined(WITH_IMLIB2) && !defined(WITHOUT_IMLIB2)
X @${REINPLACE_CMD} -E \
X -e 's|^(imlib2).*$$|\1=yes|' \
X ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
X.endif
X.if !defined(WITHOUT_IPV6)
X @${REINPLACE_CMD} -E \
X -e 's|^(ipv6).*$$|\1=yes|' \
X ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
X.endif
X.ifdef(WITH_SDL)
X @${REINPLACE_CMD} -E \
X -e 's|sdl-config|${SDL_CONFIG}|g' \
X ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
X @${FIND} ${WRKSRC} -type f | \
X ${XARGS} -n 10 ${REINPLACE_CMD} -E \
X -e 's|#include <SDL|#include <SDL/SDL|'
X.endif
X.if !defined(WITHOUT_BUILTIN_VECTOR) && defined(WITH_BUILTIN_VECTOR)
X @${REINPLACE_CMD} -E \
X -e 's|^([[:space:]]+builtin_vector).*$$|\1=yes|' \
X ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
X.else
X @${REINPLACE_CMD} -E \
X -e 's|^([[:space:]]+builtin_vector).*$$|\1=no|' \
X ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
X.endif
X @${REINPLACE_CMD} -e 's|$$(LIBDIR)/pkgconfig|${PREFIX}/libdata/pkgconfig|' \
X ${WRKSRC}/common.mak
X
Xpost-configure:
X#.ifdef(WITH_DTS)
X# @${REINPLACE_CMD} -E \
X# -e 's|-ldts|${LOCALBASE}/lib/libdts_pic.a|' \
X# -e 's|(-lx264)|-L${LOCALBASE}/lib \1|' \
X# ${WRKSRC}/config.mak \
X# ${WRKSRC}/libavcodec/Makefile
X#.endif
X.ifdef(WITHOUT_THEORA)
X @${REINPLACE_CMD} -E \
X -e 's|^(CONFIG_LIBTHEORA).*$$|\1=no|' \
X ${WRKSRC}/config.mak
X.endif
X
Xpost-install:
X ${INSTALL_DATA} ${WRKSRC}/doc/ffserver.conf ${PREFIX}/etc/ffserver.conf-dist
X if [ ! -f ${PREFIX}/etc/ffserver.conf ]; then \
X ${INSTALL_DATA} ${WRKSRC}/doc/ffserver.conf ${PREFIX}/etc; \
X fi
X.ifndef(NOPORTDOCS)
X ${MKDIR} ${DOCSDIR}
X.for file in ${DOC_FILES}
X ${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
X.endfor
X.for file in ${DOC_DOCFILES}
X ${INSTALL_DATA} ${WRKSRC}/doc/${file} ${DOCSDIR}
X.endfor
X.endif
X
X.include <bsd.port.post.mk>
END-of-ffmpeg/Makefile
echo x - ffmpeg/distinfo
sed 's/^X//' >ffmpeg/distinfo << 'END-of-ffmpeg/distinfo'
XMD5 (ffmpeg-2007-10-04.tar.bz2) = 9ec842daece6479cc92cbc421a008d53
XSHA256 (ffmpeg-2007-10-04.tar.bz2) = f8aa5a2b85c1ce27a91a4bb0415f01415dfc7e6110476da717ac835193679447
XSIZE (ffmpeg-2007-10-04.tar.bz2) = 2326718
END-of-ffmpeg/distinfo
echo x - ffmpeg/pkg-descr
sed 's/^X//' >ffmpeg/pkg-descr << 'END-of-ffmpeg/pkg-descr'
X[ excerpt (with adaptations) from developer's README ]
Xffmpeg is a hyper fast realtime audio/video encoder, a streaming
Xserver and a generic audio and video file converter.
X
XIt can convert a standard video source into several file formats
Xbased on DCT/motion compensation encoding. Sound is compressed in
XMPEG audio layer 2 or using an AC3 compatible stream.
X
XWhat makes ffmpeg interesting ?
X- Simple and efficient video encoder: outputs MPEG1, H263, Real
X Video(tm), MPEG4, DIVX and MJPEG compatible bitstreams using the
X same encoder core.
X- Hyper fast MPEG audio layer 2 compression (50 times faster than
X realtime on a K6 500).
X[snip -> rest on website below]
X
Xffmpeg is made of two programs:
X* ffmpeg: soft VCR which encodes in real time to several formats.
X It can also encode from any supported input file format to any
X input supported format.
X* ffserver: high performance live broadcast streaming server based
X on the ffmpeg core encoders.
X
XWWW: http://ffmpeg.mplayerhq.hu/
END-of-ffmpeg/pkg-descr
echo x - ffmpeg/pkg-plist
sed 's/^X//' >ffmpeg/pkg-plist << 'END-of-ffmpeg/pkg-plist'
Xbin/ffmpeg
Xbin/ffserver
X@unexec if cmp -s %D/etc/ffserver.conf %D/etc/ffserver.conf-dist; then rm -f %D/etc/ffserver.conf; fi
Xetc/ffserver.conf-dist
Xinclude/ffmpeg/adler32.h
Xinclude/ffmpeg/avcodec.h
Xinclude/ffmpeg/avformat.h
Xinclude/ffmpeg/avio.h
Xinclude/ffmpeg/avstring.h
Xinclude/ffmpeg/avutil.h
Xinclude/ffmpeg/base64.h
Xinclude/ffmpeg/common.h
Xinclude/ffmpeg/fifo.h
Xinclude/ffmpeg/integer.h
Xinclude/ffmpeg/intfloat_readwrite.h
Xinclude/ffmpeg/log.h
Xinclude/ffmpeg/lzo.h
Xinclude/ffmpeg/mathematics.h
Xinclude/ffmpeg/md5.h
Xinclude/ffmpeg/mem.h
Xinclude/ffmpeg/opt.h
Xinclude/ffmpeg/random.h
Xinclude/ffmpeg/rational.h
Xinclude/ffmpeg/rgb2rgb.h
Xinclude/ffmpeg/rtp.h
Xinclude/ffmpeg/rtsp.h
Xinclude/ffmpeg/rtspcodes.h
Xinclude/ffmpeg/swscale.h
Xinclude/postproc/postprocess.h
Xlib/libavcodec.a
Xlib/libavcodec.so
Xlib/libavcodec.so.%%SHLIB_VER%%
Xlib/libavcodec.so.51.44.0
Xlib/libavformat.a
Xlib/libavformat.so
Xlib/libavformat.so.%%SHLIB_VER%%
Xlib/libavformat.so.51.14.0
Xlib/libavutil.a
Xlib/libavutil.so
Xlib/libavutil.so.%%SHLIB_VER%%
Xlib/libavutil.so.49.5.0
Xlib/libpostproc.a
Xlib/libpostproc.so
Xlib/libpostproc.so.%%SHLIB_VER%%
Xlib/libpostproc.so.51.1.0
X%%SWSCAL%%lib/libswscale.a
X%%SWSCAL%%lib/libswscale.so
X%%SWSCAL%%lib/libswscale.so.%%SHLIB_VER%%
X%%SWSCAL%%lib/libswscale.so.0.5.0
Xlib/vhook/fish.so
Xlib/vhook/null.so
Xlib/vhook/ppm.so
Xlib/vhook/watermark.so
Xlibdata/pkgconfig/libavcodec.pc
Xlibdata/pkgconfig/libavformat.pc
Xlibdata/pkgconfig/libavutil.pc
Xlibdata/pkgconfig/libpostproc.pc
Xlibdata/pkgconfig/libswscale.pc
X@dirrm lib/vhook
X@dirrm include/postproc
X@dirrm include/ffmpeg
END-of-ffmpeg/pkg-plist
echo c - ffmpeg/files
mkdir -p ffmpeg/files > /dev/null 2>&1
echo x - ffmpeg/files/patch-libavcode_imgconvert.c
sed 's/^X//' >ffmpeg/files/patch-libavcode_imgconvert.c << 'END-of-ffmpeg/files/patch-libavcode_imgconvert.c'
X--- libavcodec/imgconvert.c.orig Thu May 3 09:07:28 2007
X+++ libavcodec/imgconvert.c Thu May 3 09:08:25 2007
X@@ -2319,7 +2319,6 @@
X }
X #endif
X
X-#ifndef CONFIG_SWSCALER
X /* XXX: always use linesize. Return -1 if not supported */
X int img_convert(AVPicture *dst, int dst_pix_fmt,
X const AVPicture *src, int src_pix_fmt,
X@@ -2561,7 +2560,6 @@
X avpicture_free(tmp);
X return ret;
X }
X-#endif
X
X /* NOTE: we scan all the pixels to have an exact information */
X static int get_alpha_info_pal8(const AVPicture *src, int width, int height)
END-of-ffmpeg/files/patch-libavcode_imgconvert.c
echo x - ffmpeg/files/patch-configure
sed 's/^X//' >ffmpeg/files/patch-configure << 'END-of-ffmpeg/files/patch-configure'
X--- configure.orig 2007-07-08 13:47:15.000000000 -0400
X+++ configure 2007-07-09 12:37:09.000000000 -0400
X@@ -210,11 +210,11 @@
X
X # "tr '[a-z]' '[A-Z]'" is a workaround for Solaris tr not grokking "tr a-z A-Z"
X toupper(){
X- echo "$@" | tr '[a-z]' '[A-Z]'
X+ echo "$@" | tr '[:lower:]' '[:upper:]'
X }
X
X tolower(){
X- echo "$@" | tr '[A-Z]' '[a-z]'
X+ echo "$@" | tr '[:upper:]' '[:lower:]'
X }
X
X set_all(){
X@@ -992,15 +992,9 @@
X enable fast_unaligned
X ;;
X x86_64|amd64)
X- arch="x86_32"
X enable fast_unaligned
X- canon_arch="`$cc -dumpmachine | sed -e 's,\([^-]*\)-.*,\1,'`"
X- if [ x"$canon_arch" = x"x86_64" -o x"$canon_arch" = x"amd64" ]; then
X- if [ -z "`echo $CFLAGS | grep -- -m32`" ]; then
X- arch="x86_64"
X- enable fast_64bit
X- fi
X- fi
X+ arch="x86_64"
X+ enable fast_64bit
X ;;
X # armv4l is a subset of armv[567]*l
X arm|armv[4567]*l)
X@@ -1734,12 +1728,6 @@
X check_cflags -Os # not all compilers support -Os
X optimize="small"
X elif enabled optimize; then
X- if test -n "`$cc -v 2>&1 | grep xlc`"; then
X- add_cflags "-O5"
X- add_ldflags "-O5"
X- else
X- add_cflags "-O3"
X- fi
X fi
X
X # PIC flags for shared library objects where they are needed
X@@ -1927,15 +1915,15 @@
X if enabled shared; then
X echo "BUILD_SHARED=yes" >> config.mak
X echo "PIC=-fPIC -DPIC" >> config.mak
X- echo "SPPMAJOR=${pp_version%%.*}" >> config.mak
X+ echo "SPPMAJOR=1" >> config.mak
X echo "SPPVERSION=$pp_version" >> config.mak
X- echo "LAVCMAJOR=${lavc_version%%.*}" >> config.mak
X+ echo "LAVCMAJOR=%%SHLIB_VER%%" >> config.mak
X echo "LAVCVERSION=$lavc_version" >> config.mak
X- echo "LAVFMAJOR=${lavf_version%%.*}" >> config.mak
X+ echo "LAVFMAJOR=%%SHLIB_VER%%" >> config.mak
X echo "LAVFVERSION=$lavf_version" >> config.mak
X- echo "LAVUMAJOR=${lavu_version%%.*}" >> config.mak
X+ echo "LAVUMAJOR=%%SHLIB_VER%%" >> config.mak
X echo "LAVUVERSION=$lavu_version" >> config.mak
X- echo "SWSMAJOR=${sws_version%%.*}" >> config.mak
X+ echo "SWSMAJOR=%%SHLIB_VER%%" >> config.mak
X echo "SWSVERSION=$sws_version" >> config.mak
X echo "SLIBNAME=${SLIBNAME}" >> config.mak
X echo "SLIBNAME_WITH_VERSION=${SLIBNAME_WITH_VERSION}" >> config.mak
X@@ -1969,7 +1957,7 @@
X
X echo "SRC_PATH=\"$source_path\"" >> config.mak
X echo "SRC_PATH_BARE=$source_path" >> config.mak
X-echo "BUILD_ROOT=\"$PWD\"" >> config.mak
X+echo "BUILD_ROOT=\"$(pwd)\"" >> config.mak
X
X # Apparently it's not possible to portably echo a backslash.
X if enabled asmalign_pot; then
X@@ -2047,8 +2035,8 @@
X Version: $version
X Requires: $requires
X Conflicts:
X-Libs: -L\${libdir} $libs
X-Cflags: -I\${includedir} -I\${includedir}/$include
X+Libs: -L\${libdir} $libs -L%%LOCALBASE%%/lib
X+Cflags: -I\${includedir} -I\${includedir}/$include -I%%LOCALBASE%%/include
X EOF
X }
X
X@@ -2071,7 +2059,8 @@
X Requires: $requires
X Conflicts:
X Libs: \${libdir}/${LIBPREF}${shortname}${LIBSUF} $libs
X-Cflags: -I\${includedir}
X+Ldflags: -L%%LOCALBASE%%/lib
X+Cflags: -I\${includedir} -I%%LOCALBASE%%/include
X EOF
X }
X
END-of-ffmpeg/files/patch-configure
echo x - ffmpeg/files/patch-libavutil__bswap.h
sed 's/^X//' >ffmpeg/files/patch-libavutil__bswap.h << 'END-of-ffmpeg/files/patch-libavutil__bswap.h'
X--- libavutil/bswap.h.orig Mon Nov 28 22:16:18 2005
X+++ libavutil/bswap.h Mon Nov 28 22:21:22 2005
X@@ -6,8 +6,18 @@
X #ifndef __BSWAP_H__
X #define __BSWAP_H__
X
X+/* to detect __FreeBSD_version */
X+#if (defined(__unix__) || defined(unix)) && !defined(USG)
X+#include <sys/param.h>
X+#endif
X+
X #ifdef HAVE_BYTESWAP_H
X #include <byteswap.h>
X+#elif (defined(__FreeBSD__) && __FreeBSD_version >= 500000)
X+# include <sys/endian.h>
X+# define bswap_16(x) bswap16(x)
X+# define bswap_32(x) bswap32(x)
X+# define bswap_64(x) bswap64(x)
X #else
X
X #ifdef ARCH_X86_64
END-of-ffmpeg/files/patch-libavutil__bswap.h
echo x - ffmpeg/files/ffserver.in
sed 's/^X//' >ffmpeg/files/ffserver.in << 'END-of-ffmpeg/files/ffserver.in'
X#!/bin/sh
X#
X# $FreeBSD: ports/multimedia/ffmpeg/files/ffserver.in,v 1.1 2007/05/25 17:07:36 ahze Exp $
X#
X
X# PROVIDE: ffserver
X# REQUIRE: NETWORKING
X# KEYWORD: shutdown
X
X#
X# Add the following lines to /etc/rc.conf to enable ffserver:
X#
X#ffserver_enable="YES"
X#
Xffserver_enable="${ffserver_enable-NO}"
X
X. %%RC_SUBR%%
X
Xname=ffserver
Xrcvar=`set_rcvar`
X
Xcommand=%%PREFIX%%/bin/${name}
Xrequired_files=%%PREFIX%%/etc/ffserver.conf
X
Xload_rc_config ${name}
Xrun_rc_command "$1"
END-of-ffmpeg/files/ffserver.in
exit
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200803200415.m2K4FPTC022946>