ports/124592: Update port: multimedia/ffmpeg

Tatsuki Makino tatsuki_makino at hotmail.com
Sat Jun 14 18:50:05 UTC 2008 

>Number:         124592
>Category:       ports
>Synopsis:       Update port: multimedia/ffmpeg
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Jun 14 18:50:04 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator:     Tatsuki Makino
>Release:        FreeBSD 6.3-STABLE i386
>Organization:
>Environment:
FreeBSD FreeBSD-C2D.DHCP.test 6.3-STABLE FreeBSD 6.3-STABLE #0: Mon Jun  9 18:26:29 JST 2008     root at FreeBSD-C2D.DHCP.test:/usr/obj/usr/src/sys/SMP  i386
>Description:
Update port multimedia/ffmpeg to 2008-04-09 version.
Fix 118237, 122922 and 123409.
>How-To-Repeat:

>Fix:
Patch it.

I have more newer version (2008-06-13).

Patch attached with submission follows:

diff -u -r -N /usr/ports/multimedia/ffmpeg/Makefile ./Makefile
--- /usr/ports/multimedia/ffmpeg/Makefile	2008-04-27 10:22:56.000000000 +0000
+++ ./Makefile	2008-06-14 18:27:21.000000000 +0000
@@ -6,8 +6,7 @@
 #      $Id: Makefile 66 2007-10-09 17:50:49Z buhnux $
 
 PORTNAME=	ffmpeg
-DISTVERSION=	2007-10-04
-PORTREVISION=	4
+DISTVERSION=	2008-04-09
 CATEGORIES=	multimedia audio ipv6 net
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	ahze
@@ -21,34 +20,38 @@
 USE_GMAKE=	yes
 WANT_SDL=	yes
 
-OPTIONS=	AMR_NB	"AMR narrowband encoder" off \
-		AMR_WB	"AMR wideband encoder" off \
-		FAAC	"FAAC mp4/aac audio encoder" off \
+OPTIONS=\
+		BKTR	"bktr(4) demuxer" on \
+		LIBA52	"liba52 support"	on \
+		X264	"X.264 codec" on \
 		FAAD	"FAAD mp4/aac audio decoder" on \
-		GSM	"gsm audio codec" off \
-		IPV6	"IPV6 network support" on \
+		FAAC	"FAAC mp4/aac audio encoder" off \
+		THEORA	"libtheora support" on \
+		VORBIS	"libvorbisenc support" on \
+		XVID	"XVID codec" off \
 		LAME	"lame MP3 codec" off \
-		LIBA52	"liba52 support"	on \
-		OGG	"OGG codec" on \
+		GSM	"gsm audio codec" off \
+		AMR_NB	"AMR narrowband encoder" off \
+		AMR_WB	"AMR wideband encoder" off \
+		IPV6	"IPv6 network support" on \
 		OPTIMIZED_CFLAGS "Additional optimizations" off \
 		SDL	"SDL support (build ffplay)" off \
+		FFSERVER "build ffserver" on \
 		SWSCALER "Software scaler support" off \
-		THEORA	"libtheora support (implies OGG)" on \
 		VHOOK	"video hooking" on \
 		VHOOK_FREETYPE2 "drawtext support (implies VHOOK)" off \
 		VHOOK_IMLIB2 "imlib2 support (implies VHOOK)" off \
-		VORBIS	"libvorbisenc support (implies OGG)" on \
-		X264	"X.264 codec" on \
-		XVID	"XVID codec" off
+		GCC42PLUS "Build with GCC 4.2+" off \
+		CPU	"Optimization for each CPU" off
 
 .include <bsd.port.pre.mk>
 
 CONFIGURE_ARGS+=--cc="${CC}" --prefix="${PREFIX}" \
-		--make="${GMAKE}" \
 		--disable-debug \
 		--enable-memalign-hack \
+		--disable-optimizations \
 		--enable-shared \
-		--enable-pp \
+		--enable-postproc \
 		--extra-cflags="${FFMPEG_CFLAGS} -I${LOCALBASE}/include" \
 		--extra-ldflags="-L${LOCALBASE}/lib ${FFMPEG_LDFLAGS}" \
 		--extra-libs="${PTHREAD_LIBS}" \
