cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update hatari to 2.1.0, and remove patches which were merged upstream.

Browse Source
This commit is contained in:
fcambus 2018-02-11 13:25:38 +00:00
parent ab4db03bc9
commit 330d2ee681
5 changed files with 25 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
emulators/hatari/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.5 2017/12/02 21:39:49 juanfra Exp $
# $OpenBSD: Makefile,v 1.6 2018/02/11 13:25:38 fcambus Exp $
ONLY_FOR_ARCHS = i386 amd64 powerpc arm
COMMENT = Atari ST/STE/TT/Falcon emulator
V = 2.0.0
V = 2.1.0
DISTNAME = hatari-${V}
EXTRACT_SUFX = .tar.bz2
@ -17,7 +17,7 @@ MAINTAINER = Frederic Cambus <fcambus@openbsd.org>
# GPLv2+
PERMIT_PACKAGE_CDROM = Yes
WANTLIB += ICE SDL2 SM X11 Xext c m png pthread readline termcap z
WANTLIB += ICE SDL2 SM X11 Xext c curses m png pthread readline z
MASTER_SITES = https://download.tuxfamily.org/hatari/$V/

4
emulators/hatari/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (hatari-2.0.0.tar.bz2) = UqRHpZtpedVdFSXzxKIewBPkNxNU1mg+3nFUbF5tpXc=
SIZE (hatari-2.0.0.tar.bz2) = 3899087
SHA256 (hatari-2.1.0.tar.bz2) = 6ymUYOkttKiimDoHJcu8jBhfFHC47NeRs9ECgV2iCSQ=
SIZE (hatari-2.1.0.tar.bz2) = 4072778

27
emulators/hatari/patches/patch-CMakeLists_txt
View File

