From c0eb427d425f2a62bcb6cc0c5aab40dc4c309625 Mon Sep 17 00:00:00 2001 From: Muhammad Moinur Rahman Date: Sat, 17 May 2025 12:44:59 +0200 Subject: [PATCH] multimedia/mplayer: Remove port Desktop application not relevant to server environment --- .portsignore | 1 + multimedia/Makefile | 1 - multimedia/mplayer/Makefile | 99 ------- multimedia/mplayer/Makefile.common | 75 ------ multimedia/mplayer/Makefile.options | 74 ------ multimedia/mplayer/Makefile.optvars | 173 ------------- multimedia/mplayer/distinfo | 3 - .../mplayer/files/extra-patch-clang-version | 22 -- multimedia/mplayer/files/patch-Makefile | 45 ---- multimedia/mplayer/files/patch-configure | 243 ------------------ multimedia/mplayer/files/patch-gui_wm_ws.c | 23 -- .../mplayer/files/patch-libao2_ao__arts.c | 15 -- .../mplayer/files/patch-libao2_ao__oss.c | 146 ----------- .../files/patch-libmpcodecs_ad__spdif.c | 11 - .../files/patch-libmpcodecs_ae__faac.c | 13 - .../mplayer/files/patch-libvo_x11__common.c | 11 - multimedia/mplayer/files/patch-loader_ext.c | 11 - .../mplayer/files/patch-loader_module.c | 20 -- multimedia/mplayer/files/patch-loader_win32.c | 66 ----- multimedia/mplayer/files/patch-mplayer.c | 12 - .../mplayer/files/patch-stream_stream__vcd.c | 10 - .../files/patch-stream_tvi__bsdbt848.c | 76 ------ .../mplayer/files/patch-stream_tvi__v4l.c | 17 -- .../mplayer/files/patch-stream_tvi__v4l2.c | 25 -- .../mplayer/files/patch-vidix_mga__vid.c | 17 -- multimedia/mplayer/files/pkg-message.in | 22 -- multimedia/mplayer/pkg-descr | 6 - multimedia/mplayer/pkg-plist | 9 - 28 files changed, 1 insertion(+), 1245 deletions(-) delete mode 100644 multimedia/mplayer/Makefile delete mode 100644 multimedia/mplayer/Makefile.common delete mode 100644 multimedia/mplayer/Makefile.options delete mode 100644 multimedia/mplayer/Makefile.optvars delete mode 100644 multimedia/mplayer/distinfo delete mode 100644 multimedia/mplayer/files/extra-patch-clang-version delete mode 100644 multimedia/mplayer/files/patch-Makefile delete mode 100644 multimedia/mplayer/files/patch-configure delete mode 100644 multimedia/mplayer/files/patch-gui_wm_ws.c delete mode 100644 multimedia/mplayer/files/patch-libao2_ao__arts.c delete mode 100644 multimedia/mplayer/files/patch-libao2_ao__oss.c delete mode 100644 multimedia/mplayer/files/patch-libmpcodecs_ad__spdif.c delete mode 100644 multimedia/mplayer/files/patch-libmpcodecs_ae__faac.c delete mode 100644 multimedia/mplayer/files/patch-libvo_x11__common.c delete mode 100644 multimedia/mplayer/files/patch-loader_ext.c delete mode 100644 multimedia/mplayer/files/patch-loader_module.c delete mode 100644 multimedia/mplayer/files/patch-loader_win32.c delete mode 100644 multimedia/mplayer/files/patch-mplayer.c delete mode 100644 multimedia/mplayer/files/patch-stream_stream__vcd.c delete mode 100644 multimedia/mplayer/files/patch-stream_tvi__bsdbt848.c delete mode 100644 multimedia/mplayer/files/patch-stream_tvi__v4l.c delete mode 100644 multimedia/mplayer/files/patch-stream_tvi__v4l2.c delete mode 100644 multimedia/mplayer/files/patch-vidix_mga__vid.c delete mode 100644 multimedia/mplayer/files/pkg-message.in delete mode 100644 multimedia/mplayer/pkg-descr delete mode 100644 multimedia/mplayer/pkg-plist diff --git a/.portsignore b/.portsignore index 92194a25f0bd..ff78ff7c47ee 100644 --- a/.portsignore +++ b/.portsignore @@ -5554,6 +5554,7 @@ multimedia/mlt7 multimedia/mlt7-glaxnimate multimedia/mlt7-qt multimedia/mpc-qt +multimedia/mplayer multimedia/mpvqt multimedia/msopenh264 multimedia/mswebrtc diff --git a/multimedia/Makefile b/multimedia/Makefile index 8614784d0e4d..f3f7190d1e05 100644 --- a/multimedia/Makefile +++ b/multimedia/Makefile @@ -152,7 +152,6 @@ SUBDIR += motion SUBDIR += mp3cd SUBDIR += mp4v2 - SUBDIR += mplayer SUBDIR += mplayer-skins SUBDIR += mplex SUBDIR += mpv diff --git a/multimedia/mplayer/Makefile b/multimedia/mplayer/Makefile deleted file mode 100644 index 84ab1c012655..000000000000 --- a/multimedia/mplayer/Makefile +++ /dev/null @@ -1,99 +0,0 @@ -PORTNAME= mplayer -PORTVERSION= ${MPLAYER_PORT_VERSION}.${MPLAYER_SNAPSHOT_DATE:S/-//g} -PORTREVISION= 2 -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 - -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 diff --git a/multimedia/mplayer/Makefile.common b/multimedia/mplayer/Makefile.common deleted file mode 100644 index 556fdf51e5a1..000000000000 --- a/multimedia/mplayer/Makefile.common +++ /dev/null @@ -1,75 +0,0 @@ -# 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 -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/Makefile.options b/multimedia/mplayer/Makefile.options deleted file mode 100644 index fd2ec8e9c602..000000000000 --- a/multimedia/mplayer/Makefile.options +++ /dev/null @@ -1,74 +0,0 @@ -# Non-helper handling of option variables and build environment. -# Include after bsd.port.pre.mk -# -# Almost all of mplayer's build-time configuration is controlled via the -# OPTIONS framework. Exceptions are listed below. These variables must be -# set via make.conf or by passing the variable to make during build, e.g. -# make WITH_DVD_DEVICE=/dev/cd0 -# -# WITH_DVD_DEVICE=/path/to/desired/device -# default: /dev/cd0 -# This option changes the default device where mplayer looks by default -# for a DVD medium -# -# WITH_CDROM_DEVICE=/path/to/desired/device -# default: /dev/cd0 -# This option changes the default cdrom device, maybe useful for VCDs - -# Non-OPTIONS knob handling -# ========================= - -.if defined(WITH_DVD_DEVICE) -DEFAULT_DVD_DEVICE=${WITH_DVD_DEVICE} -.else -DEFAULT_DVD_DEVICE=/dev/cd0 -.endif - -.if defined(WITH_CDROM_DEVICE) -DEFAULT_CDROM_DEVICE=${WITH_CDROM_DEVICE} -.else -DEFAULT_CDROM_DEVICE=/dev/cd0 -.endif - -.if defined(WITH_KERN_HZ) -DEFAULT_KERN_HZ=${WITH_KERN_HZ} -.else -DEFAULT_KERN_HZ=1024 -.endif - -# Build system handling (including OPTIONS) -# ========================================= - -.if ${CHOSEN_COMPILER_TYPE} == clang -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-clang-version -# Turn off incompatible function pointer check for clang16+ -CFLAGS+= -Wno-incompatible-function-pointer-types -# Require 16 byte stack realignment on i386 to interface -# properly with hand crafted assembler code in ffmpeg -CFLAGS_i386+= -mstack-alignment=16 -mstackrealign -.endif # ${CHOSEN_COMPILER_TYPE} == clang - -.if ${ARCH:Marmv?} -BUILD_DEPENDS+= as:devel/binutils@native -CFLAGS+= -no-integrated-as -.endif - -.if defined(MACHINE_CPU) && ${MACHINE_CPU:Maltivec} -CONFIGURE_ARGS+= --enable-altivec -.endif - -.if defined(WITH_DEBUG) -CONFIGURE_ARGS+= --enable-debug=3 -.endif - -LDFLAGS_i386+= -Wl,-z,notext - -# Win32 DLL codecs support on i386, mostly superseded by ffmpeg -# ============================================================= - -.if ${ARCH} == "i386" -CONFIGURE_ARGS+= --codecsdir=${LOCALBASE}/lib/win32 -.else -CONFIGURE_ARGS+= --disable-win32dll \ - --disable-qtx -.endif diff --git a/multimedia/mplayer/Makefile.optvars b/multimedia/mplayer/Makefile.optvars deleted file mode 100644 index 95a9701766a0..000000000000 --- a/multimedia/mplayer/Makefile.optvars +++ /dev/null @@ -1,173 +0,0 @@ -# Handling of variables using helpers -# Include before bsd.port.(pre|options).mk - -# OPTIONs -AALIB_LIB_DEPENDS= libaa.so:graphics/aalib -AALIB_CONFIGURE_OFF= --disable-aa - -AMR_NB_LIB_DEPENDS= libopencore-amrnb.so:audio/opencore-amr -AMR_NB_CONFIGURE_ENABLE=libopencore_amrnb - -AMR_WB_LIB_DEPENDS= libopencore-amrwb.so:audio/opencore-amr -AMR_WB_CONFIGURE_ENABLE=libopencore_amrwb - -ASS_LIB_DEPENDS= libass.so:multimedia/libass \ - libharfbuzz.so:print/harfbuzz -ASS_CONFIGURE_OFF= --disable-ass - -BLURAY_LIB_DEPENDS= libbluray.so:multimedia/libbluray -BLURAY_CONFIGURE_OFF= --disable-bluray - -CACA_LIB_DEPENDS= libcaca.so:graphics/libcaca -CACA_CONFIGURE_OFF= --disable-caca - -CDIO_LIB_DEPENDS= libcdio_paranoia.so:sysutils/libcdio-paranoia -CDIO_CONFIGURE_OFF= --disable-libcdio - -DV_LIB_DEPENDS= libdv.so:multimedia/libdv -DV_CONFIGURE_ENABLE= libdv - -DVDNAV_LIB_DEPENDS= libdvdnav.so:multimedia/libdvdnav \ - libdvdread.so:multimedia/libdvdread -DVDNAV_CONFIGURE_OFF= --disable-dvdnav - -ENCA_LIB_DEPENDS= libenca.so:converters/enca -ENCA_CONFIGURE_OFF= --disable-enca - -FAAC_LIB_DEPENDS= libfaac.so:audio/faac -FAAC_CONFIGURE_OFF= --disable-faac - -FONTCONFIG_LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig -FONTCONFIG_CONFIGURE_OFF= --disable-fontconfig - -FRIBIDI_LIB_DEPENDS= libfribidi.so:converters/fribidi -FRIBIDI_CONFIGURE_OFF= --disable-fribidi - -GIF_LIB_DEPENDS= libgif.so:graphics/giflib -GIF_CONFIGURE_OFF= --disable-gif - -GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls -GNUTLS_CONFIGURE_OFF= --disable-gnutls - -GSM_LIB_DEPENDS= libgsm.so:audio/gsm -GSM_CONFIGURE_OFF= --disable-libgsm - -GUI_CONFIGURE_ENABLE= gui -GUI_USE= GNOME=cairo,gdkpixbuf,gtk20 -GUI_USES= gnome -GUI_DESKTOP_ENTRIES= "MPlayer" "High performance media player" "mplayer" "gmplayer" "" false -GUI_IMPLIES= ASS JPEG X11 - -IPV6_CONFIGURE_OFF= --disable-inet6 - -JACK_LIB_DEPENDS= libjack.so:audio/jack -JACK_CONFIGURE_OFF= --disable-jack - -JPEG_USES= jpeg -JPEG_CONFIGURE_OFF= --disable-jpeg - -LADSPA_RUN_DEPENDS= ${LOCALBASE}/lib/ladspa/amp.so:audio/ladspa -LADSPA_CONFIGURE_OFF= --disable-ladspa - -LIBMNG_LIB_DEPENDS= libmng.so:graphics/libmng -LIBMNG_CONFIGURE_OFF= --disable-mng - -LIRC_LIB_DEPENDS= liblirc_client.so:comms/lirc -LIRC_CONFIGURE_OFF= --disable-lirc - -LZO_LIB_DEPENDS= liblzo2.so:archivers/lzo2 -LZO_CONFIGURE_OFF= --disable-liblzo - -NAS_LIB_DEPENDS= libaudio.so:audio/nas -NAS_CONFIGURE_OFF= --disable-nas - -NLS_USES= gettext -NLS_CONFIGURE_ENABLE= nls - -OPENAL_USES= openal:soft -OPENAL_CONFIGURE_OFF= --disable-openal - -OPENGL_USE= GL=gl -OPENGL_USES= gl -OPENGL_CONFIGURE_OFF= --disable-gl -OPENGL_IMPLIES= X11 - -OPENJPEG_LIB_DEPENDS= libopenjp2.so:graphics/openjpeg -OPENJPEG_CONFIGURE_ENABLE= libopenjpeg - -OPUS_LIB_DEPENDS= libopus.so:audio/opus -OPUS_CONFIGURE_OFF= --disable-libopus - -PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio -PULSEAUDIO_CONFIGURE_OFF= --disable-pulse - -RTCPU_CONFIGURE_ON= --enable-runtime-cpudetection - -SDL_USE= SDL=sdl -SDL_USES= sdl -SDL_LIB_DEPENDS= libaa.so:graphics/aalib -SDL_CONFIGURE_OFF= --disable-sdl - -SNDIO_LIB_DEPENDS= libsndio.so:audio/sndio -SNDIO_CONFIGURE_OFF= --disable-sndio - -SKINS_RUN_DEPENDS= mplayer-skins>=0:multimedia/mplayer-skins -SKINS_IMPLIES= GUI - -SMB_USES= samba:lib -SMB_CONFIGURE_ON= --extra-ldflags="-L${SAMBA_LIBDIR}" -SMB_CONFIGURE_OFF= --disable-smb - -SPEEX_LIB_DEPENDS= libspeex.so:audio/speex -SPEEX_CONFIGURE_OFF= --disable-speex - -SVGALIB_LIB_DEPENDS= libvga.so:graphics/svgalib -SVGALIB_CONFIGURE_OFF= --disable-svga - -THEORA_LIB_DEPENDS= libtheora.so:multimedia/libtheora \ - libogg.so:audio/libogg -THEORA_CONFIGURE_OFF= --disable-theora - -TWOLAME_LIB_DEPENDS= libtwolame.so:audio/twolame -TWOLAME_CONFIGURE_OFF= --disable-twolame - -V4L_BUILD_DEPENDS= ${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat -V4L_LIB_DEPENDS= libv4l2.so:multimedia/libv4l -V4L_CONFIGURE_OFF= --disable-tv-v4l1 --disable-tv-v4l2 -V4L_CONFIGURE_ON= --enable-tv-v4l1 --enable-tv-v4l2 --extra-libs="-lv4l1 -lv4l2" - -VDPAU_LIB_DEPENDS= libvdpau.so:multimedia/libvdpau -VDPAU_CONFIGURE_OFF= --disable-vdpau - -VPX_LIB_DEPENDS= libvpx.so:multimedia/libvpx -VPX_CONFIGURE_ENABLE= libvpx-lavc - -X11_USES= xorg -X11_USE= XORG=x11,xext,xorgproto,xscrnsaver -X11_CONFIGURE_OFF= --disable-x11 - -X11DGA_USES= xorg -X11DGA_USE= XORG=xxf86dga -X11DGA_CONFIGURE_OFF= --disable-dga1 --disable-dga2 -X11DGA_IMPLIES= X11 - -X11VM_USES= xorg -X11VM_USE= XORG=xxf86vm -X11VM_CONFIGURE_OFF= --disable-vm -X11VM_IMPLIES= X11 - -X264_LIB_DEPENDS= libx264.so:multimedia/libx264 -X264_CONFIGURE_OFF= --disable-x264 - -XINERAMA_USES= xorg -XINERAMA_USE= XORG=xinerama,xorgproto -XINERAMA_CONFIGURE_OFF= --disable-xinerama -XINERAMA_IMPLIES= X11 - -XVID_LIB_DEPENDS= libxvidcore.so:multimedia/xvid -XVID_CONFIGURE_OFF= --disable-xvid - -XVIDEO_USE= XORG=xv -XVIDEO_CONFIGURE_OFF= --disable-xv -XVIDEO_IMPLIES= X11 - diff --git a/multimedia/mplayer/distinfo b/multimedia/mplayer/distinfo deleted file mode 100644 index 18b4b07e90f0..000000000000 --- a/multimedia/mplayer/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -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/extra-patch-clang-version b/multimedia/mplayer/files/extra-patch-clang-version deleted file mode 100644 index 628ab483e194..000000000000 --- a/multimedia/mplayer/files/extra-patch-clang-version +++ /dev/null @@ -1,22 +0,0 @@ ---- configure.orig 2013-03-10 17:43:53.684182000 +0100 -+++ configure 2013-03-10 17:47:47.157190568 +0100 -@@ -1614,7 +1614,7 @@ - if $_cc -v 2>&1 | grep -q "clang"; then - echocheck "$_cc version" - cc_vendor=clang -- cc_version=$($_cc -dumpversion 2>&1) -+ cc_version=$($_cc -v 2>&1 | head -n 1 | cut -d ' ' -f 4) - res_comment="experimental support only" - echores "clang $cc_version" - break ---- Makefile.orig 2013-03-10 17:44:21.865184000 +0100 -+++ Makefile 2013-03-10 17:47:47.248184374 +0100 -@@ -792,7 +792,7 @@ - - # rebuild version.h each time the working copy is updated - version.h: version.sh $(wildcard .svn/entries .git/logs/HEAD) -- ./$< `$(CC) -dumpversion` -+ ./$< `$(CC) -v 2>&1 | head -n 1 | cut -d ' ' -f 4` - - %$(EXESUF): %.c - $(CC) $(CC_DEPFLAGS) $(CFLAGS) -o $@ $^ diff --git a/multimedia/mplayer/files/patch-Makefile b/multimedia/mplayer/files/patch-Makefile deleted file mode 100644 index 2df5c391d3f2..000000000000 --- a/multimedia/mplayer/files/patch-Makefile +++ /dev/null @@ -1,45 +0,0 @@ ---- Makefile.orig 2024-04-28 19:35:10 UTC -+++ Makefile -@@ -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%%/include -o $@ $< - - codecs.conf.h: codec-cfg$(EXESUF) etc/codecs.conf - ./$^ > $@ -@@ -866,19 +866,16 @@ install-dirs: - install-dirs: - $(INSTALL) -d $(BINDIR) $(CONFDIR) $(LIBDIR) - --install-%: %$(EXESUF) install-dirs -- $(INSTALL) -m 755 $(INSTALLSTRIP) $< $(BINDIR) -+install-mplayer: mplayer$(EXESUF) -+ @${BSD_INSTALL_PROGRAM} mplayer$(EXESUF) $(BINDIR) - --install-gui: install-mplayer install-gui-icons install-gui-msg -- -ln -sf mplayer$(EXESUF) $(BINDIR)/gmplayer$(EXESUF) -- $(INSTALL) -d $(DATADIR)/skins $(prefix)/share/applications -- $(INSTALL) -m 644 etc/mplayer.desktop $(prefix)/share/applications/ -+install-gui: install-mplayer - - install-gui-icons: $(foreach size,$(GUI_ICONSIZES),install-gui-icon-$(size)) - install-gui-man: $(foreach lang,$(MAN_LANGS),install-gui-man-$(lang)) - install-gui-msg: $(foreach lang,$(filter-out $(firstword $(MSG_LANGS)),$(MSG_LANGS)),install-gui-msg-$(lang)) - install-mencoder-man: $(foreach lang,$(MAN_LANGS),install-mencoder-man-$(lang)) --install-mplayer-man: $(foreach lang,$(MAN_LANGS),install-mplayer-man-$(lang)) -+install-mplayer-man: install-mplayer-man-en - - install-gui-man-en: install-mplayer-man-en - cd $(MANDIR)/man1/ && ln -sf mplayer.1 gmplayer.1 -@@ -887,8 +884,7 @@ install-mplayer-man-en: - cd $(MANDIR)/man1 && ln -sf mplayer.1 mencoder.1 - - install-mplayer-man-en: -- $(INSTALL) -d $(MANDIR)/man1 -- $(INSTALL) -m 644 DOCS/man/en/mplayer.1 $(MANDIR)/man1/ -+ @${BSD_INSTALL_MAN} DOCS/man/en/mplayer.1 $(MANDIR)/man1/mplayer.1 - - define GUI_ICON_RULE - install-gui-icon-$(size): diff --git a/multimedia/mplayer/files/patch-configure b/multimedia/mplayer/files/patch-configure deleted file mode 100644 index a079eeeccd3e..000000000000 --- a/multimedia/mplayer/files/patch-configure +++ /dev/null @@ -1,243 +0,0 @@ ---- configure.orig 2024-09-21 09:30:02 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" - 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 --test -e FFBRANCH && FFBRANCH=$(cat FFBRANCH) -- --if test -e ffmpeg/mp_auto_pull ; then -- echo "Updating FFmpeg, (re)move ffmpeg/mp_auto_pull to disable" -- (cd ffmpeg && git 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 -- - list_subparts() { - test ! -e ffmpeg/libav${3} && return 1 - pattern="s/^[^#]*${1}.*([^ ,]*, *\([^ ,)]*\).*/\1_${2}/p" -@@ -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 ;; -- 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" - 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 - 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 - _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_ - - # 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 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 - 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 - 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 - 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 - } - 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 - 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 - 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 - 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 - 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; - 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 - 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 - - ############################################################################# - --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-gui_wm_ws.c b/multimedia/mplayer/files/patch-gui_wm_ws.c deleted file mode 100644 index 7a4b1e2d60c4..000000000000 --- a/multimedia/mplayer/files/patch-gui_wm_ws.c +++ /dev/null @@ -1,23 +0,0 @@ ---- gui/wm/ws.c.orig 2015-11-18 16:16:39 UTC -+++ gui/wm/ws.c -@@ -193,8 +193,18 @@ void wsInit(Display *display) - int localdisp = 1; - - if (dispname && *dispname != ':') { -- localdisp = 0; -- wsUseXShm = False; -+ // check [Bug 206050] x11/slim: force use unix sockets -+ //localdisp = 0; -+ //wsUseXShm = False; -+ const char *udspfx = "unix:"; -+ size_t strsz = strlen(udspfx); -+ char substr[strsz]; -+ strncpy(substr, dispname, strsz); -+ substr[strsz] = '\0'; -+ if(strcmp(substr, udspfx) != 0) { -+ localdisp = 0; -+ wsUseXShm = False; -+ } - } - - mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[ws] display name: %s => %s display.\n", dispname, localdisp ? "local" : "REMOTE"); diff --git a/multimedia/mplayer/files/patch-libao2_ao__arts.c b/multimedia/mplayer/files/patch-libao2_ao__arts.c deleted file mode 100644 index bb60b76cba3f..000000000000 --- a/multimedia/mplayer/files/patch-libao2_ao__arts.c +++ /dev/null @@ -1,15 +0,0 @@ ---- libao2/ao_arts.c.orig 2010-02-20 21:02:49 UTC -+++ libao2/ao_arts.c -@@ -116,8 +116,10 @@ static int init(int rate_hz, int channel - - static void uninit(int immed) - { -- arts_close_stream(stream); -- arts_free(); -+ if (stream != NULL) { -+ arts_close_stream(stream); -+ stream = NULL; -+ } - } - - static int play(void* data,int len,int flags) diff --git a/multimedia/mplayer/files/patch-libao2_ao__oss.c b/multimedia/mplayer/files/patch-libao2_ao__oss.c deleted file mode 100644 index 431cfe198dc3..000000000000 --- a/multimedia/mplayer/files/patch-libao2_ao__oss.c +++ /dev/null @@ -1,146 +0,0 @@ ---- libao2/ao_oss.c.orig 2021-04-15 19:26:53 UTC -+++ libao2/ao_oss.c -@@ -57,6 +57,8 @@ static const ao_info_t info = - "" - }; - -+static int volume = -1; -+ - /* Support for >2 output channels added 2001-11-25 - Steve Davies */ - - LIBAO_EXTERN(oss) -@@ -73,6 +75,11 @@ static int format2oss(int format) - case AF_FORMAT_S16_BE: return AFMT_S16_BE; - #ifdef AFMT_S24_PACKED - case AF_FORMAT_S24_LE: return AFMT_S24_PACKED; -+#elif defined(__FreeBSD__) && defined(AFMT_S24_LE) -+ case AF_FORMAT_U24_LE: return AFMT_U24_LE; -+ case AF_FORMAT_U24_BE: return AFMT_U24_BE; -+ case AF_FORMAT_S24_LE: return AFMT_S24_LE; -+ case AF_FORMAT_S24_BE: return AFMT_S24_BE; - #endif - #ifdef AFMT_U32_LE - case AF_FORMAT_U32_LE: return AFMT_U32_LE; -@@ -116,6 +123,11 @@ static int oss2format(int format) - case AFMT_S16_BE: return AF_FORMAT_S16_BE; - #ifdef AFMT_S24_PACKED - case AFMT_S24_PACKED: return AF_FORMAT_S24_LE; -+#elif defined(__FreeBSD__) && defined(AFMT_S24_LE) -+ case AFMT_U24_LE: return AF_FORMAT_U24_LE; -+ case AFMT_U24_BE: return AF_FORMAT_U24_BE; -+ case AFMT_S24_LE: return AF_FORMAT_S24_LE; -+ case AFMT_S24_BE: return AF_FORMAT_S24_BE; - #endif - #ifdef AFMT_U32_LE - case AFMT_U32_LE: return AF_FORMAT_U32_LE; -@@ -217,6 +229,48 @@ static int control(int cmd,void *arg){ - return CONTROL_UNKNOWN; - } - -+static void setfragment(int audio_fd) -+{ -+ int buffer_bytes = ao_data.channels * ao_data.samplerate; -+ int block_size = 0; -+ -+ switch (ao_data.format & AF_FORMAT_BITS_MASK) { -+ case AF_FORMAT_8BIT: -+ break; -+ case AF_FORMAT_16BIT: -+ buffer_bytes *= 2; -+ break; -+ case AF_FORMAT_24BIT: -+ buffer_bytes *= 3; -+ break; -+ case AF_FORMAT_32BIT: -+ buffer_bytes *= 4; -+ break; -+ } -+ buffer_bytes *= 0.050; -+ -+ if(ioctl(audio_fd, SNDCTL_DSP_GETBLKSIZE, &block_size)==0){ -+ int setfrag; -+ /* make block size power of two */ -+ while (block_size & (block_size - 1)) -+ block_size += block_size & ~(block_size - 1); -+ /* set number of fragments */ -+ setfrag = ((buffer_bytes + block_size - 1) / block_size) << 16; -+ /* need at least double buffering */ -+ if (setfrag < (2 << 16)) -+ setfrag = (2 << 16); -+ /* set block size in power of two */ -+ while (block_size) { -+ setfrag++; -+ block_size /= 2; -+ } -+ /* try to set a total buffer of 50ms */ -+ if (ioctl(audio_fd, SNDCTL_DSP_SETFRAGMENT, &setfrag)==-1){ -+ mp_msg(MSGT_AO,MSGL_V,"audio_setup: setfragment %d failed\n", setfrag); -+ } -+ } -+} -+ - // open & setup audio device - // return: 1=success 0=fail - static int init(int rate,int channels,int format,int flags){ -@@ -364,6 +418,7 @@ ac3_retry: - mp_msg(MSGT_AO,MSGL_WARN, "OSS: Failed setting sample-rate %i %s\n", rate, strerror(errno)); - mp_msg(MSGT_AO,MSGL_V,"audio_setup: using %d Hz samplerate (requested: %d)\n",ao_data.samplerate,rate); - } -+ setfragment(audio_fd); - - if(ioctl(audio_fd, SNDCTL_DSP_GETOSPACE, &zz)==-1){ - int r=0; -@@ -441,10 +496,30 @@ static void uninit(int immed){ - audio_fd = -1; - } - -+static void savevol(void){ -+ int fd; -+ if (volume < 0) { -+ if ((fd = open(oss_mixer_device, O_RDONLY)) >= 0) { -+ ioctl(fd, MIXER_READ(oss_mixer_channel), &volume); -+ close(fd); -+ } -+ } -+} -+ -+static void restorevol(void){ -+ int fd; -+ if ((fd = open(oss_mixer_device, O_RDONLY)) >= 0) { -+ ioctl(fd, MIXER_WRITE(oss_mixer_channel), &volume); -+ close(fd); -+ } -+ volume = -1; -+} -+ - // stop playing and empty buffers (for seeking/pause) - static void reset(void){ - int fail = 0; - int oss_format; -+ savevol(); - uninit(1); - audio_fd=open(dsp, O_WRONLY); - if(audio_fd < 0){ -@@ -456,6 +531,7 @@ static void reset(void){ - fcntl(audio_fd, F_SETFD, FD_CLOEXEC); - #endif - -+ ioctl (audio_fd, SNDCTL_DSP_SPEED, &ao_data.samplerate); - oss_format = format2oss(ao_data.format); - if(AF_FORMAT_IS_AC3(ao_data.format)) - fail |= ioctl (audio_fd, SNDCTL_DSP_SPEED, &ao_data.samplerate) == -1; -@@ -471,11 +547,14 @@ static void reset(void){ - } - if (fail) - mp_msg(MSGT_AO,MSGL_WARN, "OSS: Reset failed\n"); -+ setfragment(audio_fd); -+ restorevol(); - } - - // stop playing, keep buffers (for pause) - static void audio_pause(void) - { -+ savevol(); - prepause_space = get_space(); - uninit(1); - } diff --git a/multimedia/mplayer/files/patch-libmpcodecs_ad__spdif.c b/multimedia/mplayer/files/patch-libmpcodecs_ad__spdif.c deleted file mode 100644 index dbd61b231791..000000000000 --- a/multimedia/mplayer/files/patch-libmpcodecs_ad__spdif.c +++ /dev/null @@ -1,11 +0,0 @@ ---- libmpcodecs/ad_spdif.c.orig 2024-09-21 09:30:04 UTC -+++ libmpcodecs/ad_spdif.c -@@ -54,7 +54,7 @@ static int read_packet(void *p, uint8_t *buf, int buf_ - return 0; - } - --static int write_packet(void *p, const uint8_t *buf, int buf_size) -+static int write_packet(void *p, uint8_t *buf, int buf_size) - { - int len; - struct spdifContext *ctx = p; diff --git a/multimedia/mplayer/files/patch-libmpcodecs_ae__faac.c b/multimedia/mplayer/files/patch-libmpcodecs_ae__faac.c deleted file mode 100644 index 59bffc2bd20b..000000000000 --- a/multimedia/mplayer/files/patch-libmpcodecs_ae__faac.c +++ /dev/null @@ -1,13 +0,0 @@ ---- libmpcodecs/ae_faac.c.orig 2011-07-27 15:33:03 UTC -+++ libmpcodecs/ae_faac.c -@@ -183,7 +183,9 @@ int mpae_init_faac(audio_encoder_t *enco - if(MAIN==0) config->aacObjectType--; - config->mpegVersion = (param_mpeg == 4 ? MPEG4 : MPEG2); - config->useTns = param_tns; -- config->allowMidside = 1; -+ //Do not set allowMidside for API compatibility with faac, -+ //see https://github.com/knik0/faac/issues/8 for details -+ //config->allowMidside = 1; - config->shortctl = SHORTCTL_NORMAL; - param_cutoff = param_cutoff ? param_cutoff : encoder->params.sample_rate / 2; - if(param_cutoff > encoder->params.sample_rate / 2) diff --git a/multimedia/mplayer/files/patch-libvo_x11__common.c b/multimedia/mplayer/files/patch-libvo_x11__common.c deleted file mode 100644 index 15172a9479d4..000000000000 --- a/multimedia/mplayer/files/patch-libvo_x11__common.c +++ /dev/null @@ -1,11 +0,0 @@ ---- libvo/x11_common.c.orig 2015-05-11 20:10:01 UTC -+++ libvo/x11_common.c -@@ -430,7 +430,7 @@ int vo_init(void) - } - - // Required so that XLookupString returns UTF-8 -- if (!setlocale(LC_CTYPE, "C.UTF-8") && !setlocale(LC_CTYPE, "en_US.utf8")) -+ if (!setlocale(LC_CTYPE, "en_US.UTF-8")) - mp_msg(MSGT_VO, MSGL_WARN, MSGTR_CouldntFindUTF8Locale); - XSetErrorHandler(x11_errorhandler); - 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; diff --git a/multimedia/mplayer/files/patch-mplayer.c b/multimedia/mplayer/files/patch-mplayer.c deleted file mode 100644 index afbc56b126f5..000000000000 --- a/multimedia/mplayer/files/patch-mplayer.c +++ /dev/null @@ -1,12 +0,0 @@ ---- mplayer.c.orig 2015-06-10 21:17:35 UTC -+++ mplayer.c -@@ -3711,7 +3711,8 @@ goto_enable_cache: - if (use_gui) { - if (!gui(GUI_SET_VIDEO, mpctx->sh_video)) - goto goto_next_file; -- gui(GUI_SET_AUDIO, mpctx->sh_audio); -+ if (mpctx->sh_audio) -+ gui(GUI_SET_AUDIO, mpctx->sh_audio); - } - #endif - diff --git a/multimedia/mplayer/files/patch-stream_stream__vcd.c b/multimedia/mplayer/files/patch-stream_stream__vcd.c deleted file mode 100644 index c6125445120b..000000000000 --- a/multimedia/mplayer/files/patch-stream_stream__vcd.c +++ /dev/null @@ -1,10 +0,0 @@ ---- stream/stream_vcd.c.orig 2015-08-31 08:14:54 UTC -+++ stream/stream_vcd.c -@@ -39,6 +39,7 @@ - #include - - #if CONFIG_LIBCDIO -+#include - #include "vcd_read_libcdio.h" - #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) || defined(__NetBSD__) || defined(__OpenBSD__) - #include "vcd_read_fbsd.h" diff --git a/multimedia/mplayer/files/patch-stream_tvi__bsdbt848.c b/multimedia/mplayer/files/patch-stream_tvi__bsdbt848.c deleted file mode 100644 index 5e5422e2e3e0..000000000000 --- a/multimedia/mplayer/files/patch-stream_tvi__bsdbt848.c +++ /dev/null @@ -1,76 +0,0 @@ ---- stream/tvi_bsdbt848.c.orig 2013-03-16 10:15:07 UTC -+++ stream/tvi_bsdbt848.c -@@ -366,11 +366,11 @@ static int control(priv_t *priv, int cmd - int req_mode = *(int *)arg; - u_short tmp_fps; - -- priv->iformat = METEOR_FMT_AUTOMODE; -+ priv->iformat = BT848_IFORM_F_AUTO; - - if(req_mode == TV_NORM_PAL) - { -- priv->iformat = METEOR_FMT_PAL; -+ priv->iformat = BT848_IFORM_F_PALBDGHI; - priv->maxheight = PAL_HEIGHT; - priv->maxwidth = PAL_WIDTH; - priv->maxfps = PAL_FPS; -@@ -391,7 +391,7 @@ static int control(priv_t *priv, int cmd - - if(req_mode == TV_NORM_NTSC) - { -- priv->iformat = METEOR_FMT_NTSC; -+ priv->iformat = BT848_IFORM_F_NTSCM; - priv->maxheight = NTSC_HEIGHT; - priv->maxwidth = NTSC_WIDTH; - priv->maxfps = NTSC_FPS; -@@ -415,9 +415,28 @@ static int control(priv_t *priv, int cmd - } - } - -- if(req_mode == TV_NORM_SECAM) priv->iformat = METEOR_FMT_SECAM; -+ if(req_mode == TV_NORM_SECAM) -+ { -+ priv->iformat = BT848_IFORM_F_SECAM; -+ priv->maxheight = PAL_HEIGHT; -+ priv->maxwidth = PAL_WIDTH; -+ priv->maxfps = PAL_FPS; -+ priv->fps = PAL_FPS; - -- if(ioctl(priv->btfd, METEORSFMT, &priv->iformat) < 0) -+ if(priv->fps > priv->maxfps) priv->fps = priv->maxfps; -+ -+ if(priv->geom.rows > priv->maxheight) -+ { -+ priv->geom.rows = priv->maxheight; -+ } -+ -+ if(priv->geom.columns > priv->maxwidth) -+ { -+ priv->geom.columns = priv->maxwidth; -+ } -+ } -+ -+ if(ioctl(priv->btfd, BT848SFMT, &priv->iformat) < 0) - { - mp_msg(MSGT_TV, MSGL_ERR, MSGTR_TV_Bt848IoctlFailed, "METEORSFMT", strerror(errno)); - return TVI_CONTROL_FALSE; -@@ -546,8 +565,9 @@ G_private = priv; /* Oooh, sick */ - /* Video Configuration */ - - priv->videoready = 1; -+priv->btdev = strdup("/dev/bktr0"); - priv->immediatemode = 0; --priv->iformat = METEOR_FMT_PAL; -+priv->iformat = BT848_IFORM_F_PALBDGHI; - priv->maxheight = PAL_HEIGHT; - priv->maxwidth = PAL_WIDTH; - priv->maxfps = PAL_FPS; -@@ -572,7 +592,7 @@ if(priv->btfd < 0) - } - - if(priv->videoready && -- ioctl(priv->btfd, METEORSFMT, &priv->iformat) < 0) -+ ioctl(priv->btfd, BT848SFMT, &priv->iformat) < 0) - { - mp_msg(MSGT_TV, MSGL_ERR, MSGTR_TV_Bt848IoctlFailed, "SETEORSFMT", strerror(errno)); - } diff --git a/multimedia/mplayer/files/patch-stream_tvi__v4l.c b/multimedia/mplayer/files/patch-stream_tvi__v4l.c deleted file mode 100644 index 6d418ed0d080..000000000000 --- a/multimedia/mplayer/files/patch-stream_tvi__v4l.c +++ /dev/null @@ -1,17 +0,0 @@ ---- stream/tvi_v4l.c.orig 2013-03-17 22:47:17 UTC -+++ stream/tvi_v4l.c -@@ -65,6 +65,14 @@ - - #include "audio_in.h" - -+#include -+#define open v4l1_open -+#define close v4l1_close -+#define dup v4l1_dup -+#define ioctl v4l1_ioctl -+#define mmap v4l1_mmap -+#define munmap v4l1_munmap -+ - static tvi_handle_t *tvi_init_v4l(tv_param_t* tv_param); - - const tvi_info_t tvi_info_v4l = { diff --git a/multimedia/mplayer/files/patch-stream_tvi__v4l2.c b/multimedia/mplayer/files/patch-stream_tvi__v4l2.c deleted file mode 100644 index 88ce34e9483c..000000000000 --- a/multimedia/mplayer/files/patch-stream_tvi__v4l2.c +++ /dev/null @@ -1,25 +0,0 @@ ---- stream/tvi_v4l2.c.orig 2014-06-10 16:39:04 UTC -+++ stream/tvi_v4l2.c -@@ -53,7 +53,6 @@ known issues: - #ifdef HAVE_SYS_VIDEOIO_H - #include - #else --#include - #include - #endif - #include "mp_msg.h" -@@ -68,6 +67,14 @@ known issues: - #define V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC 0x2000 - #endif - -+#include -+#define open v4l2_open -+#define close v4l2_close -+#define dup v4l2_dup -+#define ioctl v4l2_ioctl -+#define mmap v4l2_mmap -+#define munmap v4l2_munmap -+ - #define info tvi_info_v4l2 - static tvi_handle_t *tvi_init_v4l2(tv_param_t* tv_param); - /* information about this file */ diff --git a/multimedia/mplayer/files/patch-vidix_mga__vid.c b/multimedia/mplayer/files/patch-vidix_mga__vid.c deleted file mode 100644 index d60339de08d9..000000000000 --- a/multimedia/mplayer/files/patch-vidix_mga__vid.c +++ /dev/null @@ -1,17 +0,0 @@ ---- vidix/mga_vid.c.orig 2014-05-17 01:38:00 UTC -+++ vidix/mga_vid.c -@@ -1110,13 +1110,10 @@ static int mga_probe(int verbose,int for - i, lst[i].vendor, lst[i].device); - if (lst[i].vendor == VENDOR_MATROX) - { --#if 0 - if ((lst[i].command & PCI_COMMAND_IO) == 0) - { -- mp_msg(MSGT_VO, MSGL_STATUS, "[mga] Device is disabled, ignoring\n"); -- continue; -+ mp_msg(MSGT_VO, MSGL_STATUS, "[mga] Device seems disabled, trying anyway\n"); - } --#endif - switch(lst[i].device) - { - case DEVICE_MATROX_MGA_G550_AGP: diff --git a/multimedia/mplayer/files/pkg-message.in b/multimedia/mplayer/files/pkg-message.in deleted file mode 100644 index bf4752448afa..000000000000 --- a/multimedia/mplayer/files/pkg-message.in +++ /dev/null @@ -1,22 +0,0 @@ -[ -{ type: install - message: <