Attachment 247164 Details for Bug 275846 – Patch for the mplayer port to use ffmpeg6

Patch for the mplayer port to use ffmpeg6

mplayer.diff.txt (text/plain), 2.58 KB, created by Thomas Zander on 2023-12-19 22:15:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Thomas Zander

Created: 2023-12-19 22:15:05 UTC

Size: 2.58 KB

patch

obsolete

>diff --git a/multimedia/mplayer/Makefile b/multimedia/mplayer/Makefile
>index d739a76c0a38..c15f578ca228 100644
>--- a/multimedia/mplayer/Makefile
>+++ b/multimedia/mplayer/Makefile
>@@ -1,5 +1,6 @@
> PORTNAME=	mplayer
> PORTVERSION=	${MPLAYER_PORT_VERSION}.${MPLAYER_SNAPSHOT_DATE:S/-//g}
>+PORTREVISION=	1
> CATEGORIES=	multimedia audio
> 
> MAINTAINER=	riggs@FreeBSD.org
>diff --git a/multimedia/mplayer/Makefile.common b/multimedia/mplayer/Makefile.common
>index 710c9c1359f3..2754f1fe7078 100644
>--- a/multimedia/mplayer/Makefile.common
>+++ b/multimedia/mplayer/Makefile.common
>@@ -12,7 +12,7 @@ LICENSE=	GPLv2
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
> LIB_DEPENDS=	libpng.so:graphics/png \
>-		libavcodec.so.58:multimedia/ffmpeg4 \
>+		libavcodec.so:multimedia/ffmpeg \
> 		libfreetype.so:print/freetype2
> 
> BUILD_DEPENDS=	${BUILD_DEPENDS_${ARCH}}
>@@ -21,8 +21,7 @@ BUILD_DEPENDS_i386=	as:devel/binutils
> USES=		compiler:c11 gmake iconv ncurses tar:xz
> NOPRECIOUSMAKEVARS=	yes # ARCH
> HAS_CONFIGURE=	yes
>-CONFIGURE_ENV+=	TMPDIR="${WRKSRC}" \
>-		PKG_CONFIG_PATH="${LOCALBASE}/ffmpeg4/libdata/pkgconfig"
>+CONFIGURE_ENV+=	TMPDIR="${WRKSRC}"
> CONFIGURE_ARGS=	--cc="${CC}" \
> 		--host-cc="${CC}" \
> 		--as="${AS}" \
>@@ -51,10 +50,6 @@ CONFIGURE_ARGS=	--cc="${CC}" \
> 		--disable-real \
> 		--yasm=''
> 
>-MAKE_ENV+=	PKG_CONFIG_PATH="${LOCALBASE}/ffmpeg4/libdata/pkgconfig"
>-
>-CFLAGS+=	-I${LOCALBASE}/ffmpeg4/include
>-
> common-post-patch:
> 	@${REINPLACE_CMD} \
> 		-e 's|/dev/dvd|${DEFAULT_DVD_DEVICE}|; \
>diff --git a/multimedia/mplayer/files/patch-Makefile b/multimedia/mplayer/files/patch-Makefile
>index 0321c42a4b80..5120acf94372 100644
>--- a/multimedia/mplayer/files/patch-Makefile
>+++ b/multimedia/mplayer/files/patch-Makefile
>@@ -5,7 +5,7 @@
>  codec-cfg$(EXESUF) codecs2html$(EXESUF):  HOSTCFLAGS := $(HOSTCFLAGS) -DCODECS2HTML
>  codec-cfg$(EXESUF) codec-cfg-test$(EXESUF) codecs2html$(EXESUF): codec-cfg.c codec-cfg.h help_mp.h
> -	$(HOST_CC) $(HOSTCFLAGS) -o $@ $<
>-+	$(HOST_CC) $(HOSTCFLAGS) -I%%LOCALBASE%%/ffmpeg4/include -o $@ $<
>++	$(HOST_CC) $(HOSTCFLAGS) -isystem %%LOCALBASE%%/include -o $@ $<
>  
>  codecs.conf.h: codec-cfg$(EXESUF) etc/codecs.conf
>  	./$^ > $@
>diff --git a/multimedia/mplayer/files/patch-libmpcodecs_mp__image.c b/multimedia/mplayer/files/patch-libmpcodecs_mp__image.c
>new file mode 100644
>index 000000000000..9e139b9a8360
>--- /dev/null
>+++ b/multimedia/mplayer/files/patch-libmpcodecs_mp__image.c
>@@ -0,0 +1,10 @@
>+--- libmpcodecs/mp_image.c.orig	2022-09-01 18:12:17 UTC
>++++ libmpcodecs/mp_image.c
>+@@ -18,6 +18,7 @@
>+ 
>+ #include "config.h"
>+ 
>++#include <limits.h>
>+ #include <stdio.h>
>+ #include <stdlib.h>
>+ #include <string.h>

Actions: View

Attachments on bug 275846: 247164