@@ -64,49 +67,139 @@
 ##
 DOC_FILES=	Changelog README
 # under subdir doc
-DOC_DOCFILES=	TODO faq.html ffmpeg-doc.html \
-		ffplay-doc.html ffserver-doc.html \
-		hooks.html optimization.txt
+DOC_DOCFILES=	TODO avutil.txt faq.html ffmpeg-doc.html \
+		ffplay-doc.html ffserver-doc.html general.html \
+		hooks.html optimization.txt snow.txt
 PORTDOCS=	*
 
-## 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
-MAN1+=	ffmpeg.1 ffserver.1
+MAN1+=	ffmpeg.1
+.endif
+
+## options for gcc
+.if ${OSVERSION} < 700042
+. ifdef(WITH_GCC42PLUS)
+USE_GCC=	4.2+
+. endif
+.endif
+
+.ifdef(MACHINE_CPU) && ${MACHINE_CPU:Mmmx}==""
+CONFIGURE_ARGS+=	--disable-mmx
+.endif
+
+.ifdef(WITH_CPU)
+. ifdef(CPUTYPE)
+CONFIGURE_ARGS+=	--cpu=${CPUTYPE}
+. elifdef(WITH_CPU_OVERRIDE)
+CONFIGURE_ARGS+=	--cpu=${WITH_CPU_OVERRIDE}
+. endif
 .endif
 
 .ifdef(WITH_OPTIMIZED_CFLAGS)
-CFLAGS:=		${CFLAGS:N-O*} -O3 -ffast-math -fomit-frame-pointer
+CFLAGS:=	${CFLAGS:N-O*} -O3 -ffast-math -fno-finite-math-only -fomit-frame-pointer
+.else
+CFLAGS:=	${CFLAGS:N-O0} -O2
+DEBUG_FLAGS+=	-O2
+.endif
+
+## ipv6
+.ifdef(WITHOUT_IPV6)
+CONFIGURE_ARGS+=	--disable-ipv6
+.endif
+
+## SDL
+.ifdef(WITH_SDL)
+USE_SDL+=	sdl
+PLIST_SUB+=	SDL=""
+FFMPEG_CFLAGS+=		-I${LOCALBASE}/include/SDL
+. ifndef(NOPORTDOCS)
+MAN1+=	ffplay.1
+. endif
+.else
+CONFIGURE_ARGS+=	--disable-ffplay
+PLIST_SUB+=	SDL="@comment "
+.endif
+
+## ffserver
+.ifndef(WITHOUT_FFSERVER)
+USE_RC_SUBR=	ffserver
+PLIST_SUB+=	FFSV=""
+. ifndef(NOPORTDOCS)
+MAN1+=	ffserver.1
+. endif
+.else
+CONFIGURE_ARGS+=	--disable-ffserver
+PLIST_SUB+=	FFSV="@comment "
+.endif
+
+## software scaler
+.ifdef(WITH_SWSCALER)
+CONFIGURE_ARGS+=	--enable-swscale
+PLIST_SUB+=	SWSCAL=""
+.else
+PLIST_SUB+=	SWSCAL="@comment "
+.endif
+
+## vhook
+.ifndef(WITHOUT_VHOOK) || defined(WITH_VHOOK_FREETYPE2) || defined(WITH_VHOOK_IMLIB2)
+. ifdef(WITH_VHOOK_FREETYPE2)
+LIB_DEPENDS+=   freetype.9:${PORTSDIR}/print/freetype2
+CONFIGURE_ARGS+=	--enable-freetype2
+PLIST_SUB+=	FREETYPE2=""
+. else
+CONFIGURE_ARGS+=	--disable-freetype2
+PLIST_SUB+=	FREETYPE2="@comment "
+. endif # freetype2
+. ifdef(WITH_VHOOK_IMLIB2)
+USE_EFL+=	imlib2
+.  if !exists(${LOCALBASE}/include/X11/Xlib.h)
+FFMPEG_CFLAGS+=	-DX_DISPLAY_MISSING
+.  endif
+CONFIGURE_ARGS+=	--enable-imlib2
+PLIST_SUB+=	IMLIB2=""
+. else
+CONFIGURE_ARGS+=	--disable-imlib2
+PLIST_SUB+=	IMLIB2="@comment "
+. endif # imlib2
+CONFIGURE_ARGS+=	--enable-vhook
+PLIST_SUB+=	VHOOK=""
 .else
