Update ISSUE_TEMPLATE.md

add 'assets' smb share

CONTRIBUTING.md

@@ -1,111 +1,22 @@
-### Questions about OpenELEC?
+### Questions about Lakka?
 
-To get your questions answered, please ask in the OpenELEC [Forum], on IRC: 
-\#openelec on freenode.net, or [webchat]. 
+To get your questions answered, please ask in the [Lakka forum](https://forums.libretro.com/c/libretro/lakka-tv-general) or on IRC: \#lakka on freenode.net.
 
 Do not open an issue.
 
 ### Issue Reports
 
-**BEFORE you report a bug make sure you got the latest testing version of 
-OpenELEC. Your bug might be already fixed.**
+**BEFORE you report a bug make sure you have tried the [latest nightly version of Lakka](http://sources.lakka.tv/nightly/). Your bug might be already fixed.**
 
-If you are at all unsure whether it's a bug in OpenELEC or a problem with 
-something else, post in the OpenELEC [Forum] instead. If it turns out that it is
-a bug, an issue can always be opened later.
+If you are at all unsure whether it's a bug in Lakka or a problem with something else, post in the [Lakka forum](https://forums.libretro.com/c/libretro/lakka-tv-general)  instead. If it turns out that it is a bug, an issue can always be opened later.
 
-If you are sure that it's a bug in OpenELEC and you have not found a [similar issue], open a new [issue]
-and try to answer the following questions:
+If you are sure that it's a bug in Lakka  and you have not found a similar issue, open a new [issue](https://github.com/libretro/Lakka/issues) and try to answer the following questions:
 - What did you do?
 - What did you expect to happen?
 - What happened instead?
 
-**It is also importent to provide logs for debugging.
-A zip file can be found in the [logfiles] samba share, this will contain all the logs needed.**
+**It is important to provide logs for debugging as part of your Issue. Instructions for generating logs can be found in the [Troubleshooting Lakka](http://www.lakka.tv/doc/Troubleshooting-Lakka/) documentation.**
 
-Make sure to specify which version of OpenELEC you are using.
-- OpenELEC version
-- OpenELEC build
-- OpenELEC arch
+Make sure to specify which version of Lakka you are using.
 
-Please don't paste log messages in the issue reports or issue comments - use 
-[sprunge.us](http://sprunge.us) instead.
-
-Feature requests are great, but they usually end up lying around the issue
-tracker indefinitely. Sending a pull request is a much better way of getting a
-particular feature into OpenELEC.
-
-Please dont ask us to add 3rdparty drivers unless you are the maintainer/developer of the driver,
-we have no manpower to support a non-mainlined kernel driver for your hardware.
-However, OpenELEC comes with minimal set of kernel drivers enabled, if you are sure that your hardware
-is supported in mainline kernel, feel free to send us a Pull Request to enable it in our
-kernel defconfigs. We are always happy to support known-working hardware.
-
-### Reporting build failures
-
-As buildsystem / core packages (toolchain) / random libraries change from time to time, it is required
-that you always do a clean build (make clean) before reporting build failures. Also make sure that you
-have a clean, unmodified git clone, we can't fix bugs caused by you failed to merge / rebase on
-your own fork.
-
-### Pull Requests
-
-- **Create topic branches**. Don't ask us to pull from your master branch.
-
-- **One pull request per feature**. If you want to do more than one thing, send
-  multiple pull requests.
-
-- **Send coherent history**. Make sure each individual commit in your pull
-  request is meaningful. If you had to make multiple intermediate commits while
-  developing, please squash them before sending them to us.
-
-Please follow this process; it's the best way to get your work included in the project:
-
-- [Fork](http://help.github.com/fork-a-repo/) the project, clone your fork,
-   and configure the remotes:
-
-```bash
-   # clone your fork of the repo into the current directory in terminal
-   git clone [email protected]:<your username>/OpenELEC.tv.git
-   # navigate to the newly cloned directory
-   cd OpenELEC.tv
-   # assign the original repo to a remote called "upstream"
-   git remote add upstream https://github.com/OpenELEC/OpenELEC.tv.git
-   ```
-
-- If you cloned a while ago, get the latest changes from upstream:
-
-   ```bash
-   # fetch upstream changes
-   git fetch upstream
-   # make sure you are on your 'master' branch
-   git checkout master
-   # merge upstream changes
-   git merge upstream/master
-   ```
-
-- Create a new topic branch to contain your feature, change, or fix:
-
-   ```bash
-   git checkout -b <topic-branch-name>
-   ```
-
-- Commit your changes in logical chunks. or your pull request is unlikely
-   be merged into the main project. Use git's
-   [interactive rebase](https://help.github.com/articles/interactive-rebase)
-   feature to tidy up your commits before making them public.
-
-- Push your topic branch up to your fork:
-
-   ```bash
-   git push origin <topic-branch-name>
-   ```
-
-- [Open a Pull Request](https://help.github.com/articles/using-pull-requests) with a
-    clear title and description.
-
-[Forum]: http://openelec.tv/forum
-[issue]: https://github.com/OpenELEC/OpenELEC.tv/issues
-[webchat]: http://openelec.tv/support/chat
-[logfiles]: http://wiki.openelec.tv/index.php?title=OpenELEC_FAQ#Support_Logs
-[similar issue]: https://github.com/OpenELEC/OpenELEC.tv/search?&ref=cmdform&type=Issues
+Feature requests are great, but they usually end up lying around the issue tracker indefinitely. Sending a [Pull Request](https://github.com/libretro/Lakka/pulls) is a much better way of getting a particular feature into Lakka.

ISSUE_TEMPLATE.md

@@ -0,0 +1 @@
+The issue tracker has moved to https://github.com/libretro/Lakka-LibreELEC/issues

README.md

@@ -2,7 +2,7 @@
 
 Lakka is a lightweight Linux distribution that transforms a small computer into a full blown emulation console.
 
-* **Powerful** - Built on top of the famous RetroArch emulator, Lakka is able to emulate a large range of hardware and has some usefull features such as Braid-like rewinding, joypad hotplug and video streaming.
+* **Powerful** - Built on top of the famous RetroArch emulator, Lakka is able to emulate a large range of hardware and has some useful features such as Braid-like rewinding, joypad hotplug and video streaming.
 * **User friendly** - Lakka is easy to setup and use. Once installed to your SD card, you just have to put your rom on the card, plug your joypad and enjoy your favorite old games.
 * **Low cost** - The hardware required to run Lakka cost only $35. We also support PS3 and XBox360 controllers so you don't have to buy new ones. The power can be supplied by any micro USB adapter like the one of your smartphone.
 * **Open source** - Our code is free as in freedom and hosted on Github. We accept external contributions, and we do our best to integrate our own patches into upstream projects.
@@ -15,5 +15,5 @@ Please refer to our website http://www.lakka.tv/get on how to setup Lakka.
 
 * [FAQ](https://github.com/lakkatv/Lakka/wiki/FAQ)
 * #lakkatv on irc.freenode.org
-* [Forums](http://libretro.com/forums/forumdisplay.php?f=26)
+* [Forums](https://forums.libretro.com/c/libretro/lakka-tv-general)
 * contact@lakka.tv

config/noobs/partitions.json

@@ -3,7 +3,7 @@
     {
       "label":                     "@DISTRONAME@_@PROJECT@_System",
       "filesystem_type":           "FAT",
-      "partition_size_nominal":    200,
+      "partition_size_nominal":    512,
       "want_maximised":            false,
       "uncompressed_tarball_size": 170,
       "mkfs_options":              ""

config/options

@@ -48,6 +48,11 @@ LINUX_DEPENDS="$PROJECT_DIR/$PROJECT/linux/linux.$TARGET_ARCH.conf $ROOT/package
    . $PROJECT_DIR/$PROJECT/options
  fi
 
+# read board options if available
+ if [ -f "$PROJECT_DIR/$PROJECT/devices/$SYSTEM/options" ]; then
+   . $PROJECT_DIR/$PROJECT/devices/$SYSTEM/options
+ fi
+
 # Need to point to your actual cc
 # If you have ccache installed, take care that LOCAL_CC don't point to it
   LOCAL_CC=`which gcc`

distributions/Lakka/options

@@ -300,7 +300,7 @@
 "/tmp/cores/nxengine_libretro.so;"\
 "/tmp/cores/bluemsx_libretro.so;"\
 "/tmp/cores/prboom_libretro.so;"\
-"/tmp/cores/fba_libretro.so;"\
+"/tmp/cores/fbalpha_libretro.so;"\
 "/tmp/cores/vecx_libretro.so;"\
 "/tmp/cores/lutro_libretro.so;"\
 "/tmp/cores/o2em_libretro.so;"\
@@ -320,8 +320,8 @@
 "/tmp/cores/desmume_libretro.so;"\
 "/tmp/cores/desmume_libretro.so;"\
 "/tmp/cores/nestopia_libretro.so;"\
-"/tmp/cores/snes9x_next_libretro.so;"\
-"/tmp/cores/snes9x_next_libretro.so;"\
+"/tmp/cores/snes9x2010_libretro.so;"\
+"/tmp/cores/snes9x2010_libretro.so;"\
 "/tmp/cores/mednafen_vb_libretro.so;"\
 "/tmp/cores/tyrquake_libretro.so;"\
 "/tmp/cores/scummvm_libretro.so;"\

licenses/genesis-plus-gx-license.txt

@@ -0,0 +1,619 @@
+
+Unless otherwise explicitly stated, all code in Genesis Plus GX is released
+under the following license:
+
+Copyright (c) 1998-2003 Charles MacDonald
+Copyright (c) 2007-2015 Eke-Eke
+Some portions copyright Nicola Salmoria and the MAME team
+All rights reserved.
+
+Redistribution and use of this code or any derivative works are permitted
+provided that the following conditions are met:
+
+* Redistributions may not be sold, nor may they be used in a commercial
+product or activity.
+
+* Redistributions that are modified from the original source must include the
+complete source code, including the source code for all components used by a
+binary built from the modified sources. However, as a special exception, the
+source code distributed need not include anything that is normally distributed
+(in either source or binary form) with the major components (compiler, kernel,
+and so on) of the operating system on which the executable runs, unless that
+component itself accompanies the executable.
+
+* Redistributions must reproduce the above copyright notice, this list of
+conditions and the following disclaimer in the documentation and/or other
+materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+
+
+----------------------------------------------------------------------------------------
+
+TREMOR library is distributed under the following license:
+
+Copyright (c) 2002, Xiph.org Foundation
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+- Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+
+- Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
+
+- Neither the name of the Xiph.org Foundation nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION
+OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+----------------------------------------------------------------------------------------
+
+
+NTSC Filter and Blip Buffer libraries are distributed under the 
+terms of the GNU Lesser General Public License (LGPL)
+
+
+		  GNU LESSER GENERAL PUBLIC LICENSE
+		       Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+ 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL.  It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+  This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it.  You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+  When we speak of free software, we are referring to freedom of use,
+not price.  Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+  To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights.  These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+  For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you.  You must make sure that they, too, receive or can get the source
+code.  If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it.  And you must show them these terms so they know their rights.
+
+  We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+  To protect each distributor, we want to make it very clear that
+there is no warranty for the free library.  Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+  Finally, software patents pose a constant threat to the existence of
+any free program.  We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder.  Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+  Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License.  This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License.  We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+  When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library.  The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom.  The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+  We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License.  It also provides other free software developers Less
+of an advantage over competing non-free programs.  These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries.  However, the Lesser license provides advantages in certain
+special circumstances.
+
+  For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard.  To achieve this, non-free programs must be
+allowed to use the library.  A more frequent case is that a free
+library does the same job as widely used non-free libraries.  In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+  In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software.  For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+  Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.  Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library".  The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+		  GNU LESSER GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+  A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+  The "Library", below, refers to any such software library or work
+which has been distributed under these terms.  A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language.  (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+  "Source code" for a work means the preferred form of the work for
+making modifications to it.  For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+  Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it).  Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+  
+  1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+  You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+  2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) The modified work must itself be a software library.
+
+    b) You must cause the files modified to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    c) You must cause the whole of the work to be licensed at no
+    charge to all third parties under the terms of this License.
+
+    d) If a facility in the modified Library refers to a function or a
+    table of data to be supplied by an application program that uses
+    the facility, other than as an argument passed when the facility
+    is invoked, then you must make a good faith effort to ensure that,
+    in the event an application does not supply such function or
+    table, the facility still operates, and performs whatever part of
+    its purpose remains meaningful.
+
+    (For example, a function in a library to compute square roots has
+    a purpose that is entirely well-defined independent of the
+    application.  Therefore, Subsection 2d requires that any
+    application-supplied function or table used by this function must
+    be optional: if the application does not supply it, the square
+    root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library.  To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License.  (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.)  Do not make any other change in
+these notices.
+
+  Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+  This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+  4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+  If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library".  Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+  However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library".  The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+  When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library.  The
+threshold for this to be true is not precisely defined by law.
+
+  If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work.  (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+  Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+  6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+  You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License.  You must supply a copy of this License.  If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License.  Also, you must do one
+of these things:
+
+    a) Accompany the work with the complete corresponding
+    machine-readable source code for the Library including whatever
+    changes were used in the work (which must be distributed under
+    Sections 1 and 2 above); and, if the work is an executable linked
+    with the Library, with the complete machine-readable "work that
+    uses the Library", as object code and/or source code, so that the
+    user can modify the Library and then relink to produce a modified
+    executable containing the modified Library.  (It is understood
+    that the user who changes the contents of definitions files in the
+    Library will not necessarily be able to recompile the application
+    to use the modified definitions.)
+
+    b) Use a suitable shared library mechanism for linking with the
+    Library.  A suitable mechanism is one that (1) uses at run time a
+    copy of the library already present on the user's computer system,
+    rather than copying library functions into the executable, and (2)
+    will operate properly with a modified version of the library, if
+    the user installs one, as long as the modified version is
+    interface-compatible with the version that the work was made with.
+
+    c) Accompany the work with a written offer, valid for at
+    least three years, to give the same user the materials
+    specified in Subsection 6a, above, for a charge no more
+    than the cost of performing this distribution.
+
+    d) If distribution of the work is made by offering access to copy
+    from a designated place, offer equivalent access to copy the above
+    specified materials from the same place.
+
+    e) Verify that the user has already received a copy of these
+    materials or that you have already sent this user a copy.
+
+  For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it.  However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+  It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+  7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+    a) Accompany the combined library with a copy of the same work
+    based on the Library, uncombined with any other library
+    facilities.  This must be distributed under the terms of the
+    Sections above.
+
+    b) Give prominent notice with the combined library of the fact
+    that part of it is a work based on the Library, and explaining
+    where to find the accompanying uncombined form of the same work.
+
+  8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License.  However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+  9. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+  10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+
+  11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded.  In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+  13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation.  If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+  14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission.  For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this.  Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+			    NO WARRANTY
+
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+           How to Apply These Terms to Your New Libraries
+
+  If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change.  You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+
+  To apply these terms, attach the following notices to the library.  It is
+safest to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the library's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library 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
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the
+  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+
+  <signature of Ty Coon>, 1 April 1990
+  Ty Coon, President of Vice
+
+That's all there is to it!
+
+
+----------------------------------------------------------------------------------------
+
+Gamecube & Wii ports are linked with LIBASND library and includes code distributed under
+the following license:
+
+Copyright (c) 2008 Hermes <www.entuwii.net>
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, are 
+permitted provided that the following conditions are met:
+
+- Redistributions of source code must retain the above copyright notice, this list of 
+  conditions and the following disclaimer. 
+- Redistributions in binary form must reproduce the above copyright notice, this list 
+  of conditions and the following disclaimer in the documentation and/or other 
+  materials provided with the distribution. 
+- The names of the contributors may not be used to endorse or promote products derived 
+  from this software without specific prior written permission. 
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY 
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL 
+THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, 
+STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF 
+THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+----------------------------------------------------------------------------------------
+
+
+

licenses/picodrive-license.txt

@@ -0,0 +1,30 @@
+
+ Redistribution and use of this code or any derivative works are permitted
+ provided that the following conditions are met:
+
+ * Redistributions may not be sold, nor may they be used in a commercial
+ product or activity.
+
+ * Redistributions that are modified from the original source must include the
+ complete source code, including the source code for all components used by a
+ binary built from the modified sources. However, as a special exception, the
+ source code distributed need not include anything that is normally distributed
+ (in either source or binary form) with the major components (compiler, kernel,
+ and so on) of the operating system on which the executable runs, unless that
+ component itself accompanies the executable.
+
+ * Redistributions must reproduce the above copyright notice, this list of
+ conditions and the following disclaimer in the documentation and/or other
+ materials provided with the distribution.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ POSSIBILITY OF SUCH DAMAGE.

licenses/snes9x-license.txt

@@ -0,0 +1,174 @@
+  Snes9x - Portable Super Nintendo Entertainment System (TM) emulator.
+
+  (c) Copyright 1996 - 2002  Gary Henderson ([email protected]),
+                             Jerremy Koot ([email protected])
+
+  (c) Copyright 2002 - 2004  Matthew Kendora
+
+  (c) Copyright 2002 - 2005  Peter Bortas ([email protected])
+
+  (c) Copyright 2004 - 2005  Joel Yliluoma (http://iki.fi/bisqwit/)
+
+  (c) Copyright 2001 - 2006  John Weidman ([email protected])
+
+  (c) Copyright 2002 - 2006  funkyass ([email protected]),
+                             Kris Bleakley ([email protected])
+
+  (c) Copyright 2002 - 2010  Brad Jorsch ([email protected]),
+                             Nach ([email protected]),
+
+  (c) Copyright 2002 - 2011  zones ([email protected])
+
+  (c) Copyright 2006 - 2007  nitsuja
+
+  (c) Copyright 2009 - 2016  BearOso,
+                             OV2
+
+
+  BS-X C emulator code
+  (c) Copyright 2005 - 2006  Dreamer Nom,
+                             zones
+
+  C4 x86 assembler and some C emulation code
+  (c) Copyright 2000 - 2003  _Demo_ ([email protected]),
+                             Nach,
+                             zsKnight ([email protected])
+
+  C4 C++ code
+  (c) Copyright 2003 - 2006  Brad Jorsch,
+                             Nach
+
+  DSP-1 emulator code
+  (c) Copyright 1998 - 2006  _Demo_,
+                             Andreas Naive ([email protected]),
+                             Gary Henderson,
+                             Ivar ([email protected]),
+                             John Weidman,
+                             Kris Bleakley,
+                             Matthew Kendora,
+                             Nach,
+                             neviksti ([email protected])
+
+  DSP-2 emulator code
+  (c) Copyright 2003         John Weidman,
+                             Kris Bleakley,
+                             Lord Nightmare ([email protected]),
+                             Matthew Kendora,
+                             neviksti
+
+  DSP-3 emulator code
+  (c) Copyright 2003 - 2006  John Weidman,
+                             Kris Bleakley,
+                             Lancer,
+                             z80 gaiden
+
+  DSP-4 emulator code
+  (c) Copyright 2004 - 2006  Dreamer Nom,
+                             John Weidman,
+                             Kris Bleakley,
+                             Nach,
+                             z80 gaiden
+
+  OBC1 emulator code
+  (c) Copyright 2001 - 2004  zsKnight,
+                             pagefault ([email protected]),
+                             Kris Bleakley
+                             Ported from x86 assembler to C by sanmaiwashi
+
+  SPC7110 and RTC C++ emulator code used in 1.39-1.51
+  (c) Copyright 2002         Matthew Kendora with research by
+                             zsKnight,
+                             John Weidman,
+                             Dark Force
+
+  SPC7110 and RTC C++ emulator code used in 1.52+
+  (c) Copyright 2009         byuu,
+                             neviksti
+
+  S-DD1 C emulator code
+  (c) Copyright 2003         Brad Jorsch with research by
+                             Andreas Naive,
+                             John Weidman
+
+  S-RTC C emulator code
+  (c) Copyright 2001 - 2006  byuu,
+                             John Weidman
+
+  ST010 C++ emulator code
+  (c) Copyright 2003         Feather,
+                             John Weidman,
+                             Kris Bleakley,
+                             Matthew Kendora
+
+  Super FX x86 assembler emulator code
+  (c) Copyright 1998 - 2003  _Demo_,
+                             pagefault,
+                             zsKnight
+
+  Super FX C emulator code
+  (c) Copyright 1997 - 1999  Ivar,
+                             Gary Henderson,
+                             John Weidman
+
+  Sound emulator code used in 1.5-1.51
+  (c) Copyright 1998 - 2003  Brad Martin
+  (c) Copyright 1998 - 2006  Charles Bilyue'
+
+  Sound emulator code used in 1.52+
+  (c) Copyright 2004 - 2007  Shay Green ([email protected])
+
+  SH assembler code partly based on x86 assembler code
+  (c) Copyright 2002 - 2004  Marcus Comstedt ([email protected])
+
+  2xSaI filter
+  (c) Copyright 1999 - 2001  Derek Liauw Kie Fa
+
+  HQ2x, HQ3x, HQ4x filters
+  (c) Copyright 2003         Maxim Stepin ([email protected])
+
+  NTSC filter
+  (c) Copyright 2006 - 2007  Shay Green
+
+  GTK+ GUI code
+  (c) Copyright 2004 - 2016  BearOso
+
+  Win32 GUI code
+  (c) Copyright 2003 - 2006  blip,
+                             funkyass,
+                             Matthew Kendora,
+                             Nach,
+                             nitsuja
+  (c) Copyright 2009 - 2011  OV2
+
+  Mac OS GUI code
+  (c) Copyright 1998 - 2001  John Stiles
+  (c) Copyright 2001 - 2011  zones
+
+
+  Specific ports contains the works of other authors. See headers in
+  individual files.
+
+
+  Snes9x homepage: http://www.snes9x.com/
+
+  Permission to use, copy, modify and/or distribute Snes9x in both binary
+  and source form, for non-commercial purposes, is hereby granted without
+  fee, providing that this license information and copyright notice appear
+  with all copies and any derived work.
+
+  This software is provided 'as-is', without any express or implied
+  warranty. In no event shall the authors be held liable for any damages
+  arising from the use of this software or it's derivatives.
+
+  Snes9x is freeware for PERSONAL USE only. Commercial users should
+  seek permission of the copyright holders first. Commercial use includes,
+  but is not limited to, charging money for Snes9x or software derived from
+  Snes9x, including Snes9x or derivatives in commercial game bundles, and/or
+  using Snes9x as a promotion for your commercial product.
+
+  The copyright holders request that bug fixes and improvements to the code
+  should be forwarded to them so everyone can benefit from the modifications
+  in future versions.
+
+  Super NES and Super Nintendo Entertainment System are trademarks of
+  Nintendo Co., Limited and its subsidiary companies.

nightlies.sh

@@ -21,7 +21,6 @@ DISTRO=Lakka PROJECT=RPi2 ARCH=arm make noobs -j9
 >&2 echo "imx6.cuboxi.arm"
 DISTRO=Lakka PROJECT=imx6 SYSTEM=cuboxi ARCH=arm make image -j9
 >&2 echo "imx6.udoo.arm"
-DISTRO=Lakka PROJECT=imx6 SYSTEM=udoo ARCH=arm scripts/clean retroarch
 DISTRO=Lakka PROJECT=imx6 SYSTEM=udoo ARCH=arm make image -j9
 >&2 echo "a20.arm"
 DISTRO=Lakka PROJECT=a20 ARCH=arm make image -j9
@@ -37,6 +36,26 @@ DISTRO=Lakka PROJECT=OdroidXU3 ARCH=arm make image -j9
 DISTRO=Lakka PROJECT=WeTek_Play ARCH=arm make image -j9
 >&2 echo "WeTek_Core.arm"
 DISTRO=Lakka PROJECT=WeTek_Core ARCH=arm make image -j9
+>&2 echo "H3.op2.arm"
+DISTRO=Lakka PROJECT=H3 SYSTEM=opi2 ARCH=arm make image -j9
+>&2 echo "H3.opipc.arm"
+DISTRO=Lakka PROJECT=H3 SYSTEM=opipc ARCH=arm make image -j9
+>&2 echo "H3.opiplus.arm"
+DISTRO=Lakka PROJECT=H3 SYSTEM=opiplus ARCH=arm make image -j9
+>&2 echo "H3.opione.arm"
+DISTRO=Lakka PROJECT=H3 SYSTEM=opione ARCH=arm make image -j9
+>&2 echo "H3.opilite.arm"
+DISTRO=Lakka PROJECT=H3 SYSTEM=opilite ARCH=arm make image -j9
+>&2 echo "H3.bpim2p.arm"
+DISTRO=Lakka PROJECT=H3 SYSTEM=bpim2p ARCH=arm make image -j9
+>&2 echo "H3.opiplus2e.arm"
+DISTRO=Lakka PROJECT=H3 SYSTEM=opiplus2e ARCH=arm make image -j9
+>&2 echo "H3.opipcplus.arm"
+DISTRO=Lakka PROJECT=H3 SYSTEM=opipcplus ARCH=arm make image -j9
+>&2 echo "H3.bpim3.arm"
+DISTRO=Lakka PROJECT=H3 SYSTEM=bpim3 ARCH=arm make image -j9
+>&2 echo "H3.bx2.arm"
+DISTRO=Lakka PROJECT=H3 SYSTEM=bx2 ARCH=arm make image -j9
 
 rm target/*.kernel
 rm target/*.system

packages/3rdparty/lib/libzip/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="libzip"
-PKG_VERSION="0.11.2"
+PKG_VERSION="1.1.3"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/audio/openal-soft/package.mk

@@ -0,0 +1,46 @@
+################################################################################
+#      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 <http://www.gnu.org/licenses/>.
+################################################################################
+
+PKG_NAME="openal-soft"
+PKG_VERSION="1.17.2"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="http://www.openal.org/"
+PKG_URL="http://kcat.strangesoft.net/openal-releases/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_DEPENDS_TARGET="toolchain alsa-lib"
+PKG_SECTION="emulators/depends"
+PKG_SHORTDESC="openal: Open Audio Library"
+PKG_LONGDESC="OpenAL, the Open Audio Library, is a joint effort to create an open, vendor- neutral, cross-platform API for interactive, primarily spatialized audio. OpenAL's primary audience are application developers and desktop users that rely on portable standards like OpenGL, for games and other multimedia applications. OpenAL is already supported by a number of hardware vendors and developers."
+
+PKG_IS_ADDON="no"
+PKG_AUTORECONF="no"
+
+PKG_CMAKE_OPTS_TARGET="-DALSOFT_EXAMPLES=off \
+		       -DALSOFT_TESTS=off \
+		       -DALSOFT_UTILS=off \
+		       -DALSOFT_BACKEND_OSS=off \
+		       -DALSOFT_BACKEND_WAVE=off \
+		       -DALSOFT_BACKEND_PORTAUDIO=off \
+		       -DALSOFT_BACKEND_PULSEAUDIO=off"
+
+post_makeinstall_target() {
+  mkdir -p $INSTALL/etc/openal
+  sed s/^#drivers.*/drivers=alsa/ $INSTALL/usr/share/openal/alsoftrc.sample > $INSTALL/etc/openal/alsoft.conf
+  rm -rf $INSTALL/usr/share/openal
+}

packages/devel/cmake/package.mk

@@ -1,6 +1,6 @@
 ################################################################################
 #      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2014 Stephan Raue ([email protected])
+#      Copyright (C) 2009-2016 Stephan Raue ([email protected])
 #
 #  OpenELEC is free software: you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -17,13 +17,13 @@
 ################################################################################
 
 PKG_NAME="cmake"
-PKG_VERSION="3.0.2"
+PKG_VERSION="3.6.2"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="BSD"
 PKG_SITE="http://www.cmake.org/"
-PKG_URL="http://www.cmake.org/files/v3.0/$PKG_NAME-$PKG_VERSION.tar.gz"
-PKG_DEPENDS_HOST="ccache:host"
+PKG_URL="http://www.cmake.org/files/v3.6/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_DEPENDS_HOST="ccache:host libressl:host"
 PKG_PRIORITY="optional"
 PKG_SECTION="toolchain/devel"
 PKG_SHORTDESC="cmake: A cross-platform, open-source make system"
@@ -36,6 +36,10 @@ configure_host() {
   ../configure --prefix=$ROOT/$TOOLCHAIN \
                --no-qt-gui --no-system-libs \
                -- \
+               -DCMAKE_C_FLAGS="-O2 -Wall -pipe -Wno-format-security" \
+               -DCMAKE_CXX_FLAGS="-O2 -Wall -pipe -Wno-format-security" \
+               -DCMAKE_EXE_LINKER_FLAGS="$HOST_LDFLAGS" \
+               -DCMAKE_USE_OPENSSL=ON \
                -DBUILD_CursesDialog=0
 }
 

packages/devel/pkg-config/package.mk

@@ -17,12 +17,12 @@
 ################################################################################
 
 PKG_NAME="pkg-config"
-PKG_VERSION="0.28"
+PKG_VERSION="0.29.1"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.freedesktop.org/software/pkgconfig/"
-PKG_URL="http://pkgconfig.freedesktop.org/releases/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_URL="http://pkg-config.freedesktop.org/releases/$PKG_NAME-$PKG_VERSION.tar.gz"
 PKG_DEPENDS_HOST="ccache:host gettext:host"
 PKG_PRIORITY="optional"
 PKG_SECTION="toolchain/devel"
@@ -38,5 +38,5 @@ PKG_CONFIGURE_OPTS_HOST="--disable-silent-rules \
 
 post_makeinstall_host() {
   mkdir -p $SYSROOT_PREFIX/usr/share/aclocal
-    cp ../pkg.m4 $SYSROOT_PREFIX/usr/share/aclocal
+    cp pkg.m4 $SYSROOT_PREFIX/usr/share/aclocal
 }

packages/graphics/odroidc1-mali/package.mk

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="odroidc1-mali"
-PKG_VERSION="31d5c21"
+PKG_VERSION="cdf9ddb"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="nonfree"
@@ -39,11 +39,18 @@ make_target() {
   :
 }
 
+make_target() {
+  mkdir -p $SYSROOT_PREFIX/usr/lib
+    cp -PR fbdev/mali_libs/* $SYSROOT_PREFIX/usr/lib
+  mkdir -p $SYSROOT_PREFIX/usr/include
+    cp -PR fbdev/mali_headers/* $SYSROOT_PREFIX/usr/include
+}
+
 makeinstall_target() {
   mkdir -p $SYSROOT_PREFIX/usr/lib
     cp -PR fbdev/mali_libs/* $SYSROOT_PREFIX/usr/lib
   mkdir -p $SYSROOT_PREFIX/usr/include
-    cp -PR fbdev/mali_libs/* $SYSROOT_PREFIX/usr/include
+    cp -PR fbdev/mali_headers/* $SYSROOT_PREFIX/usr/include
   mkdir -p $INSTALL/usr/lib
     cp -PR fbdev/mali_libs/*.so* $INSTALL/usr/lib
 }

packages/graphics/sunxi-mali/package.mk

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="sunxi-mali"
-PKG_VERSION="d343311"
+PKG_VERSION="541e445"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="nonfree"
@@ -36,7 +36,11 @@ PKG_IS_ADDON="no"
 PKG_AUTORECONF="no"
 
 make_target() {
-  make ABI=armhf VERSION=r3p0 EGL_TYPE=framebuffer
+  if [ "$LINUX" == "linux-sun8i" ]; then
+    make ABI=armhf VERSION=r4p0-00rel0 EGL_TYPE=framebuffer
+  else
+    make ABI=armhf VERSION=r3p0 EGL_TYPE=framebuffer
+  fi
 }
 
 pre_makeinstall_target() {

packages/lakka/Bananapi/package.mk

@@ -25,7 +25,7 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/lakkatv/Lakka"
 PKG_URL=""
-PKG_DEPENDS_TARGET="retroarch tyrquake scummvm dosbox mgba prosystem o2em 81 fuse-libretro gw-libretro beetle-wswan beetle-ngp beetle-sgx genesis-plus-gx mupen64plus lutro gpsp 2048 pcsx_rearmed snes9x-next vecx dinothawr prboom beetle-pce handy picodrive pocketsnes nxengine nestopia gambatte stella fba libretro-ffmpeg"
+PKG_DEPENDS_TARGET="retroarch tyrquake scummvm dosbox mgba prosystem o2em 81 fuse-libretro gw-libretro beetle-wswan beetle-ngp beetle-sgx genesis-plus-gx mupen64plus glupen64 lutro gpsp 2048 pcsx_rearmed snes9x2010 vecx dinothawr prboom beetle-pce handy picodrive snes9x2002 nxengine nestopia gambatte stella fbalpha"
 PKG_PRIORITY="optional"
 PKG_SECTION="virtual"
 PKG_SHORTDESC="Lakka metapackage for Bananapi"

packages/lakka/Gamegirl/package.mk

@@ -25,7 +25,7 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/lakkatv/Lakka"
 PKG_URL=""
-PKG_DEPENDS_TARGET="retroarch tyrquake scummvm dosbox mgba prosystem o2em genesis-plus-gx 81 fuse-libretro gw-libretro lutro gpsp 2048 vecx dinothawr prboom beetle-wswan beetle-ngp beetle-pce beetle-sgx handy picodrive pocketsnes nxengine fceumm gambatte stella fba libretro-ffmpeg gamegirl-screen gamegirl-joypad"
+PKG_DEPENDS_TARGET="retroarch tyrquake scummvm dosbox mgba prosystem o2em genesis-plus-gx 81 fuse-libretro gw-libretro lutro gpsp 2048 vecx dinothawr prboom beetle-wswan beetle-ngp beetle-pce beetle-sgx handy picodrive snes9x2002 nxengine fceumm gambatte stella fbalpha gamegirl-screen gamegirl-joypad"
 PKG_PRIORITY="optional"
 PKG_SECTION="virtual"
 PKG_SHORTDESC="Lakka metapackage for Gamegirl"

packages/lakka/Generic/package.mk

@@ -25,9 +25,9 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/lakkatv/Lakka"
 PKG_URL=""
-PKG_DEPENDS_TARGET="retroarch uzebox mgba o2em puae snes9x picodrive 81 yabause hatari dosbox mame2003 gw-libretro fuse-libretro scummvm bluemsx beetle-sgx lutro 4do prosystem bsnes-mercury tyrquake 2048 virtualjaguar ppsspp beetle-vb beetle-wswan desmume beetle-ngp beetle-pcfx beetle-psx mupen64plus vecx snes9x-next dinothawr prboom beetle-pce fba handy genesis-plus-gx nxengine nestopia gambatte stella vbam libretro-ffmpeg"
+PKG_DEPENDS_TARGET="retroarch uzebox mgba o2em puae snes9x picodrive 81 yabause hatari dosbox mame2003 gw-libretro fuse-libretro scummvm bluemsx beetle-sgx lutro 4do prosystem bsnes-mercury tyrquake 2048 virtualjaguar ppsspp beetle-vb beetle-wswan desmume beetle-ngp beetle-pcfx beetle-psx-hw beetle-psx pcsx_rearmed mupen64plus glupen64 vecx snes9x2010 dinothawr prboom beetle-pce fbalpha handy genesis-plus-gx nxengine nestopia gambatte stella vbam reicast"
 if [ "$ARCH" == "x86_64" ]; then
-  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET reicast"
+  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET beetle-saturn"
 fi
 PKG_PRIORITY="optional"
 PKG_SECTION="virtual"

packages/lakka/H3/package.mk

@@ -0,0 +1,36 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2012 Stephan Raue ([email protected])
+#
+#  This Program 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, or (at your option)
+#  any later version.
+#
+#  This Program 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 OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+PKG_NAME="H3"
+PKG_VERSION=""
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="https://github.com/lakkatv/Lakka"
+PKG_URL=""
+PKG_DEPENDS_TARGET="retroarch desmume virtualjaguar tyrquake scummvm dosbox mgba mame2003 prosystem o2em 81 fuse-libretro gw-libretro beetle-sgx genesis-plus-gx mupen64plus glupen64 lutro gpsp ppsspp 2048 beetle-vb beetle-wswan beetle-ngp pcsx_rearmed vecx snes9x2010 dinothawr prboom beetle-pce handy picodrive nxengine nestopia gambatte stella fbalpha"
+PKG_PRIORITY="optional"
+PKG_SECTION="virtual"
+PKG_SHORTDESC="Lakka metapackage for H3"
+PKG_LONGDESC=""
+
+PKG_IS_ADDON="no"
+PKG_AUTORECONF="no"
+

packages/lakka/OdroidC1/package.mk

@@ -25,7 +25,7 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/lakkatv/Lakka"
 PKG_URL=""
-PKG_DEPENDS_TARGET="retroarch tyrquake scummvm dosbox mgba prosystem o2em 81 fuse-libretro gw-libretro beetle-sgx genesis-plus-gx mupen64plus lutro gpsp ppsspp 2048 beetle-vb beetle-wswan beetle-ngp pcsx_rearmed vecx snes9x-next dinothawr prboom beetle-pce handy picodrive nxengine nestopia gambatte stella fba libretro-ffmpeg"
+PKG_DEPENDS_TARGET="retroarch desmume tyrquake scummvm dosbox mgba prosystem o2em 81 fuse-libretro gw-libretro beetle-sgx genesis-plus-gx glupen64 mupen64plus lutro gpsp ppsspp 2048 beetle-vb beetle-wswan beetle-ngp pcsx_rearmed vecx snes9x2010 dinothawr prboom beetle-pce handy picodrive nxengine nestopia gambatte stella fbalpha"
 PKG_PRIORITY="optional"
 PKG_SECTION="virtual"
 PKG_SHORTDESC="Lakka metapackage for OdroidC1"

packages/lakka/OdroidC2/package.mk

@@ -0,0 +1,36 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2012 Stephan Raue ([email protected])
+#
+#  This Program 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, or (at your option)
+#  any later version.
+#
+#  This Program 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 OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+PKG_NAME="OdroidC2"
+PKG_VERSION=""
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="https://github.com/lakkatv/Lakka"
+PKG_URL=""
+PKG_DEPENDS_TARGET="retroarch tyrquake dosbox mgba prosystem o2em 81 fuse-libretro gw-libretro beetle-sgx genesis-plus-gx gpsp 2048 beetle-vb beetle-wswan beetle-ngp vecx snes9x2010 dinothawr prboom beetle-pce handy picodrive nxengine nestopia gambatte stella fbalpha"
+PKG_PRIORITY="optional"
+PKG_SECTION="virtual"
+PKG_SHORTDESC="Lakka metapackage for OdroidC2"
+PKG_LONGDESC=""
+
+PKG_IS_ADDON="no"
+PKG_AUTORECONF="no"
+

packages/lakka/OdroidXU3/package.mk

@@ -25,7 +25,7 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/lakkatv/Lakka"
 PKG_URL=""
-PKG_DEPENDS_TARGET="retroarch tyrquake scummvm dosbox mgba prosystem o2em 81 fuse-libretro gw-libretro beetle-sgx genesis-plus-gx mupen64plus lutro gpsp ppsspp 2048 beetle-vb beetle-wswan beetle-ngp pcsx_rearmed vecx snes9x-next dinothawr prboom beetle-pce handy picodrive nxengine nestopia gambatte stella fba libretro-ffmpeg"
+PKG_DEPENDS_TARGET="retroarch desmume glupen64 beetle-pcfx beetle-psx virtualjaguar 4do uzebox tyrquake scummvm dosbox mgba prosystem o2em 81 fuse-libretro gw-libretro beetle-sgx genesis-plus-gx mupen64plus lutro gpsp ppsspp 2048 beetle-vb beetle-wswan beetle-ngp pcsx_rearmed vecx snes9x2010 dinothawr prboom beetle-pce handy picodrive nxengine nestopia gambatte stella fbalpha bnes xu-fan-control"
 PKG_PRIORITY="optional"
 PKG_SECTION="virtual"
 PKG_SHORTDESC="Lakka metapackage for OdroidXU3"

packages/lakka/RPi/package.mk

@@ -25,7 +25,7 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/lakkatv/Lakka"
 PKG_URL=""
-PKG_DEPENDS_TARGET="retroarch tyrquake scummvm dosbox mgba prosystem o2em genesis-plus-gx 81 fuse-libretro gw-libretro lutro gpsp 2048 vecx dinothawr prboom beetle-wswan beetle-ngp beetle-pce beetle-sgx handy picodrive pocketsnes nxengine fceumm gambatte stella fba libretro-ffmpeg"
+PKG_DEPENDS_TARGET="retroarch glupen64 tyrquake scummvm dosbox mgba prosystem o2em genesis-plus-gx 81 fuse-libretro gw-libretro lutro gpsp 2048 vecx dinothawr prboom beetle-wswan beetle-ngp beetle-pce beetle-sgx handy picodrive snes9x2002 nxengine fceumm gambatte stella fbalpha wiringPi"
 PKG_PRIORITY="optional"
 PKG_SECTION="virtual"
 PKG_SHORTDESC="Lakka metapackage for RPi"

packages/lakka/RPi2/package.mk

@@ -25,7 +25,7 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/lakkatv/Lakka"
 PKG_URL=""
-PKG_DEPENDS_TARGET="retroarch uzebox tyrquake scummvm dosbox mgba prosystem o2em ppsspp 81 fuse-libretro gw-libretro beetle-wswan beetle-sgx beetle-ngp lutro snes9x-next genesis-plus-gx pcsx_rearmed mupen64plus gpsp 2048 vecx dinothawr prboom beetle-pce handy picodrive pocketsnes nxengine nestopia gambatte stella fba libretro-ffmpeg" 
+PKG_DEPENDS_TARGET="retroarch desmume uzebox tyrquake scummvm dosbox mgba prosystem o2em ppsspp 81 fuse-libretro gw-libretro beetle-wswan beetle-sgx beetle-ngp lutro snes9x2010 genesis-plus-gx pcsx_rearmed mupen64plus glupen64 gpsp 2048 vecx dinothawr prboom beetle-pce handy picodrive snes9x2002 nxengine nestopia gambatte stella fbalpha wiringPi"
 PKG_PRIORITY="optional"
 PKG_SECTION="virtual"
 PKG_SHORTDESC="Lakka metapackage for RPi 2"

packages/lakka/S802/package.mk

@@ -0,0 +1,36 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2012 Stephan Raue ([email protected])
+#
+#  This Program 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, or (at your option)
+#  any later version.
+#
+#  This Program 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 OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+PKG_NAME="S802"
+PKG_VERSION=""
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="https://github.com/lakkatv/Lakka"
+PKG_URL=""
+PKG_DEPENDS_TARGET="retroarch desmume glupen64 beetle-pcfx beetle-psx virtualjaguar 4do uzebox tyrquake scummvm dosbox mgba prosystem o2em 81 fuse-libretro gw-libretro beetle-sgx genesis-plus-gx mupen64plus lutro gpsp ppsspp 2048 beetle-vb beetle-wswan beetle-ngp pcsx_rearmed vecx snes9x2010 dinothawr prboom beetle-pce handy picodrive nxengine nestopia gambatte stella fbalpha bnes"
+PKG_PRIORITY="optional"
+PKG_SECTION="virtual"
+PKG_SHORTDESC="Lakka metapackage for S802"
+PKG_LONGDESC=""
+
+PKG_IS_ADDON="no"
+PKG_AUTORECONF="no"
+

packages/lakka/S805/package.mk

@@ -0,0 +1,36 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2012 Stephan Raue ([email protected])
+#
+#  This Program 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, or (at your option)
+#  any later version.
+#
+#  This Program 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 OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+PKG_NAME="S805"
+PKG_VERSION=""
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="https://github.com/lakkatv/Lakka"
+PKG_URL=""
+PKG_DEPENDS_TARGET="retroarch desmume tyrquake scummvm dosbox mgba prosystem o2em 81 fuse-libretro gw-libretro beetle-sgx genesis-plus-gx mupen64plus lutro gpsp ppsspp 2048 beetle-vb beetle-wswan beetle-ngp pcsx_rearmed vecx snes9x2010 dinothawr prboom beetle-pce handy picodrive nxengine nestopia gambatte stella fbalpha"
+PKG_PRIORITY="optional"
+PKG_SECTION="virtual"
+PKG_SHORTDESC="Lakka metapackage for S805"
+PKG_LONGDESC=""
+
+PKG_IS_ADDON="no"
+PKG_AUTORECONF="no"
+

packages/lakka/WandBoard/package.mk

@@ -25,7 +25,7 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/lakkatv/Lakka"
 PKG_URL=""
-PKG_DEPENDS_TARGET="retroarch tyrquake scummvm dosbox mgba prosystem o2em 81 fuse-libretro gw-libretro beetle-sgx genesis-plus-gx mupen64plus lutro gpsp ppsspp 2048 beetle-vb beetle-wswan beetle-ngp pcsx_rearmed vecx snes9x-next dinothawr prboom beetle-pce handy picodrive nxengine nestopia gambatte stella fba libretro-ffmpeg"
+PKG_DEPENDS_TARGET="retroarch tyrquake scummvm dosbox mgba prosystem o2em 81 fuse-libretro gw-libretro beetle-sgx genesis-plus-gx mupen64plus lutro gpsp ppsspp 2048 beetle-vb beetle-wswan beetle-ngp pcsx_rearmed vecx snes9x2010 dinothawr prboom beetle-pce handy picodrive nxengine nestopia gambatte stella fbalpha"
 PKG_PRIORITY="optional"
 PKG_SECTION="virtual"
 PKG_SHORTDESC="Lakka metapackage for Wandboard"

packages/lakka/WeTek_Core/package.mk

@@ -25,7 +25,7 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/lakkatv/Lakka"
 PKG_URL=""
-PKG_DEPENDS_TARGET="retroarch tyrquake scummvm dosbox mgba prosystem o2em 81 fuse-libretro gw-libretro beetle-sgx genesis-plus-gx mupen64plus lutro gpsp ppsspp 2048 beetle-vb beetle-wswan beetle-ngp pcsx_rearmed vecx snes9x-next dinothawr prboom beetle-pce handy picodrive nxengine nestopia gambatte stella fba libretro-ffmpeg"
+PKG_DEPENDS_TARGET="retroarch desmume tyrquake scummvm dosbox mgba prosystem o2em 81 fuse-libretro gw-libretro beetle-sgx genesis-plus-gx mupen64plus glupen64 lutro gpsp ppsspp 2048 beetle-vb beetle-wswan beetle-ngp pcsx_rearmed vecx snes9x2010 dinothawr prboom beetle-pce handy picodrive nxengine nestopia gambatte stella fbalpha"
 PKG_PRIORITY="optional"
 PKG_SECTION="virtual"
 PKG_SHORTDESC="Lakka metapackage for WeTek_Core"

packages/lakka/WeTek_Play/package.mk

@@ -25,7 +25,7 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/lakkatv/Lakka"
 PKG_URL=""
-PKG_DEPENDS_TARGET="retroarch tyrquake scummvm dosbox mgba prosystem o2em 81 fuse-libretro gw-libretro beetle-sgx genesis-plus-gx mupen64plus lutro gpsp ppsspp 2048 beetle-vb beetle-wswan beetle-ngp pcsx_rearmed vecx snes9x-next dinothawr prboom beetle-pce handy picodrive nxengine nestopia gambatte stella fba libretro-ffmpeg"
+PKG_DEPENDS_TARGET="retroarch desmume tyrquake scummvm dosbox mgba prosystem o2em 81 fuse-libretro gw-libretro beetle-sgx genesis-plus-gx mupen64plus glupen64 lutro gpsp ppsspp 2048 beetle-vb beetle-wswan beetle-ngp pcsx_rearmed vecx snes9x2010 dinothawr prboom beetle-pce handy picodrive nxengine nestopia gambatte stella fbalpha"
 PKG_PRIORITY="optional"
 PKG_SECTION="virtual"
 PKG_SHORTDESC="Lakka metapackage for WeTek_Play"

packages/lakka/a10/package.mk

@@ -25,7 +25,7 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/lakkatv/Lakka"
 PKG_URL=""
-PKG_DEPENDS_TARGET="retroarch tyrquake scummvm dosbox mgba prosystem o2em 81 fuse-libretro gw-libretro beetle-wswan beetle-ngp beetle-sgx genesis-plus-gx mupen64plus lutro gpsp 2048 pcsx_rearmed snes9x-next vecx dinothawr prboom beetle-pce handy picodrive pocketsnes nxengine nestopia gambatte stella fba libretro-ffmpeg"
+PKG_DEPENDS_TARGET="retroarch tyrquake scummvm dosbox mgba prosystem o2em 81 fuse-libretro gw-libretro beetle-wswan beetle-ngp beetle-sgx genesis-plus-gx mupen64plus glupen64 lutro gpsp 2048 pcsx_rearmed snes9x2010 vecx dinothawr prboom beetle-pce handy picodrive snes9x2002 nxengine nestopia gambatte stella fbalpha"
 PKG_PRIORITY="optional"
 PKG_SECTION="virtual"
 PKG_SHORTDESC="Lakka metapackage for Cubieboard"

packages/lakka/a20/package.mk

@@ -25,7 +25,7 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/lakkatv/Lakka"
 PKG_URL=""
-PKG_DEPENDS_TARGET="retroarch tyrquake scummvm dosbox mgba prosystem o2em 81 fuse-libretro gw-libretro beetle-wswan beetle-ngp beetle-sgx genesis-plus-gx mupen64plus lutro gpsp 2048 pcsx_rearmed snes9x-next vecx dinothawr prboom beetle-pce handy picodrive pocketsnes nxengine nestopia gambatte stella fba libretro-ffmpeg"
+PKG_DEPENDS_TARGET="retroarch tyrquake scummvm dosbox mgba prosystem o2em 81 fuse-libretro gw-libretro beetle-wswan beetle-ngp beetle-sgx genesis-plus-gx mupen64plus glupen64 lutro gpsp 2048 pcsx_rearmed snes9x2010 vecx dinothawr prboom beetle-pce handy picodrive snes9x2002 nxengine nestopia gambatte stella fbalpha"
 PKG_PRIORITY="optional"
 PKG_SECTION="virtual"
 PKG_SHORTDESC="Lakka metapackage for Cubieboard2 and Cubietruck"

packages/lakka/imx6/package.mk

@@ -25,7 +25,7 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/lakkatv/Lakka"
 PKG_URL=""
-PKG_DEPENDS_TARGET="retroarch tyrquake scummvm dosbox mgba prosystem o2em 81 fuse-libretro gw-libretro beetle-sgx genesis-plus-gx mupen64plus lutro gpsp ppsspp 2048 beetle-vb beetle-wswan beetle-ngp pcsx_rearmed vecx snes9x-next dinothawr prboom beetle-pce handy picodrive nxengine nestopia gambatte stella fba libretro-ffmpeg"
+PKG_DEPENDS_TARGET="retroarch desmume tyrquake scummvm dosbox mgba prosystem o2em 81 fuse-libretro gw-libretro beetle-sgx genesis-plus-gx mupen64plus glupen64 lutro gpsp ppsspp 2048 beetle-vb beetle-wswan beetle-ngp pcsx_rearmed vecx snes9x2010 dinothawr prboom beetle-pce handy picodrive nxengine nestopia gambatte stella fbalpha"
 PKG_PRIORITY="optional"
 PKG_SECTION="virtual"
 PKG_SHORTDESC="Lakka metapackage for Cuboxi and Hummingboard"

packages/libretro/beetle-pcfx/package.mk

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="beetle-pcfx"
-PKG_VERSION="f32250c"
+PKG_VERSION="25a083d"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv2"
@@ -34,6 +34,14 @@ PKG_LONGDESC="libretro implementation of Mednafen PC-FX."
 PKG_IS_ADDON="no"
 PKG_AUTORECONF="no"
 
+make_target() {
+  if [ "$ARCH" == "i386" -o "$ARCH" == "x86_64" ]; then
+    make platform=unix CC=$CC CXX=$CXX AR=$AR
+  else
+    make platform=armv CC=$CC CXX=$CXX AR=$AR
+  fi
+}
+
 makeinstall_target() {
   mkdir -p $INSTALL/usr/lib/libretro
   cp mednafen_pcfx_libretro.so $INSTALL/usr/lib/libretro/

packages/libretro/beetle-psx-hw/package.mk

@@ -0,0 +1,45 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2012 Stephan Raue ([email protected])
+#
+#  This Program 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, or (at your option)
+#  any later version.
+#
+#  This Program 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 OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+PKG_NAME="beetle-psx-hw"
+PKG_VERSION="73f52b3"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="GPLv2"
+PKG_SITE="https://github.com/libretro/mednafen-libretro"
+PKG_URL="$LAKKA_MIRROR/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_DEPENDS_TARGET="toolchain"
+PKG_PRIORITY="optional"
+PKG_SECTION="libretro"
+PKG_SHORTDESC="Standalone port of Mednafen PSX to libretro."
+PKG_LONGDESC="Standalone port of Mednafen PSX to libretro."
+
+PKG_IS_ADDON="no"
+PKG_AUTORECONF="no"
+
+# enables target mednafen_psx_hw_libretro.so
+make_target() {
+  make HAVE_OPENGL=1
+}
+
+makeinstall_target() {
+  mkdir -p $INSTALL/usr/lib/libretro
+  cp mednafen_psx_hw_libretro.so $INSTALL/usr/lib/libretro/
+}

packages/libretro/beetle-psx/package.mk

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="beetle-psx"
-PKG_VERSION="d9dd6c2"
+PKG_VERSION="73f52b3"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv2"

packages/libretro/beetle-saturn/package.mk

@@ -0,0 +1,40 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2012 Stephan Raue ([email protected])
+#
+#  This Program 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, or (at your option)
+#  any later version.
+#
+#  This Program 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 OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+PKG_NAME="beetle-saturn"
+PKG_VERSION="a2d77c3"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="GPLv2"
+PKG_SITE="https://github.com/libretro/mednafen-libretro"
+PKG_URL="$LAKKA_MIRROR/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_DEPENDS_TARGET="toolchain"
+PKG_PRIORITY="optional"
+PKG_SECTION="libretro"
+PKG_SHORTDESC="Standalone port of Mednafen Saturn to libretro."
+PKG_LONGDESC="Standalone port of Mednafen Saturn to libretro."
+
+PKG_IS_ADDON="no"
+PKG_AUTORECONF="no"
+
+makeinstall_target() {
+  mkdir -p $INSTALL/usr/lib/libretro
+  cp mednafen_saturn_libretro.so $INSTALL/usr/lib/libretro/
+}

packages/libretro/bnes/package.mk

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="bnes"
-PKG_VERSION="ba52a82"
+PKG_VERSION="5197b6c"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv3"
@@ -36,5 +36,5 @@ PKG_AUTORECONF="no"
 
 makeinstall_target() {
   mkdir -p $INSTALL/usr/lib/libretro
-  cp libretro.so $INSTALL/usr/lib/libretro/bnes_libretro.so
+  cp bnes_libretro.so $INSTALL/usr/lib/libretro/bnes_libretro.so
 }

packages/libretro/bnes/patches/bnes-01-fixbuild.patch

@@ -1,26 +0,0 @@
---- bnes/Makefile	2014-01-31 20:23:07.477407415 +0100
-+++ bnes.patch/Makefile	2014-02-05 23:21:11.293998643 +0100
-@@ -16,9 +16,9 @@
-    TARGET := libretro.so
- endif
- 
--ifneq ($(compiler),)
--   CXX = $(compiler)
--endif
-+#ifneq ($(compiler),)
-+#   CXX = $(compiler)
-+#endif
- 
- nes := nes
- 
-@@ -45,8 +45,8 @@
- obj/libnes.o: libretro/libretro.cpp $(call rwildcard,libretro/)
- obj/libco.o: libco/libco.c
- 
--c := $(CC) -std=gnu99
--cpp := $(CXX) -std=gnu++0x
-+c := $(CC) -std=gnu99 $(CFLAGS)
-+cpp := $(CXX) -std=gnu++0x $(CXXFLAGS)
- flags := -O3 -fomit-frame-pointer -fno-tree-vectorize -I. $(fpic)
- 
- compile = \

packages/libretro/bnes/patches/bnes-02-endianess.patch

@@ -1,11 +0,0 @@
---- bnes/nall/intrinsics.hpp	2014-01-31 20:23:07.481407503 +0100
-+++ bnes.patch/nall/intrinsics.hpp	2014-02-05 23:26:40.525326208 +0100
-@@ -43,7 +43,7 @@
- 
- /* Endian detection */
- 
--#if defined(__i386__) || defined(__amd64__) || defined(_M_IX86) || defined(_M_AMD64)
-+#if defined(__i386__) || defined(__amd64__) || defined(_M_IX86) || defined(_M_AMD64) || defined(__arm__)
-   #define ENDIAN_LSB
-   #define ARCH_LSB
-   Intrinsics::Endian Intrinsics::endian() { return Intrinsics::Endian::LSB; }

packages/libretro/core-info/package.mk

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="core-info"
-PKG_VERSION="20b3cde"
+PKG_VERSION="72eb673"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/libretro/dosbox/package.mk

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="dosbox"
-PKG_VERSION="2f5aa7e"
+PKG_VERSION="e8d91a2"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv2"

packages/libretro/fbalpha/package.mk

@@ -18,17 +18,17 @@
 #  http://www.gnu.org/copyleft/gpl.html
 ################################################################################
 
-PKG_NAME="fba"
-PKG_VERSION="5ac9b6a"
+PKG_NAME="fbalpha"
+PKG_VERSION="1a49ca7"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="Non-commercial"
-PKG_SITE="https://github.com/libretro/fba-libretro"
+PKG_SITE="https://github.com/libretro/fbalpha"
 PKG_URL="$LAKKA_MIRROR/$PKG_NAME-$PKG_VERSION.tar.xz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_PRIORITY="optional"
 PKG_SECTION="libretro"
-PKG_SHORTDESC="Port of Final Burn Alpha to Libretro."
+PKG_SHORTDESC="Port of Final Burn Alpha to Libretro (v0.2.97.38)."
 PKG_LONGDESC="Currently, FB Alpha supports games on Capcom CPS-1 and CPS-2 hardware, SNK Neo-Geo hardware, Toaplan hardware, Cave hardware, and various games on miscellaneous hardware. "
 
 PKG_IS_ADDON="no"
@@ -44,5 +44,5 @@ make_target() {
 
 makeinstall_target() {
   mkdir -p $INSTALL/usr/lib/libretro
-  cp fba_libretro.so $INSTALL/usr/lib/libretro/
+  cp fbalpha_libretro.so $INSTALL/usr/lib/libretro/
 }

packages/libretro/fsuae/package.mk

@@ -0,0 +1,56 @@
+################################################################################
+#      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 <http://www.gnu.org/licenses/>.
+################################################################################
+
+PKG_NAME="fsuae"
+PKG_VERSION="18c9817"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="GPLv2"
+PKG_SITE="https://github.com/libretro/libretro-fsuae"
+PKG_URL="$LAKKA_MIRROR/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_DEPENDS_TARGET="toolchain libmpeg2 openal-soft glib"
+PKG_SECTION="emulation"
+PKG_SHORTDESC="FS-UAE amiga emulator libretro core."
+
+PKG_IS_ADDON="no"
+PKG_AUTORECONF="yes"
+
+case $PROJECT in
+  RPi*)
+    PKG_CONFIGURE_OPTS_TARGET="--disable-jit --enable-neon"
+    ;;
+esac
+
+pre_configure_target() {
+  cd $ROOT/$BUILD/$PKG_NAME-$PKG_VERSION
+  rm -rf .$TARGET_NAME
+  export ac_cv_func_realloc_0_nonnull=yes
+  strip_lto
+}
+
+make_target() {
+  make CC=$HOST_CC CFLAGS= gen
+  make CC=$CC
+}
+
+makeinstall_target() {
+  mkdir -p $INSTALL/usr/lib/libretro
+  cp fsuae_libretro.so $INSTALL/usr/lib/libretro/
+  mkdir -p $INSTALL/usr/share/fs-uae
+  cp fs-uae.dat $INSTALL/usr/share/fs-uae/
+}

packages/libretro/fsuae/patches/fsuae-libretro-001-link-glib.patch

@@ -0,0 +1,11 @@
+--- a/Makefile.in	2016-09-16 14:46:15.352407556 +0000
++++ b/Makefile.in	2016-09-16 14:46:31.459074122 +0000
+@@ -33,7 +33,7 @@
+    CC = gcc
+    TARGET := $(TARGET_NAME)_libretro.so
+    fpic := -fPIC
+-   LDFLAGS := -lz -lpthread
++   LDFLAGS := -lz -lpthread -lglib-2.0
+    SHARED := -shared -Wl,--version-script=$(CORE_DIR)/libretro/link.T
+    ifeq ($(USE_JIT), 1)
+       ifeq ($(TARGET_ARCH), x86_64) # JIT => address space 32 bits

packages/libretro/gambatte/package.mk

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="gambatte"
-PKG_VERSION="def1fbd"
+PKG_VERSION="6d97651"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv2"
@@ -35,10 +35,10 @@ PKG_IS_ADDON="no"
 PKG_AUTORECONF="no"
 
 make_target() {
-  make -C libgambatte -f Makefile.libretro
+  make -f Makefile.libretro
 }
 
 makeinstall_target() {
   mkdir -p $INSTALL/usr/lib/libretro
-  cp libgambatte/gambatte_libretro.so $INSTALL/usr/lib/libretro/
+  cp gambatte_libretro.so $INSTALL/usr/lib/libretro/
 }

packages/libretro/glupen64/package.mk

@@ -0,0 +1,72 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2012 Stephan Raue ([email protected])
+#
+#  This Program 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, or (at your option)
+#  any later version.
+#
+#  This Program 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 OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+PKG_NAME="glupen64"
+PKG_VERSION="dd195c8"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="GPLv2"
+PKG_SITE="https://github.com/loganmc10/glupen64"
+PKG_URL="$LAKKA_MIRROR/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_DEPENDS_TARGET="toolchain"
+PKG_PRIORITY="optional"
+PKG_SECTION="libretro"
+PKG_SHORTDESC="mupen64plus + RSP-HLE + GLideN64 + libretro"
+PKG_LONGDESC="mupen64plus + RSP-HLE + GLideN64 + libretro"
+
+PKG_IS_ADDON="no"
+PKG_AUTORECONF="no"
+
+pre_configure_target() {
+  strip_gold
+  strip_lto
+}
+
+make_target() {
+  case $PROJECT in
+    RPi|Gamegirl)
+      CFLAGS="$CFLAGS -I$SYSROOT_PREFIX/usr/include/interface/vcos/pthreads \
+	              -I$SYSROOT_PREFIX/usr/include/interface/vmcs_host/linux"
+      make platform=rpi
+      ;;
+    RPi2)
+      CFLAGS="$CFLAGS -I$SYSROOT_PREFIX/usr/include/interface/vcos/pthreads \
+                      -I$SYSROOT_PREFIX/usr/include/interface/vmcs_host/linux"
+      make platform=rpi2
+      ;;
+    Generic)
+      make
+      ;;
+    OdroidC1)
+      make platform=odroid BOARD=ODROID-C1
+      ;;
+    OdroidXU3)
+      make platform=odroid BOARD=ODROID-XU3
+      ;;
+    *)
+      make platform=linux-gles GLES=1 FORCE_GLES=1 HAVE_NEON=1 WITH_DYNAREC=arm
+      ;;
+  esac
+}
+
+makeinstall_target() {
+  mkdir -p $INSTALL/usr/lib/libretro
+  cp glupen64_libretro.so $INSTALL/usr/lib/libretro/
+}

