pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/emulators/retroarch emulators/retroarch: Update to 1.7.3.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/d36371519bf1
branches:  trunk
changeset: 383686:d36371519bf1
user:      nia <nia%pkgsrc.org@localhost>
date:      Tue Aug 07 16:44:26 2018 +0000

description:
emulators/retroarch: Update to 1.7.3.

This brings it around 3 years forward and includes more changes than I
can easily list, since the changelogs don't go that far back.

diffstat:

 emulators/retroarch/Makefile                                        |   80 +--
 emulators/retroarch/PLIST                                           |   12 +-
 emulators/retroarch/distinfo                                        |   21 +-
 emulators/retroarch/options.mk                                      |  187 +++++++++-
 emulators/retroarch/patches/patch-Makefile                          |   75 ++-
 emulators/retroarch/patches/patch-frontend_drivers_platform__unix.c |   64 +++
 emulators/retroarch/version.mk                                      |    5 +
 7 files changed, 338 insertions(+), 106 deletions(-)

diffs (truncated from 512 to 300 lines):

diff -r 55f9e2f25b64 -r d36371519bf1 emulators/retroarch/Makefile
--- a/emulators/retroarch/Makefile      Tue Aug 07 16:41:48 2018 +0000
+++ b/emulators/retroarch/Makefile      Tue Aug 07 16:44:26 2018 +0000
@@ -1,63 +1,49 @@
-# $NetBSD: Makefile,v 1.7 2017/09/04 18:08:23 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2018/08/07 16:44:26 nia Exp $
 
-DISTNAME=      retroarch-20150203
-PKGNAME=       retroarch-0.0.20150203
-PKGREVISION=   1
+DISTNAME=      retroarch-${RETROARCH_VERSION}
 CATEGORIES=    emulators
-MASTER_SITES=  http://ftp.NetBSD.org/pub/NetBSD/misc/jmcneill/retroarch/
-EXTRACT_SUFX=  .zip
+MASTER_SITES=  ${MASTER_SITE_GITHUB:=libretro/}
+GITHUB_PROJECT=        RetroArch
+GITHUB_TAG=    v${PKGVERSION_NOREV}
 
-MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=      https://www.libretro.com/
+MAINTAINER=    nia%NetBSD.org@localhost
+HOMEPAGE=      https://www.retroarch.com/
 COMMENT=       Official reference frontend for the libretro API
 LICENSE=       gnu-gpl-v3
 
-WRKSRC=                ${WRKDIR}/RetroArch-master
+EXTRACT_USING= bsdtar
+USE_LANGUAGES= c c++
+USE_TOOLS+=    pkg-config gmake
+
 HAS_CONFIGURE= yes
-CONFIGURE_ARGS+=--global-config-dir=${PKG_SYSCONFDIR}
-CONFIGURE_ENV+= MAN_DIR=${PREFIX}/${PKGMANDIR}/man1/
-CONFIG_SHELL=  bash
-USE_LANGUAGES= c c++
-USE_TOOLS+=    bash pkg-config gmake
 
-PYTHON_VERSIONS_INCOMPATIBLE=  27
-REPLACE_PYTHON=        tools/cg2glsl.py
-
-EGDIR=         ${PREFIX}/share/examples/retroarch
-CONF_FILES+=   ${EGDIR}/retroarch.cfg ${PKG_SYSCONFDIR}/retroarch.cfg
+CONFIGURE_ARGS+=       --disable-builtinminiupnpc
+CONFIGURE_ARGS+=       --disable-builtinzlib
+CONFIGURE_ARGS+=       --disable-builtinflac
 
-SUBST_CLASSES+=                qb
-SUBST_STAGE.qb=                pre-configure
-SUBST_MESSAGE.qb=      Fixing path to true(1) in configure scripts.
-SUBST_FILES.qb=                qb/qb.libs.sh
-SUBST_SED.qb+=         -e 's;/bin/true;${TRUE};'
+CONFIGURE_ENV+=        BIN_DIR=${PREFIX}/bin
+CONFIGURE_ENV+=        MAN_DIR=${PREFIX}/${PKGMANDIR}
+
+MAKE_FLAGS+=   GIT_VERSION="-pkgsrc"
+
+DEPENDS+=      libretro-database>=${PKGVERSION_NOREV}:../../emulators/libretro-database
+DEPENDS+=      libretro-core-info>=${PKGVERSION_NOREV}:../../emulators/libretro-core-info
 
