From 6b7340ef23a0c39a5d4ce9a21b480e9a2ac4da73 Mon Sep 17 00:00:00 2001
From: Emery Hemingway <emery@vfemail.net>
Date: Sat, 14 Jan 2017 13:08:59 +0100
Subject: [PATCH] use single-file port for libretro.h

Ref #60
---
 lib/import/import-libretro.mk    |  4 ++--
 ports/libretro.hash              |  1 +
 ports/libretro.port              |  9 +++++++++
 ports/retroarch.hash             |  1 -
 ports/retroarch.port             | 10 ----------
 src/app/retro_frontend/target.mk |  8 +++++++-
 6 files changed, 19 insertions(+), 14 deletions(-)
 create mode 100644 ports/libretro.hash
 create mode 100644 ports/libretro.port
 delete mode 100644 ports/retroarch.hash
 delete mode 100644 ports/retroarch.port

diff --git a/lib/import/import-libretro.mk b/lib/import/import-libretro.mk
index 33cd080..9256b59 100644
--- a/lib/import/import-libretro.mk
+++ b/lib/import/import-libretro.mk
@@ -1,5 +1,5 @@
-RETROARCH_PORT_DIR := $(call select_from_ports,retroarch)
+LIBRETRO_PORT_DIR := $(call select_from_ports,libretro)
 
-INC_DIR += $(RETROARCH_PORT_DIR)/include/libretro
+INC_DIR += $(LIBRETRO_PORT_DIR)/include
 
 SYMBOLS = $(REP_DIR)/lib/symbols/libretro
diff --git a/ports/libretro.hash b/ports/libretro.hash
new file mode 100644
index 0000000..388c396
--- /dev/null
+++ b/ports/libretro.hash
@@ -0,0 +1 @@
+4af697b4dcae97201f56baf817497595df9ae3b4
diff --git a/ports/libretro.port b/ports/libretro.port
new file mode 100644
index 0000000..5431ac3
--- /dev/null
+++ b/ports/libretro.port
@@ -0,0 +1,9 @@
+LICENSE   := MIT
+VERSION   := 1.3.6
+DOWNLOADS := libretro.file
+
+URL(libretro) := https://raw.githubusercontent.com/libretro/RetroArch/v1.3.6/libretro-common/include/libretro.h
+SHA(libretro) := 452485de627b9791b243a628c1ec3f6b8a90d2c0
+
+DIRS := include
+DIR_CONTENT(include) := libretro.h
diff --git a/ports/retroarch.hash b/ports/retroarch.hash
deleted file mode 100644
index e272b38..0000000
--- a/ports/retroarch.hash
+++ /dev/null
@@ -1 +0,0 @@
-d124c14fc2233d88289e1eee584d8789f4fe299f
diff --git a/ports/retroarch.port b/ports/retroarch.port
deleted file mode 100644
index ece1d23..0000000
--- a/ports/retroarch.port
+++ /dev/null
@@ -1,10 +0,0 @@
-LICENSE   := GPL3
-VERSION   := 1.3.2
-DOWNLOADS := retroarch.archive
- 
-URL(retroarch) := https://github.com/libretro/RetroArch/archive/v$(VERSION).tar.gz
-SHA(retroarch) := 0e88126e9193949f65ed2b48cd2a13e2327b08b6
-DIR(retroarch) := src/app/retroarch
-
-DIRS := include/libretro
-DIR_CONTENT(include/libretro) := src/app/retroarch/libretro.h
diff --git a/src/app/retro_frontend/target.mk b/src/app/retro_frontend/target.mk
index 11f8cf4..aca5d32 100644
--- a/src/app/retro_frontend/target.mk
+++ b/src/app/retro_frontend/target.mk
@@ -1,3 +1,9 @@
 TARGET = retro_frontend
 SRC_CC = component.cc
-LIBS   = base libretro libc file
+LIBS   = base libc
+
+LIBRETRO_INC := $(call select_from_ports,libretro)/include
+
+INC_DIR += $(LIBRETRO_INC)
+
+component.cc: $(LIBRETRO_INC)/libretro.h