-CFLAGS:=		${CFLAGS:N-O0} -O2
-DEBUG_FLAGS+=		 -O2
+CONFIGURE_ARGS+=	--disable-vhook
+PLIST_SUB+=	VHOOK="@comment " FREETYPE2="@comment " IMLIB2="@comment "
+. endif
+
+## bktr
+.ifdef(WITHOUT_BKTR)
+CONFIGURE_ARGS+=	--disable-demuxer=bktr
+.else
+. ifdef(WITH_BKTR_VIDEO_FORMAT)
+# PAL, NTSC, NTSCM, SECAM, PALN, PALM or NTSCJ
+FFMPEG_CFLAGS+=	-DVIDEO_FORMAT=${WITH_BKTR_VIDEO_FORMAT}
+. endif
 .endif
 
 ## a52
-.if !defined(WITHOUT_LIBA52) && !defined(WITHOUT_A52)
+.ifndef(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
 
+## faac
 .ifdef(WITH_FAAC)
 LIB_DEPENDS+=		faac.0:${PORTSDIR}/audio/faac
 CONFIGURE_ARGS+=	--enable-libfaac
@@ -138,21 +231,14 @@
 CONFIGURE_ARGS+=	--disable-libamr-wb
 .endif
 
-USE_RC_SUBR=		ffserver
-
-.if ${MACHINE_CPU:Mmmx}==""
-CONFIGURE_ARGS+=	--disable-mmx
-
-WITHOUT_BUILTIN_VECTOR=	yes
-.endif
 ## gsm
 .ifdef(WITH_GSM)
 LIB_DEPENDS+=		gsm.1:${PORTSDIR}/audio/gsm
-
 CONFIGURE_ARGS+=	--enable-libgsm
 .else
 CONFIGURE_ARGS+=	--disable-libgsm
 .endif
+
 ## mp3
 .ifdef(WITH_LAME)
 LIB_DEPENDS+=		mp3lame.0:${PORTSDIR}/audio/lame
@@ -162,46 +248,21 @@
 .endif
 
 ## ogg
-.if !defined(WITHOUT_OGG) || !defined(WITHOUT_VORBIS) || !defined(WITHOUT_THEORA)
+.ifndef(WITHOUT_VORBIS) || !defined(WITHOUT_THEORA)
 LIB_DEPENDS+=		ogg.5:${PORTSDIR}/audio/libogg
-CONFIGURE_ARGS+=	--enable-libogg
-.else
-CONFIGURE_ARGS+=	--disable-libogg
-.endif
-
-## SDL
-.ifdef(WITH_SDL)
-USE_SDL+=	sdl
-PLIST_FILES+=	bin/ffplay
-.if !defined(NOPORTDOCS)
-MAN1+=	ffplay.1
-.endif
-.else
-CONFIGURE_ARGS+=	--disable-ffplay
-.endif
-
-## swscaler
-.if defined(WITH_SWSCALER)
-CONFIGURE_ARGS+=	--enable-swscaler
-PLIST_SUB+=	SWSCAL=""
-.else
-CONFIGURE_ARGS+=	--disable-swscaler
-PLIST_SUB+=	SWSCAL="@comment "
 .endif
 
 ## theora
-.if !defined(WITHOUT_THEORA)
+.ifndef(WITHOUT_THEORA)
 LIB_DEPENDS+=		theora.0:${PORTSDIR}/multimedia/libtheora
-
 CONFIGURE_ARGS+=	--enable-libtheora
 .else
 CONFIGURE_ARGS+=	--disable-libtheora
 .endif
 
 ## vorbis
-.if !defined(WITHOUT_VORBIS)
+.ifndef(WITHOUT_VORBIS)
 LIB_DEPENDS+=		vorbisenc.2:${PORTSDIR}/audio/libvorbis
-
 CONFIGURE_ARGS+=	--enable-libvorbis
 FFMPEG_CFLAGS+=		-I${LOCALBASE}/include/vorbis
 .else
@@ -211,40 +272,10 @@
 # x264
 .ifndef(WITHOUT_X264)
 LIB_DEPENDS+=		x264.50:${PORTSDIR}/multimedia/x264
-
 CONFIGURE_ARGS+=	--enable-libx264
 .else
 CONFIGURE_ARGS+=	--disable-libx264
 .endif
-## builtin vector, requires mmx
-.if !defined(WITHOUT_BUILTIN_VECTOR) && defined(WITH_BUILTIN_VECTOR)
-FFMPEG_CFLAGS+=		-msse
-.endif
-
-.if !defined(WITHOUT_VHOOK) || defined(WITH_VHOOK_FREETYPE2) || defined(WITH_VHOOK_IMLIB2)
-. ifdef(WITH_VHOOK_FREETYPE2)
-LIB_DEPENDS+=   freetype.9:${PORTSDIR}/print/freetype2
-PLIST_FILES+=   lib/vhook/drawtext.so
-CONFIGURE_ARGS+=	--enable-freetype2
-. else
-CONFIGURE_ARGS+=	--disable-freetype2
-. endif # freetype2
-. ifdef(WITH_VHOOK_IMLIB2)
-USE_EFL+=	imlib2
-.  if !exists(${LOCALBASE}/include/X11/Xlib.h)
-CFLAGS+=	-DX_DISPLAY_MISSING
-.  endif
-PLIST_FILES+=   lib/vhook/imlib2.so
-CONFIGURE_ARGS+=	--enable-imlib2
-. else
-CONFIGURE_ARGS+=	--disable-imlib2
-. endif # imlib2
-CONFIGURE_ARGS+=	--enable-vhook
-PLIST_SUB+=	VHOOK=""
-.else
-CONFIGURE_ARGS+=	--disable-vhook
-PLIST_SUB+=	VHOOK="@comment "
-. endif
 
 ## xvid
 .ifdef(WITH_XVID)
@@ -255,69 +286,32 @@
 .endif
 
 pre-configure:
-.if defined(WITHOUT_OGG) && (!defined(WITHOUT_VORBIS) || !defined(WITHOUT_THEORA))
-	@${ECHO_MSG}	WITH_VORBIS or WITH_THEORA defined, libogg will be built
-.endif
-.if defined(WITHOUT_VHOOK) && (defined(WITH_VHOOK_FREETYPE2) || defined(WITH_VHOOK_IMLIB2))
+.ifdef(WITHOUT_VHOOK) && (defined(WITH_VHOOK_FREETYPE2) || defined(WITH_VHOOK_IMLIB2))
 	@${ECHO_MSG}	WITH_VHOOK_FREETYPE2 or WITH_VHOOK_IMLIB2 defined, video hooks will be built
 .endif
 
 post-patch:
-# Faad compat
-	@${REINPLACE_CMD} -e 's|faacD|NeAACD|' ${WRKSRC}/libavcodec/libfaad.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/libx264.c
-.endif
-	@${REINPLACE_CMD} -e 's|$$(libdir)/pkgconfig|${PREFIX}/libdata/pkgconfig|' \
-		${WRKSRC}/common.mak
-	@${REINPLACE_CMD} -e 's|/etc/ffserver.conf|${PREFIX}/etc/ffserver.conf|' \
-		${WRKSRC}/ffserver.c
-	@${REINPLACE_CMD} -E \
-		-e "s|(EXTRALIBS[[:space:]]*=)|\1-L${LOCALBASE}/lib |g; \
+		-e "\
 		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
-	@${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}
-.endif
-.if !defined(WITHOUT_IPV6)
-	@${REINPLACE_CMD} -E \
-		-e 's|^(ipv6).*$$|\1=yes|' \
-		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
-.endif
+#	@${REINPLACE_CMD} -e 's|-ldl||' \
+#		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
 .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}
