Index: head/emulators/Makefile =================================================================== --- head/emulators/Makefile (revision 387881) +++ head/emulators/Makefile (revision 387882) @@ -1,177 +1,178 @@ # $FreeBSD$ # COMMENT = Emulators for other operating systems SUBDIR += adamem SUBDIR += advancemame SUBDIR += advancemenu SUBDIR += advancemess SUBDIR += aftp SUBDIR += aqemu SUBDIR += atari800 SUBDIR += bfe SUBDIR += bochs SUBDIR += bsvc SUBDIR += catapult SUBDIR += cinc SUBDIR += cingb SUBDIR += cpmemu SUBDIR += cpmtools SUBDIR += cpmtools2 SUBDIR += darcnes SUBDIR += dboxfe SUBDIR += desmume SUBDIR += dgen-sdl SUBDIR += dolphin-emu SUBDIR += dosbox SUBDIR += doscmd SUBDIR += dtcyber SUBDIR += dynagen SUBDIR += dynagui SUBDIR += dynamips SUBDIR += dynamips-community SUBDIR += dynamips-devel SUBDIR += e-uae SUBDIR += fceux SUBDIR += fmsx SUBDIR += frodo SUBDIR += fs-uae SUBDIR += fs-uae-launcher SUBDIR += fuse SUBDIR += fuse-roms SUBDIR += fuse-utils SUBDIR += gbe SUBDIR += gem5 SUBDIR += generator SUBDIR += generator-cbiere SUBDIR += gens SUBDIR += gngb SUBDIR += gngeo SUBDIR += gns3 SUBDIR += gnuboy SUBDIR += gxemul SUBDIR += hatari SUBDIR += hercules SUBDIR += higan SUBDIR += hugo SUBDIR += hyperv-is SUBDIR += i386-wine SUBDIR += i386-wine-staging SUBDIR += i386-wine-devel SUBDIR += ia64sim SUBDIR += ines SUBDIR += javatari SUBDIR += joytran SUBDIR += jzintv SUBDIR += kcemu SUBDIR += klh10 SUBDIR += kqemu-kmod SUBDIR += kqemu-kmod-devel SUBDIR += lib765 SUBDIR += libdsk SUBDIR += libspectrum SUBDIR += linux-c6 SUBDIR += linux-f10 SUBDIR += linux_base-c6 SUBDIR += linux_base-f10 SUBDIR += lisaem SUBDIR += loemu SUBDIR += m2000 SUBDIR += mame SUBDIR += mastergear SUBDIR += mednafen SUBDIR += mess SUBDIR += minivmac SUBDIR += mtools SUBDIR += mupen64plus SUBDIR += mupen64plus-audio-sdl SUBDIR += mupen64plus-core SUBDIR += mupen64plus-input-sdl SUBDIR += mupen64plus-plugins SUBDIR += mupen64plus-rsp-hle SUBDIR += mupen64plus-rsp-z64 SUBDIR += mupen64plus-ui-console SUBDIR += mupen64plus-video-arachnoid SUBDIR += mupen64plus-video-glide64 SUBDIR += mupen64plus-video-glide64mk2 SUBDIR += mupen64plus-video-rice SUBDIR += mupen64plus-video-z64 SUBDIR += nonpareil SUBDIR += o2em SUBDIR += ods2reader SUBDIR += open-vm-tools SUBDIR += open-vm-tools-nox11 SUBDIR += openmsx SUBDIR += p5-Acme-6502 SUBDIR += parallels-tools SUBDIR += pcemu SUBDIR += pcsxr SUBDIR += pearpc SUBDIR += pipelight SUBDIR += ppsspp + SUBDIR += ppsspp-devel SUBDIR += q4wine SUBDIR += qemu SUBDIR += qemu-devel SUBDIR += qemu-launcher SUBDIR += qemu-sbruno SUBDIR += qemu-user-static SUBDIR += qmc2 SUBDIR += qtemu SUBDIR += quasi88 SUBDIR += raine SUBDIR += rtc SUBDIR += rubygem-fission SUBDIR += sim6811 SUBDIR += simh SUBDIR += skyeye SUBDIR += snes9express SUBDIR += snes9x SUBDIR += snes9x-gtk SUBDIR += spim SUBDIR += stella SUBDIR += stonx SUBDIR += swine SUBDIR += tiemu3 SUBDIR += tilem SUBDIR += tme SUBDIR += tpm-emulator SUBDIR += tuxnes SUBDIR += uae SUBDIR += ucon64 SUBDIR += vba SUBDIR += vboxtool SUBDIR += vgb-bin SUBDIR += vgba-bin SUBDIR += vice SUBDIR += virtio-kmod SUBDIR += virtualbox-ose SUBDIR += virtualbox-ose-additions SUBDIR += virtualbox-ose-kmod SUBDIR += visualboyadvance-m SUBDIR += vmips SUBDIR += vmsbackup SUBDIR += vmw SUBDIR += vxtools SUBDIR += wine SUBDIR += wine-staging SUBDIR += wine-devel SUBDIR += wine-gecko SUBDIR += wine-gecko-devel SUBDIR += wine-mono SUBDIR += wine-mono-devel SUBDIR += wxmupen64plus SUBDIR += x48 SUBDIR += x49gp SUBDIR += xbraitenberg SUBDIR += xcpc SUBDIR += xen SUBDIR += xen-kernel SUBDIR += xhomer SUBDIR += xsystem35 SUBDIR += xzx SUBDIR += yabause SUBDIR += yape SUBDIR += zsnes .include Index: head/emulators/ppsspp/Makefile =================================================================== --- head/emulators/ppsspp/Makefile (revision 387881) +++ head/emulators/ppsspp/Makefile (revision 387882) @@ -1,92 +1,94 @@ # $FreeBSD$ PORTNAME= ppsspp -PORTVERSION= 1.0.1 DISTVERSIONPREFIX= v -PORTREVISION= 2 +DISTVERSION?= 1.0.1 +PORTREVISION?= 2 CATEGORIES= emulators PATCH_SITES= https://projects.archlinux.org/svntogit/community.git/plain/trunk/ PATCHFILES= ${PORTNAME}-ffmpeg.patch?id=f2b9251:-p1 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 RUN_DEPENDS= xdg-open:${PORTSDIR}/devel/xdg-utils USE_GITHUB= yes GH_ACCOUNT= hrydgard:DEFAULT,lang,native Kingcom:ext_armips GH_PROJECT= ${PORTNAME}-lang:lang native:native armips:ext_armips -GH_TAGNAME= 52c757e:lang 52ce9c1:native a0b878f:ext_armips +GH_TAGNAME?= 52c757e:lang 52ce9c1:native a0b878f:ext_armips + +CONFLICTS_INSTALL?= ${PORTNAME}-devel-[0-9]* USES= compiler:c++11-lib pkgconfig USE_GL= glu USE_SDL= sdl2 # joystick QMAKE_SOURCE_PATH= ${WRKSRC}/Qt/PPSSPPQt.pro QMAKE_ARGS= CONFIG+="system_ffmpeg" LREL_TOOL="${LRELEASE}" NINJA_VERBOSE= yes INSTALLS_ICONS= yes OPTIONS_DEFAULT=QT5 OPTIONS_SINGLE= GUI OPTIONS_SINGLE_GUI= QT4 QT5 SDL QT4_USES= qmake:outsource QT4_USE= QT4=qmake_build,moc_build,rcc_build,uic_build,linguisttools_build,gui,opengl QT5_USES= qmake:outsource QT5_USE= QT5=qmake_build,buildtools_build,linguisttools_build,gui,opengl,widgets SDL_USES= cmake:outsource ninja SDL_BUILD_DEPENDS= png>=1.6:${PORTSDIR}/graphics/png SDL_LIB_DEPENDS= libpng.so:${PORTSDIR}/graphics/png SDL_LDFLAGS= -L${LOCALBASE}/lib # ffmpeg .include .if ! ${PORT_OPTIONS:MQT*} PORTDATA+= assets ${PORTNAME} .endif post-extract: # Convert USE_GITHUB groups to git-submodule(1) paths .for group in ${GH_PROJECT:C/.*://} @${RMDIR} ${WRKSRC}/${group:S,_,/,g} @${MV} ${WRKSRC_${group}} ${WRKSRC}/${group:S,_,/,g} .endfor post-patch: @${REINPLACE_CMD} -e 's,/usr/share,${PREFIX}/share,' \ ${WRKSRC}/UI/NativeApp.cpp @${REINPLACE_CMD} -e '/find_package(Git)/d' \ -e 's/"unknown"/"${GH_TAGNAME}"/' \ -e 's/^\(VERSION =\).*/\1 ${GH_TAGNAME}/' \ ${WRKSRC}/git-version.cmake \ ${WRKSRC}/Qt/Settings.pri do-install: .if ! ${PORT_OPTIONS:MQT*} # cmake doesn't pack assets into the app unlike qmake # XXX Convert to ${PORTDATA:N${PORTNAME}} once fmake is EOL (cd ${INSTALL_WRKSRC} && ${COPYTREE_SHARE} \ "${PORTDATA:Nppsspp}" ${STAGEDIR}${DATADIR}) # Install the app alongside assets to avoid warnings with GetExeDirectory() ${INSTALL_PROGRAM} ${INSTALL_WRKSRC}/${PORTNAME:tu}* \ ${STAGEDIR}${DATADIR}/${PORTNAME} ${LN} -sf ${DATADIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin .else ${INSTALL_PROGRAM} ${INSTALL_WRKSRC}/${PORTNAME} \ ${STAGEDIR}${PREFIX}/bin .endif ${INSTALL_DATA} ${WRKSRC}/debian/${PORTNAME}.desktop \ ${STAGEDIR}${DESKTOPDIR} ${INSTALL_DATA} ${WRKSRC}/debian/${PORTNAME}.1 \ ${STAGEDIR}${MAN1PREFIX}/man/man1 (cd ${WRKSRC}/assets/unix-icons && ${COPYTREE_SHARE} \ "hicolor" ${STAGEDIR}${PREFIX}/share/icons) ${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps ${INSTALL_DATA} ${WRKSRC}/assets/unix-icons/icon-512.svg \ ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps/${PORTNAME}.svg .include Index: head/emulators/ppsspp-devel/Makefile =================================================================== --- head/emulators/ppsspp-devel/Makefile (nonexistent) +++ head/emulators/ppsspp-devel/Makefile (revision 387882) @@ -0,0 +1,16 @@ +# $FreeBSD$ + +DISTVERSION= 1.0.1-551 +DISTVERSIONSUFFIX= -gee1299b +PORTREVISION= 0 +PKGNAMESUFFIX= -devel + +GH_TAGNAME= f7a2cb6:lang 9fe3f59:native a0b878f:ext_armips + +CONFLICTS_INSTALL?= ${PORTNAME}-[0-9]* + +MASTERDIR= ${.CURDIR}/../ppsspp +PATCHDIR= ${.CURDIR}/files +DISTINFO_FILE= ${.CURDIR}/distinfo + +.include "${MASTERDIR}/Makefile" Property changes on: head/emulators/ppsspp-devel/Makefile ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +FreeBSD=%H \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/emulators/ppsspp-devel/distinfo =================================================================== --- head/emulators/ppsspp-devel/distinfo (nonexistent) +++ head/emulators/ppsspp-devel/distinfo (revision 387882) @@ -0,0 +1,10 @@ +SHA256 (hrydgard-ppsspp-v1.0.1-551-gee1299b_GH0.tar.gz) = 3f30e14b54872fd7963086b43662ad2b1e2846a91167b0ba73da2db9e20f5507 +SIZE (hrydgard-ppsspp-v1.0.1-551-gee1299b_GH0.tar.gz) = 13508841 +SHA256 (hrydgard-ppsspp-lang-f7a2cb6_GH0.tar.gz) = ea342200e8750402ea3ca1fb928a166c3b59772ffbeef3cf65feb3e43f141f47 +SIZE (hrydgard-ppsspp-lang-f7a2cb6_GH0.tar.gz) = 200273 +SHA256 (hrydgard-native-9fe3f59_GH0.tar.gz) = 27a599540fdcb369cc4105e998be87dc14be7739d0daeeb5796aca9e422e8619 +SIZE (hrydgard-native-9fe3f59_GH0.tar.gz) = 1398942 +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 Property changes on: head/emulators/ppsspp-devel/distinfo ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/emulators/ppsspp-devel/files/patch-CMakeLists.txt =================================================================== --- head/emulators/ppsspp-devel/files/patch-CMakeLists.txt (nonexistent) +++ head/emulators/ppsspp-devel/files/patch-CMakeLists.txt (revision 387882) @@ -0,0 +1,16 @@ +--- CMakeLists.txt.orig 2015-02-26 20:05:06 UTC ++++ CMakeLists.txt +@@ -525,9 +527,10 @@ target_link_libraries(libzip ${ZLIB_LIBR + include_directories(native/ext/libzip) + set(LIBZIP_LIBRARY libzip) + +-# FindPNG does a few things we don't want. So do it ourselves. Fixed to libpng17 +-find_path(PNG_PNG_INCLUDE_DIR NAMES "libpng17/png.h") +-find_library(PNG_LIBRARY NAMES png17 libpng17) ++find_package(PkgConfig) ++pkg_check_modules(PNG libpng>=1.6) ++set(PNG_LIBRARY ${PNG_LIBRARIES}) ++set(PNG_PNG_INCLUDE_DIR ${PNG_INCLUDE_DIRS}) + find_package(PackageHandleStandardArgs) + find_package_handle_standard_args(PNG REQUIRED_VARS PNG_LIBRARY PNG_PNG_INCLUDE_DIR) + if (PNG_FOUND) Property changes on: head/emulators/ppsspp-devel/files/patch-CMakeLists.txt ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/emulators/ppsspp-devel/files/patch-Common_MemoryUtil.cpp =================================================================== --- head/emulators/ppsspp-devel/files/patch-Common_MemoryUtil.cpp (nonexistent) +++ head/emulators/ppsspp-devel/files/patch-Common_MemoryUtil.cpp (revision 387882) @@ -0,0 +1,38 @@ +--- Common/MemoryUtil.cpp.orig 2015-02-26 20:05:06 UTC ++++ Common/MemoryUtil.cpp +@@ -49,6 +49,13 @@ static SYSTEM_INFO sys_info; + #define round_page(x) ((((uintptr_t)(x)) + PAGE_MASK) & ~(PAGE_MASK)) + #endif + ++#if defined(__FreeBSD__) ++/* setrlimit(2) */ ++#include ++#include ++#include ++#endif ++ + #ifdef __SYMBIAN32__ + #include + #define CODECHUNK_SIZE 1024*1024*20 +@@ -142,6 +149,21 @@ void* AllocateExecutableMemory(size_t si + map_hint = (char*)round_page(&hint_location) - 0x20000000; // 0.5gb lower than our approximate location + else + map_hint = (char*)0x20000000; // 0.5GB mark in memory ++ ++#if defined(__FreeBSD__) ++ // XXX Fix maximum data segment size (data + BSS + heap) to 256 MB. ++ // This allows avoiding calling mmap(2) with MAP_FIXED. ++ // On FreeBSD, without lowering this limit, calling mmap(2) ++ // without MAP_FIXED will result in getting an address just ++ // beyond maximum data segment size which will be far beyond ++ // the desired 2 GB. ++ struct rlimit limit; ++ limit.rlim_cur = 0x10000000; // 256 MB ++ limit.rlim_max = 0x10000000; ++ if(setrlimit(RLIMIT_DATA, &limit) != 0) { ++ PanicAlert("Failed to lower maximum data segment size"); ++ } ++#endif + } + else if (exec && (uintptr_t) map_hint > 0xFFFFFFFFULL) + { Property changes on: head/emulators/ppsspp-devel/files/patch-Common_MemoryUtil.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/emulators/ppsspp-devel/files/patch-Core_Screenshot.cpp =================================================================== --- head/emulators/ppsspp-devel/files/patch-Core_Screenshot.cpp (nonexistent) +++ head/emulators/ppsspp-devel/files/patch-Core_Screenshot.cpp (revision 387882) @@ -0,0 +1,11 @@ +--- Core/Screenshot.cpp.orig 2015-02-26 20:05:06 UTC ++++ Core/Screenshot.cpp +@@ -18,7 +18,7 @@ + #ifdef USING_QT_UI + #include + #else +-#include ++#include "png.h" + #include "ext/jpge/jpge.h" + #endif + Property changes on: head/emulators/ppsspp-devel/files/patch-Core_Screenshot.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/emulators/ppsspp-devel/files/patch-native_image_png__load.cpp =================================================================== --- head/emulators/ppsspp-devel/files/patch-native_image_png__load.cpp (nonexistent) +++ head/emulators/ppsspp-devel/files/patch-native_image_png__load.cpp (revision 387882) @@ -0,0 +1,11 @@ +--- native/image/png_load.cpp.orig 2015-02-23 23:22:58 UTC ++++ native/image/png_load.cpp +@@ -5,7 +5,7 @@ + #ifdef USING_QT_UI + #include + #else +-#include "libpng17/png.h" ++#include "png.h" + #endif + + #include "png_load.h" Property changes on: head/emulators/ppsspp-devel/files/patch-native_image_png__load.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/emulators/ppsspp-devel/files/patch-Core_Loaders.cpp =================================================================== --- head/emulators/ppsspp-devel/files/patch-Core_Loaders.cpp (nonexistent) +++ head/emulators/ppsspp-devel/files/patch-Core_Loaders.cpp (revision 387882) @@ -0,0 +1,26 @@ +--- Core/Loaders.cpp.orig 2015-02-26 20:05:06 UTC ++++ Core/Loaders.cpp +@@ -15,6 +15,9 @@ + // Official git repository and contact information can be found at + // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. + ++// XXX ports/193528 ++#define _GLIBCXX_USE_C99 1 ++ + #include + #include + +@@ -310,12 +313,7 @@ HTTPFileLoader::HTTPFileLoader(const std + size_pos = header.find_first_not_of(' ', size_pos); + } + if (size_pos != header.npos) { +- // TODO: Find a way to get this to work right on Symbian? +-#ifndef __SYMBIAN32__ +- filesize_ = atoll(&header[size_pos]); +-#else +- filesize_ = atoi(&header[size_pos]); +-#endif ++ filesize_ = std::atoll(&header[size_pos]); + } + } + if (startsWithNoCase(header, "Accept-Ranges:")) { Property changes on: head/emulators/ppsspp-devel/files/patch-Core_Loaders.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property