diff --git a/packages/addons/addon-depends/game-tools/bchunk/package.mk b/packages/addons/addon-depends/game-tools/bchunk/package.mk
new file mode 100644
index 0000000000..aad0205dd4
--- /dev/null
+++ b/packages/addons/addon-depends/game-tools/bchunk/package.mk
@@ -0,0 +1,35 @@
+################################################################################
+# This file is part of LibreELEC - http://www.libreelec.tv
+# Copyright (C) 2016 Team LibreELEC
+#
+# LibreELEC is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 2 of the License, or
+# (at your option) any later version.
+#
+# LibreELEC is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with LibreELEC. If not, see .
+################################################################################
+
+PKG_NAME="bchunk"
+PKG_VERSION="1.2.0"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="http://he.fi/bchunk/"
+PKG_URL="http://he.fi/bchunk/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_DEPENDS_TARGET="toolchain"
+PKG_SECTION="system"
+PKG_SHORTDESC="binchunker converts a CD image in a .bin / .cue format (sometimes .raw / .cue) to a set of .iso and .cdr tracks"
+PKG_LONGDESC="binchunker converts a CD image in a .bin / .cue format (sometimes .raw / .cue) to a set of .iso and .cdr tracks"
+
+PKG_IS_ADDON="no"
+PKG_AUTORECONF="no"
+
+makeinstall_target() {
+ :
+}
diff --git a/packages/addons/addon-depends/game-tools/bchunk/patches/bchunk-0001-fix-makefile.patch b/packages/addons/addon-depends/game-tools/bchunk/patches/bchunk-0001-fix-makefile.patch
new file mode 100644
index 0000000000..e092487c09
--- /dev/null
+++ b/packages/addons/addon-depends/game-tools/bchunk/patches/bchunk-0001-fix-makefile.patch
@@ -0,0 +1,16 @@
+diff -Naur a/Makefile b/Makefile
+--- a/Makefile 2001-08-02 05:51:40.000000000 -0700
++++ b/Makefile 2016-10-23 10:47:21.682136676 -0700
+@@ -1,9 +1,9 @@
+ all: bchunk
+
+ # For systems with GCC (Linux, and others with GCC installed):
+-CC = gcc
+-LD = gcc
+-CFLAGS = -Wall -Wstrict-prototypes -O2
++CC ?= gcc
++LD = $(CC)
++CFLAGS ?= -Wall -Wstrict-prototypes -O2
+
+ # For systems with a legacy CC:
+ #CC = cc
diff --git a/packages/addons/addon-depends/game-tools/ecm-tools/package.mk b/packages/addons/addon-depends/game-tools/ecm-tools/package.mk
new file mode 100644
index 0000000000..16933b35b3
--- /dev/null
+++ b/packages/addons/addon-depends/game-tools/ecm-tools/package.mk
@@ -0,0 +1,35 @@
+################################################################################
+# This file is part of LibreELEC - http://www.libreelec.tv
+# Copyright (C) 2016 Team LibreELEC
+#
+# LibreELEC is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 2 of the License, or
+# (at your option) any later version.
+#
+# LibreELEC is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with LibreELEC. If not, see .
+################################################################################
+
+PKG_NAME="ecm-tools"
+PKG_VERSION="55365b0"
+PKG_ARCH="any"
+PKG_LICENSE="GPLv3"
+PKG_SITE="https://github.com/alucryd/ecm-tools"
+PKG_URL="https://github.com/alucryd/ecm-tools/archive/$PKG_VERSION.tar.gz"
+PKG_DEPENDS_TARGET="toolchain"
+PKG_SECTION="system"
+PKG_SHORTDESC="Error Code Modeler"
+PKG_LONGDESC="Error Code Modeler"
+
+PKG_IS_ADDON="no"
+PKG_AUTORECONF="no"
+
+makeinstall_target() {
+ :
+}
diff --git a/packages/addons/addon-depends/game-tools/iat/package.mk b/packages/addons/addon-depends/game-tools/iat/package.mk
new file mode 100644
index 0000000000..bfcd0c78f8
--- /dev/null
+++ b/packages/addons/addon-depends/game-tools/iat/package.mk
@@ -0,0 +1,37 @@
+################################################################################
+# This file is part of LibreELEC - http://www.libreelec.tv
+# Copyright (C) 2016 Team LibreELEC
+#
+# LibreELEC is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 2 of the License, or
+# (at your option) any later version.
+#
+# LibreELEC is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with LibreELEC. If not, see .
+################################################################################
+
+PKG_NAME="iat"
+PKG_VERSION="0.1.7"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="https://sourceforge.net/projects/iat.berlios/"
+PKG_URL="https://sourceforge.net/projects/iat.berlios/files/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_DEPENDS_TARGET="toolchain"
+PKG_SECTION="system"
+PKG_SHORTDESC="Iso9660 Analyzer Tool, this tool have engine for detect many structure of image file"
+PKG_LONGDESC="Iso9660 Analyzer Tool, this tool have engine for detect many structure of image file"
+
+PKG_IS_ADDON="no"
+PKG_AUTORECONF="no"
+
+PKG_CONFIGURE_OPTS_TARGET="ac_cv_func_malloc_0_nonnull=yes"
+
+makeinstall_target() {
+ :
+}
diff --git a/packages/addons/addon-depends/game-tools/linuxconsoletools/package.mk b/packages/addons/addon-depends/game-tools/linuxconsoletools/package.mk
new file mode 100644
index 0000000000..807fc19c27
--- /dev/null
+++ b/packages/addons/addon-depends/game-tools/linuxconsoletools/package.mk
@@ -0,0 +1,37 @@
+################################################################################
+# This file is part of LibreELEC - http://www.libreelec.tv
+# Copyright (C) 2016 Team LibreELEC
+#
+# LibreELEC is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 2 of the License, or
+# (at your option) any later version.
+#
+# LibreELEC is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with LibreELEC. If not, see .
+################################################################################
+
+PKG_NAME="linuxconsoletools"
+PKG_VERSION="1.5.1"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="http://sourceforge.net/projects/linuxconsole/"
+PKG_URL="http://prdownloads.sourceforge.net/linuxconsole/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_DEPENDS_TARGET="toolchain"
+PKG_SECTION="system"
+PKG_SHORTDESC="Set of utilities for joysticks and serial devices"
+PKG_LONGDESC="Set of utilities for joysticks and serial devices"
+
+PKG_IS_ADDON="no"
+PKG_AUTORECONF="no"
+
+PKG_MAKE_OPTS_TARGET="SYSTEMD_SUPPORT=0"
+
+makeinstall_target() {
+ :
+}
diff --git a/packages/addons/addon-depends/game-tools/linuxconsoletools/patches/linuxconsoletools-0001-disable-building-ffmvforce.patch b/packages/addons/addon-depends/game-tools/linuxconsoletools/patches/linuxconsoletools-0001-disable-building-ffmvforce.patch
new file mode 100644
index 0000000000..bfc9ae0b89
--- /dev/null
+++ b/packages/addons/addon-depends/game-tools/linuxconsoletools/patches/linuxconsoletools-0001-disable-building-ffmvforce.patch
@@ -0,0 +1,12 @@
+diff -Naur a/utils/Makefile b/utils/Makefile
+--- a/utils/Makefile 2016-04-19 13:20:50.000000000 -0700
++++ b/utils/Makefile 2016-10-20 00:31:34.238941511 -0700
+@@ -27,7 +27,7 @@
+
+ CFLAGS ?= -g -O2 -Wall
+
+-PROGRAMS = inputattach jstest jscal fftest ffmvforce ffset \
++PROGRAMS = inputattach jstest jscal fftest ffset \
+ ffcfstress jscal-restore jscal-store evdev-joystick
+
+ PREFIX ?= /usr/local
diff --git a/packages/addons/tools/game-tools/changelog.txt b/packages/addons/tools/game-tools/changelog.txt
new file mode 100644
index 0000000000..b7f9e891ea
--- /dev/null
+++ b/packages/addons/tools/game-tools/changelog.txt
@@ -0,0 +1,2 @@
+9.0.100
+- Initial Release
diff --git a/packages/addons/tools/game-tools/icon/icon.png b/packages/addons/tools/game-tools/icon/icon.png
new file mode 100644
index 0000000000..f95a9e2b80
Binary files /dev/null and b/packages/addons/tools/game-tools/icon/icon.png differ
diff --git a/packages/addons/tools/game-tools/package.mk b/packages/addons/tools/game-tools/package.mk
new file mode 100644
index 0000000000..7ea62a044e
--- /dev/null
+++ b/packages/addons/tools/game-tools/package.mk
@@ -0,0 +1,60 @@
+################################################################################
+# This file is part of LibreELEC - http://www.libreelec.tv
+# Copyright (C) 2016 Team LibreELEC
+#
+# LibreELEC is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 2 of the License, or
+# (at your option) any later version.
+#
+# LibreELEC is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with LibreELEC. If not, see .
+################################################################################
+
+PKG_NAME="game-tools"
+PKG_VERSION=""
+PKG_REV="100"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE=""
+PKG_URL=""
+PKG_DEPENDS_TARGET="toolchain"
+PKG_SECTION="virtual"
+PKG_SHORTDESC="A bundle of game tools and programs"
+PKG_LONGDESC="This bundle currently includes bchunk, ecm-tools, iat, and linuxconsoletools"
+PKG_AUTORECONF="no"
+
+PKG_IS_ADDON="yes"
+PKG_ADDON_NAME="Game Tools"
+PKG_ADDON_TYPE="xbmc.python.script"
+
+PKG_DEPENDS_TARGET="toolchain \
+ bchunk \
+ ecm-tools \
+ iat \
+ linuxconsoletools"
+
+addon() {
+ mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin/
+ # bchunk
+ cp -P $(get_build_dir bchunk)/bchunk $ADDON_BUILD/$PKG_ADDON_ID/bin
+
+ # ecm-tools
+ cp -P $(get_build_dir ecm-tools)/bin2ecm $ADDON_BUILD/$PKG_ADDON_ID/bin
+ ln -s bin2ecm $ADDON_BUILD/$PKG_ADDON_ID/bin/ecm2bin
+
+ # iat
+ cp -P $(get_build_dir iat)/.$TARGET_NAME/src/iat $ADDON_BUILD/$PKG_ADDON_ID/bin
+
+ # linuxconsoletools
+ cp -P $(get_build_dir linuxconsoletools)/utils/fftest $ADDON_BUILD/$PKG_ADDON_ID/bin
+ cp -P $(get_build_dir linuxconsoletools)/utils/jscal $ADDON_BUILD/$PKG_ADDON_ID/bin
+ cp -P $(get_build_dir linuxconsoletools)/utils/jstest $ADDON_BUILD/$PKG_ADDON_ID/bin
+
+ debug_strip $ADDON_BUILD/$PKG_ADDON_ID/bin
+}
diff --git a/packages/addons/tools/game-tools/source/default.py b/packages/addons/tools/game-tools/source/default.py
new file mode 100644
index 0000000000..9256029318
--- /dev/null
+++ b/packages/addons/tools/game-tools/source/default.py
@@ -0,0 +1,23 @@
+################################################################################
+# This file is part of LibreELEC - http://www.libreelec.tv
+# Copyright (C) 2016 Team LibreELEC
+#
+# LibreELEC is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 2 of the License, or
+# (at your option) any later version.
+#
+# LibreELEC is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with LibreELEC. If not, see .
+################################################################################
+
+import xbmcgui
+import subprocess
+
+xbmcgui.Dialog().ok('', 'This is a console-only addon')
+