+	@${REINPLACE_CMD} -e 's|$$(LIBDIR)/pkgconfig|${PREFIX}/libdata/pkgconfig|; \
+		s|$$(INCINSTDIR)|${PREFIX}/include/${PORTNAME}|' \
+		${WRKSRC}/subdir.mak
+# Faad compat
+	@${REINPLACE_CMD} -e 's|faacD|NeAACD|' ${WRKSRC}/libavcodec/libfaad.c
+.ifndef(WITHOUT_FFSERVER)
+	@${REINPLACE_CMD} -e 's|/etc/ffserver.conf|${PREFIX}/etc/ffserver.conf|' \
+		${WRKSRC}/ffserver.c
 .endif
-	@${REINPLACE_CMD} -e 's|$$(LIBDIR)/pkgconfig|${PREFIX}/libdata/pkgconfig|' \
-		${WRKSRC}/common.mak
 
 post-configure:
 #.ifdef(WITH_DTS)
@@ -327,17 +321,14 @@
 #			${WRKSRC}/config.mak \
 #			${WRKSRC}/libavcodec/Makefile
 #.endif
-.ifdef(WITHOUT_THEORA)
-	@${REINPLACE_CMD} -E \
-		-e 's|^(CONFIG_LIBTHEORA).*$$|\1=no|' \
-		${WRKSRC}/config.mak
-.endif
 
 post-install:
