git: adcaaf9898e1 - main - multimedia/{mplayer|mencoder}: Update to new upstream snapshot
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 12 Oct 2024 08:03:51 UTC
The branch main has been updated by riggs:
URL: https://cgit.FreeBSD.org/ports/commit/?id=adcaaf9898e15c1f760a9a1d448348d75f6c5a3d
commit adcaaf9898e15c1f760a9a1d448348d75f6c5a3d
Author: Thomas Zander <riggs@FreeBSD.org>
AuthorDate: 2024-09-29 16:27:26 +0000
Commit: Thomas Zander <riggs@FreeBSD.org>
CommitDate: 2024-10-12 08:03:48 +0000
multimedia/{mplayer|mencoder}: Update to new upstream snapshot
Details:
- Move to upstream snapshot as of 2024-09-28
- Use ffmpeg6+ instead of ffmpeg4
PR: 275846
---
multimedia/mencoder/distinfo | 6 +--
multimedia/mplayer/Makefile | 2 +-
multimedia/mplayer/Makefile.common | 11 ++---
multimedia/mplayer/Makefile.optvars | 3 --
multimedia/mplayer/distinfo | 6 +--
multimedia/mplayer/files/patch-Makefile | 10 ++---
multimedia/mplayer/files/patch-configure | 50 +++++++++-------------
.../mplayer/files/patch-libmpcodecs_vd__ffmpeg.c | 11 -----
8 files changed, 35 insertions(+), 64 deletions(-)
diff --git a/multimedia/mencoder/distinfo b/multimedia/mencoder/distinfo
index 15aca8be4a8e..cf2fe139048a 100644
--- a/multimedia/mencoder/distinfo
+++ b/multimedia/mencoder/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1704536551
-SHA256 (mplayer-1.5.0.20240106.tar.xz) = c72f8c2e2a8829e49cadca8ed3f2454b70afd39b155bed734df603498b4ed5e5
-SIZE (mplayer-1.5.0.20240106.tar.xz) = 5191136
+TIMESTAMP = 1727620062
+SHA256 (mplayer-1.5.0.20240928.tar.xz) = b1fbf48ff04ab66a3e89f62a9f47b0fd25a328878cced767183a12c137cb9bcc
+SIZE (mplayer-1.5.0.20240928.tar.xz) = 5218072
diff --git a/multimedia/mplayer/Makefile b/multimedia/mplayer/Makefile
index 9e740b4f05b0..737ad94c1077 100644
--- a/multimedia/mplayer/Makefile
+++ b/multimedia/mplayer/Makefile
@@ -13,7 +13,7 @@ OPTIONS_DEFINE= AALIB AMR_NB AMR_WB ASS BLURAY CACA CDIO DV DVDNAV \
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 XVMC
+ X11 X11DGA X11VM XINERAMA XVIDEO
OPTIONS_DEFAULT=ASS DVDNAV FONTCONFIG FRIBIDI GNUTLS OPENGL \
SKINS X11 X11DGA X11VM XINERAMA XVIDEO
diff --git a/multimedia/mplayer/Makefile.common b/multimedia/mplayer/Makefile.common
index 1084afb5f4e9..556fdf51e5a1 100644
--- a/multimedia/mplayer/Makefile.common
+++ b/multimedia/mplayer/Makefile.common
@@ -3,7 +3,7 @@
# before we include bsd.port.pre.mk
MPLAYER_PORT_VERSION= 1.5.0
-MPLAYER_SNAPSHOT_DATE= 2024-01-06
+MPLAYER_SNAPSHOT_DATE= 2024-09-28
MASTER_SITES= LOCAL/riggs/mplayer
DISTNAME= mplayer-${MPLAYER_PORT_VERSION}.${MPLAYER_SNAPSHOT_DATE:S/-//g}
WRKSRC= ${WRKDIR}/mplayer-export-${MPLAYER_SNAPSHOT_DATE}
@@ -12,7 +12,7 @@ LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/LICENSE
LIB_DEPENDS= libpng.so:graphics/png \
- libavcodec.so.58:multimedia/ffmpeg4 \
+ libavcodec.so.60: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/Makefile.optvars b/multimedia/mplayer/Makefile.optvars
index e9efe7dcbe94..a01297813a61 100644
--- a/multimedia/mplayer/Makefile.optvars
+++ b/multimedia/mplayer/Makefile.optvars
@@ -171,6 +171,3 @@ XVIDEO_USE= XORG=xv
XVIDEO_CONFIGURE_OFF= --disable-xv
XVIDEO_IMPLIES= X11
-XVMC_USE= XORG=xvmc
-XVMC_CONFIGURE_ON= --enable-xvmc --with-xvmclib=XvMCW
-XVMC_IMPLIES= X11
diff --git a/multimedia/mplayer/distinfo b/multimedia/mplayer/distinfo
index 59fa23035457..18b4b07e90f0 100644
--- a/multimedia/mplayer/distinfo
+++ b/multimedia/mplayer/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1704534638
-SHA256 (mplayer-1.5.0.20240106.tar.xz) = c72f8c2e2a8829e49cadca8ed3f2454b70afd39b155bed734df603498b4ed5e5
-SIZE (mplayer-1.5.0.20240106.tar.xz) = 5191136
+TIMESTAMP = 1727559180
+SHA256 (mplayer-1.5.0.20240928.tar.xz) = b1fbf48ff04ab66a3e89f62a9f47b0fd25a328878cced767183a12c137cb9bcc
+SIZE (mplayer-1.5.0.20240928.tar.xz) = 5218072
diff --git a/multimedia/mplayer/files/patch-Makefile b/multimedia/mplayer/files/patch-Makefile
index 0321c42a4b80..2df5c391d3f2 100644
--- a/multimedia/mplayer/files/patch-Makefile
+++ b/multimedia/mplayer/files/patch-Makefile
@@ -1,15 +1,15 @@
---- Makefile.orig 2021-05-01 17:45:31 UTC
+--- Makefile.orig 2024-04-28 19:35:10 UTC
+++ Makefile
-@@ -753,7 +753,7 @@ mencoder$(EXESUF) mplayer$(EXESUF):
+@@ -752,7 +752,7 @@ codec-cfg$(EXESUF) codec-cfg-test$(EXESUF) codecs2html
codec-cfg-test$(EXESUF): HOSTCFLAGS := $(HOSTCFLAGS) -DTESTING
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) -I%%LOCALBASE%%/include -o $@ $<
codecs.conf.h: codec-cfg$(EXESUF) etc/codecs.conf
./$^ > $@
-@@ -867,19 +867,16 @@ install: $(INSTALL_TARGETS-yes)
+@@ -866,19 +866,16 @@ install-dirs:
install-dirs:
$(INSTALL) -d $(BINDIR) $(CONFDIR) $(LIBDIR)
@@ -33,7 +33,7 @@
install-gui-man-en: install-mplayer-man-en
cd $(MANDIR)/man1/ && ln -sf mplayer.1 gmplayer.1
-@@ -888,8 +885,7 @@ install-mencoder-man-en: install-mplayer-man-en
+@@ -887,8 +884,7 @@ install-mplayer-man-en:
cd $(MANDIR)/man1 && ln -sf mplayer.1 mencoder.1
install-mplayer-man-en:
diff --git a/multimedia/mplayer/files/patch-configure b/multimedia/mplayer/files/patch-configure
index b84374f958d5..7dd394ab72c7 100644
--- a/multimedia/mplayer/files/patch-configure
+++ b/multimedia/mplayer/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig 2024-05-16 21:54:48 UTC
+--- configure.orig 2024-09-21 09:30:02 UTC
+++ configure
-@@ -666,7 +666,7 @@ _altivec=auto
+@@ -664,7 +664,7 @@ _altivec=auto
_iwmmxt=auto
_mtrr=auto
_altivec=auto
@@ -9,7 +9,7 @@
_ranlib=ranlib
_windres=windres
_cc=cc
-@@ -1019,7 +1019,7 @@ for ac_option do
+@@ -1012,7 +1012,7 @@ for ac_option do
ld_static=''
;;
--enable-profile)
@@ -18,7 +18,7 @@
;;
--disable-profile)
_profile=
-@@ -1491,7 +1491,6 @@ for ac_option do
+@@ -1482,7 +1482,6 @@ for ac_option do
*)
echo "Unknown parameter: $ac_option"
@@ -26,7 +26,7 @@
;;
esac
-@@ -1529,40 +1528,6 @@ echo >> "$TMPLOG"
+@@ -1520,40 +1519,6 @@ echo >> "$TMPLOG"
echo configuration: $configuration > "$TMPLOG"
echo >> "$TMPLOG"
@@ -67,7 +67,7 @@
list_subparts() {
test ! -e ffmpeg/libav${3} && return 1
pattern="s/^[^#]*${1}.*([^ ,]*, *\([^ ,)]*\).*/\1_${2}/p"
-@@ -1844,7 +1809,7 @@ if test -z "$_target" ; then
+@@ -1843,7 +1808,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 ;;
@@ -76,7 +76,7 @@
alpha) host_arch=alpha ;;
sun4*|sparc*) host_arch=sparc ;;
parisc*|hppa*|9000*) host_arch=hppa ;;
-@@ -1970,7 +1935,11 @@ echo "yes"
+@@ -1965,7 +1930,11 @@ echo "yes"
cflag_check "" || die "Compiler is not functioning correctly. Check your installation and custom CFLAGS $CFLAGS ."
echo "yes"
@@ -89,7 +89,7 @@
if test -z "$_target" ; then
cat > $TMPC << EOF
-@@ -3109,7 +3078,7 @@ if x86_32 ; then
+@@ -3104,7 +3073,7 @@ if x86_32 ; then
_pref_as_version='2.16.92'
echo 'pabsd %xmm0, %xmm1' >> $TMPS
fi
@@ -98,7 +98,7 @@
if test "$as_verc_fail" != yes ; then
echores "ok"
-@@ -3269,8 +3238,8 @@ if ppc && ( test "$_altivec" = yes || test "$_runtime_
+@@ -3264,8 +3233,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"
@@ -109,7 +109,7 @@
# check if <altivec.h> should be included
if $(header_check altivec.h $_altivec_gcc_flags) ; then
def_altivec_h='#define HAVE_ALTIVEC_H 1'
-@@ -3376,6 +3345,13 @@ if arm ; then
+@@ -3371,6 +3340,13 @@ if arm ; then
fi
echores "$setend"
@@ -123,7 +123,7 @@
echocheck "softfloat ABI"
softfloat=yes
cpp_condition_check '' 'defined(__ARM_PCS_VFP) || (!defined(__ARM_PCS) && !defined(__SOFTFP__))' && softfloat=no
-@@ -4286,7 +4262,7 @@ elif freebsd || netbsd || openbsd || bsdos ; then
+@@ -4281,7 +4257,7 @@ elif freebsd || netbsd || openbsd || bsdos ; then
if linux ; then
THREAD_CFLAGS=-D_REENTRANT
elif freebsd || netbsd || openbsd || bsdos ; then
@@ -132,7 +132,7 @@
fi
if test "$_pthreads" = auto ; then
cat > $TMPC << EOF
-@@ -4296,7 +4272,7 @@ if ! hpux ; then
+@@ -4291,7 +4267,7 @@ if ! hpux ; then
EOF
_pthreads=no
if ! hpux ; then
@@ -141,7 +141,7 @@
# 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
-@@ -4430,7 +4406,7 @@ int main(void) {
+@@ -4434,7 +4410,7 @@ EOF
}
EOF
_iconv=no
@@ -150,17 +150,7 @@
cc_check $ld_tmp && extra_ldflags="$extra_ldflags $ld_tmp" &&
ld_iconv="$ld_tmp" && _iconv=yes && break
done
-@@ -4460,7 +4436,8 @@ if test "$_termcap" = auto ; then
- _termcap=no
- for ld_tmp in "-lncurses" "-ltinfo" "-ltermcap"; do
- statement_check term.h 'tgetent(0, 0)' $ld_tmp &&
-- extra_ldflags="$extra_ldflags $ld_tmp" &&
-+ # Nudge the linker into finding ffmpeg4 symbols first
-+ extra_ldflags="-L%%LOCALBASE%%/ffmpeg4/lib $extra_ldflags $ld_tmp" &&
- ld_termcap="$ld_tmp" && _termcap=yes && break
- done
- fi
-@@ -5876,15 +5853,6 @@ EOF
+@@ -5848,15 +5824,6 @@ EOF
break
fi
done
@@ -176,7 +166,7 @@
if win32 && cc_check -DGL_WIN32 -lopengl32 ; then
_gl=yes
_gl_win32=yes
-@@ -6419,7 +6387,7 @@ elif darwin ; then
+@@ -6391,7 +6358,7 @@ elif freebsd ; then
elif dragonfly ; then
default_cdrom_device="/dev/cd0"
elif freebsd ; then
@@ -185,7 +175,7 @@
elif openbsd ; then
default_cdrom_device="/dev/rcd0c"
elif sunos ; then
-@@ -6432,7 +6400,7 @@ else
+@@ -6404,7 +6371,7 @@ fi
default_cdrom_device="/dev/cdrom"
fi
@@ -194,7 +184,7 @@
default_dvd_device=$default_cdrom_device
elif darwin ; then
default_dvd_device="/dev/rdiskN"
-@@ -6959,7 +6927,7 @@ echores "$_speex"
+@@ -6931,7 +6898,7 @@ if test "$_libgsm" = auto ; then
echocheck "libgsm"
if test "$_libgsm" = auto ; then
_libgsm=no
@@ -203,7 +193,7 @@
fi
if test "$_libgsm" = yes ; then
def_libgsm='#define CONFIG_LIBGSM 1'
-@@ -7399,6 +7367,16 @@ if test "$_librtmp" = yes && test "$networking" = yes;
+@@ -7363,6 +7330,16 @@ if test "$_librtmp" = yes && test "$networking" = yes;
nolibrtmp=no
def_librtmp='#define CONFIG_LIBRTMP 1'
inputmodules="librtmp $inputmodules"
@@ -220,7 +210,7 @@
else
nolibrtmp=yes
_librtmp=no
-@@ -7816,7 +7794,7 @@ if test "$_mencoder" = no ; then
+@@ -7780,7 +7757,7 @@ if test "$_mencoder" = no ; then
echocheck "mencoder"
if test "$_mencoder" = no ; then
# mpeg1video for vf_lavc, snow for vf_uspp / vf_mcdeint,
@@ -229,7 +219,7 @@
fi
echores "$_mencoder"
-@@ -8422,7 +8400,7 @@ libs_mplayer=$ld_tmp
+@@ -8384,7 +8361,7 @@ libs_mplayer=$ld_tmp
#############################################################################
diff --git a/multimedia/mplayer/files/patch-libmpcodecs_vd__ffmpeg.c b/multimedia/mplayer/files/patch-libmpcodecs_vd__ffmpeg.c
deleted file mode 100644
index 53df2ba61794..000000000000
--- a/multimedia/mplayer/files/patch-libmpcodecs_vd__ffmpeg.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- libmpcodecs/vd_ffmpeg.c.orig 2022-08-07 18:20:47 UTC
-+++ libmpcodecs/vd_ffmpeg.c
-@@ -739,7 +739,7 @@ static int get_buffer(AVCodecContext *avctx, AVFrame *
- if (ctx->use_vdpau) {
- VdpVideoSurface surface = (VdpVideoSurface)mpi->priv;
- avctx->draw_horiz_band= NULL;
-- mpi->planes[3] = surface;
-+ mpi->planes[3] = (unsigned char*)surface;
- }
- #endif
- #if CONFIG_XVMC