-SUBST_CLASSES+=                vc
-SUBST_STAGE.vc=                pre-configure
-SUBST_MESSAGE.vc=      Fixing path to VideoCore libraries.
-SUBST_FILES.vc=                qb/config.libs.sh
-SUBST_SED.vc+=         -e 's;/opt/vc;${PREFIX};g'
+CPPFLAGS+=     -DPREFIX=\"${PREFIX}\"
 
-SUBST_CLASSES+=                cfg
-SUBST_STAGE.cfg=       pre-configure
-SUBST_MESSAGE.cfg=     Setting paths in sample config.
-SUBST_FILES.cfg=       retroarch.cfg
-SUBST_SED.cfg+=                -e 's;.*libretro_directory =.*;libretro_directory = "${PREFIX}/lib/libretro";'
+.include "../../mk/bsd.fast.prefs.mk"
 
-post-install:
-       ${INSTALL_PROGRAM} ${WRKSRC}/tools/retroarch-joyconfig \
-           ${DESTDIR}${PREFIX}/bin/retroarch-joyconfig
+# On exit (load a game first):
+# assertion "pthread__tsd_destructors[key] != NULL" failed:
+# file "/usr/src/lib/libpthread/pthread_tsd.c", line 287, function "pthread_key_delete"
+# [1]   Abort trap (core dumped) retroarch
+.if ${OPSYS} == "NetBSD"
+CONFIGURE_ARGS+=       --disable-thread_storage
+.endif
 
+.include "version.mk"
 .include "options.mk"
-
-.include "../../lang/python/application.mk"
+.include "../../audio/flac/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
-.include "../../textproc/libxml2/buildlink3.mk"
-.include "../../graphics/freetype2/buildlink3.mk"
-.include "../../x11/libX11/buildlink3.mk"
-.include "../../x11/libXext/buildlink3.mk"
-.include "../../x11/libXinerama/buildlink3.mk"
-.include "../../x11/libXv/buildlink3.mk"
-.include "../../x11/libXxf86vm/buildlink3.mk"
-#.include "../../x11/libxkbcommon/buildlink3.mk"
+.include "../../net/miniupnpc/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 55f9e2f25b64 -r d36371519bf1 emulators/retroarch/PLIST
--- a/emulators/retroarch/PLIST Tue Aug 07 16:41:48 2018 +0000
+++ b/emulators/retroarch/PLIST Tue Aug 07 16:44:26 2018 +0000
@@ -1,10 +1,8 @@
-@comment $NetBSD: PLIST,v 1.1 2015/02/04 22:56:43 jmcneill Exp $
+@comment $NetBSD: PLIST,v 1.2 2018/08/07 16:44:26 nia Exp $
 bin/retroarch
-bin/retroarch-cg2glsl
-bin/retroarch-joyconfig
-man/man1/retroarch-cg2glsl.1
-man/man1/retroarch-joyconfig.1
-man/man1/retroarch.1
+man/man6/retroarch.6
+share/applications/retroarch.desktop
+share/doc/retroarch/COPYING
+share/doc/retroarch/README.md
 share/examples/retroarch/retroarch.cfg
-share/pixmaps/retroarch.png
 share/pixmaps/retroarch.svg
diff -r 55f9e2f25b64 -r d36371519bf1 emulators/retroarch/distinfo
--- a/emulators/retroarch/distinfo      Tue Aug 07 16:41:48 2018 +0000
+++ b/emulators/retroarch/distinfo      Tue Aug 07 16:44:26 2018 +0000
@@ -1,15 +1,8 @@
-$NetBSD: distinfo,v 1.4 2015/11/03 20:31:01 agc Exp $
+$NetBSD: distinfo,v 1.5 2018/08/07 16:44:26 nia Exp $
 
