Author: jbeich
Date: Fri May 29 19:33:24 2015
New Revision: 387882
URL: https://svnweb.freebsd.org/changeset/ports/387882
Log:
emulators/ppsspp-devel: add new slave port for git master
A temporary port to facilitate testing and upstreaming.
Added:
head/emulators/ppsspp-devel/
head/emulators/ppsspp-devel/Makefile (contents, props changed)
head/emulators/ppsspp-devel/distinfo (contents, props changed)
head/emulators/ppsspp-devel/files/
- copied from r387873, head/emulators/ppsspp/files/
Deleted:
head/emulators/ppsspp-devel/files/patch-Common_CPUDetect.cpp
head/emulators/ppsspp-devel/files/patch-Common_FileUtil.cpp
head/emulators/ppsspp-devel/files/patch-Common_MemArena.cpp
head/emulators/ppsspp-devel/files/patch-Common_StdMutex.h
head/emulators/ppsspp-devel/files/patch-Common_Swap.h
head/emulators/ppsspp-devel/files/patch-Core_FileSystems_tlzrc.cpp
head/emulators/ppsspp-devel/files/patch-Core_HLE_ReplaceTables.cpp
head/emulators/ppsspp-devel/files/patch-Core_HLE_sceRtc.cpp
head/emulators/ppsspp-devel/files/patch-Core_MIPS_JitCommon_JitCommon.cpp
head/emulators/ppsspp-devel/files/patch-Core_MIPS_fake_FakeJit.cpp
head/emulators/ppsspp-devel/files/patch-Core_MemMap.cpp
head/emulators/ppsspp-devel/files/patch-Core_Reporting.cpp
head/emulators/ppsspp-devel/files/patch-GPU_GLES_TextureScaler.cpp
head/emulators/ppsspp-devel/files/patch-Qt_PPSSPP.pro
head/emulators/ppsspp-devel/files/patch-Qt_Platform_linux.pri
head/emulators/ppsspp-devel/files/patch-Qt_Settings.pri
head/emulators/ppsspp-devel/files/patch-UI_CwCheatScreen.cpp
head/emulators/ppsspp-devel/files/patch-UI_DevScreens.cpp
head/emulators/ppsspp-devel/files/patch-UI_NativeApp.cpp
head/emulators/ppsspp-devel/files/patch-native_base_PCMain.cpp
head/emulators/ppsspp-devel/files/patch-native_base_basictypes.h
head/emulators/ppsspp-devel/files/patch-native_ext_cityhash_city.cpp
head/emulators/ppsspp-devel/files/patch-native_ext_stb__vorbis_stb__vorbis.c
head/emulators/ppsspp-devel/files/patch-native_file_file__util.cpp
head/emulators/ppsspp-devel/files/patch-native_net_http__client.h
head/emulators/ppsspp-devel/files/patch-native_net_http__headers.cpp
head/emulators/ppsspp-devel/files/patch-native_net_http__server.cpp
head/emulators/ppsspp-devel/files/patch-native_net_resolve.cpp
Modified:
head/emulators/Makefile
head/emulators/ppsspp-devel/files/patch-CMakeLists.txt
head/emulators/ppsspp-devel/files/patch-Common_MemoryUtil.cpp
head/emulators/ppsspp/Makefile
Modified: head/emulators/Makefile
==============================================================================
--- head/emulators/Makefile Fri May 29 19:30:30 2015 (r387881)
+++ head/emulators/Makefile Fri May 29 19:33:24 2015 (r387882)
@@ -110,6 +110,7 @@
SUBDIR += pearpc
SUBDIR += pipelight
SUBDIR += ppsspp
+ SUBDIR += ppsspp-devel
SUBDIR += q4wine
SUBDIR += qemu
SUBDIR += qemu-devel
Added: head/emulators/ppsspp-devel/Makefile
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/emulators/ppsspp-devel/Makefile Fri May 29 19:33:24 2015 (r387882)
@@ -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"
Added: head/emulators/ppsspp-devel/distinfo
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/emulators/ppsspp-devel/distinfo Fri May 29 19:33:24 2015 (r387882)
@@ -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
Modified: head/emulators/ppsspp-devel/files/patch-CMakeLists.txt
==============================================================================
--- head/emulators/ppsspp/files/patch-CMakeLists.txt Fri May 29 17:50:55 2015 (r387873)
+++ head/emulators/ppsspp-devel/files/patch-CMakeLists.txt Fri May 29 19:33:24 2015 (r387882)
@@ -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-devel/files/patch-Common_MemoryUtil.cpp
==============================================================================
--- head/emulators/ppsspp/files/patch-Common_MemoryUtil.cpp Fri May 29 17:50:55 2015 (r387873)
+++ head/emulators/ppsspp-devel/files/patch-Common_MemoryUtil.cpp Fri May 29 19:33:24 2015 (r387882)
@@ -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;
Modified: head/emulators/ppsspp/Makefile
==============================================================================
--- head/emulators/ppsspp/Makefile Fri May 29 19:30:30 2015 (r387881)
+++ head/emulators/ppsspp/Makefile Fri May 29 19:33:24 2015 (r387882)
@@ -1,9 +1,9 @@
# $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/
@@ -20,7 +20,9 @@ RUN_DEPENDS= xdg-open:${PORTSDIR}/devel/
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