diff options
| author | Ørjan Malde <red@foxi.me> | 2020-09-25 16:39:52 +0200 |
|---|---|---|
| committer | Lucio Andrés Illanes Albornoz <lucio@lucioillanes.de> | 2020-09-25 15:47:33 +0100 |
| commit | 725b2041981e2e445233ab8a890aa9638503814d (patch) | |
| tree | 121e6f73d31b9727bfae197eb19b2b3829488f48 /patches/dosbox-0.74-3_pre.local.patch | |
| parent | 67ace9107c9e21a1338c55ace6397ed0d71a4882 (diff) | |
| download | midipix_build-725b2041981e2e445233ab8a890aa9638503814d.tar.bz2 midipix_build-725b2041981e2e445233ab8a890aa9638503814d.tar.xz | |
groups/231.native_packages_etc.group: adds dosbox v0.74-3
Signed-off-by: Lucio Andrés Illanes Albornoz <lucio@lucioillanes.de>
Diffstat (limited to 'patches/dosbox-0.74-3_pre.local.patch')
| -rw-r--r-- | patches/dosbox-0.74-3_pre.local.patch | 79 |
1 files changed, 79 insertions, 0 deletions
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 : |