diff --git a/multimedia/mencoder/Makefile b/multimedia/mencoder/Makefile
index 689ba14da7e5..c9ae976bd9d7 100644
--- a/multimedia/mencoder/Makefile
+++ b/multimedia/mencoder/Makefile
@@ -1,105 +1,105 @@
 PORTNAME=	mencoder
 PORTVERSION=	${MPLAYER_PORT_VERSION}.${MPLAYER_SNAPSHOT_DATE:S/-//g}
-PORTREVISION=	3
+PORTREVISION=	0
 CATEGORIES=	multimedia audio
 
 MAINTAINER=	riggs@FreeBSD.org
 COMMENT=	Convenient video file and movie encoder
 WWW=		http://www.mplayerhq.hu/
 
 .include "${.CURDIR}/../mplayer/Makefile.common"
 
 OPTIONS_DEFINE=	AMR_NB AMR_WB ASS BLURAY CDIO DV DVDNAV FAAC FONTCONFIG \
 		FRIBIDI GIF GNUTLS GSM IPV6 JACK JPEG LADSPA LIBMNG LZO \
 		MAD NAS NLS OPENAL OPENJPEG OPUS PULSEAUDIO \
 		SMB SPEEX THEORA TWOLAME V4L VPX \
 		X264 XVID
 
 OPTIONS_DEFAULT=ASS DVDNAV FONTCONFIG GIF GNUTLS JPEG X264 XVID
 
 OPTIONS_DEFINE_i386=	RTCPU
 OPTIONS_DEFINE_amd64=	RTCPU
 OPTIONS_DEFINE_powerpc=	RTCPU
 
 OPTIONS_DEFAULT_i386=	RTCPU
 OPTIONS_DEFAULT_amd64=	RTCPU
 OPTIONS_DEFAULT_powerpc=RTCPU
 
 ASS_DESC?=	Subtitles rendering via libass
 BLURAY_DESC?=	BluRay support
 DVDNAV_DESC?=	DVD navigation features support
 LZO_DESC?=	Enable external liblzo library
 RTCPU_DESC?=	Use runtime CPU detection
 
 PATCHDIR=	${.CURDIR}/../mplayer/files
 FILESDIR=	${PATCHDIR}
 DATADIR=	${PREFIX}/share/mplayer
 
 TOOLFILES=	aconvert.sh binary_codecs.sh calcbpp.pl \
 		checktree.sh countquant.pl divx2svcd.sh \
 		dvd2divxscript.pl edgedetect.fp edgeenh.fp \
 		emboss.fp mencvcd.sh midentify.sh \
 		mpconsole.sh mphelp_check.py mplmult.sh \
 		plotpsnr.pl psnr-video.sh qepdvcd.sh \
 		subedit.pl subsearch.sh vobshift.py \
 		w32codec_dl.pl wma2ogg.pl
 
 USES+=		alias iconv pkgconfig python shebangfix
 SHEBANG_FILES=	TOOLS/calcbpp.pl TOOLS/checktree.sh TOOLS/countquant.pl	\
 		TOOLS/divx2svcd.sh TOOLS/dvd2divxscript.pl TOOLS/mencvcd.sh \
 		TOOLS/mphelp_check.py TOOLS/plotpsnr.pl TOOLS/psnr-video.sh \
 		TOOLS/qepdvcd.sh TOOLS/subedit.pl TOOLS/vobshift.py \
 		TOOLS/w32codec_dl.pl TOOLS/wma2ogg.pl
 
 PYTHON_NO_DEPENDS=	yes
 
 .include "${.CURDIR}/../mplayer/Makefile.optvars"
 .include <bsd.port.pre.mk>
 
 CONFIGURE_ARGS+=	--disable-mplayer \
 			--disable-libdca \
 			--disable-x11 \
 			--disable-vdpau \
 			--disable-rtc \
 			--disable-arts \
 			--disable-caca \
 			--disable-lirc \
 			--disable-sdl \
 			--disable-svga \
 			--disable-aa \
 			--disable-joystick \
 			--disable-directfb \
 			--disable-mpg123 \
 			--disable-enca \
 			--disable-musepack \
 			--disable-sndio \
 			--disable-librtmp
 
 LIB_DEPENDS+=	libmp3lame.so:audio/lame
 
 ALL_TARGET=	mencoder
 
 .include "${.CURDIR}/../mplayer/Makefile.options"
 
 pre-everything::
 	@${ECHO_MSG} "N - O - T - E"
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "There are some knobs which *can* *not* be selected via the"
 	@${ECHO_MSG} "OPTIONS framework. At the moment, these settings are:"
 	@${ECHO_MSG} "DEFAULT_DVD_DEVICE=${DEFAULT_DVD_DEVICE}"
 	@${ECHO_MSG} "DEFAULT_CDROM_DEVICE=${DEFAULT_CDROM_DEVICE}"
 
 post-patch: common-post-patch
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/mencoder ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/DOCS/man/en/mplayer.1 ${STAGEDIR}${PREFIX}/share/man/man1/mencoder.1
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	@${CHMOD} 755 ${STAGEDIR}${DATADIR}
 	@${MKDIR} ${STAGEDIR}${DATADIR}/tools
 	@${CHMOD} 755 ${STAGEDIR}${DATADIR}/tools
 .for tool in ${TOOLFILES}
 	${INSTALL_SCRIPT} ${WRKSRC}/TOOLS/${tool} ${STAGEDIR}${DATADIR}/tools
 .endfor
 
 .include <bsd.port.post.mk>
diff --git a/multimedia/mencoder/distinfo b/multimedia/mencoder/distinfo
index cf2fe139048a..ba43f761e481 100644
--- a/multimedia/mencoder/distinfo
+++ b/multimedia/mencoder/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1727620062
-SHA256 (mplayer-1.5.0.20240928.tar.xz) = b1fbf48ff04ab66a3e89f62a9f47b0fd25a328878cced767183a12c137cb9bcc
-SIZE (mplayer-1.5.0.20240928.tar.xz) = 5218072
+TIMESTAMP = 1755341246
+SHA256 (mplayer-1.5.0.20250816.tar.xz) = 418c4f58d1b62a3eafd6b493b017369613d8b01f01d88bc7b916f5d17f9efadb
+SIZE (mplayer-1.5.0.20250816.tar.xz) = 5216196
diff --git a/multimedia/mplayer/Makefile b/multimedia/mplayer/Makefile
index 84ab1c012655..bd458dfe0d59 100644
--- a/multimedia/mplayer/Makefile
+++ b/multimedia/mplayer/Makefile
@@ -1,99 +1,99 @@
 PORTNAME=	mplayer
 PORTVERSION=	${MPLAYER_PORT_VERSION}.${MPLAYER_SNAPSHOT_DATE:S/-//g}
-PORTREVISION=	2
+PORTREVISION=	0
 CATEGORIES=	multimedia audio
 
 MAINTAINER=	riggs@FreeBSD.org
 COMMENT=	High performance media player supporting many formats
 WWW=		http://www.mplayerhq.hu/
 
 .include "${.CURDIR}/../../multimedia/mplayer/Makefile.common"
 
 OPTIONS_DEFINE=	AALIB AMR_NB AMR_WB ASS BLURAY CACA CDIO DV DVDNAV \
 		ENCA FONTCONFIG FRIBIDI GIF GNUTLS GSM GUI IPV6 JACK \
 		JPEG LADSPA LIBMNG LIRC LZO NAS NLS OPENAL OPENGL \
 		OPENJPEG OPUS PULSEAUDIO \
 		SDL SKINS SNDIO SMB SPEEX SVGALIB V4L VDPAU VPX \
 		X11 X11DGA X11VM XINERAMA XVIDEO
 
 OPTIONS_DEFAULT=ASS DVDNAV FONTCONFIG FRIBIDI GNUTLS OPENGL \
 		SKINS X11 X11DGA X11VM XINERAMA XVIDEO
 
 OPTIONS_DEFINE_i386=	RTCPU
 OPTIONS_DEFINE_amd64=	RTCPU
 OPTIONS_DEFINE_powerpc=	RTCPU
 
 OPTIONS_DEFAULT_i386=	RTCPU VDPAU
 OPTIONS_DEFAULT_amd64=	RTCPU VDPAU
 OPTIONS_DEFAULT_powerpc=RTCPU
 
 ASS_DESC?=	Subtitles rendering via libass
 BLURAY_DESC?=	BluRay support
 DVDNAV_DESC?=	DVD navigation features support
 ENCA_DESC?=	Charset conversion via enca
 LZO_DESC?=	External liblzo support
 RTCPU_DESC?=	Use runtime CPU detection
 SKINS_DESC?=	Install skins for GUI
 X11DGA_DESC?=	X11 DGA video driver support
 X11VM_DESC?=	X11 VidMode support
 
 SUB_FILES=	pkg-message
 
 CONFFILES=	example.conf input.conf menu.conf dvb-menu.conf
 USES+=		iconv pkgconfig
 
 OPTIONS_SUB=	yes
 
 .include "${.CURDIR}/../../multimedia/mplayer/Makefile.optvars"
 .include <bsd.port.pre.mk>
 
 CONFIGURE_ARGS+=	--disable-arts \
 			--disable-directfb \
 			--disable-faac \
 			--disable-libdca \
 			--disable-toolame \
 			--disable-twolame \
 			--disable-x264 \
 			--disable-xvid \
 			--disable-mencoder \
 			--disable-mpg123 \
 			--disable-musepack \
 			--disable-theora \
 			--disable-librtmp
 
 .include "${.CURDIR}/../../multimedia/mplayer/Makefile.options"
 
 pre-everything::
 	@${ECHO_MSG} "N - O - T - E"
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "There are some knobs which *can* *not* be selected via the"
 	@${ECHO_MSG} "OPTIONS framework. At the moment, these settings are:"
 	@${ECHO_MSG} "WITH_KERN_HZ=${DEFAULT_KERN_HZ}"
 	@${ECHO_MSG} "DEFAULT_DVD_DEVICE=${DEFAULT_DVD_DEVICE}"
 	@${ECHO_MSG} "DEFAULT_CDROM_DEVICE=${DEFAULT_CDROM_DEVICE}"
 
 .if ${PORT_OPTIONS:MGUI} && ${PORT_OPTIONS:MX11}
 	@${ECHO_MSG} "If you want to use the GUI, you can use the skins from"
 	@${ECHO_MSG} "${PORTSDIR}/multimedia/mplayer-skins"
 	@${ECHO_MSG} "or download them from"
 	@${ECHO_MSG} "http://www.mplayerhq.hu/"
 .endif
 
 post-patch: common-post-patch
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	@${CHMOD} 755 ${STAGEDIR}${DATADIR}
 	@${MKDIR} ${STAGEDIR}${DATADIR}/examples/etc
 	@${CHMOD} 755 ${STAGEDIR}${DATADIR}/examples/etc
 .for conf in ${CONFFILES}
 	${INSTALL_DATA} ${WRKSRC}/etc/${conf} ${STAGEDIR}${DATADIR}/examples/etc
 .endfor
 .if ${PORT_OPTIONS:MGUI} && ${PORT_OPTIONS:MX11}
 	@${LN} -sf mplayer ${STAGEDIR}${PREFIX}/bin/gmplayer
 	@(cd ${STAGEDIR}${PREFIX}/share/man/man1 && ${LN} -sf mplayer.1.gz gmplayer.1.gz)
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/pixmaps
 	${CP} ${WRKSRC}/etc/mplayer256x256.png ${STAGEDIR}${PREFIX}/share/pixmaps/mplayer.png
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/multimedia/mplayer/Makefile.common b/multimedia/mplayer/Makefile.common
index 556fdf51e5a1..1c847d35c728 100644
--- a/multimedia/mplayer/Makefile.common
+++ b/multimedia/mplayer/Makefile.common
@@ -1,75 +1,75 @@
 # Contains the build infrastructural definitions for both
 # mplayer and mencoder....the variables that we need to set
 # before we include bsd.port.pre.mk
 
 MPLAYER_PORT_VERSION=	1.5.0
-MPLAYER_SNAPSHOT_DATE=	2024-09-28
+MPLAYER_SNAPSHOT_DATE=	2025-08-16
 MASTER_SITES=	LOCAL/riggs/mplayer
 DISTNAME=	mplayer-${MPLAYER_PORT_VERSION}.${MPLAYER_SNAPSHOT_DATE:S/-//g}
 WRKSRC=		${WRKDIR}/mplayer-export-${MPLAYER_SNAPSHOT_DATE}
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libpng.so:graphics/png \
 		libavcodec.so.60:multimedia/ffmpeg \
 		libfreetype.so:print/freetype2
 
 BUILD_DEPENDS=	${BUILD_DEPENDS_${ARCH}}
 BUILD_DEPENDS_i386=	as:devel/binutils
 
 USES=		compiler:c11 gmake iconv ncurses tar:xz
 NOPRECIOUSMAKEVARS=	yes # ARCH
 HAS_CONFIGURE=	yes
 CONFIGURE_ENV+=	TMPDIR="${WRKSRC}"
 CONFIGURE_ARGS=	--cc="${CC}" \
 		--host-cc="${CC}" \
 		--as="${AS}" \
 		--mandir="${PREFIX}/share/man" \
 		--extra-cflags="-I${PREFIX}/include -I${LOCALBASE}/include" \
 		--extra-libs="-L${PREFIX}/lib" \
 		--disable-alsa \
 		--disable-ass-internal \
 		--disable-bitmap-font \
 		--disable-crystalhd \
 		--disable-esd \
 		--disable-faad \
 		--disable-ffmpeg_a \
 		--disable-ggi \
 		--disable-ggiwmh \
 		--disable-liba52 \
 		--disable-libbs2b \
 		--disable-libilbc \
 		--disable-libnut \
 		--disable-libvorbis \
 		--disable-live \
 		--disable-joystick \
 		--disable-mad \
 		--disable-libmpeg2 \
 		--disable-nemesi \
 		--disable-real \
 		--yasm=''
 
 common-post-patch:
 	@${REINPLACE_CMD} \
 		-e 's|/dev/dvd|${DEFAULT_DVD_DEVICE}|; \
 		s|/dev/cdrom|${DEFAULT_CDROM_DEVICE}|' \
 		-e 's|/usr/local|${LOCALBASE}|' \
 		-e 's|%%LOCALBASE%%|${LOCALBASE}|' \
 		-e 's|-lbz2|/usr/lib/libbz2.so|' \
 		-e 's|-lncurses|/usr/lib/libncurses.so|' \
 		-e 's|-liconv|${ICONV_LIB}|' \
 		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
 	@${REINPLACE_CMD} -E \
 		-e 's|[[:space:]]gcc[-[:digit:]\.]+| ${CC}|' \
 		-e 's|[[:space:]]gcc| ${CC}|' \
 		-e 's|\$$\(CC\)|${CC}|' \
 		-e 's|/usr/X11R6|${LOCALBASE}|' \
 		-e 's|%%LOCALBASE%%|${LOCALBASE}|' \
 		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} \
 		${CONFIGURE_WRKSRC}/Makefile
 	@${FIND} ${WRKSRC}/DOCS/man -name "mplayer.1" | ${XARGS} ${REINPLACE_CMD} -E -e \
 		's|/usr/\\:local/\\:etc/\\:mplayer|${DATADIR:S/\//\/\\\:/g}|g ; \
 		 s|/dev/\\:(dvd[[:alnum:]]*[[:>:]])|${DEFAULT_DVD_DEVICE:S/dev\//dev\/\\\:/}|g ; \
 		 s|/dev/\\:(cdrom[[:alnum:]]*[[:>:]])|${DEFAULT_CDROM_DEVICE:S/dev\//dev\/\\\:/}|g'
 	@${RM} ${WRKSRC}/binary.ver
diff --git a/multimedia/mplayer/distinfo b/multimedia/mplayer/distinfo
index 18b4b07e90f0..c4ef1cba6d6e 100644
--- a/multimedia/mplayer/distinfo
+++ b/multimedia/mplayer/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1727559180
-SHA256 (mplayer-1.5.0.20240928.tar.xz) = b1fbf48ff04ab66a3e89f62a9f47b0fd25a328878cced767183a12c137cb9bcc
-SIZE (mplayer-1.5.0.20240928.tar.xz) = 5218072
+TIMESTAMP = 1755326948
+SHA256 (mplayer-1.5.0.20250816.tar.xz) = 418c4f58d1b62a3eafd6b493b017369613d8b01f01d88bc7b916f5d17f9efadb
+SIZE (mplayer-1.5.0.20250816.tar.xz) = 5216196
diff --git a/multimedia/mplayer/files/patch-configure b/multimedia/mplayer/files/patch-configure
index a079eeeccd3e..0ad6b3450d25 100644
--- a/multimedia/mplayer/files/patch-configure
+++ b/multimedia/mplayer/files/patch-configure
@@ -1,243 +1,249 @@
---- configure.orig	2024-09-21 09:30:02 UTC
+--- configure.orig	2025-04-01 19:53:08 UTC
 +++ configure
 @@ -664,7 +664,7 @@ _altivec=auto
  _iwmmxt=auto
  _mtrr=auto
  _altivec=auto
 -_install=install
 +_install=@${BSD_INSTALL_PROGRAM}
  _ranlib=ranlib
  _windres=windres
  _cc=cc
 @@ -1012,7 +1012,7 @@ for ac_option do
      ld_static=''
      ;;
    --enable-profile)
 -    _profile='-p'
 +    _profile='-pg'
      ;;
    --disable-profile)
      _profile=
 @@ -1482,7 +1482,6 @@ for ac_option do
  
    *)
      echo "Unknown parameter: $ac_option"
 -    exit 1
      ;;
  
    esac
