svn commit: r472183 - in head/emulators/pcsxr: . files
Ganael LAPLANCHE
martymac at FreeBSD.org
Mon Jun 11 11:46:10 UTC 2018
Author: martymac
Date: Mon Jun 11 11:46:05 2018
New Revision: 472183
URL: https://svnweb.freebsd.org/changeset/ports/472183
Log:
Update to latest available Codeplex' snapshot and host project on Github
Added:
head/emulators/pcsxr/files/patch-doc-CMakeLists.txt (contents, props changed)
head/emulators/pcsxr/files/patch-gui-CMakeLists.txt (contents, props changed)
head/emulators/pcsxr/files/patch-gui-po-CMakeLists.txt (contents, props changed)
head/emulators/pcsxr/files/patch-libpcsxcore-CMakeLists.txt (contents, props changed)
head/emulators/pcsxr/files/patch-libpcsxcore-ix86_64-ix86_cpudetect.c (contents, props changed)
head/emulators/pcsxr/files/patch-libpcsxcore-psxcommon.h (contents, props changed)
head/emulators/pcsxr/files/patch-plugins-bladesio1-CMakeLists.txt (contents, props changed)
head/emulators/pcsxr/files/patch-plugins-dfcdrom-CMakeLists.txt (contents, props changed)
head/emulators/pcsxr/files/patch-plugins-dfinput-CMakeLists.txt (contents, props changed)
head/emulators/pcsxr/files/patch-plugins-dfnet-CMakeLists.txt (contents, props changed)
head/emulators/pcsxr/files/patch-plugins-dfsound-CMakeLists.txt (contents, props changed)
head/emulators/pcsxr/files/patch-plugins-dfxvideo-CMakeLists.txt (contents, props changed)
head/emulators/pcsxr/files/patch-plugins-peopsxgl-CMakeLists.txt (contents, props changed)
Deleted:
head/emulators/pcsxr/files/patch-configure.ac
head/emulators/pcsxr/files/patch-gui-Makefile.am
head/emulators/pcsxr/files/patch-libpcsxcore-cdriso.c
head/emulators/pcsxr/files/patch-libpcsxcore-socket.c
head/emulators/pcsxr/files/patch-plugins-bladesio1-Makefile.am
head/emulators/pcsxr/files/patch-plugins-bladesio1-connection.c
head/emulators/pcsxr/files/patch-plugins-dfcdrom-Makefile.am
head/emulators/pcsxr/files/patch-plugins-dfinput-Makefile.am
head/emulators/pcsxr/files/patch-plugins-dfinput-pad.c
head/emulators/pcsxr/files/patch-plugins-dfnet-Makefile.am
head/emulators/pcsxr/files/patch-plugins-dfsound-Makefile.am
head/emulators/pcsxr/files/patch-plugins-dfxvideo-Makefile.am
head/emulators/pcsxr/files/patch-plugins-dfxvideo-gpu.c
head/emulators/pcsxr/files/patch-plugins-peopsxgl-Makefile.am
head/emulators/pcsxr/files/patch-plugins-peopsxgl-gpu.c
Modified:
head/emulators/pcsxr/Makefile
head/emulators/pcsxr/distinfo
head/emulators/pcsxr/pkg-plist
Modified: head/emulators/pcsxr/Makefile
==============================================================================
--- head/emulators/pcsxr/Makefile Mon Jun 11 11:06:11 2018 (r472182)
+++ head/emulators/pcsxr/Makefile Mon Jun 11 11:46:05 2018 (r472183)
@@ -2,39 +2,45 @@
# $FreeBSD$
PORTNAME= pcsxr
-PORTVERSION= 1.9.94.r87113
-PORTREVISION= 9
+PORTVERSION= 1.9.95.20180604
CATEGORIES= emulators
-MASTER_SITES= http://contribs.martymac.org/FreeBSD-ports/distfiles/ \
- LOCAL/martymac
MAINTAINER= martymac at FreeBSD.org
COMMENT= Playstation (PSX) emulator
-LICENSE= GPLv2
+LICENSE= GPLv3+
ONLY_FOR_ARCHS= amd64 i386
-BUILD_DEPENDS= gawk:lang/gawk
LIB_DEPENDS= libvorbis.so:audio/libvorbis \
- libcdio.so:sysutils/libcdio
+ libcdio.so:sysutils/libcdio \
+ libavformat.so:multimedia/ffmpeg
-USES= autoreconf desktop-file-utils dos2unix iconv gmake libtool \
- pkgconfig tar:bzip2
+WRKSRC_SUBDIR= ${PORTNAME}
-GNU_CONFIGURE= yes
-CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
-USE_CSTD= gnu89
-CONFIGURE_ARGS= --enable-opengl --enable-libcdio
-INSTALL_TARGET= install-strip
+USES= cmake desktop-file-utils dos2unix gettext iconv libarchive \
+ libtool pkgconfig tar:bzip2
+
+USE_GITHUB= yes
+GH_ACCOUNT= martymac
+GH_TAGNAME= codeplex-final
+
USE_LDCONFIG= yes
-USE_GNOME= gtk30 intltool glib20
-USE_XORG= x11 xv xext xxf86vm xtst
-USE_SDL= sdl
+USE_GNOME= cairo gdkpixbuf2 gtk30 intltool glib20
+USE_XORG= ice sm x11 xv xext xxf86vm xtst
+USE_SDL= sdl2
USE_GL= gl
+INSTALLS_ICONS= yes
+CMAKE_ARGS+= -DDL_LIB:STRING="" \
+ -DMANPREFIX:STRING="${MANPREFIX}" \
+ -DBUILD_OPENGL:BOOL=ON \
+ -DBUILD_SIO1:BOOL=ON \
+ -DUSE_LIBCDIO:BOOL=ON \
+ -DENABLE_CCDDA:BOOL=ON \
+ -DUSE_LIBARCHIVE:BOOL=ON
+
DOS2UNIX_REGEX= .*\.(c|h|cpp|hpp|am)
PORTDOCS= ChangeLog README
@@ -43,23 +49,36 @@ PORTDOCS= ChangeLog README
# accessed through libcdio (using cam(4) and pass(4))
DEFAULT_DVD_DEVICE?= /dev/cd0
+# XXX Gettext support is mandatory and cannot really be disabled.
+# The following option only enables/disables building *additional* translations
OPTIONS_DEFINE= NLS
OPTIONS_SUB= yes
-NLS_USES= gettext
-NLS_CONFIGURE_ENABLE= nls
+NLS_DESC= Build additional NLS translations
+NLS_CMAKE_ON= -DDISABLE_NLS_TRANSLATIONS:BOOL=OFF
+NLS_CMAKE_OFF= -DDISABLE_NLS_TRANSLATIONS:BOOL=ON
.include <bsd.port.pre.mk>
-.if ${ARCH} == "amd64"
-CONFIGURE_ARGS+= --enable-dynarec=x86_64
-.endif
-
-# Add ${PREFIX} to plugins' lookup directories and set default CDROM device
post-patch:
+ # Add ${PREFIX} to plugins' lookup directories
@${REINPLACE_CMD} "s|%%PREFIX%%|${PREFIX}|" \
${WRKSRC}/gui/LnxMain.c
+ # Set default CDROM device
@${REINPLACE_CMD} "s|%%DVD_DEVICE%%|${DEFAULT_DVD_DEVICE}|" \
${WRKSRC}/plugins/dfcdrom/cdr.h
+ # Fix PSEMU_DATA_DIR and DEF_PLUGIN_DIR
+ @${REINPLACE_CMD} \
+ -e "s|games/||g" \
+ -e "s|psemu|${PORTNAME}|g" \
+ ${WRKSRC}/gui/CMakeLists.txt \
+ ${WRKSRC}/plugins/bladesio1/CMakeLists.txt \
+ ${WRKSRC}/plugins/dfcdrom/CMakeLists.txt \
+ ${WRKSRC}/plugins/dfinput/CMakeLists.txt \
+ ${WRKSRC}/plugins/dfnet/CMakeLists.txt \
+ ${WRKSRC}/plugins/dfsound/CMakeLists.txt \
+ ${WRKSRC}/plugins/dfxvideo/CMakeLists.txt \
+ ${WRKSRC}/plugins/nullsio1/CMakeLists.txt \
+ ${WRKSRC}/plugins/peopsxgl/CMakeLists.txt
post-install:
${MKDIR} ${STAGEDIR}${DOCSDIR}
Modified: head/emulators/pcsxr/distinfo
==============================================================================
--- head/emulators/pcsxr/distinfo Mon Jun 11 11:06:11 2018 (r472182)
+++ head/emulators/pcsxr/distinfo Mon Jun 11 11:46:05 2018 (r472183)
@@ -1,2 +1,3 @@
-SHA256 (pcsxr-1.9.94.r87113.tar.bz2) = cb24b2c0711f62acb866e4483dba085e90fc0cb9e4025d165fd5a618882da938
-SIZE (pcsxr-1.9.94.r87113.tar.bz2) = 1389412
+TIMESTAMP = 1528487875
+SHA256 (martymac-pcsxr-1.9.95.20180604-codeplex-final_GH0.tar.gz) = 476b6c7aa5467151846cbed949f1024fa9f6109b51d3bee94698c46f53d85eb3
+SIZE (martymac-pcsxr-1.9.95.20180604-codeplex-final_GH0.tar.gz) = 2262175
Added: head/emulators/pcsxr/files/patch-doc-CMakeLists.txt
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/emulators/pcsxr/files/patch-doc-CMakeLists.txt Mon Jun 11 11:46:05 2018 (r472183)
@@ -0,0 +1,19 @@
+Disable doc installation (handled by the port's Makefile)
+
+--- doc/CMakeLists.txt.orig 2017-02-18 22:40:07.000000000 +0100
++++ doc/CMakeLists.txt 2018-06-08 22:33:26.240772000 +0200
+@@ -1,8 +1,8 @@
+-install(FILES pcsxr.1 DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man1)
+-install(FILES keys.txt DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/pcsxr)
+-install(FILES tweaks.txt DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/pcsxr)
++install(FILES pcsxr.1 DESTINATION ${MANPREFIX}/man/man1)
++#install(FILES keys.txt DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/pcsxr)
++#install(FILES tweaks.txt DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/pcsxr)
+
+-install(FILES ../AUTHORS DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/pcsxr)
+-install(FILES ../COPYING DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/pcsxr)
+-install(FILES ../README DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/pcsxr)
++#install(FILES ../AUTHORS DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/pcsxr)
++#install(FILES ../COPYING DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/pcsxr)
++#install(FILES ../README DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/pcsxr)
+
Added: head/emulators/pcsxr/files/patch-gui-CMakeLists.txt
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/emulators/pcsxr/files/patch-gui-CMakeLists.txt Mon Jun 11 11:46:05 2018 (r472183)
@@ -0,0 +1,23 @@
+--- gui/CMakeLists.txt.orig 2018-06-07 22:06:27.348220000 +0200
++++ gui/CMakeLists.txt 2018-06-07 22:08:23.025836000 +0200
+@@ -17,6 +17,11 @@
+ include_directories(${GTK3_INCLUDE_DIRS})
+ set(GTK_LIBRARIES ${GTK3_LIBRARY} ${GDK3_LIBRARY} ${GDKPixbuf_LIBRARY} ${Pango_LIBRARY} ${Cairo_LIBRARY} ${GObject_LIBRARY} ${GLib_LIBRARY} ${GIO_LIBRARY})
+
++find_package (Intl REQUIRED)
++if(NOT Intl_FOUND)
++ message(FATAL_ERROR "Intl library not found")
++endif(NOT Intl_FOUND)
++
+ find_package(Threads REQUIRED)
+ find_package(ZLIB REQUIRED)
+ include_directories(${ZLIB_INCLUDE_DIRS})
+@@ -89,7 +94,7 @@
+ add_custom_target(resource DEPENDS ${RESOURCE_FILE})
+ add_executable(pcsxr ${SRCS} ${RESOURCE_FILE} )
+ add_dependencies(pcsxr resource)
+-target_link_libraries(pcsxr pcsxcore ${GTK_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ${ZLIB_LIBRARIES} ${RT_LIB} ${DL_LIB} ${X11_XTest_LIB})
++target_link_libraries(pcsxr pcsxcore ${GTK_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ${ZLIB_LIBRARIES} ${RT_LIB} ${DL_LIB} ${X11_XTest_LIB} ${Intl_LIBRARIES})
+
+ install(TARGETS pcsxr RUNTIME DESTINATION bin)
+ install(FILES data/pcsxr.desktop DESTINATION share/applications)
Added: head/emulators/pcsxr/files/patch-gui-po-CMakeLists.txt
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/emulators/pcsxr/files/patch-gui-po-CMakeLists.txt Mon Jun 11 11:46:05 2018 (r472183)
@@ -0,0 +1,16 @@
+--- gui/po/CMakeLists.txt.orig 2018-06-08 22:12:44.486045000 +0200
++++ gui/po/CMakeLists.txt 2018-06-08 22:14:13.363502000 +0200
+@@ -1,6 +1,9 @@
+-message("Configuring langs")
+-include(Gettext)
++option(DISABLE_NLS_TRANSLATIONS "Disable building additional NLS translations" OFF)
++if(NOT DISABLE_NLS_TRANSLATIONS)
++ message("Configuring langs")
++ include(Gettext)
+
+-#find_package(LibArchive REQUIRED)
++ #find_package(LibArchive REQUIRED)
+
+-GETTEXT_CREATE_TRANSLATIONS(pcsxr.pot ALL es fr hu it ko_KR pt_BR ru zh_CN zh_TW)
++ GETTEXT_CREATE_TRANSLATIONS(pcsxr.pot ALL es fr hu it ko_KR pt_BR ru zh_CN zh_TW)
++endif()
Added: head/emulators/pcsxr/files/patch-libpcsxcore-CMakeLists.txt
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/emulators/pcsxr/files/patch-libpcsxcore-CMakeLists.txt Mon Jun 11 11:46:05 2018 (r472183)
@@ -0,0 +1,24 @@
+--- libpcsxcore/CMakeLists.txt.orig 2017-02-18 22:40:07.000000000 +0100
++++ libpcsxcore/CMakeLists.txt 2018-06-07 22:13:45.312645000 +0200
+@@ -18,6 +18,12 @@
+ add_definitions(-DHAVE_LIBARCHIVE)
+ endif()
+
++find_package (Intl REQUIRED)
++if(NOT Intl_FOUND)
++ message(FATAL_ERROR "Intl library not found")
++endif(NOT Intl_FOUND)
++include_directories(${Intl_INCLUDE_DIRS})
++
+ # Architecture detection and arch specific settings
+ message(${CMAKE_SYSTEM_PROCESSOR})
+ if (${CMAKE_SYSTEM_PROCESSOR} MATCHES "^powerpc")
+@@ -26,6 +32,8 @@
+ set(_ARCH_32 1)
+ elseif(${CMAKE_SYSTEM_PROCESSOR} MATCHES "^x86_64")
+ set(_ARCH_64 1)
++elseif(${CMAKE_SYSTEM_PROCESSOR} MATCHES "^amd64")
++ set(_ARCH_64 1)
+ else()
+ message("Unsupported arch. Will not build dynarec")
+ add_definitions(-DNOPSXREC)
Added: head/emulators/pcsxr/files/patch-libpcsxcore-ix86_64-ix86_cpudetect.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/emulators/pcsxr/files/patch-libpcsxcore-ix86_64-ix86_cpudetect.c Mon Jun 11 11:46:05 2018 (r472183)
@@ -0,0 +1,11 @@
+--- libpcsxcore/ix86_64/ix86_cpudetect.c.orig 2018-06-07 22:29:16.208468000 +0200
++++ libpcsxcore/ix86_64/ix86_cpudetect.c 2018-06-07 22:31:35.845538000 +0200
+@@ -145,7 +145,7 @@
+ #endif
+ }
+
+-#if defined(__linux__) || defined(__APPLE__)
++#if defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__)
+
+ #include <sys/time.h>
+ #include <errno.h>
Added: head/emulators/pcsxr/files/patch-libpcsxcore-psxcommon.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/emulators/pcsxr/files/patch-libpcsxcore-psxcommon.h Mon Jun 11 11:46:05 2018 (r472183)
@@ -0,0 +1,11 @@
+--- libpcsxcore/psxcommon.h.orig 2018-06-07 22:26:55.136610000 +0200
++++ libpcsxcore/psxcommon.h 2018-06-07 22:27:17.357957000 +0200
+@@ -71,7 +71,7 @@
+ #include "system.h"
+ #include "debug.h"
+
+-#if defined (__linux__) || defined (__MACOSX__)
++#if defined (__linux__) || defined (__MACOSX__) || defined (__FreeBSD__)
+ #define strnicmp strncasecmp
+ #endif
+ #define __inline inline
Added: head/emulators/pcsxr/files/patch-plugins-bladesio1-CMakeLists.txt
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/emulators/pcsxr/files/patch-plugins-bladesio1-CMakeLists.txt Mon Jun 11 11:46:05 2018 (r472183)
@@ -0,0 +1,23 @@
+--- plugins/bladesio1/CMakeLists.txt.orig 2017-02-18 22:40:07.000000000 +0100
++++ plugins/bladesio1/CMakeLists.txt 2018-06-07 22:01:58.035345000 +0200
+@@ -17,6 +17,11 @@
+ include_directories(${GTK3_INCLUDE_DIRS})
+ set(GTK_LIBRARIES ${GTK3_LIBRARY} ${GDK3_LIBRARY} ${GDKPixbuf_LIBRARY} ${Pango_LIBRARY} ${Cairo_LIBRARY} ${GObject_LIBRARY} ${GLib_LIBRARY} ${GIO_LIBRARY})
+
++find_package (Intl REQUIRED)
++if(NOT Intl_FOUND)
++ message(FATAL_ERROR "Intl library not found")
++endif(NOT Intl_FOUND)
++include_directories(${Intl_INCLUDE_DIRS})
+
+ #defs
+ add_definitions(-DLOCALE_DIR="${CMAKE_INSTALL_FULL_DATAROOTDIR}/locale/" -DPSEMU_DATA_DIR="${CMAKE_INSTALL_FULL_DATAROOTDIR}/psemu" -DDEF_PLUGIN_DIR="${CMAKE_INSTALL_FULL_LIBDIR}/games/psemu")
+@@ -55,7 +60,7 @@
+
+ add_executable(cfgBladeSio1 ${GUI_SRCS} ${RESOURCE_FILE})
+ add_dependencies(cfgBladeSio1 bladesio1_resource)
+-target_link_libraries(cfgBladeSio1 ${GTK_LIBRARIES})
++target_link_libraries(cfgBladeSio1 ${GTK_LIBRARIES} ${Intl_LIBRARIES})
+
+ install(TARGETS BladeSio1 LIBRARY DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/games/psemu)
+ install(TARGETS cfgBladeSio1 RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/games/psemu)
Added: head/emulators/pcsxr/files/patch-plugins-dfcdrom-CMakeLists.txt
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/emulators/pcsxr/files/patch-plugins-dfcdrom-CMakeLists.txt Mon Jun 11 11:46:05 2018 (r472183)
@@ -0,0 +1,24 @@
+--- plugins/dfcdrom/CMakeLists.txt.orig 2017-02-18 22:40:07.000000000 +0100
++++ plugins/dfcdrom/CMakeLists.txt 2018-06-07 22:20:24.492042000 +0200
+@@ -27,6 +27,12 @@
+
+ find_package(Threads REQUIRED)
+
++find_package (Intl REQUIRED)
++if(NOT Intl_FOUND)
++ message(FATAL_ERROR "Intl library not found")
++endif(NOT Intl_FOUND)
++include_directories(${Intl_INCLUDE_DIRS})
++
+ #defs
+ add_definitions(-DLOCALE_DIR="${CMAKE_INSTALL_FULL_DATAROOTDIR}/locale/" -DPSEMU_DATA_DIR="${CMAKE_INSTALL_FULL_DATAROOTDIR}/psemu" -DDEF_PLUGIN_DIR="${CMAKE_INSTALL_FULL_LIBDIR}/games/psemu")
+
+@@ -66,7 +72,7 @@
+
+ add_executable(cfgDFCdrom ${GUI_SRCS} ${RESOURCE_FILE})
+ add_dependencies(cfgDFCdrom dfcdrom_resource)
+-target_link_libraries(cfgDFCdrom ${GTK_LIBRARIES})
++target_link_libraries(cfgDFCdrom ${GTK_LIBRARIES} ${Intl_LIBRARIES})
+
+ install(TARGETS DFCdrom LIBRARY DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/games/psemu)
+ install(TARGETS cfgDFCdrom RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/games/psemu)
Added: head/emulators/pcsxr/files/patch-plugins-dfinput-CMakeLists.txt
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/emulators/pcsxr/files/patch-plugins-dfinput-CMakeLists.txt Mon Jun 11 11:46:05 2018 (r472183)
@@ -0,0 +1,24 @@
+--- plugins/dfinput/CMakeLists.txt.orig 2018-06-07 22:36:37.371859000 +0200
++++ plugins/dfinput/CMakeLists.txt 2018-06-07 22:37:27.408684000 +0200
+@@ -17,6 +17,12 @@
+ include_directories(${GTK3_INCLUDE_DIRS})
+ set(GTK_LIBRARIES ${GTK3_LIBRARY} ${GDK3_LIBRARY} ${GDKPixbuf_LIBRARY} ${Pango_LIBRARY} ${Cairo_LIBRARY} ${GObject_LIBRARY} ${GLib_LIBRARY} ${GIO_LIBRARY})
+
++find_package (Intl REQUIRED)
++if(NOT Intl_FOUND)
++ message(FATAL_ERROR "Intl library not found")
++endif(NOT Intl_FOUND)
++include_directories(${Intl_INCLUDE_DIRS})
++
+ set(USE_SDL2 0)
+ find_package(SDL2)
+ if(NOT SDL2_FOUND)
+@@ -76,7 +82,7 @@
+
+ add_executable(cfgDFInput ${GUI_SRCS} ${RESOURCE_FILE})
+ add_dependencies(cfgDFInput dfinput_resource)
+-target_link_libraries(cfgDFInput ${GTK_LIBRARIES} ${SDL_LIBRARY} ${SDL2_LIBRARY} ${X11_LIBRARIES})
++target_link_libraries(cfgDFInput ${GTK_LIBRARIES} ${SDL_LIBRARY} ${SDL2_LIBRARY} ${X11_LIBRARIES} ${Intl_LIBRARIES})
+
+ install(TARGETS DFInput LIBRARY DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/games/psemu)
+ install(TARGETS cfgDFInput RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/games/psemu)
Added: head/emulators/pcsxr/files/patch-plugins-dfnet-CMakeLists.txt
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/emulators/pcsxr/files/patch-plugins-dfnet-CMakeLists.txt Mon Jun 11 11:46:05 2018 (r472183)
@@ -0,0 +1,23 @@
+--- plugins/dfnet/CMakeLists.txt.orig 2017-02-18 22:40:07.000000000 +0100
++++ plugins/dfnet/CMakeLists.txt 2018-06-07 22:34:06.729573000 +0200
+@@ -17,6 +17,11 @@
+ include_directories(${GTK3_INCLUDE_DIRS})
+ set(GTK_LIBRARIES ${GTK3_LIBRARY} ${GDK3_LIBRARY} ${GDKPixbuf_LIBRARY} ${Pango_LIBRARY} ${Cairo_LIBRARY} ${GObject_LIBRARY} ${GLib_LIBRARY} ${GIO_LIBRARY})
+
++find_package (Intl REQUIRED)
++if(NOT Intl_FOUND)
++ message(FATAL_ERROR "Intl library not found")
++endif(NOT Intl_FOUND)
++include_directories(${Intl_INCLUDE_DIRS})
+
+ #defs
+ add_definitions(-DLOCALE_DIR="${CMAKE_INSTALL_FULL_DATAROOTDIR}/locale/" -DPSEMU_DATA_DIR="${CMAKE_INSTALL_FULL_DATAROOTDIR}/psemu" -DDEF_PLUGIN_DIR="${CMAKE_INSTALL_FULL_LIBDIR}/games/psemu")
+@@ -54,7 +59,7 @@
+
+ add_executable(cfgDFNet ${GUI_SRCS} ${RESOURCE_FILE})
+ add_dependencies(cfgDFNet dfnet_resource)
+-target_link_libraries(cfgDFNet ${GTK_LIBRARIES})
++target_link_libraries(cfgDFNet ${GTK_LIBRARIES} ${Intl_LIBRARIES})
+
+ install(TARGETS DFNet LIBRARY DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/games/psemu)
+ install(TARGETS cfgDFNet RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/games/psemu)
Added: head/emulators/pcsxr/files/patch-plugins-dfsound-CMakeLists.txt
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/emulators/pcsxr/files/patch-plugins-dfsound-CMakeLists.txt Mon Jun 11 11:46:05 2018 (r472183)
@@ -0,0 +1,23 @@
+--- plugins/dfsound/CMakeLists.txt.orig 2017-02-18 22:40:07.000000000 +0100
++++ plugins/dfsound/CMakeLists.txt 2018-06-07 22:32:10.505879000 +0200
+@@ -20,6 +20,11 @@
+ include_directories(${GTK3_INCLUDE_DIRS})
+ set(GTK_LIBRARIES ${GTK3_LIBRARY} ${GDK3_LIBRARY} ${GDKPixbuf_LIBRARY} ${Pango_LIBRARY} ${Cairo_LIBRARY} ${GObject_LIBRARY} ${GLib_LIBRARY} ${GIO_LIBRARY})
+
++find_package (Intl REQUIRED)
++if(NOT Intl_FOUND)
++ message(FATAL_ERROR "Intl library not found")
++endif(NOT Intl_FOUND)
++include_directories(${Intl_INCLUDE_DIRS})
+
+ if (${SND_BACKEND} STREQUAL "oss")
+ find_package(OSS REQUIRED)
+@@ -129,7 +134,7 @@
+
+ add_executable(cfgDFSound ${GUI_SRCS} ${RESOURCE_FILE})
+ add_dependencies(cfgDFSound dfsound_resource)
+-target_link_libraries(cfgDFSound ${GTK_LIBRARIES})
++target_link_libraries(cfgDFSound ${GTK_LIBRARIES} ${Intl_LIBRARIES})
+
+ install(TARGETS DFSound LIBRARY DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/games/psemu)
+ install(TARGETS cfgDFSound RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/games/psemu)
Added: head/emulators/pcsxr/files/patch-plugins-dfxvideo-CMakeLists.txt
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/emulators/pcsxr/files/patch-plugins-dfxvideo-CMakeLists.txt Mon Jun 11 11:46:05 2018 (r472183)
@@ -0,0 +1,24 @@
+--- plugins/dfxvideo/CMakeLists.txt.orig 2017-02-18 22:40:07.000000000 +0100
++++ plugins/dfxvideo/CMakeLists.txt 2018-06-06 22:18:56.790161000 +0200
+@@ -20,6 +20,12 @@
+
+ find_package(X11 REQUIRED)
+
++find_package (Intl REQUIRED)
++if(NOT Intl_FOUND)
++ message(FATAL_ERROR "Intl library not found")
++endif(NOT Intl_FOUND)
++include_directories(${Intl_INCLUDE_DIRS})
++
+ #defs
+ add_definitions(-DLOCALE_DIR="${CMAKE_INSTALL_FULL_DATAROOTDIR}/locale/" -DPSEMU_DATA_DIR="${CMAKE_INSTALL_FULL_DATAROOTDIR}/psemu" -DDEF_PLUGIN_DIR="${CMAKE_INSTALL_FULL_LIBDIR}/games/psemu")
+
+@@ -63,7 +69,7 @@
+
+ add_executable(cfgDFXVideo ${GUI_SRCS} ${RESOURCE_FILE})
+ add_dependencies(cfgDFXVideo dfxvideo_resource)
+-target_link_libraries(cfgDFXVideo ${GTK_LIBRARIES})
++target_link_libraries(cfgDFXVideo ${GTK_LIBRARIES} ${Intl_LIBRARIES})
+
+ install(TARGETS DFXVideo LIBRARY DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/games/psemu)
+ install(TARGETS cfgDFXVideo RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/games/psemu)
Added: head/emulators/pcsxr/files/patch-plugins-peopsxgl-CMakeLists.txt
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/emulators/pcsxr/files/patch-plugins-peopsxgl-CMakeLists.txt Mon Jun 11 11:46:05 2018 (r472183)
@@ -0,0 +1,24 @@
+--- plugins/peopsxgl/CMakeLists.txt.orig 2018-06-07 22:22:14.308996000 +0200
++++ plugins/peopsxgl/CMakeLists.txt 2018-06-07 22:24:14.627266000 +0200
+@@ -17,6 +17,12 @@
+ include_directories(${GTK3_INCLUDE_DIRS})
+ set(GTK_LIBRARIES ${GTK3_LIBRARY} ${GDK3_LIBRARY} ${GDKPixbuf_LIBRARY} ${Pango_LIBRARY} ${Cairo_LIBRARY} ${GObject_LIBRARY} ${GLib_LIBRARY} ${GIO_LIBRARY})
+
++find_package (Intl REQUIRED)
++if(NOT Intl_FOUND)
++ message(FATAL_ERROR "Intl library not found")
++endif(NOT Intl_FOUND)
++include_directories(${Intl_INCLUDE_DIRS})
++
+ find_package(X11 REQUIRED)
+
+ find_package(OpenGL REQUIRED)
+@@ -69,7 +75,7 @@
+
+ add_executable(cfgpeopsxgl ${GUI_SRCS} ${RESOURCE_FILE})
+ add_dependencies(cfgpeopsxgl dfinput_resource)
+-target_link_libraries(cfgpeopsxgl ${GTK_LIBRARIES})
++target_link_libraries(cfgpeopsxgl ${GTK_LIBRARIES} ${Intl_LIBRARIES})
+
+ install(TARGETS peopsxgl LIBRARY DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/games/psemu)
+ install(TARGETS cfgpeopsxgl RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/games/psemu)
Modified: head/emulators/pcsxr/pkg-plist
==============================================================================
--- head/emulators/pcsxr/pkg-plist Mon Jun 11 11:06:11 2018 (r472182)
+++ head/emulators/pcsxr/pkg-plist Mon Jun 11 11:46:05 2018 (r472183)
@@ -1,32 +1,15 @@
bin/pcsxr
man/man1/pcsxr.1.gz
-%%NLS%%share/locale/fr_FR/LC_MESSAGES/pcsxr.mo
+%%NLS%%share/locale/es/LC_MESSAGES/pcsxr.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/pcsxr.mo
%%NLS%%share/locale/it/LC_MESSAGES/pcsxr.mo
+%%NLS%%share/locale/ko_KR/LC_MESSAGES/pcsxr.mo
%%NLS%%share/locale/pt_BR/LC_MESSAGES/pcsxr.mo
-%%NLS%%share/locale/ru_RU/LC_MESSAGES/pcsxr.mo
-%%NLS%%share/locale/hu_HU/LC_MESSAGES/pcsxr.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/pcsxr.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/pcsxr.mo
%%NLS%%share/locale/zh_TW/LC_MESSAGES/pcsxr.mo
%%NLS%%share/locale/zh_CN/LC_MESSAGES/pcsxr.mo
-share/pcsxr/peopsxgl.ui
-share/pcsxr/dfinput.ui
-share/pcsxr/dfnet.ui
-share/pcsxr/dfxvideo.ui
-share/pcsxr/dfcdrom.ui
-share/pcsxr/gpu.png
-share/pcsxr/dfsound.ui
-share/pcsxr/spu.png
-share/pcsxr/sio1.png
-share/pcsxr/sio1.ui
-share/pcsxr/cd.png
-share/pcsxr/iso-reopen.png
-share/pcsxr/cdr.png
-share/pcsxr/pcsxr.ui
-share/pcsxr/iso-open.png
-share/pcsxr/play.png
-share/pcsxr/pad.png
-share/pcsxr/memcard.png
-share/pcsxr/pcsxr.png
-share/pixmaps/pcsxr-icon.png
+share/icons/hicolor/48x48/apps/pcsxr-icon.png
share/applications/pcsxr.desktop
lib/pcsxr/cfgBladeSio1
lib/pcsxr/cfgDFXVideo
@@ -42,3 +25,4 @@ lib/pcsxr/libDFInput.so
lib/pcsxr/libDFSound.so
lib/pcsxr/libDFCdrom.so
lib/pcsxr/libDFNet.so
+lib/pcsxr/libNullSio1.so
More information about the svn-ports-all
mailing list