diff --git a/packages/mediacenter/kodi-binary-addons/game.libretro.mame2000/package.mk b/packages/mediacenter/kodi-binary-addons/game.libretro.mame2000/package.mk
index ed6c5fbdff..ec10ecdbbf 100644
--- a/packages/mediacenter/kodi-binary-addons/game.libretro.mame2000/package.mk
+++ b/packages/mediacenter/kodi-binary-addons/game.libretro.mame2000/package.mk
@@ -2,15 +2,15 @@
# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="game.libretro.mame2000"
-PKG_VERSION="7e63b8e"
-PKG_SHA256="96191832c294c0f63d20ae2ff975fb5f0db73520e25daa1ce44f8dcf06fadc59"
-PKG_REV="101"
-PKG_ARCH="none"
+PKG_VERSION="c20f41ffb3c66f3b1cd8b568951df4ed7fb9fc70"
+PKG_SHA256="6b59f5e4249afedf589002c63e40e2c46d7c6f25541128d33166b14849b64de4"
+PKG_REV="100"
PKG_LICENSE="GPL"
-PKG_SITE="https://github.com/kodi-game/game.libretro.mame"
+PKG_SITE="https://github.com/kodi-game/game.libretro.mame2000"
+PKG_URL="https://github.com/kodi-game/game.libretro.mame2000/archive/$PKG_VERSION.tar.gz"
PKG_DEPENDS_TARGET="toolchain kodi-platform libretro-mame2000"
PKG_SECTION=""
-PKG_LONGDESC="game.libretro.mame2000: MAME emulator for Kodi"
+PKG_LONGDESC="game.libretro.mame2000: MAME 2000 emulator for Kodi"
PKG_IS_ADDON="yes"
PKG_ADDON_TYPE="kodi.gameclient"
diff --git a/packages/mediacenter/kodi-binary-addons/game.libretro.mame2000/patches/game.libretro.mame2000-0001-fix-cross-compile.patch b/packages/mediacenter/kodi-binary-addons/game.libretro.mame2000/patches/game.libretro.mame2000-0001-fix-cross-compile.patch
deleted file mode 100644
index 3902867b0b..0000000000
--- a/packages/mediacenter/kodi-binary-addons/game.libretro.mame2000/patches/game.libretro.mame2000-0001-fix-cross-compile.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -Naur a/CMakeLists.txt b/CMakeLists.txt
---- a/CMakeLists.txt 2016-08-26 12:04:53.200887148 -0700
-+++ b/CMakeLists.txt 2016-08-26 12:04:53.267887799 -0700
-@@ -6,11 +6,12 @@
-
- enable_language(CXX)
-
--find_package(kodi REQUIRED)
-+find_package(Kodi REQUIRED)
- find_package(libretro-mame2000 REQUIRED)
-
- set(DEPLIBS mame2000)
- set(MAME2000_CUSTOM_BINARY ${MAME2000_LIB}
-- ${PROJECT_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX} mame2000)
-+ ${PROJECT_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX} mame2000)
-
- build_addon(${PROJECT_NAME} MAME2000 DEPLIBS)
-+
diff --git a/packages/mediacenter/kodi-binary-addons/game.libretro.mame2000/sources/CMakeLists.txt b/packages/mediacenter/kodi-binary-addons/game.libretro.mame2000/sources/CMakeLists.txt
deleted file mode 100644
index fe7a8eb1a5..0000000000
--- a/packages/mediacenter/kodi-binary-addons/game.libretro.mame2000/sources/CMakeLists.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-project(game.libretro.mame2000)
-
-cmake_minimum_required(VERSION 2.6)
-
-list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR})
-
-enable_language(CXX)
-
-find_package(kodi REQUIRED)
-find_package(libretro-mame2000 REQUIRED)
-
-set(DEPLIBS mame2000)
-set(MAME2000_CUSTOM_BINARY ${MAME2000_LIB}
- ${PROJECT_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX} mame2000)
-
-build_addon(${PROJECT_NAME} MAME2000 DEPLIBS)
diff --git a/packages/mediacenter/kodi-binary-addons/game.libretro.mame2000/sources/game.libretro.mame2000/addon.xml b/packages/mediacenter/kodi-binary-addons/game.libretro.mame2000/sources/game.libretro.mame2000/addon.xml
deleted file mode 100644
index 1ebb2f4275..0000000000
--- a/packages/mediacenter/kodi-binary-addons/game.libretro.mame2000/sources/game.libretro.mame2000/addon.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
-
-
-
-
-
- zip|chd|7z
- false
- false
-
-
- MAME2000
- MAME2000 stands for [B]M[/B]ultiple [B]A[/B]rcade [B]M[/B]achine [B]E[/B]mulator. MAME2000 can currently emulate several thousand different classic arcade video games from the late 1970s through the modern era.
-
-Supported files: .zip, .chd, .7z
-
-Icon credit: peter-86 (peter-86.deviantart.com)
-
-License: GPLv2
- all
- true
-
-
diff --git a/packages/mediacenter/kodi-binary-addons/game.libretro.mame2000/sources/game.libretro.mame2000/icon.png b/packages/mediacenter/kodi-binary-addons/game.libretro.mame2000/sources/game.libretro.mame2000/icon.png
deleted file mode 100644
index 613d8b2767..0000000000
Binary files a/packages/mediacenter/kodi-binary-addons/game.libretro.mame2000/sources/game.libretro.mame2000/icon.png and /dev/null differ
diff --git a/packages/mediacenter/kodi-binary-addons/game.libretro.mame2003/package.mk b/packages/mediacenter/kodi-binary-addons/game.libretro.mame2003/package.mk
index 74935693f6..c7353f77a9 100644
--- a/packages/mediacenter/kodi-binary-addons/game.libretro.mame2003/package.mk
+++ b/packages/mediacenter/kodi-binary-addons/game.libretro.mame2003/package.mk
@@ -2,15 +2,15 @@
# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="game.libretro.mame2003"
-PKG_VERSION="7e63b8e"
-PKG_SHA256="96191832c294c0f63d20ae2ff975fb5f0db73520e25daa1ce44f8dcf06fadc59"
-PKG_REV="101"
-PKG_ARCH="none"
+PKG_VERSION="12f436d323c17349152d417cf7b7467347b29ebe"
+PKG_SHA256="0156bc26bd6d752f1726d0ee06f3c6f213c46437d8267a321f332ceebefc2bd8"
+PKG_REV="100"
PKG_LICENSE="GPL"
-PKG_SITE="https://github.com/kodi-game/game.libretro.mame"
+PKG_SITE="https://github.com/kodi-game/game.libretro.mame2003"
+PKG_URL="https://github.com/kodi-game/game.libretro.mame2003/archive/$PKG_VERSION.tar.gz"
PKG_DEPENDS_TARGET="toolchain kodi-platform libretro-mame2003"
PKG_SECTION=""
-PKG_LONGDESC="game.libretro.mame2003: MAME emulator for Kodi"
+PKG_LONGDESC="game.libretro.mame2003: MAME 2003 emulator for Kodi"
PKG_IS_ADDON="yes"
PKG_ADDON_TYPE="kodi.gameclient"
diff --git a/packages/mediacenter/kodi-binary-addons/game.libretro.mame2003/patches/game.libretro.mame2003-0001-fix-cross-compile.patch b/packages/mediacenter/kodi-binary-addons/game.libretro.mame2003/patches/game.libretro.mame2003-0001-fix-cross-compile.patch
deleted file mode 100644
index ac4b8570e9..0000000000
--- a/packages/mediacenter/kodi-binary-addons/game.libretro.mame2003/patches/game.libretro.mame2003-0001-fix-cross-compile.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -Naur a/CMakeLists.txt b/CMakeLists.txt
---- a/CMakeLists.txt 2016-08-26 10:41:32.949343201 -0700
-+++ b/CMakeLists.txt 2016-08-26 10:41:33.088344559 -0700
-@@ -6,11 +6,12 @@
-
- enable_language(CXX)
-
--find_package(kodi REQUIRED)
-+find_package(Kodi REQUIRED)
- find_package(libretro-mame2003 REQUIRED)
-
- set(DEPLIBS mame2003)
- set(MAME2003_CUSTOM_BINARY ${MAME2003_LIB}
-- ${PROJECT_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX} mame2003)
-+ ${PROJECT_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX} mame2003)
-
- build_addon(${PROJECT_NAME} MAME2003 DEPLIBS)
-+
diff --git a/packages/mediacenter/kodi-binary-addons/game.libretro.mame2003/sources/CMakeLists.txt b/packages/mediacenter/kodi-binary-addons/game.libretro.mame2003/sources/CMakeLists.txt
deleted file mode 100644
index 56ae3021dc..0000000000
--- a/packages/mediacenter/kodi-binary-addons/game.libretro.mame2003/sources/CMakeLists.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-project(game.libretro.mame2003)
-
-cmake_minimum_required(VERSION 2.6)
-
-list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR})
-
-enable_language(CXX)
-
-find_package(kodi REQUIRED)
-find_package(libretro-mame2003 REQUIRED)
-
-set(DEPLIBS mame2003)
-set(MAME2003_CUSTOM_BINARY ${MAME2003_LIB}
- ${PROJECT_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX} mame2003)
-
-build_addon(${PROJECT_NAME} MAME2003 DEPLIBS)
diff --git a/packages/mediacenter/kodi-binary-addons/game.libretro.mame2003/sources/game.libretro.mame2003/addon.xml b/packages/mediacenter/kodi-binary-addons/game.libretro.mame2003/sources/game.libretro.mame2003/addon.xml
deleted file mode 100644
index 589586e88e..0000000000
--- a/packages/mediacenter/kodi-binary-addons/game.libretro.mame2003/sources/game.libretro.mame2003/addon.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
-
-
-
-
-
- zip|chd|7z
- false
- false
-
-
- MAME2003
- MAME2003 stands for [B]M[/B]ultiple [B]A[/B]rcade [B]M[/B]achine [B]E[/B]mulator. MAME2003 can currently emulate several thousand different classic arcade video games from the late 1970s through the modern era.
-
-Supported files: .zip, .chd, .7z
-
-Icon credit: peter-86 (peter-86.deviantart.com)
-
-License: GPLv2
- all
- true
-
-
diff --git a/packages/mediacenter/kodi-binary-addons/game.libretro.mame2003/sources/game.libretro.mame2003/icon.png b/packages/mediacenter/kodi-binary-addons/game.libretro.mame2003/sources/game.libretro.mame2003/icon.png
deleted file mode 100644
index 613d8b2767..0000000000
Binary files a/packages/mediacenter/kodi-binary-addons/game.libretro.mame2003/sources/game.libretro.mame2003/icon.png and /dev/null differ
diff --git a/packages/mediacenter/kodi-binary-addons/game.libretro.mame2010/package.mk b/packages/mediacenter/kodi-binary-addons/game.libretro.mame2010/package.mk
index 4cdf9293bb..725fa5798c 100644
--- a/packages/mediacenter/kodi-binary-addons/game.libretro.mame2010/package.mk
+++ b/packages/mediacenter/kodi-binary-addons/game.libretro.mame2010/package.mk
@@ -2,12 +2,12 @@
# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="game.libretro.mame2010"
-PKG_VERSION="7e63b8e"
-PKG_SHA256="96191832c294c0f63d20ae2ff975fb5f0db73520e25daa1ce44f8dcf06fadc59"
-PKG_REV="101"
-PKG_ARCH="none"
+PKG_VERSION="3f8772c912520d3331782ca38216e7e5d6c23845"
+PKG_SHA256="b7c72ff30ce4a7538f6fbb81945627f9e056fdc1e76447c1e3c13d9f0d1e6968"
+PKG_REV="100"
PKG_LICENSE="GPL"
-PKG_SITE="https://github.com/kodi-game/game.libretro.mame"
+PKG_SITE="https://github.com/kodi-game/game.libretro.mame2010"
+PKG_URL="https://github.com/kodi-game/game.libretro.mame2010/archive/$PKG_VERSION.tar.gz"
PKG_DEPENDS_TARGET="toolchain kodi-platform libretro-mame2010"
PKG_SECTION=""
PKG_LONGDESC="game.libretro.mame2010: MAME emulator for Kodi"
diff --git a/packages/mediacenter/kodi-binary-addons/game.libretro.mame2010/patches/game.libretro.mame2010-0001-fix-cross-compile.patch b/packages/mediacenter/kodi-binary-addons/game.libretro.mame2010/patches/game.libretro.mame2010-0001-fix-cross-compile.patch
deleted file mode 100644
index c64feb3fe4..0000000000
--- a/packages/mediacenter/kodi-binary-addons/game.libretro.mame2010/patches/game.libretro.mame2010-0001-fix-cross-compile.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -Naur a/CMakeLists.txt b/CMakeLists.txt
---- a/CMakeLists.txt 2016-08-26 09:40:47.403061474 -0700
-+++ b/CMakeLists.txt 2016-08-26 09:40:47.464062073 -0700
-@@ -6,11 +6,12 @@
-
- enable_language(CXX)
-
--find_package(kodi REQUIRED)
-+find_package(Kodi REQUIRED)
- find_package(libretro-mame2010 REQUIRED)
-
- set(DEPLIBS mame2010)
- set(MAME2010_CUSTOM_BINARY ${MAME2010_LIB}
-- ${PROJECT_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX} mame2010)
-+ ${PROJECT_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX} mame2010)
-
- build_addon(${PROJECT_NAME} MAME2010 DEPLIBS)
-+
diff --git a/packages/mediacenter/kodi-binary-addons/game.libretro.mame2010/sources/CMakeLists.txt b/packages/mediacenter/kodi-binary-addons/game.libretro.mame2010/sources/CMakeLists.txt
deleted file mode 100644
index 600867b919..0000000000
--- a/packages/mediacenter/kodi-binary-addons/game.libretro.mame2010/sources/CMakeLists.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-project(game.libretro.mame2010)
-
-cmake_minimum_required(VERSION 2.6)
-
-list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR})
-
-enable_language(CXX)
-
-find_package(kodi REQUIRED)
-find_package(libretro-mame2010 REQUIRED)
-
-set(DEPLIBS mame2010)
-set(MAME2010_CUSTOM_BINARY ${MAME2010_LIB}
- ${PROJECT_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX} mame2010)
-
-build_addon(${PROJECT_NAME} MAME2010 DEPLIBS)
diff --git a/packages/mediacenter/kodi-binary-addons/game.libretro.mame2010/sources/game.libretro.mame2010/addon.xml b/packages/mediacenter/kodi-binary-addons/game.libretro.mame2010/sources/game.libretro.mame2010/addon.xml
deleted file mode 100644
index 096cafc675..0000000000
--- a/packages/mediacenter/kodi-binary-addons/game.libretro.mame2010/sources/game.libretro.mame2010/addon.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
-
-
-
-
-
- zip|chd|7z
- false
- false
-
-
- MAME2010
- MAME2010 stands for [B]M[/B]ultiple [B]A[/B]rcade [B]M[/B]achine [B]E[/B]mulator. MAME2010 can currently emulate several thousand different classic arcade video games from the late 1970s through the modern era.
-
-Supported files: .zip, .chd, .7z
-
-Icon credit: peter-86 (peter-86.deviantart.com)
-
-License: GPLv2
- all
- true
-
-
diff --git a/packages/mediacenter/kodi-binary-addons/game.libretro.mame2010/sources/game.libretro.mame2010/icon.png b/packages/mediacenter/kodi-binary-addons/game.libretro.mame2010/sources/game.libretro.mame2010/icon.png
deleted file mode 100644
index 613d8b2767..0000000000
Binary files a/packages/mediacenter/kodi-binary-addons/game.libretro.mame2010/sources/game.libretro.mame2010/icon.png and /dev/null differ
diff --git a/packages/mediacenter/kodi-binary-addons/game.libretro.mame2014/package.mk b/packages/mediacenter/kodi-binary-addons/game.libretro.mame2014/package.mk
index ece911baec..0a9708a860 100644
--- a/packages/mediacenter/kodi-binary-addons/game.libretro.mame2014/package.mk
+++ b/packages/mediacenter/kodi-binary-addons/game.libretro.mame2014/package.mk
@@ -2,12 +2,12 @@
# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="game.libretro.mame2014"
-PKG_VERSION="7e63b8e"
-PKG_SHA256="96191832c294c0f63d20ae2ff975fb5f0db73520e25daa1ce44f8dcf06fadc59"
-PKG_REV="101"
-PKG_ARCH="none"
+PKG_VERSION="1d5dc2968930f47fe3792ef3c90958d655fd7c4c"
+PKG_SHA256="a4016af98dc66b9408c5377a2250bd9ee76c12bb0bc0a13c4cb048ac3d0b3944"
+PKG_REV="100"
PKG_LICENSE="GPL"
-PKG_SITE="https://github.com/kodi-game/game.libretro.mame"
+PKG_SITE="https://github.com/kodi-game/game.libretro.mame2014"
+PKG_URL="https://github.com/kodi-game/game.libretro.mame2014/archive/$PKG_VERSION.tar.gz"
PKG_DEPENDS_TARGET="toolchain kodi-platform libretro-mame2014"
PKG_SECTION=""
PKG_LONGDESC="game.libretro.mame2014: MAME emulator for Kodi"
diff --git a/packages/mediacenter/kodi-binary-addons/game.libretro.mame2014/patches/game.libretro.mame2014-0001-fix-cross-compile.patch b/packages/mediacenter/kodi-binary-addons/game.libretro.mame2014/patches/game.libretro.mame2014-0001-fix-cross-compile.patch
deleted file mode 100644
index 8cc18a25cf..0000000000
--- a/packages/mediacenter/kodi-binary-addons/game.libretro.mame2014/patches/game.libretro.mame2014-0001-fix-cross-compile.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -Naur a/CMakeLists.txt b/CMakeLists.txt
---- a/CMakeLists.txt 2016-08-26 12:38:18.815467745 -0700
-+++ b/CMakeLists.txt 2016-08-26 12:38:18.879468370 -0700
-@@ -6,11 +6,12 @@
-
- enable_language(CXX)
-
--find_package(kodi REQUIRED)
-+find_package(Kodi REQUIRED)
- find_package(libretro-mame2014 REQUIRED)
-
- set(DEPLIBS mame2014)
- set(MAME2014_CUSTOM_BINARY ${MAME2014_LIB}
-- ${PROJECT_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX} mame2014)
-+ ${PROJECT_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX} mame2014)
-
- build_addon(${PROJECT_NAME} MAME2014 DEPLIBS)
-+
diff --git a/packages/mediacenter/kodi-binary-addons/game.libretro.mame2014/sources/CMakeLists.txt b/packages/mediacenter/kodi-binary-addons/game.libretro.mame2014/sources/CMakeLists.txt
deleted file mode 100644
index bc4bec93cd..0000000000
--- a/packages/mediacenter/kodi-binary-addons/game.libretro.mame2014/sources/CMakeLists.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-project(game.libretro.mame2014)
-
-cmake_minimum_required(VERSION 2.6)
-
-list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR})
-
-enable_language(CXX)
-
-find_package(kodi REQUIRED)
-find_package(libretro-mame2014 REQUIRED)
-
-set(DEPLIBS mame2014)
-set(MAME2014_CUSTOM_BINARY ${MAME2014_LIB}
- ${PROJECT_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX} mame2014)
-
-build_addon(${PROJECT_NAME} MAME2014 DEPLIBS)
diff --git a/packages/mediacenter/kodi-binary-addons/game.libretro.mame2014/sources/game.libretro.mame2014/addon.xml b/packages/mediacenter/kodi-binary-addons/game.libretro.mame2014/sources/game.libretro.mame2014/addon.xml
deleted file mode 100644
index 7d8762f1f1..0000000000
--- a/packages/mediacenter/kodi-binary-addons/game.libretro.mame2014/sources/game.libretro.mame2014/addon.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
-
-
-
-
-
- zip|chd|7z
- false
- false
-
-
- MAME2014
- MAME2014 stands for [B]M[/B]ultiple [B]A[/B]rcade [B]M[/B]achine [B]E[/B]mulator. MAME2014 can currently emulate several thousand different classic arcade video games from the late 1970s through the modern era.
-
-Supported files: .zip, .chd, .7z
-
-Icon credit: peter-86 (peter-86.deviantart.com)
-
-License: GPLv2
- all
- true
-
-
diff --git a/packages/mediacenter/kodi-binary-addons/game.libretro.mame2014/sources/game.libretro.mame2014/icon.png b/packages/mediacenter/kodi-binary-addons/game.libretro.mame2014/sources/game.libretro.mame2014/icon.png
deleted file mode 100644
index 613d8b2767..0000000000
Binary files a/packages/mediacenter/kodi-binary-addons/game.libretro.mame2014/sources/game.libretro.mame2014/icon.png and /dev/null differ