packages/libretro/libretro-database/package.mk

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="libretro-database"
-PKG_VERSION="9dbef82"
+PKG_VERSION="b13a522"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/libretro/lutro/package.mk

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="lutro"
-PKG_VERSION="927b49a"
+PKG_VERSION="687a19c"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="MIT"

packages/libretro/mame2000/package.mk

@@ -0,0 +1,48 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2012 Stephan Raue ([email protected])
+#
+#  This Program 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, or (at your option)
+#  any later version.
+#
+#  This Program 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 OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+PKG_NAME="mame2000"
+PKG_VERSION="6689199"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="MAME"
+PKG_SITE="https://github.com/libretro/mame2000-libretro.git"
+PKG_URL="$LAKKA_MIRROR/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_DEPENDS_TARGET="toolchain"
+PKG_PRIORITY="optional"
+PKG_SECTION="libretro"
+PKG_SHORTDESC="MAME - Multiple Arcade Machine Emulator"
+PKG_LONGDESC="MAME - Multiple Arcade Machine Emulator"
+
+PKG_IS_ADDON="no"
+PKG_AUTORECONF="no"
+
+make_target() {
+  if [ "$ARCH" == "arm" ]; then
+    make ARM=1 USE_CYCLONE=1 USE_DRZ80=1
+  else
+    make
+  fi
+}
+
+makeinstall_target() {
+  mkdir -p $INSTALL/usr/lib/libretro
+  cp mame2000_libretro.so $INSTALL/usr/lib/libretro/
+}

