wip clean-up: remove osmose

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: wip clean-up: remove osmose
From: pin <voidpin%protonmail.com@localhost>
Date: Fri, 08 Jul 2022 20:25:28 +0000
Module Name:	pkgsrc-wip
Committed By:	pin <voidpin%protonmail.com@localhost>
Pushed By:	pin
Date:		Fri Jul 8 22:25:28 2022 +0200
Changeset:	8bb9c53eb96952edbfb6d642afacb38e57426292

Modified Files:
	Makefile
Removed Files:
	osmose/DESCR
	osmose/Makefile
	osmose/PLIST
	osmose/TODO
	osmose/distinfo
	osmose/patches/patch-EmulationThread.h
	osmose/patches/patch-Osmose-0-9-96-QT.pro
	osmose/patches/patch-OsmoseCore.cpp
	osmose/patches/patch-OsmoseCore.h
	osmose/patches/patch-OsmoseGUI.cpp
	osmose/patches/patch-OsmoseGUI.h
	osmose/patches/patch-QOsmoseConfiguration.h

Log Message:
wip clean-up: remove osmose

No upstream, EOL Qt4.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=8bb9c53eb96952edbfb6d642afacb38e57426292

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 Makefile                                    |  1 -
 osmose/DESCR                                | 22 -------------
 osmose/Makefile                             | 33 -------------------
 osmose/PLIST                                |  3 --
 osmose/TODO                                 |  9 ------
 osmose/distinfo                             | 12 -------
 osmose/patches/patch-EmulationThread.h      | 13 --------
 osmose/patches/patch-Osmose-0-9-96-QT.pro   | 45 --------------------------
 osmose/patches/patch-OsmoseCore.cpp         | 40 -----------------------
 osmose/patches/patch-OsmoseCore.h           | 25 ---------------
 osmose/patches/patch-OsmoseGUI.cpp          | 49 -----------------------------
 osmose/patches/patch-OsmoseGUI.h            | 30 ------------------
 osmose/patches/patch-QOsmoseConfiguration.h | 27 ----------------
 13 files changed, 309 deletions(-)

diffs:
diff --git a/Makefile b/Makefile
index da3c8104c1..43066fbb59 100644
--- a/Makefile
+++ b/Makefile
@@ -2771,7 +2771,6 @@ SUBDIR+=	os108-desktop
 SUBDIR+=	oslc
 SUBDIR+=	osmo
 SUBDIR+=	osmo-sdr-git
-SUBDIR+=	osmose
 SUBDIR+=	osxinfo
 SUBDIR+=	otrtool
 SUBDIR+=	ots