-@@ -1520,40 +1519,6 @@ echo >> "$TMPLOG"
+@@ -1520,46 +1519,6 @@ echo >> "$TMPLOG"
  echo configuration: $configuration > "$TMPLOG"
  echo >> "$TMPLOG"
  
 -
 -# local FFmpeg checkout handling
 -if test -e ffmpeg/.svn ; then
 -    echo "You have an outdated FFmpeg SVN checkout in ffmpeg/, please (re)move or replace it"
 -    exit 1
 -fi
 -
--FFBRANCH=master
+-FFBRANCH="release/7.1"
 -test -e FFBRANCH && FFBRANCH=$(cat FFBRANCH)
 -
 -if test -e ffmpeg/mp_auto_pull ; then
+-    cfg_fetch="remote.origin.fetch=+refs/heads/$FFBRANCH:refs/remotes/origin/$FFBRANCH"
 -    echo "Updating FFmpeg, (re)move ffmpeg/mp_auto_pull to disable"
--    (cd ffmpeg && git checkout $FFBRANCH)
+-    (cd ffmpeg && git -c "$cfg_fetch" fetch --depth 1 origin && git -c "$cfg_fetch" checkout $FFBRANCH)
 -    if ! (cd ffmpeg && git pull --rebase --ff-only) ; then
 -        echo "git pull failed, (re)move ffmpeg/mp_auto_pull to disable pulling"
 -        exit 1
 -    fi
 -fi
 -
 -if test "$ffmpeg_a" != "no" && ! test -e ffmpeg ; then
 -    echo "No FFmpeg checkout, press enter to download one with git or CTRL+C to abort"
 -    read tmp
 -    if ! git clone -b $FFBRANCH --depth 1 git://source.ffmpeg.org/ffmpeg.git ffmpeg ; then
 -        rm -rf ffmpeg
 -        echo "Failed to get a FFmpeg checkout"
 -        echo "Please try again or put FFmpeg source code copy into ffmpeg/ manually."
 -        echo "Nightly snapshot: http://ffmpeg.org/releases/ffmpeg-snapshot.tar.bz2"
 -        echo "To use a github mirror via http (e.g. because a firewall blocks git):"
 -        echo "git clone --depth 1 https://github.com/FFmpeg/FFmpeg ffmpeg; touch ffmpeg/mp_auto_pull"
 -        exit 1
 -    fi
 -    touch ffmpeg/mp_auto_pull
 -fi