+.ifndef(WITHOUT_FFSERVER)
 	${INSTALL_DATA} ${WRKSRC}/doc/ffserver.conf ${PREFIX}/etc/ffserver.conf-dist
 	if [ ! -f ${PREFIX}/etc/ffserver.conf ]; then \
 		${INSTALL_DATA} ${WRKSRC}/doc/ffserver.conf ${PREFIX}/etc; \
 	fi
+.endif
 .ifndef(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 .for FILE in ${DOC_FILES}
diff -u -r -N /usr/ports/multimedia/ffmpeg/distinfo ./distinfo
--- /usr/ports/multimedia/ffmpeg/distinfo	2007-10-09 18:19:18.000000000 +0000
+++ ./distinfo	2008-06-14 17:26:30.000000000 +0000
@@ -1,3 +1,3 @@
-MD5 (ffmpeg-2007-10-04.tar.bz2) = 9ec842daece6479cc92cbc421a008d53
-SHA256 (ffmpeg-2007-10-04.tar.bz2) = f8aa5a2b85c1ce27a91a4bb0415f01415dfc7e6110476da717ac835193679447
-SIZE (ffmpeg-2007-10-04.tar.bz2) = 2326718
+MD5 (ffmpeg-2008-04-09.tar.bz2) = b8562005bea797de986985e0605ba567
+SHA256 (ffmpeg-2008-04-09.tar.bz2) = 9d1892ec84b69134949c6b2f5024e2384df45fbc2febbffbd528babecb3f33f4
+SIZE (ffmpeg-2008-04-09.tar.bz2) = 2515962
diff -u -r -N /usr/ports/multimedia/ffmpeg/files/patch-PR122922 ./files/patch-PR122922
--- /usr/ports/multimedia/ffmpeg/files/patch-PR122922	1970-01-01 00:00:00.000000000 +0000
+++ ./files/patch-PR122922	2008-06-13 02:35:30.000000000 +0000
@@ -0,0 +1,42 @@
+--- ./libavutil/log.c.orig	2008-05-09 08:20:36.000000000 +0000
++++ ./libavutil/log.c	2008-06-13 02:30:07.000000000 +0000
+@@ -26,6 +26,8 @@
+ 
+ #include "avutil.h"
+ 
++int need_return = 0;
++
+ int av_log_level = AV_LOG_INFO;
+ 
+ void av_log_default_callback(void* ptr, int level, const char* fmt, va_list vl)
+@@ -36,6 +38,7 @@
+         return;
+ #undef fprintf
+     if(print_prefix && avc) {
++      if (need_return) { fprintf(stderr, "\n"); need_return = 0; }
+             fprintf(stderr, "[%s @ %p]", avc->item_name(ptr), avc);
+     }
+ #define fprintf please_use_av_log
+--- ./ffmpeg.c.orig	2008-06-12 18:23:58.000000000 +0000
++++ ./ffmpeg.c	2008-06-13 02:30:07.000000000 +0000
+@@ -978,6 +978,8 @@
+     }
+ }
+ 
++extern int need_return; /* global - for better debugging output */
++
+ static void print_report(AVFormatContext **output_files,
+                          AVOutputStream **ost_table, int nb_ostreams,
+                          int is_last_report)
+@@ -1081,8 +1083,11 @@
+             (double)total_size / 1024, ti1, bitrate);
+ 
+         if (verbose > 1)
++	  {
+           snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), " dup=%d drop=%d",
+                   nb_frames_dup, nb_frames_drop);
++	  need_return = 1;
++	  }
+ 
+         if (verbose >= 0)
+             fprintf(stderr, "%s    \r", buf);
diff -u -r -N /usr/ports/multimedia/ffmpeg/files/patch-configure ./files/patch-configure
--- /usr/ports/multimedia/ffmpeg/files/patch-configure	2008-04-27 10:22:56.000000000 +0000
+++ ./files/patch-configure	2008-06-14 17:36:06.000000000 +0000
@@ -1,61 +1,40 @@
---- configure.orig	2007-09-29 22:25:06.000000000 +0200
-+++ configure	2008-03-12 08:59:27.000000000 +0100
-@@ -211,11 +211,11 @@
+--- ./configure.orig	2008-04-07 21:16:31.000000000 +0000
++++ ./configure	2008-06-14 17:35:37.000000000 +0000
+@@ -222,11 +222,11 @@
  
