Attachment 169348 Details for Bug 208822 – Patch to add Add FFMPEG_SUFFIX variable to multimedia/vlc port

[patch] Patch to add Add FFMPEG_SUFFIX variable to multimedia/vlc port

vlc.diff (text/plain), 2.08 KB, created by Ben Woods on 2016-04-15 16:31:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ben Woods

Created: 2016-04-15 16:31:09 UTC

Size: 2.08 KB

patch

obsolete

>Index: multimedia/vlc/Makefile
>===================================================================
>--- multimedia/vlc/Makefile	(revision 413245)
>+++ multimedia/vlc/Makefile	(working copy)
>@@ -20,9 +20,9 @@
> 		libfontconfig.so:x11-fonts/fontconfig \
> 		libfreetype.so:print/freetype2 \
> 		libidn.so:dns/libidn
>-BUILD_DEPENDS=	ffmpeg>=2.0:multimedia/ffmpeg \
>+BUILD_DEPENDS=	ffmpeg${FFMPEG_SUFFIX}>=2.0:multimedia/ffmpeg${FFMPEG_SUFFIX} \
> 		yasm:devel/yasm
>-RUN_DEPENDS=	ffmpeg>=2.0:multimedia/ffmpeg
>+RUN_DEPENDS=	ffmpeg${FFMPEG_SUFFIX}>=2.0:multimedia/ffmpeg${FFMPEG_SUFFIX}
> 
> USES=		compiler:c11 desktop-file-utils gmake iconv libtool pathfix \
> 		pkgconfig tar:xz
>@@ -30,6 +30,20 @@
> USE_LDCONFIG=	yes
> INSTALL_TARGET=	install-strip
> 
>+# supported versions: ffmpeg, ffmpeg28
>+# corresponding FFMPEG_SUFFIX: '', '28'
>+FFMPEG_SUFFIX?=	# Empty for now (use multimedia/ffmpeg)
>+
>+.if !empty(FFMPEG_SUFFIX)
>+FFMPEG_INCDIR=	${LOCALBASE}/include/ffmpeg${FFMPEG_SUFFIX}
>+FFMPEG_LIBDIR=	${LOCALBASE}/lib/ffmpeg${FFMPEG_SUFFIX}
>+CPPFLAGS+=	-I${FFMPEG_INCDIR}
>+CONFIGURE_ENV+=	AVCODEC_CFLAGS="-I${FFMPEG_INCDIR}" AVCODEC_LIBS="-L${FFMPEG_LIBDIR} -Wl,-rpath -Wl,${FFMPEG_LIBDIR} -lavcodec${FFMPEG_SUFFIX}"
>+CONFIGURE_ENV+=	AVFORMAT_CFLAGS="-I${FFMPEG_INCDIR}" AVFORMAT_LIBS="-L${FFMPEG_LIBDIR} -Wl,-rpath -Wl,${FFMPEG_LIBDIR} -lavformat${FFMPEG_SUFFIX}"
>+CONFIGURE_ENV+=	POSTPROC_CFLAGS="-I${FFMPEG_INCDIR}" POSTPROC_LIBS="-L${FFMPEG_LIBDIR} -Wl,-rpath -Wl,${FFMPEG_LIBDIR} -lpostproc${FFMPEG_SUFFIX}"
>+CONFIGURE_ENV+=	SWSCALE_CFLAGS="-I${FFMPEG_INCDIR}" SWSCALE_LIBS="-L${FFMPEG_LIBDIR} -Wl,-rpath -Wl,${FFMPEG_LIBDIR} -lswscale${FFMPEG_SUFFIX}"
>+.endif
>+
> CONFLICTS?=	vlc-qt4-*
> 
> GNU_CONFIGURE=	yes
>@@ -350,9 +364,10 @@
> .endif
> 
> post-patch:
>-	@${REINPLACE_CMD} \
>+	@${REINPLACE_CMD} -E \
> 		-e '\|LIBS|s|-lrt||' \
> 		-e 's|LIBS="-llirc_client|LIBS="$$LIBS_lirc|' \
>+		-e '/PKG_CONFIG.*lib.*>/s;lib(avcodec|avdevice|filter|format|avresample|avutil|postproc|swresample|swscale) >;lib\1${FFMPEG_SUFFIX} >;g' \
> 		${WRKSRC}/configure
> 	@${REINPLACE_CMD} -e 's|/dev/cdrom|${WITH_CDROM_DEVICE}|g' \
> 		-e 's|/dev/dvd|${WITH_DVD_DEVICE}|g' \

Flags:

woodsb02: maintainer-approval? (multimedia)

Actions: View | Diff

Attachments on bug 208822: 169348 | 169351