+-
+-ffmpeg_filter_struct_name=AVFilter
+-if grep -q FFFilter ffmpeg/configure; then
+-    ffmpeg_filter_struct_name=FFFilter
+-fi
 -
  list_subparts() {
    test ! -e ffmpeg/libav${3} && return 1
    pattern="s/^[^#]*${1}.*([^ ,]*, *\([^ ,)]*\).*/\1_${2}/p"
-@@ -1843,7 +1808,7 @@ if test -z "$_target" ; then
+@@ -1858,7 +1817,7 @@ if test -z "$_target" ; then
    case "$1" in
        x86_64|amd64|x64|i[3-9]86*|i86pc|x86|x86pc|k5|k6|k6_2|k6_3|k6-2|k6-3|pentium*|athlon*|i586_i686|i586-i686) host_arch=i386 ;;
        ia64) host_arch=ia64 ;;
 -      macppc|ppc*|Power*) host_arch=ppc ;;
 +      macppc|powerpc|ppc*|Power*) host_arch=ppc ;;
        alpha) host_arch=alpha ;;
        sun4*|sparc*) host_arch=sparc ;;
        parisc*|hppa*|9000*) host_arch=hppa ;;
-@@ -1965,7 +1930,11 @@ echo "yes"
+@@ -1984,7 +1943,11 @@ echo "yes"
  cflag_check "" || die "Compiler is not functioning correctly. Check your installation and custom CFLAGS $CFLAGS ."
  echo "yes"
  
 -cflag_check "-lm" && libm="-lm"
 +if test -z "$_profile" ; then
 +  cflag_check "-lm" && libm="-lm"
 +else
 +  cflag_check "-lm_p" && libm="-lm_p"
 +fi
  
  if test -z "$_target" ; then
    cat > $TMPC << EOF
