diff options
| -rw-r--r-- | groups/231.native_packages_etc.group | 8 | ||||
| -rw-r--r-- | patches/dosbox-0.74-3.local.patch | 28 | ||||
| -rw-r--r-- | patches/dosbox-0.74-3_pre.local.patch | 79 |
3 files changed, 114 insertions, 1 deletions
diff --git a/groups/231.native_packages_etc.group b/groups/231.native_packages_etc.group index 6e342dba..76ccd3ea 100644 --- a/groups/231.native_packages_etc.group +++ b/groups/231.native_packages_etc.group @@ -4,7 +4,7 @@ GROUP_TARGET="native_packages"; NATIVE_PACKAGES_PACKAGES="$(rtl_lconcat "${NATIVE_PACKAGES_PACKAGES}" " alsa_lib apr apr_util bdwgc bmake bochs bzip2 cherokee clzip cmake cron dante dbus -doomgeneric emacs enscript expat ffmpeg file gdbm geoip gettext_tiny ghostpdl +dosbox doomgeneric emacs enscript expat ffmpeg file gdbm geoip gettext_tiny ghostpdl giflib gnuchess gzip hastyhex hexcurse htop imagemagick infounzip infozip john lcms2 less libmetalink lolcode mintty mlogin musl_compat musl_fts ncdu ncurses ncursestw ncursesw npth openjpeg p7zip pcre popt potrace procps_ng qemu @@ -82,6 +82,12 @@ zstd")"; : ${PKG_DBUS_URL:=https://dbus.freedesktop.org/releases/dbus/dbus-${PKG_DBUS_VERSION}.tar.gz}; : ${PKG_DBUS_SHA256SUM:=7fd9d0536f7ec2f2afc94b84d5b5487f88c464e8d47c661d8e0b54aa83974bfa}; : ${PKG_DBUS_CONFIGURE_ARGS_EXTRA:="--disable-tests --with-x=no"}; +: ${PKG_DOSBOX_DEPENDS:="sdl1"}; +: ${PKG_DOSBOX_SHA256SUM:=c0d13dd7ed2ed363b68de615475781e891cd582e8162b5c3669137502222260a}; +: ${PKG_DOSBOX_VERSION:=0.74-3}; +: ${PKG_DOSBOX_URL:=https://sourceforge.net/projects/dosbox/files/dosbox/${PKG_DOSBOX_VERSION}/dosbox-${PKG_DOSBOX_VERSION}.tar.gz}; +: ${PKG_DOSBOX_CONFIGURE_ARGS_EXTRA:="--disable-opengl --disable-alsa-midi --with-sdl-prefix=${PREFIX_NATIVE}"}; +: ${PKG_DOSBOX_CFLAGS_CONFIGURE_EXTRA:="-I${PREFIX_NATIVE}/include/w32api.ports -DWINAPI_ANSI_DEFAULT"}; : ${PKG_DOOMGENERIC_DEPENDS:="w32api w32lib"}; : ${PKG_DOOMGENERIC_URLS_GIT:=doomgeneric=https://github.com/Redfoxymoon/doomgeneric.git@midipix}; : ${PKG_DOOMGENERIC_BUILD_DIR:=doomgeneric/doomgeneric}; diff --git a/patches/dosbox-0.74-3.local.patch b/patches/dosbox-0.74-3.local.patch new file mode 100644 index 00000000..3c357166 --- /dev/null +++ b/patches/dosbox-0.74-3.local.patch @@ -0,0 +1,28 @@ +diff -ru dosbox-0.74-3.orig/include/cross.h dosbox-0.74-3/include/cross.h +--- dosbox-0.74-3.orig/include/cross.h 2019-06-25 19:57:19.000000000 +0200 ++++ dosbox-0.74-3/include/cross.h 2020-09-25 12:12:19.286982119 +0200 +@@ -61,12 +61,6 @@ + #define ftruncate(blah,blah2) chsize(blah,blah2) + #endif + +-//Solaris maybe others +-#if defined (DB_HAVE_NO_POWF) +-#include <math.h> +-static inline float powf (float x, float y) { return (float) pow (x,y); } +-#endif +- + class Cross { + public: + static void GetPlatformConfigDir(std::string& in); +diff -ru dosbox-0.74-3.orig/src/gui/sdl_mapper.cpp dosbox-0.74-3/src/gui/sdl_mapper.cpp +--- dosbox-0.74-3.orig/src/gui/sdl_mapper.cpp 2019-06-22 17:07:45.000000000 +0200 ++++ dosbox-0.74-3/src/gui/sdl_mapper.cpp 2020-09-25 14:58:04.502405522 +0200 +@@ -415,7 +415,7 @@ + /* try to retrieve key from symbolic key as scancode is zero */ + if (keysym.sym<MAX_SDLKEYS) key=scancode_map[(Bitu)keysym.sym]; + } +-#if !defined (WIN32) && !defined (MACOSX) && !defined(OS2) ++#if !defined (WIN32) && !defined (MACOSX) && !defined(OS2) && !defined(__midipix__) + /* Linux adds 8 to all scancodes */ + else key-=8; + #endif diff --git a/patches/dosbox-0.74-3_pre.local.patch b/patches/dosbox-0.74-3_pre.local.patch new file mode 100644 index 00000000..dbbaa745 --- /dev/null +++ b/patches/dosbox-0.74-3_pre.local.patch @@ -0,0 +1,79 @@ +diff -ru dosbox-0.74-3.orig/configure dosbox-0.74-3/configure +--- dosbox-0.74-3.orig/configure 2019-06-26 16:55:12.000000000 +0200 ++++ dosbox-0.74-3/configure 2020-09-25 16:20:13.964548319 +0200 +@@ -4954,8 +4954,8 @@ + if test "$SDL_CONFIG" = "no" ; then + no_sdl=yes + else +- SDL_CFLAGS=`$SDL_CONFIG $sdlconf_args --cflags` +- SDL_LIBS=`$SDL_CONFIG $sdlconf_args --libs` ++ SDL_CFLAGS=`$PKG_CONFIG --cflags sdl` ++ SDL_LIBS=`$PKG_CONFIG --libs sdl` + + sdl_major_version=`$SDL_CONFIG $sdl_args --version | \ + sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'` +@@ -7083,64 +7083,6 @@ + fi + + +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lX11" >&5 +-$as_echo_n "checking for main in -lX11... " >&6; } +-if ${ac_cv_lib_X11_main+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- ac_check_lib_save_LIBS=$LIBS +-LIBS="-lX11 $LIBS" +-cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +- +-int +-main () +-{ +-return main (); +- ; +- return 0; +-} +-_ACEOF +-if ac_fn_c_try_link "$LINENO"; then : +- ac_cv_lib_X11_main=yes +-else +- ac_cv_lib_X11_main=no +-fi +-rm -f core conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext +-LIBS=$ac_check_lib_save_LIBS +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_X11_main" >&5 +-$as_echo "$ac_cv_lib_X11_main" >&6; } +-if test "x$ac_cv_lib_X11_main" = xyes; then : +- have_x11_lib=yes +-else +- have_x11_lib=no +-fi +- +-ac_fn_c_check_header_mongrel "$LINENO" "X11/XKBlib.h" "ac_cv_header_X11_XKBlib_h" "$ac_includes_default" +-if test "x$ac_cv_header_X11_XKBlib_h" = xyes; then : +- have_x11_h=yes +-else +- have_x11_h=no +-fi +- +- +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XKBlib support" >&5 +-$as_echo_n "checking for XKBlib support... " >&6; } +-if test x$have_x11_lib = xyes -a x$have_x11_h = xyes ; then +- LIBS="$LIBS -lX11" +- $as_echo "#define C_X11_XKB 1" >>confdefs.h +- +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +-$as_echo "yes" >&6; } +-else +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +-fi +- +- + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lGL" >&5 + $as_echo_n "checking for main in -lGL... " >&6; } + if ${ac_cv_lib_GL_main+:} false; then : |