[ports-multimedia commit] r48 - in trunk/ports-multimedia/multimedia/ffmpeg: . files
codesite-noreply at google.com
codesite-noreply at google.com
Thu May 31 11:47:25 EDT 2007
Author: buhnux
Date: Thu May 31 08:47:10 2007
New Revision: 48
Added:
trunk/ports-multimedia/multimedia/ffmpeg/
trunk/ports-multimedia/multimedia/ffmpeg/Makefile
trunk/ports-multimedia/multimedia/ffmpeg/distinfo
trunk/ports-multimedia/multimedia/ffmpeg/files/
trunk/ports-multimedia/multimedia/ffmpeg/files/amd64-patch
trunk/ports-multimedia/multimedia/ffmpeg/files/ffserver.in
trunk/ports-multimedia/multimedia/ffmpeg/files/patch-configure
trunk/ports-multimedia/multimedia/ffmpeg/files/patch-libavcode_imgconvert.c
trunk/ports-multimedia/multimedia/ffmpeg/files/patch-libavcodec_Makefile
trunk/ports-multimedia/multimedia/ffmpeg/files/patch-libavutil__bswap.h
trunk/ports-multimedia/multimedia/ffmpeg/pkg-descr
trunk/ports-multimedia/multimedia/ffmpeg/pkg-plist
Log:
Update to 2007-05-30
Added: trunk/ports-multimedia/multimedia/ffmpeg/Makefile
==============================================================================
--- (empty file)
+++ trunk/ports-multimedia/multimedia/ffmpeg/Makefile Thu May 31 08:47:10 2007
@@ -0,0 +1,326 @@
+# New ports collection makefile for: ffmpeg cvs
+# Date created: Sun May 1 20:46:59 UTC 2005
+# Whom: Mario Sergio Fujikawa Ferreira <lioux at FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= ffmpeg
+DISTVERSION= 2007-05-30
+CATEGORIES= multimedia audio ipv6 net
+MASTER_SITES= ${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR= ahze
+
+MAINTAINER= multimedia at FreeBSD.org
+COMMENT= Hyper fast realtime audio/video encoder/converter, streaming server
+
+HAS_CONFIGURE= yes
+USE_BZIP2= yes
+USE_GMAKE= yes
+WANT_SDL= yes
+CONFIGURE_ARGS= --cc="${CC}" --prefix="${PREFIX}" \
+ --make="${GMAKE}" \
+ --disable-debug \
+ --enable-memalign-hack \
+ --enable-shared \
+ --enable-pp \
+ --extra-cflags="-fPIC -DPIC ${CFLAGS} -I${LOCALBASE}/include" \
+ --extra-ldflags="-L${LOCALBASE}/lib" \
+ --extra-libs="${PTHREAD_LIBS}" \
+ --disable-bktr \
+ --enable-gpl \
+ --enable-pthreads \
+ --enable-swscaler
+CONFIGURE_ENV+= LANG=C
+MAKE_ENV= INSTALL="${INSTALL}"
+SHLIB_VER= 1
+PLIST_SUB= SHLIB_VER=${SHLIB_VER}
+USE_LDCONFIG= yes
+
+CONFLICTS= ffmpeg-[0-9]*
+
+MAN1= ffmpeg.1
+
+##
+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= *
+
+.include <bsd.port.pre.mk>
+
+.if ${ARCH}=="amd64"
+EXTRA_PATCHES= ${PATCHDIR}/amd64-patch
+.endif
+
+## sse hardware vector support
+.if (defined(MACHINE_CPU) && ${MACHINE_CPU:Msse} == "sse")
+WITH_BUILTIN_VECTOR= yes
+.endif
+
+##
+## support activation
+##
+## PORTDOCS
+.ifndef(NOPORTDOCS)
+BUILD_DEPENDS+= texi2html:${PORTSDIR}/textproc/texi2html
+.endif
+
+.ifdef(WITH_OPTIMIZED_CFLAGS)
+FFMPEG_CFLAGS+= -O3 -ffast-math -fomit-frame-pointer
+.endif
+
+## a52
+.if !defined(WITHOUT_LIBA52) && !defined(WITHOUT_A52)
+LIB_DEPENDS+= a52.0:${PORTSDIR}/audio/liba52
+
+CONFIGURE_ARGS+= --enable-liba52 \
+ --enable-liba52bin
+FFMPEG_LDFLAGS+= -la52
+.else
+CONFIGURE_ARGS+= --disable-liba52
+.endif
+## dts
+#.ifdef(WITH_DTS) || exists(${LOCALBASE}/lib/libdca.a)
+#LIB_DEPENDS+= dca.0:${PORTSDIR}/multimedia/libdca
+#CONFIGURE_ARGS+= --enable-libdts
+#.endif
+## faac
+.ifdef(WITH_FAAC) || exists(${LOCALBASE}/lib/libfaac.so)
+LIB_DEPENDS+= faac.0:${PORTSDIR}/audio/faac
+
+CONFIGURE_ARGS+= --enable-libfaac
+.endif
+## faad
+.ifdef(WITH_FAAD) || exists(${LOCALBASE}/lib/libfaad.so)
+LIB_DEPENDS+= faad.0:${PORTSDIR}/audio/faad
+
+CONFIGURE_ARGS+= --enable-libfaad \
+ --enable-libfaadbin
+.endif
+USE_RC_SUBR= ffserver
+MAN1+= ffserver.1
+
+#### BROKEN LIST #####
+WITHOUT_THEORA= yes
+
+.if ${MACHINE_CPU:Mmmx}==""
+CONFIGURE_ARGS+= --disable-mmx
+
+WITHOUT_BUILTIN_VECTOR= yes
+.endif
+## gsm
+.ifdef(WITH_GSM) || exists(${LOCALBASE}/lib/libgsm.so)
+LIB_DEPENDS+= gsm.1:${PORTSDIR}/audio/gsm
+
+CONFIGURE_ARGS+= --enable-libgsm
+.endif
+## mp3
+.ifdef(WITH_LAME) || exists(${LOCALBASE}/lib/libmp3lame.so) || defined(WITH_MP3)
+LIB_DEPENDS+= mp3lame.0:${PORTSDIR}/audio/lame
+
+CONFIGURE_ARGS+= --enable-libmp3lame
+.endif
+## ogg
+.ifndef(WITHOUT_OGG) || exists(${LOCALBASE}/lib/libogg.so)
+LIB_DEPENDS+= ogg.5:${PORTSDIR}/audio/libogg
+
+CONFIGURE_ARGS+= --enable-libogg
+.endif
+
+## SDL
+.ifdef(WITH_SDL) || ${HAVE_SDL:Msdl}
+USE_SDL+= sdl
+
+MAN1+= ffplay.1
+
+PLIST_FILES+= bin/ffplay
+.else
+CONFIGURE_ARGS+= --disable-ffplay
+.endif
+.if !defined(WITHOUT_THEORA)
+WITH_OGG= yes
+LIB_DEPENDS+= theora.2:${PORTSDIR}/multimedia/libtheora
+
+CONFIGURE_ARGS+= --enable-libtheora
+.endif
+## vorbis
+.if !defined(WITHOUT_VORBIS)
+WITH_OGG= yes
+LIB_DEPENDS+= vorbisenc.2:${PORTSDIR}/audio/libvorbis
+
+CONFIGURE_ARGS+= --enable-libvorbis
+FFMPEG_CFLAGS+= -I${LOCALBASE}/include/vorbis
+.endif
+# x264
+.ifdef(WITH_X264) || exists(${LOCALBASE}/lib/libx264.so)
+LIB_DEPENDS+= x264.50:${PORTSDIR}/multimedia/x264
+
+CONFIGURE_ARGS+= --enable-x264
+.endif
+## builtin vector, requires mmx
+.if !defined(WITHOUT_BUILTIN_VECTOR) && defined(WITH_BUILTIN_VECTOR)
+FFMPEG_CFLAGS+= -msse
+.endif
+. ifdef(WITH_FREETYPE2) || exists(${LOCALBASE}/lib/libfreetype.so)
+LIB_DEPENDS+= freetype.9:${PORTSDIR}/print/freetype2
+
+PLIST_FILES+= lib/vhook/drawtext.so
+. endif # freetype2
+. ifdef(WITH_IMLIB2) || exists(${LOCALBASE}/lib/libImlib2.so)
+LIB_DEPENDS+= Imlib2.4:${PORTSDIR}/graphics/imlib2
+
+PLIST_FILES+= lib/vhook/imlib2.so
+. else
+WITHOUT_IMLIB2= yes
+. endif # imlib2
+
+## xvid
+.ifdef(WITH_XVID) || exists(${LOCALBASE}/lib/libxvidcore.so)
+LIB_DEPENDS+= xvidcore.4:${PORTSDIR}/multimedia/xvid
+
+CONFIGURE_ARGS+= --enable-xvid
+.endif
+
+pre-everything::
+.ifndef(WITHOUT_A52)
+ @${ECHO_MSG} 'You can disable liba52 support by defining WITHOUT_LIBA52'
+ @${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(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_LAME)
+ @${ECHO_MSG} 'Define WITH_LAME 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(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
+
+post-patch:
+# Faad compat
+ @${REINPLACE_CMD} -e 's|faacD|NeAACD|' ${WRKSRC}/libavcodec/faad.c
+# {C,LD}FLAGS safeness
+# fix x264 math, use correct log base 2 from math(3)
+.if ${OSVERSION} <= 601000
+ @${REINPLACE_CMD} -E \
+ -e 's| log2| log|' \
+ ${WRKSRC}/libavcodec/x264.c
+.endif
+ @${REINPLACE_CMD} -e 's|$$(libdir)/pkgconfig|${PREFIX}/libdata/pkgconfig|' \
+ ${WRKSRC}/common.mak
+ @${REINPLACE_CMD} -E \
+ -e "s|(EXTRALIBS[[:space:]]*=)|\1-L${LOCALBASE}/lib |g; \
+ s|%%LOCALBASE%%|${LOCALBASE}|g; s|%%SHLIB_VER%%|${SHLIB_VER}|g; \
+ s|-pthread|${PTHREAD_LIBS}|g" \
+ ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
+# force detection of texi2html
+.ifndef(NOPORTDOCS)
+ @${REINPLACE_CMD} -E \
+ -e 's|^(texi2html=)no|\1yes|' \
+ ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
+.endif
+ @${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.*$$||'
+ @${REINPLACE_CMD} -e 's|-ldl||' \
+ ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
+.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)
+ @${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
+.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
+
+post-configure:
+.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
+
+.include <bsd.port.post.mk>
Added: trunk/ports-multimedia/multimedia/ffmpeg/distinfo
==============================================================================
--- (empty file)
+++ trunk/ports-multimedia/multimedia/ffmpeg/distinfo Thu May 31 08:47:10 2007
@@ -0,0 +1,3 @@
+MD5 (ffmpeg-2007-05-30.tar.bz2) = 85d6f1a5657ca9c7730dac76c1cca883
+SHA256 (ffmpeg-2007-05-30.tar.bz2) = fa2237b2852ea8f01b329863f9b07f72865a1f58af5d001904d67f974ab0e18b
+SIZE (ffmpeg-2007-05-30.tar.bz2) = 2256282
Added: trunk/ports-multimedia/multimedia/ffmpeg/files/amd64-patch
==============================================================================
--- (empty file)
+++ trunk/ports-multimedia/multimedia/ffmpeg/files/amd64-patch Thu May 31 08:47:10 2007
@@ -0,0 +1,55 @@
+$OpenBSD: patch-libavcodec_mpegvideo_c,v 1.1 2007/01/23 09:34:45 robert Exp $
+--- libavcodec/mpegvideo.c.orig Sat Dec 23 05:05:36 2006
++++ libavcodec/mpegvideo.c Tue Jan 2 18:22:01 2007
+@@ -4837,7 +4837,7 @@ static int pre_estimate_motion_thread(AV
+ static int estimate_motion_thread(AVCodecContext *c, void *arg){
+ MpegEncContext *s= arg;
+
+- ff_check_alignment();
++ /*ff_check_alignment();*/
+
+ s->me.dia_size= s->avctx->dia_size;
+ s->first_slice_line=1;
+@@ -4865,7 +4865,7 @@ static int mb_var_thread(AVCodecContext
+ MpegEncContext *s= arg;
+ int mb_x, mb_y;
+
+- ff_check_alignment();
++ /*ff_check_alignment();*/
+
+ for(mb_y=s->start_mb_y; mb_y < s->end_mb_y; mb_y++) {
+ for(mb_x=0; mb_x < s->mb_width; mb_x++) {
+@@ -4914,7 +4914,7 @@ static int encode_thread(AVCodecContext
+ PutBitContext pb[2], pb2[2], tex_pb[2];
+ //printf("%d->%d\n", s->resync_mb_y, s->end_mb_y);
+
+- ff_check_alignment();
++ /*ff_check_alignment();*/
+
+ for(i=0; i<2; i++){
+ init_put_bits(&pb [i], bit_buf [i], MAX_MB_BYTES);
+--- libavcodec/dsputil.c.orig Wed Apr 18 09:42:55 2007
++++ libavcodec/dsputil.c Wed Apr 18 10:16:01 2007
+@@ -3814,6 +3814,7 @@
+ for(i=0; i<64; i++) inv_zigzag_direct16[ff_zigzag_direct[i]]= i+1;
+ }
+
++/*
+ int ff_check_alignment(void){
+ static int did_fail=0;
+ DECLARE_ALIGNED_16(int, aligned);
+@@ -3832,12 +3833,12 @@
+ }
+ return 0;
+ }
+-
++*/
+ void dsputil_init(DSPContext* c, AVCodecContext *avctx)
+ {
+ int i;
+
+- ff_check_alignment();
++ /*ff_check_alignment();*/
+
+ #ifdef CONFIG_ENCODERS
+ if(avctx->dct_algo==FF_DCT_FASTINT) {
Added: trunk/ports-multimedia/multimedia/ffmpeg/files/ffserver.in
==============================================================================
--- (empty file)
+++ trunk/ports-multimedia/multimedia/ffmpeg/files/ffserver.in Thu May 31 08:47:10 2007
@@ -0,0 +1,26 @@
+#!/bin/sh
+#
+# $FreeBSD: ports/multimedia/ffmpeg/files/ffserver.in,v 1.1 2007/05/25 17:07:36 ahze Exp $
+#
+
+# PROVIDE: ffserver
+# REQUIRE: NETWORKING
+# KEYWORD: shutdown
+
+#
+# Add the following lines to /etc/rc.conf to enable ffserver:
+#
+#ffserver_enable="YES"
+#
+ffserver_enable="${ffserver_enable-NO}"
+
+. %%RC_SUBR%%
+
+name=ffserver
+rcvar=`set_rcvar`
+
+command=%%PREFIX%%/bin/${name}
+required_files=%%PREFIX%%/etc/ffserver.conf
+
+load_rc_config ${name}
+run_rc_command "$1"
Added: trunk/ports-multimedia/multimedia/ffmpeg/files/patch-configure
==============================================================================
--- (empty file)
+++ trunk/ports-multimedia/multimedia/ffmpeg/files/patch-configure Thu May 31 08:47:10 2007
@@ -0,0 +1,108 @@
+--- configure.orig Sun May 27 12:31:02 2007
++++ configure Wed May 30 21:50:21 2007
+@@ -210,11 +210,11 @@
+
+ # "tr '[a-z]' '[A-Z]'" is a workaround for Solaris tr not grokking "tr a-z A-Z"
+ toupper(){
+- echo "$@" | tr '[a-z]' '[A-Z]'
++ echo "$@" | tr '[:lower:]' '[:upper:]'
+ }
+
+ tolower(){
+- echo "$@" | tr '[A-Z]' '[a-z]'
++ echo "$@" | tr '[:upper:]' '[:lower:]'
+ }
+
+ set_all(){
+@@ -1020,15 +1020,9 @@
+ enable fast_unaligned
+ ;;
+ x86_64|amd64)
+- arch="x86_32"
+ enable fast_unaligned
+- 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
+- arch="x86_64"
+- enable fast_64bit
+- fi
+- fi
++ arch="x86_64"
++ enable fast_64bit
+ ;;
+ # armv4l is a subset of armv[567]*l
+ arm|armv[4567]*l)
+@@ -1781,14 +1775,14 @@
+ # not all compilers support -Os
+ test "$optimize" = "small" && check_cflags -Os
+
+-if enabled optimize; then
+- if test -n "`$cc -v 2>&1 | grep xlc`"; then
+- add_cflags "-O5"
+- add_ldflags "-O5"
+- else
+- add_cflags "-O3"
+- fi
+-fi
++#if enabled optimize; then
++# if test -n "`$cc -v 2>&1 | grep xlc`"; then
++# add_cflags "-O5"
++# add_ldflags "-O5"
++# else
++# add_cflags "-O3"
++# fi
++#fi
+
+ # PIC flags for shared library objects where they are needed
+ if enabled shared; then
+@@ -1996,15 +1990,15 @@
+ if enabled shared; then
+ echo "BUILD_SHARED=yes" >> config.mak
+ echo "PIC=-fPIC -DPIC" >> config.mak
+- echo "SPPMAJOR=${pp_version%%.*}" >> config.mak
++ echo "SPPMAJOR=1" >> config.mak
+ echo "SPPVERSION=$pp_version" >> config.mak
+- echo "LAVCMAJOR=${lavc_version%%.*}" >> config.mak
++ echo "LAVCMAJOR=%%SHLIB_VER%%" >> config.mak
+ echo "LAVCVERSION=$lavc_version" >> config.mak
+- echo "LAVFMAJOR=${lavf_version%%.*}" >> config.mak
++ echo "LAVFMAJOR=%%SHLIB_VER%%" >> config.mak
+ echo "LAVFVERSION=$lavf_version" >> config.mak
+- echo "LAVUMAJOR=${lavu_version%%.*}" >> config.mak
++ echo "LAVUMAJOR=%%SHLIB_VER%%" >> config.mak
+ echo "LAVUVERSION=$lavu_version" >> config.mak
+- echo "SWSMAJOR=${sws_version%%.*}" >> config.mak
++ echo "SWSMAJOR=%%SHLIB_VER%%" >> config.mak
+ echo "SWSVERSION=$sws_version" >> config.mak
+ echo "SLIBNAME=${SLIBNAME}" >> config.mak
+ echo "SLIBNAME_WITH_VERSION=${SLIBNAME_WITH_VERSION}" >> config.mak
+@@ -2039,7 +2033,7 @@
+
+ echo "SRC_PATH=\"$source_path\"" >> config.mak
+ echo "SRC_PATH_BARE=$source_path" >> config.mak
+-echo "BUILD_ROOT=\"$PWD\"" >> config.mak
++echo "BUILD_ROOT=\"$(pwd)\"" >> config.mak
+
+ # Apparently it's not possible to portably echo a backslash.
+ if enabled asmalign_pot; then
+@@ -2119,8 +2113,8 @@
+ Version: $version
+ Requires: $requires
+ Conflicts:
+-Libs: -L\${libdir} $libs
+-Cflags: -I\${includedir} -I\${includedir}/$include
++Libs: -L\${libdir} $libs -L%%LOCALBASE%%/lib
++Cflags: -I\${includedir} -I\${includedir}/$include -I%%LOCALBASE%%/include
+ EOF
+ }
+
+@@ -2143,7 +2137,8 @@
+ Requires: $requires
+ Conflicts:
+ Libs: \${libdir}/${LIBPREF}${shortname}${LIBSUF} $libs
+-Cflags: -I\${includedir}
++Ldflags: -L%%LOCALBASE%%/lib
++Cflags: -I\${includedir} -I%%LOCALBASE%%/include
+ EOF
+ }
+
Added: trunk/ports-multimedia/multimedia/ffmpeg/files/patch-libavcode_imgconvert.c
==============================================================================
--- (empty file)
+++ trunk/ports-multimedia/multimedia/ffmpeg/files/patch-libavcode_imgconvert.c Thu May 31 08:47:10 2007
@@ -0,0 +1,18 @@
+--- libavcodec/imgconvert.c.orig Thu May 3 09:07:28 2007
++++ libavcodec/imgconvert.c Thu May 3 09:08:25 2007
+@@ -2319,7 +2319,6 @@
+ }
+ #endif
+
+-#ifndef CONFIG_SWSCALER
+ /* XXX: always use linesize. Return -1 if not supported */
+ int img_convert(AVPicture *dst, int dst_pix_fmt,
+ const AVPicture *src, int src_pix_fmt,
+@@ -2561,7 +2560,6 @@
+ avpicture_free(tmp);
+ return ret;
+ }
+-#endif
+
+ /* NOTE: we scan all the pixels to have an exact information */
+ static int get_alpha_info_pal8(const AVPicture *src, int width, int height)
Added: trunk/ports-multimedia/multimedia/ffmpeg/files/patch-libavcodec_Makefile
==============================================================================
--- (empty file)
+++ trunk/ports-multimedia/multimedia/ffmpeg/files/patch-libavcodec_Makefile Thu May 31 08:47:10 2007
@@ -0,0 +1,12 @@
+--- libavcodec/Makefile.orig Thu May 3 08:50:33 2007
++++ libavcodec/Makefile Thu May 3 08:50:42 2007
+@@ -293,9 +293,7 @@
+
+ OBJS-$(HAVE_XVMC_ACCEL) += xvmcvideo.o
+
+-ifneq ($(CONFIG_SWSCALER),yes)
+ OBJS += imgresample.o
+-endif
+
+ # processor-specific code
+ ifeq ($(TARGET_MMX),yes)
Added: trunk/ports-multimedia/multimedia/ffmpeg/files/patch-libavutil__bswap.h
==============================================================================
--- (empty file)
+++ trunk/ports-multimedia/multimedia/ffmpeg/files/patch-libavutil__bswap.h Thu May 31 08:47:10 2007
@@ -0,0 +1,21 @@
+--- 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
Added: trunk/ports-multimedia/multimedia/ffmpeg/pkg-descr
==============================================================================
--- (empty file)
+++ trunk/ports-multimedia/multimedia/ffmpeg/pkg-descr Thu May 31 08:47:10 2007
@@ -0,0 +1,24 @@
+[ excerpt (with adaptations) from developer's README ]
+ffmpeg is a hyper fast realtime audio/video encoder, a streaming
+server and a generic audio and video file converter.
+
+It can convert a standard video source into several file formats
+based on DCT/motion compensation encoding. Sound is compressed in
+MPEG audio layer 2 or using an AC3 compatible stream.
+
+What makes ffmpeg interesting ?
+- Simple and efficient video encoder: outputs MPEG1, H263, Real
+ Video(tm), MPEG4, DIVX and MJPEG compatible bitstreams using the
+ same encoder core.
+- Hyper fast MPEG audio layer 2 compression (50 times faster than
+ realtime on a K6 500).
+[snip -> rest on website below]
+
+ffmpeg is made of two programs:
+* ffmpeg: soft VCR which encodes in real time to several formats.
+ It can also encode from any supported input file format to any
+ input supported format.
+* ffserver: high performance live broadcast streaming server based
+ on the ffmpeg core encoders.
+
+WWW: http://ffmpeg.mplayerhq.hu/
Added: trunk/ports-multimedia/multimedia/ffmpeg/pkg-plist
==============================================================================
--- (empty file)
+++ trunk/ports-multimedia/multimedia/ffmpeg/pkg-plist Thu May 31 08:47:10 2007
@@ -0,0 +1,58 @@
+bin/ffmpeg
+bin/ffserver
+include/ffmpeg/adler32.h
+include/ffmpeg/avcodec.h
+include/ffmpeg/avformat.h
+include/ffmpeg/avio.h
+include/ffmpeg/avutil.h
+include/ffmpeg/base64.h
+include/ffmpeg/common.h
+include/ffmpeg/fifo.h
+include/ffmpeg/integer.h
+include/ffmpeg/intfloat_readwrite.h
+include/ffmpeg/log.h
+include/ffmpeg/lzo.h
+include/ffmpeg/mathematics.h
+include/ffmpeg/md5.h
+include/ffmpeg/mem.h
+include/ffmpeg/opt.h
+include/ffmpeg/random.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
+include/postproc/postprocess.h
+lib/libavcodec.a
+lib/libavcodec.so
+lib/libavcodec.so.%%SHLIB_VER%%
+lib/libavcodec.so.51.40.4
+lib/libavformat.a
+lib/libavformat.so
+lib/libavformat.so.%%SHLIB_VER%%
+lib/libavformat.so.51.12.1
+lib/libavutil.a
+lib/libavutil.so
+lib/libavutil.so.%%SHLIB_VER%%
+lib/libavutil.so.49.4.0
+lib/libpostproc.a
+lib/libpostproc.so
+lib/libpostproc.so.%%SHLIB_VER%%
+lib/libpostproc.so.51.1.0
+lib/libswscale.a
+lib/libswscale.so
+lib/libswscale.so.%%SHLIB_VER%%
+lib/libswscale.so.0.5.0
+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/libpostproc.pc
+libdata/pkgconfig/libswscale.pc
+ at dirrm lib/vhook
+ at dirrm include/postproc
+ at dirrm include/ffmpeg
More information about the multimedia-devel
mailing list