-SHA1 (retroarch-20150203.zip) = 46f9493f3ab09fd185345e6bab797c4e882c5262
-RMD160 (retroarch-20150203.zip) = 76c4ae4f7edb5c866f606cb23e5550a5b7c285b4
-SHA512 (retroarch-20150203.zip) = 6b7bc44a3956fe706a53ba56d06338823fe9438182b3e16d9a7d3e7f17197cb1d49ca163b947e980849c3d54912a816dd77b17613fffd4dc305486498bca7951
-Size (retroarch-20150203.zip) = 10043939 bytes
-SHA1 (patch-Makefile) = 41a8de7bc2d992cae1799935c5d3a61774c6be88
-SHA1 (patch-Makefile.common) = 3a2157e04dfacadc48f421106760b0194586677e
-SHA1 (patch-audio_audio__utils.c) = a489e8862d10e8dde77a7d22becafb690fb61f89
-SHA1 (patch-audio_audio__utils.h) = e6cb0d7897eee6908d62bb46a98d7a28398d9e14
-SHA1 (patch-audio_drivers__resampler_cc__resampler.c) = 2ec89750a7bad2eb4b799d389d0e995b316ccd82
-SHA1 (patch-audio_drivers__resampler_sinc.c) = 5747731b8aec14b6a5e1359e80698f121fe9f337
-SHA1 (patch-performance.c) = 1881d32968babc58686c88bfdeb021d18a222fe8
-SHA1 (patch-qb_config.libs.sh) = 4eccb74e9f31d0f8ff3eeb6c6ded03ac148b2808
-SHA1 (patch-qb_qb.libs.sh) = 00689ff9d4b6afc9313938e2921e90f01640420f
+SHA1 (retroarch-1.7.3.tar.gz) = e1d104df59faac60e4666bf78291d7f39793cdee
+RMD160 (retroarch-1.7.3.tar.gz) = c3203c559cda925a9e76ab7df7ed491ea0f89a85
+SHA512 (retroarch-1.7.3.tar.gz) = f6e3f82465d301450e7f9a947e3e50a0b972c2ae4ad52d41640c0933185988e910892ab04dd93d1f6bed485a406356233ea81f8468041f3425cd286670fb97b1
+Size (retroarch-1.7.3.tar.gz) = 19382106 bytes
+SHA1 (patch-Makefile) = e40570eaf260e527442264c2ba424f2d7f499885
+SHA1 (patch-frontend_drivers_platform__unix.c) = 090b82414411067409167c2b144f3d1ecac4d21c
diff -r 55f9e2f25b64 -r d36371519bf1 emulators/retroarch/options.mk
--- a/emulators/retroarch/options.mk    Tue Aug 07 16:41:48 2018 +0000
+++ b/emulators/retroarch/options.mk    Tue Aug 07 16:44:26 2018 +0000
@@ -1,23 +1,190 @@
-# $NetBSD: options.mk,v 1.1 2015/02/04 22:56:43 jmcneill Exp $
+# $NetBSD: options.mk,v 1.2 2018/08/07 16:44:26 nia Exp $
 
-.include "../../mk/bsd.prefs.mk"
+.include "../../mk/bsd.fast.prefs.mk"
+
+PKG_OPTIONS_VAR=               PKG_OPTIONS.retroarch
 
-PKG_OPTIONS_VAR=       PKG_OPTIONS.retroarch
-PKG_SUPPORTED_OPTIONS= sdl
-PKG_SUGGESTED_OPTIONS= sdl
+PKG_SUPPORTED_OPTIONS+=                sdl2 ffmpeg freetype qt5 x11 caca
+PKG_SUPPORTED_OPTIONS+=                alsa jack openal pulseaudio libusb-1
+PKG_SUPPORTED_OPTIONS+=                libxml2 # Deprecated
+PKG_SUGGESTED_OPTIONS+=                sdl2 ffmpeg freetype x11 openal
+
+.if ${OPSYS} == "Linux"
+PKG_SUPPORTED_OPTIONS+=                udev
+.endif
+
+PKG_SUGGESTED_OPTIONS.Linux+=  alsa pulseaudio udev
+
+PKG_OPTIONS_OPTIONAL_GROUPS+=  gl
+PKG_OPTIONS_GROUP.gl+=         opengl
 
 .if !empty(MACHINE_ARCH:M*arm*)
-PKG_SUPPORTED_OPTIONS+=        rpi
-PKG_SUGGESTED_OPTIONS+=        rpi
+CONFIGURE_ARGS+=               --enable-floathard
+PKG_OPTIONS_GROUP.gl+=         rpi
+PKG_SUPPORTED_OPTIONS+=                simd
+.  if !empty(MACHINE_ARCH:M*armv7*)
+PKG_SUGGESTED_OPTIONS+=                simd
+.  endif
+.endif
+
+.if !empty(MACHINE_PLATFORM:MLinux-*-*armv7*)
+PKG_OPTIONS_GROUP.gl+=         sunxi-mali-fb
+PKG_SUPPORTED_OPTIONS+=                sunxi-g2d
+PKG_SUGGESTED_OPTIONS+=                sunxi-g2d
+.endif
+
+.if !empty(MACHINE_PLATFORM:MNetBSD-*-arm*)
+PKG_SUGGESTED_OPTIONS+=                rpi
+.else
+PKG_SUGGESTED_OPTIONS+=                opengl
 .endif
 
 .include "../../mk/bsd.options.mk"
 
