libretro-ppsspp: Use c++11 and avoid use of pkg-config.

[nia <nia%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	nia <nia%NetBSD.org@localhost>
Pushed By:	nee
Date:		Mon Aug 13 19:44:54 2018 +0100
Changeset:	4fd614f1fd63fef14f9c286f58b19c41c5d1820e

Modified Files:
	libretro-ppsspp/Makefile
	libretro-ppsspp/distinfo
	libretro-ppsspp/patches/patch-libretro_Makefile
	libretro-ppsspp/patches/patch-libretro_Makefile.common

Log Message:
libretro-ppsspp: Use c++11 and avoid use of pkg-config.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=4fd614f1fd63fef14f9c286f58b19c41c5d1820e

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 libretro-ppsspp/Makefile                               | 17 ++++++++---------
 libretro-ppsspp/distinfo                               |  4 ++--
 libretro-ppsspp/patches/patch-libretro_Makefile        | 16 ++++------------
 libretro-ppsspp/patches/patch-libretro_Makefile.common |  2 +-
 4 files changed, 15 insertions(+), 24 deletions(-)

diffs:
diff --git a/libretro-ppsspp/Makefile b/libretro-ppsspp/Makefile
index 757c74b097..32b8d6c7cc 100644
--- a/libretro-ppsspp/Makefile
+++ b/libretro-ppsspp/Makefile
@@ -4,6 +4,7 @@ V=		1.6.3
 DISTNAME=	libretro-ppsspp-${V}
 CATEGORIES=	emulators
 
+MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	https://docs.libretro.com/library/ppsspp/
 COMMENT=	Libretro core based on the PPSSPP PlayStation Portable emulator
 LICENSE=	gnu-gpl-v2
@@ -33,22 +34,20 @@ WRKSRC=		${WRKDIR}/ppsspp-${PKGVERSION_NOREV}
 BUILD_DIRS=	libretro
 
 USE_TOOLS+=	gmake pkg-config
-USE_LANGUAGES=	c c++
+USE_LANGUAGES=	c c++11
 EXTRACT_USING=	bsdtar
 
-.include "../../mk/bsd.fast.prefs.mk"
+.include "../../mk/bsd.prefs.mk"
 
 .if !empty(MACHINE_ARCH:M*arm*)
 CFLAGS+=		-marm
-BUILD_MAKE_FLAGS+=	TARGET_ARCH=arm
+MAKE_FLAGS+=		TARGET_ARCH=arm
 .elif !empty(MACHINE_ARCH:M*x86_64*)
-BUILD_MAKE_FLAGS+=	TARGET_ARCH=x86_64
+MAKE_FLAGS+=		TARGET_ARCH=x86_64
 .elif !empty(MACHINE_ARCH:M*i386*)
-BUILD_MAKE_FLAGS+=	TARGET_ARCH=x86
+MAKE_FLAGS+=		TARGET_ARCH=x86
 .endif
 
-BUILD_MAKE_FLAGS+=	FFMPEGLDFLAGS="`pkg-config --libs libavformat libavcodec libavutil libswresample libswscale`"
-
 INSTALLATION_DIRS+=	${PREFIX}/lib/libretro
 
 post-extract:
@@ -63,8 +62,8 @@ do-install:
 .include "options.mk"
 
 .include "../../mk/dlopen.buildlink3.mk"
-BUILDLINK_TRANSFORM+=   opt:-ldl:${BUILDLINK_LDADD.dl:M*}
+BUILDLINK_TRANSFORM+=   opt:-ldl:${BUILDLINK_LDADD.dl:Q}
 
-.include "../../mk/pthread.buildlink3.mk"
 .include "../../multimedia/ffmpeg4/buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/libretro-ppsspp/distinfo b/libretro-ppsspp/distinfo
index a56c5b35c8..da9317a2e6 100644
--- a/libretro-ppsspp/distinfo
+++ b/libretro-ppsspp/distinfo
@@ -16,5 +16,5 @@ SHA1 (ppsspp-1.6.3.tar.gz) = 5a4ec3f99dcb50840d26a2c738ff1ce4a37e7433
 RMD160 (ppsspp-1.6.3.tar.gz) = 0b0ea6c86aad60a7d9d176332ea62a88d23411fa
 SHA512 (ppsspp-1.6.3.tar.gz) = fe592c81a3b22ba0fff3dbd403ad2f6b9639c39d036db31132147a91a25793acb8698174a1c139b7dced01a9101777b5c53a1e5db6b5da0b7727f480ef597b8e
 Size (ppsspp-1.6.3.tar.gz) = 19477643 bytes
-SHA1 (patch-libretro_Makefile) = 3ae57acd3dfe2fbc696ee58126006fe4c813f6e1
-SHA1 (patch-libretro_Makefile.common) = 27b8a25a2ab882a90f09fd24f656eb6ac6b9d79e
+SHA1 (patch-libretro_Makefile) = ff14d98bb21d87b5a27f40b180d73beef7ab2f74
+SHA1 (patch-libretro_Makefile.common) = 5bce7657a4b6703903b71e7d33317dcb284e2759
diff --git a/libretro-ppsspp/patches/patch-libretro_Makefile b/libretro-ppsspp/patches/patch-libretro_Makefile
index 60361d045c..2f9cd5455d 100644
--- a/libretro-ppsspp/patches/patch-libretro_Makefile
+++ b/libretro-ppsspp/patches/patch-libretro_Makefile
@@ -1,8 +1,8 @@
 $NetBSD$
 
-Allow using our own flags to link to pkgsrc ffmpeg.
+Use ffmpeg from pkgsrc.
 
---- libretro/Makefile.orig	2018-04-21 20:53:30.000000000 +0000
+--- libretro/Makefile.orig	2018-06-05 17:58:41.000000000 +0000
 +++ libretro/Makefile
 @@ -40,7 +40,6 @@ endif
  
@@ -12,22 +12,14 @@ Allow using our own flags to link to pkgsrc ffmpeg.
  LIBRETRODIR		= $(CORE_DIR)/libretro
  COREDIR			= $(CORE_DIR)/Core
  COMMONDIR		= $(CORE_DIR)/Common
-@@ -51,18 +50,11 @@ EXTDIR			= $(CORE_DIR)/ext
- 
- TARGET_NAME := ppsspp
- 
--FFMPEGINCFLAGS :=
--FFMPEGLIBDIR :=
--FFMPEGLIBS :=
--
- # Unix
- ifneq (,$(findstring unix,$(platform)))
+@@ -60,9 +59,7 @@ ifneq (,$(findstring unix,$(platform)))
  	TARGET := $(TARGET_NAME)_libretro.so
  	LDFLAGS += -shared -Wl,--version-script=link.T -Wl,--no-undefined
  
 -	FFMPEGINCFLAGS += -I$(FFMPEGDIR)/linux/$(TARGET_ARCH)/include
 -	FFMPEGLIBDIR := $(FFMPEGDIR)/linux/$(TARGET_ARCH)/lib
 -	FFMPEGLDFLAGS += -L$(FFMPEGLIBDIR) -lavformat -lavcodec -lavutil -lswresample -lswscale
++	FFMPEGLDFLAGS += -lavformat -lavcodec -lavutil -lswresample -lswscale
  	fpic = -fPIC
  	ifneq (,$(findstring gles,$(platform)))
  		GLES = 1
diff --git a/libretro-ppsspp/patches/patch-libretro_Makefile.common b/libretro-ppsspp/patches/patch-libretro_Makefile.common
index 1eb030d9a7..d22c0fe4f2 100644
--- a/libretro-ppsspp/patches/patch-libretro_Makefile.common
+++ b/libretro-ppsspp/patches/patch-libretro_Makefile.common
@@ -1,6 +1,6 @@
 $NetBSD$
 
-Fix "Build error: undefined references"
+Fix "Build error: undefined references".
 
 https://github.com/libretro/ppsspp/commit/68634705b9d6b5bc8db2232bc92b6ae06f0b31d8