From adaff9579defe3af61f71b6621b450e4e901dbc9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9rgio=20Benjamim?= <sergiobenrocha2+gh@gmail.com>
Date: Sun, 1 Feb 2015 20:50:14 -0200
Subject: [PATCH] Cleanup in Makefile/ARM and debian packaging.

---
 Makefile.libretro                             | 23 +++++++++----------
 libretro/debian/copyright                     | 10 ++++----
 .../debian/libretro-genesisplusgx.postinst    |  9 --------
 libretro/debian/rules                         |  4 ++--
 4 files changed, 18 insertions(+), 28 deletions(-)
 delete mode 100755 libretro/debian/libretro-genesisplusgx.postinst

diff --git a/Makefile.libretro b/Makefile.libretro
index 3da682c..583fc92 100644
--- a/Makefile.libretro
+++ b/Makefile.libretro
@@ -66,11 +66,10 @@ else ifeq ($(platform), osx)
 	ifeq ($(OSX_LT_MAVERICKS),"YES")
 		fpic += -mmacosx-version-min=10.5
 	endif
-
-ifndef ($(NOUNIVERSAL))
-   CFLAGS  += $(ARCHFLAGS)
-   LDFLAGS += $(ARCHFLAGS)
-endif
+	ifndef ($(NOUNIVERSAL))
+		CFLAGS  += $(ARCHFLAGS)
+		LDFLAGS += $(ARCHFLAGS)
+	endif
 
 # iOS
 else ifeq ($(platform), ios)
@@ -185,16 +184,16 @@ else ifneq (,$(findstring armv,$(platform)))
 	SHARED := -shared -Wl,--version-script=libretro/link.T -Wl,--no-undefined -lz
 	ENDIANNESS_DEFINES := -DLSB_FIRST -DBYTE_ORDER=LITTLE_ENDIAN
 	PLATFORM_DEFINES := -DHAVE_ZLIB
-	CC = gcc
-	ifneq (,$(findstring cortexa8,$(platform)))
+	ifneq (,$(findstring cortexa5,$(platform)))
+		PLATFORM_DEFINES += -marm -mcpu=cortex-a5
+	else ifneq (,$(findstring cortexa8,$(platform)))
 		PLATFORM_DEFINES += -marm -mcpu=cortex-a8
 	else ifneq (,$(findstring cortexa9,$(platform)))
 		PLATFORM_DEFINES += -marm -mcpu=cortex-a9
-	endif
-	PLATFORM_DEFINES += -marm
-	ifneq (,$(findstring neon,$(platform)))
-		PLATFORM_DEFINES += -mfpu=neon
-		HAVE_NEON = 1
+	else ifneq (,$(findstring cortexa15a7,$(platform)))
+		PLATFORM_DEFINES += -marm -mcpu=cortex-a15.cortex-a7
+	else
+		PLATFORM_DEFINES += -marm
 	endif
 	ifneq (,$(findstring softfloat,$(platform)))
 		PLATFORM_DEFINES += -mfloat-abi=softfp
diff --git a/libretro/debian/copyright b/libretro/debian/copyright
index eb3a1e1..450a60b 100644
--- a/libretro/debian/copyright
+++ b/libretro/debian/copyright
@@ -13,7 +13,7 @@ Upstream Authors:
 Files: *
 Copyright: 1998, 1999, 2000, 2001, 2002, 2003 Charles MacDonald
            Some portions copyright Nicola Salmoria and the MAME team. All rights reserved.
-           2007-2014 Eke-Eke. All rights reserved.
+           2007-2015 Eke-Eke. All rights reserved.
 License: 
     Unless otherwise explicitly stated, all code in Genesis Plus GX is released
     under the following license:
@@ -156,11 +156,11 @@ License:
     - This entire notice must remain in the source code.
 
 Files: libretro/*
-Copyright: 2012-2014 The RetroArch Team
+Copyright: 2012-2015 The RetroArch Team
 License: GPLv3
 
 Files: libretro/libretro.h
-Copyright: 2012-2014 The RetroArch Team
+Copyright: 2012-2015 The RetroArch Team
 License: The MIT License (MIT)
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"), to deal
@@ -182,8 +182,8 @@ License: The MIT License (MIT)
 
 The Debian packaging is:
 
-    Copyright (C) 2011-2014 Hunter Kaller (hizzlekizzle) <hunter_kaller@yahoo.com>
-    Copyright (C) 2014 Sergio Benjamim (sergio-br2) <sergio_br2@yahoo.com.br>
+    Copyright (C) 2011-2015 Hunter Kaller (hizzlekizzle) <hunter_kaller@yahoo.com>
+    Copyright (C) 2014, 2015 Sergio Benjamim (sergio-br2) <sergio_br2@yahoo.com.br>
 
 and is licensed under the GPL version 3, 
 see `/usr/share/common-licenses/GPL-3'.
diff --git a/libretro/debian/libretro-genesisplusgx.postinst b/libretro/debian/libretro-genesisplusgx.postinst
deleted file mode 100755
index f41a197..0000000
--- a/libretro/debian/libretro-genesisplusgx.postinst
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-set -e
-
-update-alternatives --install /usr/lib/libretro.so libretro /usr/lib/libretro/genesis_plus_gx_libretro.so 10
-
-#DEBHELPER#
-
-exit 0
\ No newline at end of file
diff --git a/libretro/debian/rules b/libretro/debian/rules
index e1fcc64..eed4150 100755
--- a/libretro/debian/rules
+++ b/libretro/debian/rules
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
-# Copyright (C) 2011-2014 Hunter Kaller
-# Copyright (C) 2014 Sergio Benjamim
+# Copyright (C) 2011-2015 Hunter Kaller
+# Copyright (C) 2014, 2015 Sergio Benjamim
 
 # 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