-.if !empty(PKG_OPTIONS:Mrpi)
+.if !empty(MACHINE_ARCH:M*arm*)
+.  if !empty(PKG_OPTIONS:Msimd)
+CONFIGURE_ARGS+=       --enable-neon
+.  else
+CONFIGURE_ARGS+=       --disable-neon
+.  endif
+.endif
+
+.if !empty(PKG_OPTIONS:Mx11)
+CONFIGURE_ARGS+=       --enable-x11
+.include "../../x11/libX11/buildlink3.mk"
+.include "../../x11/libXext/buildlink3.mk"
+.include "../../x11/libXxf86vm/buildlink3.mk"
+.include "../../x11/libXinerama/buildlink3.mk"
+.include "../../x11/libxcb/buildlink3.mk"
+.include "../../x11/libxkbcommon/buildlink3.mk"
+.else
 CONFIGURE_ARGS+=       --disable-x11
+.endif
+
+#
+# Graphics acceleration options
+#
+
+# Use standard Mesa OpenGL
+.if !empty(PKG_OPTIONS:Mopengl)
+.include "../../graphics/MesaLib/buildlink3.mk"
+CONFIGURE_ARGS+=       --enable-opengl
+USE_RETROARCH_GL=      yes
+
+# Enable use of the Raspberry Pi GPU driver
+.elif !empty(PKG_OPTIONS:Mrpi)
 .include "../../misc/raspberrypi-userland/buildlink3.mk"
+SUBST_CLASSES+=                vc
+SUBST_STAGE.vc=                pre-configure
+SUBST_MESSAGE.vc=      Fixing path to VideoCore libraries.
+SUBST_FILES.vc=                qb/config.libs.sh
+SUBST_SED.vc+=         -e 's;/opt/vc;${PREFIX};g'
+
+CONFIGURE_ARGS+=       --enable-opengles
+USE_RETROARCH_GL=      yes
+
+# Disable any graphics acceleration library
+.else
+CONFIGURE_ARGS+=       --disable-egl
+CONFIGURE_ARGS+=       --disable-opengl
+CONFIGURE_ARGS+=       --disable-vulkan
+CONFIGURE_ARGS+=       --disable-vulkan_display
+CONFIGURE_ARGS+=       --disable-wayland
+USE_RETROARCH_GL=      no
+.endif
+
+.if ${USE_RETROARCH_GL} == "yes"
+DEPENDS+=      retroarch-assets>=${PKGVERSION_NOREV}:../../emulators/retroarch-assets
+DEPENDS+=      libretro-glsl-shaders>0:../../emulators/libretro-glsl-shaders
+.endif
+
+.if !empty(PKG_OPTIONS:Msunxi-g2d)
+CONFIGURE_ARGS+=       --enable-sunxi
+.endif
+
+.if !empty(PKG_OPTIONS:Mudev)
+# To support keyboard callback interface in udev, the libxkbcommon package
+# (version 0.3 and up) is required. It is used to translate raw evdev events
+# to printable characters. It does not depend on Xorg, but it depends on X11
+# keyboard layout files being installed.
+.include "../../x11/libxkbcommon/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=       --disable-udev
 .endif
 
-.if !empty(PKG_OPTIONS:Msdl)
-.include "../../devel/SDL/buildlink3.mk"
+.if !empty(PKG_OPTIONS:Msdl2)
+CONFIGURE_ARGS+=       --enable-sdl2
+.include "../../devel/SDL2/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=       --disable-sdl2
+.endif
+
+.if !empty(PKG_OPTIONS:Mffmpeg)
+CONFIGURE_ARGS+=       --enable-ffmpeg
+.include "../../multimedia/ffmpeg4/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=       --disable-ffmpeg
+.endif
+
+.if !empty(PKG_OPTIONS:Mfreetype)
+CONFIGURE_ARGS+=       --enable-freetype
+.include "../../graphics/freetype2/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=       --disable-freetype
+.endif
+
+.if !empty(PKG_OPTIONS:Malsa)
+CONFIGURE_ARGS+=       --enable-alsa
+.include "../../audio/alsa-lib/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=       --disable-alsa
+.endif



Home | Main Index | Thread Index | Old Index