- # "tr '[a-z]' '[A-Z]'" is a workaround for Solaris tr not grokking "tr a-z A-Z"
+ # Avoid locale weirdness, besides we really just want to translate ASCII.
  toupper(){
--    echo "$@" | tr '[a-z]' '[A-Z]'
+-    echo "$@" | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ
 +    echo "$@" | tr '[:lower:]' '[:upper:]'
  }
  
  tolower(){
--    echo "$@" | tr '[A-Z]' '[a-z]'
+-    echo "$@" | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz
 +    echo "$@" | tr '[:upper:]' '[:lower:]'
  }
  
  set_all(){
-@@ -604,9 +604,11 @@
-     ffmpeg
-     ffplay
-     ffserver
-+    freetype2
-     gpl
-     gprof
-     gray
+@@ -663,6 +663,8 @@
+     vhook
+     x11grab
+     zlib
 +    imlib2
-     ipv6
-     liba52
-     liba52bin
-@@ -1033,15 +1035,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)
-@@ -1491,8 +1487,8 @@
++    freetype2
+ "
+ 
+ THREADS_LIST='
+@@ -1558,8 +1560,8 @@
  
  if check_func dlopen; then
      ldl=
 -elif check_func dlopen -ldl; then
 -    ldl=-ldl
-+elif check_func dlopen ; then
-+    ldl=
++#elif check_func dlopen -ldl; then
++#    ldl=-ldl
  fi
  
- check_func fork
-@@ -1597,10 +1593,17 @@
+ check_func  fork
+@@ -1674,10 +1676,17 @@
  if enabled vhook; then
      check_ldflags -rdynamic
      check_ldflags -export-dynamic
@@ -75,50 +54,25 @@
  
  ##########################################
  # SDL check
-@@ -1705,12 +1708,6 @@
-     check_cflags -Os            # not all compilers support -Os
-     optimize="small"
- elif 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
+@@ -2005,7 +2014,7 @@
+     eval ${name}_VERSION=\$${name}_VERSION_MAJOR.\$${name}_VERSION_MINOR.\$${name}_VERSION_MICRO
+     lcname=$(tolower $name)
+     eval echo "${lcname}_VERSION=\$${name}_VERSION" >> config.mak
+-    eval echo "${lcname}_VERSION_MAJOR=\$${name}_VERSION_MAJOR" >> config.mak
++    eval echo "${lcname}_VERSION_MAJOR=%%SHLIB_VER%%" >> config.mak
+ }
  
- # PIC flags for shared library objects where they are needed
-@@ -1894,15 +1891,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
-@@ -1911,7 +1908,7 @@
-   echo "SLIB_INSTALL_EXTRA_CMD=${SLIB_INSTALL_EXTRA_CMD}" >> config.mak
+ get_version LIBSWSCALE  libswscale/swscale.h
+@@ -2028,7 +2037,7 @@
+     echo "SLIB_UNINSTALL_EXTRA_CMD=${SLIB_UNINSTALL_EXTRA_CMD}" >> config.mak
  fi
  echo "LIB_INSTALL_EXTRA_CMD=${LIB_INSTALL_EXTRA_CMD}" >> config.mak
 -echo "EXTRALIBS=$extralibs" >> config.mak
