mplayer: Bump to 1.5
This commit is contained in:
parent
f90d662973
commit
8b951f0a7a
|
@ -2,32 +2,24 @@ TERMUX_PKG_HOMEPAGE=https://mplayerhq.hu/
|
|||
TERMUX_PKG_DESCRIPTION="The Movie Player"
|
||||
TERMUX_PKG_LICENSE="GPL-2.0"
|
||||
TERMUX_PKG_MAINTAINER="@termux"
|
||||
TERMUX_PKG_VERSION=1.4
|
||||
TERMUX_PKG_REVISION=5
|
||||
TERMUX_PKG_VERSION=1.5
|
||||
TERMUX_PKG_SRCURL=https://ftp-osl.osuosl.org/pub/gentoo/distfiles/MPlayer-${TERMUX_PKG_VERSION}.tar.xz
|
||||
TERMUX_PKG_SHA256=82596ed558478d28248c7bc3828eb09e6948c099bbd76bb7ee745a0e3275b548
|
||||
TERMUX_PKG_DEPENDS="ffmpeg, fontconfig, freetype, fribidi, libass, libbluray, libdvdread, libiconv, libjpeg-turbo, liblzo, libmp3lame, libogg, libpng, libtheora, libvorbis, libx11, libx264, libxext, libxss, ncurses, openal-soft, xvidcore, zlib"
|
||||
TERMUX_PKG_SHA256=650cd55bb3cb44c9b39ce36dac488428559799c5f18d16d98edb2b7256cbbf85
|
||||
TERMUX_PKG_DEPENDS="ffmpeg, fontconfig, freetype, fribidi, liba52, libass, libbluray, libdvdnav, libdvdread, libiconv, libjpeg-turbo, liblzo, libmad, libmp3lame, libogg, libpng, libtheora, libtwolame, libvorbis, libx11, libx264, libxext, libxss, mpg123, ncurses, openal-soft, pulseaudio, xvidcore, zlib"
|
||||
TERMUX_PKG_BUILD_IN_SRC=true
|
||||
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
|
||||
--disable-smb
|
||||
--disable-ffmpeg_a
|
||||
--disable-vidix
|
||||
--disable-gl
|
||||
--disable-dga2
|
||||
--disable-dga1
|
||||
--disable-xinerama
|
||||
"
|
||||
TERMUX_PKG_EXTRA_MAKE_ARGS="INSTALLSTRIP="
|
||||
TERMUX_PKG_BLACKLISTED_ARCHES="i686"
|
||||
|
||||
termux_step_post_get_source() {
|
||||
termux_download \
|
||||
"https://github.com/gentoo/gentoo/raw/a3045b07e451738d566af36b38e96dbf76d8659c/media-video/mplayer/files/ffmpeg44.patch" \
|
||||
$TERMUX_PKG_CACHEDIR/mplayer-ffmpeg44.patch \
|
||||
eb796b380f9ed9a6a68ee523493dce5f27fc57b8c0dea0d44a13752ec7411fcd
|
||||
cat $TERMUX_PKG_CACHEDIR/mplayer-ffmpeg44.patch | patch --silent -p1
|
||||
termux_download \
|
||||
"https://dev.gentoo.org/~aballier/distfiles/mplayer-1.4-ffmpeg5.patch.bz2" \
|
||||
$TERMUX_PKG_CACHEDIR/mplayer-1.4-ffmpeg5.patch.bz2 \
|
||||
3397eb50fe7265dc435f6df824cd6153440c14029c8a0be76056ae89733970db
|
||||
bzcat $TERMUX_PKG_CACHEDIR/mplayer-1.4-ffmpeg5.patch.bz2 | patch --silent -p1
|
||||
|
||||
local FFMPEG_BUILD_SH=$TERMUX_SCRIPTDIR/packages/ffmpeg/build.sh
|
||||
local FFMPEG_SRCURL=$(bash -c ". $FFMPEG_BUILD_SH; echo \$TERMUX_PKG_SRCURL")
|
||||
local FFMPEG_SHA256=$(bash -c ". $FFMPEG_BUILD_SH; echo \$TERMUX_PKG_SHA256")
|
||||
|
|
|
@ -1,24 +0,0 @@
|
|||
https://nvd.nist.gov/vuln/detail/CVE-2016-4352
|
||||
https://www.openwall.com/lists/oss-security/2016/04/29/7
|
||||
https://trac.mplayerhq.hu/ticket/2295
|
||||
|
||||
--- a/libmpdemux/demux_gif.c
|
||||
+++ b/libmpdemux/demux_gif.c
|
||||
@@ -316,6 +316,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);
|
||||
|
Loading…
Reference in New Issue