* [gentoo-commits] repo/gentoo:master commit in: media-video/mplayer/files/, media-video/mplayer/
@ 2017-06-19 12:50 Alexis Ballier
0 siblings, 0 replies; 10+ messages in thread
From: Alexis Ballier @ 2017-06-19 12:50 UTC (permalink / raw
To: gentoo-commits
commit: 6a58da3acd14857965c3fe1030237fbb6c75bc91
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 17 19:55:00 2017 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Mon Jun 19 12:50:48 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a58da3a
media-video/mplayer: Rev bump to add patch for CVE-2016-4352 (bug #581952)
Package-Manager: Portage-2.3.5, Repoman-2.3.2
.../mplayer/files/mplayer-1.3-CVE-2016-4352.patch | 24 +
media-video/mplayer/mplayer-1.3.0-r1.ebuild | 628 +++++++++++++++++++++
2 files changed, 652 insertions(+)
diff --git a/media-video/mplayer/files/mplayer-1.3-CVE-2016-4352.patch b/media-video/mplayer/files/mplayer-1.3-CVE-2016-4352.patch
new file mode 100644
index 00000000000..4eabf8b5f28
--- /dev/null
+++ b/media-video/mplayer/files/mplayer-1.3-CVE-2016-4352.patch
@@ -0,0 +1,24 @@
+https://trac.mplayerhq.hu/ticket/2295
+
+r37857
+
+--- old/libmpdemux/demux_gif.c
++++ new/libmpdemux/demux_gif.c
+@@ -304,6 +304,17 @@
+ return NULL;
+ }
+
++ // Validate image size, most code in this demuxer assumes w*h <= INT_MAX
++ if ((int64_t)gif->SWidth * gif->SHeight > INT_MAX) {
++ mp_msg(MSGT_DEMUX, MSGL_ERR,
++ "[demux_gif] Unsupported picture size %dx%d.\n", gif->SWidth,
++ gif->SHeight);
++ if (DGifCloseFile(gif) == GIF_ERROR)
++ print_gif_error(NULL);
++ free(priv);
++ return NULL;
++ }
++
+ // create a new video stream header
+ sh_video = new_sh_video(demuxer, 0);
+
diff --git a/media-video/mplayer/mplayer-1.3.0-r1.ebuild b/media-video/mplayer/mplayer-1.3.0-r1.ebuild
new file mode 100644
index 00000000000..0b643e2701b
--- /dev/null
+++ b/media-video/mplayer/mplayer-1.3.0-r1.ebuild
@@ -0,0 +1,628 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+EGIT_REPO_URI="git://git.videolan.org/ffmpeg.git"
+ESVN_REPO_URI="svn://svn.mplayerhq.hu/mplayer/trunk"
+[[ ${PV} = *9999* ]] && SVN_ECLASS="subversion git-2" || SVN_ECLASS=""
+
+inherit toolchain-funcs eutils flag-o-matic multilib base ${SVN_ECLASS}
+
+IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext a52 aalib +alsa altivec aqua bidi bl bluray
+bs2b cddb +cdio cdparanoia cpudetection debug dga
+directfb doc dts dv dvb +dvd +dvdnav +enca +encode faac faad fbcon
+ftp gif ggi gsm +iconv ipv6 jack joystick jpeg jpeg2k kernel_linux ladspa
++libass libcaca libmpeg2 lirc live lzo mad md5sum +cpu_flags_x86_mmx cpu_flags_x86_mmxext mng mp3 nas
++network nut openal opengl +osdmenu oss png pnm pulseaudio pvr
+radio rar rtc rtmp samba selinux +shm sdl speex cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_ssse3
+tga theora tremor +truetype toolame twolame +unicode v4l vcd vdpau vidix
+vorbis +X x264 xinerama +xscreensaver +xv xvid xvmc yuv4mpeg zoran"
+
+VIDEO_CARDS="s3virge mga tdfx"
+for x in ${VIDEO_CARDS}; do
+ IUSE+=" video_cards_${x}"
+done
+
+FONT_URI="
+ mirror://mplayer/releases/fonts/font-arial-iso-8859-1.tar.bz2
+ mirror://mplayer/releases/fonts/font-arial-iso-8859-2.tar.bz2
+ mirror://mplayer/releases/fonts/font-arial-cp1250.tar.bz2
+"
+if [[ ${PV} == *9999* ]]; then
+ RELEASE_URI=""
+elif [ "${PV%_rc*}" = "${PV}" -a "${PV%_pre*}" = "${PV}" ]; then
+ MY_P="MPlayer-${PV}"
+ S="${WORKDIR}/${MY_P}"
+ RELEASE_URI="mirror://mplayer/releases/${MY_P}.tar.xz"
+else
+ RELEASE_URI="mirror://gentoo/${P}.tar.xz"
+fi
+SRC_URI="${RELEASE_URI}
+ !truetype? ( ${FONT_URI} )"
+
+DESCRIPTION="Media Player for Linux"
+HOMEPAGE="http://www.mplayerhq.hu/"
+
+FONT_RDEPS="
+ virtual/ttf-fonts
+ media-libs/fontconfig
+ >=media-libs/freetype-2.2.1:2
+"
+X_RDEPS="
+ x11-libs/libXext
+ x11-libs/libXxf86vm
+"
+# Rar: althrought -gpl version is nice, it cant do most functions normal rars can
+# nemesi? ( net-libs/libnemesi )
+RDEPEND+="
+ sys-libs/ncurses:0=
+ app-arch/bzip2
+ sys-libs/zlib
+ >=media-video/ffmpeg-3.0:0=[vdpau?]
+ a52? ( media-libs/a52dec )
+ aalib? ( media-libs/aalib )
+ alsa? ( media-libs/alsa-lib )
+ bidi? ( dev-libs/fribidi )
+ bluray? ( >=media-libs/libbluray-0.2.1:= )
+ bs2b? ( media-libs/libbs2b )
+ cdio? ( dev-libs/libcdio:0= dev-libs/libcdio-paranoia )
+ cdparanoia? ( !cdio? ( media-sound/cdparanoia ) )
+ dga? ( x11-libs/libXxf86dga )
+ directfb? ( dev-libs/DirectFB )
+ dts? ( media-libs/libdca )
+ dv? ( media-libs/libdv )
+ dvb? ( virtual/linuxtv-dvb-headers )
+ dvd? ( >=media-libs/libdvdread-4.1.3 )
+ dvdnav? ( >=media-libs/libdvdnav-4.1.3 )
+ encode? (
+ !twolame? ( toolame? ( media-sound/toolame ) )
+ twolame? ( media-sound/twolame )
+ faac? ( media-libs/faac )
+ mp3? ( media-sound/lame )
+ x264? ( >=media-libs/x264-0.0.20100423:= )
+ xvid? ( media-libs/xvid )
+ )
+ enca? ( app-i18n/enca )
+ faad? ( media-libs/faad2 )
+ ggi? ( media-libs/libggi media-libs/libggiwmh )
+ gif? ( media-libs/giflib:0= )
+ gsm? ( media-sound/gsm )
+ iconv? ( virtual/libiconv )
+ jack? ( media-sound/jack-audio-connection-kit )
+ jpeg? ( virtual/jpeg:0 )
+ jpeg2k? ( media-libs/openjpeg:0 )
+ ladspa? ( media-libs/ladspa-sdk )
+ libass? ( >=media-libs/libass-0.9.10:= )
+ libcaca? ( media-libs/libcaca )
+ libmpeg2? ( media-libs/libmpeg2 )
+ lirc? ( app-misc/lirc )
+ live? ( media-plugins/live )
+ lzo? ( >=dev-libs/lzo-2 )
+ mad? ( media-libs/libmad )
+ mng? ( media-libs/libmng:= )
+ mp3? ( media-sound/mpg123 )
+ nas? ( media-libs/nas )
+ nut? ( >=media-libs/libnut-661 )
+ openal? ( media-libs/openal )
+ opengl? ( virtual/opengl )
+ png? ( media-libs/libpng:0= )
+ pnm? ( media-libs/netpbm )
+ pulseaudio? ( media-sound/pulseaudio )
+ rar? (
+ || (
+ app-arch/unrar
+ app-arch/rar
+ )
+ )
+ rtmp? ( media-video/rtmpdump )
+ samba? ( net-fs/samba )
+ sdl? ( media-libs/libsdl )
+ speex? ( media-libs/speex )
+ theora? ( media-libs/libtheora[encode?] )
+ tremor? ( media-libs/tremor )
+ truetype? ( ${FONT_RDEPS} )
+ vdpau? ( x11-libs/libvdpau )
+ vorbis? ( !tremor? ( media-libs/libvorbis ) )
+ X? ( ${X_RDEPS} )
+ xinerama? ( x11-libs/libXinerama )
+ xscreensaver? ( x11-libs/libXScrnSaver )
+ xv? ( x11-libs/libXv )
+ xvmc? ( x11-libs/libXvMC )
+"
+
+X_DEPS="
+ x11-proto/videoproto
+ x11-proto/xf86vidmodeproto
+"
+ASM_DEP="dev-lang/yasm"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ dga? ( x11-proto/xf86dgaproto )
+ X? ( ${X_DEPS} )
+ xinerama? ( x11-proto/xineramaproto )
+ xscreensaver? ( x11-proto/scrnsaverproto )
+ amd64? ( ${ASM_DEP} )
+ doc? (
+ dev-libs/libxslt app-text/docbook-xml-dtd
+ app-text/docbook-xsl-stylesheets
+ )
+ x86? ( ${ASM_DEP} )
+ x86-fbsd? ( ${ASM_DEP} )
+"
+RDEPEND+="
+ selinux? ( sec-policy/selinux-mplayer )
+"
+
+SLOT="0"
+LICENSE="GPL-2"
+if [[ ${PV} != *9999* ]]; then
+ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+else
+ KEYWORDS="~alpha ~arm ~hppa ~ia64"
+fi
+
+# faac codecs are nonfree
+# libcdio support: prefer libcdio over cdparanoia and don't check for cddb w/cdio
+# dvd navigation requires dvd read support
+# ass and freetype font require iconv and ass requires freetype fonts
+# unicode transformations are usefull only with iconv
+# radio requires oss or alsa backend
+# xvmc requires xvideo support
+REQUIRED_USE="
+ dga? ( X )
+ dvdnav? ( dvd )
+ enca? ( iconv )
+ ggi? ( X )
+ libass? ( truetype )
+ opengl? ( X )
+ osdmenu? ( X )
+ truetype? ( iconv )
+ vdpau? ( X )
+ vidix? ( X )
+ xinerama? ( X )
+ xscreensaver? ( X )
+ xv? ( X )
+ xvmc? ( xv )"
+RESTRICT="faac? ( bindist )"
+
+pkg_setup() {
+ if [[ ${PV} == *9999* ]]; then
+ elog
+ elog "This is a live ebuild which installs the latest from upstream's"
+ elog "subversion repository, and is unsupported by Gentoo."
+ elog "Everything but bugs in the ebuild itself will be ignored."
+ elog
+ fi
+
+ if use cpudetection; then
+ ewarn
+ ewarn "You've enabled the cpudetection flag. This feature is"
+ ewarn "included mainly for people who want to use the same"
+ ewarn "binary on another system with a different CPU architecture."
+ ewarn "MPlayer will already detect your CPU settings by default at"
+ ewarn "buildtime; this flag is used for runtime detection."
+ ewarn "You won't need this turned on if you are only building"
+ ewarn "mplayer for this system. Also, if your compile fails, try"
+ ewarn "disabling this use flag."
+ fi
+
+ if has_version 'media-video/libav' ; then
+ ewarn "Please note that upstream uses media-video/ffmpeg."
+ ewarn "media-video/libav should be fine in theory but if you"
+ ewarn "experience any problem, try to move to media-video/ffmpeg."
+ fi
+}
+
+src_unpack() {
+ if [[ ${PV} = *9999* ]]; then
+ subversion_src_unpack
+ cd "${WORKDIR}"
+ rm -rf "${WORKDIR}/${P}/ffmpeg/"
+ ( S="${WORKDIR}/${P}/ffmpeg/" git-2_src_unpack )
+ else
+ unpack ${A}
+ fi
+
+ if [[ ${PV} = *9999* ]] || [[ "${PV%_rc*}" = "${PV}" ]]; then
+ cd "${S}"
+ cp "${FILESDIR}/dump_ffmpeg.sh" . || die
+ chmod +x dump_ffmpeg.sh
+ ./dump_ffmpeg.sh || die
+ fi
+
+ if ! use truetype; then
+ unpack font-arial-iso-8859-1.tar.bz2 \
+ font-arial-iso-8859-2.tar.bz2 \
+ font-arial-cp1250.tar.bz2
+ fi
+}
+
+src_prepare() {
+ local svf=snapshot_version
+ if [[ ${PV} = *9999* ]]; then
+ # Set SVN version manually
+ subversion_wc_info
+ printf "${ESVN_WC_REVISION}" > $svf
+ else
+ epatch "${FILESDIR}"/${PN}-1.3-CVE-2016-4352.patch
+ fi
+ if [ ! -f VERSION ] ; then
+ [ -f "$svf" ] || die "Missing ${svf}. Did you generate your snapshot with prepare_mplayer.sh?"
+ local sv=$(<$svf)
+ printf "SVN-r${sv} (Gentoo)" > VERSION
+ fi
+
+ # fix path to bash executable in configure scripts
+ sed -i -e "1c\#!${EPREFIX}/bin/bash" configure version.sh || die
+
+ base_src_prepare
+
+ # Use sane default for >=virtual/udev-197
+ sed -i -e '/default_dvd_device/s:/dev/dvd:/dev/cdrom:' configure || die
+}
+
+src_configure() {
+ local myconf=""
+ local uses i
+
+ # set LINGUAS
+ [[ -n $LINGUAS ]] && LINGUAS="${LINGUAS/da/dk}"
+ [[ -n $LINGUAS ]] && LINGUAS="${LINGUAS/zh/zh_CN}" #482968
+
+ # mplayer ebuild uses "use foo || --disable-foo" to forcibly disable
+ # compilation in almost every situation. The reason for this is
+ # because if --enable is used, it will force the build of that option,
+ # regardless of whether the dependency is available or not.
+
+ ###################
+ #Optional features#
+ ###################
+ # disable svga since we don't want it
+ # disable arts since we don't have kde3
+ # always disable internal ass
+ # disable opus and ilbc since it only controls support in internal
+ # ffmpeg which we do not use
+ myconf+="
+ --disable-svga --disable-svgalib_helper
+ --disable-ass-internal
+ --disable-arts
+ --disable-kai
+ --disable-libopus
+ --disable-libilbc
+ $(use_enable network networking)
+ $(use_enable joystick)
+ "
+ uses="bl bluray enca ftp rtc vcd" # nemesi <- not working with in-tree ebuild
+ myconf+=" --disable-nemesi" # nemesi automagic disable
+ for i in ${uses}; do
+ use ${i} || myconf+=" --disable-${i}"
+ done
+ use bidi || myconf+=" --disable-fribidi"
+ use ipv6 || myconf+=" --disable-inet6"
+ use libass || myconf+=" --disable-ass"
+ use nut || myconf+=" --disable-libnut"
+ use rar || myconf+=" --disable-unrarexec"
+ use samba || myconf+=" --disable-smb"
+ use lirc || myconf+=" --disable-lirc --disable-lircc --disable-apple-ir"
+
+ # libcdio support: prefer libcdio over cdparanoia
+ # don't check for cddb w/cdio
+ if use cdio; then
+ myconf+=" --disable-cdparanoia"
+ else
+ myconf+=" --disable-libcdio"
+ use cdparanoia || myconf+=" --disable-cdparanoia"
+ use cddb || myconf+=" --disable-cddb"
+ fi
+
+ ################################
+ # DVD read, navigation support #
+ ################################
+ #
+ # dvdread - accessing a DVD
+ # dvdnav - navigation of menus
+ use dvd || myconf+=" --disable-dvdread"
+ use dvdnav || myconf+=" --disable-dvdnav"
+
+ #############
+ # Subtitles #
+ #############
+ #
+ # SRT/ASS/SSA (subtitles) requires freetype support
+ # freetype support requires iconv
+ # iconv optionally can use unicode
+ use truetype || myconf+=" --disable-freetype"
+ use iconv || myconf+=" --disable-iconv --charset=noconv"
+ use iconv && use unicode && myconf+=" --charset=UTF-8"
+
+ #####################################
+ # DVB / Video4Linux / Radio support #
+ #####################################
+ myconf+=" --disable-tv-bsdbt848"
+ # broken upstream, won't work with recent kernels
+ myconf+=" --disable-ivtv"
+ # gone since linux-headers-2.6.38
+ myconf+=" --disable-tv-v4l1"
+ if { use dvb || use v4l || use pvr || use radio; }; then
+ use dvb || myconf+=" --disable-dvb"
+ use pvr || myconf+=" --disable-pvr"
+ use v4l || myconf+=" --disable-tv-v4l2"
+ if use radio && { use dvb || use v4l; }; then
+ myconf+="
+ --enable-radio
+ $(use_enable encode radio-capture)
+ "
+ else
+ myconf+="
+ --disable-radio-v4l2
+ --disable-radio-bsdbt848
+ "
+ fi
+ else
+ myconf+="
+ --disable-tv
+ --disable-tv-v4l2
+ --disable-radio
+ --disable-radio-v4l2
+ --disable-radio-bsdbt848
+ --disable-dvb
+ --disable-v4l2
+ --disable-pvr"
+ fi
+
+ ##########
+ # Codecs #
+ ##########
+ myconf+=" --disable-musepack" # Use internal musepack codecs for SV7 and SV8 support
+ myconf+=" --disable-libmpeg2-internal" # always use system media-libs/libmpeg2
+ use dts || myconf+=" --disable-libdca"
+ if ! use mp3; then
+ myconf+="
+ --disable-mp3lame
+ --disable-mpg123
+ "
+ fi
+ uses="a52 bs2b dv gsm lzo rtmp vorbis"
+ for i in ${uses}; do
+ use ${i} || myconf+=" --disable-lib${i}"
+ done
+
+ uses="faad gif jpeg libmpeg2 live mad mng png pnm speex tga theora tremor"
+ for i in ${uses}; do
+ use ${i} || myconf+=" --disable-${i}"
+ done
+ use jpeg2k || myconf+=" --disable-libopenjpeg"
+
+ # Encoding
+ uses="faac x264 xvid toolame twolame"
+ if use encode; then
+ for i in ${uses}; do
+ use ${i} || myconf+=" --disable-${i}"
+ done
+ else
+ myconf+=" --disable-mencoder"
+ for i in ${uses}; do
+ myconf+=" --disable-${i}"
+ use ${i} && elog "Useflag \"${i}\" will only be useful for encoding, i.e., with \"encode\" useflag enabled."
+ done
+ fi
+
+ #################
+ # Binary codecs #
+ #################
+ myconf+=" --disable-qtx --disable-real --disable-win32dll"
+
+ ################
+ # Video Output #
+ ################
+ uses="directfb md5sum sdl yuv4mpeg"
+ for i in ${uses}; do
+ use ${i} || myconf+=" --disable-${i}"
+ done
+ use aalib || myconf+=" --disable-aa"
+ use fbcon || myconf+=" --disable-fbdev"
+ use fbcon && use video_cards_s3virge && myconf+=" --enable-s3fb"
+ use libcaca || myconf+=" --disable-caca"
+ use zoran || myconf+=" --disable-zr"
+
+ if ! use kernel_linux || ! use video_cards_mga; then
+ myconf+=" --disable-mga --disable-xmga"
+ fi
+
+ if use video_cards_tdfx; then
+ myconf+="
+ $(use_enable video_cards_tdfx tdfxvid)
+ $(use_enable fbcon tdfxfb)
+ "
+ else
+ myconf+="
+ --disable-3dfx
+ --disable-tdfxvid
+ --disable-tdfxfb
+ "
+ fi
+
+ # sun card, disable by default, see bug #258729
+ myconf+=" --disable-xvr100"
+
+ ################
+ # Audio Output #
+ ################
+ myconf+=" --disable-esd"
+ uses="alsa jack ladspa nas openal"
+ for i in ${uses}; do
+ use ${i} || myconf+=" --disable-${i}"
+ done
+ use pulseaudio || myconf+=" --disable-pulse"
+ if ! use radio; then
+ use oss || myconf+=" --disable-ossaudio"
+ fi
+
+ ####################
+ # Advanced Options #
+ ####################
+ # Platform specific flags, hardcoded on amd64 (see below)
+ use cpudetection && myconf+=" --enable-runtime-cpudetection"
+
+ uses="3dnow 3dnowext mmx mmxext sse sse2 ssse3"
+ for i in ${uses}; do
+ myconf+=" $(use_enable cpu_flags_x86_${i} ${i})"
+ done
+
+ uses="altivec shm"
+ for i in ${uses}; do
+ myconf+=" $(use_enable ${i})"
+ done
+
+ use debug && myconf+=" --enable-debug=3"
+
+ if use x86 && gcc-specs-pie; then
+ filter-flags -fPIC -fPIE
+ append-ldflags -nopie
+ fi
+
+ ###########################
+ # X enabled configuration #
+ ###########################
+ myconf+=" --disable-gui"
+ myconf+=" --disable-vesa"
+ uses="ggi vdpau xinerama xv"
+ for i in ${uses}; do
+ use ${i} || myconf+=" --disable-${i}"
+ done
+ use dga || myconf+=" --disable-dga1 --disable-dga2"
+ use opengl || myconf+=" --disable-gl"
+ use osdmenu && myconf+=" --enable-menu"
+ use vidix || myconf+=" --disable-vidix --disable-vidix-pcidb"
+ use xscreensaver || myconf+=" --disable-xss"
+ use X || myconf+=" --disable-x11"
+ if use xvmc; then
+ myconf+=" --enable-xvmc --with-xvmclib=XvMCW"
+ else
+ myconf+=" --disable-xvmc"
+ fi
+
+ ############################
+ # OSX (aqua) configuration #
+ ############################
+ if use aqua; then
+ myconf+="
+ --enable-macosx-finder
+ --enable-macosx-bundle
+ "
+ fi
+
+ ./configure \
+ --cc="$(tc-getCC)" \
+ --host-cc="$(tc-getBUILD_CC)" \
+ --prefix="${EPREFIX}/usr" \
+ --bindir="${EPREFIX}/usr/bin" \
+ --libdir="${EPREFIX}/usr/$(get_libdir)" \
+ --confdir="${EPREFIX}/etc/mplayer" \
+ --datadir="${EPREFIX}/usr/share/mplayer${namesuf}" \
+ --mandir="${EPREFIX}/usr/share/man" \
+ --disable-ffmpeg_a \
+ ${myconf} || die
+}
+
+src_compile() {
+ base_src_compile
+ # Build only user-requested docs if they're available.
+ if use doc ; then
+ # select available languages from $LINGUAS
+ local ALLOWED_LINGUAS="cs de en es fr hu it pl ru zh_CN"
+ local BUILT_DOCS=""
+ for i in ${LINGUAS} ; do
+ has ${i} ${ALLOWED_LINGUAS} && BUILT_DOCS+=" ${i}"
+ done
+ if [[ -z $BUILT_DOCS ]]; then
+ emake -j1 html-chunked
+ else
+ for i in ${BUILT_DOCS}; do
+ emake -j1 html-chunked-${i}
+ done
+ fi
+ fi
+}
+
+src_install() {
+ local i
+
+ emake \
+ DESTDIR="${D}" \
+ INSTALLSTRIP="" \
+ install
+
+ dodoc AUTHORS Changelog Copyright README etc/codecs.conf
+
+ docinto tech/
+ dodoc DOCS/tech/{*.txt,MAINTAINERS,mpsub.sub,playtree,TODO,wishlist}
+ docinto TOOLS/
+ dodoc -r TOOLS
+ docinto tech/mirrors/
+ dodoc DOCS/tech/mirrors/*
+
+ if use doc; then
+ docinto html/
+ dohtml -r "${S}"/DOCS/HTML/*
+ fi
+
+ if ! use truetype; then
+ dodir /usr/share/mplayer/fonts
+ # Do this generic, as the mplayer people like to change the structure
+ # of their zips ...
+ for i in $(find "${WORKDIR}/" -type d -name 'font-arial-*'); do
+ cp -pPR "${i}" "${ED}/usr/share/mplayer/fonts"
+ done
+ # Fix the font symlink ...
+ rm -rf "${ED}/usr/share/mplayer/font"
+ dosym fonts/font-arial-14-iso-8859-1 /usr/share/mplayer/font
+ fi
+
+ insinto /etc/mplayer
+ newins "${S}/etc/example.conf" mplayer.conf
+ cat >> "${ED}/etc/mplayer/mplayer.conf" << _EOF_
+# Config options can be section specific, global
+# options should go in the default section
+[default]
+_EOF_
+ doins "${S}/etc/input.conf"
+ if use osdmenu; then
+ doins "${S}/etc/menu.conf"
+ fi
+
+ if use truetype; then
+ cat >> "${ED}/etc/mplayer/mplayer.conf" << _EOF_
+fontconfig=1
+subfont-osd-scale=4
+subfont-text-scale=3
+_EOF_
+ fi
+
+ # bug 256203
+ if use rar; then
+ cat >> "${ED}/etc/mplayer/mplayer.conf" << _EOF_
+unrarexec=${EPREFIX}/usr/bin/unrar
+_EOF_
+ fi
+
+ dosym ../../../etc/mplayer/mplayer.conf /usr/share/mplayer/mplayer.conf
+ newbin "${S}/TOOLS/midentify.sh" midentify
+}
+
+pkg_preinst() {
+ [[ -d ${EROOT}/usr/share/mplayer/Skin/default ]] && \
+ rm -rf "${EROOT}/usr/share/mplayer/Skin/default"
+}
+
+pkg_postrm() {
+ # Cleanup stale symlinks
+ [ -L "${EROOT}/usr/share/mplayer/font" -a \
+ ! -e "${EROOT}/usr/share/mplayer/font" ] && \
+ rm -f "${EROOT}/usr/share/mplayer/font"
+
+ [ -L "${EROOT}/usr/share/mplayer/subfont.ttf" -a \
+ ! -e "${EROOT}/usr/share/mplayer/subfont.ttf" ] && \
+ rm -f "${EROOT}/usr/share/mplayer/subfont.ttf"
+}
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/mplayer/files/, media-video/mplayer/
@ 2017-10-23 12:13 Alexis Ballier
0 siblings, 0 replies; 10+ messages in thread
From: Alexis Ballier @ 2017-10-23 12:13 UTC (permalink / raw
To: gentoo-commits
commit: 549f9b5f320c3e0032551e0da821d1151ea764df
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 23 12:13:40 2017 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Mon Oct 23 12:13:45 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=549f9b5f
media-video/mplayer: backport upstream patch fixing vdpau build with latest ffmpeg, bug #625650
Package-Manager: Portage-2.3.12, Repoman-2.3.3
media-video/mplayer/files/mplayer-1.3-vdpau-x11.patch | 19 +++++++++++++++++++
media-video/mplayer/mplayer-1.3.0-r3.ebuild | 2 ++
2 files changed, 21 insertions(+)
diff --git a/media-video/mplayer/files/mplayer-1.3-vdpau-x11.patch b/media-video/mplayer/files/mplayer-1.3-vdpau-x11.patch
new file mode 100644
index 00000000000..ae21941a8aa
--- /dev/null
+++ b/media-video/mplayer/files/mplayer-1.3-vdpau-x11.patch
@@ -0,0 +1,19 @@
+r37932 | al | 2017-04-20 01:06:04 +0200 (Thu, 20 Apr 2017) | 6 lines
+
+vo_vdpau: Explicitly include header vdpau_x11.h
+
+The include from inside libavcodec/vdpau.h was removed in FFmpeg
+commit d40e181bec22014a9ea312ab6837f7f0bc4f9e42 .
+
+Index: libvo/vo_vdpau.c
+===================================================================
+--- libvo/vo_vdpau.c (revision 37931)
++++ libvo/vo_vdpau.c (revision 37932)
+@@ -34,6 +34,7 @@
+
+ #include <stdio.h>
+ #include <strings.h>
++#include <vdpau/vdpau_x11.h>
+
+ #include "config.h"
+ #include "sub/ass_mp.h"
diff --git a/media-video/mplayer/mplayer-1.3.0-r3.ebuild b/media-video/mplayer/mplayer-1.3.0-r3.ebuild
index d1900e1ba1d..9283124a63f 100644
--- a/media-video/mplayer/mplayer-1.3.0-r3.ebuild
+++ b/media-video/mplayer/mplayer-1.3.0-r3.ebuild
@@ -185,6 +185,8 @@ REQUIRED_USE="
xvmc? ( xv )"
RESTRICT="faac? ( bindist )"
+PATCHES=( "${FILESDIR}/${PN}-1.3-vdpau-x11.patch" )
+
pkg_setup() {
if [[ ${PV} == *9999* ]]; then
elog
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/mplayer/files/, media-video/mplayer/
@ 2018-05-09 5:55 Lars Wendler
0 siblings, 0 replies; 10+ messages in thread
From: Lars Wendler @ 2018-05-09 5:55 UTC (permalink / raw
To: gentoo-commits
commit: fbe832b17dfaac3584e5623b61de68b37d4948f0
Author: Georgy Yakovlev <ya <AT> sysdump <DOT> net>
AuthorDate: Tue May 8 14:25:46 2018 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Wed May 9 05:54:49 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fbe832b1
media-video/mplayer: Use pkg-config to find freetype
Bug: https://bugs.gentoo.org/655240
Package-Manager: Portage-2.3.36, Repoman-2.3.9
Closes: https://github.com/gentoo/gentoo/pull/8313
.../mplayer/files/mplayer-1.3.0-freetype_pkgconfig.patch | 14 ++++++++++++++
media-video/mplayer/mplayer-1.3.0-r3.ebuild | 1 +
media-video/mplayer/mplayer-1.3.0-r5.ebuild | 1 +
3 files changed, 16 insertions(+)
diff --git a/media-video/mplayer/files/mplayer-1.3.0-freetype_pkgconfig.patch b/media-video/mplayer/files/mplayer-1.3.0-freetype_pkgconfig.patch
new file mode 100644
index 00000000000..4bd67ca185a
--- /dev/null
+++ b/media-video/mplayer/files/mplayer-1.3.0-freetype_pkgconfig.patch
@@ -0,0 +1,14 @@
+Index: configure
+===================================================================
+--- a/configure (revision 38020)
++++ b/configure (revision 38021)
+@@ -839,7 +839,8 @@
+ _macosx_finder=no
+ _macosx_bundle=auto
+ _sortsub=yes
+-_freetypeconfig='freetype-config'
++_freetypeconfig='pkg-config freetype2'
++type freetype-config >/dev/null 2>&1 && _freetypeconfig=freetype-config
+ _fribidi=auto
+ _enca=auto
+ _inet6=auto
diff --git a/media-video/mplayer/mplayer-1.3.0-r3.ebuild b/media-video/mplayer/mplayer-1.3.0-r3.ebuild
index c52e83c38b3..c48e3a8e79d 100644
--- a/media-video/mplayer/mplayer-1.3.0-r3.ebuild
+++ b/media-video/mplayer/mplayer-1.3.0-r3.ebuild
@@ -242,6 +242,7 @@ src_prepare() {
subversion_wc_info
printf "${ESVN_WC_REVISION}" > $svf
else
+ epatch "${FILESDIR}"/${PN}-1.3.0-freetype_pkgconfig.patch #655240
epatch "${FILESDIR}"/${PN}-1.3-CVE-2016-4352.patch
fi
if [ ! -f VERSION ] ; then
diff --git a/media-video/mplayer/mplayer-1.3.0-r5.ebuild b/media-video/mplayer/mplayer-1.3.0-r5.ebuild
index 1e14de1f1ea..6b515f5212d 100644
--- a/media-video/mplayer/mplayer-1.3.0-r5.ebuild
+++ b/media-video/mplayer/mplayer-1.3.0-r5.ebuild
@@ -243,6 +243,7 @@ src_prepare() {
subversion_wc_info
printf "${ESVN_WC_REVISION}" > $svf
else
+ eapply "${FILESDIR}"/${PN}-1.3.0-freetype_pkgconfig.patch #655240
eapply "${FILESDIR}"/${PN}-1.3-CVE-2016-4352.patch
has_version '>media-video/ffmpeg-3.5' && eapply "${FILESDIR}"/${PN}-1.3-ffmpeg4.patch
fi
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/mplayer/files/, media-video/mplayer/
@ 2018-11-06 11:20 Alexis Ballier
0 siblings, 0 replies; 10+ messages in thread
From: Alexis Ballier @ 2018-11-06 11:20 UTC (permalink / raw
To: gentoo-commits
commit: dd8a1b7a0928465e051bf18cd139efc16259e9b5
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 6 11:20:15 2018 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Tue Nov 6 11:20:34 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd8a1b7a
media-video/mplayer: backport upstream fix for ffmpeg4 + mencoder.
No revbump as ffmpeg4 is masked.
Closes: https://bugs.gentoo.org/658128
Package-Manager: Portage-2.3.51, Repoman-2.3.12
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org>
.../files/mplayer-1.3-ffmpeg4+mencoder.patch | 360 +++++++++++++++++++++
media-video/mplayer/mplayer-1.3.0-r5.ebuild | 2 +-
2 files changed, 361 insertions(+), 1 deletion(-)
diff --git a/media-video/mplayer/files/mplayer-1.3-ffmpeg4+mencoder.patch b/media-video/mplayer/files/mplayer-1.3-ffmpeg4+mencoder.patch
new file mode 100644
index 00000000000..f312203027a
--- /dev/null
+++ b/media-video/mplayer/files/mplayer-1.3-ffmpeg4+mencoder.patch
@@ -0,0 +1,360 @@
+r38001 | al | 2017-10-31 23:33:45 +0100 (Tue, 31 Oct 2017) | 37 lines
+
+ve_lavc,ae_lavc: Adjust to work with newest FFmpeg again
+
+This commit re-enables previously disabled lavc encoders.
+
+The lavc audio encoder had no problems by itself after
+my last commit, but could not stay enabled because of
+the coupling of the lavcopts option.
+
+Here follows a list of changes done to ve lavc
+
+* Explicitly use 16 as upper limit for vmax_b_frames
+
+ The FF_MAX_B_FRAMES #define was removed from FFmpeg's API.
+
+ It was removed because there is no global limit to the number of
+ b frames. While this is the most conservative change to address
+ the removal of the #define, it may not be optimal because we do
+ not allow for more than 16 b frames.
+
+* Options that now need to be passed to the encoder as AVOption
+ - lmin & lmax
+ - vrc_strategy
+ - vqsquish
+ - vqmod_amp & vqmod_freq
+ - vrc_eq
+ - vrc_buf_aggressivity
+ - vrc_init_cplx
+ - ibias & pbias
+ - border_mask
+ - naq
+ - gmc
+ - vme
+
+* Options that were dropped because they had no effect anymore
+ - sc_factor
+
+
+Index: MPlayer-1.3.0/Makefile
+===================================================================
+--- MPlayer-1.3.0.orig/Makefile
++++ MPlayer-1.3.0/Makefile
+@@ -615,7 +615,9 @@ SRCS_MPLAYER = command.c
+
+ #MEncoder
+ SRCS_MENCODER-$(FAAC) += libmpcodecs/ae_faac.c
+-SRCS_MENCODER-$(FFMPEG) += libmpdemux/muxer_lavf.c
++SRCS_MENCODER-$(FFMPEG) += libmpcodecs/ae_lavc.c \
++ libmpcodecs/ve_lavc.c \
++ libmpdemux/muxer_lavf.c
+ SRCS_MENCODER-$(LIBDV) += libmpcodecs/ve_libdv.c
+ SRCS_MENCODER-$(LIBLZO) += libmpcodecs/ve_nuv.c \
+ libmpcodecs/native/rtjpegn.c
+Index: MPlayer-1.3.0/cfg-mencoder.h
+===================================================================
+--- MPlayer-1.3.0.orig/cfg-mencoder.h
++++ MPlayer-1.3.0/cfg-mencoder.h
+@@ -52,7 +52,7 @@ const m_option_t ovc_conf[]={
+ " nuv - nuppel video\n"
+ #endif
+ #ifdef CONFIG_FFMPEG
+-// " lavc - libavcodec codecs - best quality!\n"//TODO: ve_lavc is deactivated because it doesn't build after latest FFmpeg major bumps
++ " lavc - libavcodec codecs - best quality!\n"
+ #endif
+ #ifdef CONFIG_WIN32DLL
+ " vfw - VfW DLLs, read DOCS/HTML/en/encoding-guide.html.\n"
+@@ -106,7 +106,7 @@ const m_option_t oac_conf[]={
+ " mp3lame - cbr/abr/vbr MP3 using libmp3lame\n"
+ #endif
+ #ifdef CONFIG_FFMPEG
+-// " lavc - FFmpeg audio encoder (MP2, AC3, ...)\n"//TODO: ae_lavc was deactivated because it depends on ve_lavc which does not compile after latest FFmpeg major bumps
++ " lavc - FFmpeg audio encoder (MP2, AC3, ...)\n"
+ #endif
+ #ifdef CONFIG_TOOLAME
+ " toolame - Toolame MP2 audio encoder\n"
+@@ -226,7 +226,7 @@ const m_option_t mencoder_opts[]={
+ {"lameopts", lameopts_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL},
+ #endif
+ #ifdef CONFIG_FFMPEG
+- //{"lavcopts", lavcopts_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL}, //TODO: ve_lavc doesn't build after latest FFmpeg major bumps
++ {"lavcopts", lavcopts_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL},
+ #else
+ {"lavcopts", "MPlayer was compiled without libavcodec. See README or DOCS.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
+ #endif /* CONFIG_FFMPEG */
+Index: MPlayer-1.3.0/libmpcodecs/ve.c
+===================================================================
+--- MPlayer-1.3.0.orig/libmpcodecs/ve.c
++++ MPlayer-1.3.0/libmpcodecs/ve.c
+@@ -43,7 +43,7 @@ extern const vf_info_t ve_info_x264;
+
+ static const vf_info_t * const encoder_list[] = {
+ #ifdef CONFIG_FFMPEG
+-// &ve_info_lavc,//TODO: ve_lavc is deactivated because it doesn't build after latest FFmpeg major bumps
++ &ve_info_lavc,
+ #endif
+ #ifdef CONFIG_WIN32DLL
+ &ve_info_vfw,
+Index: MPlayer-1.3.0/libmpcodecs/ae.c
+===================================================================
+--- MPlayer-1.3.0.orig/libmpcodecs/ae.c
++++ MPlayer-1.3.0/libmpcodecs/ae.c
+@@ -59,7 +59,9 @@ audio_encoder_t *new_audio_encoder(muxer
+ break;
+ #endif
+ #ifdef CONFIG_FFMPEG
+- //TODO: ACODEC_LAVC <-- has been removed here because it depends on ve_lavc which does not compile after latest FFmpeg major bumps
++ case ACODEC_LAVC:
++ ris = mpae_init_lavc(encoder);
++ break;
+ #endif
+ #ifdef CONFIG_MP3LAME
+ case ACODEC_VBRMP3:
+Index: MPlayer-1.3.0/libmpcodecs/ve_lavc.c
+===================================================================
+--- MPlayer-1.3.0.orig/libmpcodecs/ve_lavc.c
++++ MPlayer-1.3.0/libmpcodecs/ve_lavc.c
+@@ -63,12 +63,9 @@ static int lavc_param_vbitrate = -1;
+ static int lavc_param_vrate_tolerance = 1000*8;
+ static int lavc_param_mb_decision = 0; /* default is realtime encoding */
+ static int lavc_param_v4mv = 0;
+-static int lavc_param_vme = 4;
+ static float lavc_param_vqscale = -1;
+ static int lavc_param_vqmin = 2;
+ static int lavc_param_vqmax = 31;
+-static float lavc_param_lmin = 2;
+-static float lavc_param_lmax = 31;
+ static float lavc_param_mb_lmin = 2;
+ static float lavc_param_mb_lmax = 31;
+ static int lavc_param_vqdiff = 3;
+@@ -81,22 +78,15 @@ static float lavc_param_vi_qoffset = 0.0
+ static int lavc_param_vmax_b_frames = 0;
+ static int lavc_param_keyint = -1;
+ static int lavc_param_vpass = 0;
+-static int lavc_param_vrc_strategy = 0;
+ static int lavc_param_vb_strategy = 0;
+ static int lavc_param_packet_size= 0;
+ static int lavc_param_strict= -1;
+ static int lavc_param_data_partitioning= 0;
+ static int lavc_param_gray=0;
+-static float lavc_param_rc_qsquish=1.0;
+-static float lavc_param_rc_qmod_amp=0;
+-static int lavc_param_rc_qmod_freq=0;
+ static char *lavc_param_rc_override_string=NULL;
+-static char *lavc_param_rc_eq="tex^qComp";
+ static int lavc_param_rc_buffer_size=0;
+-static float lavc_param_rc_buffer_aggressivity=1.0;
+ static int lavc_param_rc_max_rate=0;
+ static int lavc_param_rc_min_rate=0;
+-static float lavc_param_rc_initial_cplx=0;
+ static float lavc_param_rc_initial_buffer_occupancy=0.9;
+ static int lavc_param_mpeg_quant=0;
+ static int lavc_param_fdct=0;
+@@ -108,8 +98,6 @@ static float lavc_param_dark_masking= 0.
+ static float lavc_param_temporal_cplx_masking= 0.0;
+ static float lavc_param_spatial_cplx_masking= 0.0;
+ static float lavc_param_p_masking= 0.0;
+-static float lavc_param_border_masking= 0.0;
+-static int lavc_param_normalize_aqp= 0;
+ static int lavc_param_interlaced_dct= 0;
+ static int lavc_param_prediction_method= FF_PRED_LEFT;
+ static int lavc_param_format= IMGFMT_YV12;
+@@ -131,15 +119,12 @@ static int lavc_param_bit_exact = 0;
+ static int lavc_param_aic= 0;
+ static int lavc_param_aiv= 0;
+ static int lavc_param_umv= 0;
+-static int lavc_param_gmc= 0;
+ static int lavc_param_obmc= 0;
+ static int lavc_param_loop= 0;
+ static int lavc_param_last_pred= 0;
+ static int lavc_param_pre_me= 1;
+ static int lavc_param_me_subpel_quality= 8;
+ static int lavc_param_me_range= 0;
+-static int lavc_param_ibias= FF_DEFAULT_QUANT_BIAS;
+-static int lavc_param_pbias= FF_DEFAULT_QUANT_BIAS;
+ static int lavc_param_coder= 0;
+ static int lavc_param_context= 0;
+ static char *lavc_param_intra_matrix = NULL;
+@@ -162,7 +147,6 @@ static int lavc_param_skip_exp=0;
+ static int lavc_param_skip_cmp=0;
+ static int lavc_param_brd_scale = 0;
+ static int lavc_param_bidir_refine = 0;
+-static int lavc_param_sc_factor = 1;
+ static int lavc_param_video_global_header= 0;
+ static int lavc_param_mv0_threshold = 256;
+ static int lavc_param_refs = 1;
+@@ -190,21 +174,21 @@ const m_option_t lavcopts_conf[]={
+ {"vhq", &lavc_param_mb_decision, CONF_TYPE_FLAG, 0, 0, 1, NULL},
+ {"mbd", &lavc_param_mb_decision, CONF_TYPE_INT, CONF_RANGE, 0, 9, NULL},
+ {"v4mv", &lavc_param_v4mv, CONF_TYPE_FLAG, 0, 0, 1, NULL},
+- {"vme", &lavc_param_vme, CONF_TYPE_INT, CONF_RANGE, 0, 8, NULL},
++ {"vme", "vme has no effect, please use the corresponding codec specific option (see FFmpeg documentation) instead of vme.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL},
+ {"vqscale", &lavc_param_vqscale, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 255.0, NULL},
+ {"vqmin", &lavc_param_vqmin, CONF_TYPE_INT, CONF_RANGE, 1, 31, NULL},
+ {"vqmax", &lavc_param_vqmax, CONF_TYPE_INT, CONF_RANGE, 1, 31, NULL},
+- {"lmin", &lavc_param_lmin, CONF_TYPE_FLOAT, CONF_RANGE, 0.01, 255.0, NULL},
+- {"lmax", &lavc_param_lmax, CONF_TYPE_FLOAT, CONF_RANGE, 0.01, 255.0, NULL},
++ {"lmin", "Please use o=lmin=<value>*QP2LAMBDA instead of lmin.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL},
++ {"lmax", "Please use o=lmax=<value>*QP2LAMBDA instead of lmax.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL},
+ {"mblmin", &lavc_param_mb_lmin, CONF_TYPE_FLOAT, CONF_RANGE, 0.01, 255.0, NULL},
+ {"mblmax", &lavc_param_mb_lmax, CONF_TYPE_FLOAT, CONF_RANGE, 0.01, 255.0, NULL},
+ {"vqdiff", &lavc_param_vqdiff, CONF_TYPE_INT, CONF_RANGE, 1, 31, NULL},
+ {"vqcomp", &lavc_param_vqcompress, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 1.0, NULL},
+ {"vqblur", &lavc_param_vqblur, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 1.0, NULL},
+ {"vb_qfactor", &lavc_param_vb_qfactor, CONF_TYPE_FLOAT, CONF_RANGE, -31.0, 31.0, NULL},
+- {"vmax_b_frames", &lavc_param_vmax_b_frames, CONF_TYPE_INT, CONF_RANGE, 0, FF_MAX_B_FRAMES, NULL},
++ {"vmax_b_frames", &lavc_param_vmax_b_frames, CONF_TYPE_INT, CONF_RANGE, 0, 16, NULL}, // FF_MAX_B_FRAMES was removed from FFmpeg. We still use its value here, so we probably limit ourselves in some cases.
+ {"vpass", &lavc_param_vpass, CONF_TYPE_INT, CONF_RANGE, 0, 3, NULL},
+- {"vrc_strategy", &lavc_param_vrc_strategy, CONF_TYPE_INT, CONF_RANGE, 0, 2, NULL},
++ {"vrc_strategy", "Please use o=rc_strategy=<value> instead of vrc_strategy.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL},
+ {"vb_strategy", &lavc_param_vb_strategy, CONF_TYPE_INT, CONF_RANGE, 0, 10, NULL},
+ {"vb_qoffset", &lavc_param_vb_qoffset, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 31.0, NULL},
+ {"vlelim", "Please use o=luma_elim_threshold=<value> instead of vlelim.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL},
+@@ -217,16 +201,16 @@ const m_option_t lavcopts_conf[]={
+ {"mpeg_quant", &lavc_param_mpeg_quant, CONF_TYPE_FLAG, 0, 0, 1, NULL},
+ {"vi_qfactor", &lavc_param_vi_qfactor, CONF_TYPE_FLOAT, CONF_RANGE, -31.0, 31.0, NULL},
+ {"vi_qoffset", &lavc_param_vi_qoffset, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 31.0, NULL},
+- {"vqsquish", &lavc_param_rc_qsquish, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 99.0, NULL},
+- {"vqmod_amp", &lavc_param_rc_qmod_amp, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 99.0, NULL},
+- {"vqmod_freq", &lavc_param_rc_qmod_freq, CONF_TYPE_INT, 0, 0, 0, NULL},
+- {"vrc_eq", &lavc_param_rc_eq, CONF_TYPE_STRING, 0, 0, 0, NULL},
++ {"vqsquish", "Please use o=qsquish=<value> instead of vqsquish.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL},
++ {"vqmod_amp", "Please use o=rc_qmod_amp=<value> instead of vqmod_amp.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL},
++ {"vqmod_freq", "Please use o=rc_qmod_freq=<value> instead of vqmod_freq.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL},
++ {"vrc_eq", "Please use o=rc_eq=<value> instead of vrc_eq.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL},
+ {"vrc_override", &lavc_param_rc_override_string, CONF_TYPE_STRING, 0, 0, 0, NULL},
+ {"vrc_maxrate", &lavc_param_rc_max_rate, CONF_TYPE_INT, CONF_RANGE, 0, MAX_BITRATE, NULL},
+ {"vrc_minrate", &lavc_param_rc_min_rate, CONF_TYPE_INT, CONF_RANGE, 0, MAX_BITRATE, NULL},
+ {"vrc_buf_size", &lavc_param_rc_buffer_size, CONF_TYPE_INT, CONF_RANGE, 4, MAX_BITRATE, NULL},
+- {"vrc_buf_aggressivity", &lavc_param_rc_buffer_aggressivity, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 99.0, NULL},
+- {"vrc_init_cplx", &lavc_param_rc_initial_cplx, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 9999999.0, NULL},
++ {"vrc_buf_aggressivity", "Please use o=rc_buf_aggressivity=<value> instead of vrc_buf_aggressivity.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL},
++ {"vrc_init_cplx", "Please use o=rc_init_cplx=<value> instead of vrc_init_cplx.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL},
+ {"vrc_init_occupancy", &lavc_param_rc_initial_buffer_occupancy, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 1.0, NULL},
+ {"vfdct", &lavc_param_fdct, CONF_TYPE_INT, CONF_RANGE, 0, 10, NULL},
+ {"aspect", &lavc_param_aspect, CONF_TYPE_STRING, 0, 0, 0, NULL},
+@@ -235,7 +219,7 @@ const m_option_t lavcopts_conf[]={
+ {"tcplx_mask", &lavc_param_temporal_cplx_masking, CONF_TYPE_FLOAT, CONF_RANGE, -1.0, 1.0, NULL},
+ {"scplx_mask", &lavc_param_spatial_cplx_masking, CONF_TYPE_FLOAT, CONF_RANGE, -1.0, 1.0, NULL},
+ {"p_mask", &lavc_param_p_masking, CONF_TYPE_FLOAT, CONF_RANGE, -1.0, 1.0, NULL},
+- {"naq", &lavc_param_normalize_aqp, CONF_TYPE_FLAG, 0, 0, 1, NULL},
++ {"naq", "Please use o=mpv_flags=+naq instead of naq.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL},
+ {"dark_mask", &lavc_param_dark_masking, CONF_TYPE_FLOAT, CONF_RANGE, -1.0, 1.0, NULL},
+ {"ildct", &lavc_param_interlaced_dct, CONF_TYPE_FLAG, 0, 0, 1, NULL},
+ {"idct", &lavc_param_idct, CONF_TYPE_INT, CONF_RANGE, 0, 20, NULL},
+@@ -266,8 +250,8 @@ const m_option_t lavcopts_conf[]={
+ {"aiv", &lavc_param_aiv, CONF_TYPE_FLAG, 0, 0, 1, NULL},
+ {"obmc", &lavc_param_obmc, CONF_TYPE_FLAG, 0, 0, 1, NULL},
+ {"loop", &lavc_param_loop, CONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_LOOP_FILTER, NULL},
+- {"ibias", &lavc_param_ibias, CONF_TYPE_INT, CONF_RANGE, -512, 512, NULL},
+- {"pbias", &lavc_param_pbias, CONF_TYPE_INT, CONF_RANGE, -512, 512, NULL},
++ {"ibias", "Please use o=ibias=<value> instead of ibias.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL},
++ {"pbias", "Please use o=pbias=<value> instead of pbias.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL},
+ {"coder", &lavc_param_coder, CONF_TYPE_INT, CONF_RANGE, 0, 10, NULL},
+ {"context", &lavc_param_context, CONF_TYPE_INT, CONF_RANGE, 0, 10, NULL},
+ {"intra_matrix", &lavc_param_intra_matrix, CONF_TYPE_STRING, 0, 0, 0, NULL},
+@@ -280,9 +264,9 @@ const m_option_t lavcopts_conf[]={
+ {"alt", &lavc_param_alt, CONF_TYPE_FLAG, 0, 0, 1, NULL},
+ {"ilme", &lavc_param_ilme, CONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_INTERLACED_ME, NULL},
+ {"cgop", &lavc_param_closed_gop, CONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_CLOSED_GOP, NULL},
+- {"gmc", &lavc_param_gmc, CONF_TYPE_FLAG, 0, 0, CODEC_FLAG_GMC, NULL},
++ {"gmc", "Please use o=gmc=<value> instead of gmc.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL},
+ {"dc", &lavc_param_dc_precision, CONF_TYPE_INT, CONF_RANGE, 8, 11, NULL},
+- {"border_mask", &lavc_param_border_masking, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 1.0, NULL},
++ {"border_mask", "Please use o=border_mask=<value> instead of border_mask.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL},
+ {"inter_threshold", "inter_threshold has no effect, please remove it.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL},
+ {"sc_threshold", &lavc_param_sc_threshold, CONF_TYPE_INT, CONF_RANGE, -1000000000, 1000000000, NULL},
+ {"top", &lavc_param_top, CONF_TYPE_INT, CONF_RANGE, -1, 1, NULL},
+@@ -295,7 +279,7 @@ const m_option_t lavcopts_conf[]={
+ {"skip_exp", &lavc_param_skip_exp, CONF_TYPE_INT, CONF_RANGE, 0, 1000000, NULL},
+ {"brd_scale", &lavc_param_brd_scale, CONF_TYPE_INT, CONF_RANGE, 0, 10, NULL},
+ {"bidir_refine", &lavc_param_bidir_refine, CONF_TYPE_INT, CONF_RANGE, 0, 4, NULL},
+- {"sc_factor", &lavc_param_sc_factor, CONF_TYPE_INT, CONF_RANGE, 1, INT_MAX, NULL},
++ {"sc_factor", "sc_factor has no effect, please remove it.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL},
+ {"vglobal", &lavc_param_video_global_header, CONF_TYPE_INT, CONF_RANGE, 0, INT_MAX, NULL},
+ {"aglobal", &lavc_param_audio_global_header, CONF_TYPE_INT, CONF_RANGE, 0, INT_MAX, NULL},
+ {"mv0_threshold", &lavc_param_mv0_threshold, CONF_TYPE_INT, CONF_RANGE, 0, INT_MAX, NULL},
+@@ -351,8 +335,6 @@ static int config(struct vf_instance *vf
+ lavc_venc_context->time_base= (AVRational){mux_v->h.dwScale, mux_v->h.dwRate};
+ lavc_venc_context->qmin= lavc_param_vqmin;
+ lavc_venc_context->qmax= lavc_param_vqmax;
+- lavc_venc_context->lmin= (int)(FF_QP2LAMBDA * lavc_param_lmin + 0.5);
+- lavc_venc_context->lmax= (int)(FF_QP2LAMBDA * lavc_param_lmax + 0.5);
+ lavc_venc_context->mb_lmin= (int)(FF_QP2LAMBDA * lavc_param_mb_lmin + 0.5);
+ lavc_venc_context->mb_lmax= (int)(FF_QP2LAMBDA * lavc_param_mb_lmax + 0.5);
+ lavc_venc_context->max_qdiff= lavc_param_vqdiff;
+@@ -360,17 +342,12 @@ static int config(struct vf_instance *vf
+ lavc_venc_context->qblur= lavc_param_vqblur;
+ lavc_venc_context->max_b_frames= lavc_param_vmax_b_frames;
+ lavc_venc_context->b_quant_factor= lavc_param_vb_qfactor;
+- lavc_venc_context->rc_strategy= lavc_param_vrc_strategy;
+ lavc_venc_context->b_frame_strategy= lavc_param_vb_strategy;
+ lavc_venc_context->b_quant_offset= (int)(FF_QP2LAMBDA * lavc_param_vb_qoffset + 0.5);
+ lavc_venc_context->rtp_payload_size= lavc_param_packet_size;
+ lavc_venc_context->strict_std_compliance= lavc_param_strict;
+ lavc_venc_context->i_quant_factor= lavc_param_vi_qfactor;
+ lavc_venc_context->i_quant_offset= (int)(FF_QP2LAMBDA * lavc_param_vi_qoffset + 0.5);
+- lavc_venc_context->rc_qsquish= lavc_param_rc_qsquish;
+- lavc_venc_context->rc_qmod_amp= lavc_param_rc_qmod_amp;
+- lavc_venc_context->rc_qmod_freq= lavc_param_rc_qmod_freq;
+- lavc_venc_context->rc_eq= lavc_param_rc_eq;
+
+ mux_v->max_rate=
+ lavc_venc_context->rc_max_rate= lavc_param_rc_max_rate*1000;
+@@ -382,8 +359,6 @@ static int config(struct vf_instance *vf
+ lavc_venc_context->rc_initial_buffer_occupancy=
+ lavc_venc_context->rc_buffer_size *
+ lavc_param_rc_initial_buffer_occupancy;
+- lavc_venc_context->rc_buffer_aggressivity= lavc_param_rc_buffer_aggressivity;
+- lavc_venc_context->rc_initial_cplx= lavc_param_rc_initial_cplx;
+ lavc_venc_context->debug= lavc_param_debug;
+ lavc_venc_context->last_predictor_count= lavc_param_last_pred;
+ lavc_venc_context->pre_me= lavc_param_pre_me;
+@@ -391,8 +366,6 @@ static int config(struct vf_instance *vf
+ lavc_venc_context->pre_dia_size= lavc_param_pre_dia_size;
+ lavc_venc_context->me_subpel_quality= lavc_param_me_subpel_quality;
+ lavc_venc_context->me_range= lavc_param_me_range;
+- lavc_venc_context->intra_quant_bias= lavc_param_ibias;
+- lavc_venc_context->inter_quant_bias= lavc_param_pbias;
+ lavc_venc_context->coder_type= lavc_param_coder;
+ lavc_venc_context->context_model= lavc_param_context;
+ lavc_venc_context->scenechange_threshold= lavc_param_sc_threshold;
+@@ -479,7 +452,6 @@ static int config(struct vf_instance *vf
+ lavc_venc_context->spatial_cplx_masking= lavc_param_spatial_cplx_masking;
+ lavc_venc_context->p_masking= lavc_param_p_masking;
+ lavc_venc_context->dark_masking= lavc_param_dark_masking;
+- lavc_venc_context->border_masking = lavc_param_border_masking;
+
+ if (lavc_param_aspect != NULL)
+ {
+@@ -552,20 +524,17 @@ static int config(struct vf_instance *vf
+ if (lavc_param_alt)
+ av_dict_set(&opts, "alternate_scan", "1", 0);
+ lavc_venc_context->flags|= lavc_param_ilme;
+- lavc_venc_context->flags|= lavc_param_gmc;
+ #ifdef AV_CODEC_FLAG_CLOSED_GOP
+ lavc_venc_context->flags|= lavc_param_closed_gop;
+ #endif
+ lavc_venc_context->flags|= lavc_param_gray;
+
+- if(lavc_param_normalize_aqp) lavc_venc_context->flags|= CODEC_FLAG_NORMALIZE_AQP;
+ if(lavc_param_interlaced_dct) lavc_venc_context->flags|= AV_CODEC_FLAG_INTERLACED_DCT;
+ lavc_venc_context->flags|= lavc_param_psnr;
+ lavc_venc_context->intra_dc_precision = lavc_param_dc_precision - 8;
+ lavc_venc_context->prediction_method= lavc_param_prediction_method;
+ lavc_venc_context->brd_scale = lavc_param_brd_scale;
+ lavc_venc_context->bidir_refine = lavc_param_bidir_refine;
+- lavc_venc_context->scenechange_factor = lavc_param_sc_factor;
+ if((lavc_param_video_global_header&1)
+ /*|| (video_global_header==0 && (oc->oformat->flags & AVFMT_GLOBALHEADER))*/){
+ lavc_venc_context->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
+@@ -648,8 +617,6 @@ static int config(struct vf_instance *vf
+ }
+ }
+
+- lavc_venc_context->me_method = ME_ZERO+lavc_param_vme;
+-
+ /* fixed qscale :p */
+ if (lavc_param_vqscale >= 0.0)
+ {
diff --git a/media-video/mplayer/mplayer-1.3.0-r5.ebuild b/media-video/mplayer/mplayer-1.3.0-r5.ebuild
index 23d607fa3d2..b5a27b3c40e 100644
--- a/media-video/mplayer/mplayer-1.3.0-r5.ebuild
+++ b/media-video/mplayer/mplayer-1.3.0-r5.ebuild
@@ -240,7 +240,7 @@ src_prepare() {
else
eapply "${FILESDIR}"/${PN}-1.3.0-freetype_pkgconfig.patch #655240
eapply "${FILESDIR}"/${PN}-1.3-CVE-2016-4352.patch
- has_version '>media-video/ffmpeg-3.5' && eapply "${FILESDIR}"/${PN}-1.3-ffmpeg4.patch
+ has_version '>media-video/ffmpeg-3.5' && eapply "${FILESDIR}"/${PN}-1.3-ffmpeg4.patch "${FILESDIR}"/${PN}-1.3-ffmpeg4+mencoder.patch
fi
if [ ! -f VERSION ] ; then
[ -f "$svf" ] || die "Missing ${svf}. Did you generate your snapshot with prepare_mplayer.sh?"
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/mplayer/files/, media-video/mplayer/
@ 2020-11-15 15:31 Joonas Niilola
0 siblings, 0 replies; 10+ messages in thread
From: Joonas Niilola @ 2020-11-15 15:31 UTC (permalink / raw
To: gentoo-commits
commit: 13dac17d3cc5f58466179b5f0a73fcfceb107c18
Author: Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 15 14:20:41 2020 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sun Nov 15 15:31:19 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13dac17d
media-video/mplayer: fix SizeViolation issue
Closes: https://bugs.gentoo.org/748198
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
media-video/mplayer/Manifest | 1 +
.../mplayer/files/mplayer-1.3-ffmpeg4.patch | 501 ---------------------
media-video/mplayer/mplayer-1.3.0-r6.ebuild | 3 +-
3 files changed, 3 insertions(+), 502 deletions(-)
diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index e33d1bde68c..522275d16bb 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -3,3 +3,4 @@ DIST MPlayer-1.4.tar.xz 15054920 BLAKE2B 4777cb31a32d62c393778c581c1913fbf355a36
DIST font-arial-cp1250.tar.bz2 249705 BLAKE2B eb4366a110d917dc975b8add168ab43b1e8a0db7342647f69f5421fc1170719015c97ffa770e89892cbb4cee8e5b2fb74a4772c8f6cbef9606ee12c3746d78c9 SHA512 4f77ff5ceb8ec6e5d9f8f34d8950a6a6276d1fd5a947772fcbdb6554988b1ea665c12b82f45164f91fb7bd08000cb4afc26fa35beb4c760464160e22b9b8c340
DIST font-arial-iso-8859-1.tar.bz2 234242 BLAKE2B 0671854e1a257d27b502affb59de681942a93990d3ac2575bbf1a6dd9eef026969f2f9ce4e9c11a68ea3d8aed48063f826a1e153f7468437a39791672c92a5d0 SHA512 a1d03b6f09c48f48b7733f3bc0402ceab239a9abf88b860d852ea9fe69b4da690208a79d6f29d30204f5b37becf10672e8e8c0bfef201846d80ec54df617d029
DIST font-arial-iso-8859-2.tar.bz2 222208 BLAKE2B 94b1a04672bf9b4b20a0e6981591e761f751bd637deddcb801855296c525bf3b5e8feb1cb11cef282c0269f2c963ded22846089076e7e6763f258b8a932af454 SHA512 5671e628303fd816f64a51ad10e2f4dd9c3dc1b34c379a2ecf489b83931db7af668aaa4e00e96a00cacd63ed98daeae6b6a4d5925edfb06fc98d3a923f70257d
+DIST mplayer-1.3-ffmpeg4.patch 25679 BLAKE2B 08f9ddb05a11c9b7ce0de7fe7bb92b492d1b35e65437c09be07cd39aa70cd9541baf442ffae1ee3060fd94d78eca30fa35808db8eebfdf679456da2c1d8217e8 SHA512 9f29fcd0bfd374fecf15a40c51e2bac53d2646d939ea13e7afffc8e9854d6d2105142f95745f0b26d8f58e19938c5ccedb191af30858fb6f3520072c98db3081
diff --git a/media-video/mplayer/files/mplayer-1.3-ffmpeg4.patch b/media-video/mplayer/files/mplayer-1.3-ffmpeg4.patch
deleted file mode 100644
index 036f9d15177..00000000000
--- a/media-video/mplayer/files/mplayer-1.3-ffmpeg4.patch
+++ /dev/null
@@ -1,501 +0,0 @@
-Index: Makefile
-===================================================================
---- a/Makefile.orig
-+++ b/Makefile
-@@ -68,7 +68,6 @@ SRCS_COMMON-$(CONFIG_VF_LAVFI) +=
-
- # These filters use private headers and do not work with shared FFmpeg.
- SRCS_COMMON-$(FFMPEG_A) += libmpcodecs/vf_fspp.c \
-- libmpcodecs/vf_mcdeint.c \
- libmpcodecs/vf_qp.c \
- libmpcodecs/vf_spp.c \
- libmpcodecs/vf_uspp.c \
-@@ -616,9 +615,7 @@ SRCS_MPLAYER = command.c
-
- #MEncoder
- SRCS_MENCODER-$(FAAC) += libmpcodecs/ae_faac.c
--SRCS_MENCODER-$(FFMPEG) += libmpcodecs/ae_lavc.c \
-- libmpcodecs/ve_lavc.c \
-- libmpdemux/muxer_lavf.c
-+SRCS_MENCODER-$(FFMPEG) += libmpdemux/muxer_lavf.c
- SRCS_MENCODER-$(LIBDV) += libmpcodecs/ve_libdv.c
- SRCS_MENCODER-$(LIBLZO) += libmpcodecs/ve_nuv.c \
- libmpcodecs/native/rtjpegn.c
-Index: cfg-mencoder.h
-===================================================================
---- a/cfg-mencoder.h.orig
-+++ b/cfg-mencoder.h
-@@ -52,7 +52,7 @@ const m_option_t ovc_conf[]={
- " nuv - nuppel video\n"
- #endif
- #ifdef CONFIG_FFMPEG
-- " lavc - libavcodec codecs - best quality!\n"
-+// " lavc - libavcodec codecs - best quality!\n"//TODO: ve_lavc is deactivated because it doesn't build after latest FFmpeg major bumps
- #endif
- #ifdef CONFIG_WIN32DLL
- " vfw - VfW DLLs, read DOCS/HTML/en/encoding-guide.html.\n"
-@@ -106,7 +106,7 @@ const m_option_t oac_conf[]={
- " mp3lame - cbr/abr/vbr MP3 using libmp3lame\n"
- #endif
- #ifdef CONFIG_FFMPEG
-- " lavc - FFmpeg audio encoder (MP2, AC3, ...)\n"
-+// " lavc - FFmpeg audio encoder (MP2, AC3, ...)\n"//TODO: ae_lavc was deactivated because it depends on ve_lavc which does not compile after latest FFmpeg major bumps
- #endif
- #ifdef CONFIG_TOOLAME
- " toolame - Toolame MP2 audio encoder\n"
-@@ -226,7 +226,7 @@ const m_option_t mencoder_opts[]={
- {"lameopts", lameopts_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL},
- #endif
- #ifdef CONFIG_FFMPEG
-- {"lavcopts", lavcopts_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL},
-+ //{"lavcopts", lavcopts_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL}, //TODO: ve_lavc doesn't build after latest FFmpeg major bumps
- #else
- {"lavcopts", "MPlayer was compiled without libavcodec. See README or DOCS.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
- #endif /* CONFIG_FFMPEG */
-Index: gui/util/bitmap.c
-===================================================================
---- a/gui/util/bitmap.c.orig
-+++ b/gui/util/bitmap.c
-@@ -95,7 +95,7 @@ static int pngRead(const char *fname, gu
- return 3;
- }
-
-- data = av_malloc(len + FF_INPUT_BUFFER_PADDING_SIZE);
-+ data = av_malloc(len + AV_INPUT_BUFFER_PADDING_SIZE);
-
- if (!data) {
- fclose(file);
-Index: libmpdemux/demuxer.c
-===================================================================
---- a/libmpdemux/demuxer.c.orig
-+++ b/libmpdemux/demuxer.c
-@@ -50,7 +50,7 @@
-
- #ifdef CONFIG_FFMPEG
- #include "libavcodec/avcodec.h"
--#if MP_INPUT_BUFFER_PADDING_SIZE < FF_INPUT_BUFFER_PADDING_SIZE
-+#if MP_INPUT_BUFFER_PADDING_SIZE < AV_INPUT_BUFFER_PADDING_SIZE
- #error MP_INPUT_BUFFER_PADDING_SIZE is too small!
- #endif
- #include "av_helpers.h"
-Index: libmpdemux/demux_lavf.c
-===================================================================
---- a/libmpdemux/demux_lavf.c.orig
-+++ b/libmpdemux/demux_lavf.c
-@@ -176,7 +176,7 @@ static int lavf_check_file(demuxer_t *de
- }
-
- avpd.buf = av_mallocz(FFMAX(BIO_BUFFER_SIZE, PROBE_BUF_SIZE) +
-- FF_INPUT_BUFFER_PADDING_SIZE);
-+ AV_INPUT_BUFFER_PADDING_SIZE);
- do {
- read_size = stream_read(demuxer->stream, avpd.buf + probe_data_size, read_size);
- if(read_size < 0) {
-Index: libmpcodecs/vf_uspp.c
-===================================================================
---- a/libmpcodecs/vf_uspp.c.orig
-+++ b/libmpcodecs/vf_uspp.c
-@@ -240,7 +240,7 @@ static int config(struct vf_instance *vf
- avctx_enc->gop_size = 300;
- avctx_enc->max_b_frames= 0;
- avctx_enc->pix_fmt = AV_PIX_FMT_YUV420P;
-- avctx_enc->flags = CODEC_FLAG_QSCALE | CODEC_FLAG_LOW_DELAY;
-+ avctx_enc->flags = AV_CODEC_FLAG_QSCALE | AV_CODEC_FLAG_LOW_DELAY;
- avctx_enc->strict_std_compliance = FF_COMPLIANCE_EXPERIMENTAL;
- avctx_enc->global_quality= 123;
- av_dict_set(&opts, "no_bitstream", "1", 0);
-Index: libmpcodecs/ad_ffmpeg.c
-===================================================================
---- a/libmpcodecs/ad_ffmpeg.c.orig
-+++ b/libmpcodecs/ad_ffmpeg.c
-@@ -134,7 +134,7 @@ static int init(sh_audio_t *sh_audio)
-
- /* alloc extra data */
- if (sh_audio->wf && sh_audio->wf->cbSize > 0) {
-- lavc_context->extradata = av_mallocz(sh_audio->wf->cbSize + FF_INPUT_BUFFER_PADDING_SIZE);
-+ lavc_context->extradata = av_mallocz(sh_audio->wf->cbSize + AV_INPUT_BUFFER_PADDING_SIZE);
- lavc_context->extradata_size = sh_audio->wf->cbSize;
- memcpy(lavc_context->extradata, sh_audio->wf + 1,
- lavc_context->extradata_size);
-Index: libmpcodecs/vf_lavc.c
-===================================================================
---- a/libmpcodecs/vf_lavc.c.orig
-+++ b/libmpcodecs/vf_lavc.c
-@@ -157,7 +157,7 @@ static int vf_open(vf_instance_t *vf, ch
-
- if(p_quality<32){
- // fixed qscale
-- lavc_venc_context.flags = CODEC_FLAG_QSCALE;
-+ lavc_venc_context.flags = AV_CODEC_FLAG_QSCALE;
- lavc_venc_context.global_quality =
- vf->priv->pic->quality = (int)(FF_QP2LAMBDA * ((p_quality<1) ? 1 : p_quality) + 0.5);
- } else {
-Index: libmpcodecs/ae_lavc.c
-===================================================================
---- a/libmpcodecs/ae_lavc.c.orig
-+++ b/libmpcodecs/ae_lavc.c
-@@ -224,10 +224,10 @@ int mpae_init_lavc(audio_encoder_t *enco
- }
- if((lavc_param_audio_global_header&1)
- /*|| (video_global_header==0 && (oc->oformat->flags & AVFMT_GLOBALHEADER))*/){
-- lavc_actx->flags |= CODEC_FLAG_GLOBAL_HEADER;
-+ lavc_actx->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
- }
- if(lavc_param_audio_global_header&2){
-- lavc_actx->flags2 |= CODEC_FLAG2_LOCAL_HEADER;
-+ lavc_actx->flags2 |= AV_CODEC_FLAG2_LOCAL_HEADER;
- }
-
- if(avcodec_open2(lavc_actx, lavc_acodec, NULL) < 0)
-Index: libmpcodecs/vf_mcdeint.c
-===================================================================
---- a/libmpcodecs/vf_mcdeint.c.orig
-+++ b/libmpcodecs/vf_mcdeint.c
-@@ -231,7 +231,7 @@ static int config(struct vf_instance *vf
- avctx_enc->gop_size = 300;
- avctx_enc->max_b_frames= 0;
- avctx_enc->pix_fmt = AV_PIX_FMT_YUV420P;
-- avctx_enc->flags = CODEC_FLAG_QSCALE | CODEC_FLAG_LOW_DELAY;
-+ avctx_enc->flags = AV_CODEC_FLAG_QSCALE | AV_CODEC_FLAG_LOW_DELAY;
- avctx_enc->strict_std_compliance = FF_COMPLIANCE_EXPERIMENTAL;
- avctx_enc->global_quality= 1;
- av_dict_set(&opts, "memc_only", "1", 0);
-@@ -245,11 +245,11 @@ static int config(struct vf_instance *vf
- case 2:
- avctx_enc->me_method= ME_ITER;
- case 1:
-- avctx_enc->flags |= CODEC_FLAG_4MV;
-+ avctx_enc->flags |= AV_CODEC_FLAG_4MV;
- avctx_enc->dia_size=2;
- // avctx_enc->mb_decision = MB_DECISION_RD;
- case 0:
-- avctx_enc->flags |= CODEC_FLAG_QPEL;
-+ avctx_enc->flags |= AV_CODEC_FLAG_QPEL;
- }
-
- avcodec_open2(avctx_enc, enc, &opts);
-Index: libmpcodecs/ve_lavc.c
-===================================================================
---- a/libmpcodecs/ve_lavc.c.orig
-+++ b/libmpcodecs/ve_lavc.c
-@@ -213,7 +213,7 @@ const m_option_t lavcopts_conf[]={
- {"vstrict", &lavc_param_strict, CONF_TYPE_INT, CONF_RANGE, -99, 99, NULL},
- {"vdpart", &lavc_param_data_partitioning, CONF_TYPE_FLAG, 0, 0, 1, NULL},
- {"keyint", &lavc_param_keyint, CONF_TYPE_INT, 0, 0, 0, NULL},
-- {"gray", &lavc_param_gray, CONF_TYPE_FLAG, 0, 0, CODEC_FLAG_GRAY, NULL},
-+ {"gray", &lavc_param_gray, CONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_GRAY, NULL},
- {"mpeg_quant", &lavc_param_mpeg_quant, CONF_TYPE_FLAG, 0, 0, 1, NULL},
- {"vi_qfactor", &lavc_param_vi_qfactor, CONF_TYPE_FLOAT, CONF_RANGE, -31.0, 31.0, NULL},
- {"vi_qoffset", &lavc_param_vi_qoffset, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 31.0, NULL},
-@@ -242,7 +242,7 @@ const m_option_t lavcopts_conf[]={
- {"pred", &lavc_param_prediction_method, CONF_TYPE_INT, CONF_RANGE, 0, 20, NULL},
- {"format", &lavc_param_format, CONF_TYPE_IMGFMT, 0, 0, 0, NULL},
- {"debug", &lavc_param_debug, CONF_TYPE_INT, CONF_RANGE, 0, 100000000, NULL},
-- {"psnr", &lavc_param_psnr, CONF_TYPE_FLAG, 0, 0, CODEC_FLAG_PSNR, NULL},
-+ {"psnr", &lavc_param_psnr, CONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_PSNR, NULL},
- {"precmp", &lavc_param_me_pre_cmp, CONF_TYPE_INT, CONF_RANGE, 0, 2000, NULL},
- {"cmp", &lavc_param_me_cmp, CONF_TYPE_INT, CONF_RANGE, 0, 2000, NULL},
- {"subcmp", &lavc_param_me_sub_cmp, CONF_TYPE_INT, CONF_RANGE, 0, 2000, NULL},
-@@ -251,21 +251,21 @@ const m_option_t lavcopts_conf[]={
- #ifdef FF_CMP_VSAD
- {"ildctcmp", &lavc_param_ildct_cmp, CONF_TYPE_INT, CONF_RANGE, 0, 2000, NULL},
- #endif
-- {"bit_exact", &lavc_param_bit_exact, CONF_TYPE_FLAG, 0, 0, CODEC_FLAG_BITEXACT, NULL},
-+ {"bit_exact", &lavc_param_bit_exact, CONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_BITEXACT, NULL},
- {"predia", &lavc_param_pre_dia_size, CONF_TYPE_INT, CONF_RANGE, -2000, 2000, NULL},
- {"dia", &lavc_param_dia_size, CONF_TYPE_INT, CONF_RANGE, -2000, 2000, NULL},
-- {"qpel", &lavc_param_qpel, CONF_TYPE_FLAG, 0, 0, CODEC_FLAG_QPEL, NULL},
-+ {"qpel", &lavc_param_qpel, CONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_QPEL, NULL},
- {"trell", &lavc_param_trell, CONF_TYPE_FLAG, 0, 0, 1, NULL},
-- {"lowdelay", &lavc_param_lowdelay, CONF_TYPE_FLAG, 0, 0, CODEC_FLAG_LOW_DELAY, NULL},
-+ {"lowdelay", &lavc_param_lowdelay, CONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_LOW_DELAY, NULL},
- {"last_pred", &lavc_param_last_pred, CONF_TYPE_INT, CONF_RANGE, 0, 2000, NULL},
- {"preme", &lavc_param_pre_me, CONF_TYPE_INT, CONF_RANGE, 0, 2000, NULL},
- {"subq", &lavc_param_me_subpel_quality, CONF_TYPE_INT, CONF_RANGE, 0, 8, NULL},
- {"me_range", &lavc_param_me_range, CONF_TYPE_INT, CONF_RANGE, 0, 16000, NULL},
-- {"aic", &lavc_param_aic, CONF_TYPE_FLAG, 0, 0, CODEC_FLAG_AC_PRED, NULL},
-+ {"aic", &lavc_param_aic, CONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_AC_PRED, NULL},
- {"umv", &lavc_param_umv, CONF_TYPE_FLAG, 0, 0, 1, NULL},
- {"aiv", &lavc_param_aiv, CONF_TYPE_FLAG, 0, 0, 1, NULL},
- {"obmc", &lavc_param_obmc, CONF_TYPE_FLAG, 0, 0, 1, NULL},
-- {"loop", &lavc_param_loop, CONF_TYPE_FLAG, 0, 0, CODEC_FLAG_LOOP_FILTER, NULL},
-+ {"loop", &lavc_param_loop, CONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_LOOP_FILTER, NULL},
- {"ibias", &lavc_param_ibias, CONF_TYPE_INT, CONF_RANGE, -512, 512, NULL},
- {"pbias", &lavc_param_pbias, CONF_TYPE_INT, CONF_RANGE, -512, 512, NULL},
- {"coder", &lavc_param_coder, CONF_TYPE_INT, CONF_RANGE, 0, 10, NULL},
-@@ -278,8 +278,8 @@ const m_option_t lavcopts_conf[]={
- {"qprd", "Please use o=mpv_flags=+qp_rd instead of qprd.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL},
- {"ss", &lavc_param_ss, CONF_TYPE_FLAG, 0, 0, 1, NULL},
- {"alt", &lavc_param_alt, CONF_TYPE_FLAG, 0, 0, 1, NULL},
-- {"ilme", &lavc_param_ilme, CONF_TYPE_FLAG, 0, 0, CODEC_FLAG_INTERLACED_ME, NULL},
-- {"cgop", &lavc_param_closed_gop, CONF_TYPE_FLAG, 0, 0, CODEC_FLAG_CLOSED_GOP, NULL},
-+ {"ilme", &lavc_param_ilme, CONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_INTERLACED_ME, NULL},
-+ {"cgop", &lavc_param_closed_gop, CONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_CLOSED_GOP, NULL},
- {"gmc", &lavc_param_gmc, CONF_TYPE_FLAG, 0, 0, CODEC_FLAG_GMC, NULL},
- {"dc", &lavc_param_dc_precision, CONF_TYPE_INT, CONF_RANGE, 8, 11, NULL},
- {"border_mask", &lavc_param_border_masking, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 1.0, NULL},
-@@ -543,7 +543,7 @@ static int config(struct vf_instance *vf
- if (lavc_param_obmc)
- av_dict_set(&opts, "obmc", "1", 0);
- lavc_venc_context->flags|= lavc_param_loop;
-- lavc_venc_context->flags|= lavc_param_v4mv ? CODEC_FLAG_4MV : 0;
-+ lavc_venc_context->flags|= lavc_param_v4mv ? AV_CODEC_FLAG_4MV : 0;
- if (lavc_param_data_partitioning)
- av_dict_set(&opts, "data_partitioning", "1", 0);
- lavc_venc_context->flags|= lavc_param_mv0;
-@@ -553,13 +553,13 @@ static int config(struct vf_instance *vf
- av_dict_set(&opts, "alternate_scan", "1", 0);
- lavc_venc_context->flags|= lavc_param_ilme;
- lavc_venc_context->flags|= lavc_param_gmc;
--#ifdef CODEC_FLAG_CLOSED_GOP
-+#ifdef AV_CODEC_FLAG_CLOSED_GOP
- lavc_venc_context->flags|= lavc_param_closed_gop;
- #endif
- lavc_venc_context->flags|= lavc_param_gray;
-
- if(lavc_param_normalize_aqp) lavc_venc_context->flags|= CODEC_FLAG_NORMALIZE_AQP;
-- if(lavc_param_interlaced_dct) lavc_venc_context->flags|= CODEC_FLAG_INTERLACED_DCT;
-+ if(lavc_param_interlaced_dct) lavc_venc_context->flags|= AV_CODEC_FLAG_INTERLACED_DCT;
- lavc_venc_context->flags|= lavc_param_psnr;
- lavc_venc_context->intra_dc_precision = lavc_param_dc_precision - 8;
- lavc_venc_context->prediction_method= lavc_param_prediction_method;
-@@ -568,10 +568,10 @@ static int config(struct vf_instance *vf
- lavc_venc_context->scenechange_factor = lavc_param_sc_factor;
- if((lavc_param_video_global_header&1)
- /*|| (video_global_header==0 && (oc->oformat->flags & AVFMT_GLOBALHEADER))*/){
-- lavc_venc_context->flags |= CODEC_FLAG_GLOBAL_HEADER;
-+ lavc_venc_context->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
- }
- if(lavc_param_video_global_header&2){
-- lavc_venc_context->flags2 |= CODEC_FLAG2_LOCAL_HEADER;
-+ lavc_venc_context->flags2 |= AV_CODEC_FLAG2_LOCAL_HEADER;
- }
- lavc_venc_context->mv0_threshold = lavc_param_mv0_threshold;
- lavc_venc_context->refs = lavc_param_refs;
-@@ -595,7 +595,7 @@ static int config(struct vf_instance *vf
- switch(lavc_param_vpass){
- case 2:
- case 3:
-- lavc_venc_context->flags|= CODEC_FLAG_PASS2;
-+ lavc_venc_context->flags|= AV_CODEC_FLAG_PASS2;
- stats_file= fopen(passtmpfile, "rb");
- if(stats_file==NULL){
- mp_msg(MSGT_MENCODER,MSGL_ERR,"2pass failed: filename=%s\n", passtmpfile);
-@@ -618,7 +618,7 @@ static int config(struct vf_instance *vf
- fclose(stats_file);
- /* fall through */
- case 1:
-- lavc_venc_context->flags|= CODEC_FLAG_PASS1;
-+ lavc_venc_context->flags|= AV_CODEC_FLAG_PASS1;
- stats_file= fopen(passtmpfile, "wb");
- if(stats_file==NULL){
- mp_msg(MSGT_MENCODER,MSGL_ERR,"2pass failed: filename=%s\n", passtmpfile);
-@@ -638,8 +638,8 @@ static int config(struct vf_instance *vf
- lavc_venc_context->noise_reduction = 0; // nr=0
- lavc_venc_context->mb_decision = 0; // mbd=0 ("realtime" encoding)
-
-- lavc_venc_context->flags &= ~CODEC_FLAG_QPEL;
-- lavc_venc_context->flags &= ~CODEC_FLAG_4MV;
-+ lavc_venc_context->flags &= ~AV_CODEC_FLAG_QPEL;
-+ lavc_venc_context->flags &= ~AV_CODEC_FLAG_4MV;
- lavc_venc_context->trellis = 0;
- av_dict_set(&opts, "mpv_flags", "-mv0", 0);
- av_dict_set(&opts, "mpv_flags", "-qp_rd-cbp_rd", 0);
-@@ -654,7 +654,7 @@ static int config(struct vf_instance *vf
- if (lavc_param_vqscale >= 0.0)
- {
- mp_msg(MSGT_MENCODER, MSGL_INFO, MSGTR_MPCODECS_UsingConstantQscale, lavc_param_vqscale);
-- lavc_venc_context->flags |= CODEC_FLAG_QSCALE;
-+ lavc_venc_context->flags |= AV_CODEC_FLAG_QSCALE;
- lavc_venc_context->global_quality=
- vf->priv->pic->quality = (int)(FF_QP2LAMBDA * lavc_param_vqscale + 0.5);
- }
-@@ -693,7 +693,7 @@ static int control(struct vf_instance *v
-
- switch(request){
- case VFCTRL_FLUSH_FRAMES:
-- if(vf->priv->codec->capabilities & CODEC_CAP_DELAY)
-+ if(vf->priv->codec->capabilities & AV_CODEC_CAP_DELAY)
- while(encode_frame(vf, NULL, MP_NOPTS_VALUE) > 0);
- return CONTROL_TRUE;
- default:
-Index: libmpcodecs/ve.c
-===================================================================
---- a/libmpcodecs/ve.c.orig
-+++ b/libmpcodecs/ve.c
-@@ -43,7 +43,7 @@ extern const vf_info_t ve_info_x264;
-
- static const vf_info_t * const encoder_list[] = {
- #ifdef CONFIG_FFMPEG
-- &ve_info_lavc,
-+// &ve_info_lavc,//TODO: ve_lavc is deactivated because it doesn't build after latest FFmpeg major bumps
- #endif
- #ifdef CONFIG_WIN32DLL
- &ve_info_vfw,
-Index: libmpcodecs/ae.c
-===================================================================
---- a/libmpcodecs/ae.c.orig
-+++ b/libmpcodecs/ae.c
-@@ -59,9 +59,7 @@ audio_encoder_t *new_audio_encoder(muxer
- break;
- #endif
- #ifdef CONFIG_FFMPEG
-- case ACODEC_LAVC:
-- ris = mpae_init_lavc(encoder);
-- break;
-+ //TODO: ACODEC_LAVC <-- has been removed here because it depends on ve_lavc which does not compile after latest FFmpeg major bumps
- #endif
- #ifdef CONFIG_MP3LAME
- case ACODEC_VBRMP3:
-Index: libmpcodecs/vd_ffmpeg.c
-===================================================================
---- a/libmpcodecs/vd_ffmpeg.c.orig
-+++ b/libmpcodecs/vd_ffmpeg.c
-@@ -115,8 +115,7 @@ static int lavc_param_gray=0;
- static int lavc_param_vstats=0;
- static int lavc_param_idct_algo=0;
- static int lavc_param_debug=0;
--static int lavc_param_vismv=0;
--#ifdef CODEC_FLAG2_SHOW_ALL
-+#ifdef AV_CODEC_FLAG2_SHOW_ALL
- static int lavc_param_wait_keyframe=0;
- #endif
- static int lavc_param_skip_top=0;
-@@ -141,24 +140,23 @@ static const mp_image_t mpi_no_picture =
- const m_option_t lavc_decode_opts_conf[]={
- {"bug" , &lavc_param_workaround_bugs , CONF_TYPE_INT , CONF_RANGE, -1, 999999, NULL},
- {"er" , &lavc_param_error_resilience , CONF_TYPE_INT , CONF_RANGE, 0, 99, NULL},
-- {"gray" , &lavc_param_gray , CONF_TYPE_FLAG , 0, 0, CODEC_FLAG_GRAY, NULL},
-+ {"gray" , &lavc_param_gray , CONF_TYPE_FLAG , 0, 0, AV_CODEC_FLAG_GRAY, NULL},
- {"idct" , &lavc_param_idct_algo , CONF_TYPE_INT , CONF_RANGE, 0, 99, NULL},
- {"ec" , &lavc_param_error_concealment , CONF_TYPE_INT , CONF_RANGE, 0, 99, NULL},
- {"vstats" , &lavc_param_vstats , CONF_TYPE_FLAG , 0, 0, 1, NULL},
- {"debug" , &lavc_param_debug , CONF_TYPE_INT , CONF_RANGE, 0, 9999999, NULL},
-- {"vismv" , &lavc_param_vismv , CONF_TYPE_INT , CONF_RANGE, 0, 9999999, NULL},
--#ifdef CODEC_FLAG2_SHOW_ALL
-+#ifdef AV_CODEC_FLAG2_SHOW_ALL
- {"wait_keyframe" , &lavc_param_wait_keyframe , CONF_TYPE_FLAG , 0, 0, 1, NULL},
- #endif
- {"st" , &lavc_param_skip_top , CONF_TYPE_INT , CONF_RANGE, 0, 999, NULL},
- {"sb" , &lavc_param_skip_bottom , CONF_TYPE_INT , CONF_RANGE, 0, 999, NULL},
-- {"fast" , &lavc_param_fast , CONF_TYPE_FLAG , 0, 0, CODEC_FLAG2_FAST, NULL},
-+ {"fast" , &lavc_param_fast , CONF_TYPE_FLAG , 0, 0, AV_CODEC_FLAG2_FAST, NULL},
- {"lowres" , &lavc_param_lowres_str , CONF_TYPE_STRING , 0, 0, 0, NULL},
- {"skiploopfilter", &lavc_param_skip_loop_filter_str , CONF_TYPE_STRING , 0, 0, 0, NULL},
- {"skipidct" , &lavc_param_skip_idct_str , CONF_TYPE_STRING , 0, 0, 0, NULL},
- {"skipframe" , &lavc_param_skip_frame_str , CONF_TYPE_STRING , 0, 0, 0, NULL},
-- {"threads" , &lavc_param_threads , CONF_TYPE_INT , CONF_RANGE, 1, 16, NULL},
-- {"bitexact" , &lavc_param_bitexact , CONF_TYPE_FLAG , 0, 0, CODEC_FLAG_BITEXACT, NULL},
-+ {"threads" , &lavc_param_threads , CONF_TYPE_INT , CONF_RANGE, 1, 32, NULL},
-+ {"bitexact" , &lavc_param_bitexact , CONF_TYPE_FLAG , 0, 0, AV_CODEC_FLAG_BITEXACT, NULL},
- {"o" , &lavc_avopt , CONF_TYPE_STRING , 0, 0, 0, NULL},
- {NULL, NULL, 0, 0, 0, 0, NULL}
- };
-@@ -257,9 +255,9 @@ static void set_dr_slice_settings(struct
- // explicitly requested
- int use_slices = vd_use_slices > 0 || (vd_use_slices < 0 && lavc_param_threads <= 1);
-
-- ctx->do_slices = use_slices && (lavc_codec->capabilities & CODEC_CAP_DRAW_HORIZ_BAND);
-+ ctx->do_slices = use_slices && (lavc_codec->capabilities & AV_CODEC_CAP_DRAW_HORIZ_BAND);
-
-- ctx->do_dr1 = (lavc_codec->capabilities & CODEC_CAP_DR1) &&
-+ ctx->do_dr1 = (lavc_codec->capabilities & AV_CODEC_CAP_DR1) &&
- lavc_codec->id != AV_CODEC_ID_INTERPLAY_VIDEO &&
- lavc_codec->id != AV_CODEC_ID_H264 &&
- lavc_codec->id != AV_CODEC_ID_HEVC;
-@@ -271,12 +269,9 @@ static void set_dr_slice_settings(struct
- ctx->do_dr1 = 1;
- ctx->nonref_dr = 1;
- }
-- if (lavc_param_vismv || (lavc_param_debug & (FF_DEBUG_VIS_MB_TYPE|FF_DEBUG_VIS_QP))) {
-- ctx->do_slices = ctx->do_dr1 = 0;
-- }
- if(ctx->do_dr1){
- avctx->get_buffer2 = get_buffer2;
-- } else if (lavc_codec->capabilities & CODEC_CAP_DR1) {
-+ } else if (lavc_codec->capabilities & AV_CODEC_CAP_DR1) {
- avctx->get_buffer2 = avcodec_default_get_buffer2;
- }
- avctx->slice_flags = 0;
-@@ -372,9 +367,9 @@ static int init(sh_video_t *sh){
- case 1:
- avctx->err_recognition |= AV_EF_CAREFUL;
- }
-- lavc_param_gray|= CODEC_FLAG_GRAY;
--#ifdef CODEC_FLAG2_SHOW_ALL
-- if(!lavc_param_wait_keyframe) avctx->flags2 |= CODEC_FLAG2_SHOW_ALL;
-+ lavc_param_gray|= AV_CODEC_FLAG_GRAY;
-+#ifdef AV_CODEC_FLAG2_SHOW_ALL
-+ if(!lavc_param_wait_keyframe) avctx->flags2 |= AV_CODEC_FLAG2_SHOW_ALL;
- #endif
- avctx->flags2|= lavc_param_fast;
- avctx->codec_tag= sh->format;
-@@ -383,7 +378,6 @@ static int init(sh_video_t *sh){
- avctx->debug= lavc_param_debug;
- if (lavc_param_debug)
- av_log_set_level(AV_LOG_DEBUG);
-- avctx->debug_mv= lavc_param_vismv;
- avctx->skip_top = lavc_param_skip_top;
- avctx->skip_bottom= lavc_param_skip_bottom;
- if(lavc_param_lowres_str != NULL)
-@@ -419,7 +413,7 @@ static int init(sh_video_t *sh){
- handled here; the second case falls through to the next section. */
- if (sh->ImageDesc) {
- avctx->extradata_size = (*(int *)sh->ImageDesc) - sizeof(int);
-- avctx->extradata = av_mallocz(avctx->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE);
-+ avctx->extradata = av_mallocz(avctx->extradata_size + AV_INPUT_BUFFER_PADDING_SIZE);
- memcpy(avctx->extradata, ((int *)sh->ImageDesc)+1, avctx->extradata_size);
- break;
- }
-@@ -434,7 +428,7 @@ static int init(sh_video_t *sh){
- break;
- av_dict_set(&opts, "extern_huff", "1", 0);
- avctx->extradata_size = sh->bih->biSize-sizeof(*sh->bih);
-- avctx->extradata = av_mallocz(avctx->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE);
-+ avctx->extradata = av_mallocz(avctx->extradata_size + AV_INPUT_BUFFER_PADDING_SIZE);
- memcpy(avctx->extradata, sh->bih+1, avctx->extradata_size);
-
- #if 0
-@@ -457,14 +451,14 @@ static int init(sh_video_t *sh){
- if(sh->bih->biSize<sizeof(*sh->bih)+8){
- /* only 1 packet per frame & sub_id from fourcc */
- avctx->extradata_size= 8;
-- avctx->extradata = av_mallocz(avctx->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE);
-+ avctx->extradata = av_mallocz(avctx->extradata_size + AV_INPUT_BUFFER_PADDING_SIZE);
- ((uint32_t *)avctx->extradata)[0] = 0;
- ((uint32_t *)avctx->extradata)[1] =
- (sh->format == mmioFOURCC('R', 'V', '1', '3')) ? 0x10003001 : 0x10000000;
- } else {
- /* has extra slice header (demux_rm or rm->avi streamcopy) */
- avctx->extradata_size = sh->bih->biSize-sizeof(*sh->bih);
-- avctx->extradata = av_mallocz(avctx->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE);
-+ avctx->extradata = av_mallocz(avctx->extradata_size + AV_INPUT_BUFFER_PADDING_SIZE);
- memcpy(avctx->extradata, sh->bih+1, avctx->extradata_size);
- }
-
-@@ -475,7 +469,11 @@ static int init(sh_video_t *sh){
- if (!sh->bih || sh->bih->biSize <= sizeof(*sh->bih))
- break;
- avctx->extradata_size = sh->bih->biSize-sizeof(*sh->bih);
-- avctx->extradata = av_mallocz(avctx->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE);
-+ avctx->extradata = av_mallocz(avctx->extradata_size + AV_INPUT_BUFFER_PADDING_SIZE);
-+ if (!avctx->extradata) {
-+ avctx->extradata_size = 0;
-+ break;
-+ }
- memcpy(avctx->extradata, sh->bih+1, avctx->extradata_size);
- break;
- }
-Index: libmpcodecs/vf.c
-===================================================================
---- a/libmpcodecs/vf.c.orig
-+++ b/libmpcodecs/vf.c
-@@ -200,7 +200,7 @@ static const vf_info_t* const filter_lis
- &vf_info_uspp,
- &vf_info_fspp,
- &vf_info_qp,
-- &vf_info_mcdeint,
-+// &vf_info_mcdeint, //TODO: vf_mcdeint is deactivated because it doesn't build after latest FFmpeg major bumps
- #endif
- &vf_info_yuvcsp,
- &vf_info_kerndeint,
diff --git a/media-video/mplayer/mplayer-1.3.0-r6.ebuild b/media-video/mplayer/mplayer-1.3.0-r6.ebuild
index 425e4c483f2..1bdf32fb43c 100644
--- a/media-video/mplayer/mplayer-1.3.0-r6.ebuild
+++ b/media-video/mplayer/mplayer-1.3.0-r6.ebuild
@@ -39,6 +39,7 @@ else
RELEASE_URI="mirror://gentoo/${P}.tar.xz"
fi
SRC_URI="${RELEASE_URI}
+ https://dev.gentoo.org/~juippis/distfiles/tmp/mplayer-1.3-ffmpeg4.patch
!truetype? ( ${FONT_URI} )"
DESCRIPTION="Media Player for Linux"
@@ -235,7 +236,7 @@ src_prepare() {
else
eapply "${FILESDIR}"/${PN}-1.3.0-freetype_pkgconfig.patch #655240
eapply "${FILESDIR}"/${PN}-1.3-CVE-2016-4352.patch
- has_version '>media-video/ffmpeg-3.5' && eapply "${FILESDIR}"/${PN}-1.3-ffmpeg4.patch "${FILESDIR}"/${PN}-1.3-ffmpeg4+mencoder.patch
+ has_version '>media-video/ffmpeg-3.5' && eapply "${DISTDIR}"/${PN}-1.3-ffmpeg4.patch "${FILESDIR}"/${PN}-1.3-ffmpeg4+mencoder.patch
fi
if [ ! -f VERSION ] ; then
[ -f "$svf" ] || die "Missing ${svf}. Did you generate your snapshot with prepare_mplayer.sh?"
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/mplayer/files/, media-video/mplayer/
@ 2021-04-09 13:01 Alexis Ballier
0 siblings, 0 replies; 10+ messages in thread
From: Alexis Ballier @ 2021-04-09 13:01 UTC (permalink / raw
To: gentoo-commits
commit: c9f197136f2ba5cf2ff546197f66aec6bb4033d2
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 9 13:00:47 2021 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Fri Apr 9 13:00:58 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9f19713
media-video/mplayer: fix build with ffmpeg 4.4
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org>
media-video/mplayer/files/ffmpeg44.patch | 12 ++++++++++++
media-video/mplayer/mplayer-1.4-r1.ebuild | 1 +
2 files changed, 13 insertions(+)
diff --git a/media-video/mplayer/files/ffmpeg44.patch b/media-video/mplayer/files/ffmpeg44.patch
new file mode 100644
index 00000000000..99d54079cab
--- /dev/null
+++ b/media-video/mplayer/files/ffmpeg44.patch
@@ -0,0 +1,12 @@
+Index: MPlayer-1.4/libmpcodecs/ad_spdif.c
+===================================================================
+--- MPlayer-1.4.orig/libmpcodecs/ad_spdif.c
++++ MPlayer-1.4/libmpcodecs/ad_spdif.c
+@@ -300,7 +300,6 @@ static void uninit(sh_audio_t *sh)
+ av_freep(&lavf_ctx->pb);
+ if (lavf_ctx->streams) {
+ av_freep(&lavf_ctx->streams[0]->codec);
+- av_freep(&lavf_ctx->streams[0]->info);
+ av_freep(&lavf_ctx->streams[0]);
+ }
+ av_freep(&lavf_ctx->streams);
diff --git a/media-video/mplayer/mplayer-1.4-r1.ebuild b/media-video/mplayer/mplayer-1.4-r1.ebuild
index c3f5a2e913c..e3f376cc706 100644
--- a/media-video/mplayer/mplayer-1.4-r1.ebuild
+++ b/media-video/mplayer/mplayer-1.4-r1.ebuild
@@ -232,6 +232,7 @@ src_prepare() {
else
eapply "${FILESDIR}"/${PN}-1.3-CVE-2016-4352.patch
fi
+ eapply "${FILESDIR}"/ffmpeg44.patch
if [ ! -f VERSION ] ; then
[ -f "$svf" ] || die "Missing ${svf}. Did you generate your snapshot with prepare_mplayer.sh?"
local sv=$(<$svf)
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/mplayer/files/, media-video/mplayer/
@ 2021-04-18 16:50 Andreas Sturmlechner
0 siblings, 0 replies; 10+ messages in thread
From: Andreas Sturmlechner @ 2021-04-18 16:50 UTC (permalink / raw
To: gentoo-commits
commit: 73773fe46c95dabdf14ce72e5d2c21c3f52b424b
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 18 16:34:00 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Apr 18 16:50:22 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73773fe4
media-video/mplayer: Drop 1.3.0-r6
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-video/mplayer/Manifest | 2 -
.../files/mplayer-1.3-ffmpeg4+mencoder.patch | 360 ------------
.../mplayer/files/mplayer-1.3-vdpau-x11.patch | 19 -
media-video/mplayer/metadata.xml | 1 -
media-video/mplayer/mplayer-1.3.0-r6.ebuild | 609 ---------------------
5 files changed, 991 deletions(-)
diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index 522275d16bb..4fd4e60d363 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -1,6 +1,4 @@
-DIST MPlayer-1.3.0.tar.xz 13278984 BLAKE2B 4e2d67f6fda893f3b200bc92598c23410a2a38b2bc6a2ce0ce062f213bf46c11c67b0d93dd53ea3bd618c74df08bf756e8872d172c1b27e0e175fc67c236a077 SHA512 10007e471a941f8a3dabf6149e6e44fc1a364a9ccb5cd08c670fc22560e5053a15f3249e9d3e18cdda06b6b7e77e537026b5d33dc356e928c63747d6ed73dbae
DIST MPlayer-1.4.tar.xz 15054920 BLAKE2B 4777cb31a32d62c393778c581c1913fbf355a36cbe6bcf6f426c90c2c8c70123e8aed4d01faf52ee6b1fba3c49e11fa13185f81ae8582f90c901b90955a1f42b SHA512 8ef71cad187d8c8f81c837279bd3a421b440c892d3347a667670b21c954007e35cf0d15828f0901f347b9c1b053e8da4bc7f0fb6de34382d1e463074923d7b34
DIST font-arial-cp1250.tar.bz2 249705 BLAKE2B eb4366a110d917dc975b8add168ab43b1e8a0db7342647f69f5421fc1170719015c97ffa770e89892cbb4cee8e5b2fb74a4772c8f6cbef9606ee12c3746d78c9 SHA512 4f77ff5ceb8ec6e5d9f8f34d8950a6a6276d1fd5a947772fcbdb6554988b1ea665c12b82f45164f91fb7bd08000cb4afc26fa35beb4c760464160e22b9b8c340
DIST font-arial-iso-8859-1.tar.bz2 234242 BLAKE2B 0671854e1a257d27b502affb59de681942a93990d3ac2575bbf1a6dd9eef026969f2f9ce4e9c11a68ea3d8aed48063f826a1e153f7468437a39791672c92a5d0 SHA512 a1d03b6f09c48f48b7733f3bc0402ceab239a9abf88b860d852ea9fe69b4da690208a79d6f29d30204f5b37becf10672e8e8c0bfef201846d80ec54df617d029
DIST font-arial-iso-8859-2.tar.bz2 222208 BLAKE2B 94b1a04672bf9b4b20a0e6981591e761f751bd637deddcb801855296c525bf3b5e8feb1cb11cef282c0269f2c963ded22846089076e7e6763f258b8a932af454 SHA512 5671e628303fd816f64a51ad10e2f4dd9c3dc1b34c379a2ecf489b83931db7af668aaa4e00e96a00cacd63ed98daeae6b6a4d5925edfb06fc98d3a923f70257d
-DIST mplayer-1.3-ffmpeg4.patch 25679 BLAKE2B 08f9ddb05a11c9b7ce0de7fe7bb92b492d1b35e65437c09be07cd39aa70cd9541baf442ffae1ee3060fd94d78eca30fa35808db8eebfdf679456da2c1d8217e8 SHA512 9f29fcd0bfd374fecf15a40c51e2bac53d2646d939ea13e7afffc8e9854d6d2105142f95745f0b26d8f58e19938c5ccedb191af30858fb6f3520072c98db3081
diff --git a/media-video/mplayer/files/mplayer-1.3-ffmpeg4+mencoder.patch b/media-video/mplayer/files/mplayer-1.3-ffmpeg4+mencoder.patch
deleted file mode 100644
index f312203027a..00000000000
--- a/media-video/mplayer/files/mplayer-1.3-ffmpeg4+mencoder.patch
+++ /dev/null
@@ -1,360 +0,0 @@
-r38001 | al | 2017-10-31 23:33:45 +0100 (Tue, 31 Oct 2017) | 37 lines
-
-ve_lavc,ae_lavc: Adjust to work with newest FFmpeg again
-
-This commit re-enables previously disabled lavc encoders.
-
-The lavc audio encoder had no problems by itself after
-my last commit, but could not stay enabled because of
-the coupling of the lavcopts option.
-
-Here follows a list of changes done to ve lavc
-
-* Explicitly use 16 as upper limit for vmax_b_frames
-
- The FF_MAX_B_FRAMES #define was removed from FFmpeg's API.
-
- It was removed because there is no global limit to the number of
- b frames. While this is the most conservative change to address
- the removal of the #define, it may not be optimal because we do
- not allow for more than 16 b frames.
-
-* Options that now need to be passed to the encoder as AVOption
- - lmin & lmax
- - vrc_strategy
- - vqsquish
- - vqmod_amp & vqmod_freq
- - vrc_eq
- - vrc_buf_aggressivity
- - vrc_init_cplx
- - ibias & pbias
- - border_mask
- - naq
- - gmc
- - vme
-
-* Options that were dropped because they had no effect anymore
- - sc_factor
-
-
-Index: MPlayer-1.3.0/Makefile
-===================================================================
---- MPlayer-1.3.0.orig/Makefile
-+++ MPlayer-1.3.0/Makefile
-@@ -615,7 +615,9 @@ SRCS_MPLAYER = command.c
-
- #MEncoder
- SRCS_MENCODER-$(FAAC) += libmpcodecs/ae_faac.c
--SRCS_MENCODER-$(FFMPEG) += libmpdemux/muxer_lavf.c
-+SRCS_MENCODER-$(FFMPEG) += libmpcodecs/ae_lavc.c \
-+ libmpcodecs/ve_lavc.c \
-+ libmpdemux/muxer_lavf.c
- SRCS_MENCODER-$(LIBDV) += libmpcodecs/ve_libdv.c
- SRCS_MENCODER-$(LIBLZO) += libmpcodecs/ve_nuv.c \
- libmpcodecs/native/rtjpegn.c
-Index: MPlayer-1.3.0/cfg-mencoder.h
-===================================================================
---- MPlayer-1.3.0.orig/cfg-mencoder.h
-+++ MPlayer-1.3.0/cfg-mencoder.h
-@@ -52,7 +52,7 @@ const m_option_t ovc_conf[]={
- " nuv - nuppel video\n"
- #endif
- #ifdef CONFIG_FFMPEG
--// " lavc - libavcodec codecs - best quality!\n"//TODO: ve_lavc is deactivated because it doesn't build after latest FFmpeg major bumps
-+ " lavc - libavcodec codecs - best quality!\n"
- #endif
- #ifdef CONFIG_WIN32DLL
- " vfw - VfW DLLs, read DOCS/HTML/en/encoding-guide.html.\n"
-@@ -106,7 +106,7 @@ const m_option_t oac_conf[]={
- " mp3lame - cbr/abr/vbr MP3 using libmp3lame\n"
- #endif
- #ifdef CONFIG_FFMPEG
--// " lavc - FFmpeg audio encoder (MP2, AC3, ...)\n"//TODO: ae_lavc was deactivated because it depends on ve_lavc which does not compile after latest FFmpeg major bumps
-+ " lavc - FFmpeg audio encoder (MP2, AC3, ...)\n"
- #endif
- #ifdef CONFIG_TOOLAME
- " toolame - Toolame MP2 audio encoder\n"
-@@ -226,7 +226,7 @@ const m_option_t mencoder_opts[]={
- {"lameopts", lameopts_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL},
- #endif
- #ifdef CONFIG_FFMPEG
-- //{"lavcopts", lavcopts_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL}, //TODO: ve_lavc doesn't build after latest FFmpeg major bumps
-+ {"lavcopts", lavcopts_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL},
- #else
- {"lavcopts", "MPlayer was compiled without libavcodec. See README or DOCS.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
- #endif /* CONFIG_FFMPEG */
-Index: MPlayer-1.3.0/libmpcodecs/ve.c
-===================================================================
---- MPlayer-1.3.0.orig/libmpcodecs/ve.c
-+++ MPlayer-1.3.0/libmpcodecs/ve.c
-@@ -43,7 +43,7 @@ extern const vf_info_t ve_info_x264;
-
- static const vf_info_t * const encoder_list[] = {
- #ifdef CONFIG_FFMPEG
--// &ve_info_lavc,//TODO: ve_lavc is deactivated because it doesn't build after latest FFmpeg major bumps
-+ &ve_info_lavc,
- #endif
- #ifdef CONFIG_WIN32DLL
- &ve_info_vfw,
-Index: MPlayer-1.3.0/libmpcodecs/ae.c
-===================================================================
---- MPlayer-1.3.0.orig/libmpcodecs/ae.c
-+++ MPlayer-1.3.0/libmpcodecs/ae.c
-@@ -59,7 +59,9 @@ audio_encoder_t *new_audio_encoder(muxer
- break;
- #endif
- #ifdef CONFIG_FFMPEG
-- //TODO: ACODEC_LAVC <-- has been removed here because it depends on ve_lavc which does not compile after latest FFmpeg major bumps
-+ case ACODEC_LAVC:
-+ ris = mpae_init_lavc(encoder);
-+ break;
- #endif
- #ifdef CONFIG_MP3LAME
- case ACODEC_VBRMP3:
-Index: MPlayer-1.3.0/libmpcodecs/ve_lavc.c
-===================================================================
---- MPlayer-1.3.0.orig/libmpcodecs/ve_lavc.c
-+++ MPlayer-1.3.0/libmpcodecs/ve_lavc.c
-@@ -63,12 +63,9 @@ static int lavc_param_vbitrate = -1;
- static int lavc_param_vrate_tolerance = 1000*8;
- static int lavc_param_mb_decision = 0; /* default is realtime encoding */
- static int lavc_param_v4mv = 0;
--static int lavc_param_vme = 4;
- static float lavc_param_vqscale = -1;
- static int lavc_param_vqmin = 2;
- static int lavc_param_vqmax = 31;
--static float lavc_param_lmin = 2;
--static float lavc_param_lmax = 31;
- static float lavc_param_mb_lmin = 2;
- static float lavc_param_mb_lmax = 31;
- static int lavc_param_vqdiff = 3;
-@@ -81,22 +78,15 @@ static float lavc_param_vi_qoffset = 0.0
- static int lavc_param_vmax_b_frames = 0;
- static int lavc_param_keyint = -1;
- static int lavc_param_vpass = 0;
--static int lavc_param_vrc_strategy = 0;
- static int lavc_param_vb_strategy = 0;
- static int lavc_param_packet_size= 0;
- static int lavc_param_strict= -1;
- static int lavc_param_data_partitioning= 0;
- static int lavc_param_gray=0;
--static float lavc_param_rc_qsquish=1.0;
--static float lavc_param_rc_qmod_amp=0;
--static int lavc_param_rc_qmod_freq=0;
- static char *lavc_param_rc_override_string=NULL;
--static char *lavc_param_rc_eq="tex^qComp";
- static int lavc_param_rc_buffer_size=0;
--static float lavc_param_rc_buffer_aggressivity=1.0;
- static int lavc_param_rc_max_rate=0;
- static int lavc_param_rc_min_rate=0;
--static float lavc_param_rc_initial_cplx=0;
- static float lavc_param_rc_initial_buffer_occupancy=0.9;
- static int lavc_param_mpeg_quant=0;
- static int lavc_param_fdct=0;
-@@ -108,8 +98,6 @@ static float lavc_param_dark_masking= 0.
- static float lavc_param_temporal_cplx_masking= 0.0;
- static float lavc_param_spatial_cplx_masking= 0.0;
- static float lavc_param_p_masking= 0.0;
--static float lavc_param_border_masking= 0.0;
--static int lavc_param_normalize_aqp= 0;
- static int lavc_param_interlaced_dct= 0;
- static int lavc_param_prediction_method= FF_PRED_LEFT;
- static int lavc_param_format= IMGFMT_YV12;
-@@ -131,15 +119,12 @@ static int lavc_param_bit_exact = 0;
- static int lavc_param_aic= 0;
- static int lavc_param_aiv= 0;
- static int lavc_param_umv= 0;
--static int lavc_param_gmc= 0;
- static int lavc_param_obmc= 0;
- static int lavc_param_loop= 0;
- static int lavc_param_last_pred= 0;
- static int lavc_param_pre_me= 1;
- static int lavc_param_me_subpel_quality= 8;
- static int lavc_param_me_range= 0;
--static int lavc_param_ibias= FF_DEFAULT_QUANT_BIAS;
--static int lavc_param_pbias= FF_DEFAULT_QUANT_BIAS;
- static int lavc_param_coder= 0;
- static int lavc_param_context= 0;
- static char *lavc_param_intra_matrix = NULL;
-@@ -162,7 +147,6 @@ static int lavc_param_skip_exp=0;
- static int lavc_param_skip_cmp=0;
- static int lavc_param_brd_scale = 0;
- static int lavc_param_bidir_refine = 0;
--static int lavc_param_sc_factor = 1;
- static int lavc_param_video_global_header= 0;
- static int lavc_param_mv0_threshold = 256;
- static int lavc_param_refs = 1;
-@@ -190,21 +174,21 @@ const m_option_t lavcopts_conf[]={
- {"vhq", &lavc_param_mb_decision, CONF_TYPE_FLAG, 0, 0, 1, NULL},
- {"mbd", &lavc_param_mb_decision, CONF_TYPE_INT, CONF_RANGE, 0, 9, NULL},
- {"v4mv", &lavc_param_v4mv, CONF_TYPE_FLAG, 0, 0, 1, NULL},
-- {"vme", &lavc_param_vme, CONF_TYPE_INT, CONF_RANGE, 0, 8, NULL},
-+ {"vme", "vme has no effect, please use the corresponding codec specific option (see FFmpeg documentation) instead of vme.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL},
- {"vqscale", &lavc_param_vqscale, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 255.0, NULL},
- {"vqmin", &lavc_param_vqmin, CONF_TYPE_INT, CONF_RANGE, 1, 31, NULL},
- {"vqmax", &lavc_param_vqmax, CONF_TYPE_INT, CONF_RANGE, 1, 31, NULL},
-- {"lmin", &lavc_param_lmin, CONF_TYPE_FLOAT, CONF_RANGE, 0.01, 255.0, NULL},
-- {"lmax", &lavc_param_lmax, CONF_TYPE_FLOAT, CONF_RANGE, 0.01, 255.0, NULL},
-+ {"lmin", "Please use o=lmin=<value>*QP2LAMBDA instead of lmin.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL},
-+ {"lmax", "Please use o=lmax=<value>*QP2LAMBDA instead of lmax.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL},
- {"mblmin", &lavc_param_mb_lmin, CONF_TYPE_FLOAT, CONF_RANGE, 0.01, 255.0, NULL},
- {"mblmax", &lavc_param_mb_lmax, CONF_TYPE_FLOAT, CONF_RANGE, 0.01, 255.0, NULL},
- {"vqdiff", &lavc_param_vqdiff, CONF_TYPE_INT, CONF_RANGE, 1, 31, NULL},
- {"vqcomp", &lavc_param_vqcompress, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 1.0, NULL},
- {"vqblur", &lavc_param_vqblur, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 1.0, NULL},
- {"vb_qfactor", &lavc_param_vb_qfactor, CONF_TYPE_FLOAT, CONF_RANGE, -31.0, 31.0, NULL},
-- {"vmax_b_frames", &lavc_param_vmax_b_frames, CONF_TYPE_INT, CONF_RANGE, 0, FF_MAX_B_FRAMES, NULL},
-+ {"vmax_b_frames", &lavc_param_vmax_b_frames, CONF_TYPE_INT, CONF_RANGE, 0, 16, NULL}, // FF_MAX_B_FRAMES was removed from FFmpeg. We still use its value here, so we probably limit ourselves in some cases.
- {"vpass", &lavc_param_vpass, CONF_TYPE_INT, CONF_RANGE, 0, 3, NULL},
-- {"vrc_strategy", &lavc_param_vrc_strategy, CONF_TYPE_INT, CONF_RANGE, 0, 2, NULL},
-+ {"vrc_strategy", "Please use o=rc_strategy=<value> instead of vrc_strategy.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL},
- {"vb_strategy", &lavc_param_vb_strategy, CONF_TYPE_INT, CONF_RANGE, 0, 10, NULL},
- {"vb_qoffset", &lavc_param_vb_qoffset, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 31.0, NULL},
- {"vlelim", "Please use o=luma_elim_threshold=<value> instead of vlelim.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL},
-@@ -217,16 +201,16 @@ const m_option_t lavcopts_conf[]={
- {"mpeg_quant", &lavc_param_mpeg_quant, CONF_TYPE_FLAG, 0, 0, 1, NULL},
- {"vi_qfactor", &lavc_param_vi_qfactor, CONF_TYPE_FLOAT, CONF_RANGE, -31.0, 31.0, NULL},
- {"vi_qoffset", &lavc_param_vi_qoffset, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 31.0, NULL},
-- {"vqsquish", &lavc_param_rc_qsquish, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 99.0, NULL},
-- {"vqmod_amp", &lavc_param_rc_qmod_amp, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 99.0, NULL},
-- {"vqmod_freq", &lavc_param_rc_qmod_freq, CONF_TYPE_INT, 0, 0, 0, NULL},
-- {"vrc_eq", &lavc_param_rc_eq, CONF_TYPE_STRING, 0, 0, 0, NULL},
-+ {"vqsquish", "Please use o=qsquish=<value> instead of vqsquish.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL},
-+ {"vqmod_amp", "Please use o=rc_qmod_amp=<value> instead of vqmod_amp.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL},
-+ {"vqmod_freq", "Please use o=rc_qmod_freq=<value> instead of vqmod_freq.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL},
-+ {"vrc_eq", "Please use o=rc_eq=<value> instead of vrc_eq.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL},
- {"vrc_override", &lavc_param_rc_override_string, CONF_TYPE_STRING, 0, 0, 0, NULL},
- {"vrc_maxrate", &lavc_param_rc_max_rate, CONF_TYPE_INT, CONF_RANGE, 0, MAX_BITRATE, NULL},
- {"vrc_minrate", &lavc_param_rc_min_rate, CONF_TYPE_INT, CONF_RANGE, 0, MAX_BITRATE, NULL},
- {"vrc_buf_size", &lavc_param_rc_buffer_size, CONF_TYPE_INT, CONF_RANGE, 4, MAX_BITRATE, NULL},
-- {"vrc_buf_aggressivity", &lavc_param_rc_buffer_aggressivity, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 99.0, NULL},
-- {"vrc_init_cplx", &lavc_param_rc_initial_cplx, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 9999999.0, NULL},
-+ {"vrc_buf_aggressivity", "Please use o=rc_buf_aggressivity=<value> instead of vrc_buf_aggressivity.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL},
-+ {"vrc_init_cplx", "Please use o=rc_init_cplx=<value> instead of vrc_init_cplx.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL},
- {"vrc_init_occupancy", &lavc_param_rc_initial_buffer_occupancy, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 1.0, NULL},
- {"vfdct", &lavc_param_fdct, CONF_TYPE_INT, CONF_RANGE, 0, 10, NULL},
- {"aspect", &lavc_param_aspect, CONF_TYPE_STRING, 0, 0, 0, NULL},
-@@ -235,7 +219,7 @@ const m_option_t lavcopts_conf[]={
- {"tcplx_mask", &lavc_param_temporal_cplx_masking, CONF_TYPE_FLOAT, CONF_RANGE, -1.0, 1.0, NULL},
- {"scplx_mask", &lavc_param_spatial_cplx_masking, CONF_TYPE_FLOAT, CONF_RANGE, -1.0, 1.0, NULL},
- {"p_mask", &lavc_param_p_masking, CONF_TYPE_FLOAT, CONF_RANGE, -1.0, 1.0, NULL},
-- {"naq", &lavc_param_normalize_aqp, CONF_TYPE_FLAG, 0, 0, 1, NULL},
-+ {"naq", "Please use o=mpv_flags=+naq instead of naq.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL},
- {"dark_mask", &lavc_param_dark_masking, CONF_TYPE_FLOAT, CONF_RANGE, -1.0, 1.0, NULL},
- {"ildct", &lavc_param_interlaced_dct, CONF_TYPE_FLAG, 0, 0, 1, NULL},
- {"idct", &lavc_param_idct, CONF_TYPE_INT, CONF_RANGE, 0, 20, NULL},
-@@ -266,8 +250,8 @@ const m_option_t lavcopts_conf[]={
- {"aiv", &lavc_param_aiv, CONF_TYPE_FLAG, 0, 0, 1, NULL},
- {"obmc", &lavc_param_obmc, CONF_TYPE_FLAG, 0, 0, 1, NULL},
- {"loop", &lavc_param_loop, CONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_LOOP_FILTER, NULL},
-- {"ibias", &lavc_param_ibias, CONF_TYPE_INT, CONF_RANGE, -512, 512, NULL},
-- {"pbias", &lavc_param_pbias, CONF_TYPE_INT, CONF_RANGE, -512, 512, NULL},
-+ {"ibias", "Please use o=ibias=<value> instead of ibias.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL},
-+ {"pbias", "Please use o=pbias=<value> instead of pbias.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL},
- {"coder", &lavc_param_coder, CONF_TYPE_INT, CONF_RANGE, 0, 10, NULL},
- {"context", &lavc_param_context, CONF_TYPE_INT, CONF_RANGE, 0, 10, NULL},
- {"intra_matrix", &lavc_param_intra_matrix, CONF_TYPE_STRING, 0, 0, 0, NULL},
-@@ -280,9 +264,9 @@ const m_option_t lavcopts_conf[]={
- {"alt", &lavc_param_alt, CONF_TYPE_FLAG, 0, 0, 1, NULL},
- {"ilme", &lavc_param_ilme, CONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_INTERLACED_ME, NULL},
- {"cgop", &lavc_param_closed_gop, CONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_CLOSED_GOP, NULL},
-- {"gmc", &lavc_param_gmc, CONF_TYPE_FLAG, 0, 0, CODEC_FLAG_GMC, NULL},
-+ {"gmc", "Please use o=gmc=<value> instead of gmc.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL},
- {"dc", &lavc_param_dc_precision, CONF_TYPE_INT, CONF_RANGE, 8, 11, NULL},
-- {"border_mask", &lavc_param_border_masking, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 1.0, NULL},
-+ {"border_mask", "Please use o=border_mask=<value> instead of border_mask.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL},
- {"inter_threshold", "inter_threshold has no effect, please remove it.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL},
- {"sc_threshold", &lavc_param_sc_threshold, CONF_TYPE_INT, CONF_RANGE, -1000000000, 1000000000, NULL},
- {"top", &lavc_param_top, CONF_TYPE_INT, CONF_RANGE, -1, 1, NULL},
-@@ -295,7 +279,7 @@ const m_option_t lavcopts_conf[]={
- {"skip_exp", &lavc_param_skip_exp, CONF_TYPE_INT, CONF_RANGE, 0, 1000000, NULL},
- {"brd_scale", &lavc_param_brd_scale, CONF_TYPE_INT, CONF_RANGE, 0, 10, NULL},
- {"bidir_refine", &lavc_param_bidir_refine, CONF_TYPE_INT, CONF_RANGE, 0, 4, NULL},
-- {"sc_factor", &lavc_param_sc_factor, CONF_TYPE_INT, CONF_RANGE, 1, INT_MAX, NULL},
-+ {"sc_factor", "sc_factor has no effect, please remove it.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL},
- {"vglobal", &lavc_param_video_global_header, CONF_TYPE_INT, CONF_RANGE, 0, INT_MAX, NULL},
- {"aglobal", &lavc_param_audio_global_header, CONF_TYPE_INT, CONF_RANGE, 0, INT_MAX, NULL},
- {"mv0_threshold", &lavc_param_mv0_threshold, CONF_TYPE_INT, CONF_RANGE, 0, INT_MAX, NULL},
-@@ -351,8 +335,6 @@ static int config(struct vf_instance *vf
- lavc_venc_context->time_base= (AVRational){mux_v->h.dwScale, mux_v->h.dwRate};
- lavc_venc_context->qmin= lavc_param_vqmin;
- lavc_venc_context->qmax= lavc_param_vqmax;
-- lavc_venc_context->lmin= (int)(FF_QP2LAMBDA * lavc_param_lmin + 0.5);
-- lavc_venc_context->lmax= (int)(FF_QP2LAMBDA * lavc_param_lmax + 0.5);
- lavc_venc_context->mb_lmin= (int)(FF_QP2LAMBDA * lavc_param_mb_lmin + 0.5);
- lavc_venc_context->mb_lmax= (int)(FF_QP2LAMBDA * lavc_param_mb_lmax + 0.5);
- lavc_venc_context->max_qdiff= lavc_param_vqdiff;
-@@ -360,17 +342,12 @@ static int config(struct vf_instance *vf
- lavc_venc_context->qblur= lavc_param_vqblur;
- lavc_venc_context->max_b_frames= lavc_param_vmax_b_frames;
- lavc_venc_context->b_quant_factor= lavc_param_vb_qfactor;
-- lavc_venc_context->rc_strategy= lavc_param_vrc_strategy;
- lavc_venc_context->b_frame_strategy= lavc_param_vb_strategy;
- lavc_venc_context->b_quant_offset= (int)(FF_QP2LAMBDA * lavc_param_vb_qoffset + 0.5);
- lavc_venc_context->rtp_payload_size= lavc_param_packet_size;
- lavc_venc_context->strict_std_compliance= lavc_param_strict;
- lavc_venc_context->i_quant_factor= lavc_param_vi_qfactor;
- lavc_venc_context->i_quant_offset= (int)(FF_QP2LAMBDA * lavc_param_vi_qoffset + 0.5);
-- lavc_venc_context->rc_qsquish= lavc_param_rc_qsquish;
-- lavc_venc_context->rc_qmod_amp= lavc_param_rc_qmod_amp;
-- lavc_venc_context->rc_qmod_freq= lavc_param_rc_qmod_freq;
-- lavc_venc_context->rc_eq= lavc_param_rc_eq;
-
- mux_v->max_rate=
- lavc_venc_context->rc_max_rate= lavc_param_rc_max_rate*1000;
-@@ -382,8 +359,6 @@ static int config(struct vf_instance *vf
- lavc_venc_context->rc_initial_buffer_occupancy=
- lavc_venc_context->rc_buffer_size *
- lavc_param_rc_initial_buffer_occupancy;
-- lavc_venc_context->rc_buffer_aggressivity= lavc_param_rc_buffer_aggressivity;
-- lavc_venc_context->rc_initial_cplx= lavc_param_rc_initial_cplx;
- lavc_venc_context->debug= lavc_param_debug;
- lavc_venc_context->last_predictor_count= lavc_param_last_pred;
- lavc_venc_context->pre_me= lavc_param_pre_me;
-@@ -391,8 +366,6 @@ static int config(struct vf_instance *vf
- lavc_venc_context->pre_dia_size= lavc_param_pre_dia_size;
- lavc_venc_context->me_subpel_quality= lavc_param_me_subpel_quality;
- lavc_venc_context->me_range= lavc_param_me_range;
-- lavc_venc_context->intra_quant_bias= lavc_param_ibias;
-- lavc_venc_context->inter_quant_bias= lavc_param_pbias;
- lavc_venc_context->coder_type= lavc_param_coder;
- lavc_venc_context->context_model= lavc_param_context;
- lavc_venc_context->scenechange_threshold= lavc_param_sc_threshold;
-@@ -479,7 +452,6 @@ static int config(struct vf_instance *vf
- lavc_venc_context->spatial_cplx_masking= lavc_param_spatial_cplx_masking;
- lavc_venc_context->p_masking= lavc_param_p_masking;
- lavc_venc_context->dark_masking= lavc_param_dark_masking;
-- lavc_venc_context->border_masking = lavc_param_border_masking;
-
- if (lavc_param_aspect != NULL)
- {
-@@ -552,20 +524,17 @@ static int config(struct vf_instance *vf
- if (lavc_param_alt)
- av_dict_set(&opts, "alternate_scan", "1", 0);
- lavc_venc_context->flags|= lavc_param_ilme;
-- lavc_venc_context->flags|= lavc_param_gmc;
- #ifdef AV_CODEC_FLAG_CLOSED_GOP
- lavc_venc_context->flags|= lavc_param_closed_gop;
- #endif
- lavc_venc_context->flags|= lavc_param_gray;
-
-- if(lavc_param_normalize_aqp) lavc_venc_context->flags|= CODEC_FLAG_NORMALIZE_AQP;
- if(lavc_param_interlaced_dct) lavc_venc_context->flags|= AV_CODEC_FLAG_INTERLACED_DCT;
- lavc_venc_context->flags|= lavc_param_psnr;
- lavc_venc_context->intra_dc_precision = lavc_param_dc_precision - 8;
- lavc_venc_context->prediction_method= lavc_param_prediction_method;
- lavc_venc_context->brd_scale = lavc_param_brd_scale;
- lavc_venc_context->bidir_refine = lavc_param_bidir_refine;
-- lavc_venc_context->scenechange_factor = lavc_param_sc_factor;
- if((lavc_param_video_global_header&1)
- /*|| (video_global_header==0 && (oc->oformat->flags & AVFMT_GLOBALHEADER))*/){
- lavc_venc_context->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
-@@ -648,8 +617,6 @@ static int config(struct vf_instance *vf
- }
- }
-
-- lavc_venc_context->me_method = ME_ZERO+lavc_param_vme;
--
- /* fixed qscale :p */
- if (lavc_param_vqscale >= 0.0)
- {
diff --git a/media-video/mplayer/files/mplayer-1.3-vdpau-x11.patch b/media-video/mplayer/files/mplayer-1.3-vdpau-x11.patch
deleted file mode 100644
index cfefb63deb9..00000000000
--- a/media-video/mplayer/files/mplayer-1.3-vdpau-x11.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-r37932 | al | 2017-04-20 01:06:04 +0200 (Thu, 20 Apr 2017) | 6 lines
-
-vo_vdpau: Explicitly include header vdpau_x11.h
-
-The include from inside libavcodec/vdpau.h was removed in FFmpeg
-commit d40e181bec22014a9ea312ab6837f7f0bc4f9e42 .
-
-Index: libvo/vo_vdpau.c
-===================================================================
---- a/libvo/vo_vdpau.c (revision 37931)
-+++ b/libvo/vo_vdpau.c (revision 37932)
-@@ -34,6 +34,7 @@
-
- #include <stdio.h>
- #include <strings.h>
-+#include <vdpau/vdpau_x11.h>
-
- #include "config.h"
- #include "sub/ass_mp.h"
diff --git a/media-video/mplayer/metadata.xml b/media-video/mplayer/metadata.xml
index 5f4a3dfe1b7..11e093c1f06 100644
--- a/media-video/mplayer/metadata.xml
+++ b/media-video/mplayer/metadata.xml
@@ -20,7 +20,6 @@
<flag name="md5sum">Enables md5sum video output</flag>
<flag name="mng">MNG input support</flag>
<flag name="network">Enables network streaming support</flag>
- <flag name="nut">Enables support for the NUT container format</flag>
<flag name="osdmenu">Enables support for on-screen display (OSD) menus</flag>
<flag name="pnm">Add PNM video output option, to create PPM/PGM/PGMYUV images</flag>
<flag name="pvr">Enable Video4Linux2 MPEG PVR</flag>
diff --git a/media-video/mplayer/mplayer-1.3.0-r6.ebuild b/media-video/mplayer/mplayer-1.3.0-r6.ebuild
deleted file mode 100644
index cc6c4c2db4c..00000000000
--- a/media-video/mplayer/mplayer-1.3.0-r6.ebuild
+++ /dev/null
@@ -1,609 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGIT_REPO_URI="https://git.ffmpeg.org/ffmpeg.git"
-ESVN_REPO_URI="svn://svn.mplayerhq.hu/mplayer/trunk"
-[[ ${PV} = *9999* ]] && SVN_ECLASS="subversion git-2" || SVN_ECLASS=""
-
-inherit toolchain-funcs flag-o-matic ${SVN_ECLASS}
-
-IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext a52 aalib +alsa altivec aqua bidi bl bluray
-bs2b cddb +cdio cdparanoia cpudetection debug dga
-doc dts dv dvb +dvd +dvdnav +enca +encode faac faad fbcon
-ftp ggi gsm +iconv ipv6 jack joystick jpeg kernel_linux ladspa
-+libass libcaca libmpeg2 lirc live lzo mad md5sum cpu_flags_x86_mmx cpu_flags_x86_mmxext mng mp3 nas
-+network nut openal opengl +osdmenu oss png pnm pulseaudio pvr
-radio rar rtc rtmp samba selinux +shm sdl speex cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_ssse3
-tga theora tremor +truetype toolame twolame +unicode v4l vcd vdpau vidix
-vorbis +X x264 xinerama +xscreensaver +xv xvid yuv4mpeg zoran"
-
-VIDEO_CARDS="mga"
-for x in ${VIDEO_CARDS}; do
- IUSE+=" video_cards_${x}"
-done
-
-FONT_URI="
- mirror://mplayer/releases/fonts/font-arial-iso-8859-1.tar.bz2
- mirror://mplayer/releases/fonts/font-arial-iso-8859-2.tar.bz2
- mirror://mplayer/releases/fonts/font-arial-cp1250.tar.bz2
-"
-if [[ ${PV} == *9999* ]]; then
- RELEASE_URI=""
-elif [ "${PV%_rc*}" = "${PV}" -a "${PV%_pre*}" = "${PV}" ]; then
- MY_P="MPlayer-${PV}"
- S="${WORKDIR}/${MY_P}"
- RELEASE_URI="mirror://mplayer/releases/${MY_P}.tar.xz"
-else
- RELEASE_URI="mirror://gentoo/${P}.tar.xz"
-fi
-SRC_URI="${RELEASE_URI}
- https://dev.gentoo.org/~juippis/distfiles/tmp/mplayer-1.3-ffmpeg4.patch
- !truetype? ( ${FONT_URI} )"
-
-DESCRIPTION="Media Player for Linux"
-HOMEPAGE="http://www.mplayerhq.hu/"
-
-FONT_RDEPS="
- virtual/ttf-fonts
- media-libs/fontconfig
- >=media-libs/freetype-2.2.1:2
-"
-X_RDEPS="
- x11-libs/libXext
- x11-libs/libXxf86vm
-"
-# Rar: althrought -gpl version is nice, it cant do most functions normal rars can
-# nemesi? ( net-libs/libnemesi )
-# mplayer relies on private APIs in giflib that have been removed:
-# https://sourceforge.net/p/giflib/bugs/132/
-RDEPEND+="
- sys-libs/ncurses:0=
- app-arch/bzip2
- sys-libs/zlib
- >=media-video/ffmpeg-3.0:0=[vdpau?]
- a52? ( media-libs/a52dec )
- aalib? ( media-libs/aalib )
- alsa? ( media-libs/alsa-lib )
- bidi? ( dev-libs/fribidi )
- bluray? ( >=media-libs/libbluray-0.2.1:= )
- bs2b? ( media-libs/libbs2b )
- cdio? ( dev-libs/libcdio:0= dev-libs/libcdio-paranoia )
- cdparanoia? ( !cdio? ( media-sound/cdparanoia ) )
- dga? ( x11-libs/libXxf86dga )
- dts? ( media-libs/libdca )
- dv? ( media-libs/libdv )
- dvd? ( >=media-libs/libdvdread-4.1.3:0= )
- dvdnav? ( >=media-libs/libdvdnav-4.1.3:0= )
- encode? (
- !twolame? ( toolame? ( media-sound/toolame ) )
- twolame? ( media-sound/twolame )
- faac? ( media-libs/faac )
- mp3? ( media-sound/lame )
- x264? ( >=media-libs/x264-0.0.20100423:= )
- xvid? ( media-libs/xvid )
- )
- enca? ( app-i18n/enca )
- faad? ( media-libs/faad2 )
- ggi? ( media-libs/libggi media-libs/libggiwmh )
- gsm? ( media-sound/gsm )
- iconv? ( virtual/libiconv )
- jack? ( virtual/jack )
- jpeg? ( virtual/jpeg:0 )
- ladspa? ( media-libs/ladspa-sdk )
- libass? ( >=media-libs/libass-0.9.10:= )
- libcaca? ( media-libs/libcaca )
- libmpeg2? ( media-libs/libmpeg2 )
- lirc? ( app-misc/lirc )
- live? ( media-plugins/live )
- lzo? ( >=dev-libs/lzo-2 )
- mad? ( media-libs/libmad )
- mng? ( media-libs/libmng:= )
- mp3? ( media-sound/mpg123 )
- nas? ( media-libs/nas )
- nut? ( >=media-libs/libnut-661 )
- openal? ( media-libs/openal )
- opengl? ( virtual/opengl )
- png? ( media-libs/libpng:0= )
- pnm? ( media-libs/netpbm )
- pulseaudio? ( media-sound/pulseaudio )
- rar? (
- || (
- app-arch/unrar
- app-arch/rar
- )
- )
- rtmp? ( media-video/rtmpdump )
- samba? ( net-fs/samba )
- sdl? ( media-libs/libsdl )
- speex? ( media-libs/speex )
- theora? ( media-libs/libtheora[encode?] )
- tremor? ( media-libs/tremor )
- truetype? ( ${FONT_RDEPS} )
- vdpau? ( x11-libs/libvdpau )
- vorbis? ( !tremor? ( media-libs/libvorbis ) )
- X? ( ${X_RDEPS} )
- xinerama? ( x11-libs/libXinerama )
- xscreensaver? ( x11-libs/libXScrnSaver )
- xv? ( x11-libs/libXv )
-"
-
-ASM_DEP="dev-lang/yasm"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- dga? ( x11-base/xorg-proto )
- dvb? ( virtual/linuxtv-dvb-headers )
- X? ( x11-base/xorg-proto )
- xinerama? ( x11-base/xorg-proto )
- xscreensaver? ( x11-base/xorg-proto )
- amd64? ( ${ASM_DEP} )
- doc? (
- dev-libs/libxslt app-text/docbook-xml-dtd
- app-text/docbook-xsl-stylesheets
- )
- x86? ( ${ASM_DEP} )
- x86-fbsd? ( ${ASM_DEP} )
-"
-RDEPEND+="
- selinux? ( sec-policy/selinux-mplayer )
-"
-
-SLOT="0"
-LICENSE="GPL-2"
-if [[ ${PV} != *9999* ]]; then
- KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
-fi
-
-# faac codecs are nonfree
-# libcdio support: prefer libcdio over cdparanoia and don't check for cddb w/cdio
-# dvd navigation requires dvd read support
-# ass and freetype font require iconv and ass requires freetype fonts
-# unicode transformations are usefull only with iconv
-# radio requires oss or alsa backend
-REQUIRED_USE="
- dga? ( X )
- dvdnav? ( dvd )
- enca? ( iconv )
- ggi? ( X )
- libass? ( truetype )
- opengl? ( X )
- osdmenu? ( X )
- truetype? ( iconv )
- vdpau? ( X )
- vidix? ( X )
- xinerama? ( X )
- xscreensaver? ( X )
- xv? ( X )"
-RESTRICT="faac? ( bindist )"
-
-PATCHES=( "${FILESDIR}/${PN}-1.3-vdpau-x11.patch" )
-
-pkg_setup() {
- if [[ ${PV} == *9999* ]]; then
- elog
- elog "This is a live ebuild which installs the latest from upstream's"
- elog "subversion repository, and is unsupported by Gentoo."
- elog "Everything but bugs in the ebuild itself will be ignored."
- elog
- fi
-
- if use cpudetection; then
- ewarn
- ewarn "You've enabled the cpudetection flag. This feature is"
- ewarn "included mainly for people who want to use the same"
- ewarn "binary on another system with a different CPU architecture."
- ewarn "MPlayer will already detect your CPU settings by default at"
- ewarn "buildtime; this flag is used for runtime detection."
- ewarn "You won't need this turned on if you are only building"
- ewarn "mplayer for this system. Also, if your compile fails, try"
- ewarn "disabling this use flag."
- fi
-}
-
-src_unpack() {
- if [[ ${PV} = *9999* ]]; then
- subversion_src_unpack
- cd "${WORKDIR}"
- rm -rf "${WORKDIR}/${P}/ffmpeg/"
- ( S="${WORKDIR}/${P}/ffmpeg/" git-2_src_unpack )
- else
- unpack ${A}
- fi
-
- if [[ ${PV} = *9999* ]] || [[ "${PV%_rc*}" = "${PV}" ]]; then
- cd "${S}"
- cp "${FILESDIR}/dump_ffmpeg.sh" . || die
- chmod +x dump_ffmpeg.sh
- ./dump_ffmpeg.sh || die
- fi
-
- if ! use truetype; then
- unpack font-arial-iso-8859-1.tar.bz2 \
- font-arial-iso-8859-2.tar.bz2 \
- font-arial-cp1250.tar.bz2
- fi
-}
-
-src_prepare() {
- default
-
- local svf=snapshot_version
- if [[ ${PV} = *9999* ]]; then
- # Set SVN version manually
- subversion_wc_info
- printf "${ESVN_WC_REVISION}" > $svf
- else
- eapply "${FILESDIR}"/${PN}-1.3.0-freetype_pkgconfig.patch #655240
- eapply "${FILESDIR}"/${PN}-1.3-CVE-2016-4352.patch
- has_version '>media-video/ffmpeg-3.5' && eapply "${DISTDIR}"/${PN}-1.3-ffmpeg4.patch "${FILESDIR}"/${PN}-1.3-ffmpeg4+mencoder.patch
- fi
- if [ ! -f VERSION ] ; then
- [ -f "$svf" ] || die "Missing ${svf}. Did you generate your snapshot with prepare_mplayer.sh?"
- local sv=$(<$svf)
- printf "SVN-r${sv} (Gentoo)" > VERSION
- fi
-
- # fix path to bash executable in configure scripts
- sed -i -e "1c\#!${EPREFIX}/bin/bash" configure version.sh || die
-
- # Use sane default for >=virtual/udev-197
- sed -i -e '/default_dvd_device/s:/dev/dvd:/dev/cdrom:' configure || die
-}
-
-src_configure() {
- local myconf=""
- local uses i
-
- # set LINGUAS
- [[ -n $LINGUAS ]] && LINGUAS="${LINGUAS/da/dk}"
- [[ -n $LINGUAS ]] && LINGUAS="${LINGUAS/zh/zh_CN}" #482968
-
- # mplayer ebuild uses "use foo || --disable-foo" to forcibly disable
- # compilation in almost every situation. The reason for this is
- # because if --enable is used, it will force the build of that option,
- # regardless of whether the dependency is available or not.
-
- ###################
- #Optional features#
- ###################
- # disable svga since we don't want it
- # disable arts since we don't have kde3
- # always disable internal ass
- # disable opus and ilbc since it only controls support in internal
- # ffmpeg which we do not use
- myconf+="
- --disable-svga --disable-svgalib_helper
- --disable-ass-internal
- --disable-arts
- --disable-directfb
- --disable-kai
- --disable-libopus
- --disable-libilbc
- --disable-xvmc
- $(use_enable network networking)
- $(use_enable joystick)
- "
- uses="bl bluray enca ftp rtc vcd" # nemesi <- not working with in-tree ebuild
- myconf+=" --disable-nemesi" # nemesi automagic disable
- for i in ${uses}; do
- use ${i} || myconf+=" --disable-${i}"
- done
- use bidi || myconf+=" --disable-fribidi"
- use ipv6 || myconf+=" --disable-inet6"
- use libass || myconf+=" --disable-ass"
- use nut || myconf+=" --disable-libnut"
- use rar || myconf+=" --disable-unrarexec"
- use samba || myconf+=" --disable-smb"
- use lirc || myconf+=" --disable-lirc --disable-lircc --disable-apple-ir"
-
- # libcdio support: prefer libcdio over cdparanoia
- # don't check for cddb w/cdio
- if use cdio; then
- myconf+=" --disable-cdparanoia"
- else
- myconf+=" --disable-libcdio"
- use cdparanoia || myconf+=" --disable-cdparanoia"
- use cddb || myconf+=" --disable-cddb"
- fi
-
- ################################
- # DVD read, navigation support #
- ################################
- #
- # dvdread - accessing a DVD
- # dvdnav - navigation of menus
- use dvd || myconf+=" --disable-dvdread"
- use dvdnav || myconf+=" --disable-dvdnav"
-
- #############
- # Subtitles #
- #############
- #
- # SRT/ASS/SSA (subtitles) requires freetype support
- # freetype support requires iconv
- # iconv optionally can use unicode
- use truetype || myconf+=" --disable-freetype"
- use iconv || myconf+=" --disable-iconv --charset=noconv"
- use iconv && use unicode && myconf+=" --charset=UTF-8"
-
- #####################################
- # DVB / Video4Linux / Radio support #
- #####################################
- myconf+=" --disable-tv-bsdbt848"
- # broken upstream, won't work with recent kernels
- myconf+=" --disable-ivtv"
- # gone since linux-headers-2.6.38
- myconf+=" --disable-tv-v4l1"
- if { use dvb || use v4l || use pvr || use radio; }; then
- use dvb || myconf+=" --disable-dvb"
- use pvr || myconf+=" --disable-pvr"
- use v4l || myconf+=" --disable-tv-v4l2"
- if use radio && { use dvb || use v4l; }; then
- myconf+="
- --enable-radio
- $(use_enable encode radio-capture)
- "
- else
- myconf+="
- --disable-radio-v4l2
- --disable-radio-bsdbt848
- "
- fi
- else
- myconf+="
- --disable-tv
- --disable-tv-v4l2
- --disable-radio
- --disable-radio-v4l2
- --disable-radio-bsdbt848
- --disable-dvb
- --disable-v4l2
- --disable-pvr"
- fi
-
- ##########
- # Codecs #
- ##########
- myconf+=" --disable-musepack" # Use internal musepack codecs for SV7 and SV8 support
- myconf+=" --disable-libmpeg2-internal" # always use system media-libs/libmpeg2
- myconf+=" --disable-gif" # relies on to-be-removed giflib internals https://sourceforge.net/p/giflib/bugs/132/
- use dts || myconf+=" --disable-libdca"
- if ! use mp3; then
- myconf+="
- --disable-mp3lame
- --disable-mpg123
- "
- fi
- uses="a52 bs2b dv gsm lzo rtmp vorbis"
- for i in ${uses}; do
- use ${i} || myconf+=" --disable-lib${i}"
- done
-
- uses="faad jpeg libmpeg2 live mad mng png pnm speex tga theora tremor"
- for i in ${uses}; do
- use ${i} || myconf+=" --disable-${i}"
- done
- # Pulls an outdated libopenjpeg, ffmpeg provides better support for it
- myconf+=" --disable-libopenjpeg"
-
- # Encoding
- uses="faac x264 xvid toolame twolame"
- if use encode; then
- for i in ${uses}; do
- use ${i} || myconf+=" --disable-${i}"
- done
- else
- myconf+=" --disable-mencoder"
- for i in ${uses}; do
- myconf+=" --disable-${i}"
- use ${i} && elog "Useflag \"${i}\" will only be useful for encoding, i.e., with \"encode\" useflag enabled."
- done
- fi
-
- #################
- # Binary codecs #
- #################
- myconf+=" --disable-qtx --disable-real --disable-win32dll"
-
- ################
- # Video Output #
- ################
- uses="md5sum sdl yuv4mpeg"
- for i in ${uses}; do
- use ${i} || myconf+=" --disable-${i}"
- done
- use aalib || myconf+=" --disable-aa"
- use fbcon || myconf+=" --disable-fbdev"
- use libcaca || myconf+=" --disable-caca"
- use zoran || myconf+=" --disable-zr"
-
- if ! use kernel_linux || ! use video_cards_mga; then
- myconf+=" --disable-mga --disable-xmga"
- fi
-
- myconf+="
- --disable-3dfx
- --disable-tdfxvid
- --disable-tdfxfb
- "
-
- # sun card, disable by default, see bug #258729
- myconf+=" --disable-xvr100"
-
- ################
- # Audio Output #
- ################
- myconf+=" --disable-esd"
- uses="alsa jack ladspa nas openal"
- for i in ${uses}; do
- use ${i} || myconf+=" --disable-${i}"
- done
- use pulseaudio || myconf+=" --disable-pulse"
- if ! use radio; then
- use oss || myconf+=" --disable-ossaudio"
- fi
-
- ####################
- # Advanced Options #
- ####################
- # Platform specific flags, hardcoded on amd64 (see below)
- use cpudetection && myconf+=" --enable-runtime-cpudetection"
-
- uses="3dnow 3dnowext mmx mmxext sse sse2 ssse3"
- for i in ${uses}; do
- myconf+=" $(use_enable cpu_flags_x86_${i} ${i})"
- done
-
- uses="altivec shm"
- for i in ${uses}; do
- myconf+=" $(use_enable ${i})"
- done
-
- use debug && myconf+=" --enable-debug=3"
-
- if use x86 && gcc-specs-pie; then
- filter-flags -fPIC -fPIE
- append-ldflags -nopie
- fi
-
- ###########################
- # X enabled configuration #
- ###########################
- myconf+=" --disable-gui"
- myconf+=" --disable-vesa"
- uses="ggi vdpau xinerama xv"
- for i in ${uses}; do
- use ${i} || myconf+=" --disable-${i}"
- done
- use dga || myconf+=" --disable-dga1 --disable-dga2"
- use opengl || myconf+=" --disable-gl"
- use osdmenu && myconf+=" --enable-menu"
- use vidix || myconf+=" --disable-vidix --disable-vidix-pcidb"
- use xscreensaver || myconf+=" --disable-xss"
- use X || myconf+=" --disable-x11"
-
- ############################
- # OSX (aqua) configuration #
- ############################
- if use aqua; then
- myconf+="
- --enable-macosx-finder
- --enable-macosx-bundle
- "
- fi
-
- ./configure \
- --cc="$(tc-getCC)" \
- --host-cc="$(tc-getBUILD_CC)" \
- --prefix="${EPREFIX}/usr" \
- --bindir="${EPREFIX}/usr/bin" \
- --libdir="${EPREFIX}/usr/$(get_libdir)" \
- --confdir="${EPREFIX}/etc/mplayer" \
- --datadir="${EPREFIX}/usr/share/mplayer${namesuf}" \
- --mandir="${EPREFIX}/usr/share/man" \
- --disable-ffmpeg_a \
- ${myconf} || die
-}
-
-src_compile() {
- default
-
- # Build only user-requested docs if they're available.
- if use doc ; then
- # select available languages from $LINGUAS
- local ALLOWED_LINGUAS="cs de en es fr hu it pl ru zh_CN"
- local BUILT_DOCS=""
- for i in ${LINGUAS} ; do
- has ${i} ${ALLOWED_LINGUAS} && BUILT_DOCS+=" ${i}"
- done
- if [[ -z $BUILT_DOCS ]]; then
- emake -j1 html-chunked
- else
- for i in ${BUILT_DOCS}; do
- emake -j1 html-chunked-${i}
- done
- fi
- fi
-}
-
-src_install() {
- local i
-
- emake \
- DESTDIR="${D}" \
- INSTALLSTRIP="" \
- install
-
- dodoc AUTHORS Changelog Copyright README etc/codecs.conf
-
- docinto tech/
- dodoc DOCS/tech/{*.txt,MAINTAINERS,mpsub.sub,playtree,TODO,wishlist}
- docinto TOOLS/
- dodoc -r TOOLS/*
- docinto tech/mirrors/
- dodoc DOCS/tech/mirrors/*
-
- if use doc; then
- docinto html/
- dohtml -r "${S}"/DOCS/HTML/*
- fi
-
- if ! use truetype; then
- dodir /usr/share/mplayer/fonts
- # Do this generic, as the mplayer people like to change the structure
- # of their zips ...
- for i in $(find "${WORKDIR}/" -type d -name 'font-arial-*'); do
- cp -pPR "${i}" "${ED}/usr/share/mplayer/fonts"
- done
- # Fix the font symlink ...
- rm -rf "${ED}/usr/share/mplayer/font"
- dosym fonts/font-arial-14-iso-8859-1 /usr/share/mplayer/font
- fi
-
- insinto /etc/mplayer
- newins "${S}/etc/example.conf" mplayer.conf
- cat >> "${ED}/etc/mplayer/mplayer.conf" << _EOF_
-# Config options can be section specific, global
-# options should go in the default section
-[default]
-_EOF_
- doins "${S}/etc/input.conf"
- if use osdmenu; then
- doins "${S}/etc/menu.conf"
- fi
-
- if use truetype; then
- cat >> "${ED}/etc/mplayer/mplayer.conf" << _EOF_
-fontconfig=1
-subfont-osd-scale=4
-subfont-text-scale=3
-_EOF_
- fi
-
- # bug 256203
- if use rar; then
- cat >> "${ED}/etc/mplayer/mplayer.conf" << _EOF_
-unrarexec=${EPREFIX}/usr/bin/unrar
-_EOF_
- fi
-
- dosym ../../../etc/mplayer/mplayer.conf /usr/share/mplayer/mplayer.conf
- newbin "${S}/TOOLS/midentify.sh" midentify
-}
-
-pkg_preinst() {
- [[ -d ${EROOT}/usr/share/mplayer/Skin/default ]] && \
- rm -rf "${EROOT}/usr/share/mplayer/Skin/default"
-}
-
-pkg_postrm() {
- # Cleanup stale symlinks
- [ -L "${EROOT}/usr/share/mplayer/font" -a \
- ! -e "${EROOT}/usr/share/mplayer/font" ] && \
- rm -f "${EROOT}/usr/share/mplayer/font"
-
- [ -L "${EROOT}/usr/share/mplayer/subfont.ttf" -a \
- ! -e "${EROOT}/usr/share/mplayer/subfont.ttf" ] && \
- rm -f "${EROOT}/usr/share/mplayer/subfont.ttf"
-}
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/mplayer/files/, media-video/mplayer/
@ 2023-02-15 7:36 Sam James
0 siblings, 0 replies; 10+ messages in thread
From: Sam James @ 2023-02-15 7:36 UTC (permalink / raw
To: gentoo-commits
commit: 182bb7a92d0e6fc1f0bc32546d53d12f40d86215
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 15 07:25:19 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Feb 15 07:25:59 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=182bb7a9
media-video/mplayer: add 1.5_p20230215 (snapshot for >=ffmpeg-5, unkw'd for now)
Unkeyworded until had some more testing (please let us know in a comment
on one of the linked bugs if it works/doesn't).
Bug: https://bugs.gentoo.org/876760
Bug: https://bugs.gentoo.org/888821
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-video/mplayer/Manifest | 1 +
media-video/mplayer/files/prepare_mplayer.sh | 42 +++++++++++++---------
...er-9999.ebuild => mplayer-1.5_p20230215.ebuild} | 16 +++++----
media-video/mplayer/mplayer-9999.ebuild | 10 ++++--
4 files changed, 44 insertions(+), 25 deletions(-)
diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index a97a4832bde1..9fb82b326254 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -2,3 +2,4 @@ DIST MPlayer-1.5.tar.xz 15379972 BLAKE2B 33c09025a9c521e1bc09a50fabb04e89493cbc4
DIST font-arial-cp1250.tar.bz2 249705 BLAKE2B eb4366a110d917dc975b8add168ab43b1e8a0db7342647f69f5421fc1170719015c97ffa770e89892cbb4cee8e5b2fb74a4772c8f6cbef9606ee12c3746d78c9 SHA512 4f77ff5ceb8ec6e5d9f8f34d8950a6a6276d1fd5a947772fcbdb6554988b1ea665c12b82f45164f91fb7bd08000cb4afc26fa35beb4c760464160e22b9b8c340
DIST font-arial-iso-8859-1.tar.bz2 234242 BLAKE2B 0671854e1a257d27b502affb59de681942a93990d3ac2575bbf1a6dd9eef026969f2f9ce4e9c11a68ea3d8aed48063f826a1e153f7468437a39791672c92a5d0 SHA512 a1d03b6f09c48f48b7733f3bc0402ceab239a9abf88b860d852ea9fe69b4da690208a79d6f29d30204f5b37becf10672e8e8c0bfef201846d80ec54df617d029
DIST font-arial-iso-8859-2.tar.bz2 222208 BLAKE2B 94b1a04672bf9b4b20a0e6981591e761f751bd637deddcb801855296c525bf3b5e8feb1cb11cef282c0269f2c963ded22846089076e7e6763f258b8a932af454 SHA512 5671e628303fd816f64a51ad10e2f4dd9c3dc1b34c379a2ecf489b83931db7af668aaa4e00e96a00cacd63ed98daeae6b6a4d5925edfb06fc98d3a923f70257d
+DIST mplayer-1.5_p20230215.tar.xz 15454028 BLAKE2B 08012f9b955921d832ab268a6e52e22e018b669787ff5e1c1ac734bd85083138551ad1065d5e4f5f9c977b804f8135ee89d2fd0590fb7228d4916b458cc58efa SHA512 f93d222817ff59ac7708956d6e8d5e9ee2084b4e724f66ea9fe4ffd477b864c2d0546d8df97511d499495ee446239645216a1e027d70eed434a3c64331f5ac73
diff --git a/media-video/mplayer/files/prepare_mplayer.sh b/media-video/mplayer/files/prepare_mplayer.sh
index 57d47425689f..88ae8773cea8 100644
--- a/media-video/mplayer/files/prepare_mplayer.sh
+++ b/media-video/mplayer/files/prepare_mplayer.sh
@@ -1,25 +1,35 @@
-#!/bin/sh
+#!/usr/bin/env bash
+. /lib/gentoo/functions.sh || { echo "Failed to source gentoo-functions!" ; exit 1 ; }
VERSION=$(date +%Y%m%d)
-PACKAGE="mplayer-1.2_pre${VERSION}"
-DUMP_FFMPEG="$(dirname $0)/dump_ffmpeg.sh"
+PACKAGE="mplayer-1.5_p${VERSION}"
+DUMP_FFMPEG="$(realpath $(dirname $0)/dump_ffmpeg.sh)"
+ebegin "Fetching mplayer from svn"
svn checkout svn://svn.mplayerhq.hu/mplayer/trunk ${PACKAGE}
+eend $?
-pushd ${PACKAGE} > /dev/null
- # ffmpeg is in git now so no svn external anymore
- rm -rf ffmpeg
- git clone git://source.ffmpeg.org/ffmpeg.git ffmpeg/
- sh "$DUMP_FFMPEG"
- STORE_VERSION=$(LC_ALL=C svn info 2> /dev/null | grep Revision | cut -d' ' -f2)
- printf "$STORE_VERSION" > snapshot_version
-popd > /dev/null
+pushd ${PACKAGE} > /dev/null || { eerror "Moving to ${PACKAGE} dir failed!" ; exit 1 ; }
+ # ffmpeg is in git now so no svn external anymore
+ rm -rf ffmpeg
+
+ ebegin "Cloning ffmpeg from git"
+ git clone https://git.ffmpeg.org/ffmpeg.git
+ eend $?
+
+ einfo "Extracting version"
+ # This should be fatal but it hasn't been fatal in the live ebuild
+ # for years and it needs fixing, so...
+ bash "${DUMP_FFMPEG}" || ewarn "Dumping ffmpeg failed!"
+ STORE_VERSION=$(LC_ALL=C svn info 2> /dev/null | grep Revision | cut -d' ' -f2)
+ printf "${STORE_VERSION}" > snapshot_version
+ einfo "Got version ${STORE_VERSION}"
+popd > /dev/null || { eerror "Returning to previous dir failed!" ; exit 1 ; }
find "${PACKAGE}" -type d -name '.svn' -prune -print0 | xargs -0 rm -rf
find "${PACKAGE}" -type d -name '.git' -prune -print0 | xargs -0 rm -rf
-tar cJf ${PACKAGE}.tar.xz ${PACKAGE}
-rm -rf ${PACKAGE}/
-
-echo "Tarball: \"${PACKAGE}.tar.xz\""
+tar --exclude-vcs -cJf ${PACKAGE}.tar.xz ${PACKAGE} || { eerror "Tar creation failed! Error: $?" ; exit 1 ; }
+rm -rf ${PACKAGE}/ || { eerror "Removal of ${PACKAGE}? failed! Error: $?" ; exit 1 ; }
-echo "** all done **"
+einfo "Tarball: \"${PACKAGE}.tar.xz\""
+einfo "** all done **"
diff --git a/media-video/mplayer/mplayer-9999.ebuild b/media-video/mplayer/mplayer-1.5_p20230215.ebuild
similarity index 96%
copy from media-video/mplayer/mplayer-9999.ebuild
copy to media-video/mplayer/mplayer-1.5_p20230215.ebuild
index c938cefbf668..b74a6e409f8e 100644
--- a/media-video/mplayer/mplayer-9999.ebuild
+++ b/media-video/mplayer/mplayer-1.5_p20230215.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -11,12 +11,16 @@ if [[ ${PV} == *9999* ]]; then
RELEASE_URI=""
inherit subversion git-r3
-elif [[ "${PV%_rc*}" == "${PV}" && "${PV%_pre*}" == "${PV}" ]]; then
+elif [[ "${PV%_rc*}" == "${PV}" && "${PV%_pre*}" == "${PV}" && "${PV%_p*}" == "${PV}" ]]; then
MY_P="MPlayer-${PV}"
S="${WORKDIR}/${MY_P}"
RELEASE_URI="mirror://mplayer/releases/${MY_P}.tar.xz"
else
- RELEASE_URI="mirror://gentoo/${P}.tar.xz"
+ # If necessary, don't be afraid to make a snapshot.
+ # http://www.mplayerhq.hu/design7/dload.html says:
+ # "We recommend to always use the latest SVN to get the all the new
+ # features and bugfixes, especially if the release date above looks old."
+ RELEASE_URI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}.tar.xz"
fi
FONT_URI="
@@ -161,9 +165,9 @@ RDEPEND+="selinux? ( sec-policy/selinux-mplayer )"
LICENSE="GPL-2"
SLOT="0"
-if [[ ${PV} != *9999* ]]; then
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-fi
+#if [[ ${PV} != *9999* ]]; then
+# KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+#fi
# faac codecs are nonfree
# libcdio support: prefer libcdio over cdparanoia and don't check for cddb w/cdio
diff --git a/media-video/mplayer/mplayer-9999.ebuild b/media-video/mplayer/mplayer-9999.ebuild
index c938cefbf668..31de25e10b42 100644
--- a/media-video/mplayer/mplayer-9999.ebuild
+++ b/media-video/mplayer/mplayer-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -11,12 +11,16 @@ if [[ ${PV} == *9999* ]]; then
RELEASE_URI=""
inherit subversion git-r3
-elif [[ "${PV%_rc*}" == "${PV}" && "${PV%_pre*}" == "${PV}" ]]; then
+elif [[ "${PV%_rc*}" == "${PV}" && "${PV%_pre*}" == "${PV}" && "${PV%_p*}" == "${PV}" ]]; then
MY_P="MPlayer-${PV}"
S="${WORKDIR}/${MY_P}"
RELEASE_URI="mirror://mplayer/releases/${MY_P}.tar.xz"
else
- RELEASE_URI="mirror://gentoo/${P}.tar.xz"
+ # If necessary, don't be afraid to make a snapshot.
+ # http://www.mplayerhq.hu/design7/dload.html says:
+ # "We recommend to always use the latest SVN to get the all the new
+ # features and bugfixes, especially if the release date above looks old."
+ RELEASE_URI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}.tar.xz"
fi
FONT_URI="
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/mplayer/files/, media-video/mplayer/
@ 2023-12-06 8:32 Sam James
0 siblings, 0 replies; 10+ messages in thread
From: Sam James @ 2023-12-06 8:32 UTC (permalink / raw
To: gentoo-commits
commit: fa1593152d4a210b8ac3327557620746b6ddb152
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 6 08:28:04 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Dec 6 08:31:40 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa159315
media-video/mplayer: backport gcc-13 fix
The snapshot I just pushed (1.5_p20231206) will fix it for ~arch users, but let's
backport this for stable.
Bug: https://bugs.gentoo.org/918113
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-video/mplayer/files/mplayer-1.5_p20230618-gcc13.patch | 11 +++++++++++
media-video/mplayer/mplayer-1.5_p20230618.ebuild | 4 ++++
2 files changed, 15 insertions(+)
diff --git a/media-video/mplayer/files/mplayer-1.5_p20230618-gcc13.patch b/media-video/mplayer/files/mplayer-1.5_p20230618-gcc13.patch
new file mode 100644
index 000000000000..0aab0273d424
--- /dev/null
+++ b/media-video/mplayer/files/mplayer-1.5_p20230618-gcc13.patch
@@ -0,0 +1,11 @@
+https://bugs.gentoo.org/918113
+--- a/libmpcodecs/mp_image.c
++++ b/libmpcodecs/mp_image.c
+@@ -30,6 +30,7 @@
+ #include "libmpcodecs/mp_image.h"
+ #include "libvo/fastmemcpy.h"
+ #include "libavutil/mem.h"
++#include <limits.h>
+ #include "mp_msg.h"
+
+ void mp_image_alloc_planes(mp_image_t *mpi) {
diff --git a/media-video/mplayer/mplayer-1.5_p20230618.ebuild b/media-video/mplayer/mplayer-1.5_p20230618.ebuild
index 3acf8571df98..9a7535cdde6b 100644
--- a/media-video/mplayer/mplayer-1.5_p20230618.ebuild
+++ b/media-video/mplayer/mplayer-1.5_p20230618.ebuild
@@ -194,6 +194,10 @@ REQUIRED_USE="
xv? ( X )"
RESTRICT="faac? ( bindist )"
+PATCHES=(
+ "${FILESDIR}"/${P}-gcc13.patch
+)
+
pkg_setup() {
if [[ ${PV} == *9999* ]]; then
elog
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/mplayer/files/, media-video/mplayer/
@ 2024-07-06 19:54 Miroslav Šulc
0 siblings, 0 replies; 10+ messages in thread
From: Miroslav Šulc @ 2024-07-06 19:54 UTC (permalink / raw
To: gentoo-commits
commit: 76235aeef01e3657daefac65f7d20c362eb71f76
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 6 19:53:58 2024 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sat Jul 6 19:54:07 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76235aee
media-video/mplayer: fixed incompatible pointers
Closes: https://bugs.gentoo.org/922624
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
...layer-1.5_p20231206-incompatible-pointers.patch | 287 +++++++++++++++++++++
media-video/mplayer/mplayer-1.5_p20231206.ebuild | 4 +
2 files changed, 291 insertions(+)
diff --git a/media-video/mplayer/files/mplayer-1.5_p20231206-incompatible-pointers.patch b/media-video/mplayer/files/mplayer-1.5_p20231206-incompatible-pointers.patch
new file mode 100644
index 000000000000..2fe47a941685
--- /dev/null
+++ b/media-video/mplayer/files/mplayer-1.5_p20231206-incompatible-pointers.patch
@@ -0,0 +1,287 @@
+--- a/libaf/af_lavcresample.c
++++ b/libaf/af_lavcresample.c
+@@ -156,7 +156,7 @@ static af_data_t* play(struct af_instance_s* af, af_data_t* data)
+
+ memcpy(s->in[0], in, in_len);
+
+- ret = swr_convert(s->swrctx, &s->tmp[0], out_len/chans/2, &s->in[0], in_len/chans/2);
++ ret = swr_convert(s->swrctx, &s->tmp[0], out_len/chans/2, (const uint8_t **)&s->in[0], in_len/chans/2);
+ if (ret < 0) return NULL;
+ out_len= ret*chans*2;
+
+--- a/libmpcodecs/ad_spdif.c
++++ b/libmpcodecs/ad_spdif.c
+@@ -131,7 +131,7 @@ static int init(sh_audio_t *sh)
+ // FORCE USE DTS-HD
+ if (lavf_ctx->streams[0]->codecpar->codec_id == AV_CODEC_ID_DTS)
+ av_dict_set(&opts, "dtshd_rate", "768000" /* 192000*4 */, 0);
+- if ((res = avformat_write_header(lavf_ctx, opts)) < 0) {
++ if ((res = avformat_write_header(lavf_ctx, (AVDictionary **)opts)) < 0) {
+ av_dict_free(&opts);
+ if (res == AVERROR_PATCHWELCOME)
+ mp_msg(MSGT_DECAUDIO,MSGL_INFO,
+--- a/libmpcodecs/vd_ffmpeg.c
++++ b/libmpcodecs/vd_ffmpeg.c
+@@ -739,7 +739,7 @@ static int get_buffer(AVCodecContext *avctx, AVFrame *pic, int isreference){
+ 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
+--- a/libmpcodecs/vf_pp.c
++++ b/libmpcodecs/vf_pp.c
+@@ -142,7 +142,7 @@ static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts, double
+
+ if(vf->priv->pp || !(mpi->flags&MP_IMGFLAG_DIRECT)){
+ // do the postprocessing! (or copy if no DR)
+- pp_postprocess(mpi->planes ,mpi->stride,
++ pp_postprocess((const uint8_t **)mpi->planes ,mpi->stride,
+ vf->dmpi->planes,vf->dmpi->stride,
+ (mpi->w+7)&(~7),mpi->h,
+ mpi->qscale, mpi->qstride,
+--- a/libmpcodecs/vf_scale.c
++++ b/libmpcodecs/vf_scale.c
+@@ -439,14 +439,14 @@ static void scale(struct SwsContext *sws1, struct SwsContext *sws2, uint8_t *src
+ int src_stride2[MP_MAX_PLANES]={2*src_stride[0], 2*src_stride[1], 2*src_stride[2], 2*src_stride[3]};
+ int dst_stride2[MP_MAX_PLANES]={2*dst_stride[0], 2*dst_stride[1], 2*dst_stride[2], 2*dst_stride[3]};
+
+- sws_scale(sws1, src2, src_stride2, y>>1, h>>1, dst2, dst_stride2);
++ sws_scale(sws1, (const uint8_t * const*)src2, src_stride2, y>>1, h>>1, dst2, dst_stride2);
+ for(i=0; i<MP_MAX_PLANES; i++){
+ src2[i] += src_stride[i];
+ dst2[i] += dst_stride[i];
+ }
+- sws_scale(sws2, src2, src_stride2, y>>1, h>>1, dst2, dst_stride2);
++ sws_scale(sws2, (const uint8_t * const*)src2, src_stride2, y>>1, h>>1, dst2, dst_stride2);
+ }else{
+- sws_scale(sws1, src2, src_stride, y, h, dst, dst_stride);
++ sws_scale(sws1, (const uint8_t * const*)src2, src_stride, y, h, dst, dst_stride);
+ }
+ }
+
+--- a/libmpcodecs/vf_screenshot.c
++++ b/libmpcodecs/vf_screenshot.c
+@@ -60,7 +60,7 @@ static void draw_slice(struct vf_instance *vf, unsigned char** src,
+ int* stride, int w,int h, int x, int y)
+ {
+ if (vf->priv->store_slices) {
+- sws_scale(vf->priv->ctx, src, stride, y, h, vf->priv->pic->data, vf->priv->pic->linesize);
++ sws_scale(vf->priv->ctx, (const uint8_t * const*)src, stride, y, h, vf->priv->pic->data, vf->priv->pic->linesize);
+ }
+ vf_next_draw_slice(vf,src,stride,w,h,x,y);
+ }
+@@ -158,7 +158,7 @@ static void scale_image(struct vf_priv_s* priv, mp_image_t *mpi)
+ if (!priv->pic->data[0])
+ priv->pic->data[0] = av_malloc(priv->pic->linesize[0]*priv->dh);
+
+- sws_scale(priv->ctx, mpi->planes, mpi->stride, 0, mpi->height, priv->pic->data, priv->pic->linesize);
++ sws_scale(priv->ctx, (const uint8_t * const*)mpi->planes, mpi->stride, 0, mpi->height, priv->pic->data, priv->pic->linesize);
+ }
+
+ static void start_slice(struct vf_instance *vf, mp_image_t *mpi)
+--- a/libmpdemux/demux_film.c
++++ b/libmpdemux/demux_film.c
+@@ -157,7 +157,7 @@ static int demux_film_fill_buffer(demuxer_t *demuxer, demux_stream_t *ds)
+ free(buf);
+ }
+ else {/* for 16bit */
+- unsigned short* tmp = dp->buffer;
++ unsigned short* tmp = (short unsigned int *)dp->buffer;
+ unsigned short* buf = malloc(film_chunk.chunk_size);
+ for(i = 0; i < film_chunk.chunk_size/4; i++) {
+ buf[i*2] = tmp[i];
+--- a/libmpdemux/demux_lavf.c
++++ b/libmpdemux/demux_lavf.c
+@@ -378,7 +378,7 @@ static void handle_stream(demuxer_t *demuxer, AVFormatContext *avfc, int i) {
+ }
+ case AVMEDIA_TYPE_VIDEO:{
+ AVDictionaryEntry *rot = av_dict_get(st->metadata, "rotate", NULL, 0);
+- const int32_t *disp_matrix = av_stream_get_side_data(st, AV_PKT_DATA_DISPLAYMATRIX, NULL);
++ const int32_t *disp_matrix = (const int32_t *)av_stream_get_side_data(st, AV_PKT_DATA_DISPLAYMATRIX, NULL);
+ sh_video_t* sh_video;
+ BITMAPINFOHEADER *bih;
+ sh_video=new_sh_video_vid(demuxer, i, priv->video_streams);
+--- a/libmpdemux/muxer_avi.c
++++ b/libmpdemux/muxer_avi.c
+@@ -142,8 +142,8 @@ static muxer_stream_t* avifile_new_stream(muxer_t *muxer,int type){
+ static void write_avi_chunk(stream_t *stream,unsigned int id,int len,void* data){
+ int le_len = le2me_32(len);
+ int le_id = le2me_32(id);
+- stream_write_buffer(stream, &le_id, 4);
+- stream_write_buffer(stream, &le_len, 4);
++ stream_write_buffer(stream, (unsigned char *)&le_id, 4);
++ stream_write_buffer(stream, (unsigned char *)&le_len, 4);
+
+ if(len>0){
+ if(data){
+@@ -176,9 +176,9 @@ static void write_avi_list(stream_t *stream, unsigned int id, int len)
+ list_id = le2me_32(list_id);
+ le_len = le2me_32(len);
+ le_id = le2me_32(id);
+- stream_write_buffer(stream, &list_id, 4);
+- stream_write_buffer(stream, &le_len, 4);
+- stream_write_buffer(stream, &le_id, 4);
++ stream_write_buffer(stream, (unsigned char *)&list_id, 4);
++ stream_write_buffer(stream, (unsigned char *)&le_len, 4);
++ stream_write_buffer(stream, (unsigned char *)&le_id, 4);
+ }
+
+ static void avifile_odml_new_riff(muxer_t *muxer)
+@@ -199,7 +199,7 @@ static void avifile_odml_new_riff(muxer_t *muxer)
+ riff[0]=le2me_32(mmioFOURCC('R','I','F','F'));
+ riff[1]=0;
+ riff[2]=le2me_32(mmioFOURCC('A','V','I','X'));
+- stream_write_buffer(muxer->stream, riff, 12);
++ stream_write_buffer(muxer->stream, (unsigned char *)riff, 12);
+
+ write_avi_list(muxer->stream,listtypeAVIMOVIE,0);
+
+@@ -251,12 +251,12 @@ static void avifile_write_header(muxer_t *muxer){
+ movilen = le2me_32(rifflen - 12);
+ rifflen = le2me_32(rifflen);
+ stream_seek(muxer->stream, vsi->riffofs[i]+4);
+- stream_write_buffer(muxer->stream,&rifflen,4);
++ stream_write_buffer(muxer->stream,(unsigned char *)&rifflen,4);
+
+ /* fixup movi length */
+ if (i > 0) {
+ stream_seek(muxer->stream, vsi->riffofs[i]+16);
+- stream_write_buffer(muxer->stream,&movilen,4);
++ stream_write_buffer(muxer->stream,(unsigned char *)&movilen,4);
+ }
+ }
+
+@@ -269,7 +269,7 @@ static void avifile_write_header(muxer_t *muxer){
+ riff[0]=le2me_32(riff[0]);
+ riff[1]=le2me_32(riff[1]);
+ riff[2]=le2me_32(riff[2]);
+- stream_write_buffer(muxer->stream,&riff,12);
++ stream_write_buffer(muxer->stream,(unsigned char *)&riff,12);
+ }
+
+ // update AVI header:
+@@ -406,7 +406,7 @@ static void avifile_write_header(muxer_t *muxer){
+ idxhdr[6] = 0;
+ idxhdr[7] = 0;
+
+- stream_write_buffer(muxer->stream,idxhdr,sizeof(idxhdr));
++ stream_write_buffer(muxer->stream,(unsigned char *)idxhdr,sizeof(idxhdr));
+ for (j=0; j<n; j++) {
+ struct avi_odmlsuperidx_entry *entry = &si->superidx[j];
+ unsigned int data[4];
+@@ -414,7 +414,7 @@ static void avifile_write_header(muxer_t *muxer){
+ data[1] = le2me_32(entry->ofs >> 32);
+ data[2] = le2me_32(entry->len);
+ data[3] = le2me_32(entry->duration);
+- stream_write_buffer(muxer->stream,data,sizeof(data));
++ stream_write_buffer(muxer->stream,(unsigned char *)data,sizeof(data));
+ }
+ }
+ }
+@@ -642,13 +642,13 @@ static void avifile_odml_write_index(muxer_t *muxer){
+ si->superidx[j].ofs = stream_tell(muxer->stream);
+ si->superidx[j].duration = duration;
+
+- stream_write_buffer(muxer->stream, idxhdr,sizeof(idxhdr));
++ stream_write_buffer(muxer->stream, (unsigned char *)idxhdr,sizeof(idxhdr));
+ for (k=0; k<entries_per_subidx && idxpos<si->idxpos; k++) {
+ unsigned int entry[2];
+ entry[0] = le2me_32(si->idx[idxpos].ofs - start);
+ entry[1] = le2me_32(si->idx[idxpos].len | si->idx[idxpos].flags);
+ idxpos++;
+- stream_write_buffer(muxer->stream, entry, sizeof(entry));
++ stream_write_buffer(muxer->stream, (unsigned char *)entry, sizeof(entry));
+ }
+ }
+ }
+--- a/libvo/gl_common.c
++++ b/libvo/gl_common.c
+@@ -2239,7 +2239,7 @@ static XVisualInfo *getWindowVisualInfo(Window win) {
+ XVisualInfo vinfo_template;
+ int tmp;
+ if (!XGetWindowAttributes(mDisplay, win, &xw_attr))
+- return DefaultVisual(mDisplay, 0);
++ return (XVisualInfo *)DefaultVisual(mDisplay, 0);
+ vinfo_template.visualid = XVisualIDFromVisual(xw_attr.visual);
+ return XGetVisualInfo(mDisplay, VisualIDMask, &vinfo_template, &tmp);
+ }
+--- a/libvo/vo_matrixview.c
++++ b/libvo/vo_matrixview.c
+@@ -170,7 +170,7 @@ static void flip_page(void)
+
+ static int draw_slice(uint8_t *src[], int stride[], int w, int h, int x, int y)
+ {
+- sws_scale(sws, src, stride, y, h, map_image, map_stride);
++ sws_scale(sws, (const uint8_t * const*)src, stride, y, h, map_image, map_stride);
+ return 0;
+ }
+
+--- a/libvo/vo_x11.c
++++ b/libvo/vo_x11.c
+@@ -492,7 +492,7 @@ static int draw_slice(uint8_t * src[], int stride[], int w, int h,
+ dst[0] += dstStride[0] * (image_height - 1);
+ dstStride[0] = -dstStride[0];
+ }
+- sws_scale(swsContext, src, stride, y, h, dst, dstStride);
++ sws_scale(swsContext, (const uint8_t * const*)src, stride, y, h, dst, dstStride);
+ return 0;
+ }
+
+--- a/loader/qtx/qtxsdk/components.h
++++ b/loader/qtx/qtxsdk/components.h
+@@ -780,7 +780,7 @@ static inline void dump_CodecDecompressParams(void* xxx){
+ printf("dstrect: %d;%d - %d;%d\n",cd->dstRect.top,cd->dstRect.left,cd->dstRect.bottom,cd->dstRect.right);
+ printf("wantedDestinationPixelTypes=%p\n",cd->wantedDestinationPixelTypes);
+ if(cd->wantedDestinationPixelTypes){
+- unsigned int* p=cd->wantedDestinationPixelTypes;
++ unsigned int* p=(unsigned int *)cd->wantedDestinationPixelTypes;
+ while(p[0]){
+ printf(" 0x%08X %p\n",p[0],&p[0]);
+ ++p;
+--- a/mp_msg.c
++++ b/mp_msg.c
+@@ -70,7 +70,7 @@ const char* filename_recode(const char* filename)
+ filename_len = strlen(filename);
+ max_path = MSGSIZE_MAX - 4;
+ precoded = recoded_filename;
+- if (iconv(inv_msgiconv, &filename, &filename_len,
++ if (iconv(inv_msgiconv, (char ** restrict)&filename, &filename_len,
+ &precoded, &max_path) == (size_t)(-1) && errno == E2BIG) {
+ precoded[0] = precoded[1] = precoded[2] = '.';
+ precoded += 3;
+--- a/mplayer.c
++++ b/mplayer.c
+@@ -3536,7 +3536,7 @@ goto_enable_cache:
+ break;
+ if ((mpctx->demuxer->file_format == DEMUXER_TYPE_AVI || mpctx->demuxer->file_format == DEMUXER_TYPE_ASF || mpctx->demuxer->file_format == DEMUXER_TYPE_MOV)
+ && stream_dump_type == 2)
+- stream_write_buffer(os, &in_size, 4);
++ stream_write_buffer(os, (unsigned char *)&in_size, 4);
+ if (in_size > 0) {
+ stream_write_buffer(os, start, in_size);
+ stream_dump_progress(in_size, mpctx->stream);
+--- a/sub/spudec.c
++++ b/sub/spudec.c
+@@ -899,7 +899,7 @@ static void sws_spu_image(unsigned char *d1, unsigned char *d2, int dw, int dh,
+ ctx=sws_getContext(sw, sh, AV_PIX_FMT_GRAY8, dw, dh, AV_PIX_FMT_GRAY8, SWS_GAUSS, &filter, NULL, NULL);
+ sws_scale(ctx,&s1,&ss,0,sh,&d1,&ds);
+ for (i=ss*sh-1; i>=0; i--) s2[i] = -s2[i];
+- sws_scale(ctx,&s2,&ss,0,sh,&d2,&ds);
++ sws_scale(ctx,(const uint8_t * const*)&s2,&ss,0,sh,&d2,&ds);
+ for (i=ds*dh-1; i>=0; i--) d2[i] = -d2[i];
+ sws_freeContext(ctx);
+ }
+--- a/sub/sub.c
++++ b/sub/sub.c
+@@ -727,7 +727,7 @@ static inline void vo_update_text_sub(mp_osd_obj_t *obj, int dxs, int dys)
+ // reading the subtitle words from vo_sub->text[]
+ while (*t) {
+ if (sub_utf8)
+- c = utf8_get_char(&t);
++ c = utf8_get_char((const char **)&t);
+ else if ((c = *t++) >= 0x80 && sub_unicode)
+ c = (c<<8) + *t++;
+ if (k==MAX_UCS){
diff --git a/media-video/mplayer/mplayer-1.5_p20231206.ebuild b/media-video/mplayer/mplayer-1.5_p20231206.ebuild
index b7e9b5420e81..54ab8bf0f878 100644
--- a/media-video/mplayer/mplayer-1.5_p20231206.ebuild
+++ b/media-video/mplayer/mplayer-1.5_p20231206.ebuild
@@ -194,6 +194,10 @@ REQUIRED_USE="
xv? ( X )"
RESTRICT="faac? ( bindist )"
+PATCHES=(
+ "${FILESDIR}/${P}-incompatible-pointers.patch"
+)
+
pkg_setup() {
if [[ ${PV} == *9999* ]]; then
elog
^ permalink raw reply related [flat|nested] 10+ messages in thread
end of thread, other threads:[~2024-07-06 19:54 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-11-06 11:20 [gentoo-commits] repo/gentoo:master commit in: media-video/mplayer/files/, media-video/mplayer/ Alexis Ballier
-- strict thread matches above, loose matches on Subject: below --
2024-07-06 19:54 Miroslav Šulc
2023-12-06 8:32 Sam James
2023-02-15 7:36 Sam James
2021-04-18 16:50 Andreas Sturmlechner
2021-04-09 13:01 Alexis Ballier
2020-11-15 15:31 Joonas Niilola
2018-05-09 5:55 Lars Wendler
2017-10-23 12:13 Alexis Ballier
2017-06-19 12:50 Alexis Ballier
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox