From 8687928d6af65a41eef0fda0f92cd3953563bff0 Mon Sep 17 00:00:00 2001 From: James Le Cuirot Date: Tue, 14 Apr 2020 14:19:24 +0100 Subject: app-emulation/vice: Drop old 3.1 Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: James Le Cuirot --- app-emulation/vice/Manifest | 1 - .../vice/files/vice-2.4.27-autotools.patch | 11 -- app-emulation/vice/files/vice-3.1-ffmpeg4.patch | 74 --------- app-emulation/vice/metadata.xml | 3 - app-emulation/vice/vice-3.1.ebuild | 171 --------------------- 5 files changed, 260 deletions(-) delete mode 100644 app-emulation/vice/files/vice-2.4.27-autotools.patch delete mode 100644 app-emulation/vice/files/vice-3.1-ffmpeg4.patch delete mode 100644 app-emulation/vice/vice-3.1.ebuild diff --git a/app-emulation/vice/Manifest b/app-emulation/vice/Manifest index 5aaf0e576027..a4b74f25b8ce 100644 --- a/app-emulation/vice/Manifest +++ b/app-emulation/vice/Manifest @@ -1,3 +1,2 @@ -DIST vice-3.1.tar.gz 30714226 BLAKE2B 75c2cce5294dad5b954cd23b623b6b4610c8142a09aef05dbefed6b3e6b268077d375e644dde6a057682d41ab9cf15e93a9f4a9359bfa0d1567d6d1862053a0e SHA512 bc02a3597a17dadb37c487e6942192c0e9dc1a7d4e440fbf0dc8a165dbb2dee60ddf157697a020d2780ddef56a0a67802768d5c6d117b9cf5cdc124de45bc579 DIST vice-emu-code-r37498-trunk-vice.zip 26810776 BLAKE2B 05baa0d123e9a0f1141ef68940455b5abfccde0204d0ffeb0a806212977be6f1f2c777267cad077272f4e09fa3c6adb9e95436adaaee5482b2ce918a3485caeb SHA512 5b4c31e51efc67ac08f6fe9361c42b80115b315fc24c128861341f2eea7567bdbb1761e52bc914df442ed5cc7f2ca7c6b0a2694441d63e63f9f693bcf72c70c0 DIST vice-emu-code-r37605-trunk-vice.zip 26854864 BLAKE2B 771728b69cb38492d086d199fcb56d19f14738bc6b5c3f0b1c9c6ffb07db0d2c2a3d631ed9f32a2abf0159d4e3e0d144c04e6ba13c22ce619ea1090f89b7b5cc SHA512 975c342d5ee7f72cc775bee711fed77fb6ce00bc15eef13403b9f3a457ac589d0089bcdf452507605bbf11d8806fceec94729becf1ef3fe66f6074854684d998 diff --git a/app-emulation/vice/files/vice-2.4.27-autotools.patch b/app-emulation/vice/files/vice-2.4.27-autotools.patch deleted file mode 100644 index 7bebd2800ef6..000000000000 --- a/app-emulation/vice/files/vice-2.4.27-autotools.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 deleted file mode 100644 index d232ee22337e..000000000000 --- a/app-emulation/vice/files/vice-3.1-ffmpeg4.patch +++ /dev/null @@ -1,74 +0,0 @@ ---- 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/metadata.xml b/app-emulation/vice/metadata.xml index 8ff137c8c207..2294b11c8d08 100644 --- a/app-emulation/vice/metadata.xml +++ b/app-emulation/vice/metadata.xml @@ -7,13 +7,10 @@ Enable ethernet emulation - Enable the ability to run fullscreen Include the headless variant of the emulator Enable mp3@64 cartridge support Enable parallel port SID support Enable PCI device discovery using sys-apps/pciutils - Use media-libs/libsdl for sound support - Enable support for x11-libs/vte in the GTK+ interface vice-emu diff --git a/app-emulation/vice/vice-3.1.ebuild b/app-emulation/vice/vice-3.1.ebuild deleted file mode 100644 index 083344470e3c..000000000000 --- a/app-emulation/vice/vice-3.1.ebuild +++ /dev/null @@ -1,171 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools flag-o-matic toolchain-funcs - -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="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 )" - -# gtk3? ( -# x11-libs/cairo -# x11-libs/gtk+:3 -# x11-libs/pango -# vte? ( x11-libs/vte:2.90 ) -# ) -RDEPEND=" - media-libs/giflib - virtual/jpeg:0 - virtual/opengl - alsa? ( media-libs/alsa-lib ) - ethernet? ( - >=net-libs/libpcap-0.9.8 - >=net-libs/libnet-1.1.2.1:1.1 - ) - ffmpeg? ( - 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= ) - pulseaudio? ( media-sound/pulseaudio ) - sdl? ( media-libs/libsdl[joystick,video] ) - !sdl? ( - sys-libs/readline:0= - x11-libs/libX11 - x11-libs/libXext - fullscreen? ( - x11-libs/libXrandr - x11-libs/libXxf86vm - ) - !gtk? ( - x11-libs/libXmu - x11-libs/libXpm - x11-libs/libXt - x11-libs/libXv - Xaw3d? ( x11-libs/libXaw3d ) - !Xaw3d? ( x11-libs/libXaw ) - ) - ) - sdlsound? ( media-libs/libsdl[sound] ) - zlib? ( sys-libs/zlib ) -" -DEPEND="${RDEPEND} - media-libs/fontconfig - x11-apps/bdftopcf - >=x11-apps/mkfontscale-1.2.0 - x11-base/xorg-proto - virtual/pkgconfig - nls? ( sys-devel/gettext ) - !gtk? ( !sdl? ( - x11-libs/libICE - x11-libs/libSM - ) ) -" - -PATCHES=( - "${FILESDIR}"/${PN}-2.4.27-autotools.patch - "${FILESDIR}"/${P}-ffmpeg4.patch -) - -src_prepare() { - default - sed -i \ - -e 's/building//' \ - doc/Makefile.am || die - sed -i \ - -e "/^docdir =/s:=.*:=/usr/share/doc/${PF}:" \ - doc/Makefile.am \ - doc/readmes/Makefile.am || die - sed -i \ - -e "/^docdir =/s:=.*:=/usr/share/doc/${PF}/html:" \ - doc/html/Makefile.am || die - sed -i \ - -e "s:/usr/local/lib/VICE:/usr/$(get_libdir)/${PN}:" \ - man/vice.1 \ - $(grep -rl --exclude="*texi" /usr/local/lib doc) || die - sed -i \ - -e "/VICEDIR=/s:=.*:=\"/usr/$(get_libdir)/${PN}\";:" \ - configure.ac || die - sed -i \ - -e "s:\(#define LIBDIR \).*:\1\"/usr/$(get_libdir)/${PN}\":" \ - -e "s:\(#define DOCDIR \).*:\1\"/usr/share/doc/${PF}\":" \ - src/arch/unix/archdep.h \ - src/arch/sdl/archdep_unix.h || die - rm -rf src/lib/{libffmpeg,liblame} || die - sed -i \ - -e '/SUBDIRS/s/libffmpeg//;' \ - -e '/SUBDIRS/s/liblame//;' \ - src/lib/Makefile.am || die - AT_NO_RECURSIVE=1 eautoreconf -} - -src_configure() { - local gui_arg=() snd_arg=() - - snd_arg+=( $(use_with alsa) ) - snd_arg+=( $(use_with oss) ) - snd_arg+=( $(use_with pulseaudio pulse) ) - snd_arg+=( $(use_with sdlsound) ) - - gui_arg+=( $(use_enable sdl sdlui) ) - # The gtk UI code has raw calls to XOpenDisplay and - # is missing -lX11 if vte doesn't pull it in. - #if use gtk2 || use gtk3 ; then - if use gtk ; then - use vte || append-libs -lX11 - fi - gui_arg+=( $(use_enable gtk gnomeui) ) - #gui_arg+=" $(use_enable gtk3 gnomeui3)" - gui_arg+=( $(use_enable Xaw3d xaw3d) ) - - # --with-readline is forced to avoid using the embedded copy - # don't try to actually run fc-cache (bug #280976) - FCCACHE=/bin/true \ - PKG_CONFIG=$(tc-getPKG_CONFIG) \ - econf \ - --enable-parsid \ - --with-resid \ - --with-readline \ - --without-arts \ - --without-midas \ - $(use_enable ethernet) \ - $(use_enable ffmpeg) \ - $(use_enable ffmpeg external-ffmpeg) \ - $(use_enable fullscreen) \ - $(use_enable ipv6) \ - $(use_enable lame) \ - $(use_enable nls) \ - $(use_enable vte) \ - $(use_with png) \ - $(use_with threads uithreads) \ - $(use_with zlib) \ - "${gui_arg[@]}" \ - "${snd_arg[@]}" \ - --disable-option-checking - # --disable-option-checking has to be last -} - -src_install() { - default - dodoc FEEDBACK -} -- cgit v1.2.3-65-gdbad