Attachment #247164 for bug #275846

View | Details | Raw Unified | Return to bug 275846
Collapse All | Expand All

Lines 1-5 Link Here

(-)b/multimedia/mplayer/Makefile (+1 lines)
1	PORTNAME= mplayer	1	PORTNAME= mplayer
2	PORTVERSION= ${MPLAYER_PORT_VERSION}.${MPLAYER_SNAPSHOT_DATE:S/-//g}	2	PORTVERSION= ${MPLAYER_PORT_VERSION}.${MPLAYER_SNAPSHOT_DATE:S/-//g}
		3	PORTREVISION= 1
3	CATEGORIES= multimedia audio	4	CATEGORIES= multimedia audio
4		5
5	MAINTAINER= riggs@FreeBSD.org	6	MAINTAINER= riggs@FreeBSD.org




LICENSE_FILE=	${WRKSRC}/LICENSE

LIB_DEPENDS=	libpng.so:graphics/png \
		libavcodec.so:multimedia/ffmpeg \
		libfreetype.so:print/freetype2

BUILD_DEPENDS=	${BUILD_DEPENDS_${ARCH}}

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_ARGS=	--cc="${CC}" \
		--host-cc="${CC}" \
		--as="${AS}" \

		--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}|; \

Lines 5-11 Link Here

(-)b/multimedia/mplayer/files/patch-Makefile (-1 / +1 lines)
5	codec-cfg$(EXESUF) codecs2html$(EXESUF): HOSTCFLAGS := $(HOSTCFLAGS) -DCODECS2HTML	5	codec-cfg$(EXESUF) codecs2html$(EXESUF): HOSTCFLAGS := $(HOSTCFLAGS) -DCODECS2HTML
6	codec-cfg$(EXESUF) codec-cfg-test$(EXESUF) codecs2html$(EXESUF): codec-cfg.c codec-cfg.h help_mp.h	6	codec-cfg$(EXESUF) codec-cfg-test$(EXESUF) codecs2html$(EXESUF): codec-cfg.c codec-cfg.h help_mp.h
7	- $(HOST_CC) $(HOSTCFLAGS) -o $@ $<	7	- $(HOST_CC) $(HOSTCFLAGS) -o $@ $<
8	+ $(HOST_CC) $(HOSTCFLAGS) -I%%LOCALBASE%%/ffmpeg4/include -o $@ $<	8	+ $(HOST_CC) $(HOSTCFLAGS) -isystem %%LOCALBASE%%/include -o $@ $<
9		9
10	codecs.conf.h: codec-cfg$(EXESUF) etc/codecs.conf	10	codecs.conf.h: codec-cfg$(EXESUF) etc/codecs.conf
11	./$^ > $@	11	./$^ > $@

Added Link Here

(-)b/multimedia/mplayer/files/patch-libmpcodecs_mp__image.c (+10 lines)
1	--- libmpcodecs/mp_image.c.orig 2022-09-01 18:12:17 UTC
2	+++ libmpcodecs/mp_image.c
3	@@ -18,6 +18,7 @@
4
5	#include "config.h"
6
7	+#include <limits.h>
8	#include <stdio.h>
9	#include <stdlib.h>
10	#include <string.h>

Return to bug 275846

Lines 12-18 LICENSE= GPLv2 Link Here

(-)b/multimedia/mplayer/Makefile.common (-7 / +2 lines)
12	LICENSE_FILE= ${WRKSRC}/LICENSE	12	LICENSE_FILE= ${WRKSRC}/LICENSE
13		13
14	LIB_DEPENDS= libpng.so:graphics/png \	14	LIB_DEPENDS= libpng.so:graphics/png \
15	libavcodec.so.58:multimedia/ffmpeg4 \	15	libavcodec.so:multimedia/ffmpeg \
16	libfreetype.so:print/freetype2	16	libfreetype.so:print/freetype2
17		17
18	BUILD_DEPENDS= ${BUILD_DEPENDS_${ARCH}}	18	BUILD_DEPENDS= ${BUILD_DEPENDS_${ARCH}}
Lines 21-28 BUILD_DEPENDS_i386= as:devel/binutils Link Here
21	USES= compiler:c11 gmake iconv ncurses tar:xz	21	USES= compiler:c11 gmake iconv ncurses tar:xz
22	NOPRECIOUSMAKEVARS= yes # ARCH	22	NOPRECIOUSMAKEVARS= yes # ARCH
23	HAS_CONFIGURE= yes	23	HAS_CONFIGURE= yes
24	CONFIGURE_ENV+= TMPDIR="${WRKSRC}" \	24	CONFIGURE_ENV+= TMPDIR="${WRKSRC}"
25	PKG_CONFIG_PATH="${LOCALBASE}/ffmpeg4/libdata/pkgconfig"
26	CONFIGURE_ARGS= --cc="${CC}" \	25	CONFIGURE_ARGS= --cc="${CC}" \
27	--host-cc="${CC}" \	26	--host-cc="${CC}" \
28	--as="${AS}" \	27	--as="${AS}" \
Lines 51-60 CONFIGURE_ARGS= --cc="${CC}" \ Link Here
51	--disable-real \	50	--disable-real \
52	--yasm=''	51	--yasm=''
53		52
54	MAKE_ENV+= PKG_CONFIG_PATH="${LOCALBASE}/ffmpeg4/libdata/pkgconfig"
55
56	CFLAGS+= -I${LOCALBASE}/ffmpeg4/include
57
58	common-post-patch:	53	common-post-patch:
59	@${REINPLACE_CMD} \	54	@${REINPLACE_CMD} \
60	-e 's\|/dev/dvd\|${DEFAULT_DVD_DEVICE}\|; \	55	-e 's\|/dev/dvd\|${DEFAULT_DVD_DEVICE}\|; \