diff --git a/osmose/DESCR b/osmose/DESCR
deleted file mode 100644
index 95750cc7cf..0000000000
--- a/osmose/DESCR
+++ /dev/null
@@ -1,22 +0,0 @@
-Osmose is another Sega Master System / Gamegear emulator. The
-emulator is released as open source project, under the GPL license.
-
-- SMS: Good compatibility. At this stage, the emulator can run 96%
-  of commercial games and public demos, except games that rely on
-  the codemaster mapper, which work but do not have the proper video
-  mode emulated.
-- Game Gear: Good compatibility. At this stage, the emulator can
-  run 98.0% of game gear ROMS.
-- SN76489 sound is supported, but needs more work on the noise
-  register.
-- Support for .zip, .sms and .gg formats.
-- Video filters: monochrome, scanline, scale2x, bilinear, nearest
-  neighbour, and a new interesting scale2xscanline (fullscreen option
-  always also available).
-- Pad (keyboard or joystick mapped), Sport Paddle (mouse mapped) emulation.
-- PAL/NTSC Timing.
-- Japanese/Export console.
-- In-game screenshots, GFX rip, sound shot.
-- Accurate auto-frameskip.
-- Configurable keyboard configuration.
-- Joystick support.
diff --git a/osmose/Makefile b/osmose/Makefile
deleted file mode 100644
index ac2a7a3c53..0000000000
--- a/osmose/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-# $NetBSD$
-
-DISTNAME=	Osmose-${PKGVERSION_NOREV:S/./-/g}-QT
-PKGNAME=	osmose-0.9.96
-CATEGORIES=	emulators
-MASTER_SITES=	http://bcz.asterope.fr/osmose/
-EXTRACT_SUFX=	.zip
-
-MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=	http://bcz.asterope.fr/osmose.htm
-COMMENT=	Sega Master System/Game Gear emulator
-LICENSE=	gnu-gpl-v3
-
-USE_TOOLS+=	gmake
-USE_LANGUAGES=	c c++
-
-INSTALLATION_DIRS=	bin
-INSTALLATION_DIRS+=	share/doc/${PKGBASE}
-
-QMAKE=	${QTDIR}/bin/qmake
-
-do-configure:
-	cd ${WRKSRC} && \
-	env QTDIR=${QTDIR} ${QMAKE}
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/${DISTNAME} ${DESTDIR}${PREFIX}/bin/osmose
-	${INSTALL_DATA} ${WRKSRC}/Readme.txt ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
-
-.include "../../x11/qt4-libs/buildlink3.mk"
-.include "../../x11/qt4-tools/buildlink3.mk"
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/osmose/PLIST b/osmose/PLIST
deleted file mode 100644
index f69708cce9..0000000000
--- a/osmose/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD$
-bin/osmose
-share/doc/osmose/Readme.txt
diff --git a/osmose/TODO b/osmose/TODO
deleted file mode 100644
index 4f94698ae4..0000000000
--- a/osmose/TODO
+++ /dev/null
@@ -1,9 +0,0 @@
-Osmose uses Linux-only libraries for dealing with sound and
-joystick input, so they've been gutted so that Osmose can at
-least compile and run.
-
-The Preferences screen also seems to be broken, and the File
-Select window acts a bit funny too.
-
-At the very least, ROMs seem to load and run fine, as well as
-as the rest of the UI controls. Not seeing any performance issues.
diff --git a/osmose/distinfo b/osmose/distinfo
deleted file mode 100644
index 8b72163950..0000000000
--- a/osmose/distinfo
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2006/12/13 18:34:02 thomasklausner Exp $
-
-RMD160 (Osmose-0-9-96-QT.zip) = bacdebb2e077e3e08b51c973da3f52fe8f582d67
-SHA512 (Osmose-0-9-96-QT.zip) = 0c2b8ec71edd567afdbee7d7347be2a854cd424c37daec4336987e749bd325739c6d7294213e5ed988b3dd4af11d548afd5601c0e6e74b27e481559b085c9e19
-Size (Osmose-0-9-96-QT.zip) = 194671 bytes
-SHA1 (patch-EmulationThread.h) = 34ad25b6a6496f2c718d8dd61965038ce9ef5b6e
-SHA1 (patch-Osmose-0-9-96-QT.pro) = 725547b5d2c0bf9015ca9ac1a02b54fc1661fe58
-SHA1 (patch-OsmoseCore.cpp) = 384adc7aa8ae61ff256a27bcfe1b04f086b025e2
-SHA1 (patch-OsmoseCore.h) = f678a6ee0ed688d71a3061c80077cd86c9274f4e
-SHA1 (patch-OsmoseGUI.cpp) = ef0e611dc2c2bbb70ad26a4f57317b56c51cb07d
-SHA1 (patch-OsmoseGUI.h) = e8dc4130c0ab33c9854566ee8012ab09f1fbb9a5
-SHA1 (patch-QOsmoseConfiguration.h) = 8d194c2c685ca8f189b7435ee94d5026ca1238c9
diff --git a/osmose/patches/patch-EmulationThread.h b/osmose/patches/patch-EmulationThread.h
deleted file mode 100644
index 5b600f9f9a..0000000000
--- a/osmose/patches/patch-EmulationThread.h
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD$
-
---- EmulationThread.h.orig	2011-06-06 14:39:18.000000000 +0000
-+++ EmulationThread.h
-@@ -33,7 +33,7 @@
- 
- #include <iostream>
- #include <sys/time.h>
--#include <QThread>
-+#include <QtCore/QThread>
- #include <QReadWriteLock>
- #include "QGLImage.h"
- #include "OsmoseConfigurationFile.h"
diff --git a/osmose/patches/patch-Osmose-0-9-96-QT.pro b/osmose/patches/patch-Osmose-0-9-96-QT.pro
deleted file mode 100644
index b54cacfa62..0000000000
--- a/osmose/patches/patch-Osmose-0-9-96-QT.pro
+++ /dev/null
@@ -1,45 +0,0 @@
-$NetBSD$
-
-Add -lpthread, and remove Linux Joystick and ALSA-related stuff from
-the build.
-
---- Osmose-0-9-96-QT.pro.orig	2011-04-30 13:23:22.000000000 +0000
-+++ Osmose-0-9-96-QT.pro
-@@ -6,12 +6,11 @@ TEMPLATE = app
- TARGET = 
- DEPENDPATH += . cpu osmose unzip
- INCLUDEPATH += . cpu osmose unzip
--LIBS += -lz -lasound
-+LIBS += -lz -lpthread
- QT+=opengl
- 
- # Input
- HEADERS += EmulationThread.h \
--           Joystick.h \
-            KeyMapper.h \
-            OsmoseConfigurationFile.h \
-            OsmoseEmulationThread.h \
-@@ -40,7 +39,6 @@ HEADERS += EmulationThread.h \
-            osmose/SmsDebugger.h \
-            osmose/SmsEnvironment.h \
-            osmose/SN76489.h \
--           osmose/SoundThread.h \
-            osmose/VDP.h \
-            osmose/VDP_GG.h \
-            osmose/Version.h \
-@@ -50,7 +48,6 @@ HEADERS += EmulationThread.h \
-            unzip/unzip.h
- FORMS += Configuration.ui LogWindow.ui
- SOURCES += EmulationThread.cpp \
--           Joystick.cpp \
-            KeyMapper.cpp \
-            main.cpp \
-            OsmoseConfigurationFile.cpp \
-@@ -80,7 +77,6 @@ SOURCES += EmulationThread.cpp \
-            osmose/RomSpecificOption.cpp \
-            osmose/SmsEnvironment.cpp \
-            osmose/SN76489.cpp \
--           osmose/SoundThread.cpp \
-            osmose/VDP.cpp \
-            osmose/VDP_GG.cpp \
-            osmose/WaveWriter.cpp \
diff --git a/osmose/patches/patch-OsmoseCore.cpp b/osmose/patches/patch-OsmoseCore.cpp
deleted file mode 100644
index dc0467bf38..0000000000
--- a/osmose/patches/patch-OsmoseCore.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD$
-
---- osmose/OsmoseCore.cpp.orig	2011-06-06 15:24:54.000000000 +0000
-+++ osmose/OsmoseCore.cpp
-@@ -108,6 +108,7 @@ OsmoseCore::OsmoseCore(const char *rom_f
- 
-     if (emu_opt.sound == true)
-     {
-+#ifdef USE_SOUND
- 		try
- 		{
- 			sndThread = new SoundThread("plughw:0,0", p->getFIFOSoundBuffer());
-@@ -122,6 +123,7 @@ OsmoseCore::OsmoseCore(const char *rom_f
- 			sndThread = NULL;
- 			emu_opt.sound = false;
- 		}
-+#endif // USE_SOUND
- 	}
- }
- 
-@@ -131,7 +133,9 @@ OsmoseCore::OsmoseCore(const char *rom_f
- OsmoseCore::~OsmoseCore()
- {
- 	if (wavW != NULL) delete wavW;
-+#ifdef USE_SOUND
- 	if (sndThread != NULL) delete sndThread;
-+#endif
- 	save_bbr();	/* Save Battery backed memory if needed. */
- 	delete v;
- 	delete mem;
-@@ -218,7 +222,9 @@ void OsmoseCore::run_frame()
-         if (!p->getFIFOSoundBuffer()->spaceAvailable())
-         {
-             snd_started = true;
-+#ifdef USE_SOUND
- 			sndThread->resume();	
-+#endif
-         }
-     }
- 
diff --git a/osmose/patches/patch-OsmoseCore.h b/osmose/patches/patch-OsmoseCore.h
deleted file mode 100644
index 3c58076ea4..0000000000
--- a/osmose/patches/patch-OsmoseCore.h
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD$
-
---- osmose/OsmoseCore.h.orig	2011-06-06 15:25:26.000000000 +0000
-+++ osmose/OsmoseCore.h
-@@ -56,7 +56,10 @@
- #include "TGAWriter.h"
- #include "QLogWindow.h"
- #include "Pthreadcpp.h"
-+
-+#ifdef USE_SOUND
- #include "SoundThread.h"
-+#endif
- 
- using namespace std;
- 
-@@ -136,7 +139,9 @@ class OsmoseCore : public DebugEventThro
-         void save_bbr();				// Save Battery Backed Ram.
-         
-         void displayTiles(unsigned int *s, VDP *vd, int tile, int x, int y);
-+#ifdef USE_SOUND
- 		SoundThread *sndThread;
-+#endif
- 		OsmoseConfigurationFile *configuration;
- 		pthread_mutex_t *osmose_core_mutex;
- };
diff --git a/osmose/patches/patch-OsmoseGUI.cpp b/osmose/patches/patch-OsmoseGUI.cpp
deleted file mode 100644
index 074a2e141d..0000000000
--- a/osmose/patches/patch-OsmoseGUI.cpp
+++ /dev/null
@@ -1,49 +0,0 @@
-$NetBSD$
-
-Fix pthread-related build errors.
-
---- OsmoseGUI.cpp.orig	2011-06-06 15:07:12.000000000 +0000
-+++ OsmoseGUI.cpp
-@@ -40,7 +40,9 @@ OsmoseGUI::OsmoseGUI(QWidget * parent, Q
- 	rom_name = NULL;
- 	osmoseCore = NULL;
- 	saveStateSlot = 0;
--	osmose_core_mutex = PTHREAD_MUTEX_INITIALIZER;
-+
-+	pthread_mutex_t osmose_core_mutex;
-+	pthread_mutex_init(&osmose_core_mutex, NULL);
- 
- 	QLogWindow::getInstance()->appendLog("Starting Osmose emulator.");
- 		
-@@ -347,6 +349,7 @@ OsmoseGUI::OsmoseGUI(QWidget * parent, Q
- 	}
- 	
- 	/* Try to find a Joystick*/
-+#ifdef USE_JOYSTICK
- 	js0 = NULL;
- 	try
- 	{
-@@ -363,6 +366,7 @@ OsmoseGUI::OsmoseGUI(QWidget * parent, Q
- 		msg = msg + ").";
- 		QLogWindow::getInstance()->appendLog(msg);
- 	}
-+#endif // USE_JOYSTICK
- 	
- 	// Enable Drop events.
- 	setAcceptDrops(true);	
-@@ -381,6 +385,7 @@ OsmoseGUI::~OsmoseGUI()
- 
- void OsmoseGUI::configure()
- {
-+#ifdef USE_JOYSTICK
- 	QOsmoseConfiguration *configWindow;
- 
- 	if (js0 == NULL)
-@@ -394,6 +399,7 @@ void OsmoseGUI::configure()
- 	}
- 	configWindow->exec();
- 	if (js0 != NULL) js0->setListener(this);
-+#endif
- }
- 
- void OsmoseGUI::sizeX1()
diff --git a/osmose/patches/patch-OsmoseGUI.h b/osmose/patches/patch-OsmoseGUI.h
deleted file mode 100644
index 00e0bcf032..0000000000
--- a/osmose/patches/patch-OsmoseGUI.h
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD$
-
---- OsmoseGUI.h.orig	2011-06-06 15:07:18.000000000 +0000
-+++ OsmoseGUI.h
-@@ -49,11 +49,14 @@
- #include "OsmoseCore.h"
- #include "MemoryMapper.h"
- #include "QLogWindow.h"
-+
-+#ifdef USE_JOYSTICK
- #include "Joystick.h"
-+#endif // USE_JOYSTICK
- 
- #define MENU_HEIGHT	20
- 
--class OsmoseGUI : public QMainWindow, JoystickListener
-+class OsmoseGUI : public QMainWindow
- {
- 	Q_OBJECT;
- 	
-@@ -131,7 +134,9 @@ private:
- 	void updateMachineMenu();
- 	void loadTheROM(QString name);
- 	bool isFullscreen;
-+#ifdef USE_JOYSTICK
- 	Joystick *js0;
-+#endif
- };
- 
- #endif	// OsmoseGUI
diff --git a/osmose/patches/patch-QOsmoseConfiguration.h b/osmose/patches/patch-QOsmoseConfiguration.h
deleted file mode 100644
index 00ba6e3ddd..0000000000
--- a/osmose/patches/patch-QOsmoseConfiguration.h
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD$
-
---- QOsmoseConfiguration.h.orig	2011-06-06 15:07:54.000000000 +0000
-+++ QOsmoseConfiguration.h
-@@ -36,7 +36,11 @@
- #include <QMessageBox>
- #include "ui_Configuration.h"
- #include "KeyMapper.h"
-+
-+#ifdef USE_JOYSTICK
- #include "Joystick.h"
-+#endif
-+
- #include "OsmoseConfigurationFile.h"
- 
- class KeyGrabber : public QDialog
-@@ -53,7 +57,9 @@ protected:
- 	unsigned int keyPressed;
- };
- 
--class QOsmoseConfiguration : public QDialog, public JoystickListener, private Ui::Configuration
-+class QOsmoseConfiguration :
-+	public QDialog,
-+	private Ui::Configuration
- {
- 
- Q_OBJECT
Prev by Date: PLIST created
Next by Date: wip clean-up: remove pokerth
Previous by Thread: PLIST created
Next by Thread: wip clean-up: remove pokerth
Indexes:
Home | Main Index | Thread Index | Old Index