diff --git a/packages/emulation/libretro-mame2016/package.mk b/packages/emulation/libretro-mame2016/package.mk
index 43bb78b4be..66162a7d11 100644
--- a/packages/emulation/libretro-mame2016/package.mk
+++ b/packages/emulation/libretro-mame2016/package.mk
@@ -15,24 +15,19 @@ PKG_LIBNAME="mame2016_libretro.so"
 PKG_LIBPATH="${PKG_LIBNAME}"
 PKG_LIBVAR="MAME2016_LIB"
 
-make_target() {
-  if [ "${ARCH}" = "arm" ]; then
-    PKG_NOASM="1"
-  else
-    PKG_NOASM="0"
-  fi
+pre_make_target() {
+  PKG_MAKE_OPTS_TARGET=" \
+    REGENIE=1 VERBOSE=1 NOWERROR=1 PYTHON_EXECUTABLE=python3 CONFIG=libretro \
+    LIBRETRO_OS="unix" ARCH="" PROJECT="" LIBRETRO_CPU="${ARCH}" DISTRO="debian-stable" \
+    CROSS_BUILD="1" OVERRIDE_CC="${CC}" OVERRIDE_CXX="${CXX}" \
+    TARGET="mame" SUBTARGET="arcade" PLATFORM="${ARCH}" RETRO=1 OSD="retro" \
+    GIT_VERSION=${PKG_VERSION:0:7}"
 
-  if [ "${ARCH}" = "x86_64" ]; then
-    PKG_PTR64="1"
-  else
-    PKG_PTR64="0"
+  if [ "$ARCH" = "arm" ]; then
+    PKG_MAKE_OPTS_TARGET+=" NOASM="1" ARCHITECTURE="""
+  elif [ "$ARCH" = "x86_64" ]; then
+    PKG_MAKE_OPTS_TARGET+=" NOASM="0" PTR64="1""
   fi
-
-  make REGENIE=1 VERBOSE=1 NOWERROR=1 PYTHON_EXECUTABLE=python3 CONFIG=libretro \
-       LIBRETRO_OS="unix" ARCH="" PROJECT="" LIBRETRO_CPU="${ARCH}" DISTRO="debian-stable" \
-       CROSS_BUILD="1" OVERRIDE_CC="${CC}" OVERRIDE_CXX="${CXX}" \
-       PTR64="${PKG_PTR64}" NOASM="${PKG_NOASM}" TARGET="mame" \
-       SUBTARGET="arcade" PLATFORM="${ARCH}" RETRO=1 OSD="retro" GIT_VERSION=${PKG_VERSION:0:7}
 }
 
 post_make_target() {
diff --git a/packages/emulation/libretro-mame2016/patches/bgfx.patch b/packages/emulation/libretro-mame2016/patches/bgfx.patch
new file mode 100644
index 0000000000..61658ab385
--- /dev/null
+++ b/packages/emulation/libretro-mame2016/patches/bgfx.patch
@@ -0,0 +1,11 @@
+--- a/3rdparty/bgfx/src/config.h	2020-01-14 08:42:35.023108564 +0100
++++ b/3rdparty/bgfx/src/config.h	2020-01-14 08:42:39.527041246 +0100
+@@ -12,7 +12,7 @@
+ #	define BGFX_CONFIG_DEBUG 0
+ #endif // BGFX_CONFIG_DEBUG
+ 
+-#if !defined(BGFX_CONFIG_RENDERER_DIRECT3D9) \
++#if 0 && !defined(BGFX_CONFIG_RENDERER_DIRECT3D9) \
+ 	&& !defined(BGFX_CONFIG_RENDERER_DIRECT3D11) \
+ 	&& !defined(BGFX_CONFIG_RENDERER_DIRECT3D12) \
+ 	&& !defined(BGFX_CONFIG_RENDERER_METAL) \
diff --git a/packages/emulation/libretro-mame2016/patches/genie.patch b/packages/emulation/libretro-mame2016/patches/genie.patch
new file mode 100644
index 0000000000..b4bb2c54dd
--- /dev/null
+++ b/packages/emulation/libretro-mame2016/patches/genie.patch
@@ -0,0 +1,17 @@
+--- a/3rdparty/genie/build/gmake.linux/genie.make	2020-01-14 06:27:22.077161784 +0100
++++ b/3rdparty/genie/build/gmake.linux/genie.make	2020-01-14 06:27:49.856857764 +0100
+@@ -28,8 +28,12 @@
+   RM    = $(SILENT) del /F "$(subst /,\\,$(1))" 2> nul || exit 0
+ endif
+ 
+-CC  = gcc
+-CXX = g++
++CC  = $(HOST_CC)
++CXX = $(HOST_CXX)
++CPPFLAGS = $(HOST_CPPFLAGS)
++CFLAGS = $(HOST_CFLAGS)
++CXXFLAGS = $(HOST_CXXFLAGS)
++LDFLAGS = $(HOST_LDFLAGS)
+ AR  = ar
+ 
+ ifndef RESCOMP
diff --git a/packages/emulation/libretro-mame2016/patches/libretro-mame2016-100.01-cross-compile.patch b/packages/emulation/libretro-mame2016/patches/libretro-mame2016-100.01-cross-compile.patch
deleted file mode 100644
index ae75bc2df2..0000000000
--- a/packages/emulation/libretro-mame2016/patches/libretro-mame2016-100.01-cross-compile.patch
+++ /dev/null
@@ -1,52 +0,0 @@
---- a/3rdparty/genie/build/gmake.linux/genie.make
-+++ b/3rdparty/genie/build/gmake.linux/genie.make
-@@ -28,8 +28,8 @@
-   RM    = $(SILENT) del /F "$(subst /,\\,$(1))" 2> nul || exit 0
- endif
- 
--CC  = gcc
--CXX = g++
-+CC  = $(HOST_CC)
-+CXX = $(HOST_CXX)
- AR  = ar
- 
- ifndef RESCOMP
-@@ -47,11 +47,11 @@
-   DEFINES   += -DNDEBUG -DLUA_COMPAT_MODULE -DLUA_USE_POSIX -DLUA_USE_DLOPEN
-   INCLUDES  += -I../../src/host/lua-5.3.0/src
-   ALL_CPPFLAGS  += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES)
--  ALL_CFLAGS    += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Wall -Wextra -Os
--  ALL_CXXFLAGS  += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Wall -Wextra -Os
--  ALL_OBJCFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Wall -Wextra -Os
-+  ALL_CFLAGS    += $(ALL_CPPFLAGS) $(ARCH) -Wall -Wextra -Os
-+  ALL_CXXFLAGS  += $(ALL_CPPFLAGS) $(ARCH) -Wall -Wextra -Os
-+  ALL_OBJCFLAGS += $(ALL_CPPFLAGS) $(ARCH) -Wall -Wextra -Os
-   ALL_RESFLAGS  += $(RESFLAGS) $(DEFINES) $(INCLUDES)
--  ALL_LDFLAGS   += $(LDFLAGS) -L. -s -rdynamic
-+  ALL_LDFLAGS   += -L. -s -rdynamic
-   LDDEPS    +=
-   LIBS      += $(LDDEPS) -ldl -lm
-   EXTERNAL_LIBS +=
---- a/scripts/toolchain.lua
-+++ b/scripts/toolchain.lua
-@@ -675,9 +675,6 @@
- 
- 	configuration { "linux-gcc", "x32" }
- 		objdir (_buildDir .. "linux_gcc" .. "/obj")
--		buildoptions {
--			"-m32",
--		}
- 
- 	configuration { "linux-gcc", "x32", "Release" }
- 		targetdir (_buildDir .. "linux_gcc" .. "/bin/x32/Release")
---- a/3rdparty/genie/src/host/scripts.c
-+++ b/3rdparty/genie/src/host/scripts.c
-@@ -131,7 +131,7 @@
- 	"gs(cfg)\nlocal result = table.translate(cfg.flags, flags)\nreturn result\nend\nfunction premake.dotnet.getkind(cfg)\nif (cfg.kind == \"ConsoleApp\") then\nreturn \"Exe\"\nelseif (cfg.kind == \"WindowedApp\") then\nreturn \"WinExe\"\nelseif (cfg.kind == \"SharedLib\") then\nreturn \"Library\"\nend\nend",
- 
- 	/* tools/gcc.lua */
--	"premake.gcc = { }\npremake.gcc.cc     = \"gcc\"\npremake.gcc.cxx    = \"g++\"\npremake.gcc.ar     = \"ar\"\npremake.gcc.llvm   = false\nlocal cflags =\n{\nEnableSSE      = \"-msse\",\nEnableSSE2     = \"-msse2\",\nEnableAVX      = \"-mavx\",\nEnableAVX2     = \"-mavx2\",\nExtraWarnings  = \"-Wall -Wextra\",\nFatalWarnings  = \"-Werror\",\nFloatFast      = \"-ffast-math\",\nFloatStrict    = \"-ffloat-store\",\nNoFramePointer = \"-fomit-frame-pointer\",\nOptimize       = \"-O2\",\nOptimizeSize   = \"-Os\",\nOptimizeSpeed  = \"-O3\",\nSymbols        = \"-g\",\n}\nlocal cxxflags =\n{\nNoExceptions   = \"-fno-exceptions\",\nNoRTTI         = \"-fno-rtti\",\nUnsignedChar   = \"-funsigned-char\",\n}\npremake.gcc.platforms =\n{\nNative = {\ncppflags = \"-MMD -MP\",\n},\nx32 = {\ncppflags = \"-MMD -MP\",\nflags    = \"-m32\",\n},\nx64 = {\ncppflags = \"-MMD -MP\",\nflags    = \"-m64\",\n},\nUniversal = {\nar       = \"libtool\",\ncppflags = \"-MMD -MP\",\nflags    = \"-arch i386 -arch x86_64 -arch ppc -arch ppc64\",\n},"
-+	"premake.gcc = { }\npremake.gcc.cc     = \"gcc\"\npremake.gcc.cxx    = \"g++\"\npremake.gcc.ar     = \"ar\"\npremake.gcc.llvm   = false\nlocal cflags =\n{\nEnableSSE      = \"-msse\",\nEnableSSE2     = \"-msse2\",\nEnableAVX      = \"-mavx\",\nEnableAVX2     = \"-mavx2\",\nExtraWarnings  = \"-Wall -Wextra\",\nFatalWarnings  = \"-Werror\",\nFloatFast      = \"-ffast-math\",\nFloatStrict    = \"-ffloat-store\",\nNoFramePointer = \"-fomit-frame-pointer\",\nOptimize       = \"-O2\",\nOptimizeSize   = \"-Os\",\nOptimizeSpeed  = \"-O3\",\nSymbols        = \"-g\",\n}\nlocal cxxflags =\n{\nNoExceptions   = \"-fno-exceptions\",\nNoRTTI         = \"-fno-rtti\",\nUnsignedChar   = \"-funsigned-char\",\n}\npremake.gcc.platforms =\n{\nNative = {\ncppflags = \"-MMD -MP\",\n},\nx32 = {\ncppflags = \"-MMD -MP\",\n},\nx64 = {\ncppflags = \"-MMD -MP\",\nflags    = \"-m64\",\n},\nUniversal = {\nar       = \"libtool\",\ncppflags = \"-MMD -MP\",\nflags    = \"-arch i386 -arch x86_64 -arch ppc -arch ppc64\",\n},"
- 	"\nUniversal32 = {\nar       = \"libtool\",\ncppflags = \"-MMD -MP\",\nflags    = \"-arch i386 -arch ppc\",\n},\nUniversal64 = {\nar       = \"libtool\",\ncppflags = \"-MMD -MP\",\nflags    = \"-arch x86_64 -arch ppc64\",\n},\nPS3 = {\ncc         = \"ppu-lv2-g++\",\ncxx        = \"ppu-lv2-g++\",\nar         = \"ppu-lv2-ar\",\ncppflags   = \"-MMD -MP\",\n},\nWiiDev = {\ncppflags    = \"-MMD -MP -I$(LIBOGC_INC) $(MACHDEP)\",\nldflags= \"-L$(LIBOGC_LIB) $(MACHDEP)\",\ncfgsettings = [[\n  ifeq ($(strip $(DEVKITPPC)),)\n    $(error \"DEVKITPPC environment variable is not set\")'\n  endif\n  include $(DEVKITPPC)/wii_rules']],\n},\nOrbis = {\ncc         = \"orbis-clang\",\ncxx        = \"orbis-clang++\",\nar         = \"orbis-ar\",\ncppflags   = \"-MMD -MP\",\n}\n}\nlocal platforms = premake.gcc.platforms\nfunction premake.gcc.getcppflags(cfg)\nlocal flags = { }\ntable.insert(flags, platforms[cfg.platform].cppflags)\nif flags[1]:startswith(\"-MMD\") then\ntable.insert(flags, \"-MP\")\nend\nreturn flags\nend\nfunction "
- 	"premake.gcc.getcflags(cfg)\nlocal result = table.translate(cfg.flags, cflags)\ntable.insert(result, platforms[cfg.platform].flags)\nif cfg.system ~= \"windows\" and cfg.kind == \"SharedLib\" then\ntable.insert(result, \"-fPIC\")\nend\nreturn result\nend\nfunction premake.gcc.getcxxflags(cfg)\nlocal result = table.translate(cfg.flags, cxxflags)\nreturn result\nend\nfunction premake.gcc.getldflags(cfg)\nlocal result = { }\nif not cfg.flags.Symbols then\nif cfg.system == \"macosx\" then\nelse\ntable.insert(result, \"-s\")\nend\nend\nif cfg.kind == \"SharedLib\" then\nif cfg.system == \"macosx\" then\ntable.insert(result, \"-dynamiclib\")\nelse\ntable.insert(result, \"-shared\")\nend\nif cfg.system == \"windows\" and not cfg.flags.NoImportLib then\ntable.insert(result, '-Wl,--out-implib=\"' .. cfg.linktarget.fullpath .. '\"')\nend\nend\nif cfg.kind == \"WindowedApp\" and cfg.system == \"windows\" then\ntable.insert(result, \"-mwindows\")\nend\nlocal platform = platforms[cfg.platform]\ntable.insert(result, platform"
- 	".flags)\ntable.insert(result, platform.ldflags)\nreturn result\nend\nfunction premake.gcc.getlibdirflags(cfg)\nlocal result = { }\nfor _, value in ipairs(premake.getlinks(cfg, \"all\", \"directory\")) do\ntable.insert(result, '-L' .. _MAKE.esc(value))\nend\nreturn result\nend\nfunction premake.gcc.islibfile(p)\nif path.getextension(p) == \".a\" then\nreturn true\nend\nreturn false\nend\nfunction premake.gcc.getlibfiles(cfg)\nlocal result = {}\nfor _, value in ipairs(premake.getlinks(cfg, \"system\", \"fullpath\")) do\nif premake.gcc.islibfile(value) then\ntable.insert(result, _MAKE.esc(value))\nend\nend\nreturn result\nend\nfunction premake.gcc.getlinkflags(cfg)\nlocal result = {}\nfor _, value in ipairs(premake.getlinks(cfg, \"system\", \"fullpath\")) do\nif premake.gcc.islibfile(value) then\ntable.insert(result, _MAKE.esc(value))\nelseif path.getextension(value) == \".framework\" then\ntable.insert(result, '-framework ' .. _MAKE.esc(path.getbasename(value)))\nelse\ntable.insert(result, '-l' .. _MAKE.esc(path"