Remove paths patch, not needed.

3 files changed, 4 insertions, 54 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8964d7b3a6a5..a82e38257245 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = retroarch-git
 	pkgdesc = Reference frontend for the libretro API (Git-latest)
-	pkgver = 1.3.6.r1440.6ac73c5
+	pkgver = 1.3.6.r1588.2c0d8e8
 	pkgrel = 1
 	url = http://www.libretro.com/
 	install = retroarch-git.install
@@ -49,11 +49,9 @@ pkgbase = retroarch-git
 	source = git+https://github.com/libretro/RetroArch.git
 	source = git+https://github.com/KhronosGroup/glslang.git
 	source = git+https://github.com/KhronosGroup/SPIRV-Cross.git
-	source = default-paths.patch
 	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = SKIP
-	sha256sums = 37aab0127cd15a7fa08e5f66982da14296e4c4b56807b054863d1f9eff5c64df
 
 pkgname = retroarch-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 001f8c50176c..876827821351 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,7 +10,7 @@
 #        'git+https://github.com/KhronosGroup/SPIRV-Cross.git#commit=5c24d99')
 
 pkgname=retroarch-git
-pkgver=1.3.6.r1440.6ac73c5
+pkgver=1.3.6.r1588.2c0d8e8
 pkgrel=1
 #epoch=1
 _gitname=RetroArch
@@ -37,12 +37,10 @@ optdepends=('libretro-overlays-git: Collection of overlays'
 backup=('etc/retroarch.cfg')
 source=('git+https://github.com/libretro/RetroArch.git'
         'git+https://github.com/KhronosGroup/glslang.git'
-        'git+https://github.com/KhronosGroup/SPIRV-Cross.git'
-	'default-paths.patch')
+        'git+https://github.com/KhronosGroup/SPIRV-Cross.git')
 sha256sums=('SKIP'
             'SKIP'
-            'SKIP'
-	    '37aab0127cd15a7fa08e5f66982da14296e4c4b56807b054863d1f9eff5c64df')
+            'SKIP')
 
 pkgver() {
 
@@ -66,10 +64,6 @@ build() {
 
   cd $_gitname
 
-  # Patch retroarch.cfg for sane defaults (core path, core info, joypad autoconfig)
-  msg2 "Patching retroarch.cfg for default paths"
-  patch -p1 < $srcdir/default-paths.patch
-
   ./configure \
     --prefix='/usr' \
     --disable-jack \
diff --git a/default-paths.patch b/default-paths.patch
deleted file mode 100644
index fb8f9a0066e7..000000000000
--- a/default-paths.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- RetroArch.orig/retroarch.cfg	2016-09-20 10:31:42.688072700 -0400
-+++ RetroArch/retroarch.cfg	2016-09-20 13:45:50.057006464 -0400
-@@ -35,10 +35,10 @@
- # libretro_path = "/path/to/libretro.so"
- 
- # A directory for where to search for libretro core implementations.
--# libretro_directory =
-+libretro_directory = /usr/lib/libretro
- 
- # A directory for where to search for libretro core information.
--# libretro_info_path =
-+libretro_info_path = /usr/lib/libretro
- 
- # Sets log level for libretro cores (GET_LOG_INTERFACE).
- # If a log level issued by a libretro core is below libretro_log_level, it is ignored.
-@@ -98,7 +98,7 @@
- 
- # Assets directory. This location is queried by default when menu interfaces try to look for
- # loadable assets, etc.
--# assets_directory =
-+assets_directory = /usr/share/libretro/assets
- 
- # Dynamic wallpapers directory. The place to store the wallpapers dynamically
- # loaded by the menu depending on context.
-@@ -385,7 +385,7 @@
- 
- # Enable input auto-detection. Will attempt to autoconfigure
- # joypads, Plug-and-Play style.
--# input_autodetect_enable = true
-+input_autodetect_enable = true
- 
- # Show the input descriptors set by the core instead of the
- # default ones.
-@@ -414,7 +414,7 @@
- # Input binds which are made explicit (input_playerN_*_btn/axis) will take priority over autoconfigs.
- # Autoconfigs can be created with retroarch-joyconfig, manually, or with a frontend.
- # Requires input_autodetect_enable to be enabled.
--# joypad_autoconfig_dir =
-+joypad_autoconfig_dir = /usr/share/libretro/autoconfig
- 
- # Sets which libretro device is used for a user.
- # Devices are indentified with a number.