[Midnightbsd-cvs] mports [15818] trunk/multimedia/ffmpeg: set target os

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Sun Jan 5 22:46:24 EST 2014


Revision: 15818
          http://svnweb.midnightbsd.org/mports/?rev=15818
Author:   laffer1
Date:     2014-01-05 22:46:23 -0500 (Sun, 05 Jan 2014)
Log Message:
-----------
set target os

Modified Paths:
--------------
    trunk/multimedia/ffmpeg/Makefile
    trunk/multimedia/ffmpeg/pkg-plist

Added Paths:
-----------
    trunk/multimedia/ffmpeg/files/patch-libavfilter_vf-drawtext.c

Modified: trunk/multimedia/ffmpeg/Makefile
===================================================================
--- trunk/multimedia/ffmpeg/Makefile	2014-01-06 02:53:40 UTC (rev 15817)
+++ trunk/multimedia/ffmpeg/Makefile	2014-01-06 03:46:23 UTC (rev 15818)
@@ -3,7 +3,7 @@
 
 PORTNAME=	ffmpeg
 PORTVERSION=	2.1.1
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	multimedia audio ipv6 net
 MASTER_SITES=	http://ffmpeg.org/releases/
@@ -20,6 +20,7 @@
 
 HAS_CONFIGURE=	yes
 CONFIGURE_LOG=	config.err
+CONFIGURE_ARGS+=	--host-os=freebsd --target-os=freebsd
 USES=		gmake pkgconfig perl5
 USE_PERL5=	build
 USE_BZIP2=	yes
@@ -296,7 +297,6 @@
 # ffserver
 .if ${PORT_OPTIONS:MFFSERVER}
 PLIST_SUB+=	FFSERVER=""
-PLIST_FILES+=	man/man1/ffserver.1.gz
 FFPROGS+=	ffserver
 . if ${PORT_OPTIONS:MDOCS}
 DOC_DOCFILES+=	ffserver.html
@@ -349,6 +349,7 @@
 		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
 	@${REINPLACE_CMD} -e 's|-ldl||' \
 		-e 's|opencv opencv/cxcore.h|opencv-core opencv2/core/core_c.h|g' \
+		-e 's|freetype/freetype.h|freetype.h|g' \
 		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
 	@${REINPLACE_CMD} -e 's|/usr/bin/perl|${PERL5}|g' \
 		${WRKSRC}/doc/texi2pod.pl

Added: trunk/multimedia/ffmpeg/files/patch-libavfilter_vf-drawtext.c
===================================================================
--- trunk/multimedia/ffmpeg/files/patch-libavfilter_vf-drawtext.c	                        (rev 0)
+++ trunk/multimedia/ffmpeg/files/patch-libavfilter_vf-drawtext.c	2014-01-06 03:46:23 UTC (rev 15818)
@@ -0,0 +1,10 @@
+--- libavfilter/vf_drawtext.c.orig	2013-11-20 03:28:56.000000000 +0100
++++ libavfilter/vf_drawtext.c	2013-12-06 18:26:57.000000000 +0100
+@@ -48,7 +48,6 @@
+ #include "video.h"
+ 
+ #include <ft2build.h>
+-#include <freetype/config/ftheader.h>
+ #include FT_FREETYPE_H
+ #include FT_GLYPH_H
+ #if CONFIG_FONTCONFIG

Modified: trunk/multimedia/ffmpeg/pkg-plist
===================================================================
--- trunk/multimedia/ffmpeg/pkg-plist	2014-01-06 02:53:40 UTC (rev 15817)
+++ trunk/multimedia/ffmpeg/pkg-plist	2014-01-06 03:46:23 UTC (rev 15818)
@@ -130,8 +130,6 @@
 libdata/pkgconfig/libpostproc.pc
 libdata/pkgconfig/libswresample.pc
 libdata/pkgconfig/libswscale.pc
-man/man1/ffmpeg.1.gz
-man/man1/ffprobe.1.gz
 %%DATADIR%%/examples/Makefile
 %%DATADIR%%/examples/README
 %%DATADIR%%/examples/decoding_encoding.c



More information about the Midnightbsd-cvs mailing list