From owner-svn-ports-head@freebsd.org Tue Oct 6 03:20:29 2015 Return-Path: Delivered-To: svn-ports-head@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 4A7DD9B6DC7; Tue, 6 Oct 2015 03:20:29 +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 307A31AC9; Tue, 6 Oct 2015 03:20:29 +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 t963KTVb053698; Tue, 6 Oct 2015 03:20:29 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t963KQKJ051893; Tue, 6 Oct 2015 03:20:26 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201510060320.t963KQKJ051893@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Tue, 6 Oct 2015 03:20:26 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r398680 - 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-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 06 Oct 2015 03:20:29 -0000 Author: jbeich Date: Tue Oct 6 03:20:26 2015 New Revision: 398680 URL: https://svnweb.freebsd.org/changeset/ports/398680 Log: emulators/ppsspp: update to 1.1.0 - Integrate r397030 and r397702 into master port - Switch slave port back to use patches from master Changes: http://ppsspp.org/#news Added: head/emulators/ppsspp/files/patch-Core_FileLoaders_HTTPFileLoader.cpp (contents, props changed) - copied, changed from r398676, head/emulators/ppsspp-devel/files/patch-Core_FileLoaders_HTTPFileLoader.cpp head/emulators/ppsspp/files/patch-ext_native_image_png__load.cpp (contents, props changed) - copied, changed from r398676, head/emulators/ppsspp-devel/files/patch-ext_native_image_png__load.cpp Deleted: head/emulators/ppsspp-devel/files/ head/emulators/ppsspp/files/patch-CVE-2015-2331 head/emulators/ppsspp/files/patch-Common_CPUDetect.cpp head/emulators/ppsspp/files/patch-Common_FileUtil.cpp head/emulators/ppsspp/files/patch-Common_MemArena.cpp head/emulators/ppsspp/files/patch-Common_StdMutex.h head/emulators/ppsspp/files/patch-Common_Swap.h head/emulators/ppsspp/files/patch-Core_FileSystems_tlzrc.cpp head/emulators/ppsspp/files/patch-Core_HLE_ReplaceTables.cpp head/emulators/ppsspp/files/patch-Core_HLE_sceRtc.cpp head/emulators/ppsspp/files/patch-Core_Loaders.cpp head/emulators/ppsspp/files/patch-Core_MIPS_JitCommon_JitCommon.cpp head/emulators/ppsspp/files/patch-Core_MIPS_fake_FakeJit.cpp head/emulators/ppsspp/files/patch-Core_MemMap.cpp head/emulators/ppsspp/files/patch-Core_Reporting.cpp head/emulators/ppsspp/files/patch-GPU_GLES_TextureScaler.cpp head/emulators/ppsspp/files/patch-Qt_PPSSPP.pro head/emulators/ppsspp/files/patch-Qt_Platform_linux.pri head/emulators/ppsspp/files/patch-Qt_Settings.pri head/emulators/ppsspp/files/patch-UI_CwCheatScreen.cpp head/emulators/ppsspp/files/patch-UI_DevScreens.cpp head/emulators/ppsspp/files/patch-UI_NativeApp.cpp head/emulators/ppsspp/files/patch-git-version.cmake head/emulators/ppsspp/files/patch-native_base_PCMain.cpp head/emulators/ppsspp/files/patch-native_base_basictypes.h head/emulators/ppsspp/files/patch-native_ext_cityhash_city.cpp head/emulators/ppsspp/files/patch-native_ext_stb__vorbis_stb__vorbis.c head/emulators/ppsspp/files/patch-native_file_file__util.cpp head/emulators/ppsspp/files/patch-native_image_png__load.cpp head/emulators/ppsspp/files/patch-native_net_http__client.h head/emulators/ppsspp/files/patch-native_net_http__headers.cpp head/emulators/ppsspp/files/patch-native_net_http__server.cpp head/emulators/ppsspp/files/patch-native_net_resolve.cpp Modified: head/emulators/ppsspp-devel/Makefile (contents, props changed) head/emulators/ppsspp/Makefile (contents, props changed) head/emulators/ppsspp/distinfo (contents, props changed) head/emulators/ppsspp/files/patch-CMakeLists.txt (contents, props changed) head/emulators/ppsspp/files/patch-Common_MemoryUtil.cpp (contents, props changed) head/emulators/ppsspp/files/patch-ext_xbrz_xbrz.cpp (contents, props changed) Modified: head/emulators/ppsspp-devel/Makefile ============================================================================== --- head/emulators/ppsspp-devel/Makefile Tue Oct 6 03:20:22 2015 (r398679) +++ head/emulators/ppsspp-devel/Makefile Tue Oct 6 03:20:26 2015 (r398680) @@ -4,34 +4,12 @@ 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/Makefile ============================================================================== --- head/emulators/ppsspp/Makefile Tue Oct 6 03:20:22 2015 (r398679) +++ head/emulators/ppsspp/Makefile Tue Oct 6 03:20:26 2015 (r398680) @@ -2,37 +2,35 @@ PORTNAME= ppsspp DISTVERSIONPREFIX= v -DISTVERSION?= 1.0.1 -PORTREVISION?= 5 +DISTVERSION?= 1.1.0 +PORTREVISION?= 0 CATEGORIES= emulators - -.ifndef PKGNAMESUFFIX -PATCH_SITES= https://projects.archlinux.org/svntogit/community.git/plain/trunk/ -PATCHFILES= ${PORTNAME}-ffmpeg.patch?id=f2b9251:-p1 -.endif +# 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/:.*//} MAINTAINER= jbeich@FreeBSD.org 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= libzip.so:${PORTSDIR}/archivers/libzip \ + libsnappy.so:${PORTSDIR}/archivers/snappy \ + libavcodec.so:${PORTSDIR}/multimedia/ffmpeg RUN_DEPENDS= xdg-open:${PORTSDIR}/devel/xdg-utils USE_GITHUB= yes GH_ACCOUNT= hrydgard:DEFAULT,lang Kingcom:ext_armips GH_PROJECT= ${PORTNAME}-lang:lang armips:ext_armips -GH_TAGNAME?= 52c757e:lang 52ce9c1:native a0b878f:ext_armips - -.ifndef PKGNAMESUFFIX -GH_ACCOUNT+= hrydgard:native -GH_PROJECT+= native:native -.endif +GH_TAGNAME?= 38e1efe:lang a0b878f:ext_armips CONFLICTS_INSTALL?= ${PORTNAME}-devel-[0-9]* USES= compiler:c++11-lib localbase pkgconfig -USE_GL+= glu +EXCLUDE= glew snappy libzip zlib +EXTRACT_AFTER_ARGS=${EXCLUDE:S,^,--exclude ,} +USE_GL= glew glu USE_SDL= sdl2 # joystick CMAKE_ARGS= -DUSE_SYSTEM_FFMPEG=on QMAKE_SOURCE_PATH= ${WRKSRC}/Qt/PPSSPPQt.pro @@ -70,6 +68,8 @@ post-extract: post-patch: @${REINPLACE_CMD} -e 's,/usr/share,${PREFIX}/share,' \ ${WRKSRC}/UI/NativeApp.cpp + @${REINPLACE_CMD} -e 's,/usr,${LOCALBASE},' \ + ${WRKSRC}/Qt/*.pr* @${REINPLACE_CMD} \ -e 's/"unknown"/"${GH_TAGNAME}"/' \ -e 's/^\(VERSION =\).*/\1 ${GH_TAGNAME}/' \ @@ -91,10 +91,8 @@ do-install-SDL-off: ${STAGEDIR}${PREFIX}/bin post-install: -.ifndef PKGNAMESUFFIX - ${INSTALL_MAN} ${WRKSRC}/debian/${PORTNAME}.1 \ + ${INSTALL_MAN} ${_DISTDIR}/${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 Modified: head/emulators/ppsspp/distinfo ============================================================================== --- head/emulators/ppsspp/distinfo Tue Oct 6 03:20:22 2015 (r398679) +++ head/emulators/ppsspp/distinfo Tue Oct 6 03:20:26 2015 (r398680) @@ -1,10 +1,8 @@ -SHA256 (hrydgard-ppsspp-v1.0.1_GH0.tar.gz) = e2d656671301a13e13f94c0a3021eaacacc9428fa9df60307b16ed5b4498812c -SIZE (hrydgard-ppsspp-v1.0.1_GH0.tar.gz) = 14199883 -SHA256 (hrydgard-ppsspp-lang-52c757e_GH0.tar.gz) = 9f9c97e1d506645f68dfb7fbd6c380be0bb66d23f56a33251bb50ac95b498e8a -SIZE (hrydgard-ppsspp-lang-52c757e_GH0.tar.gz) = 193165 -SHA256 (hrydgard-native-52ce9c1_GH0.tar.gz) = 2d3fbcc0685046326f21158892c235a1dcd4770d1cfedd29da0e06daa9c2ce5e -SIZE (hrydgard-native-52ce9c1_GH0.tar.gz) = 1393991 +SHA256 (ppsspp.1) = 8e335555393a6400c97d5f6d23798af801f88b909181bb5af676dfdcb4f8f8be +SIZE (ppsspp.1) = 1507 +SHA256 (hrydgard-ppsspp-v1.1.0_GH0.tar.gz) = b65d95e66d37bdcb2e9ab4d176014f2088951f4be7e0d13fc1de6786ab4ef736 +SIZE (hrydgard-ppsspp-v1.1.0_GH0.tar.gz) = 14767366 +SHA256 (hrydgard-ppsspp-lang-38e1efe_GH0.tar.gz) = 5585ff0b46d7ff7633b23d0069a20d27107003454c77f06762f4e6701725cd1c +SIZE (hrydgard-ppsspp-lang-38e1efe_GH0.tar.gz) = 214388 SHA256 (Kingcom-armips-a0b878f_GH0.tar.gz) = 64623bbddda609f9692904e6b6823b1d2d4dd0149349f2be9edcc600bf12bafa SIZE (Kingcom-armips-a0b878f_GH0.tar.gz) = 136535 -SHA256 (ppsspp-ffmpeg.patch?id=f2b9251) = 4d60b99f9e6fe1bb81b2b1b648845f9e76289ba824fcb5e53f2117d0319e086d -SIZE (ppsspp-ffmpeg.patch?id=f2b9251) = 6304 Modified: head/emulators/ppsspp/files/patch-CMakeLists.txt ============================================================================== --- head/emulators/ppsspp/files/patch-CMakeLists.txt Tue Oct 6 03:20:22 2015 (r398679) +++ head/emulators/ppsspp/files/patch-CMakeLists.txt Tue Oct 6 03:20:26 2015 (r398680) @@ -1,25 +1,5 @@ --- CMakeLists.txt.orig 2015-02-26 20:05:06 UTC +++ CMakeLists.txt -@@ -21,7 +21,9 @@ if(CMAKE_SYSTEM_PROCESSOR) - if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "^armv7") - set(ARMV7 ON) - endif() -- elseif(${CMAKE_SYSTEM_PROCESSOR} MATCHES "^x86" OR ${CMAKE_SYSTEM_PROCESSOR} MATCHES "i.86") -+ elseif(${CMAKE_SYSTEM_PROCESSOR} MATCHES "^x86" OR -+ ${CMAKE_SYSTEM_PROCESSOR} MATCHES "^amd64" OR -+ ${CMAKE_SYSTEM_PROCESSOR} MATCHES "i.86") - set(X86 ON) - elseif(${CMAKE_SYSTEM_PROCESSOR} MATCHES "^mips") - set(MIPS ON) -@@ -250,7 +252,7 @@ if(NOT MSVC) - if (NOT CMAKE_C_COMPILER_ID STREQUAL "Intel" AND NOT CMAKE_C_COMPILER_ID STREQUAL "Clang") - add_definitions(-Wno-psabi) - endif() -- add_definitions(-D_XOPEN_SOURCE=600 -D_XOPEN_SOURCE_EXTENDED -D__BSD_VISIBLE=1) -+ add_definitions(-D_XOPEN_SOURCE=700 -D_XOPEN_SOURCE_EXTENDED -D__BSD_VISIBLE=1) - add_definitions(-D_LARGEFILE64_SOURCE=1 -D_FILE_OFFSET_BITS=64) - endif() - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") @@ -525,9 +527,10 @@ target_link_libraries(libzip ${ZLIB_LIBR include_directories(native/ext/libzip) set(LIBZIP_LIBRARY libzip) Modified: head/emulators/ppsspp/files/patch-Common_MemoryUtil.cpp ============================================================================== --- head/emulators/ppsspp/files/patch-Common_MemoryUtil.cpp Tue Oct 6 03:20:22 2015 (r398679) +++ head/emulators/ppsspp/files/patch-Common_MemoryUtil.cpp Tue Oct 6 03:20:26 2015 (r398680) @@ -36,12 +36,3 @@ } else if (exec && (uintptr_t) map_hint > 0xFFFFFFFFULL) { -@@ -160,7 +182,7 @@ void* AllocateExecutableMemory(size_t si - // printf("Mapped executable memory at %p (size %ld)\n", ptr, - // (unsigned long)size); - --#if defined(__FreeBSD__) -+#if !defined(_WIN32) && !defined(__SYMBIAN32__) - if (ptr == MAP_FAILED) - { - ptr = NULL; Copied and modified: head/emulators/ppsspp/files/patch-Core_FileLoaders_HTTPFileLoader.cpp (from r398676, head/emulators/ppsspp-devel/files/patch-Core_FileLoaders_HTTPFileLoader.cpp) ============================================================================== Copied and modified: head/emulators/ppsspp/files/patch-ext_native_image_png__load.cpp (from r398676, head/emulators/ppsspp-devel/files/patch-ext_native_image_png__load.cpp) ============================================================================== Modified: head/emulators/ppsspp/files/patch-ext_xbrz_xbrz.cpp ============================================================================== --- head/emulators/ppsspp/files/patch-ext_xbrz_xbrz.cpp Tue Oct 6 03:20:22 2015 (r398679) +++ head/emulators/ppsspp/files/patch-ext_xbrz_xbrz.cpp Tue Oct 6 03:20:26 2015 (r398680) @@ -1,8 +1,8 @@ ---- ext/xbrz/xbrz.cpp.orig 2015-02-26 20:05:06 UTC +--- ext/xbrz/xbrz.cpp.orig 2015-05-28 17:02:46 UTC +++ ext/xbrz/xbrz.cpp -@@ -616,23 +616,21 @@ void scalePixel(const Kernel_3x3& ker, - auto eq = [&](uint32_t col1, uint32_t col2) { return ColorDistance::dist(col1, col2, cfg.luminanceWeight_) < cfg.equalColorTolerance_; }; - auto dist = [&](uint32_t col1, uint32_t col2) { return ColorDistance::dist(col1, col2, cfg.luminanceWeight_); }; +@@ -648,23 +648,21 @@ void scalePixel(const Kernel_3x3& ker, + auto eq = [&](uint32_t pix1, uint32_t pix2) { return ColorDistance::dist(pix1, pix2, cfg.luminanceWeight_) < cfg.equalColorTolerance_; }; + auto dist = [&](uint32_t pix1, uint32_t pix2) { return ColorDistance::dist(pix1, pix2, cfg.luminanceWeight_); }; - const bool doLineBlend = [&]() -> bool - { @@ -23,12 +23,12 @@ + else if (getBottomL(blend) != BLEND_NONE && !eq(e, c)) + doLineBlend = false; //no full blending for L-shapes; blend corner only (handles "mario mushroom eyes") -- if (eq(g, h) && eq(h , i) && eq(i, f) && eq(f, c) && !eq(e, i)) +- if (!eq(e, i) && eq(g, h) && eq(h , i) && eq(i, f) && eq(f, c)) - return false; - - return true; - }(); -+ else if (eq(g, h) && eq(h, i) && eq(i, f) && eq(f, c) && !eq(e, i)) ++ else if (!eq(e, i) && eq(g, h) && eq(h, i) && eq(i, f) && eq(f, c)) + doLineBlend = false; + else + doLineBlend = true;