packages/libretro/mame2003/package.mk

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="mame2003"
-PKG_VERSION="ae84f5d"
+PKG_VERSION="ce6322f"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="MAME"

packages/libretro/mame2014/package.mk

@@ -0,0 +1,65 @@
+################################################################################
+#      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 <http://www.gnu.org/licenses/>.
+################################################################################
+
+PKG_NAME="mame2014"
+PKG_VERSION="7dc561f"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="GPLv2"
+PKG_SITE="https://github.com/libretro/mame2014-libretro"
+PKG_URL="$LAKKA_MIRROR/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_DEPENDS_TARGET="toolchain"
+PKG_SECTION="libretro"
+PKG_SHORTDESC="Late 2014 version of MAME (0.159-ish) for libretro and MAME 0.159 romsets"
+
+PKG_IS_ADDON="no"
+PKG_AUTORECONF="no"
+
+pre_make_target() {
+  export REALCC=$CC
+  export CC=$CXX
+  export LD=$CXX
+  strip_lto
+}
+make_target() {
+  case $PROJECT in
+    RPi)
+      make platform=armv6-hardfloat-arm1176jzf-s
+      ;;
+    RPi2)
+      make platform=armv7-neon-hardfloat-cortex-a7
+      ;;
+    imx6)
+      make platform=armv7-neon-hardfloat-cortex-a9
+      ;;
+    WeTek_Play)
+      make platform=armv7-neon-hardfloat-cortex-a9
+      ;;
+    Odroid_C2|WeTek_Hub|WeTek_Play_2)
+      make platform=aarch64
+      ;;
+    Generic)
+      make
+      ;;
+  esac
+}
+
+makeinstall_target() {
+  mkdir -p $INSTALL/usr/lib/libretro
+  cp mame2014_libretro.so $INSTALL/usr/lib/libretro/
+}

packages/libretro/mame2014/patches/mame2014-libretro-001-fix-cross-compile.patch

@@ -0,0 +1,49 @@
+diff -Naur a/Makefile b/Makefile
+--- a/Makefile	2016-01-14 22:44:37.000000000 +0100
++++ b/Makefile	2016-01-18 20:53:35.439383675 +0100
+@@ -130,27 +130,25 @@
+       LIBS += -lGL
+    endif
+    LDFLAGS +=  $(fpic) $(SHARED)
+-   REALCC   = gcc
+-   NATIVECC = g++
+-   NATIVECFLAGS = -std=gnu99
++   REALCC   ?= gcc
+    BASELIBS +=  -lpthread
+-   CC = g++
+-   AR = @ar
+-   LD = g++
++   CC ?= g++
++   AR ?= @ar
++   LD ?= g++
+    LIBS += -lstdc++ -lpthread -ldl
+-   ifeq ($(firstword $(filter x86_64,$(UNAME))),x86_64)
++   ifeq ($(firstword $(filter x86_64,$(ARCH))),x86_64)
+       PTR64 = 1
+    endif
+-   ifeq ($(firstword $(filter amd64,$(UNAME))),amd64)
++   ifeq ($(firstword $(filter amd64,$(ARCH))),amd64)
+       PTR64 = 1
+    endif
+-   ifeq ($(firstword $(filter ppc64,$(UNAME))),ppc64)
++   ifeq ($(firstword $(filter ppc64,$(ARCH))),ppc64)
+       PTR64 = 1
+    endif
+-   ifneq (,$(findstring ppc,$(UNAME)))
++   ifneq (,$(findstring ppc,$(ARCH)))
+       BIGENDIAN=1
+    endif
+-   ifneq (,$(findstring armv,$(UNAME) $(platform)))
++   ifneq (,$(findstring armv,$(ARCH) $(platform)))
+       CCOMFLAGS += -mstructure-size-boundary=32
+       PLATCFLAGS += -DSDLMAME_NO64BITIO -DSDLMAME_ARM -DRETRO_SETJMP_HACK -DARM
+       LDFLAGS += -Wl,--fix-cortex-a8 -Wl,--no-as-needed
+@@ -482,7 +478,7 @@
+ # utilities
+ MD = -mkdir$(EXE_EXT)
+ RM = @rm -f
+-OBJDUMP = @objdump
++OBJDUMP ?= @objdump
+ PYTHON ?= @python2
+ 
+ #-------------------------------------------------

packages/libretro/mame2014/patches/mame2014-libretro-002-aarch64-support.patch

@@ -0,0 +1,33 @@
+diff -Naur a/Makefile b/Makefile
+--- a/Makefile	2016-05-10 12:18:51.824846056 -0700
++++ b/Makefile	2016-05-10 13:12:56.463629991 -0700
+@@ -344,6 +344,29 @@
+ 	PLATCFLAGS += -DARM
+ 	LIBS += -lstdc++ -lpthread -ldl
+ 
++# aarch64
++else ifneq (,$(findstring aarch64,$(platform)))
++        armplatform := 1
++        TARGETLIB := $(TARGET_NAME)_libretro.so
++        TARGETOS=linux
++        fpic := -fPIC
++        SHARED := -shared -Wl,--version-script=src/osd/retro/link.T -Wl,--no-undefined
++        CCOMFLAGS += $(fpic)
++#        PLATCFLAGS += -march=armv7-a -DALIGN_INTS -DALIGN_SHORTS -DLSB_FIRST -fstrict-aliasing -fno-merge-constants -DSDLMAME_NO64BITIO -DSDLMAME_ARM -DRETRO_SETJMP_HACK
++        LDFLAGS += -Wl,--no-as-needed $(fpic) $(SHARED)
++        REALCC   ?= gcc
++        CC ?= g++
++        AR ?= @ar
++        LD ?= g++
++        CCOMFLAGS += $(PLATCFLAGS)
++        PTR64 = 1
++
++#        PLATCFLAGS += -DHAVE_GL
++        LIBS += -lGLESv2
++        GLES = 1
++
++        LIBS += -lstdc++ -lpthread -ldl
++
+ # Windows cross compiler
+ else ifeq ($(platform), wincross)
+ 	TARGETLIB := $(TARGET_NAME)_libretro.dll

packages/libretro/pcsx_rearmed/package.mk

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="pcsx_rearmed"
-PKG_VERSION="bb22137"
+PKG_VERSION="17b93a2"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv2"
@@ -42,8 +42,10 @@ make_target() {
   cd $ROOT/$PKG_BUILD
   if [[ "$TARGET_FPU" =~ "neon" ]]; then
     make -f Makefile.libretro HAVE_NEON=1 USE_DYNAREC=1 BUILTIN_GPU=neon
-  else
+  elif [ "$ARCH" == "arm" ]; then
     make -f Makefile.libretro USE_DYNAREC=1 BUILTIN_GPU=neon
+  else
+    make -f Makefile.libretro
   fi
 }
 

packages/libretro/ppsspp/package.mk

@@ -19,11 +19,11 @@
 ################################################################################
 
 PKG_NAME="ppsspp"
-PKG_VERSION="2ddea9a"
+PKG_VERSION="5f7bcf7"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv2"
-PKG_SITE="https://github.com/libretro/ppsspp-libretro"
+PKG_SITE="https://github.com/libretro/libretro-ppsspp"
 PKG_URL="$LAKKA_MIRROR/$PKG_NAME-$PKG_VERSION.tar.xz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_PRIORITY="optional"

