Attachment 161756 Details for Bug 203579 – v0 rebased after bug 203477

[patch] v0 rebased after bug 203477

ffmpeg.simplify_docs.diff (text/plain), 2.36 KB, created by Jan Beich on 2015-10-06 10:14:52 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Beich

Created: 2015-10-06 10:14:52 UTC

Size: 2.36 KB

patch

obsolete

>diff --git multimedia/ffmpeg/Makefile multimedia/ffmpeg/Makefile
>index a17b8d1..faddbe0 100644
>--- multimedia/ffmpeg/Makefile
>+++ multimedia/ffmpeg/Makefile
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	ffmpeg
> PORTVERSION=	2.8
>+PORTREVISION=	1
> PORTEPOCH=	1
> CATEGORIES=	multimedia audio ipv6 net
> MASTER_SITES=	http://ffmpeg.org/releases/
>@@ -93,7 +94,7 @@ DEBUG_CONFIGURE_OFF=	--disable-debug
> 
> # docs
> DOCS_BUILD_DEPENDS=	texi2html:${PORTSDIR}/textproc/texi2html
>-DOCS_VARS=		DOC_DOCFILES+="*.html"
>+DOCS_CONFIGURE_ENABLE=	htmlpages
> 
> # faac
> FAAC_LIB_DEPENDS=	libfaac.so:${PORTSDIR}/audio/faac
>@@ -107,7 +108,7 @@ FDK_AAC_IMPLIES=	NONFREE
> 
> # ffserver
> FFSERVER_CONFIGURE_ENABLE=	ffserver
>-FFSERVER_VARS=		FFPROGS+=ffserver USE_RC_SUBR+=ffserver
>+FFSERVER_VARS=		USE_RC_SUBR+=ffserver
> 
> # fontconfig
> FONTCONFIG_LIB_DEPENDS=	libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig
>@@ -204,7 +205,6 @@ SCHROEDINGER_CONFIGURE_ENABLE=	libschroedinger
> # sdl
> SDL_USE=		SDL=sdl
> SDL_CONFIGURE_ENABLE=	ffplay
>-SDL_VARS=		FFPROGS+=ffplay
> SDL_CONFIGURE_OFF=	--disable-outdev=sdl
> 
> # smbclient
>@@ -277,8 +277,8 @@ LICENSE_FILE_LGPL3=	${WRKSRC}/COPYING.LGPLv3
> NONFREE_CONFIGURE_ENABLE=nonfree
> NONFREE_VARS=		RESTRICTED="linking to libfaac or libaacplus restricts redistribution"
> 
>-FFPROGS=	ffmpeg ffprobe
>-INSTALL_TARGET=	install-progs install-data install-libs install-headers
>+INSTALL_TARGET=	install-progs install-doc install-data \
>+		install-libs install-headers
> 
> DATADIR=	${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX}
> 
>@@ -350,8 +350,6 @@ post-configure-THEORA-off:
> 		${WRKSRC}/config.mak
> 
> post-install:
>-	(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} \
>-		"${FFPROGS:S/$/*.1/}" ${STAGEDIR}${MAN1PREFIX}/man/man1)
> 	(cd ${WRKSRC} && ${COPYTREE_SHARE} \
> 		"${DOC_FILES}" ${STAGEDIR}${DOCSDIR})
> 	(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} \
>diff --git multimedia/ffmpeg/pkg-plist multimedia/ffmpeg/pkg-plist
>index 5158137..0251dff 100644
>--- multimedia/ffmpeg/pkg-plist
>+++ multimedia/ffmpeg/pkg-plist
>@@ -164,6 +164,13 @@ man/man1/ffprobe-all.1.gz
> man/man1/ffprobe.1.gz
> %%FFSERVER%%man/man1/ffserver-all.1.gz
> %%FFSERVER%%man/man1/ffserver.1.gz
>+man/man3/libavcodec.3.gz
>+man/man3/libavdevice.3.gz
>+man/man3/libavfilter.3.gz
>+man/man3/libavformat.3.gz
>+man/man3/libavutil.3.gz
>+man/man3/libswresample.3.gz
>+man/man3/libswscale.3.gz
> %%DATADIR%%/examples/Makefile
> %%DATADIR%%/examples/README
> %%DATADIR%%/examples/avio_dir_cmd.c

Actions: View | Diff

Attachments on bug 203579: 161754 | 161755 | 161756