Attachment 177378 Details for Bug 214823 – v0

[patch] v0

gmerlin-avdecoder.ffmpeg2.diff (text/plain), 2.56 KB, created by Jan Beich on 2016-11-25 12:10:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Beich

Created: 2016-11-25 12:10:37 UTC

Size: 2.56 KB

patch

obsolete

>From a672b38d7df16ef1b5f7f96c618ec731be23fbfe Mon Sep 17 00:00:00 2001
>From: Jan Beich <jbeich@FreeBSD.org>
>Date: Fri, 25 Nov 2016 12:00:33 +0000
>Subject: multimedia/gmerlin-avdecoder: switch to non-obsolete ffmpeg
>
>PR:		?
>Approved by:	wg (maintainer)
>---
> multimedia/gmerlin-avdecoder/Makefile | 20 +++++++++-----------
> 1 file changed, 9 insertions(+), 11 deletions(-)
>
>diff --git a/multimedia/gmerlin-avdecoder/Makefile b/multimedia/gmerlin-avdecoder/Makefile
>index daf6cfa..a228068 100644
>--- a/multimedia/gmerlin-avdecoder/Makefile
>+++ b/multimedia/gmerlin-avdecoder/Makefile
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	gmerlin-avdecoder
> PORTVERSION=	1.2.0
>-PORTREVISION=	15
>+PORTREVISION=	16
> CATEGORIES=	multimedia
> MASTER_SITES=	SF/gmerlin/${PORTNAME}/${PORTVERSION}
> 
>@@ -25,14 +25,11 @@ DVDREAD_DESC=	libdvdread support
> GMERLIN_DESC=	gmerlin support
> SAMBA_DESC=	Samba support using libsmbclient
> 
>-USES=		gettext libtool pathfix pkgconfig
>+USES=		gettext libtool localbase:ldflags pathfix pkgconfig
> GNU_CONFIGURE=	yes
> CONFIGURE_ARGS=	--with-cpuflags=none --without-doxygen
> USE_LDCONFIG=	yes
> 
>-CPPFLAGS+=	-I${LOCALBASE}/include/ffmpeg0 -I${LOCALBASE}/include
>-LDFLAGS+=	-L${LOCALBASE}/lib/ffmpeg0 -L${LOCALBASE}/lib
>-
> .include <bsd.port.options.mk>
> 
> .if ${PORT_OPTIONS:MGMERLIN}
>@@ -44,7 +41,7 @@ PLIST_SUB+=	GMERLIN="@comment "
> .endif
> 
> .if ${PORT_OPTIONS:MFFMPEG}
>-LIB_DEPENDS+=	libavcodec0.so:multimedia/ffmpeg0
>+LIB_DEPENDS+=	libavcodec.so:multimedia/ffmpeg
> .else
> CONFIGURE_ARGS+=--disable-libavcodec --disable-libpostproc --disable-libswscale --disable-libavformat
> .endif
>@@ -180,11 +177,6 @@ post-patch:
> 		's|-O3 -funroll-all-loops -ffast-math||g; \
> 		 /LIBS/ s|-ldl||g; \
> 		 s|^LDFLAGS="|&$${LDFLAGS} |' \
>-		 -e 's|^(.*PKG_CONFIG.*)libavcodec(.*)|\1libavcodec0\2|g' \
>-		 -e 's|^(.*PKG_CONFIG.*)libavformat(.*)|\1libavformat0\2|g' \
>-		 -e 's|^(.*PKG_CONFIG.*)libavutil(.*)|\1libavutil0\2|g' \
>-		 -e 's|^(.*PKG_CONFIG.*)libpostproc(.*)|\1libpostproc0\2|g' \
>-		 -e 's|^(.*PKG_CONFIG.*)libswscale(.*)|\1libswscale0\2|g' \
> 		 ${WRKSRC}/configure
> 	@${REINPLACE_CMD} -e \
> 		's|#if DVDREAD_VERSION < 905|#if DVDREAD_VERSION < 904|' ${WRKSRC}/configure
>@@ -192,6 +184,12 @@ post-patch:
> 		'/^LIBS = / s|$$| @LIBINTL@ -lz|' ${WRKSRC}/tests/Makefile.in
> 	@${REINPLACE_CMD} -e \
> 		's|malloc.h|stdlib.h|' ${WRKSRC}/lib/in_smb.c
>+	@${REINPLACE_CMD} -e 's/[[:<:]]CodecID/AV&/' \
>+		-e 's/[[:<:]]CODEC_ID/AV_&/' \
>+		-e 's/[[:<:]]PixelFormat/AV&/' \
>+		-e 's/[[:<:]]PIX_FMT/AV_&/' \
>+		-e 's/codec_alloc_frame/_frame_alloc/' \
>+		${WRKSRC}/lib/*_ffmpeg.c
> 
> post-install:
> 	@${MKDIR} ${STAGEDIR}${DOCSDIR}

Actions: View | Diff

Attachments on bug 214823: 177378 | 177379 | 177381