packages/libretro/reicast/package.mk

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="reicast"
-PKG_VERSION="a4b2829"
+PKG_VERSION="ed47c72"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv2"

packages/libretro/reicast/patches/reicast-01-i386-buildfix.patch

@@ -0,0 +1,12 @@
+diff -Naur reicast.git/Makefile reicast.patch/Makefile
+--- reicast.git/Makefile	2016-12-04 17:31:51.066019302 +0100
++++ reicast.patch/Makefile	2016-12-04 17:49:55.907778479 +0100
+@@ -505,7 +505,7 @@
+ 
+ ifeq ($(WITH_DYNAREC), arm)
+ else
+-AS=${CC_PREFIX}gcc
++AS=${CC_PREFIX}${CC}
+ ASFLAGS += $(CFLAGS)
+ endif
+ 

packages/libretro/retroarch-assets/package.mk

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="retroarch-assets"
-PKG_VERSION="c8f7c0b"
+PKG_VERSION="cd2bbf0"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/libretro/retroarch-joypad-autoconfig/package.mk

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="retroarch-joypad-autoconfig"
-PKG_VERSION="ec890e8"
+PKG_VERSION="b28afb2"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/libretro/retroarch-overlays/package.mk

@@ -0,0 +1,44 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2012 Stephan Raue ([email protected])
+#
+#  This Program 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, or (at your option)
+#  any later version.
+#
+#  This Program 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 OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+PKG_NAME="retroarch-overlays"
+PKG_VERSION="5954c95"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="https://github.com/libretro/common-overlays"
+PKG_URL="$LAKKA_MIRROR/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_DEPENDS_TARGET="toolchain"
+PKG_PRIORITY="optional"
+PKG_SECTION="libretro"
+PKG_SHORTDESC="RetroArch overlays"
+PKG_LONGDESC="Collection of overlay files for use with libretro frontends, such as RetroArch."
+
+PKG_IS_ADDON="no"
+PKG_AUTORECONF="no"
+
+make_target() {
+  :
+}
+
+makeinstall_target() {
+  mkdir -p $INSTALL/usr/share/retroarch-overlays
+  cp -r * $INSTALL/usr/share/retroarch-overlays
+}

packages/libretro/retroarch/package.mk

@@ -19,13 +19,13 @@
 ################################################################################
 
 PKG_NAME="retroarch"
-PKG_VERSION="397f82c"
-PKG_REV="5"
+PKG_VERSION="b3aef50"
+PKG_REV="3"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv3"
 PKG_SITE="https://github.com/libretro/RetroArch"
 PKG_URL="$LAKKA_MIRROR/$PKG_NAME-$PKG_VERSION.tar.xz"
-PKG_DEPENDS_TARGET="toolchain alsa-lib freetype zlib retroarch-assets core-info retroarch-joypad-autoconfig common-shaders lakka-update libretro-database ffmpeg connman-ncurses"
+PKG_DEPENDS_TARGET="toolchain alsa-lib freetype zlib retroarch-assets retroarch-overlays core-info retroarch-joypad-autoconfig common-shaders lakka-update libretro-database ffmpeg joyutils libass libvdpau"
 PKG_PRIORITY="optional"
 PKG_SECTION="libretro"
 PKG_SHORTDESC="Reference frontend for the libretro API."
@@ -51,13 +51,13 @@ fi
 if [ "$OPENGLES" == "no" ]; then
   RETROARCH_GL="--enable-kms"
 elif [ "$OPENGLES" == "bcm2835-driver" ]; then
-  RETROARCH_GL="--enable-gles --disable-kms --disable-x11"
+  RETROARCH_GL="--enable-opengles --disable-kms --disable-x11"
   CFLAGS="$CFLAGS -I$SYSROOT_PREFIX/usr/include/interface/vcos/pthreads \
                   -I$SYSROOT_PREFIX/usr/include/interface/vmcs_host/linux"
 elif [ "$OPENGLES" == "sunxi-mali" ] || [ "$OPENGLES" == "odroidc1-mali" ] || [ "$OPENGLES" == "odroidxu3-mali" ] || [ "$OPENGLES" == "opengl-meson6" ] || [ "$OPENGLES" == "opengl-meson8" ]; then
-  RETROARCH_GL="--enable-gles --disable-kms --disable-x11 --enable-mali_fbdev"
+  RETROARCH_GL="--enable-opengles --disable-kms --disable-x11 --enable-mali_fbdev"
 elif [ "$OPENGLES" == "gpu-viv-bin-mx6q" ]; then
-  RETROARCH_GL="--enable-gles --disable-kms --disable-x11 --enable-vivante_fbdev"
+  RETROARCH_GL="--enable-opengles --disable-kms --disable-x11 --enable-vivante_fbdev"
   CFLAGS="$CFLAGS -DLINUX -DEGL_API_FB"
 fi
 
@@ -80,13 +80,7 @@ pre_configure_target() {
 }
 
 make_target() {
-  LAKKA_PROJECT="$PROJECT"
-  if [ "$PROJECT" == "imx6" -a -n "$SYSTEM" ]; then
-    LAKKA_PROJECT="$LAKKA_PROJECT.$SYSTEM"
-  fi
-  LAKKA_PROJECT="$LAKKA_PROJECT.$ARCH"
-  echo $LAKKA_PROJECT
-  make V=1 HAVE_LAKKA=1 HAVE_ZARCH=0 LAKKA_PROJECT=\'\"$LAKKA_PROJECT\"\'
+  make V=1 HAVE_LAKKA=1 HAVE_ZARCH=0
   make -C gfx/video_filters compiler=$CC extra_flags="$CFLAGS"
   make -C audio/audio_filters compiler=$CC extra_flags="$CFLAGS"
 }
