From a70f42c65202d88c203c40910fef8f96f333d1ee Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 2 Jan 2018 14:45:16 +0000 Subject: gentoo resync : 02.01.2018 --- games-emulation/Manifest.gz | Bin 10306 -> 9971 bytes games-emulation/dboxfe/Manifest | 4 - games-emulation/dboxfe/dboxfe-0.1.3-r1.ebuild | 29 -- .../dboxfe/files/dboxfe-0.1.3-ldflags.patch | 20 -- games-emulation/dboxfe/metadata.xml | 15 - games-emulation/mastergear-bin/Manifest | 2 +- games-emulation/virtualjaguar/Manifest | 5 - games-emulation/virtualjaguar/files/virtualjaguar | 35 --- .../files/virtualjaguar-2.1.2-gcc6.patch | 316 --------------------- games-emulation/virtualjaguar/metadata.xml | 12 - .../virtualjaguar/virtualjaguar-2.1.2-r2.ebuild | 70 ----- games-emulation/xe/Manifest | 4 +- 12 files changed, 3 insertions(+), 509 deletions(-) delete mode 100644 games-emulation/dboxfe/Manifest delete mode 100644 games-emulation/dboxfe/dboxfe-0.1.3-r1.ebuild delete mode 100644 games-emulation/dboxfe/files/dboxfe-0.1.3-ldflags.patch delete mode 100644 games-emulation/dboxfe/metadata.xml delete mode 100644 games-emulation/virtualjaguar/Manifest delete mode 100644 games-emulation/virtualjaguar/files/virtualjaguar delete mode 100644 games-emulation/virtualjaguar/files/virtualjaguar-2.1.2-gcc6.patch delete mode 100644 games-emulation/virtualjaguar/metadata.xml delete mode 100644 games-emulation/virtualjaguar/virtualjaguar-2.1.2-r2.ebuild (limited to 'games-emulation') diff --git a/games-emulation/Manifest.gz b/games-emulation/Manifest.gz index b7da3bc6a267..264afd1be393 100644 Binary files a/games-emulation/Manifest.gz and b/games-emulation/Manifest.gz differ diff --git a/games-emulation/dboxfe/Manifest b/games-emulation/dboxfe/Manifest deleted file mode 100644 index 716ad6ed2327..000000000000 --- a/games-emulation/dboxfe/Manifest +++ /dev/null @@ -1,4 +0,0 @@ -AUX dboxfe-0.1.3-ldflags.patch 636 BLAKE2B 7e6eabd4c47ef4a0035ebb63f02b2ced7b346573a0436cc1e7529dd23b5a7aa5245307a6d93583bc0dc034a057961270220ad08765009874343462803871de8a SHA512 b441765fc8a570375e477eecd3a9ab91739ec80fc0e28d02fea92096044d7d75d3b241b6c2245f85424fd35da5d72e1823afd104a4141c008deb65bc6bf3a37a -DIST dboxfe-0.1.3.tar.bz2 260934 BLAKE2B a267aa002a662254739fef6d3a92473d6efaae588898d5074c7f6af2f5ab3e35034859d5953a6820a0f7c2fd817922744ca604ee753024d3d108b0706bc76089 SHA512 2c4f56b03daa4701b1c28c6082c89cb5e737c2d808215ea994ecbaf18d7e02a5616291b229768a86e4ff272e4d84fffaf4ec3350efad72b4f6aa6195804a7ad2 -EBUILD dboxfe-0.1.3-r1.ebuild 616 BLAKE2B 9c4e744421b9a6a2a51fa91af763a8f734bb7c16a1fc4e20b1af25dbf1a32459b8668e439b1c75f9b9611504ef93419e5e41e7c483ea1ca6a786db552d9ddbcd SHA512 1e1242877b5b0b1d468c3718a2a43c72ecd9722c9bde13cb7b7baf36b3eacaa035c552a46c2e256c7494127be5d60c52a92fbc1f631bbaf1e3d6e5553176f1c4 -MISC metadata.xml 449 BLAKE2B 8e542a3905f8ffbd0c5ad143caa474490ba297e6b2c6bea689b48b793d65d4e04c56f7c789ee55bcd989b6553cf6764da1c3865399fc6b729d8f3c6083dfa8ee SHA512 adca5c3e992eac7a3f8ba7d81932ddb8b90455b1ad8930abbb779253a416f61349fd61aa749bbdb6c7ec2c6a7e2dd0931168b9fd68ef9a5a03cd9ab537be9884 diff --git a/games-emulation/dboxfe/dboxfe-0.1.3-r1.ebuild b/games-emulation/dboxfe/dboxfe-0.1.3-r1.ebuild deleted file mode 100644 index 5ada0d983da2..000000000000 --- a/games-emulation/dboxfe/dboxfe-0.1.3-r1.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="Creates and manages configuration files for DOSBox" -HOMEPAGE="https://sourceforge.net/projects/dboxfe.berlios/" -SRC_URI="mirror://sourceforge/dboxfe.berlios/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND="dev-qt/qtgui:4 - dev-qt/qtcore:4" -RDEPEND="${DEPEND} - >=games-emulation/dosbox-0.65" - -PATCHES=( - "${FILESDIR}"/${P}-ldflags.patch -) - -src_install() { - default - dobin bin/dboxfe - newicon res/default.png ${PN}.png - make_desktop_entry dboxfe "DosBoxFE" -} diff --git a/games-emulation/dboxfe/files/dboxfe-0.1.3-ldflags.patch b/games-emulation/dboxfe/files/dboxfe-0.1.3-ldflags.patch deleted file mode 100644 index b5927823d0cf..000000000000 --- a/games-emulation/dboxfe/files/dboxfe-0.1.3-ldflags.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/dboxfe.pro 2010-09-29 23:53:38.000000000 +0200 -+++ b/dboxfe.pro 2010-09-29 23:54:11.000000000 +0200 -@@ -83,6 +83,7 @@ - # Unix/Linux settings - unix{ - TARGET = dboxfe -+ QMAKE_LFLAGS += $(LDFLAGS) - #QMAKE_POST_LINK = strip -s bin/dboxfe - RCC_DIR = .unix/rcc - MOC_DIR += .unix/moc ---- a/dboxfetray/dboxfetray.pro 2010-09-29 23:55:31.000000000 +0200 -+++ b/dboxfetray/dboxfetray.pro 2010-09-29 23:56:12.000000000 +0200 -@@ -56,6 +56,7 @@ - # Unix/Linux settings - unix{ - TARGET = dboxfetray -+ QMAKE_LFLAGS += $(LDFLAGS) - #QMAKE_POST_LINK = strip -s bin/dboxfetray - RCC_DIR = .unix/rcc - MOC_DIR += .unix/moc diff --git a/games-emulation/dboxfe/metadata.xml b/games-emulation/dboxfe/metadata.xml deleted file mode 100644 index fb66d2dcbef0..000000000000 --- a/games-emulation/dboxfe/metadata.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - games@gentoo.org - Gentoo Games Project - - - wine@gentoo.org - Gentoo Wine Project - - - dboxfe.berlios - - diff --git a/games-emulation/mastergear-bin/Manifest b/games-emulation/mastergear-bin/Manifest index 2425970652b8..a2f48b0e9f09 100644 --- a/games-emulation/mastergear-bin/Manifest +++ b/games-emulation/mastergear-bin/Manifest @@ -1,3 +1,3 @@ -DIST MG20-Linux-80x86-bin.tar.Z 160293 SHA256 51f0af3e1c865abd2ab236e25ff7923851f22bd23a25481a1de1201adea10f5d SHA512 378d12d0977d773bf3aab0a4f138ea13b8ceff4db198849b8447e35ff1c43f9a997d7ee9b3bd2515fa40d4e462ea4dde3c0c8ef52a3680c67ea88db98889b7b4 WHIRLPOOL e8a08a7e8853fcffe5f3a5fb397c29b61292c6923538d9adba74c36ec5898959743c452e01510f3b6d90a0528ff24055cbe289c4a27ff964b2bc2bed157c1b30 +DIST MG20-Linux-80x86-bin.tar.Z 160293 BLAKE2B 5c93ac1536855cc9446888d85dc06a3cf4066d8db089affc123ee495b2c0886c341ff4063e7239275e928b0ba386191cc529f75996950e54e042c1f532d82e1b SHA512 378d12d0977d773bf3aab0a4f138ea13b8ceff4db198849b8447e35ff1c43f9a997d7ee9b3bd2515fa40d4e462ea4dde3c0c8ef52a3680c67ea88db98889b7b4 EBUILD mastergear-bin-2.0.ebuild 565 BLAKE2B 80ebd8d0c095056d883d43f7b94215d951ce11306183532e35618d9d0e68997e28a1a75804595c5c3016f92e86d5ae8395c99a94af433b98b141ce37f6e76658 SHA512 634bf87ad096b148ffbf35a6eb48725dbd1ef095dfe0d007c66e405eadc7db48be5e21b6b8fafabc23df033d7d4e202ecfe752737bdd4b7d86495a2a70d8ea81 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 diff --git a/games-emulation/virtualjaguar/Manifest b/games-emulation/virtualjaguar/Manifest deleted file mode 100644 index 8b45604bdb09..000000000000 --- a/games-emulation/virtualjaguar/Manifest +++ /dev/null @@ -1,5 +0,0 @@ -AUX virtualjaguar 695 BLAKE2B 2203485170370d9b67346b4d39d3b2ba5ef097ee3b2ff770442330edd99cbabc53aa71bdcf0b3a2d1d3826af04679bfaa1fb5382680386dcdf2a477a91cde26b SHA512 78967da2cca340559f57a037ad025bd643ac82c9097fa7c892ee2e3ca91e5ce1dc0f4a4fa50013e9d1016d5f308f1502b7c809f686117a5cfffe29262a0d802c -AUX virtualjaguar-2.1.2-gcc6.patch 13767 BLAKE2B fc3792cd4d58d6f1901591671832d4a2152bcd560e93254969849db6cfb302119b2884b5407ff12660d932a16fc4e6b37d20a725e419ffd53ece08a09d10e9c4 SHA512 0c8360eab5b0ec1a7c179ae1df8f109326879f12dc82c05db0e03c6ab61cb73cd15e38049ad9cd19745c407b7dea8c51b91e1264b190787431c4bd5912c3d795 -DIST virtualjaguar-2.1.2.tar.bz2 2917041 BLAKE2B f9639b27549818b43b446ecf490a50d17c12c8951924e204ceb730afbd1842c5c066f4f20da3d3035f388ea0c698563f6ead3e4a56ffbcc82c39ecb10ddaa63f SHA512 96b842762773631b5df25721d4913f771580c8e23c017a3572539c15a028a4e7743870f2ce3f30380f553781d3beed26693d7e04191efc1475c0cc6fef9f91fb -EBUILD virtualjaguar-2.1.2-r2.ebuild 1395 BLAKE2B 331f9c6d19636fde606fb2325129943d6c872f7cd3fcda55490aa815fec402afe2e3ed85c70710719c5f77e9c8b4131981d077ee6ed744403f02345da40a7335 SHA512 d817ae1b1b0271bd5ff53d434b0de36036675e0e1c510dc775f1309e7a6a3699c32b22ed8548d5fbff4f21b083c7485d8f60a3afd8b5b5af628e469eb70fe10a -MISC metadata.xml 416 BLAKE2B 6ea983e3b906fd52e83ee87a9bd8c1600e4918ef83343a9ee8db579a98ff41d0843a945cac16ee6693fd7803ed6008a93ba9e2b6c0eacdfcfc45262acd5d3c02 SHA512 32606c2f70434bafa0bbd1c8a8161169b4274a117cc755967e297843e17775419369401b395446c124d9b5ad0ecd46f980b8177659de1c6cc63f55e3afd2316e diff --git a/games-emulation/virtualjaguar/files/virtualjaguar b/games-emulation/virtualjaguar/files/virtualjaguar deleted file mode 100644 index df4bb14d73f8..000000000000 --- a/games-emulation/virtualjaguar/files/virtualjaguar +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/bash -# -# Script for launching virtualjaguar -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -source /lib/gentoo/functions.sh || exit 1 - -shopt -s nullglob - -if [[ ! -d ~/.vj/bios ]] ; then - mkdir -p ~/.vj/bios -fi - -if [[ ! -d ~/.vj/eeproms ]] ; then - mkdir -p ~/.vj/eeproms -fi - -if [[ ! -d ~/.vj/ROMs ]] ; then - mkdir -p ~/.vj/ROMs -fi - -cd ~/.vj - -# check for bios -if [[ -z "`cd ./bios && ls`" ]] ; then - # if the bios directory is empty, then ... well ... - echo - eerror " Put your BIOS file into ~/.vj/bios/" - eerror " or virtualjaguar will not work!" - exit 1 -fi - -# execute program (with args) -exec GENTOODIR/vj "$@" diff --git a/games-emulation/virtualjaguar/files/virtualjaguar-2.1.2-gcc6.patch b/games-emulation/virtualjaguar/files/virtualjaguar-2.1.2-gcc6.patch deleted file mode 100644 index 8145de9bbd15..000000000000 --- a/games-emulation/virtualjaguar/files/virtualjaguar-2.1.2-gcc6.patch +++ /dev/null @@ -1,316 +0,0 @@ -Backported from following commit: - -From c9d57b57d70ab2ae842144828175820fb207a3b0 Mon Sep 17 00:00:00 2001 -From: Shamus Hammons -Date: Wed, 18 May 2016 00:31:26 +0000 -Subject: [PATCH] Fixes for compilation against GCC 6. - -So Debian decides to be more rice than Gentoo, and makes the jump to GCC -6 for some unknown reason. Thus, in order to prevent VJ from getting -dumped out of Debian for incompatibility with GCC 6, we have the -following update. Thanks to John Paul Adrian Glaubitz for the report, and -to Teemu Hukkanen for Debian chroot advice. :-) ---- - Makefile | 2 +- - src/blitter.cpp | 2 +- - src/gui/about.cpp | 3 +-- - src/gui/controllerwidget.cpp | 10 ++++++---- - src/gui/mainwin.cpp | 2 +- - src/jagbios.cpp | 4 +++- - src/jagbios.h | 4 +++- - src/jagbios2.cpp | 4 +++- - src/jagbios2.h | 4 +++- - src/jagcdbios.cpp | 4 +++- - src/jagcdbios.h | 4 +++- - src/jagdevcdbios.cpp | 4 +++- - src/jagdevcdbios.h | 4 +++- - src/jagstub1bios.cpp | 4 +++- - src/jagstub1bios.h | 4 +++- - src/jagstub2bios.cpp | 4 +++- - src/jagstub2bios.h | 4 +++- - src/joystick.cpp | 4 ++-- - 18 files changed, 48 insertions(+), 23 deletions(-) - -diff --git a/Makefile b/Makefile -index 4fd8eae..29f5f49 100644 ---- a/Makefile -+++ b/Makefile -@@ -65,7 +65,7 @@ virtualjaguar: sources libs makefile-qt - - makefile-qt: virtualjaguar.pro - @echo -e "\033[01;33m***\033[00;32m Creating Qt makefile...\033[00m" -- $(Q)$(CROSS)qmake $(QMAKE_EXTRA) virtualjaguar.pro -o makefile-qt -+ $(Q)$(CROSS)qmake -qt=5 $(QMAKE_EXTRA) virtualjaguar.pro -o makefile-qt - - libs: obj/libm68k.a obj/libjaguarcore.a - @echo -e "\033[01;33m***\033[00;32m Libraries successfully made.\033[00m" -diff --git a/src/blitter.cpp b/src/blitter.cpp -index 588e6c2..7193daf 100644 ---- a/src/blitter.cpp -+++ b/src/blitter.cpp -@@ -5387,7 +5387,7 @@ Addq_x := JOIN (addq_x, addq_x[0..5], addqt_x[6..15]); - Addq_y := JOIN (addq_y, addq_y[0..15]);*/ - - ////////////////////////////////////// C++ CODE ////////////////////////////////////// -- int16_t mask[8] = { 0xFFFF, 0xFFFE, 0xFFFC, 0xFFF8, 0xFFF0, 0xFFE0, 0xFFC0, 0x0000 }; -+ uint16_t mask[8] = { 0xFFFF, 0xFFFE, 0xFFFC, 0xFFF8, 0xFFF0, 0xFFE0, 0xFFC0, 0x0000 }; - addq_x = addqt_x & mask[modx]; - addq_y = addqt_y & 0xFFFF; - ////////////////////////////////////////////////////////////////////////////////////// -diff --git a/src/gui/about.cpp b/src/gui/about.cpp -index 1b3df54..71cec73 100644 ---- a/src/gui/about.cpp -+++ b/src/gui/about.cpp -@@ -51,9 +51,8 @@ AboutWindow::AboutWindow(QWidget * parent/*= 0*/): QWidget(parent, Qt::Dialog) - "Ryan C. Gordon for Virtual Jaguar's web presence
" - "Curt Vendel for various Jaguar & other goodies
" - "Reboot for reasons too numerous to mention
" -- "The Free Jaguar Project (you know why) ;-)
" - "The guys over at Atari Age :-)
" -- "byuu for BSNES and showing us what was possible" -+ "byuu for BSNES Higan and showing us what was possible" - )); - text = new QLabel(s); - layout->addWidget(text); -diff --git a/src/gui/controllerwidget.cpp b/src/gui/controllerwidget.cpp -index f7ea8d0..38ce415 100644 ---- a/src/gui/controllerwidget.cpp -+++ b/src/gui/controllerwidget.cpp -@@ -47,8 +47,8 @@ char ControllerWidget::hatName[4][16] = { "Up", "Rt", "Dn", "Lf" }; - char ControllerWidget::axisName[2][8] = { "+", "-" }; - - // This is hard-coded crap. It's crap-tastic! --// These are the positions to draw the button names at, ordered by the BUTTON_* sequence --// found in joystick.h. -+// These are the positions to draw the button names at, ordered by the BUTTON_* -+// sequence found in joystick.h. - int ControllerWidget::buttonPos[21][2] = { { 74, 32 }, { 71, 67 }, { 53, 49 }, { 93, 49 }, - { 110, 200 }, { 110, 175 }, { 110, 151 }, { 110, 126 }, - { 148, 200 }, { 148, 175 }, { 148, 151 }, { 148, 126 }, -@@ -239,7 +239,8 @@ void ControllerWidget::mouseMoveEvent(QMouseEvent * event) - - for(int i=BUTTON_FIRST; i<=BUTTON_LAST; i++) - { -- // We loop through the button text positions, to see which one is closest. -+ // We loop through the button text positions, to see which one is -+ // closest. - double distX = (double)(event->x() - buttonPos[i][0]); - double distY = (double)(event->y() - buttonPos[i][1]); - double currentDistance = sqrt((distX * distX) + (distY * distY)); -@@ -265,7 +266,8 @@ void ControllerWidget::leaveEvent(QEvent * /*event*/) - - void ControllerWidget::DrawBorderedText(QPainter & painter, int x, int y, QString text) - { -- // Text is drawn centered at (x, y) as well, using a bounding rect for the purpose. -+ // Text is drawn centered at (x, y) as well, using a bounding rect for the -+ // purpose. - QRect rect(0, 0, 60, 30); - QPen oldPen = painter.pen(); - painter.setPen(QColor(0, 0, 0, 255)); // This is R,G,B,A -diff --git a/src/gui/mainwin.cpp b/src/gui/mainwin.cpp -index 9f64c62..cb01b02 100644 ---- a/src/gui/mainwin.cpp -+++ b/src/gui/mainwin.cpp -@@ -964,7 +964,7 @@ void MainWin::LoadSoftware(QString file) - running = false; // Prevent bad things(TM) from happening... - pauseForFileSelector = false; // Reset the file selector pause flag - -- char * biosPointer = jaguarBootROM; -+ uint8_t * biosPointer = jaguarBootROM; - - if (vjs.hardwareTypeAlpine) - biosPointer = jaguarDevBootROM2; -diff --git a/src/jagbios.cpp b/src/jagbios.cpp -index 8c03e6f..7951524 100644 ---- a/src/jagbios.cpp -+++ b/src/jagbios.cpp -@@ -4,7 +4,9 @@ - // NOTE: This is the Jaguar Series K boot ROM - // - --char jaguarBootROM[0x20000] = { -+#include "jagbios.h" -+ -+uint8_t jaguarBootROM[0x20000] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0xE0, 0x00, 0x08, 0x41, 0xF9, 0x00, 0xF0, 0x00, 0x00, 0x30, 0xBC, 0x18, 0x61, 0x32, 0x3C, 0x35, 0xCC, 0x30, 0x39, 0x00, 0xF1, 0x40, 0x02, 0x08, 0x00, 0x00, 0x05, - 0x66, 0x04, 0x32, 0x3C, 0x35, 0xDD, 0x31, 0x41, 0x00, 0x02, 0x46, 0xFC, 0x27, 0x00, 0x2E, 0x7C, 0x00, 0x00, 0x40, 0x00, 0x31, 0x7C, 0x00, 0x00, 0x00, 0x58, 0x21, 0x7C, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x2A, 0x33, 0xFC, 0x00, 0x04, 0x00, 0xF1, 0x00, 0x14, 0x08, 0x00, 0x00, 0x04, 0x67, 0x00, 0x00, 0x74, 0x33, 0xFC, 0x00, 0xB5, 0x00, 0xF1, 0x00, 0x12, 0x31, 0x7C, 0x03, 0x4C, 0x00, 0x2E, -diff --git a/src/jagbios.h b/src/jagbios.h -index 3f6ae5e..9e9a383 100644 ---- a/src/jagbios.h -+++ b/src/jagbios.h -@@ -1,6 +1,8 @@ - #ifndef __JAGBIOS_H__ - #define __JAGBIOS_H__ - --extern char jaguarBootROM[]; -+#include -+ -+extern uint8_t jaguarBootROM[]; - - #endif // __JAGBIOS_H__ -diff --git a/src/jagbios2.cpp b/src/jagbios2.cpp -index 413e5e6..5076405 100644 ---- a/src/jagbios2.cpp -+++ b/src/jagbios2.cpp -@@ -4,7 +4,9 @@ - // NOTE: This is the Jaguar Series M boot ROM - // - --char jaguarBootROM2[0x20000] = { -+#include "jagbios2.h" -+ -+uint8_t jaguarBootROM2[0x20000] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0xE0, 0x00, 0x08, 0x41, 0xF9, 0x00, 0xF0, 0x00, 0x00, 0x30, 0xBC, 0x18, 0x61, 0x70, 0xFF, 0x51, 0xC8, 0xFF, 0xFE, 0x32, 0x3C, 0x35, 0xCC, 0x30, 0x39, 0x00, 0xF1, - 0x40, 0x02, 0x08, 0x00, 0x00, 0x05, 0x66, 0x04, 0x32, 0x3C, 0x35, 0xDD, 0x31, 0x41, 0x00, 0x02, 0x46, 0xFC, 0x27, 0x00, 0x2E, 0x7C, 0x00, 0x00, 0x40, 0x00, 0x31, 0x7C, 0x00, 0x00, 0x00, 0x58, - 0x21, 0x7C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x2A, 0x23, 0xFC, 0x00, 0x07, 0x00, 0x07, 0x00, 0xF1, 0xA1, 0x0C, 0x23, 0xFC, 0x00, 0x07, 0x00, 0x07, 0x00, 0xF0, 0x21, 0x0C, 0x23, 0xFC, 0x00, 0x00, -diff --git a/src/jagbios2.h b/src/jagbios2.h -index 9944947..961e585 100644 ---- a/src/jagbios2.h -+++ b/src/jagbios2.h -@@ -1,6 +1,8 @@ - #ifndef __JAGBIOS2_H__ - #define __JAGBIOS2_H__ - --extern char jaguarBootROM2[]; -+#include -+ -+extern uint8_t jaguarBootROM2[]; - - #endif // __JAGBIOS2_H__ -diff --git a/src/jagcdbios.cpp b/src/jagcdbios.cpp -index eea4cf0..a4c407a 100644 ---- a/src/jagcdbios.cpp -+++ b/src/jagcdbios.cpp -@@ -2,7 +2,9 @@ - // This file was automagically generated by bin2c (by James Hammons) - // - --char jaguarCDBootROM[0x40000] = { -+#include "jagcdbios.h" -+ -+uint8_t jaguarCDBootROM[0x40000] = { - 0xF6, 0x1A, 0x8C, 0x5F, 0xF0, 0x28, 0xD5, 0xC2, 0xDE, 0xE7, 0xB6, 0x87, 0xD6, 0xEA, 0x4A, 0x42, 0x9A, 0x9B, 0x2E, 0xCB, 0xE7, 0x35, 0x3C, 0x3B, 0xA2, 0xA6, 0x74, 0xF9, 0xC9, 0x86, 0xE2, 0xD7, - 0x67, 0xC0, 0x9A, 0xFB, 0x61, 0x37, 0x37, 0x89, 0x70, 0x3B, 0xE0, 0x84, 0x97, 0x0A, 0xD2, 0xC5, 0x9F, 0xC1, 0x62, 0xB5, 0x2E, 0xD1, 0x26, 0x02, 0x44, 0xC3, 0xE1, 0xD4, 0xD6, 0xC2, 0xE7, 0x6A, - 0x56, 0x27, 0x2E, 0x60, 0x74, 0xE9, 0x05, 0xCE, 0x65, 0xB9, 0x87, 0x74, 0x64, 0x65, 0xF2, 0xB2, 0x00, 0xF7, 0xFB, 0xBC, 0xB9, 0xA2, 0x2D, 0x73, 0xC1, 0x75, 0xF5, 0xD1, 0xF3, 0xDB, 0xB5, 0x17, -diff --git a/src/jagcdbios.h b/src/jagcdbios.h -index 2fb0861..23e5abe 100644 ---- a/src/jagcdbios.h -+++ b/src/jagcdbios.h -@@ -1,6 +1,8 @@ - #ifndef __JAGCDBIOS_H__ - #define __JAGCDBIOS_H__ - --extern char jaguarCDBootROM[]; -+#include -+ -+extern uint8_t jaguarCDBootROM[]; - - #endif // __JAGCDBIOS_H__ -diff --git a/src/jagdevcdbios.cpp b/src/jagdevcdbios.cpp -index 85dbe91..e4ce4b4 100644 ---- a/src/jagdevcdbios.cpp -+++ b/src/jagdevcdbios.cpp -@@ -2,7 +2,9 @@ - // This file was automagically generated by bin2c (by James Hammons) - // - --char jaguarDevCDBootROM[0x40000] = { -+#include "jagdevcdbios.h" -+ -+uint8_t jaguarDevCDBootROM[0x40000] = { - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, -diff --git a/src/jagdevcdbios.h b/src/jagdevcdbios.h -index 432e48c..fe6ae8c 100644 ---- a/src/jagdevcdbios.h -+++ b/src/jagdevcdbios.h -@@ -1,6 +1,8 @@ - #ifndef __JAGDEVCDBIOS_H__ - #define __JAGDEVCDBIOS_H__ - --extern char jaguarDevCDBootROM[]; -+#include -+ -+extern uint8_t jaguarDevCDBootROM[]; - - #endif // __JAGDEVCDBIOS_H__ -diff --git a/src/jagstub1bios.cpp b/src/jagstub1bios.cpp -index 80fdd43..7fb85d5 100644 ---- a/src/jagstub1bios.cpp -+++ b/src/jagstub1bios.cpp -@@ -2,7 +2,9 @@ - // This file was automagically generated by bin2c (by James Hammons) - // - --char jaguarDevBootROM1[0x20000] = { -+#include "jagstub1bios.h" -+ -+uint8_t jaguarDevBootROM1[0x20000] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0xE0, 0x00, 0x08, 0x4D, 0xF9, 0x00, 0xF0, 0x00, 0x00, 0x49, 0xF9, 0x00, 0xF1, 0x40, 0x00, 0x3C, 0xFC, 0x18, 0x61, 0x3C, 0xBC, 0x35, 0xCC, 0x46, 0xFC, 0x27, 0x00, - 0x4F, 0xF8, 0x03, 0x00, 0x70, 0xFF, 0x74, 0x02, 0x51, 0xC8, 0xFF, 0xFC, 0x38, 0xBC, 0x80, 0x0D, 0xC4, 0x6C, 0x00, 0x02, 0x66, 0x06, 0x4E, 0xF9, 0x00, 0xE0, 0x1B, 0xFA, 0x41, 0xF9, 0x00, 0xE0, - 0x00, 0x00, 0x47, 0xF8, 0x04, 0x00, 0x30, 0x3C, 0x06, 0xFF, 0x26, 0xD8, 0x51, 0xC8, 0xFF, 0xFC, 0x30, 0x3C, 0x06, 0xFF, 0x24, 0x23, 0xB4, 0xA0, 0x67, 0x04, 0x60, 0x00, 0x12, 0x1A, 0x51, 0xC8, -diff --git a/src/jagstub1bios.h b/src/jagstub1bios.h -index a4b6f72..200e84b 100644 ---- a/src/jagstub1bios.h -+++ b/src/jagstub1bios.h -@@ -1,6 +1,8 @@ - #ifndef __JAGSTUB1BIOS_H__ - #define __JAGSTUB1BIOS_H__ - --extern char jaguarDevBootROM1[]; -+#include -+ -+extern uint8_t jaguarDevBootROM1[]; - - #endif // __JAGSTUB1BIOS_H__ -diff --git a/src/jagstub2bios.cpp b/src/jagstub2bios.cpp -index 884680a..41d55c4 100644 ---- a/src/jagstub2bios.cpp -+++ b/src/jagstub2bios.cpp -@@ -2,7 +2,9 @@ - // This file was automagically generated by bin2c (by James Hammons) - // - --char jaguarDevBootROM2[0x20000] = { -+#include "jagstub2bios.h" -+ -+uint8_t jaguarDevBootROM2[0x20000] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0xE0, 0x00, 0x08, 0x4D, 0xF9, 0x00, 0xF0, 0x00, 0x00, 0x49, 0xF9, 0x00, 0xF1, 0x40, 0x00, 0x3C, 0xFC, 0x18, 0x61, 0x3C, 0xBC, 0x35, 0xCC, 0x46, 0xFC, 0x27, 0x00, - 0x4F, 0xF8, 0x03, 0x00, 0x70, 0xFF, 0x76, 0x02, 0x51, 0xC8, 0xFF, 0xFC, 0x41, 0xF9, 0x00, 0xE0, 0x00, 0x00, 0x47, 0xF8, 0x04, 0x00, 0x30, 0x3C, 0x06, 0xFF, 0x26, 0xD8, 0x51, 0xC8, 0xFF, 0xFC, - 0x30, 0x3C, 0x06, 0xFF, 0x24, 0x23, 0xB4, 0xA0, 0x66, 0x00, 0x12, 0x34, 0x51, 0xC8, 0xFF, 0xF6, 0x48, 0x79, 0x00, 0x00, 0x04, 0x64, 0x45, 0xF9, 0x00, 0xE0, 0x15, 0x94, 0x95, 0xFC, 0x00, 0xDF, -diff --git a/src/jagstub2bios.h b/src/jagstub2bios.h -index fcec2e3..c80d98d 100644 ---- a/src/jagstub2bios.h -+++ b/src/jagstub2bios.h -@@ -1,6 +1,8 @@ - #ifndef __JAGSTUB2BIOS_H__ - #define __JAGSTUB2BIOS_H__ - --extern char jaguarDevBootROM2[]; -+#include -+ -+extern uint8_t jaguarDevBootROM2[]; - - #endif // __JAGSTUB1BIOS_H__ -diff --git a/src/joystick.cpp b/src/joystick.cpp -index 4b25493..25aef85 100644 ---- a/src/joystick.cpp -+++ b/src/joystick.cpp -@@ -137,6 +137,6 @@ uint16_t JoystickReadWord(uint32_t offset) - if (offset0 != 0xFF) - { -- uint8_t mask[4][2] = { { BUTTON_A, BUTTON_PAUSE }, { BUTTON_B, -1 }, { BUTTON_C, -1 }, { BUTTON_OPTION, -1 } }; -+ uint8_t mask[4][2] = { { BUTTON_A, BUTTON_PAUSE }, { BUTTON_B, 0xFF }, { BUTTON_C, 0xFF }, { BUTTON_OPTION, 0xFF } }; - data &= (joypad0Buttons[mask[offset0][0]] ? 0xFFFD : 0xFFFF); - - if (mask[offset0][1] != -1) -@@ -147,6 +147,6 @@ uint16_t JoystickReadWord(uint32_t offset) - if (offset1 != 0xFF) - { -- uint8_t mask[4][2] = { { BUTTON_A, BUTTON_PAUSE }, { BUTTON_B, -1 }, { BUTTON_C, -1 }, { BUTTON_OPTION, -1 } }; -+ uint8_t mask[4][2] = { { BUTTON_A, BUTTON_PAUSE }, { BUTTON_B, 0xFF }, { BUTTON_C, 0xFF }, { BUTTON_OPTION, 0xFF } }; - data &= (joypad1Buttons[mask[offset1][0]] ? 0xFFF7 : 0xFFFF); - - if (mask[offset1][1] != -1) diff --git a/games-emulation/virtualjaguar/metadata.xml b/games-emulation/virtualjaguar/metadata.xml deleted file mode 100644 index e73cd94a1388..000000000000 --- a/games-emulation/virtualjaguar/metadata.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - games@gentoo.org - Gentoo Games Project - - -The Virtual Atari Jaguar GCC/SDL portable Jaguar emulator which is based on -the source code released by Cal2 of Potato Emulation. - - diff --git a/games-emulation/virtualjaguar/virtualjaguar-2.1.2-r2.ebuild b/games-emulation/virtualjaguar/virtualjaguar-2.1.2-r2.ebuild deleted file mode 100644 index d4d53cd4f1c9..000000000000 --- a/games-emulation/virtualjaguar/virtualjaguar-2.1.2-r2.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit eutils versionator gnome2-utils qmake-utils toolchain-funcs - -DESCRIPTION="an Atari Jaguar emulator" -HOMEPAGE="http://www.icculus.org/virtualjaguar/" -SRC_URI="http://www.icculus.org/virtualjaguar/tarballs/${P}.tar.bz2" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND=" - dev-libs/libcdio - dev-qt/qtcore:4 - dev-qt/qtgui:4 - dev-qt/qtopengl:4[-egl] - media-libs/libsdl[joystick,opengl,sound,video] - sys-libs/zlib - virtual/opengl" -DEPEND="${RDEPEND} - >=sys-devel/gcc-4.4" - -S=${WORKDIR}/${PN} - -PATCHES=( "${FILESDIR}"/${P}-gcc6.patch ) - -src_prepare() { - default - sed -i \ - -e '/^Categories/s/$/;/' \ - virtualjaguar.desktop || die -} - -src_configure() { - eqmake4 virtualjaguar.pro -o makefile-qt -} - -src_compile() { - emake -j1 libs - emake -} - -src_install() { - dobin ${PN} - dodoc README docs/{TODO,WHATSNEW} - doman docs/virtualjaguar.1 - domenu virtualjaguar.desktop - newicon -s 128 res/vj-icon.png ${PN}.png -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - elog "The ${PN} ROM path is no-longer hardcoded, " - elog "set it from within, the ${PN} GUI." - elog - elog "The ROM extension supported by ${PN} is .j64, " - elog ".jag files will be interpreted as Jaguar Server executables." - gnome2_icon_cache_update -} - -pkg_postrm() { - gnome2_icon_cache_update -} diff --git a/games-emulation/xe/Manifest b/games-emulation/xe/Manifest index 351f5baa619a..cfab9ded742e 100644 --- a/games-emulation/xe/Manifest +++ b/games-emulation/xe/Manifest @@ -1,6 +1,6 @@ AUX xe-2.16.2 173 BLAKE2B a872f9cb20e082cfe1f81cf049cb6697b7a7a3064ff2f8651e2614062a4a76ea2c8fa3d6f126ba795cbd9b092d49e76b5a874da4a792b7b7d6f168d0bbf7f94e SHA512 6e5812cf355ded200a9fd16d41fca76938ca0526b120858771e0a900c2e4129ec5b00808f20ce4577df3643324dea6526296424c387db5babc36e1266ec8546b AUX xe-2.16.2-gentoo.patch 506 BLAKE2B 29b67d92770e1e4d5888872eb9a96ef8b4d984d665a3b14e1e0d6e9a078a4d776ce0ef79c83b6415ee3be1c1d0d99934328661e948d2fc30a63fd10b2e0cd960 SHA512 31a215532c2fb17fd7234ba6a5375c465d6336f82625a5406ac361a29929da787a8bf5398cd21425682de2bd350790d03eca2be666b7f000c90b8c1839cfe618 -DIST xe-x86-32-bin.2.16.2.tar.bz2 1610395 SHA256 fff82a9e56d8f03d14395eeebb9306de7b3a03df6af12b0acc11b0206d1212f0 SHA512 b73f79854f860f7e7060c8b09e0a038b787762d3bd440b5b2825b5a702e4f32c788b883012728813e0a9dcee779f8b98b807c8af3f655fea21bd0ed1383e361c WHIRLPOOL 0c6c18c53105859ec44767cbc21fdf82e14ea4532fe26ecf9dec2acc6917af2baa80df7d8050ce9206ad189a2d8ac5cad1b17c7daa86d69ebcc04b4e83d1cabf -DIST xe-x86-64-bin.2.16.2.tar.bz2 2141614 SHA256 73a035c20b56fe197529aeb034ce3b81c680e184d0acca7d48df7fedbbafb103 SHA512 cf8a4be4f169660138018631b4a2b6c1a42850c7fc08bd9bd184ab054bffc6fe00197baaf9628cce87608628bb33db0dabac97debd7c53466b086cf0805cc5d8 WHIRLPOOL 49a8f159e34bb3a2c4e44130f6b2c68e3dc681f8795f776c9323c0e2d21180fa490dc810abab327f5573c0cfd71307c1c4d16abaf0775795949c5af244b8831c +DIST xe-x86-32-bin.2.16.2.tar.bz2 1610395 BLAKE2B 37db06d73f5d6e3e6192e69bb2786b979e5cb74554fce3f89fd752dba76ea223d2a7a3e90950cc0d64d69e132d5bbd9f55816f93481d752aba79aa72e5ab1e97 SHA512 b73f79854f860f7e7060c8b09e0a038b787762d3bd440b5b2825b5a702e4f32c788b883012728813e0a9dcee779f8b98b807c8af3f655fea21bd0ed1383e361c +DIST xe-x86-64-bin.2.16.2.tar.bz2 2141614 BLAKE2B cfa386cd1a0614d21f7f32af44fe13eeaf0b2b8f65c605961b2768087788a9e9b950955ec1853a0d3302326199217b180aa448669a31f662f05c8e867e018bdc SHA512 cf8a4be4f169660138018631b4a2b6c1a42850c7fc08bd9bd184ab054bffc6fe00197baaf9628cce87608628bb33db0dabac97debd7c53466b086cf0805cc5d8 EBUILD xe-2.16.2.ebuild 1226 BLAKE2B 45ee5b77ab6270836fde5d3a2dc6e84218d514c27ea7ee2cf5f23fb803a7e13410c776c7b08a7792fe528edd608994b4c8e16e49a498b2c005aafe15c1fb18e1 SHA512 3fac70eb6ebe94816ed53b41b0950a88fa3df674901f5dbe12175b580e952837f4c654922205bf5e77339987a9172e028052ebf06e9457befc9e1b264741d0e4 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 -- cgit v1.2.3