-+echo "EXTRALIBS=-L%%LOCALBASE%%/lib -L%%LOCALBASE%%/lib $extralibs" >> config.mak
++echo "EXTRALIBS=-L%%LOCALBASE%%/lib $extralibs" >> config.mak
  
  print_config ARCH_   $TMPH config.mak $ARCH_LIST
  print_config HAVE_   $TMPH config.mak $HAVE_LIST
-@@ -1932,7 +1929,7 @@
+@@ -2052,7 +2061,7 @@
  
  echo "SRC_PATH=\"$source_path\"" >> config.mak
  echo "SRC_PATH_BARE=$source_path" >> config.mak
@@ -127,18 +81,18 @@
  
  # Apparently it's not possible to portably echo a backslash.
  enabled asmalign_pot &&
-@@ -2008,8 +2005,8 @@
+@@ -2135,8 +2144,8 @@
  Version: $version
  Requires: $requires
  Conflicts:
 -Libs: -L\${libdir} $libs
--Cflags: -I\${includedir} -I\${includedir}/$include
+-Cflags: -I\${includedir}
 +Libs: -L\${libdir} $libs -L%%LOCALBASE%%/lib
-+Cflags: -I\${includedir} -I\${includedir}/$include -I%%LOCALBASE%%/include
++Cflags: -I\${includedir} -I%%LOCALBASE%%/include
  EOF
  }
  
-@@ -2032,7 +2029,8 @@
+@@ -2159,7 +2168,8 @@
  Requires: $requires
  Conflicts:
  Libs: \${libdir}/${LIBPREF}${shortname}${LIBSUF} $libs
diff -u -r -N /usr/ports/multimedia/ffmpeg/files/patch-libavcode_imgconvert.c ./files/patch-libavcode_imgconvert.c
--- /usr/ports/multimedia/ffmpeg/files/patch-libavcode_imgconvert.c	2007-05-25 17:07:36.000000000 +0000
+++ ./files/patch-libavcode_imgconvert.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,18 +0,0 @@
---- 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)
diff -u -r -N /usr/ports/multimedia/ffmpeg/files/patch-libavcodec__imgconvert.c ./files/patch-libavcodec__imgconvert.c
--- /usr/ports/multimedia/ffmpeg/files/patch-libavcodec__imgconvert.c	1970-01-01 00:00:00.000000000 +0000
+++ ./files/patch-libavcodec__imgconvert.c	2008-06-12 21:03:56.000000000 +0000
@@ -0,0 +1,18 @@
+--- ./libavcodec/imgconvert.c.orig	2008-06-06 13:04:27.000000000 +0000
++++ ./libavcodec/imgconvert.c	2008-06-12 21:03:39.000000000 +0000
+@@ -2108,7 +2108,6 @@
+ }
+ #endif
+ 
+-#ifndef CONFIG_SWSCALE
+ static uint8_t y_ccir_to_jpeg[256];
+ static uint8_t y_jpeg_to_ccir[256];
+ static uint8_t c_ccir_to_jpeg[256];
+@@ -2628,7 +2627,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)
diff -u -r -N /usr/ports/multimedia/ffmpeg/files/patch-libavutil__bswap.h ./files/patch-libavutil__bswap.h
--- /usr/ports/multimedia/ffmpeg/files/patch-libavutil__bswap.h	2007-05-25 17:07:36.000000000 +0000
+++ ./files/patch-libavutil__bswap.h	2008-06-12 20:53:59.000000000 +0000
@@ -1,8 +1,8 @@
---- 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__
+--- libavutil/bswap.h.orig	2008-05-09 08:20:36.000000000 +0000
++++ libavutil/bswap.h	2008-06-12 20:53:33.000000000 +0000
+@@ -30,8 +30,18 @@
+ #include "config.h"
+ #include "common.h"
  
 +/* to detect __FreeBSD_version */
 +#if (defined(__unix__) || defined(unix)) && !defined(USG)
@@ -18,4 +18,4 @@
 +# define bswap_64(x) bswap64(x)
  #else
  