@@ -116,11 +110,14 @@ makeinstall_target() {
   sed -i -e "s/# video_shader_dir =/video_shader_dir =\/usr\/share\/common-shaders/" $INSTALL/etc/retroarch.cfg
   sed -i -e "s/# rgui_show_start_screen = true/rgui_show_start_screen = false/" $INSTALL/etc/retroarch.cfg
   sed -i -e "s/# assets_directory =/assets_directory =\/tmp\/assets/" $INSTALL/etc/retroarch.cfg
+  sed -i -e "s/# overlays_directory =/overlays_directory =\/usr\/share\/retroarch-overlays/" $INSTALL/etc/retroarch.cfg
   sed -i -e "s/# cheat_database_path =/cheat_database_path =\/tmp\/database\/cht/" $INSTALL/etc/retroarch.cfg
   sed -i -e "s/# menu_driver = \"rgui\"/menu_driver = \"xmb\"/" $INSTALL/etc/retroarch.cfg
   echo "core_assets_directory =/storage/roms/downloads" >> $INSTALL/etc/retroarch.cfg
   
   # Video
+  sed -i -e "s/# video_fullscreen = false/video_fullscreen = true/" $INSTALL/etc/retroarch.cfg
+  sed -i -e "s/# video_windowed_fullscreen = true/video_windowed_fullscreen = false/" $INSTALL/etc/retroarch.cfg
   sed -i -e "s/# video_smooth = true/video_smooth = false/" $INSTALL/etc/retroarch.cfg
   sed -i -e "s/# video_aspect_ratio_auto = false/video_aspect_ratio_auto = true/" $INSTALL/etc/retroarch.cfg
   sed -i -e "s/# video_threaded = false/video_threaded = true/" $INSTALL/etc/retroarch.cfg
@@ -135,6 +132,9 @@ makeinstall_target() {
   if [ "$PROJECT" == "OdroidXU3" ]; then # workaround the 55fps bug
     sed -i -e "s/# audio_out_rate = 48000/audio_out_rate = 44100/" $INSTALL/etc/retroarch.cfg
   fi
+
+  # Saving
+  echo "savestate_thumbnail_enable = \"false\"" >> $INSTALL/etc/retroarch.cfg
   
   # Input
   sed -i -e "s/# input_driver = sdl/input_driver = udev/" $INSTALL/etc/retroarch.cfg
@@ -143,10 +143,16 @@ makeinstall_target() {
   sed -i -e "s/# joypad_autoconfig_dir =/joypad_autoconfig_dir = \/tmp\/joypads/" $INSTALL/etc/retroarch.cfg
   sed -i -e "s/# input_remapping_directory =/input_remapping_directory = \/storage\/remappings/" $INSTALL/etc/retroarch.cfg
   sed -i -e "s/# input_menu_toggle_gamepad_combo = 0/input_menu_toggle_gamepad_combo = 2/" $INSTALL/etc/retroarch.cfg
+  sed -i -e "s/# all_users_control_menu = false/all_users_control_menu = true/" $INSTALL/etc/retroarch.cfg
 
   # Menu
   sed -i -e "s/# menu_core_enable = true/menu_core_enable = false/" $INSTALL/etc/retroarch.cfg
   sed -i -e "s/# thumbnails_directory =/thumbnails_directory = \/storage\/thumbnails/" $INSTALL/etc/retroarch.cfg
+  echo "menu_show_advanced_settings = \"false\"" >> $INSTALL/etc/retroarch.cfg
+  echo "menu_wallpaper_opacity = \"1.0\"" >> $INSTALL/etc/retroarch.cfg
+  echo "xmb_show_images = \"false\"" >> $INSTALL/etc/retroarch.cfg
+  echo "xmb_show_music = \"false\"" >> $INSTALL/etc/retroarch.cfg
+  echo "xmb_show_video = \"false\"" >> $INSTALL/etc/retroarch.cfg
 
   # Updater
   if [ "$ARCH" == "arm" ]; then
@@ -156,6 +162,20 @@ makeinstall_target() {
   # Playlists
   echo "playlist_names = \"$RA_PLAYLIST_NAMES\"" >> $INSTALL/etc/retroarch.cfg
   echo "playlist_cores = \"$RA_PLAYLIST_CORES\"" >> $INSTALL/etc/retroarch.cfg
+
+  # Gamegirl
+  if [ "$PROJECT" == "Gamegirl" ]; then
+    echo "xmb_theme = 3" >> $INSTALL/etc/retroarch.cfg
+    echo "xmb_menu_color_theme = 9" >> $INSTALL/etc/retroarch.cfg
+    echo "video_font_size = 10" >> $INSTALL/etc/retroarch.cfg
+    echo "aspect_ratio_index = 0" >> $INSTALL/etc/retroarch.cfg
+    echo "audio_device = \"sysdefault:CARD=ALSA\"" >> $INSTALL/etc/retroarch.cfg
+    echo "menu_timedate_enable = false" >> $INSTALL/etc/retroarch.cfg
+    echo "xmb_shadows_enable = true" >> $INSTALL/etc/retroarch.cfg
+    sed -i -e "s/input_menu_toggle_gamepad_combo = 2/input_menu_toggle_gamepad_combo = 4/" $INSTALL/etc/retroarch.cfg
+    sed -i -e "s/video_smooth = false/video_smooth = true/" $INSTALL/etc/retroarch.cfg
+    sed -i -e "s/video_font_path =\/usr\/share\/retroarch-assets\/xmb\/monochrome\/font.ttf//" $INSTALL/etc/retroarch.cfg
+  fi
 }
 
 post_install() {  

packages/libretro/retroarch/patches/retroarch-02-fixes.patch

@@ -1,50 +0,0 @@
-diff -Naur retroarch/libretro-common/queues/task_queue.c retroarch.patch/libretro-common/queues/task_queue.c
---- retroarch/libretro-common/queues/task_queue.c	2016-07-31 00:07:35.497118479 +0200
-+++ retroarch.patch/libretro-common/queues/task_queue.c	2016-08-02 22:18:01.040639520 +0200
-@@ -82,7 +82,7 @@
-       {
-          if (task->error)
-             task_queue_msg_push(1, 60, true, "%s: %s",
--               "Task failed\n", task->title);
-+               "Task failed", task->title);
-          else
-             task_queue_msg_push(1, 60, true, "100%%: %s", task->title);
-       }
-diff -Naur retroarch/menu/menu_displaylist.c retroarch.patch/menu/menu_displaylist.c
---- retroarch/menu/menu_displaylist.c	2016-07-31 00:07:32.108998293 +0200
-+++ retroarch.patch/menu/menu_displaylist.c	2016-07-31 00:59:53.660611939 +0200
-@@ -2688,6 +2688,7 @@
-             MENU_ENUM_LABEL_LOAD_STATE,
-             MENU_SETTING_ACTION_LOADSTATE, 0, 0);
- 
-+#ifndef HAVE_LAKKA
-       menu_entries_append_enum(info->list,
-             msg_hash_to_str(MENU_ENUM_LABEL_VALUE_UNDO_LOAD_STATE),
-             msg_hash_to_str(MENU_ENUM_LABEL_UNDO_LOAD_STATE),
-@@ -2699,6 +2700,7 @@
-             msg_hash_to_str(MENU_ENUM_LABEL_UNDO_SAVE_STATE),
-             MENU_ENUM_LABEL_UNDO_SAVE_STATE,
-             MENU_SETTING_ACTION_LOADSTATE, 0, 0);
-+#endif
- 
-       menu_entries_append_enum(info->list,
-             msg_hash_to_str(MENU_ENUM_LABEL_VALUE_CORE_OPTIONS),
-diff -Naur retroarch/menu/menu_setting.c retroarch.patch/menu/menu_setting.c
---- retroarch/menu/menu_setting.c	2016-07-31 00:07:32.072997016 +0200
-+++ retroarch.patch/menu/menu_setting.c	2016-08-09 14:16:29.955922130 +0200
-@@ -4288,6 +4288,7 @@
-                parent_group);
-          menu_settings_list_current_add_enum_idx(list, list_info, MENU_ENUM_LABEL_MENU_SETTINGS);
- 
-+#ifndef HAVE_LAKKA
-          CONFIG_ACTION(
-                list, list_info,
-                msg_hash_to_str(MENU_ENUM_LABEL_USER_INTERFACE_SETTINGS),
-@@ -4296,6 +4297,7 @@
-                &subgroup_info,
-                parent_group);
-          menu_settings_list_current_add_enum_idx(list, list_info, MENU_ENUM_LABEL_USER_INTERFACE_SETTINGS);
-+#endif
- 
-          CONFIG_ACTION(
-                list, list_info,

packages/libretro/retroarch/patches/retroarch-03-services.patch

@@ -1,209 +0,0 @@
-diff --git a/intl/msg_hash_us.c b/intl/msg_hash_us.c
-index fc4bdea..117d064 100644
---- a/intl/msg_hash_us.c
-+++ b/intl/msg_hash_us.c
-@@ -1350,6 +1350,8 @@ static const char *menu_hash_to_str_us_label_enum(enum msg_hash_enums msg)
-          return "deferred_updater_settings_list";
-       case MENU_ENUM_LABEL_DEFERRED_NETWORK_SETTINGS_LIST:
-          return "deferred_network_settings_list";
-+      case MENU_ENUM_LABEL_DEFERRED_LAKKA_SERVICES_LIST:
-+         return "deferred_lakka_services_list";
-       case MENU_ENUM_LABEL_DEFERRED_USER_SETTINGS_LIST:
-          return "deferred_user_settings_list";
-       case MENU_ENUM_LABEL_DEFERRED_DIRECTORY_SETTINGS_LIST:
-diff --git a/menu/cbs/menu_cbs_deferred_push.c b/menu/cbs/menu_cbs_deferred_push.c
-index 5eb7384..7abae3e 100644
---- a/menu/cbs/menu_cbs_deferred_push.c
-+++ b/menu/cbs/menu_cbs_deferred_push.c
-@@ -174,6 +174,11 @@ static int deferred_push_network_settings_list(menu_displaylist_info_t *info)
-    return deferred_push_dlist(info, DISPLAYLIST_NETWORK_SETTINGS_LIST);
- }
- 
-+static int deferred_push_lakka_services_list(menu_displaylist_info_t *info)
-+{
-+   return deferred_push_dlist(info, DISPLAYLIST_LAKKA_SERVICES_LIST);
-+}
-+
- static int deferred_push_user_settings_list(menu_displaylist_info_t *info)
- {
-    return deferred_push_dlist(info, DISPLAYLIST_USER_SETTINGS_LIST);
-@@ -746,6 +751,12 @@ static int menu_cbs_init_bind_deferred_push_compare_label(
-       return 0;
-    }
- 
-+   if (string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_DEFERRED_LAKKA_SERVICES_LIST)))
-+   {
-+      BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_lakka_services_list);
-+      return 0;
-+   }
-+
-    if (string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_DEFERRED_USER_SETTINGS_LIST)))
-    {
-       BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_user_settings_list);
-diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c
-index 04ca710..85d27a1 100644
---- a/menu/cbs/menu_cbs_ok.c
-+++ b/menu/cbs/menu_cbs_ok.c
-@@ -696,6 +696,14 @@ int generic_action_ok_displaylist_push(const char *path,
-          info.enum_idx      = MENU_ENUM_LABEL_DEFERRED_NETWORK_SETTINGS_LIST;
-          dl_type                 = DISPLAYLIST_GENERIC;
-          break;
-+      case ACTION_OK_DL_LAKKA_SERVICES_LIST:
-+         info.directory_ptr = idx;
-+         info.type          = type;
-+         info_path          = path;
-+         info_label         = msg_hash_to_str(MENU_ENUM_LABEL_DEFERRED_LAKKA_SERVICES_LIST);
-+         info.enum_idx      = MENU_ENUM_LABEL_DEFERRED_LAKKA_SERVICES_LIST;
-+         dl_type                 = DISPLAYLIST_GENERIC;
-+         break;
-       case ACTION_OK_DL_USER_SETTINGS_LIST:
-          info.directory_ptr = idx;
-          info.type          = type;
-@@ -2660,6 +2668,13 @@ static int action_ok_network_list(const char *path,
-          entry_idx, ACTION_OK_DL_NETWORK_SETTINGS_LIST);
- }
- 
-+static int action_ok_lakka_services(const char *path,
-+      const char *label, unsigned type, size_t idx, size_t entry_idx)
-+{
-+   return generic_action_ok_displaylist_push(path, NULL, label, type, idx,
-+         entry_idx, ACTION_OK_DL_LAKKA_SERVICES_LIST);
-+}
-+
- static int action_ok_user_list(const char *path,
-       const char *label, unsigned type, size_t idx, size_t entry_idx)
- {
-@@ -3390,6 +3405,9 @@ static int menu_cbs_init_bind_ok_compare_label(menu_file_list_cbs_t *cbs,
-          case MENU_ENUM_LABEL_NETWORK_SETTINGS:
-             BIND_ACTION_OK(cbs, action_ok_network_list);
-             break;
-+         case MENU_ENUM_LABEL_LAKKA_SERVICES:
-+            BIND_ACTION_OK(cbs, action_ok_lakka_services);
-+            break;
-          case MENU_ENUM_LABEL_USER_SETTINGS:
-             BIND_ACTION_OK(cbs, action_ok_user_list);
-             break;
-diff --git a/menu/cbs/menu_cbs_title.c b/menu/cbs/menu_cbs_title.c
-index 5458f75..824976f 100644
---- a/menu/cbs/menu_cbs_title.c
-+++ b/menu/cbs/menu_cbs_title.c
-@@ -284,6 +284,13 @@ static int action_get_network_settings_list(const char *path, const char *label,
-    return 0;
- }
- 
-+static int action_get_lakka_services_list(const char *path, const char *label, 
-+      unsigned menu_type, char *s, size_t len)
-+{
-+   sanitize_to_string(s, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_LAKKA_SERVICES), len);
-+   return 0;
-+}
-+
- static int action_get_user_settings_list(const char *path, const char *label, 
-       unsigned menu_type, char *s, size_t len)
- {
-@@ -951,6 +958,12 @@ static int menu_cbs_init_bind_title_compare_label(menu_file_list_cbs_t *cbs,
-       return 0;
-    }
- 
-+   if (string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_DEFERRED_LAKKA_SERVICES_LIST)))
-+   {
-+      BIND_ACTION_GET_TITLE(cbs, action_get_lakka_services_list);
-+      return 0;
-+   }
-+
-    if (string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_DEFERRED_USER_SETTINGS_LIST)))
-    {
-       BIND_ACTION_GET_TITLE(cbs, action_get_user_settings_list);
-diff --git a/menu/menu_cbs.h b/menu/menu_cbs.h
-index 5926acc..0a5bf8f 100644
---- a/menu/menu_cbs.h
-+++ b/menu/menu_cbs.h
-@@ -85,6 +85,7 @@ enum
-    ACTION_OK_DL_RETRO_ACHIEVEMENTS_SETTINGS_LIST,
-    ACTION_OK_DL_UPDATER_SETTINGS_LIST,
-    ACTION_OK_DL_NETWORK_SETTINGS_LIST,
-+   ACTION_OK_DL_LAKKA_SERVICES_LIST,
-    ACTION_OK_DL_USER_SETTINGS_LIST,
-    ACTION_OK_DL_DIRECTORY_SETTINGS_LIST,
-    ACTION_OK_DL_PRIVACY_SETTINGS_LIST,
-diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c
-index a3acfe8..380b3b8 100644
---- a/menu/menu_displaylist.c
-+++ b/menu/menu_displaylist.c
-@@ -3951,6 +3951,7 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data)
-       case DISPLAYLIST_RETRO_ACHIEVEMENTS_SETTINGS_LIST:
-       case DISPLAYLIST_UPDATER_SETTINGS_LIST:
-       case DISPLAYLIST_NETWORK_SETTINGS_LIST:
-+      case DISPLAYLIST_LAKKA_SERVICES_LIST:
-       case DISPLAYLIST_USER_SETTINGS_LIST:
-       case DISPLAYLIST_DIRECTORY_SETTINGS_LIST:
-       case DISPLAYLIST_PRIVACY_SETTINGS_LIST:
-@@ -4607,6 +4608,22 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data)
-          info->need_refresh = true;
-          info->need_push    = true;
-          break;
-+      case DISPLAYLIST_LAKKA_SERVICES_LIST:
-+         menu_displaylist_parse_settings_enum(menu, info,
-+               MENU_ENUM_LABEL_SSH_ENABLE,
-+               PARSE_ONLY_BOOL, false);
-+
-+         menu_displaylist_parse_settings_enum(menu, info,
-+               MENU_ENUM_LABEL_SAMBA_ENABLE,
-+               PARSE_ONLY_BOOL, false);
-+
-+         menu_displaylist_parse_settings_enum(menu, info,
-+               MENU_ENUM_LABEL_BLUETOOTH_ENABLE,
-+               PARSE_ONLY_BOOL, false);
-+
-+         info->need_refresh = true;
-+         info->need_push    = true;
-+         break;
-       case DISPLAYLIST_USER_SETTINGS_LIST:
-          menu_displaylist_parse_settings_enum(menu, info,
-                MENU_ENUM_LABEL_ACCOUNTS_LIST,
-diff --git a/menu/menu_displaylist.h b/menu/menu_displaylist.h
-index ff5737f..51df36a 100644
---- a/menu/menu_displaylist.h
-+++ b/menu/menu_displaylist.h
-@@ -124,6 +124,7 @@ enum menu_displaylist_ctl_state
-    DISPLAYLIST_RETRO_ACHIEVEMENTS_SETTINGS_LIST,
-    DISPLAYLIST_UPDATER_SETTINGS_LIST,
-    DISPLAYLIST_NETWORK_SETTINGS_LIST,
-+   DISPLAYLIST_LAKKA_SERVICES_LIST,
-    DISPLAYLIST_USER_SETTINGS_LIST,
-    DISPLAYLIST_DIRECTORY_SETTINGS_LIST,
-    DISPLAYLIST_PRIVACY_SETTINGS_LIST,
-diff --git a/menu/menu_setting.c b/menu/menu_setting.c
-index dacc66a..0c98055 100644
---- a/menu/menu_setting.c
-+++ b/menu/menu_setting.c
-@@ -4333,6 +4333,17 @@ static bool setting_append_list(
-                parent_group);
-          menu_settings_list_current_add_enum_idx(list, list_info, MENU_ENUM_LABEL_NETWORK_SETTINGS);
- 
-+#ifdef HAVE_SYSTEMD
-+         CONFIG_ACTION(
-+               list, list_info,
-+               msg_hash_to_str(MENU_ENUM_LABEL_LAKKA_SERVICES),
-+               msg_hash_to_str(MENU_ENUM_LABEL_VALUE_LAKKA_SERVICES),
-+               &group_info,
-+               &subgroup_info,
-+               parent_group);
-+         menu_settings_list_current_add_enum_idx(list, list_info, MENU_ENUM_LABEL_LAKKA_SERVICES);
-+#endif
-+
-          CONFIG_ACTION(
-                list, list_info,
-                msg_hash_to_str(MENU_ENUM_LABEL_PLAYLIST_SETTINGS),
-diff --git a/msg_hash.h b/msg_hash.h
-index 218fe86..431bc8c 100644
---- a/msg_hash.h
-+++ b/msg_hash.h
-@@ -780,6 +780,7 @@ enum msg_hash_enums
-    MENU_ENUM_LABEL_DEFERRED_RETRO_ACHIEVEMENTS_SETTINGS_LIST,
-    MENU_ENUM_LABEL_DEFERRED_UPDATER_SETTINGS_LIST,
-    MENU_ENUM_LABEL_DEFERRED_NETWORK_SETTINGS_LIST,
-+   MENU_ENUM_LABEL_DEFERRED_LAKKA_SERVICES_LIST,
-    MENU_ENUM_LABEL_DEFERRED_USER_SETTINGS_LIST,
-    MENU_ENUM_LABEL_DEFERRED_DIRECTORY_SETTINGS_LIST,
-    MENU_ENUM_LABEL_DEFERRED_PRIVACY_SETTINGS_LIST,

packages/libretro/retroarch/patches/retroarch-05-simple-mode.patch

@@ -0,0 +1,502 @@
+diff --git a/menu/menu_setting.c b/menu/menu_setting.c
+index 2a39907..6760276 100644
+--- a/menu/menu_setting.c
++++ b/menu/menu_setting.c
+@@ -2215,6 +2215,7 @@ static bool setting_append_list(
+                (*list)[list_info->index - 1].values       = ext_name;
+                menu_settings_list_current_add_cmd(list, list_info, CMD_EVENT_LOAD_CORE);
+                settings_data_list_current_add_flags(list, list_info, SD_FLAG_BROWSER_ACTION);
++               settings_data_list_current_add_flags(list, list_info, SD_FLAG_ADVANCED);
+             }
+          }
+ 
+@@ -2256,6 +2257,7 @@ static bool setting_append_list(
+                &group_info,
+                &subgroup_info,
+                parent_group);
++         settings_data_list_current_add_flags(list, list_info, SD_FLAG_ADVANCED);
+ 
+          CONFIG_ACTION(
+                list, list_info,
+@@ -2273,6 +2275,7 @@ static bool setting_append_list(
+                &group_info,
+                &subgroup_info,
+                parent_group);
++         settings_data_list_current_add_flags(list, list_info, SD_FLAG_ADVANCED);
+ 
+          CONFIG_ACTION(
+                list, list_info,
+@@ -2300,6 +2303,7 @@ static bool setting_append_list(
+                &group_info,
+                &subgroup_info,
+                parent_group);
++         settings_data_list_current_add_flags(list, list_info, SD_FLAG_ADVANCED);
+ 
+          CONFIG_ACTION(
+                list, list_info,
+@@ -2352,6 +2356,7 @@ static bool setting_append_list(
+                &group_info,
+                &subgroup_info,
+                parent_group);
++         settings_data_list_current_add_flags(list, list_info, SD_FLAG_ADVANCED);
+ 
+ #if !defined(IOS)
+          /* Apple rejects iOS apps that lets you forcibly quit an application. */
+@@ -2392,6 +2397,7 @@ static bool setting_append_list(
+                &group_info,
+                &subgroup_info,
+                parent_group);
++         settings_data_list_current_add_flags(list, list_info, SD_FLAG_ADVANCED);
+ 
+          CONFIG_ACTION(
+                list, list_info,
+@@ -2433,6 +2439,7 @@ static bool setting_append_list(
+                &group_info,
+                &subgroup_info,
+                parent_group);
++         settings_data_list_current_add_flags(list, list_info, SD_FLAG_ADVANCED);
+ 
+          CONFIG_ACTION(
+                list, list_info,
+@@ -2441,6 +2448,7 @@ static bool setting_append_list(
+                &group_info,
+                &subgroup_info,
+                parent_group);
++         settings_data_list_current_add_flags(list, list_info, SD_FLAG_ADVANCED);
+ 
+          CONFIG_ACTION(
+                list, list_info,
+@@ -2458,6 +2466,7 @@ static bool setting_append_list(
+                &group_info,
+                &subgroup_info,
+                parent_group);
++         settings_data_list_current_add_flags(list, list_info, SD_FLAG_ADVANCED);
+ 
+          CONFIG_ACTION(
+                list, list_info,
+@@ -2466,6 +2475,7 @@ static bool setting_append_list(
+                &group_info,
+                &subgroup_info,
+                parent_group);
++         settings_data_list_current_add_flags(list, list_info, SD_FLAG_ADVANCED);
+ 
+          CONFIG_ACTION(
+                list, list_info,
+@@ -2474,6 +2484,7 @@ static bool setting_append_list(
+                &group_info,
+                &subgroup_info,
+                parent_group);
++         settings_data_list_current_add_flags(list, list_info, SD_FLAG_ADVANCED);
+ 
+          CONFIG_ACTION(
+                list, list_info,
+@@ -2482,6 +2493,7 @@ static bool setting_append_list(
+                &group_info,
+                &subgroup_info,
+                parent_group);
++         settings_data_list_current_add_flags(list, list_info, SD_FLAG_ADVANCED);
+ 
+          CONFIG_ACTION(
+                list, list_info,
+@@ -2490,6 +2502,7 @@ static bool setting_append_list(
+                &group_info,
+                &subgroup_info,
+                parent_group);
++         settings_data_list_current_add_flags(list, list_info, SD_FLAG_ADVANCED);
+ 
+          CONFIG_ACTION(
+                list, list_info,
+@@ -2498,6 +2511,7 @@ static bool setting_append_list(
+                &group_info,
+                &subgroup_info,
+                parent_group);
++         settings_data_list_current_add_flags(list, list_info, SD_FLAG_ADVANCED);
+ 
+          CONFIG_ACTION(
+                list, list_info,
+@@ -2515,6 +2529,7 @@ static bool setting_append_list(
+                &group_info,
+                &subgroup_info,
+                parent_group);
++         settings_data_list_current_add_flags(list, list_info, SD_FLAG_ADVANCED);
+ #endif
+ 
+          CONFIG_ACTION(
+@@ -2524,6 +2539,7 @@ static bool setting_append_list(
+                &group_info,
+                &subgroup_info,
+                parent_group);
++         settings_data_list_current_add_flags(list, list_info, SD_FLAG_ADVANCED);
+ 
+          CONFIG_ACTION(
+                list, list_info,
+@@ -2532,6 +2548,7 @@ static bool setting_append_list(
+                &group_info,
+                &subgroup_info,
+                parent_group);
++         settings_data_list_current_add_flags(list, list_info, SD_FLAG_ADVANCED);
+ 
+          CONFIG_ACTION(
+                list, list_info,
+@@ -2540,6 +2557,7 @@ static bool setting_append_list(
+                &group_info,
+                &subgroup_info,
+                parent_group);
++         settings_data_list_current_add_flags(list, list_info, SD_FLAG_ADVANCED);
+ 
+          if (!string_is_equal(settings->wifi.driver, "null"))
+          {
+@@ -2559,6 +2577,7 @@ static bool setting_append_list(
+                &group_info,
+                &subgroup_info,
+                parent_group);
++         settings_data_list_current_add_flags(list, list_info, SD_FLAG_ADVANCED);
+ 
+ #ifdef HAVE_LAKKA
+          CONFIG_ACTION(
+@@ -2577,6 +2596,7 @@ static bool setting_append_list(
+                &group_info,
+                &subgroup_info,
+                parent_group);
++         settings_data_list_current_add_flags(list, list_info, SD_FLAG_ADVANCED);
+ 
+          CONFIG_ACTION(
+                list, list_info,
+@@ -2593,6 +2613,7 @@ static bool setting_append_list(
+                &group_info,
+                &subgroup_info,
+                parent_group);
++         settings_data_list_current_add_flags(list, list_info, SD_FLAG_ADVANCED);
+ 
+          CONFIG_ACTION(
+                list, list_info,
+@@ -3092,6 +3113,7 @@ static bool setting_append_list(
+                general_write_handler,
+                general_read_handler,
+                SD_FLAG_NONE);
++         settings_data_list_current_add_flags(list, list_info, SD_FLAG_ADVANCED);
+ #endif
+ 
+          CONFIG_BOOL(
+@@ -3153,6 +3175,7 @@ static bool setting_append_list(
+                   general_read_handler,
+                   SD_FLAG_CMD_APPLY_AUTO);
+             menu_settings_list_current_add_cmd(list, list_info, CMD_EVENT_REINIT);
++            settings_data_list_current_add_flags(list, list_info, SD_FLAG_ADVANCED);
+          }
+          if (video_driver_has_windowed())
+          {
+@@ -3170,6 +3193,7 @@ static bool setting_append_list(
+                   general_write_handler,
+                   general_read_handler,
+                   SD_FLAG_NONE);
++            settings_data_list_current_add_flags(list, list_info, SD_FLAG_ADVANCED);
+          }
+          CONFIG_FLOAT(
+                list, list_info,
+@@ -3268,6 +3292,7 @@ static bool setting_append_list(
+                list,
+                list_info,
+                CMD_EVENT_VIDEO_APPLY_STATE_CHANGES);
++         settings_data_list_current_add_flags(list, list_info, SD_FLAG_ADVANCED);
+ 
+          CONFIG_INT(
+                list, list_info,
+@@ -3285,6 +3310,7 @@ static bool setting_append_list(
+                list,
+                list_info,
+                CMD_EVENT_VIDEO_APPLY_STATE_CHANGES);
++         settings_data_list_current_add_flags(list, list_info, SD_FLAG_ADVANCED);
+ 
+          CONFIG_UINT(
+                list, list_info,
+@@ -3307,6 +3333,7 @@ static bool setting_append_list(
+                list,
+                list_info,
+                CMD_EVENT_VIDEO_APPLY_STATE_CHANGES);
++         settings_data_list_current_add_flags(list, list_info, SD_FLAG_ADVANCED);
+ 
+          CONFIG_UINT(
+                list, list_info,
+@@ -3329,6 +3356,7 @@ static bool setting_append_list(
+                list,
+                list_info,
+                CMD_EVENT_VIDEO_APPLY_STATE_CHANGES);
++         settings_data_list_current_add_flags(list, list_info, SD_FLAG_ADVANCED);
+ 
+          END_SUB_GROUP(list, list_info, parent_group);
+          START_SUB_GROUP(list, list_info, "Scaling", &group_info, &subgroup_info, parent_group);
+@@ -3348,6 +3376,7 @@ static bool setting_append_list(
+                   general_write_handler,
+                   general_read_handler);
+             menu_settings_list_current_add_range(list, list_info, 1.0, 10.0, 1.0, true, true);
++            settings_data_list_current_add_flags(list, list_info, SD_FLAG_ADVANCED);
+             CONFIG_UINT(
+                   list, list_info,
+                   &settings->video.window_x,
+@@ -3360,6 +3389,7 @@ static bool setting_append_list(
+                   general_write_handler,
+                   general_read_handler);
+             menu_settings_list_current_add_range(list, list_info, 0, 7680, 8, true, true);
++            settings_data_list_current_add_flags(list, list_info, SD_FLAG_ADVANCED);
+             CONFIG_UINT(
+                   list, list_info,
+                   &settings->video.window_y,
+@@ -3372,6 +3402,7 @@ static bool setting_append_list(
+                   general_write_handler,
+                   general_read_handler);
+             menu_settings_list_current_add_range(list, list_info, 0, 4320, 8, true, true);
++            settings_data_list_current_add_flags(list, list_info, SD_FLAG_ADVANCED);
+          }
+ 
+          CONFIG_BOOL(
+@@ -3479,7 +3510,7 @@ static bool setting_append_list(
+                parent_group,
+                general_write_handler,
+                general_read_handler,
+-               SD_FLAG_CMD_APPLY_AUTO | SD_FLAG_ADVANCED
++               SD_FLAG_CMD_APPLY_AUTO
+                );
+          menu_settings_list_current_add_cmd(list, list_info, CMD_EVENT_REINIT);
+ #endif
+@@ -3546,6 +3577,7 @@ static bool setting_append_list(
+                   general_read_handler,
+                   SD_FLAG_NONE
+                   );
++            settings_data_list_current_add_flags(list, list_info, SD_FLAG_ADVANCED);
+ 
+             CONFIG_UINT(
+                   list, list_info,
+@@ -3592,6 +3624,7 @@ static bool setting_append_list(
+                general_read_handler,
+                SD_FLAG_NONE
+                );
++         settings_data_list_current_add_flags(list, list_info, SD_FLAG_ADVANCED);
+ #endif
+          END_SUB_GROUP(list, list_info, parent_group);
+          START_SUB_GROUP(
+@@ -3634,6 +3667,7 @@ static bool setting_append_list(
+                general_read_handler,
+                SD_FLAG_NONE
+                );
++         settings_data_list_current_add_flags(list, list_info, SD_FLAG_ADVANCED);
+ 
+          CONFIG_PATH(
+                list, list_info,
+@@ -3649,6 +3683,7 @@ static bool setting_append_list(
+                general_read_handler);
+          menu_settings_list_current_add_values(list, list_info, "filt");
+          menu_settings_list_current_add_cmd(list, list_info, CMD_EVENT_REINIT);
++         settings_data_list_current_add_flags(list, list_info, SD_FLAG_ADVANCED);
+ 
+          END_SUB_GROUP(list, list_info, parent_group);
+          END_GROUP(list, list_info, parent_group);
+@@ -3753,6 +3788,7 @@ static bool setting_append_list(
+                general_read_handler,
+                SD_FLAG_NONE
+                );
++         settings_data_list_current_add_flags(list, list_info, SD_FLAG_ADVANCED);
+ 
+          CONFIG_UINT(
+                list, list_info,
+@@ -3767,6 +3803,7 @@ static bool setting_append_list(
+                general_write_handler,
+                general_read_handler);
+          menu_settings_list_current_add_range(list, list_info, 8, 512, 16.0, true, true);
++         settings_data_list_current_add_flags(list, list_info, SD_FLAG_ADVANCED);
+ 
+          CONFIG_FLOAT(
+                list, list_info,
+@@ -3852,7 +3889,7 @@ static bool setting_append_list(
+                parent_group,
+                general_write_handler,
+                general_read_handler);
+-         settings_data_list_current_add_flags(list, list_info, SD_FLAG_ALLOW_INPUT | SD_FLAG_ADVANCED);
++         settings_data_list_current_add_flags(list, list_info, SD_FLAG_ALLOW_INPUT);
+          (*list)[list_info->index - 1].action_left   = &setting_string_action_left_audio_device;
+          (*list)[list_info->index - 1].action_right  = &setting_string_action_right_audio_device;
+ #endif
+@@ -3884,6 +3921,7 @@ static bool setting_append_list(
+                general_read_handler);
+          menu_settings_list_current_add_values(list, list_info, "dsp");
+          menu_settings_list_current_add_cmd(list, list_info, CMD_EVENT_DSP_FILTER_INIT);
++         settings_data_list_current_add_flags(list, list_info, SD_FLAG_ADVANCED);
+ 
+          END_SUB_GROUP(list, list_info, parent_group);
+          END_GROUP(list, list_info, parent_group);
+@@ -3911,6 +3949,7 @@ static bool setting_append_list(
+                   general_write_handler,
+                   general_read_handler);
+             menu_settings_list_current_add_range(list, list_info, 1, MAX_USERS, 1, true, true);
++            settings_data_list_current_add_flags(list, list_info, SD_FLAG_ADVANCED);
+ 
+             CONFIG_UINT(
+                   list, list_info,
+@@ -3924,6 +3963,7 @@ static bool setting_append_list(
+                   general_write_handler,
+                   general_read_handler);
+             menu_settings_list_current_add_range(list, list_info, 0, 2, 1, true, true);
++            settings_data_list_current_add_flags(list, list_info, SD_FLAG_ADVANCED);
+           
+ #ifdef VITA
+             CONFIG_BOOL(
+@@ -4034,6 +4074,7 @@ static bool setting_append_list(
+                   general_read_handler,
+                   SD_FLAG_NONE
+                   );
++            settings_data_list_current_add_flags(list, list_info, SD_FLAG_ADVANCED);
+ 
+             CONFIG_BOOL(
+                   list, list_info,
+@@ -4050,6 +4091,7 @@ static bool setting_append_list(
+                   general_read_handler,
+                   SD_FLAG_NONE
+                   );
++            settings_data_list_current_add_flags(list, list_info, SD_FLAG_ADVANCED);
+ 
+             CONFIG_BOOL(
+                   list, list_info,
+@@ -4066,6 +4108,7 @@ static bool setting_append_list(
+                   general_read_handler,
+                   SD_FLAG_NONE
+                   );
++            settings_data_list_current_add_flags(list, list_info, SD_FLAG_ADVANCED);
+ 
+             CONFIG_BOOL(
+                   list, list_info,
+@@ -4082,6 +4125,7 @@ static bool setting_append_list(
+                   general_read_handler,
+                   SD_FLAG_NONE
+                   );
++            settings_data_list_current_add_flags(list, list_info, SD_FLAG_ADVANCED);
+ 
+ #if 0
+             CONFIG_BOOL(
+@@ -4141,6 +4185,7 @@ static bool setting_append_list(
+                   general_write_handler,
+                   general_read_handler);
+             menu_settings_list_current_add_range(list, list_info, 0, 1.00, 0.001, true, true);
++            settings_data_list_current_add_flags(list, list_info, SD_FLAG_ADVANCED);
+             
+             CONFIG_UINT(
+                   list, list_info,
+@@ -4648,6 +4693,7 @@ static bool setting_append_list(
+                   general_write_handler,
+                   general_read_handler);
+             menu_settings_list_current_add_values(list, list_info, "png");
++            settings_data_list_current_add_flags(list, list_info, SD_FLAG_ADVANCED);
+ 
+             CONFIG_FLOAT(
+                   list, list_info,
+@@ -4662,6 +4708,7 @@ static bool setting_append_list(
+                   general_write_handler,
+                   general_read_handler);
+             menu_settings_list_current_add_range(list, list_info, 0.0, 1.0, 0.010, true, true);
++            settings_data_list_current_add_flags(list, list_info, SD_FLAG_ADVANCED);
+          }
+ 
+ 
+@@ -4682,6 +4729,7 @@ static bool setting_append_list(
+                   general_read_handler,
+                   SD_FLAG_NONE
+                   );
++            settings_data_list_current_add_flags(list, list_info, SD_FLAG_ADVANCED);
+          }
+ 
+ 
+@@ -4701,6 +4749,7 @@ static bool setting_append_list(
+                SD_FLAG_CMD_APPLY_AUTO
+                );
+          menu_settings_list_current_add_cmd(list, list_info, CMD_EVENT_MENU_PAUSE_LIBRETRO);
++         settings_data_list_current_add_flags(list, list_info, SD_FLAG_ADVANCED);
+ 
+          CONFIG_BOOL(
+                list, list_info,
+@@ -4717,6 +4766,7 @@ static bool setting_append_list(
+                general_read_handler,
+                SD_FLAG_NONE
+                );
++         settings_data_list_current_add_flags(list, list_info, SD_FLAG_ADVANCED);
+ 
+          CONFIG_BOOL(
+                list, list_info,
+@@ -4733,6 +4783,7 @@ static bool setting_append_list(
+                general_read_handler,
+                SD_FLAG_NONE
+                );
++         settings_data_list_current_add_flags(list, list_info, SD_FLAG_ADVANCED);
+ 
+          CONFIG_BOOL(
+                list, list_info,
+@@ -4749,6 +4800,7 @@ static bool setting_append_list(
+                general_read_handler,
+                SD_FLAG_NONE
+                );
++         settings_data_list_current_add_flags(list, list_info, SD_FLAG_ADVANCED);
+ 
+ #ifdef RARCH_MOBILE
+          /* We don't want mobile users being able to switch this off. */
+@@ -4910,6 +4962,7 @@ static bool setting_append_list(
+                   general_write_handler,
+                   general_read_handler);
+             menu_settings_list_current_add_range(list, list_info, 0, 100, 1, true, true);
++            settings_data_list_current_add_flags(list, list_info, SD_FLAG_ADVANCED);
+ 
+             CONFIG_UINT(
+                   list, list_info,
+@@ -4923,6 +4976,7 @@ static bool setting_append_list(
+                   general_write_handler,
+                   general_read_handler);
+             menu_settings_list_current_add_range(list, list_info, 0, 100, 1, true, true);
++            settings_data_list_current_add_flags(list, list_info, SD_FLAG_ADVANCED);
+ 
+             CONFIG_PATH(
+                   list, list_info,
+@@ -4936,6 +4990,7 @@ static bool setting_append_list(
+                   parent_group,
+                   general_write_handler,
+                   general_read_handler);
++            settings_data_list_current_add_flags(list, list_info, SD_FLAG_ADVANCED);
+ 
+             CONFIG_UINT(
+                   list, list_info,
+@@ -5007,6 +5062,7 @@ static bool setting_append_list(
+                   general_write_handler,
+                   general_read_handler,
+                   SD_FLAG_NONE);
++            settings_data_list_current_add_flags(list, list_info, SD_FLAG_ADVANCED);
+ 
+ #ifdef HAVE_IMAGEVIEWER
+             CONFIG_BOOL(
+@@ -5136,6 +5192,7 @@ static bool setting_append_list(
+                general_write_handler,
+                general_read_handler,
+                SD_FLAG_NONE);
++         settings_data_list_current_add_flags(list, list_info, SD_FLAG_ADVANCED);
+ 
+          if (string_is_equal(settings->menu.driver, "xmb"))
+          {
+@@ -5167,6 +5224,7 @@ static bool setting_append_list(
+                general_write_handler,
+                general_read_handler,
+                SD_FLAG_NONE);
++         settings_data_list_current_add_flags(list, list_info, SD_FLAG_ADVANCED);
+ 
+          CONFIG_BOOL(
+                list, list_info,
+@@ -5182,6 +5240,7 @@ static bool setting_append_list(
+                general_write_handler,
+                general_read_handler,
+                SD_FLAG_NONE);
++         settings_data_list_current_add_flags(list, list_info, SD_FLAG_ADVANCED);
+ 
+          END_SUB_GROUP(list, list_info, parent_group);
+          END_GROUP(list, list_info, parent_group);
+@@ -5827,6 +5886,7 @@ static bool setting_append_list(
+                &group_info,
+                &subgroup_info,
+                parent_group);
++         settings_data_list_current_add_flags(list, list_info, SD_FLAG_ADVANCED);
+ 
+          CONFIG_STRING(
+                list, list_info,

packages/libretro/retroarch/patches/retroarch-06-comment-subdirs.patch

@@ -0,0 +1,15 @@
+diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c
+index a7c9caa..32001c2 100644
+--- a/menu/cbs/menu_cbs_ok.c
++++ b/menu/cbs/menu_cbs_ok.c
+@@ -103,8 +103,8 @@ finish:
+       fill_pathname_parent_dir(parent_dir,
+             state->path, sizeof(parent_dir));
+ 
+-      generic_action_ok_displaylist_push(parent_dir, NULL,
+-            subdir_path, 0, 0, 0, ACTION_OK_DL_CORE_CONTENT_DIRS_SUBDIR_LIST);
++      /*generic_action_ok_displaylist_push(parent_dir, NULL,
++            subdir_path, 0, 0, 0, ACTION_OK_DL_CORE_CONTENT_DIRS_SUBDIR_LIST);*/
+    }
+ 
+    if (err)

packages/libretro/retroarch/patches/retroarch-06-download-content.patch

@@ -0,0 +1,17 @@
+diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c
+index 00b7995..128111d 100644
+--- a/menu/menu_displaylist.c
++++ b/menu/menu_displaylist.c
+@@ -2934,6 +2934,12 @@ static int menu_displaylist_parse_options(
+          msg_hash_to_str(MENU_ENUM_LABEL_THUMBNAILS_UPDATER_LIST),
+          MENU_ENUM_LABEL_THUMBNAILS_UPDATER_LIST,
+          MENU_SETTING_ACTION, 0, 0);
++
++   menu_entries_append_enum(info->list,
++         msg_hash_to_str(MENU_ENUM_LABEL_VALUE_DOWNLOAD_CORE_CONTENT),
++         msg_hash_to_str(MENU_ENUM_LABEL_DOWNLOAD_CORE_CONTENT_DIRS),
++         MENU_ENUM_LABEL_DOWNLOAD_CORE_CONTENT_DIRS,
++         MENU_SETTING_ACTION, 0, 0);
+ #else
+ #if !defined(VITA)
+    menu_entries_append_enum(info->list,

packages/libretro/retroarch/patches/retroarch-07-simple-quickmenu.patch

@@ -0,0 +1,34 @@
+diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c
+index 00b7995..f7a8b6e 100644
+--- a/menu/menu_displaylist.c
++++ b/menu/menu_displaylist.c
+@@ -2679,12 +2679,14 @@ static int menu_displaylist_parse_load_content_settings(
+             MENU_ENUM_LABEL_LOAD_STATE,
+             MENU_SETTING_ACTION_LOADSTATE, 0, 0);
+ 
++      if (settings->menu.show_advanced_settings)
+       menu_entries_append_enum(info->list,
+             msg_hash_to_str(MENU_ENUM_LABEL_VALUE_UNDO_LOAD_STATE),
+             msg_hash_to_str(MENU_ENUM_LABEL_UNDO_LOAD_STATE),
+             MENU_ENUM_LABEL_UNDO_LOAD_STATE,
+             MENU_SETTING_ACTION_LOADSTATE, 0, 0);
+ 
++      if (settings->menu.show_advanced_settings)
+       menu_entries_append_enum(info->list,
+             msg_hash_to_str(MENU_ENUM_LABEL_VALUE_UNDO_SAVE_STATE),
+             msg_hash_to_str(MENU_ENUM_LABEL_UNDO_SAVE_STATE),
+@@ -2725,12 +2727,14 @@ static int menu_displaylist_parse_load_content_settings(
+             MENU_SETTING_ACTION, 0, 0);
+ #endif
+ 
++      if (settings->menu.show_advanced_settings)
+       menu_entries_append_enum(info->list,
+             msg_hash_to_str(MENU_ENUM_LABEL_VALUE_SAVE_CURRENT_CONFIG_OVERRIDE_CORE),
+             msg_hash_to_str(MENU_ENUM_LABEL_SAVE_CURRENT_CONFIG_OVERRIDE_CORE),
+             MENU_ENUM_LABEL_SAVE_CURRENT_CONFIG_OVERRIDE_CORE,
+             MENU_SETTING_ACTION, 0, 0);
+ 
++      if (settings->menu.show_advanced_settings)
+       menu_entries_append_enum(info->list,
+             msg_hash_to_str(MENU_ENUM_LABEL_VALUE_SAVE_CURRENT_CONFIG_OVERRIDE_GAME),
+             msg_hash_to_str(MENU_ENUM_LABEL_SAVE_CURRENT_CONFIG_OVERRIDE_GAME),

packages/libretro/retroarch/patches/retroarch-08-osk-perf.patch

@@ -0,0 +1,20 @@
+diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c
+index ce2c906..93afff6 100644
+--- a/menu/drivers/xmb.c
++++ b/menu/drivers/xmb.c
+@@ -713,6 +713,7 @@ static void xmb_render_keyboard(xmb_handle_t *xmb, const char *grid[], unsigned
+ 
+       uintptr_t texture = xmb->textures.list[XMB_TEXTURE_KEY];
+       if (i == id)
++      {
+          texture = xmb->textures.list[XMB_TEXTURE_KEY_HOVER];
+ 
+       menu_display_blend_begin();
+@@ -726,6 +727,7 @@ static void xmb_render_keyboard(xmb_handle_t *xmb, const char *grid[], unsigned
+             texture);
+ 
+       menu_display_blend_end();
++      }
+ 
+       menu_display_draw_text(xmb->font, grid[i],
+             width/2.0 - (11*ptr_width)/2.0 + (i % 11) * ptr_width + ptr_width/2.0,

packages/libretro/retroarch/patches/retroarch-09-fix-int64.patch

@@ -0,0 +1,12 @@
+diff -Naur retroarch.git/libretro-common/include/glsym/glsym_es2.h retroarch.patch/libretro-common/include/glsym/glsym_es2.h
+--- retroarch.git/libretro-common/include/glsym/glsym_es2.h	2016-12-04 00:48:23.294181322 +0100
++++ retroarch.patch/libretro-common/include/glsym/glsym_es2.h	2016-12-04 00:50:17.086161391 +0100
+@@ -23,7 +23,7 @@
+ typedef GLint GLfixed;
+ #endif
+ 
+-#if (__STDC_VERSION__ <= 199409L) || (OSX && !MAC_OS_X_VERSION_10_7)
++#if (__STDC_VERSION__ <= 199901L) || (OSX && !MAC_OS_X_VERSION_10_7)
+ #ifndef GLint64
+ typedef long long int GLint64;
+ #endif

packages/libretro/retroarch/patches/retroarch-09-menu-settings.patch

@@ -0,0 +1,35 @@
+From 8fff4244634492869e56b668254c35d29b9e27ab Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jean-Andr=C3=A9=20Santoni?= <[email protected]>
+Date: Fri, 2 Dec 2016 00:42:55 +0100
+Subject: [PATCH 349/349] Revert "Move Menu Settings to User Interface"
+
+This reverts commit eb0c27ee9b265d14647e7cce438fa281f2a692bb.
+---
+ menu/menu_displaylist.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c
+index d32345c..33e9863 100644
+--- a/menu/menu_displaylist.c
++++ b/menu/menu_displaylist.c
+@@ -4823,8 +4823,6 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data)
+          break;
+       case DISPLAYLIST_USER_INTERFACE_SETTINGS_LIST:
+          menu_displaylist_parse_settings_enum(menu, info,
+-               MENU_ENUM_LABEL_MENU_SETTINGS,   PARSE_ACTION, false);
+-         menu_displaylist_parse_settings_enum(menu, info,
+                MENU_ENUM_LABEL_PAUSE_NONACTIVE,
+                PARSE_ONLY_BOOL, false);
+          menu_displaylist_parse_settings_enum(menu, info,
+@@ -5409,6 +5407,8 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data)
+          ret = menu_displaylist_parse_settings_enum(menu, info,
+                MENU_ENUM_LABEL_ONSCREEN_DISPLAY_SETTINGS,   PARSE_ACTION, false);
+          ret = menu_displaylist_parse_settings_enum(menu, info,
++               MENU_ENUM_LABEL_MENU_SETTINGS,   PARSE_ACTION, false);
++         ret = menu_displaylist_parse_settings_enum(menu, info,
+                MENU_ENUM_LABEL_USER_INTERFACE_SETTINGS,   PARSE_ACTION, false);
+ #ifdef HAVE_CHEEVOS
+          ret = menu_displaylist_parse_settings_enum(menu, info,
+-- 
+2.10.2
+

packages/libretro/retroarch/udev.d/99-ION-iCade-bluetooth.rules

@@ -0,0 +1 @@
+SUBSYSTEM=="input", ATTRS{name}=="ION iCade", KERNEL=="event*", MODE="0666", ENV{ID_INPUT_JOYSTICK}="1"

packages/libretro/retroarch/udev.d/99-ninteno-wii-remote.rules

@@ -0,0 +1,2 @@
+SUBSYSTEM=="input", ATTRS{name}=="Nintendo Wii Remote", MODE="666", ENV{ID_INPUT_JOYSTICK}="1"
+SUBSYSTEM=="input", ATTRS{name}=="Nintendo Wii Remote Classic Controller", MODE="666", ENV{ID_INPUT_JOYSTICK}="1"

packages/libretro/scummvm/package.mk

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="scummvm"
-PKG_VERSION="ce31819"
+PKG_VERSION="83c3b2f"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv2"

packages/libretro/snes9x/package.mk

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="snes9x"
-PKG_VERSION="ccf1ee2"
+PKG_VERSION="4ca6b68"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="Non-commercial"

packages/libretro/snes9x/patches/snes9x-01-buildfix.patch

@@ -1,12 +0,0 @@
-diff -Naur snes9x.git/libretro/Makefile snes9x.patch/libretro/Makefile
---- snes9x.git/libretro/Makefile	2015-12-04 20:55:32.895470234 +0100
-+++ snes9x.patch/libretro/Makefile	2015-12-04 21:06:58.183862860 +0100
-@@ -18,8 +18,6 @@
- 	endif
- endif
- 
--CXX			= g++
--CC			= gcc
- TARGET_NAME	= snes9x
- LIBM		= -lm
- 

packages/libretro/snes9x2002/package.mk

@@ -18,8 +18,8 @@
 #  http://www.gnu.org/copyleft/gpl.html
 ################################################################################
 
-PKG_NAME="pocketsnes"
-PKG_VERSION="79f6be5"
+PKG_NAME="snes9x2002"
+PKG_VERSION="fd7b58a"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="Non-commercial"
@@ -28,13 +28,13 @@ PKG_URL="$LAKKA_MIRROR/$PKG_NAME-$PKG_VERSION.tar.xz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_PRIORITY="optional"
 PKG_SECTION="libretro"
-PKG_SHORTDESC="An ARM-based SNES emulator for libretro"
-PKG_LONGDESC="An ARM-based SNES emulator for libretro"
+PKG_SHORTDESC="Snes9x 2002."
+PKG_LONGDESC="Snes9x 2002. Port of SNES9x 1.39 for libretro (was previously called PocketSNES). Heavily optimized for ARM."
 
 PKG_IS_ADDON="no"
 PKG_AUTORECONF="no"
 
 makeinstall_target() {
   mkdir -p $INSTALL/usr/lib/libretro
-  cp libretro.so $INSTALL/usr/lib/libretro/pocketsnes_libretro.so
+  cp snes9x2002_libretro.so $INSTALL/usr/lib/libretro/
 }

packages/libretro/snes9x2005/package.mk

@@ -18,8 +18,8 @@
 #  http://www.gnu.org/copyleft/gpl.html
 ################################################################################
 
-PKG_NAME="catsfc"
-PKG_VERSION="f85531b"
+PKG_NAME="snes9x2005"
+PKG_VERSION="76b73ff"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="Non-commercial"
@@ -28,8 +28,8 @@ PKG_URL="$LAKKA_MIRROR/$PKG_NAME-$PKG_VERSION.tar.xz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_PRIORITY="optional"
 PKG_SECTION="libretro"
-PKG_SHORTDESC="Super Nintendo/Super Famicom emulator."
-PKG_LONGDESC="Super Nintendo/Super Famicom emulator."
+PKG_SHORTDESC="Snes9x 2005."
+PKG_LONGDESC="Snes9x 2005. Port of SNES9x 1.43 for libretro (was previously called CAT SFC)."
 
 PKG_IS_ADDON="no"
 PKG_AUTORECONF="no"
@@ -40,5 +40,5 @@ make_target() {
 
 makeinstall_target() {
   mkdir -p $INSTALL/usr/lib/libretro
-  cp catsfc_libretro.so $INSTALL/usr/lib/libretro/
+  cp snes9x2005_libretro.so $INSTALL/usr/lib/libretro/
 }

packages/libretro/snes9x2010/package.mk

@@ -18,8 +18,8 @@
 #  http://www.gnu.org/copyleft/gpl.html
 ################################################################################
 
-PKG_NAME="snes9x-next"
-PKG_VERSION="00e7dff"
+PKG_NAME="snes9x2010"
+PKG_VERSION="66ba123"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="Non-commercial"
@@ -28,8 +28,8 @@ PKG_URL="$LAKKA_MIRROR/$PKG_NAME-$PKG_VERSION.tar.xz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_PRIORITY="optional"
 PKG_SECTION="libretro"
-PKG_SHORTDESC="Optimized port/rewrite of SNES9x 1.52+ to Libretro."
-PKG_LONGDESC="Optimized port/rewrite of SNES9x 1.52+ to Libretro."
+PKG_SHORTDESC="Snes9x 2010."
+PKG_LONGDESC="Snes9x 2010. Port of Snes9x 1.52+ to Libretro (previously called SNES9x Next). Rewritten in C and several optimizations and speedhacks."
 
 PKG_IS_ADDON="no"
 PKG_AUTORECONF="no"
@@ -40,5 +40,5 @@ make_target() {
 
 makeinstall_target() {
   mkdir -p $INSTALL/usr/lib/libretro
-  cp snes9x_next_libretro.so $INSTALL/usr/lib/libretro/
+  cp snes9x2010_libretro.so $INSTALL/usr/lib/libretro/
 }

packages/libretro/tyrquake/package.mk

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="tyrquake"
-PKG_VERSION="2f6d70b"
+PKG_VERSION="7f3c540"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv2"

packages/libretro/virtualjaguar/package.mk

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="virtualjaguar"
-PKG_VERSION="2899c5a"
+PKG_VERSION="8be4390"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv3"

packages/linux-drivers/mt7601u/package.mk

@@ -0,0 +1,56 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2016 Stephan Raue ([email protected])
+#
+#  OpenELEC 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.
+#
+#  OpenELEC 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 OpenELEC.  If not, see <http://www.gnu.org/licenses/>.
+################################################################################
+
+PKG_NAME="mt7601u"
+PKG_VERSION="e65aed5"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="https://github.com/porjo/mt7601"
+PKG_URL="http://down.nu/packages/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_DEPENDS_TARGET="toolchain linux"
+PKG_NEED_UNPACK="$LINUX_DEPENDS"
+PKG_PRIORITY="optional"
+PKG_SECTION="driver"
+PKG_SHORTDESC="Mediatek MT7601U Linux 3.x driver"
+PKG_LONGDESC="Mediatek MT7601U Linux 3.x driver"
+
+PKG_IS_ADDON="no"
+PKG_AUTORECONF="no"
+
+pre_make_target() {
+  unset LDFLAGS
+}
+
+make_target() {
+  sed -i '200s|.*LINUX_SRC.*|LINUX_SRC = '$(kernel_path)'|' src/Makefile
+  sed -i '203s|.*LINUX_SRC_MODULE.*|LINUX_SRC_MODULE = '$INSTALL'/lib/modules/'$(get_module_dir)'/kernel/drivers/net/wireless/|' src/Makefile
+  sed -i '204s|.*CROSS_COMPILE.*|CROSS_COMPILE = $(TARGET_PREFIX)|' src/Makefile
+  sed -i '205i ARCH = $(TARGET_ARCH)' src/Makefile
+  sed -i '206i export ARCH' src/Makefile
+  sed -i '207i export CROSS_COMPILE' src/Makefile
+  make -C src osdrv
+}
+
+makeinstall_target() {
+  mkdir -p $INSTALL/lib/modules/$(get_module_dir)/$PKG_NAME
+    cp src/os/linux/mt7601Usta.ko $INSTALL/lib/modules/$(get_module_dir)/$PKG_NAME
+
+  mkdir -p $INSTALL/lib/firmware/mt7601u
+    cp src/RT2870STA.dat $INSTALL/lib/firmware/mt7601u/mt7601u_sta.dat
+}

packages/linux-drivers/mt7601u/patches/mt7601u-000-build-fix.patch

@@ -0,0 +1,12 @@
+diff -Nur a/src/include/os/rt_linux.h b/src/include/os/rt_linux.h
+--- a/src/include/os/rt_linux.h	2015-10-04 22:56:40.000000000 +0200
++++ b/src/include/os/rt_linux.h	2016-02-01 22:11:19.837259634 +0100
+@@ -279,7 +279,7 @@
+ 
+ typedef struct _OS_FS_INFO_
+ {
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,12,0)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0)
+ 	uid_t				fsuid;
+ 	gid_t				fsgid;
+ #else

packages/linux-drivers/mt7601u/patches/mt7601u-001-wlan-interface.patch

@@ -0,0 +1,13 @@
+--- a/src/include/rtmp_def.h	2016-02-16 11:23:49.000000000 +0100
++++ b/src/include/rtmp_def.h	2016-04-18 21:57:18.566527968 +0200
+@@ -1601,8 +1601,8 @@
+ #define INF_MAIN_DEV_NAME		"wlan"
+ #define INF_MBSSID_DEV_NAME		"wlan"
+ #else
+-#define INF_MAIN_DEV_NAME		"ra"
+-#define INF_MBSSID_DEV_NAME		"ra"
++#define INF_MAIN_DEV_NAME		"wlan"
++#define INF_MBSSID_DEV_NAME		"wlan"
+ #endif /* ANDROID_SUPPORT */
+ #define INF_WDS_DEV_NAME		"wds"
+ #define INF_APCLI_DEV_NAME		"apcli"

packages/linux-drivers/mt7601u/patches/mt7601u-002-firmware-path.patch

@@ -0,0 +1,24 @@
+diff -Nur a/src/include/os/rt_drv.h b/src/include/os/rt_drv.h
+--- a/src/include/os/rt_drv.h	2016-02-16 11:23:49.000000000 +0100
++++ b/src/include/os/rt_drv.h	2016-04-18 21:59:18.653191304 +0200
+@@ -56,7 +56,7 @@
+ #ifdef CONFIG_STA_SUPPORT
+ 
+ #ifdef RTMP_MAC_USB
+-#define STA_PROFILE_PATH			"/etc/Wireless/RT2870STA/RT2870STA.dat"
++#define STA_PROFILE_PATH			"/lib/firmware/mt7601u/mt7601u_sta.dat"
+ #define STA_DRIVER_VERSION			"3.0.0.3"
+ #ifdef MULTIPLE_CARD_SUPPORT
+ #define CARD_INFO_PATH			"/etc/Wireless/RT2870STA/RT2870STACard.dat"
+diff -Nur a/src/include/os/rt_linux.h b/src/include/os/rt_linux.h
+--- a/src/include/os/rt_linux.h	2016-02-16 11:23:49.000000000 +0100
++++ b/src/include/os/rt_linux.h	2016-04-18 21:59:26.406524422 +0200
+@@ -127,7 +127,7 @@
+ #ifdef CONFIG_STA_SUPPORT
+ 
+ #ifdef RTMP_MAC_USB
+-#define STA_PROFILE_PATH			"/etc/Wireless/RT2870STA/RT2870STA.dat"
++#define STA_PROFILE_PATH			"/lib/firmware/mt7601u/mt7601u_sta.dat"
+ #define STA_DRIVER_VERSION			"3.0.0.3"
+ #ifdef MULTIPLE_CARD_SUPPORT
+ #define CARD_INFO_PATH			"/etc/Wireless/RT2870STA/RT2870STACard.dat"

packages/linux/package.mk

@@ -31,11 +31,11 @@ PKG_SHORTDESC="linux26: The Linux kernel 2.6 precompiled kernel binary image and
 PKG_LONGDESC="This package contains a precompiled kernel image and the modules."
 case "$LINUX" in
   linux-odroidxu3)
-    PKG_VERSION="533ce55"
+    PKG_VERSION="e337a20"
     PKG_URL="$LAKKA_MIRROR/$PKG_NAME-$PKG_VERSION.tar.xz"
     ;;
   linux-odroidc-3.10.y)
-    PKG_VERSION="a761439"
+    PKG_VERSION="6ac660c"
     PKG_URL="$LAKKA_MIRROR/$PKG_NAME-$PKG_VERSION.tar.xz"
     ;;
   linux-odroidc2-3.14.y)
@@ -47,6 +47,11 @@ case "$LINUX" in
     PKG_VERSION="6ce48b3"
     PKG_URL="$LAKKA_MIRROR/$PKG_NAME-$PKG_VERSION.tar.xz"
     ;;
+  linux-sun8i)
+    PKG_VERSION="f143b8a"
+    PKG_URL="$LAKKA_MIRROR/$PKG_NAME-$PKG_VERSION.tar.xz"
+    PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET sunxi-tools:host sunxi-sys-utils"
+    ;;
   wandboard)
     PKG_VERSION="8e81319"
     PKG_URL="$LAKKA_MIRROR/$PKG_NAME-$PKG_VERSION.tar.xz"
@@ -68,6 +73,10 @@ case "$LINUX" in
     PKG_VERSION="awh3-3.4"
     PKG_URL="https://github.com/jernejsk/OpenELEC-OPi2/raw/7de19646f7a8bf77df6f2f40fff7aa978f9beb67/storage/$PKG_NAME-$PKG_VERSION.tar.xz"
     ;;
+  s805)
+    PKG_VERSION="efd897e"
+    PKG_URL="$LAKKA_MIRROR/$PKG_NAME-$PKG_VERSION.tar.xz"
+    ;;
   *)
     PKG_VERSION="4.6.3"
     PKG_URL="http://www.kernel.org/pub/linux/kernel/v4.x/$PKG_NAME-$PKG_VERSION.tar.xz"
@@ -165,6 +174,14 @@ pre_make_target() {
 make_target() {
   LDFLAGS="" make modules
   LDFLAGS="" make INSTALL_MOD_PATH=$INSTALL DEPMOD="$ROOT/$TOOLCHAIN/bin/depmod" modules_install
+
+  if [ "$LINUX" = "linux-sun8i" ]; then
+    for all_fex in $PROJECT_DIR/$PROJECT/sys_config/*.fex; do
+      fex=$(basename $all_fex)
+      fex2bin $all_fex $fex
+    done
+  fi
+
   rm -f $INSTALL/lib/modules/*/build
   rm -f $INSTALL/lib/modules/*/source
 

packages/linux/udev.d/99-fix-controller.rules

@@ -6,3 +6,5 @@
 
 SUBSYSTEM=="input", ATTRS{idVendor}=="0955", ATTRS{idProduct}=="7210", MODE="0666", ENV{ID_INPUT_JOYSTICK}="1", ENV{ID_INPUT_MOUSE}=""
 
+# Same goes for the OUYA controller
+SUBSYSTEM=="input", ATTRS{name}=="OUYA Game Controller", MODE="0666", ENV{ID_INPUT_JOYSTICK}="1", ENV{ID_INPUT_MOUSE}=""

packages/multimedia/ffmpeg/package.mk

@@ -17,13 +17,13 @@
 ################################################################################
 
 PKG_NAME="ffmpeg"
-PKG_VERSION="2.5.4"
+PKG_VERSION="3.1.4"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="LGPL"
 PKG_SITE="http://ffmpeg.org"
 PKG_URL="https://www.ffmpeg.org/releases/${PKG_NAME}-${PKG_VERSION}.tar.gz"
-PKG_DEPENDS_TARGET="toolchain yasm:host zlib bzip2 libvorbis libressl"
+PKG_DEPENDS_TARGET="toolchain yasm:host zlib bzip2 libvorbis libressl libx264 lame libtheora freetype"
 PKG_PRIORITY="optional"
 PKG_SECTION="multimedia"
 PKG_SHORTDESC="FFmpeg is a complete, cross-platform solution to record, convert and stream audio and video."
@@ -126,7 +126,7 @@ configure_target() {
               --enable-shared \
               --enable-gpl \
               --disable-version3 \
-              --disable-nonfree \
+              --enable-nonfree \
               --enable-logging \
               --disable-doc \
               $FFMPEG_DEBUG \
@@ -149,7 +149,7 @@ configure_target() {
               --disable-w32threads \
               --disable-x11grab \
               --enable-network \
-              --disable-gnutls --enable-libressl \
+              --disable-gnutls \
               --disable-gray \
               --enable-swscale-alpha \
               --disable-small \
@@ -168,15 +168,17 @@ configure_target() {
               --enable-encoder=ac3 \
               --enable-encoder=aac \
               --enable-encoder=wmav2 \
+              --enable-encoder=flac \
               --disable-decoder=mpeg_xvmc \
               --enable-hwaccels \
-              --disable-muxers \
+              --enable-muxers \
               --enable-muxer=spdif \
               --enable-muxer=adts \
               --enable-muxer=asf \
               --enable-muxer=ipod \
               --enable-muxer=mpegts \
               --enable-demuxers \
+              --enable-demuxer=ogg,matroska,mov,flv \
               --enable-parsers \
               --enable-bsfs \
               --enable-protocol=http \
@@ -191,20 +193,21 @@ configure_target() {
               --disable-libopencv \
               --disable-libdc1394 \
               --disable-libfaac \
-              --disable-libfreetype \
+              --enable-libfreetype \
               --disable-libgsm \
-              --disable-libmp3lame \
+              --enable-libmp3lame \
               --disable-libnut \
               --disable-libopenjpeg \
               --disable-librtmp \
               --disable-libschroedinger \
               --disable-libspeex \
-              --disable-libtheora \
-              --disable-libvo-aacenc \
+              --enable-libtheora \
               --disable-libvo-amrwbenc \
               --enable-libvorbis --enable-muxer=ogg --enable-encoder=libvorbis \
               --disable-libvpx \
-              --disable-libx264 \
+              --enable-libx264 \
+              --enable-encoder=libx264 \
+              --enable-encoder=libx264rgb \
               --disable-libxavs \
               --disable-libxvid \
               --enable-zlib \

packages/multimedia/ffmpeg/patches/ffmpeg-2.3-libressl-is-free.patch

@@ -1,141 +0,0 @@
-diff -Naur ffmpeg-2.3/configure ffmpeg-2.3.patch/configure
---- ffmpeg-2.3/configure	2014-07-16 03:00:37.000000000 +0200
-+++ ffmpeg-2.3.patch/configure	2014-07-27 10:08:44.022632800 +0200
-@@ -225,6 +225,7 @@
-   --enable-libopus         enable Opus de/encoding via libopus [no]
-   --enable-libpulse        enable Pulseaudio input via libpulse [no]
-   --enable-libquvi         enable quvi input via libquvi [no]
-+  --enable-libressl        enable libressl [no]
-   --enable-librtmp         enable RTMP[E] support via librtmp [no]
-   --enable-libschroedinger enable Dirac de/encoding via libschroedinger [no]
-   --enable-libshine        enable fixed-point MP3 encoding via libshine [no]
-@@ -1349,6 +1350,7 @@
-     libopus
-     libpulse
-     libquvi
-+    libressl
-     librtmp
-     libschroedinger
-     libshine
-@@ -2462,7 +2464,7 @@
- # protocols
- bluray_protocol_deps="libbluray"
- ffrtmpcrypt_protocol_deps="!librtmp_protocol"
--ffrtmpcrypt_protocol_deps_any="gcrypt nettle openssl"
-+ffrtmpcrypt_protocol_deps_any="gcrypt libressl nettle openssl"
- ffrtmpcrypt_protocol_select="tcp_protocol"
- ffrtmphttp_protocol_deps="!librtmp_protocol"
- ffrtmphttp_protocol_select="http_protocol"
-@@ -2493,7 +2495,7 @@
- sctp_protocol_select="network"
- srtp_protocol_select="rtp_protocol"
- tcp_protocol_select="network"
--tls_protocol_deps_any="openssl gnutls"
-+tls_protocol_deps_any="libressl openssl gnutls"
- tls_protocol_select="tcp_protocol"
- udp_protocol_select="network"
- unix_protocol_deps="sys_un_h"
-@@ -4749,6 +4751,10 @@
- enabled libopus           && require_pkg_config opus opus_multistream.h opus_multistream_decoder_create
- enabled libpulse          && require_pkg_config libpulse-simple pulse/simple.h pa_simple_new
- enabled libquvi           && require_pkg_config libquvi quvi/quvi.h quvi_init
-+enabled libressl          && { check_lib openssl/ssl.h SSL_library_init -lssl -lcrypto ||
-+                               check_lib openssl/ssl.h SSL_library_init -lssl32 -leay32 ||
-+                               check_lib openssl/ssl.h SSL_library_init -lssl -lcrypto -lws2_32 -lgdi32 ||
-+                               die "ERROR: libressl not found"; }
- enabled librtmp           && require_pkg_config librtmp librtmp/rtmp.h RTMP_Socket
- enabled libschroedinger   && require_pkg_config schroedinger-1.0 schroedinger/schro.h schro_init
- enabled libshine          && require_pkg_config shine shine/layer3.h shine_encode_buffer
-diff -Naur ffmpeg-2.3/libavformat/network.c ffmpeg-2.3.patch/libavformat/network.c
---- ffmpeg-2.3/libavformat/network.c	2014-07-16 03:00:38.000000000 +0200
-+++ ffmpeg-2.3.patch/libavformat/network.c	2014-07-27 10:17:17.252998566 +0200
-@@ -36,7 +36,7 @@
- #endif
- #endif
- 
--#if CONFIG_OPENSSL
-+#if CONFIG_OPENSSL || CONFIG_LIBRESSL
- #include <openssl/ssl.h>
- static int openssl_init;
- #if HAVE_THREADS
-@@ -69,7 +69,7 @@
- void ff_tls_init(void)
- {
-     avpriv_lock_avformat();
--#if CONFIG_OPENSSL
-+#if CONFIG_OPENSSL || CONFIG_LIBRESSL
-     if (!openssl_init) {
-         SSL_library_init();
-         SSL_load_error_strings();
-@@ -101,7 +101,7 @@
- void ff_tls_deinit(void)
- {
-     avpriv_lock_avformat();
--#if CONFIG_OPENSSL
-+#if CONFIG_OPENSSL || CONFIG_LIBRESSL
-     openssl_init--;
-     if (!openssl_init) {
- #if HAVE_THREADS
-diff -Naur ffmpeg-2.3/libavformat/rtmpdh.c ffmpeg-2.3.patch/libavformat/rtmpdh.c
---- ffmpeg-2.3/libavformat/rtmpdh.c	2014-07-15 02:20:49.000000000 +0200
-+++ ffmpeg-2.3.patch/libavformat/rtmpdh.c	2014-07-27 10:17:38.082053995 +0200
-@@ -161,7 +161,7 @@
-     bn_free(dh->priv_key);
-     av_free(dh);
- }
--#elif CONFIG_OPENSSL
-+#elif CONFIG_OPENSSL || CONFIG_LIBRESSL
- #define bn_new(bn)                  bn = BN_new()
- #define bn_free(bn)                 BN_free(bn)
- #define bn_set_word(bn, w)          BN_set_word(bn, w)
-diff -Naur ffmpeg-2.3/libavformat/rtmpdh.h ffmpeg-2.3.patch/libavformat/rtmpdh.h
---- ffmpeg-2.3/libavformat/rtmpdh.h	2014-07-15 02:20:49.000000000 +0200
-+++ ffmpeg-2.3.patch/libavformat/rtmpdh.h	2014-07-27 10:16:08.495815596 +0200
-@@ -45,7 +45,7 @@
-   long length;
- } FF_DH;
- 
--#elif CONFIG_OPENSSL
-+#elif CONFIG_OPENSSL || CONFIG_LIBRESSL
- #include <openssl/bn.h>
- #include <openssl/dh.h>
- 
-diff -Naur ffmpeg-2.3/libavformat/tls.c ffmpeg-2.3.patch/libavformat/tls.c
---- ffmpeg-2.3/libavformat/tls.c	2014-07-15 02:20:49.000000000 +0200
-+++ ffmpeg-2.3.patch/libavformat/tls.c	2014-07-27 10:18:18.700162096 +0200
-@@ -39,7 +39,7 @@
-         if (c->cred) \
-             gnutls_certificate_free_credentials(c->cred); \
-     } while (0)
--#elif CONFIG_OPENSSL
-+#elif CONFIG_OPENSSL || CONFIG_LIBRESSL
- #include <openssl/bio.h>
- #include <openssl/ssl.h>
- #include <openssl/err.h>
-@@ -63,7 +63,7 @@
- #if CONFIG_GNUTLS
-     gnutls_session_t session;
-     gnutls_certificate_credentials_t cred;
--#elif CONFIG_OPENSSL
-+#elif CONFIG_OPENSSL || CONFIG_LIBRESSL
-     SSL_CTX *ctx;
-     SSL *ssl;
- #endif
-@@ -115,7 +115,7 @@
-         p.events = POLLOUT;
-     else
-         p.events = POLLIN;
--#elif CONFIG_OPENSSL
-+#elif CONFIG_OPENSSL || CONFIG_LIBRESSL
-     ret = SSL_get_error(c->ssl, ret);
-     if (ret == SSL_ERROR_WANT_READ) {
-         p.events = POLLIN;
-@@ -285,7 +285,7 @@
-             goto fail;
-         }
-     }
--#elif CONFIG_OPENSSL
-+#elif CONFIG_OPENSSL || CONFIG_LIBRESSL
-     c->ctx = SSL_CTX_new(c->listen ? TLSv1_server_method() : TLSv1_client_method());
-     if (!c->ctx) {
-         av_log(h, AV_LOG_ERROR, "%s\n", ERR_error_string(ERR_get_error(), NULL));

packages/multimedia/ffmpeg/patches/ffmpeg-2.5-kodi.patch

@@ -1,600 +0,0 @@
-From cc70eab317cc54a46ebf14dee17a6670d470d716 Mon Sep 17 00:00:00 2001
-From: Joakim Plate <[email protected]>
-Date: Sun, 11 Sep 2011 19:04:51 +0200
-Subject: [PATCH 01/13] Support raw dvdsub palette as stored on normal dvd's
-
-This is how the palette is stored on dvd's. Currently
-only xbmc passes the palette information to libavcodec
-this way.
----
- libavcodec/dvdsubdec.c | 24 ++++++++++++++++++++++++
- 1 file changed, 24 insertions(+)
-
-diff --git a/libavcodec/dvdsubdec.c b/libavcodec/dvdsubdec.c
-index 222c71b..040a713 100644
---- a/libavcodec/dvdsubdec.c
-+++ b/libavcodec/dvdsubdec.c
-@@ -64,6 +64,24 @@ static void yuv_a_to_rgba(const uint8_t *ycbcr, const uint8_t *alpha, uint32_t *
-     }
- }
- 
-+static void ayvu_to_argb(const uint8_t *ayvu, uint32_t *argb, int num_values)
-+{
-+    uint8_t *cm = ff_crop_tab + MAX_NEG_CROP;
-+    uint8_t r, g, b;
-+    int i, y, cb, cr, a;
-+    int r_add, g_add, b_add;
-+
-+    for (i = num_values; i > 0; i--) {
-+        a = *ayvu++;
-+        y = *ayvu++;
-+        cr = *ayvu++;
-+        cb = *ayvu++;
-+        YUV_TO_RGB1_CCIR(cb, cr);
-+        YUV_TO_RGB2_CCIR(r, g, b, y);
-+        *argb++ = (a << 24) | (r << 16) | (g << 8) | b;
-+    }
-+}
-+
- static int decode_run_2bit(GetBitContext *gb, int *color)
- {
-     unsigned int v, t;
-@@ -700,6 +718,12 @@ static av_cold int dvdsub_init(AVCodecContext *avctx)
-         parse_ifo_palette(ctx, ctx->ifo_str);
-     if (ctx->palette_str)
-         parse_palette(ctx, ctx->palette_str);
-+
-+    if (!ctx->has_palette && avctx->extradata_size == 64) {
-+        ayvu_to_argb((uint8_t*)avctx->extradata, ctx->palette, 16);
-+        ctx->has_palette = 1;
-+    }
-+
-     if (ctx->has_palette) {
-         int i;
-         av_log(avctx, AV_LOG_DEBUG, "palette:");
-
-From d51b190099d13d293d94b876ea8dad422f2e4e39 Mon Sep 17 00:00:00 2001
-From: Joakim Plate <[email protected]>
-Date: Mon, 12 Sep 2011 21:37:17 +0200
-Subject: [PATCH 02/13] asf hacks
-
----
- libavformat/asfdec.c | 11 +++++++++++
- 1 file changed, 11 insertions(+)
-
-diff --git a/libavformat/asfdec.c b/libavformat/asfdec.c
-index 7f7bb4d..8911987 100644
---- a/libavformat/asfdec.c
-+++ b/libavformat/asfdec.c
-@@ -1549,9 +1549,20 @@ static int asf_read_seek(AVFormatContext *s, int stream_index,
-     AVStream *st    = s->streams[stream_index];
-     int ret = 0;
- 
-+    if (pts == 0) {
-+      // this is a hack since av_gen_search searches the entire file in this case
-+      av_log(s, AV_LOG_DEBUG, "SEEKTO: %"PRId64"\n", s->data_offset);
-+      if (avio_seek(s->pb, s->data_offset, SEEK_SET) < 0)
-+          return -1;
-+      return 0;
-+    }
-+
-     if (s->packet_size <= 0)
-         return -1;
- 
-+    if (st->codec->codec_type != AVMEDIA_TYPE_VIDEO)
-+        return -1;
-+
-     /* Try using the protocol's read_seek if available */
-     if (s->pb) {
-         int ret = avio_seek_time(s->pb, stream_index, pts, flags);
-
-From d0dcf7d95bffe4509fb71a8129cc880e9e0552f9 Mon Sep 17 00:00:00 2001
-From: Cory Fields <[email protected]>
-Date: Mon, 28 Jun 2010 01:55:31 -0400
-Subject: [PATCH 03/13] if av_read_packet returns AVERROR_IO, we are done.
- ffmpeg's codecs might or might not handle returning any completed demuxed
- packets correctly
-
----
- libavformat/utils.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/libavformat/utils.c b/libavformat/utils.c
-index 78653d1..b233a2b 100644
---- a/libavformat/utils.c
-+++ b/libavformat/utils.c
-@@ -1307,6 +1307,8 @@ static int read_frame_internal(AVFormatContext *s, AVPacket *pkt)
-         if (ret < 0) {
-             if (ret == AVERROR(EAGAIN))
-                 return ret;
-+            if (ret == AVERROR(EIO))
-+                return ret;
-             /* flush the parsers */
-             for (i = 0; i < s->nb_streams; i++) {
-                 st = s->streams[i];
-
-From 37154452e754303f638cff93214c122d640c5d69 Mon Sep 17 00:00:00 2001
-From: Cory Fields <[email protected]>
-Date: Mon, 28 Jun 2010 02:10:50 -0400
-Subject: [PATCH 04/13] added: Ticket #7187, TV Teletext support for DVB EBU
- Teletext streams
-
----
- libavcodec/avcodec.h | 4 ++++
- libavformat/mpegts.c | 2 ++
- 2 files changed, 6 insertions(+)
-
-diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
-index dabae1b..dd6ef3f 100644
---- a/libavcodec/avcodec.h
-+++ b/libavcodec/avcodec.h
-@@ -520,6 +520,10 @@ enum AVCodecID {
-     AV_CODEC_ID_PJS        = MKBETAG('P','h','J','S'),
-     AV_CODEC_ID_ASS        = MKBETAG('A','S','S',' '),  ///< ASS as defined in Matroska
- 
-+    /* data codecs */
-+    AV_CODEC_ID_VBI_DATA= 0x17500,
-+    AV_CODEC_ID_VBI_TELETEXT,
-+
-     /* other specific kind of codecs (generally used for attachments) */
-     AV_CODEC_ID_FIRST_UNKNOWN = 0x18000,           ///< A dummy ID pointing at the start of various fake codecs.
-     AV_CODEC_ID_TTF = 0x18000,
-diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c
-index 97da0a3..5dd28f1 100644
---- a/libavformat/mpegts.c
-+++ b/libavformat/mpegts.c
-@@ -729,6 +729,8 @@ static const StreamType DESC_types[] = {
-     { 0x7b, AVMEDIA_TYPE_AUDIO,    AV_CODEC_ID_DTS          },
-     { 0x56, AVMEDIA_TYPE_SUBTITLE, AV_CODEC_ID_DVB_TELETEXT },
-     { 0x59, AVMEDIA_TYPE_SUBTITLE, AV_CODEC_ID_DVB_SUBTITLE }, /* subtitling descriptor */
-+    { 0x45, AVMEDIA_TYPE_DATA,         AV_CODEC_ID_VBI_DATA }, /* VBI Data descriptor */
-+    { 0x46, AVMEDIA_TYPE_DATA,     AV_CODEC_ID_VBI_TELETEXT }, /* VBI Teletext descriptor */
-     { 0 },
- };
- 
-
-From 7993eb16b229ab65a32a4a3ce5d1f18ab64349f2 Mon Sep 17 00:00:00 2001
-From: Joakim Plate <[email protected]>
-Date: Sun, 18 Sep 2011 19:16:34 +0200
-Subject: [PATCH 05/13] Don't accept mpegts PMT that isn't current
-
----
- libavformat/mpegts.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c
-index 5dd28f1..9f85aed 100644
---- a/libavformat/mpegts.c
-+++ b/libavformat/mpegts.c
-@@ -572,6 +572,7 @@ typedef struct SectionHeader {
-     uint8_t tid;
-     uint16_t id;
-     uint8_t version;
-+    uint8_t current;
-     uint8_t sec_num;
-     uint8_t last_sec_num;
- } SectionHeader;
-@@ -643,6 +644,7 @@ static int parse_section_header(SectionHeader *h,
-     val = get8(pp, p_end);
-     if (val < 0)
-         return val;
-+    h->current = val & 0x1;
-     h->version = (val >> 1) & 0x1f;
-     val = get8(pp, p_end);
-     if (val < 0)
-@@ -1968,6 +1970,8 @@ static void pat_cb(MpegTSFilter *filter, const uint8_t *section, int section_len
-         return;
-     if (ts->skip_changes)
-         return;
-+    if (!h->current)
-+        return;
- 
-     ts->stream->ts_id = h->id;
- 
-
-From 3c994a2ad7873395455b834ce85458202c90266b Mon Sep 17 00:00:00 2001
-From: Joakim Plate <[email protected]>
-Date: Sun, 18 Sep 2011 19:17:23 +0200
-Subject: [PATCH 06/13] Don't reparse PMT unless it's version has changed
-
----
- libavformat/mpegts.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c
-index 9f85aed..25007a6 100644
---- a/libavformat/mpegts.c
-+++ b/libavformat/mpegts.c
-@@ -88,6 +88,7 @@ struct MpegTSFilter {
-     int es_id;
-     int last_cc; /* last cc code (-1 if first packet) */
-     int64_t last_pcr;
-+    int last_version; /* last version of data on this pid */
-     enum MpegTSFilterType type;
-     union {
-         MpegTSPESFilter pes_filter;
-@@ -450,6 +451,7 @@ static MpegTSFilter *mpegts_open_filter(MpegTSContext *ts, unsigned int pid,
-     filter->es_id   = -1;
-     filter->last_cc = -1;
-     filter->last_pcr= -1;
-+    filter->last_version = -1;
- 
-     return filter;
- }
-@@ -1972,6 +1974,10 @@ static void pat_cb(MpegTSFilter *filter, const uint8_t *section, int section_len
-         return;
-     if (!h->current)
-         return;
-+    if (h->version == filter->last_version)
-+        return;
-+    filter->last_version = h->version;
-+    av_dlog(ts->stream, "version=%d\n", filter->last_version);
- 
-     ts->stream->ts_id = h->id;
- 
-
-From b772f2fa2076904e3cf2c9e9a80c080cec25c523 Mon Sep 17 00:00:00 2001
-From: Cory Fields <[email protected]>
-Date: Fri, 9 Jul 2010 16:43:31 -0400
-Subject: [PATCH 07/13] Read PID timestamps as well as PCR timestamps to find
- location in mpegts stream
-
----
- libavformat/mpegts.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++--
- 1 file changed, 46 insertions(+), 2 deletions(-)
-
-diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c
-index 25007a6..d5a8a45 100644
---- a/libavformat/mpegts.c
-+++ b/libavformat/mpegts.c
-@@ -2459,6 +2459,44 @@ static void seek_back(AVFormatContext *s, AVIOContext *pb, int64_t pos) {
-         av_log(s, pb->seekable ? AV_LOG_ERROR : AV_LOG_INFO, "Unable to seek back to the start\n");
- }
- 
-+static int parse_timestamp(int64_t *ts, const uint8_t *buf)
-+{
-+    int afc, flags;
-+    const uint8_t *p;
-+
-+    if(!(buf[1] & 0x40)) /* must be a start packet */
-+        return -1;
-+
-+    afc = (buf[3] >> 4) & 3;
-+    p = buf + 4;
-+    if (afc == 0 || afc == 2) /* invalid or only adaption field */
-+        return -1;
-+    if (afc == 3)
-+        p += p[0] + 1;
-+    if (p >= buf + TS_PACKET_SIZE)
-+        return -1;
-+
-+    if (p[0] != 0x00 || p[1] != 0x00 || p[2] != 0x01)  /* packet_start_code_prefix */
-+        return -1;
-+
-+    flags = p[3] | 0x100; /* stream type */
-+    if (!((flags >= 0x1c0 && flags <= 0x1df) ||
-+          (flags >= 0x1e0 && flags <= 0x1ef) ||
-+          (flags == 0x1bd) || (flags == 0x1fd)))
-+        return -1;
-+
-+    flags = p[7];
-+    if ((flags & 0xc0) == 0x80) {
-+        *ts = ff_parse_pes_pts(p+9);
-+        return 0;
-+    } else if ((flags & 0xc0) == 0xc0) {
-+        *ts = ff_parse_pes_pts(p+9+5);
-+        return 0;
-+    }
-+    return -1;
-+}
-+
-+
- static int mpegts_read_header(AVFormatContext *s)
- {
-     MpegTSContext *ts = s->priv_data;
-@@ -2658,6 +2696,7 @@ static av_unused int64_t mpegts_get_pcr(AVFormatContext *s, int stream_index,
-     uint8_t buf[TS_PACKET_SIZE];
-     int pcr_l, pcr_pid =
-         ((PESContext *)s->streams[stream_index]->priv_data)->pcr_pid;
-+    int pid = ((PESContext*)s->streams[stream_index]->priv_data)->pid;
-     int pos47 = ts->pos47_full % ts->raw_packet_size;
-     pos =
-         ((*ppos + ts->raw_packet_size - 1 - pos47) / ts->raw_packet_size) *
-@@ -2679,6 +2718,11 @@ static av_unused int64_t mpegts_get_pcr(AVFormatContext *s, int stream_index,
-             *ppos = pos;
-             return timestamp;
-         }
-+        if ((pid < 0 || (AV_RB16(buf + 1) & 0x1fff) == pid) &&
-+            parse_timestamp(&timestamp, buf) == 0) {
-+            *ppos = pos;
-+            return timestamp;
-+        }
-         pos += ts->raw_packet_size;
-     }
- 
-@@ -2778,7 +2822,7 @@ AVInputFormat ff_mpegts_demuxer = {
-     .read_header    = mpegts_read_header,
-     .read_packet    = mpegts_read_packet,
-     .read_close     = mpegts_read_close,
--    .read_timestamp = mpegts_get_dts,
-+    .read_timestamp = mpegts_get_pcr,
-     .flags          = AVFMT_SHOW_IDS | AVFMT_TS_DISCONT,
-     .priv_class     = &mpegts_class,
- };
-@@ -2790,7 +2834,7 @@ AVInputFormat ff_mpegtsraw_demuxer = {
-     .read_header    = mpegts_read_header,
-     .read_packet    = mpegts_raw_read_packet,
-     .read_close     = mpegts_read_close,
--    .read_timestamp = mpegts_get_dts,
-+    .read_timestamp = mpegts_get_pcr,
-     .flags          = AVFMT_SHOW_IDS | AVFMT_TS_DISCONT,
-     .priv_class     = &mpegtsraw_class,
- };
-
-From ce94d83559b1f4e1affd6349abcd1bf794e2cd17 Mon Sep 17 00:00:00 2001
-From: Joakim Plate <[email protected]>
-Date: Sat, 22 Oct 2011 19:01:38 +0200
-Subject: [PATCH 08/13] Get stream durations using read_timestamp
-
----
- libavformat/utils.c | 39 +++++++++++++++++++++++++++++++++++++++
- 1 file changed, 39 insertions(+)
-
-diff --git a/libavformat/utils.c b/libavformat/utils.c
-index b233a2b..ccd8149 100644
---- a/libavformat/utils.c
-+++ b/libavformat/utils.c
-@@ -2359,6 +2359,41 @@ static void estimate_timings_from_bit_rate(AVFormatContext *ic)
- #define DURATION_MAX_READ_SIZE 250000LL
- #define DURATION_MAX_RETRY 4
- 
-+static void av_estimate_timings_from_pts2(AVFormatContext *ic, int64_t old_offset)
-+{
-+    AVStream *st;
-+    int i, step= 1024;
-+    int64_t ts, pos;
-+
-+    for(i=0;i<ic->nb_streams;i++) {
-+        st = ic->streams[i];
-+
-+        pos = 0;
-+        ts = ic->iformat->read_timestamp(ic, i, &pos, DURATION_MAX_READ_SIZE);
-+        if (ts == AV_NOPTS_VALUE)
-+            continue;
-+        if (st->start_time > ts || st->start_time == AV_NOPTS_VALUE)
-+            st->start_time = ts;
-+
-+        pos = avio_size(ic->pb) - 1;
-+        do {
-+            pos -= step;
-+            ts = ic->iformat->read_timestamp(ic, i, &pos, pos + step);
-+            step += step;
-+        } while (ts == AV_NOPTS_VALUE && pos >= step && step < DURATION_MAX_READ_SIZE);
-+
-+        if (ts == AV_NOPTS_VALUE)
-+            continue;
-+
-+        if (st->duration < ts - st->start_time || st->duration == AV_NOPTS_VALUE)
-+            st->duration = ts - st->start_time;
-+    }
-+
-+    fill_all_stream_timings(ic);
-+
-+    avio_seek(ic->pb, old_offset, SEEK_SET);
-+}
-+
- /* only usable for MPEG-PS streams */
- static void estimate_timings_from_pts(AVFormatContext *ic, int64_t old_offset)
- {
-@@ -2509,6 +2544,10 @@ static void estimate_timings(AVFormatContext *ic, int64_t old_offset)
-          * the components */
-         fill_all_stream_timings(ic);
-         ic->duration_estimation_method = AVFMT_DURATION_FROM_STREAM;
-+    } else if (ic->iformat->read_timestamp && 
-+        file_size && ic->pb->seekable) {
-+        /* get accurate estimate from the PTSes */
-+        av_estimate_timings_from_pts2(ic, old_offset);
-     } else {
-         /* less precise: use bitrate info */
-         estimate_timings_from_bit_rate(ic);
-
-From d159d252efab3568335faf615d8083b7e88e5b51 Mon Sep 17 00:00:00 2001
-From: Joakim Plate <[email protected]>
-Date: Wed, 8 Dec 2010 14:03:43 +0000
-Subject: [PATCH 09/13] changed: allow 4 second skew between streams in mov
- before attempting to seek
-
----
- libavformat/mov.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/libavformat/mov.c b/libavformat/mov.c
-index 7455e3b..4f6e207 100644
---- a/libavformat/mov.c
-+++ b/libavformat/mov.c
-@@ -4049,8 +4049,8 @@ static AVIndexEntry *mov_find_next_sample(AVFormatContext *s, AVStream **st)
-             if (!sample || (!s->pb->seekable && current_sample->pos < sample->pos) ||
-                 (s->pb->seekable &&
-                  ((msc->pb != s->pb && dts < best_dts) || (msc->pb == s->pb &&
--                 ((FFABS(best_dts - dts) <= AV_TIME_BASE && current_sample->pos < sample->pos) ||
--                  (FFABS(best_dts - dts) > AV_TIME_BASE && dts < best_dts)))))) {
-+                 ((FFABS(best_dts - dts) <= 4*AV_TIME_BASE && current_sample->pos < sample->pos) ||
-+                  (FFABS(best_dts - dts) > 4*AV_TIME_BASE && dts < best_dts)))))) {
-                 sample = current_sample;
-                 best_dts = dts;
-                 *st = avst;
-
-From bce4a8f7d52722aacf9d5d6256f70cb7c42e5480 Mon Sep 17 00:00:00 2001
-From: Joakim Plate <[email protected]>
-Date: Fri, 26 Nov 2010 20:56:48 +0000
-Subject: [PATCH 10/13] fixed: memleak in mpegts demuxer on some malformed (??)
- mpegts files with too large pes packets
-
-at-visions sample file brokenStream.mpg
----
- libavformat/mpegts.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c
-index d5a8a45..e070f1f 100644
---- a/libavformat/mpegts.c
-+++ b/libavformat/mpegts.c
-@@ -832,6 +832,10 @@ static void reset_pes_packet_state(PESContext *pes)
- 
- static void new_pes_packet(PESContext *pes, AVPacket *pkt)
- {
-+    if(pkt->data) {
-+      av_log(pes->stream, AV_LOG_ERROR, "ignoring previously allocated packet on stream %d\n", pkt->stream_index);
-+      av_free_packet(pkt);
-+    }
-     av_init_packet(pkt);
- 
-     pkt->buf  = pes->buffer;
-@@ -2649,6 +2653,8 @@ static int mpegts_read_packet(AVFormatContext *s, AVPacket *pkt)
- 
-     pkt->size = -1;
-     ts->pkt = pkt;
-+    ts->pkt->data = NULL;
-+
-     ret = handle_packets(ts, 0);
-     if (ret < 0) {
-         av_free_packet(ts->pkt);
-
-From 81ffa6832117d97c61aff62b27c1cd71b778daa0 Mon Sep 17 00:00:00 2001
-From: Joakim Plate <[email protected]>
-Date: Mon, 28 Jun 2010 21:26:54 +0000
-Subject: [PATCH 11/13] Speed up mpegts av_find_stream_info
-
----
- libavformat/mpegts.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c
-index e070f1f..dd9e129 100644
---- a/libavformat/mpegts.c
-+++ b/libavformat/mpegts.c
-@@ -994,7 +994,7 @@ static int mpegts_push_data(MpegTSFilter *filter,
-                         goto skip;
- 
-                     /* stream not present in PMT */
--                    if (!pes->st) {
-+                    if (ts->auto_guess && !pes->st) {
-                         if (ts->skip_changes)
-                             goto skip;
- 
-
-From 7cc40ff6285cb0e571ef2fccaffdbeda11600ccb Mon Sep 17 00:00:00 2001
-From: marc <mhocking@ubuntu-desktop.(none)>
-Date: Mon, 18 Feb 2013 17:18:18 +0000
-Subject: [PATCH 12/13] dxva-h264 Fix dxva playback of streams that don't start
- with an I-Frame.
-
----
- libavcodec/dxva2_h264.c | 8 ++++++++
- libavcodec/h264.c       | 1 +
- libavcodec/h264.h       | 2 ++
- libavcodec/h264_slice.c | 1 +
- 4 files changed, 12 insertions(+)
-
-diff --git a/libavcodec/dxva2_h264.c b/libavcodec/dxva2_h264.c
-index 6deccc3..85b25fd 100644
---- a/libavcodec/dxva2_h264.c
-+++ b/libavcodec/dxva2_h264.c
-@@ -451,6 +451,14 @@ static int dxva2_h264_end_frame(AVCodecContext *avctx)
- 
-     if (ctx_pic->slice_count <= 0 || ctx_pic->bitstream_size <= 0)
-         return -1;
-+
-+    // Wait for an I-frame before start decoding. Workaround for ATI UVD and UVD+ GPUs
-+    if (!h->got_first_iframe) {
-+        if (!(ctx_pic->pp.wBitFields & (1 << 15)))
-+            return -1;
-+        h->got_first_iframe = 1;
-+    }
-+
-     ret = ff_dxva2_common_end_frame(avctx, &h->cur_pic_ptr->f,
-                                     &ctx_pic->pp, sizeof(ctx_pic->pp),
-                                     &ctx_pic->qm, sizeof(ctx_pic->qm),
-diff --git a/libavcodec/h264.c b/libavcodec/h264.c
-index 438c43f..a576e90 100644
---- a/libavcodec/h264.c
-+++ b/libavcodec/h264.c
-@@ -1096,6 +1096,7 @@ void ff_h264_flush_change(H264Context *h)
-     h->list_count = 0;
-     h->current_slice = 0;
-     h->mmco_reset = 1;
-+    h->got_first_iframe = 0;
- }
- 
- /* forget old pics after a seek */
-diff --git a/libavcodec/h264.h b/libavcodec/h264.h
-index cb7e6f9..f819465 100644
---- a/libavcodec/h264.h
-+++ b/libavcodec/h264.h
-@@ -742,6 +742,8 @@ typedef struct H264Context {
-     int luma_weight_flag[2];    ///< 7.4.3.2 luma_weight_lX_flag
-     int chroma_weight_flag[2];  ///< 7.4.3.2 chroma_weight_lX_flag
- 
-+    int got_first_iframe;
-+
-     // Timestamp stuff
-     int sei_buffering_period_present;   ///< Buffering period SEI flag
-     int initial_cpb_removal_delay[32];  ///< Initial timestamps for CPBs
-diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c
-index f03ab4e..ee22bc0 100644
---- a/libavcodec/h264_slice.c
-+++ b/libavcodec/h264_slice.c
-@@ -1189,6 +1189,7 @@ static int h264_slice_header_init(H264Context *h, int reinit)
-         ff_h264_free_tables(h, 0);
-     h->first_field           = 0;
-     h->prev_interlaced_frame = 1;
-+    h->got_first_iframe = 0;
- 
-     init_scan_tables(h);
-     ret = ff_h264_alloc_tables(h);
-
-From f723a5163e9a24080de5abdbd317ee8df61a79f7 Mon Sep 17 00:00:00 2001
-From: elupus <[email protected]>
-Date: Tue, 1 Nov 2011 20:18:35 +0100
-Subject: [PATCH 13/13] add public version of ff_read_frame_flush
-
-We need this since we sometimes seek on the
-input stream behind ffmpeg's back. After this
-all data need to be flushed completely.
----
- libavformat/avformat.h | 5 +++++
- libavformat/utils.c    | 5 +++++
- 2 files changed, 10 insertions(+)
-
-diff --git a/libavformat/avformat.h b/libavformat/avformat.h
-index 2e54ed1..3a9f292 100644
---- a/libavformat/avformat.h
-+++ b/libavformat/avformat.h
-@@ -2121,6 +2121,11 @@ int av_find_best_stream(AVFormatContext *ic,
- int av_read_frame(AVFormatContext *s, AVPacket *pkt);
- 
- /**
-+ * Clear out any buffered data in context
-+ */
-+void av_read_frame_flush(AVFormatContext *s);
-+
-+/**
-  * Seek to the keyframe at timestamp.
-  * 'timestamp' in 'stream_index'.
-  *
-diff --git a/libavformat/utils.c b/libavformat/utils.c
-index ccd8149..d241608 100644
---- a/libavformat/utils.c
-+++ b/libavformat/utils.c
-@@ -1627,6 +1627,11 @@ void ff_read_frame_flush(AVFormatContext *s)
-     }
- }
- 
-+void av_read_frame_flush(AVFormatContext *s)
-+{
-+  ff_read_frame_flush(s);
-+}
-+
- void ff_update_cur_dts(AVFormatContext *s, AVStream *ref_st, int64_t timestamp)
- {
-     int i;

packages/multimedia/ffmpeg/patches/ffmpeg-Speed_up_wtv_index_creation.patch

@@ -1,47 +0,0 @@
-commit 0e7427498cb1131671f6fe9d054245ae7e5a36f5
-Author: popcornmix <[email protected]>
-Date:   Tue Mar 25 19:43:07 2014 +0000
-
-    [ffmpeg] Speed up wtv index creation
-
-    The index creation is O(N^2) with number of entries (typically thousands).
-    On a Pi this can take more than 60 seconds to execute for a recording of a few hours.
-
-    By replacing with an O(N) loop, this takes virtually zero time
-
-diff --git a/libavformat/wtvdec.c b/libavformat/wtvdec.c
-index e423370..70898bd 100644
---- a/libavformat/wtvdec.c
-+++ b/libavformat/wtvdec.c
-@@ -980,21 +980,23 @@ static int read_header(AVFormatContext *s)
-                 pb = wtvfile_open(s, root, root_size, ff_timeline_table_0_entries_Events_le16);
-                 if (pb) {
-                     int i;
-+                    AVIndexEntry *e = wtv->index_entries;
-+                    AVIndexEntry *e_end = wtv->index_entries + wtv->nb_index_entries - 1;
-+                    uint64_t last_position = 0;
-                     while (1) {
-                         uint64_t frame_nb = avio_rl64(pb);
-                         uint64_t position = avio_rl64(pb);
-+                        while (frame_nb > e->size && e <= e_end) {
-+                           e->pos = last_position;
-+                           e++;
-+                        }
-                         if (avio_feof(pb))
-                             break;
--                        for (i = wtv->nb_index_entries - 1; i >= 0; i--) {
--                            AVIndexEntry *e = wtv->index_entries + i;
--                            if (frame_nb > e->size)
--                                break;
--                            if (position > e->pos)
--                                e->pos = position;
--                        }
-+                        last_position = position;
-                     }
-+                    e_end->pos = last_position;
-                     wtvfile_close(pb);
--                    st->duration = wtv->index_entries[wtv->nb_index_entries - 1].timestamp;
-+                    st->duration = e_end->timestamp;
-                 }
-             }
-         }

packages/multimedia/libtheora/package.mk

@@ -0,0 +1,40 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2014 Stephan Raue ([email protected])
+#
+#  OpenELEC 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.
+#
+#  OpenELEC 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 OpenELEC.  If not, see <http://www.gnu.org/licenses/>.
+################################################################################
+
+PKG_NAME="libtheora"
+PKG_VERSION="1.1.1"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="BSD"
+PKG_SITE="https://www.theora.org/"
+PKG_URL="http://downloads.xiph.org/releases/theora/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_DEPENDS_TARGET="toolchain"
+PKG_PRIORITY="optional"
+PKG_SECTION="multimedia"
+PKG_SHORTDESC="Theora is a free and open video compression format"
+PKG_LONGDESC="Theora is a free and open video compression format"
+PKG_IS_ADDON="no"
+
+PKG_AUTORECONF=""
+
+PKG_CONFIGURE_OPTS_TARGET="--disable-examples"
+
+pre_configure_target() {
+  strip_lto
+  strip_gold
+}

packages/multimedia/libx264/package.mk

@@ -0,0 +1,40 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2014 Stephan Raue ([email protected])
+#
+#  OpenELEC 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.
+#
+#  OpenELEC 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 OpenELEC.  If not, see <http://www.gnu.org/licenses/>.
+################################################################################
+
+PKG_NAME="libx264"
+PKG_VERSION="86b7198"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="http://www.videolan.org/developers/x264.html"
+PKG_URL="$LAKKA_MIRROR/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_DEPENDS_TARGET="toolchain"
+PKG_PRIORITY="optional"
+PKG_SECTION="multimedia"
+PKG_SHORTDESC="x264 is a free software library and application for encoding video streams into the H.264/MPEG-4 AVC compression format"
+PKG_LONGDESC="Achieves dramatic performance, encoding 4 or more 1080p streams in realtime on a single consumer-level computer."
+PKG_IS_ADDON="no"
+
+PKG_AUTORECONF=""
+
+PKG_CONFIGURE_OPTS_TARGET="--disable-cli --disable-asm"
+
+pre_configure_target() {
+  strip_lto
+  strip_gold
+}

packages/network/avahi/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="avahi"
-PKG_VERSION="0.6.31"
+PKG_VERSION="0.6.32"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
@@ -30,7 +30,7 @@ PKG_SHORTDESC="avahi: A Zeroconf mDNS/DNS-SD responder"
 PKG_LONGDESC="Avahi is a framework for Multicast DNS Service Discovery (mDNS/DNS-SD a.k.a. Zeroconf) on Linux. It allows programs to publish and discover services running on a local network with no specific configuration. For example, you can plug into a network and instantly find printers to print to, files to look at, and people to talk to."
 
 PKG_IS_ADDON="no"
-PKG_AUTORECONF="yes"
+PKG_AUTORECONF="no"
 
 MAKEFLAGS="-j1"
 
@@ -75,6 +75,10 @@ PKG_CONFIGURE_OPTS_TARGET="py_cv_mod_gtk_=yes \
                            --with-avahi-group=avahi \
                            --disable-nls"
 
+pre_configure_target() {
+	NOCONFIGURE=1 ./autogen.sh
+}
+
 post_makeinstall_target() {
 # for some reason avai can fail to start see: http://forums.gentoo.org/viewtopic-p-7322172.html#7322172
   sed -e "s,^.*disallow-other-stacks=.*$,disallow-other-stacks=yes,g" -i $INSTALL/etc/avahi/avahi-daemon.conf

packages/network/avahi/patches/avahi-0.6.31-automake.patch

@@ -1,12 +0,0 @@
-diff -Naur avahi-0.6.31/avahi-daemon/Makefile.am avahi-0.6.31.patch/avahi-daemon/Makefile.am
---- avahi-0.6.31/avahi-daemon/Makefile.am	2010-08-26 02:51:38.000000000 +0200
-+++ avahi-0.6.31.patch/avahi-daemon/Makefile.am	2012-06-13 18:44:23.910169467 +0200
-@@ -169,7 +169,7 @@
- 	done
- 
- install-data-local:
--	test -z "$(localstatedir)/run" || $(mkdir_p) "$(DESTDIR)$(localstatedir)/run"
-+	test -z "$(localstatedir)/run" || $(MKDIR_P) "$(DESTDIR)$(localstatedir)/run"
- 
- update-systemd:
- 	curl http://cgit.freedesktop.org/systemd/plain/src/sd-daemon.c > sd-daemon.c

packages/network/avahi/patches/avahi-0001_fix-autoconf.patch

@@ -0,0 +1,11 @@
+diff -Naur a/configure.ac b/configure.ac
+--- a/configure.ac	2016-02-18 21:17:52.000000000 +0100
++++ b/configure.ac	2016-02-18 23:22:37.384875431 +0100
+@@ -417,7 +417,6 @@
+ GETTEXT_PACKAGE=avahi
+ AC_SUBST([GETTEXT_PACKAGE])
+ AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[Gettext package])
+-AM_GLIB_GNU_GETTEXT
+ 
+ avahilocaledir='${prefix}/${DATADIRNAME}/locale'
+ AC_SUBST(avahilocaledir)

packages/network/samba/config/smb.conf

@@ -61,6 +61,14 @@
 # Using the following configurations as a template allows you to add
 # writable shares of disks and paths under /storage
 
+[Assets]
+  path = /storage/.assets
+  available = yes
+  browsable = yes
+  public = yes
+  writable = yes
+  root preexec = mkdir -p /storage/.assets
+  
 [Update]
   path = /storage/.update
   available = yes

packages/security/libressl/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="libressl"
-PKG_VERSION="2.1.1"
+PKG_VERSION="2.4.3"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="BSD"
@@ -30,7 +30,8 @@ PKG_SHORTDESC="libressl: a FREE version of the SSL/TLS protocol forked from Open
 PKG_LONGDESC="LibreSSL is a FREE version of the SSL/TLS protocol forked from OpenSSL"
 
 PKG_IS_ADDON="no"
-PKG_AUTORECONF="yes"
+PKG_USE_CMAKE="no"
+PKG_AUTORECONF="no"
 
 post_makeinstall_target() {
 # ca-certification: provides a tool to download and create ca-bundle.crt
@@ -40,5 +41,5 @@ post_makeinstall_target() {
   mkdir -p $INSTALL/$SSL_CERTIFICATES
     cp $PKG_DIR/cert/ca-bundle.crt $INSTALL/$SSL_CERTIFICATES/cacert.pem
   mkdir -p $INSTALL/etc/ssl
-  ln -sf $SSL_CERTIFICATES/cacert.pem $INSTALL/etc/ssl/cert.pem
+    ln -sf $SSL_CERTIFICATES/cacert.pem $INSTALL/etc/ssl/cert.pem
 }

packages/security/libressl/patches/libressl-2.1.1_version.patch

@@ -1,15 +0,0 @@
-diff -Naur libressl-2.1.1/configure.ac libressl-2.1.1.patch/configure.ac
---- libressl-2.1.1/configure.ac	2014-10-16 04:36:04.000000000 +0200
-+++ libressl-2.1.1.patch/configure.ac	2014-11-01 11:42:32.797637394 +0100
-@@ -1,4 +1,4 @@
--+AC_INIT([libressl], m4_esyscmd([tr -d '\n' < VERSION]))
-+AC_INIT([libressl], m4_esyscmd([tr -d '\n' < VERSION]))
- AC_CANONICAL_HOST
- AM_INIT_AUTOMAKE([subdir-objects])
- AC_CONFIG_MACRO_DIR([m4])
-diff -Naur libressl-2.1.1/VERSION libressl-2.1.1.patch/VERSION
---- libressl-2.1.1/VERSION	1970-01-01 01:00:00.000000000 +0100
-+++ libressl-2.1.1.patch/VERSION	2014-11-01 11:42:23.969645930 +0100
-@@ -0,0 +1 @@
-+2.1.1
-\ Kein Zeilenumbruch am Dateiende.

packages/security/libressl/patches/libressl-add_trusted-first_option.patch

@@ -0,0 +1,65 @@
+From 9d2006d8ed733522014035ec0514e23a312083e8 Mon Sep 17 00:00:00 2001
+From: "Dr. Stephen Henson" <[email protected]>
+Date: Wed, 26 Sep 2012 13:50:42 +0000
+Subject: [PATCH] add -trusted_first option and verify flag (backport from
+ HEAD)
+
+---
+ apps/openssl/apps.c            |  2 ++
+ crypto/x509/x509_vfy.c | 16 ++++++++++++++++
+ include/openssl/x509_vfy.h |  2 ++
+ 4 files changed, 24 insertions(+)
+
+diff --git a/apps/openssl/apps.c b/apps/openssl/apps.c
+index 4e11915..d8d8a70 100644
+--- a/apps/openssl/apps.c
++++ b/apps/openssl/apps.c
+@@ -2358,6 +2358,8 @@ int args_verify(char ***pargs, int *pargc,
+ 		flags |= X509_V_FLAG_NOTIFY_POLICY;
+ 	else if (!strcmp(arg, "-check_ss_sig"))
+ 		flags |= X509_V_FLAG_CHECK_SS_SIGNATURE;
++	else if (!strcmp(arg, "-trusted_first"))
++		flags |= X509_V_FLAG_TRUSTED_FIRST;
+ 	else
+ 		return 0;
+ 
+diff --git a/crypto/x509/x509_vfy.c b/crypto/x509/x509_vfy.c
+index b0779db..ba10811 100644
+--- a/crypto/x509/x509_vfy.c
++++ b/crypto/x509/x509_vfy.c
+@@ -206,6 +206,22 @@ int X509_verify_cert(X509_STORE_CTX *ctx)
+ 		/* If we are self signed, we break */
+ 		if (ctx->check_issued(ctx, x,x)) break;
+ 
++		/* If asked see if we can find issuer in trusted store first */
++		if (ctx->param->flags & X509_V_FLAG_TRUSTED_FIRST)
++			{
++			ok = ctx->get_issuer(&xtmp, ctx, x);
++			if (ok < 0)
++				return ok;
++			/* If successful for now free up cert so it
++			 * will be picked up again later.
++			 */
++			if (ok > 0)
++				{
++				X509_free(xtmp);
++				break;
++				}
++			}
++
+ 		/* If we were passed a cert chain, use it first */
+ 		if (ctx->untrusted != NULL)
+ 			{
+diff --git a/include/openssl/x509_vfy.h b/include/openssl/x509_vfy.h
+index fe09b30..d53f3e3 100644
+--- a/include/openssl/x509_vfy.h
++++ b/include/openssl/x509_vfy.h
+@@ -383,6 +383,8 @@ void X509_STORE_CTX_set_depth(X509_STORE_CTX *ctx, int depth);
+ #define X509_V_FLAG_USE_DELTAS			0x2000
+ /* Check selfsigned CA signature */
+ #define X509_V_FLAG_CHECK_SS_SIGNATURE		0x4000
++/* Use trusted store first */
++#define X509_V_FLAG_TRUSTED_FIRST		0x8000
+ /* Do not check certificate or CRL validity against current time. */
+ #define X509_V_FLAG_NO_CHECK_TIME		0x200000
+