From owner-svn-ports-all@freebsd.org Thu Sep 24 18:09:33 2015 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 37846A07669; Thu, 24 Sep 2015 18:09:33 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1B55818CC; Thu, 24 Sep 2015 18:09:33 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t8OI9WNi060107; Thu, 24 Sep 2015 18:09:32 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t8OI9W9k060103; Thu, 24 Sep 2015 18:09:32 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201509241809.t8OI9W9k060103@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Thu, 24 Sep 2015 18:09:32 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r397702 - in head/emulators: ppsspp ppsspp-devel ppsspp-devel/files ppsspp/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Sep 2015 18:09:33 -0000 Author: jbeich Date: Thu Sep 24 18:09:31 2015 New Revision: 397702 URL: https://svnweb.freebsd.org/changeset/ports/397702 Log: 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 Added: head/emulators/ppsspp/files/patch-git-version.cmake (contents, props changed) Deleted: head/emulators/ppsspp-devel/files/patch-CVE-2015-2331 Modified: head/emulators/ppsspp-devel/Makefile (contents, props changed) head/emulators/ppsspp-devel/distinfo (contents, props changed) head/emulators/ppsspp/Makefile (contents, props changed) Modified: head/emulators/ppsspp-devel/Makefile ============================================================================== --- head/emulators/ppsspp-devel/Makefile Thu Sep 24 18:08:56 2015 (r397701) +++ head/emulators/ppsspp-devel/Makefile Thu Sep 24 18:09:31 2015 (r397702) @@ -1,16 +1,37 @@ # $FreeBSD$ -DISTVERSION= 1.0.1-2668 -DISTVERSIONSUFFIX= -g253ed9f -PORTREVISION= 1 +DISTVERSION= 1.0.1-2768 +DISTVERSIONSUFFIX= -gd8b43dd +PORTREVISION= 0 PKGNAMESUFFIX= -devel +# XXX Get from Debian once #697821 lands +MASTER_SITES= https://bazaar.launchpad.net/~sergio-br2/${PORTNAME}/debian-sdl/download/1/${PORTNAME}.1-20140802045408-dd26dik367ztj5xg-8/:manpage +DISTFILES= ${PORTNAME}.1:manpage +EXTRACT_ONLY= ${DISTFILES:N*\:manpage:C/:.*//} GH_TAGNAME= e22d7a5:lang a0b878f:ext_armips CONFLICTS_INSTALL?= ${PORTNAME}-[0-9]* +LIB_DEPENDS= libzip.so:${PORTSDIR}/archivers/libzip \ + libsnappy.so:${PORTSDIR}/archivers/snappy +USE_GL= glew + +EXCLUDE= glew snappy libzip zlib +EXTRACT_AFTER_ARGS=${EXCLUDE:S,^,--exclude ,} + MASTERDIR= ${.CURDIR}/../ppsspp PATCHDIR= ${.CURDIR}/files DISTINFO_FILE= ${.CURDIR}/distinfo +post-patch: slave-post-patch +slave-post-patch: + @${REINPLACE_CMD} -e 's,/usr,${LOCALBASE},' \ + ${WRKSRC}/Qt/*.pr* + +post-install: slave-post-install +slave-post-install: + ${INSTALL_MAN} ${_DISTDIR}/${PORTNAME}.1 \ + ${STAGEDIR}${MAN1PREFIX}/man/man1 + .include "${MASTERDIR}/Makefile" Modified: head/emulators/ppsspp-devel/distinfo ============================================================================== --- head/emulators/ppsspp-devel/distinfo Thu Sep 24 18:08:56 2015 (r397701) +++ head/emulators/ppsspp-devel/distinfo Thu Sep 24 18:09:31 2015 (r397702) @@ -1,5 +1,7 @@ -SHA256 (hrydgard-ppsspp-v1.0.1-2668-g253ed9f_GH0.tar.gz) = 53126bbbc64e0e9fb61f4ffe65d3d87f79f68803bbf3dcc67bcb387b1a00d270 -SIZE (hrydgard-ppsspp-v1.0.1-2668-g253ed9f_GH0.tar.gz) = 14919158 +SHA256 (ppsspp.1) = 8e335555393a6400c97d5f6d23798af801f88b909181bb5af676dfdcb4f8f8be +SIZE (ppsspp.1) = 1507 +SHA256 (hrydgard-ppsspp-v1.0.1-2768-gd8b43dd_GH0.tar.gz) = 0f5c25a67cf8466b56a7947fa0ceb65b92eca3f51b164830d6f6d84648432299 +SIZE (hrydgard-ppsspp-v1.0.1-2768-gd8b43dd_GH0.tar.gz) = 14756762 SHA256 (hrydgard-ppsspp-lang-e22d7a5_GH0.tar.gz) = b481a44c75b646d99909e3acd1f59614e7c05463e73c3827a662d9cf298e84cb SIZE (hrydgard-ppsspp-lang-e22d7a5_GH0.tar.gz) = 210229 SHA256 (Kingcom-armips-a0b878f_GH0.tar.gz) = 64623bbddda609f9692904e6b6823b1d2d4dd0149349f2be9edcc600bf12bafa Modified: head/emulators/ppsspp/Makefile ============================================================================== --- head/emulators/ppsspp/Makefile Thu Sep 24 18:08:56 2015 (r397701) +++ head/emulators/ppsspp/Makefile Thu Sep 24 18:09:31 2015 (r397702) @@ -16,7 +16,7 @@ COMMENT= PSP emulator in C++ with dynare 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 Added: head/emulators/ppsspp/files/patch-git-version.cmake ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/emulators/ppsspp/files/patch-git-version.cmake Thu Sep 24 18:09:31 2015 (r397702) @@ -0,0 +1,19 @@ +commit e81fa01 +Author: sergiobenrocha2 +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