@ -1,11 +1,12 @@
$OpenBSD: patch-CMakeLists_txt,v 1.2 2016/11/17 09:51:41 fcambus Exp $
$OpenBSD: patch-CMakeLists_txt,v 1.3 2018/02/11 13:25:38 fcambus Exp $
Make PortAudio and CAPSImage detection conditional and disabled by default,
and disable building the Python GTK+2 user interface.
--- CMakeLists.txt.orig Thu Nov 3 22:25:43 2016
+++ CMakeLists.txt Sat Nov 12 17:20:14 2016
@@ -40,6 +40,12 @@ set(ENABLE_SMALL_MEM 0
Index: CMakeLists.txt
--- CMakeLists.txt.orig
+++ CMakeLists.txt
@@ -34,6 +34,12 @@ set(ENABLE_SMALL_MEM 0
CACHE BOOL "Enable to use less memory - at the expense of emulation speed")
set(ENABLE_WINUAE_CPU 1
CACHE BOOL "Enable WinUAE CPU core")
@ -18,7 +19,7 @@ and disable building the Python GTK+2 user interface.
# Run-time checks with GCC "mudflap" etc features:
# - stack protection
@@ -127,15 +133,19 @@ if (NOT ENABLE_OSX_BUNDLE)
@@ -121,20 +127,24 @@ if (NOT ENABLE_OSX_BUNDLE)
endif(X11_FOUND)
endif()
@ -33,6 +34,11 @@ and disable building the Python GTK+2 user interface.
+ endif(PORTAUDIO_FOUND)
+endif(ENABLE_PORTAUDIO)
find_package(PortMidi)
if(PORTMIDI_FOUND)
set(HAVE_PORTMIDI 1)
endif(PORTMIDI_FOUND)
-find_package(CapsImage)
-if(CAPSIMAGE_FOUND)
- set(HAVE_CAPSIMAGE 1)
@ -46,7 +52,7 @@ and disable building the Python GTK+2 user interface.
find_package(Udev)
if(UDEV_FOUND)
@@ -302,10 +312,12 @@ add_subdirectory(src)
@@ -301,10 +311,12 @@ add_subdirectory(src)
add_subdirectory(doc)
add_subdirectory(tools)
@ -63,7 +69,7 @@ and disable building the Python GTK+2 user interface.
if(UNIX AND NOT ENABLE_OSX_BUNDLE)
add_subdirectory(share)
@@ -352,17 +364,20 @@ else()
@@ -351,11 +363,13 @@ else()
message( " - png :\tnot found, install it to compress screenshot/avi files using png" )
endif(PNG_FOUND)
@ -80,6 +86,12 @@ and disable building the Python GTK+2 user interface.
+ endif(PORTAUDIO_FOUND)
+endif(ENABLE_PORTAUDIO)
if(PORTMIDI_FOUND)
message( " - portmidi :\tfound, required for (non-Linux) MIDI support" )
@@ -363,11 +377,13 @@ else()
message( " - portmidi :\tnot found, install it for MIDI support on Windows / OSX" )
endif(PORTMIDI_FOUND)
-if(CAPSIMAGE_FOUND)
- message( " - capsimage :\tv${CAPSIMAGE_VERSION} found, allow to use .IPF, .RAW and .CTR disk images" )
-else()
@ -87,6 +99,7 @@ and disable building the Python GTK+2 user interface.
-endif(CAPSIMAGE_FOUND)
+if(ENABLE_CAPSIMAGE)
+ if(CAPSIMAGE_FOUND)
+ message( " - capsimage :\tv${CAPSIMAGE_VERSION} found, allow to use .IPF, .RAW and .CTR disk images" )
+ else()
+ message( " - capsimage :\tv${CAPSIMAGE_VERSION} not found, install it to use .IPF, .RAW and .CTR disk images" )
+ endif(CAPSIMAGE_FOUND)

28
emulators/hatari/patches/patch-share_CMakeLists_txt
View File

@ -1,28 +0,0 @@
$OpenBSD: patch-share_CMakeLists_txt,v 1.2 2016/11/17 09:51:41 fcambus Exp $
Prevent installing files outside of every prefix.
--- share/CMakeLists.txt.orig Thu Jun 23 01:55:13 2016
+++ share/CMakeLists.txt Thu Jun 23 02:03:44 2016
@@ -5,8 +5,8 @@ foreach(size 32x32 48x48 64x64 128x128 256x256)
install(FILES icons/hicolor/${size}/mimetypes/application-x-st-disk-image.png
DESTINATION ${ICONDIR}/${size}/mimetypes)
foreach(type vnd.msa vnd.fastcopy x-stx)
- install(CODE "execute_process(COMMAND ln -sf application-x-st-disk-image.png
- ${CMAKE_INSTALL_PREFIX}/${ICONDIR}/${size}/mimetypes/application-${type}-disk-image.png)
+ install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink application-x-st-disk-image.png application-${type}-disk-image.png
+ WORKING_DIRECTORY \$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${ICONDIR}/${size}/mimetypes)
")
endforeach()
endforeach()
@@ -16,8 +16,8 @@ install(FILES icons/hicolor/scalable/apps/hatari.svg
install(FILES icons/hicolor/scalable/mimetypes/application-x-st-disk-image.svg
DESTINATION ${ICONDIR}/scalable/mimetypes)
foreach(type vnd.msa vnd.fastcopy x-stx)
- install(CODE "execute_process(COMMAND ln -sf application-x-st-disk-image.svg
- ${CMAKE_INSTALL_PREFIX}/${ICONDIR}/scalable/mimetypes/application-${type}-disk-image.svg)
+ install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink application-x-st-disk-image.svg application-${type}-disk-image.svg
+ WORKING_DIRECTORY \$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${ICONDIR}/scalable/mimetypes)
")
endforeach()
install(FILES mime/packages/hatari.xml DESTINATION share/mime/packages)

17
emulators/hatari/patches/patch-src_CMakeLists_txt
View File

@ -1,17 +0,0 @@
$OpenBSD: patch-src_CMakeLists_txt,v 1.2 2016/11/17 09:51:41 fcambus Exp $
Prevent libzip's zip.h header to be picked up instead of src/includes/zip.h
--- src/CMakeLists.txt.orig Thu Nov 3 22:25:43 2016
+++ src/CMakeLists.txt Fri Nov 4 20:38:26 2016
@@ -43,8 +43,8 @@ else()
set(CPUDIR uae-cpu)
endif(ENABLE_WINUAE_CPU)
-include_directories(${CMAKE_BINARY_DIR} ${SDL_INCLUDE_DIR} ${CPUDIR}
- includes debug falcon)
+include_directories(includes debug falcon
+ ${CMAKE_BINARY_DIR} ${SDL_INCLUDE_DIR} ${CPUDIR})
if(ZLIB_FOUND)
include_directories(${ZLIB_INCLUDE_DIR})