-@@ -2975,7 +2944,11 @@ if test -z "$CFLAGS" || test "$_profile" != "" || test
+@@ -2997,7 +2960,11 @@ if test -z "$CFLAGS" || test "$_profile" != "" || test
    fi
  
    if test "$_profile" != "" || test "$_debug" != ""; then
 -    CFLAGS="-O2 $_march $_mcpu $_pipe $_debug $_profile"
 +    if test "$cc_vendor" = "gnu"; then
 +      CFLAGS="-O2 $_march $_mcpu $_pipe $_debug $_profile"
 +    else
 +      CFLAGS="-O2 $_march $_pipe $_debug $_profile"
 +    fi
      WARNFLAGS="-W -Wall $WARNFLAGS"
      _install_strip=
    fi
-@@ -3104,7 +3077,7 @@ if x86_32 ; then
+@@ -3126,7 +3093,7 @@ if x86_32 ; then
      _pref_as_version='2.16.92'
      echo 'pabsd %xmm0, %xmm1' >> $TMPS
    fi
 -  $_as -c $TMPS -o $TMPEXE > /dev/null 2>&1 || as_verc_fail=yes
 +  $_as $TMPS -o $TMPEXE > /dev/null 2>&1 || as_verc_fail=yes
  
    if test "$as_verc_fail" != yes ; then
      echores "ok"
