diff options
| author | Jan Beich <jbeich@FreeBSD.org> | 2015-09-24 18:09:31 +0000 |
|---|---|---|
| committer | Jan Beich <jbeich@FreeBSD.org> | 2015-09-24 18:09:31 +0000 |
| commit | 837ff9f943b8f549ce0f4fe6f48948cadacdc99b (patch) | |
| tree | 924cd229c84be5e1ad6313b28e2d7d0918b1b5fb /emulators/ppsspp | |
| parent | 6b7b4fdcba6bfb81db102a8b56b13d79f277a316 (diff) | |
emulators/ppsspp-devel: update to 1.0.1.2768
- Take advantage of more system libraries support upstream
Changes: https://github.com/hrydgard/ppsspp/compare/253ed9f...d8b43dd
Notes
Notes:
svn path=/head/; revision=397702
Diffstat (limited to 'emulators/ppsspp')
| -rw-r--r-- | emulators/ppsspp/Makefile | 8 | ||||
| -rw-r--r-- | emulators/ppsspp/files/patch-git-version.cmake | 19 |
2 files changed, 24 insertions, 3 deletions
diff --git a/emulators/ppsspp/Makefile b/emulators/ppsspp/Makefile index 16a246131a12..1da0f9435b9c 100644 --- a/emulators/ppsspp/Makefile +++ b/emulators/ppsspp/Makefile @@ -16,7 +16,7 @@ COMMENT= PSP emulator in C++ with dynarec JIT for x86, ARM, MIPS LICENSE= GPLv2 # or any later version -LIB_DEPENDS= libavcodec.so:${PORTSDIR}/multimedia/ffmpeg +LIB_DEPENDS+= libavcodec.so:${PORTSDIR}/multimedia/ffmpeg RUN_DEPENDS= xdg-open:${PORTSDIR}/devel/xdg-utils USE_GITHUB= yes @@ -32,7 +32,7 @@ GH_PROJECT+= native:native CONFLICTS_INSTALL?= ${PORTNAME}-devel-[0-9]* USES= compiler:c++11-lib pkgconfig -USE_GL= glu +USE_GL+= glu USE_SDL= sdl2 # joystick CMAKE_ARGS= -DUSE_SYSTEM_FFMPEG=on QMAKE_SOURCE_PATH= ${WRKSRC}/Qt/PPSSPPQt.pro @@ -71,7 +71,7 @@ post-extract: post-patch: @${REINPLACE_CMD} -e 's,/usr/share,${PREFIX}/share,' \ ${WRKSRC}/UI/NativeApp.cpp - @${REINPLACE_CMD} -e '/find_package(Git)/d' \ + @${REINPLACE_CMD} \ -e 's/"unknown"/"${GH_TAGNAME}"/' \ -e 's/^\(VERSION =\).*/\1 ${GH_TAGNAME}/' \ ${WRKSRC}/git-version.cmake \ @@ -92,8 +92,10 @@ do-install-SDL-off: ${STAGEDIR}${PREFIX}/bin post-install: +.ifndef PKGNAMESUFFIX ${INSTALL_MAN} ${WRKSRC}/debian/${PORTNAME}.1 \ ${STAGEDIR}${MAN1PREFIX}/man/man1 +.endif (cd ${WRKSRC}/assets/unix-icons && ${COPYTREE_SHARE} \ "hicolor" ${STAGEDIR}${PREFIX}/share/icons) ${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps diff --git a/emulators/ppsspp/files/patch-git-version.cmake b/emulators/ppsspp/files/patch-git-version.cmake new file mode 100644 index 000000000000..a619a9007aef --- /dev/null +++ b/emulators/ppsspp/files/patch-git-version.cmake @@ -0,0 +1,19 @@ +commit e81fa01 +Author: sergiobenrocha2 <sergiobenrocha2@gmail.com> +Date: Wed Sep 16 19:07:25 2015 -0300 + + fix build when git is installed but there is no .git folder. + +diff --git git-version.cmake git-version.cmake +index a507a93..ff276d7 100644 +--- git-version.cmake ++++ git-version.cmake +@@ -3,7 +3,7 @@ set(GIT_VERSION "unknown") + set(GIT_VERSION_UPDATE "1") + + find_package(Git) +-if(GIT_FOUND) ++if(GIT_FOUND AND EXISTS ".git") + execute_process(COMMAND ${GIT_EXECUTABLE} describe --always + WORKING_DIRECTORY ${SOURCE_DIR} + RESULT_VARIABLE exit_code |