- #ifdef ARCH_X86_64
+ static av_always_inline av_const uint16_t bswap_16(uint16_t x)
diff -u -r -N /usr/ports/multimedia/ffmpeg/pkg-plist ./pkg-plist
--- /usr/ports/multimedia/ffmpeg/pkg-plist	2008-04-27 10:22:56.000000000 +0000
+++ ./pkg-plist	2008-06-14 18:11:59.000000000 +0000
@@ -1,17 +1,19 @@
 bin/ffmpeg
-bin/ffserver
- at unexec if cmp -s %D/etc/ffserver.conf %D/etc/ffserver.conf-dist; then rm -f %D/etc/ffserver.conf; fi
-etc/ffserver.conf-dist
+%%SDL%%bin/ffplay
+%%FFSV%%bin/ffserver
+%%FFSV%%@unexec if cmp -s %D/etc/ffserver.conf %D/etc/ffserver.conf-dist; then rm -f %D/etc/ffserver.conf; fi
+%%FFSV%%etc/ffserver.conf-dist
 include/ffmpeg/adler32.h
 include/ffmpeg/avcodec.h
+include/ffmpeg/avdevice.h
 include/ffmpeg/avformat.h
 include/ffmpeg/avio.h
 include/ffmpeg/avstring.h
 include/ffmpeg/avutil.h
 include/ffmpeg/base64.h
 include/ffmpeg/common.h
+include/ffmpeg/crc.h
 include/ffmpeg/fifo.h
-include/ffmpeg/integer.h
 include/ffmpeg/intfloat_readwrite.h
 include/ffmpeg/log.h
 include/ffmpeg/lzo.h
@@ -19,43 +21,49 @@
 include/ffmpeg/md5.h
 include/ffmpeg/mem.h
 include/ffmpeg/opt.h
+include/ffmpeg/postprocess.h
 include/ffmpeg/random.h
 include/ffmpeg/rational.h
-include/ffmpeg/rgb2rgb.h
-include/ffmpeg/rtp.h
+%%SWSCAL%%include/ffmpeg/rgb2rgb.h
 include/ffmpeg/rtsp.h
 include/ffmpeg/rtspcodes.h
-include/ffmpeg/swscale.h
-include/postproc/postprocess.h
+include/ffmpeg/sha1.h
+%%SWSCAL%%include/ffmpeg/swscale.h
 lib/libavcodec.a
 lib/libavcodec.so
 lib/libavcodec.so.%%SHLIB_VER%%
-lib/libavcodec.so.51.44.0
+lib/libavcodec.so.51.54.0
+lib/libavdevice.a
+lib/libavdevice.so
+lib/libavdevice.so.%%SHLIB_VER%%
+lib/libavdevice.so.52.0.0
 lib/libavformat.a
 lib/libavformat.so
 lib/libavformat.so.%%SHLIB_VER%%
-lib/libavformat.so.51.14.0
+lib/libavformat.so.52.13.0
 lib/libavutil.a
 lib/libavutil.so
 lib/libavutil.so.%%SHLIB_VER%%
-lib/libavutil.so.49.5.0
+lib/libavutil.so.49.6.0
 lib/libpostproc.a
 lib/libpostproc.so
 lib/libpostproc.so.%%SHLIB_VER%%
 lib/libpostproc.so.51.1.0
 %%SWSCAL%%lib/libswscale.a
 %%SWSCAL%%lib/libswscale.so
+%%SWSCAL%%lib/libswscale.so.0.5.1
 %%SWSCAL%%lib/libswscale.so.%%SHLIB_VER%%
-%%SWSCAL%%lib/libswscale.so.0.5.0
+%%FREETYPE2%%lib/vhook/drawtext.so
 %%VHOOK%%lib/vhook/fish.so
+%%IMLIB2%%lib/vhook/imlib2.so
 %%VHOOK%%lib/vhook/null.so
 %%VHOOK%%lib/vhook/ppm.so
 %%VHOOK%%lib/vhook/watermark.so
 libdata/pkgconfig/libavcodec.pc
+libdata/pkgconfig/libavdevice.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
+%%SWSCAL%%libdata/pkgconfig/libswscale.pc
+%%VHOOK%%@dirrm lib/vhook
 @dirrm include/ffmpeg


>Release-Note:
>Audit-Trail:
>Unformatted:

More information about the freebsd-ports-bugs mailing list