-@@ -3264,8 +3237,8 @@ if ppc && ( test "$_altivec" = yes || test "$_runtime_
+@@ -3286,8 +3253,8 @@ if ppc && ( test "$_altivec" = yes || test "$_runtime_
  
      # check if AltiVec is supported by the compiler, and how to enable it
      echocheck "GCC AltiVec flags"
 -    if $(cflag_check -maltivec -mabi=altivec) ; then
 -    _altivec_gcc_flags="-maltivec -mabi=altivec"
 +    if $(cflag_check -maltivec) ; then
 +    _altivec_gcc_flags="-maltivec"
      # check if <altivec.h> should be included
          if $(header_check altivec.h $_altivec_gcc_flags) ; then
              def_altivec_h='#define HAVE_ALTIVEC_H 1'
-@@ -3371,6 +3344,13 @@ if arm ; then
+@@ -3393,6 +3360,13 @@ if arm ; then
    fi
    echores "$setend"
  
 +  echocheck "ARM setend"
 +  if test $setend = "auto" ; then
 +    setend=no
 +    inline_asm_check '"setend be"' && setend=yes
 +  fi
 +  echores "$setend"
 +
    echocheck "softfloat ABI"
    softfloat=yes
    cpp_condition_check '' 'defined(__ARM_PCS_VFP) || (!defined(__ARM_PCS) && !defined(__SOFTFP__))' && softfloat=no
-@@ -4281,7 +4261,7 @@ elif freebsd || netbsd || openbsd || bsdos ; then
+@@ -4303,7 +4277,7 @@ elif freebsd || netbsd || openbsd || bsdos ; then
  if linux ; then
    THREAD_CFLAGS=-D_REENTRANT
  elif freebsd || netbsd || openbsd || bsdos ; then
 -  THREAD_CFLAGS=-D_THREAD_SAFE
 +  THREAD_CFLAGS=
  fi
  if test "$_pthreads" = auto ; then
  cat > $TMPC << EOF
-@@ -4291,7 +4271,7 @@ if ! hpux ; then
+@@ -4313,7 +4287,7 @@ if ! hpux ; then
  EOF
  _pthreads=no
  if ! hpux ; then
 -  for ld_tmp in "-lpthreadGC2" "" "-lpthread" "-pthread" ; do
 +  for ld_tmp in "-lpthread" "-pthread" ; do
      # for crosscompilation, we cannot execute the program, be happy if we can link statically
      cc_check $THREAD_CFLAGS $ld_tmp && (tmp_run || test "$ld_static") && ld_pthread="$ld_tmp" && _pthreads=yes && break
    done
-@@ -4434,7 +4414,7 @@ EOF
+@@ -4456,7 +4430,7 @@ EOF
  }
  EOF
    _iconv=no
 -  for ld_tmp in "" "-liconv" "-liconv $ld_dl" ; do
 +  for ld_tmp in "" "-L$_prefix/lib -liconv" "-L%%LOCALBASE%%/lib -liconv" "-liconv" "-liconv $ld_dl" ; do
      cc_check $ld_tmp && extra_ldflags="$extra_ldflags $ld_tmp" &&
        ld_iconv="$ld_tmp" && _iconv=yes && break
    done
-@@ -5848,15 +5828,6 @@ EOF
+@@ -5870,15 +5844,6 @@ EOF
        break
      fi
    done
 -  if test "$_x11" = yes && cc_check -DGL_EGL_X11 -lEGL ; then
 -    _gl=yes
 -    _gl_egl_x11=yes
 -    libs_mplayer="$libs_mplayer -lEGL $ld_dl"
 -  elif cc_check -DGL_EGL_ANDROID -lEGL ; then
 -    _gl=yes
 -    _gl_egl_android=yes
 -    libs_mplayer="$libs_mplayer -lEGL $ld_dl"
 -  fi
    if win32 && cc_check -DGL_WIN32 -lopengl32 ; then
      _gl=yes
      _gl_win32=yes
-@@ -6391,7 +6362,7 @@ elif freebsd ; then
+@@ -6413,7 +6378,7 @@ elif freebsd ; then
  elif dragonfly ; then
    default_cdrom_device="/dev/cd0"
  elif freebsd ; then
 -  default_cdrom_device="/dev/acd0"
 +  default_cdrom_device="/dev/cdrom"
  elif openbsd ; then
    default_cdrom_device="/dev/rcd0c"
  elif sunos ; then
-@@ -6404,7 +6375,7 @@ fi
+@@ -6426,7 +6391,7 @@ fi
    default_cdrom_device="/dev/cdrom"
  fi
  
 -if win32 || os2 || dragonfly || freebsd || openbsd || sunos || amigaos ; then
 +if win32 || os2 || dragonfly || openbsd || sunos || amigaos ; then
    default_dvd_device=$default_cdrom_device
  elif darwin ; then
    default_dvd_device="/dev/rdiskN"
-@@ -6931,7 +6902,7 @@ if test "$_libgsm" = auto ; then
+@@ -6953,7 +6918,7 @@ if test "$_libgsm" = auto ; then
  echocheck "libgsm"
  if test "$_libgsm" = auto ; then
    _libgsm=no
 -  statement_check gsm/gsm.h 'gsm_create()' -lgsm && _libgsm=yes
 +  statement_check gsm.h 'gsm_create()' -lgsm && _libgsm=yes
  fi
  if test "$_libgsm" = yes ; then
    def_libgsm='#define CONFIG_LIBGSM 1'
-@@ -7363,6 +7334,16 @@ if test "$_librtmp" = yes && test "$networking" = yes;
+@@ -7385,6 +7350,16 @@ if test "$_librtmp" = yes && test "$networking" = yes;
    nolibrtmp=no
    def_librtmp='#define CONFIG_LIBRTMP 1'
    inputmodules="librtmp $inputmodules"
 +
 +  if $_pkg_config --exists librtmp; then
 +	_inc_tmp=$($_pkg_config --cflags librtmp)
 +	_ld_tmp=$($_pkg_config --libs librtmp)
 +  else
 +	_inc_tmp="-I${LOCALBASE}/include"
 +	_ld_tmp="-L${LOCALBASE}/lib -lrtmp -lz -lssl -lcrypto"
 +  fi
 +  extra_ldflags="$extra_ldflags $_ld_tmp"
 +  extra_cflags="$extra_cflags $_inc_tmp"
  else
    nolibrtmp=yes
    _librtmp=no
-@@ -7780,7 +7761,7 @@ if test "$_mencoder" = no ; then
+@@ -7802,7 +7777,7 @@ if test "$_mencoder" = no ; then
  echocheck "mencoder"
  if test "$_mencoder" = no ; then
    # mpeg1video for vf_lavc, snow for vf_uspp / vf_mcdeint,
 -  libavencoders="$mplayer_encoders MPEG1VIDEO_ENCODER SNOW_ENCODER"
 +  libavencoders="$mplayer_encoders MPEG1VIDEO_ENCODER H263_ENCODER SNOW_ENCODER"
  fi
  echores "$_mencoder"
  
-@@ -8384,7 +8365,7 @@ libs_mplayer=$ld_tmp
+@@ -8406,7 +8381,7 @@ libs_mplayer=$ld_tmp
  
  #############################################################################
  
 -CFLAGS="$CFLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE"
 +CFLAGS="$CFLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
  
  CXXFLAGS=" $CFLAGS -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -std=c++98"
  
diff --git a/multimedia/mplayer/files/patch-loader_ext.c b/multimedia/mplayer/files/patch-loader_ext.c
deleted file mode 100644
index 8bddcf64f602..000000000000
--- a/multimedia/mplayer/files/patch-loader_ext.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- loader/ext.c.orig	2021-01-23 18:22:09 UTC
-+++ loader/ext.c
-@@ -444,7 +444,7 @@ LPVOID WINAPI VirtualAlloc(LPVOID address, DWORD size,
- 
-     if (type&MEM_RESERVE && (unsigned)address&0xffff) {
- 	size += (unsigned)address&0xffff;
--	address = (unsigned)address&~0xffff;
-+	address = (void*)((unsigned)address&~0xffff);
-     }
-     pgsz = sysconf(_SC_PAGESIZE);
-     if (type&MEM_COMMIT && (unsigned)address%pgsz) {
diff --git a/multimedia/mplayer/files/patch-loader_module.c b/multimedia/mplayer/files/patch-loader_module.c
deleted file mode 100644
index bcdeabbe3ba8..000000000000
--- a/multimedia/mplayer/files/patch-loader_module.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- loader/module.c.orig	2011-07-30 20:44:37 UTC
-+++ loader/module.c
-@@ -844,7 +844,7 @@ static int report_func(void *stack_base, int stack_siz
-   // memory management:
-   case 0x150011: //NewPtrClear
-   case 0x150012: //NewPtrSysClear
--      reg->eax = malloc(((uint32_t *)stack_base)[1]);
-+      reg->eax = (uint32_t)malloc(((uint32_t *)stack_base)[1]);
-       memset((void *)reg->eax,0,((uint32_t *)stack_base)[1]);
- #ifdef DEBUG_QTX_API
-       printf("%*sLEAVE(%d): EMULATED! 0x%X\n",ret_i*2,"",ret_i, reg->eax);
-@@ -852,7 +852,7 @@ static int report_func(void *stack_base, int stack_siz
-       return 1;
-   case 0x15000F: //NewPtr
-   case 0x150010: //NewPtrSys
--      reg->eax = malloc(((uint32_t *)stack_base)[1]);
-+      reg->eax = (uint32_t)malloc(((uint32_t *)stack_base)[1]);
- #ifdef DEBUG_QTX_API
-       printf("%*sLEAVE(%d): EMULATED! 0x%X\n",ret_i*2,"",ret_i, reg->eax);
- #endif
diff --git a/multimedia/mplayer/files/patch-loader_win32.c b/multimedia/mplayer/files/patch-loader_win32.c
deleted file mode 100644
index 604d4e35c657..000000000000
--- a/multimedia/mplayer/files/patch-loader_win32.c
+++ /dev/null
@@ -1,66 +0,0 @@
---- loader/win32.c.orig	2021-01-23 18:22:09 UTC
-+++ loader/win32.c
-@@ -1504,7 +1504,7 @@ static void WINAPI expDeleteCriticalSection(CRITICAL_S
- static int WINAPI expGetCurrentThreadId(void)
- {
-     dbgprintf("GetCurrentThreadId() => %d\n", pthread_self());
--    return pthread_self();
-+    return (int)pthread_self();
- }
- static int WINAPI expGetCurrentProcess(void)
- {
-@@ -2019,15 +2019,15 @@ static DWORD WINAPI expSignalObjectAndWait(HANDLE hObj
-         expSetEvent(mlist);
-         break;
-     case 1:  // Semaphore
--        expReleaseSemaphore(mlist, 1, NULL);
-+        expReleaseSemaphore((long)mlist, 1, NULL);
-         break;
-     case 2:  // Mutex
--        expReleaseMutex(mlist);
-+        expReleaseMutex((long)mlist);
-         break;
-     default:
-         dbgprintf("Signalling unknown object type %d!\n", hObjectToSignal);
-     }
--    return expWaitForSingleObject(hObjectToWaitOn, dwMilliseconds);
-+    return (DWORD)expWaitForSingleObject((void*)hObjectToWaitOn, dwMilliseconds);
- }
- 
- static long WINAPI expRegOpenKeyExA(long key, const char* subkey, long reserved, long access, int* newkey)
-@@ -2751,7 +2751,7 @@ static int WINAPI expEnumDisplayMonitors(void *dc, REC
- {
-     dbgprintf("EnumDisplayMonitors(0x%x, 0x%x, 0x%x, 0x%x) => ?\n",
- 	dc, r, callback_proc, callback_param);
--    return callback_proc(0, dc, r, callback_param);
-+    return callback_proc(0, (HDC)dc, r, (LPARAM)callback_param);
- }
- 
- #if 0
-@@ -2851,14 +2851,14 @@ static int WINAPI expEnumWindows(int (*callback_func)(
- {
-     int i, i2;
-     dbgprintf("EnumWindows(0x%x, 0x%x) => 1\n", callback_func, callback_param);
--    i = callback_func(0, callback_param);
--    i2 = callback_func(1, callback_param);
-+    i = callback_func(0, (LPARAM)callback_param);
-+    i2 = callback_func(1, (LPARAM)callback_param);
-     return i && i2;
- }
- 
- static int WINAPI expGetWindowThreadProcessId(HWND win, int *pid_data)
- {
--    int tid = pthread_self();
-+    int tid = (int)pthread_self();
-     dbgprintf("GetWindowThreadProcessId(0x%x, 0x%x) => %d\n",
- 	win, pid_data, tid);
-     if (pid_data)
-@@ -4940,7 +4940,7 @@ static HPALETTE WINAPI expCreatePalette(CONST LOGPALET
-     dbgprintf("CreatePalette(%x) => NULL\n", lpgpl);
- 
-     i = sizeof(LOGPALETTE)+((lpgpl->palNumEntries-1)*sizeof(PALETTEENTRY));
--    test = malloc(i);
-+    test = (HPALETTE)malloc(i);
-     memcpy((void *)test, lpgpl, i);
- 
-     return test;