Update hatari to 2.4.1.
This commit is contained in:
parent
d90a1c655f
commit
3b39363f4f
@ -2,7 +2,7 @@ ONLY_FOR_ARCHS = i386 amd64 powerpc powerpc64 arm
|
||||
|
||||
COMMENT = Atari ST/STE/TT/Falcon emulator
|
||||
|
||||
V = 2.4.0
|
||||
V = 2.4.1
|
||||
DISTNAME = hatari-${V}
|
||||
EXTRACT_SUFX = .tar.bz2
|
||||
|
||||
|
@ -1,2 +1,2 @@
|
||||
SHA256 (hatari-2.4.0.tar.bz2) = PkgbCMRctl00IxV8TpErRYy3KUH/UkeDYvmr15HLHtc=
|
||||
SIZE (hatari-2.4.0.tar.bz2) = 4452205
|
||||
SHA256 (hatari-2.4.1.tar.bz2) = Kl2hkygEFnFB3kvubBxdjVMDAmD+f+fjHl5xpMAOBUc=
|
||||
SIZE (hatari-2.4.1.tar.bz2) = 4446656
|
||||
|
@ -1,44 +0,0 @@
|
||||
Check for the availability of Python Gtk before using the python-ui.
|
||||
|
||||
Upstream commits 7464d78448514241ead1645d757e6cadb4edd5da and
|
||||
231a79eaae152160fc63fd6f3d8bd9aaac1f0c6b.
|
||||
|
||||
Index: CMakeLists.txt
|
||||
--- CMakeLists.txt.orig
|
||||
+++ CMakeLists.txt
|
||||
@@ -324,8 +324,21 @@ if(PYTHONINTERP_FOUND AND PYTHON_VERSION_MAJOR LESS 3)
|
||||
message("Note: Hatari needs at least Python 3 ... ignoring older version")
|
||||
unset(PYTHONINTERP_FOUND)
|
||||
endif()
|
||||
+set(PYTHON_GTK_FOUND 0)
|
||||
if(PYTHONINTERP_FOUND)
|
||||
- add_subdirectory(python-ui)
|
||||
+ execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "\
|
||||
+import gi\n\
|
||||
+gi.require_version('Gtk', '3.0')\n\
|
||||
+from gi.repository import Gtk\n\
|
||||
+from gi.repository import Gdk\n\
|
||||
+from gi.repository import GdkPixbuf\n\
|
||||
+from gi.repository import GLib"
|
||||
+ RESULT_VARIABLE PYTHON_GTK_RESULT
|
||||
+ OUTPUT_QUIET ERROR_QUIET)
|
||||
+ if(${PYTHON_GTK_RESULT} EQUAL 0)
|
||||
+ set(PYTHON_GTK_FOUND 1)
|
||||
+ add_subdirectory(python-ui)
|
||||
+ endif()
|
||||
endif(PYTHONINTERP_FOUND)
|
||||
|
||||
if(UNIX AND NOT ENABLE_OSX_BUNDLE)
|
||||
@@ -376,6 +389,12 @@ if(CapsImage_FOUND)
|
||||
else()
|
||||
message( " - capsimage :\tv5 not found, install it to use .IPF, .RAW and .CTR disk images" )
|
||||
endif(CapsImage_FOUND)
|
||||
+
|
||||
+if(PYTHON_GTK_FOUND)
|
||||
+ message( " - python Gtk:\tfound, python-ui can be used" )
|
||||
+else()
|
||||
+ message( " - python Gtk:\tnot found, install it to enable the python-ui" )
|
||||
+endif(PYTHON_GTK_FOUND)
|
||||
|
||||
if(Udev_FOUND)
|
||||
message( " - udev :\tfound, required for media change detection in NatFeats SCSI" )
|
Loading…
Reference in New Issue
Block a user