From de49812990871e1705b64051c35161d5e6400269 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 24 Dec 2018 14:11:38 +0000 Subject: gentoo resync : 24.12.2018 --- app-emulation/vice/Manifest | 4 +- .../vice/files/vice-2.4.27-autotools.patch | 11 ++++ app-emulation/vice/files/vice-3.1-ffmpeg4.patch | 74 ++++++++++++++++++++++ app-emulation/vice/vice-3.1.ebuild | 56 ++++++++-------- 4 files changed, 115 insertions(+), 30 deletions(-) create mode 100644 app-emulation/vice/files/vice-2.4.27-autotools.patch create mode 100644 app-emulation/vice/files/vice-3.1-ffmpeg4.patch (limited to 'app-emulation/vice') diff --git a/app-emulation/vice/Manifest b/app-emulation/vice/Manifest index 7773d3a62c2c..96934694a36d 100644 --- a/app-emulation/vice/Manifest +++ b/app-emulation/vice/Manifest @@ -1,3 +1,5 @@ +AUX vice-2.4.27-autotools.patch 353 BLAKE2B 01b25d40ad4dd621e32896b0c7f30715fcf0ea7cce8bffdb742caf241ebb0ed7c7d0d40c2cea852640f8b0e4d84bac1d5a87653c9641a33acd8f177a39130c80 SHA512 10ba3f9f9c0e69f34ea3ab361b198826b7055586e2dade320a60c1a1e429797d2eaf1554b1e9fde63f8ddb23bd4a9b8fb24d3f9692433b6b6d043d09761924d3 +AUX vice-3.1-ffmpeg4.patch 1971 BLAKE2B 6fcf4f8ddb3cb26727075483f8e17f8b07a22c081440356abdd733a91a41908a4d4344ad4aa2839bf79fc123a8e342d026a93e9d37bbef550ea3a6ee6dcf6741 SHA512 3240ab6287131813a56ac2c64613b5ea93560f0b0ed572b042aeed47594e7bb7c6b03e36edaee4efdc5350533dbde8adb10451658406ef9998c3c5742e08233c DIST vice-3.1.tar.gz 30714226 BLAKE2B 75c2cce5294dad5b954cd23b623b6b4610c8142a09aef05dbefed6b3e6b268077d375e644dde6a057682d41ab9cf15e93a9f4a9359bfa0d1567d6d1862053a0e SHA512 bc02a3597a17dadb37c487e6942192c0e9dc1a7d4e440fbf0dc8a165dbb2dee60ddf157697a020d2780ddef56a0a67802768d5c6d117b9cf5cdc124de45bc579 -EBUILD vice-3.1.ebuild 4030 BLAKE2B a7729152f7e43ac7624ebd19ab72499edf3b5f254dbc051a994e9408c4a0e452594f90e05d3da77cee0d8ce7148bccd5e32f80743ea7b8f1ac1cb0a1ad91ade0 SHA512 f822b9e80318c7bb1b64084c879189e76a1dd235f2ff3ee3415393df8b5bcf988cbf07f1677bc18529982cb9d80f63c47cffb6f4b4385ebb046f13bb1b745b9d +EBUILD vice-3.1.ebuild 4051 BLAKE2B 4b015996ba774adb0f2448a833edcc95b802ccdbb188b6bba848d077250ccb2679b13f08dbaca16958943f5e2b90904af1da12dbd853e26467b6eceec1e9de13 SHA512 032d6a388b51e4148577a18a0130ef0bb72b59820bafda3812152856bb1cf9acb232d06c6463834132ebce5e6e1e170be38ea08003135d1a0027c7eb7469bc3d MISC metadata.xml 646 BLAKE2B 94f3652c8e4217e34415b84f35b468febdefb688fe85b5b0b2ddafa0b3739bc36fbfaab12e4100df1cad3c5b4cd823b4af260811110da4410c09d32596ac7f43 SHA512 1d641f0e1ba5962aa7b9e230c20ade01595aed9f853be25ec4d5022aff22cbd75414a41fbf64427bf5a27485057ee3e767521561f396a5bf70ffa3e1da31739f diff --git a/app-emulation/vice/files/vice-2.4.27-autotools.patch b/app-emulation/vice/files/vice-2.4.27-autotools.patch new file mode 100644 index 000000000000..7bebd2800ef6 --- /dev/null +++ b/app-emulation/vice/files/vice-2.4.27-autotools.patch @@ -0,0 +1,11 @@ +--- vice-2.4.7.orig/configure.ac ++++ vice-2.4.7/configure.ac +@@ -124,7 +118,7 @@ + AC_SUBST(VICE_VERSION) + + AM_INIT_AUTOMAKE(vice, $VICE_VERSION) +-AM_CONFIG_HEADER(src/config.h) ++AC_CONFIG_HEADERS(src/config.h) + + if test x"$VICE_VERSION_BUILD" = "x" -o x"$VICE_VERSION_BUILD" = "x0" ; then + VERSION_RC=$VICE_VERSION_MAJOR","$VICE_VERSION_MINOR",0,0" diff --git a/app-emulation/vice/files/vice-3.1-ffmpeg4.patch b/app-emulation/vice/files/vice-3.1-ffmpeg4.patch new file mode 100644 index 000000000000..d232ee22337e --- /dev/null +++ b/app-emulation/vice/files/vice-3.1-ffmpeg4.patch @@ -0,0 +1,74 @@ +--- a/src/gfxoutputdrv/ffmpegdrv.c ++++ b/src/gfxoutputdrv/ffmpegdrv.c +@@ -46,6 +46,13 @@ + #include "util.h" + #include "soundmovie.h" + ++/** \brief Helper macro to determine ffmpeg version ++ */ ++#if (LIBAVCODEC_VERSION_MAJOR >= 58) && (LIBAVCODEC_VERSION_MINOR >= 18) ++# define HAVE_FFMPEG4 ++#endif ++ ++ + static gfxoutputdrv_codec_t avi_audio_codeclist[] = { + { AV_CODEC_ID_MP2, "MP2" }, + { AV_CODEC_ID_MP3, "MP3" }, +@@ -354,7 +361,11 @@ + } + + audio_is_open = 1; ++#ifdef HAVE_FFMPEG4 ++ if (c->codec->capabilities & AV_CODEC_CAP_VARIABLE_FRAME_SIZE) { ++#else + if (c->codec->capabilities & CODEC_CAP_VARIABLE_FRAME_SIZE) { ++#endif + audio_inbuf_samples = 10000; + } else { + audio_inbuf_samples = c->frame_size; +@@ -447,8 +458,13 @@ + audio_st.samples_count = 0; + + /* Some formats want stream headers to be separate. */ +- if (ffmpegdrv_oc->oformat->flags & AVFMT_GLOBALHEADER) ++ if (ffmpegdrv_oc->oformat->flags & AVFMT_GLOBALHEADER) { ++#ifdef HAVE_FFMPEG4 ++ c->flags |= AV_CODEC_FLAG_GLOBAL_HEADER; ++#else + c->flags |= CODEC_FLAG_GLOBAL_HEADER; ++#endif ++ } + + /* create resampler context */ + #ifndef HAVE_FFMPEG_AVRESAMPLE +@@ -781,7 +797,11 @@ + + /* Some formats want stream headers to be separate. */ + if (ffmpegdrv_oc->oformat->flags & AVFMT_GLOBALHEADER) { ++#ifdef HAVE_FFMPEG4 ++ c->flags |= AV_CODEC_FLAG_GLOBAL_HEADER; ++#else + c->flags |= CODEC_FLAG_GLOBAL_HEADER; ++#endif + } + + if (audio_init_done) { +@@ -961,6 +981,7 @@ + + video_st.frame->pts = video_st.next_pts++; + ++#ifdef AVFMT_RAWPICTURE + if (ffmpegdrv_oc->oformat->flags & AVFMT_RAWPICTURE) { + AVPacket pkt; + VICE_P_AV_INIT_PACKET(&pkt); +@@ -971,7 +992,9 @@ + pkt.pts = pkt.dts = video_st.frame->pts; + + ret = VICE_P_AV_INTERLEAVED_WRITE_FRAME(ffmpegdrv_oc, &pkt); +- } else { ++ } else ++#endif ++ { + AVPacket pkt = { 0 }; + int got_packet; + diff --git a/app-emulation/vice/vice-3.1.ebuild b/app-emulation/vice/vice-3.1.ebuild index 6fe9e2623e27..e5b69137fe9b 100644 --- a/app-emulation/vice/vice-3.1.ebuild +++ b/app-emulation/vice/vice-3.1.ebuild @@ -1,38 +1,34 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 inherit autotools flag-o-matic toolchain-funcs -DESCRIPTION="The Versatile Commodore 8-bit Emulator" +DESCRIPTION="Versatile Commodore 8-bit Emulator" HOMEPAGE="http://vice-emu.sourceforge.net/" SRC_URI="mirror://sourceforge/vice-emu/releases/${P}.tar.gz" LICENSE="GPL-2+" SLOT="0" KEYWORDS="amd64 x86" -IUSE="Xaw3d alsa ethernet ffmpeg fullscreen +gtk ipv6 lame libav nls oss png pulseaudio sdl +sdlsound threads vte zlib" +IUSE="alsa ethernet ffmpeg fullscreen +gtk ipv6 lame libav nls oss png pulseaudio sdl +sdlsound threads vte Xaw3d zlib" # upstream says gtk3 and sdl2 shouldn't be exposed yet. #REQUIRED_USE="?? ( gtk2 gtk3 sdl )" REQUIRED_USE="?? ( gtk sdl )" -GTK_COMMON=" - x11-libs/pango - x11-libs/cairo" # gtk3? ( +# x11-libs/cairo # x11-libs/gtk+:3 +# x11-libs/pango # vte? ( x11-libs/vte:2.90 ) -# ${GTK_COMMON} # ) RDEPEND=" + media-libs/giflib virtual/jpeg:0 virtual/opengl - media-libs/giflib alsa? ( media-libs/alsa-lib ) - pulseaudio? ( media-sound/pulseaudio ) - sdlsound? ( media-libs/libsdl[sound] ) ethernet? ( >=net-libs/libpcap-0.9.8 >=net-libs/libnet-1.1.2.1:1.1 @@ -41,17 +37,22 @@ RDEPEND=" libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:= ) ) + gtk? ( + x11-libs/cairo + x11-libs/gtk+:2 + x11-libs/gtkglext + x11-libs/pango + vte? ( x11-libs/vte:0 ) + ) lame? ( media-sound/lame ) nls? ( virtual/libintl ) png? ( media-libs/libpng:0= ) - zlib? ( sys-libs/zlib:= ) - sdl? ( - media-libs/libsdl[joystick,video] - ) + pulseaudio? ( media-sound/pulseaudio ) + sdl? ( media-libs/libsdl[joystick,video] ) !sdl? ( + sys-libs/readline:0= x11-libs/libX11 x11-libs/libXext - sys-libs/readline:0= fullscreen? ( x11-libs/libXrandr x11-libs/libXxf86vm @@ -65,28 +66,25 @@ RDEPEND=" !Xaw3d? ( x11-libs/libXaw ) ) ) - gtk? ( - x11-libs/gtk+:2 - x11-libs/gtkglext - ${GTK_COMMON} - vte? ( x11-libs/vte:0 ) - )" + sdlsound? ( media-libs/libsdl[sound] ) + zlib? ( sys-libs/zlib ) +" DEPEND="${RDEPEND} - virtual/pkgconfig + media-libs/fontconfig x11-apps/bdftopcf x11-apps/mkfontdir x11-base/xorg-proto - media-libs/fontconfig + virtual/pkgconfig nls? ( sys-devel/gettext ) - !sdl? ( - !gtk? ( + !gtk? ( !sdl? ( x11-libs/libICE x11-libs/libSM - ) - )" + ) ) +" -PATCH=( - "${FILESDIR}"/${P}-autotools.patch +PATCHES=( + "${FILESDIR}"/${PN}-2.4.27-autotools.patch + "${FILESDIR}"/${P}-ffmpeg4.patch ) src_prepare() { -- cgit v1.2.3