Index: head/emulators/pcsxr/Makefile =================================================================== --- head/emulators/pcsxr/Makefile (revision 472182) +++ head/emulators/pcsxr/Makefile (revision 472183) @@ -1,68 +1,87 @@ # Created by: Ganael Laplanche # $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@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 # Default CDROM device to use with dfcdrom, # 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 -.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} ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} .include Index: head/emulators/pcsxr/distinfo =================================================================== --- head/emulators/pcsxr/distinfo (revision 472182) +++ head/emulators/pcsxr/distinfo (revision 472183) @@ -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 Index: head/emulators/pcsxr/files/patch-plugins-dfinput-Makefile.am =================================================================== --- head/emulators/pcsxr/files/patch-plugins-dfinput-Makefile.am (revision 472182) +++ head/emulators/pcsxr/files/patch-plugins-dfinput-Makefile.am (nonexistent) @@ -1,29 +0,0 @@ ---- plugins/dfinput/Makefile.am.orig 2013-09-10 15:40:15.000000000 +0200 -+++ plugins/dfinput/Makefile.am 2013-09-10 15:43:00.000000000 +0200 -@@ -1,14 +1,14 @@ --bindir = @libdir@/games/psemu/ --libdir = @libdir@/games/psemu/ -+bindir = @libdir@/pcsxr/ -+libdir = @libdir@/pcsxr/ - - lib_LTLIBRARIES = libDFInput.la - - libDFInput_la_SOURCES = cfg.c pad.c pad.h sdljoy.c xkb.c analog.c util.c util.h --libDFInput_la_LDFLAGS = -module -avoid-version --libDFInput_la_LIBADD = -lpthread -lX11 $(SDL2_LIBS) $(SDL_LIBS) -+libDFInput_la_LDFLAGS = -module -avoid-version -pthread -+libDFInput_la_LIBADD = -lX11 $(SDL2_LIBS) $(SDL_LIBS) - - AM_CPPFLAGS = -DLOCALE_DIR=\"${datadir}/locale/\" \ -- -DDATADIR=\"${datadir}/psemu/\" \ -+ -DDATADIR=\"${datadir}/pcsxr/\" \ - $(GTK3_CFLAGS) \ - -I../../include -I../../libpcsxcore $(SDL2_CFLAGS) $(SDL_CFLAGS) - -@@ -17,5 +17,5 @@ - cfgDFInput_LDADD = $(GTK3_LIBS) $(SDL2_LIBS) $(SDL_LIBS) -lX11 - - glade_DATA = dfinput.ui --gladedir = $(datadir)/psemu/ -+gladedir = $(datadir)/pcsxr/ - EXTRA_DIST = $(glade_DATA) Property changes on: head/emulators/pcsxr/files/patch-plugins-dfinput-Makefile.am ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/emulators/pcsxr/files/patch-gui-Makefile.am =================================================================== --- head/emulators/pcsxr/files/patch-gui-Makefile.am (revision 472182) +++ head/emulators/pcsxr/files/patch-gui-Makefile.am (nonexistent) @@ -1,20 +0,0 @@ ---- gui/Makefile.am.orig 2011-06-30 08:47:19.000000000 +0200 -+++ gui/Makefile.am 2011-06-30 11:43:02.263535649 +0200 -@@ -3,8 +3,8 @@ - -DLOCALE_DIR=\"${datadir}/locale/\" \ - $(GTK3_CFLAGS) $(GLADE2_CFLAGS) \ - -I$(top_srcdir)/libpcsxcore -I$(top_srcdir)/include \ -- -DPSEMU_DATA_DIR=\"${datadir}/psemu\" \ -- -DDEF_PLUGIN_DIR=\"${libdir}/games/psemu\" -+ -DPSEMU_DATA_DIR=\"${datadir}/pcsxr\" \ -+ -DDEF_PLUGIN_DIR=\"${libdir}/pcsxr\" - - bin_PROGRAMS = pcsxr - -@@ -29,4 +29,5 @@ - - pcsxr_LDADD = \ - ../libpcsxcore/libpcsxcore.a \ -- $(GTK3_LIBS) $(GLADE2_LIBS) -lpthread -lz -lm -lXext -lXtst -+ $(GTK3_LIBS) $(GLADE2_LIBS) -lz -lm -lXext -lXtst -lGL -+pcsxr_LDFLAGS = -pthread Property changes on: head/emulators/pcsxr/files/patch-gui-Makefile.am ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/emulators/pcsxr/files/patch-plugins-bladesio1-Makefile.am =================================================================== --- head/emulators/pcsxr/files/patch-plugins-bladesio1-Makefile.am (revision 472182) +++ head/emulators/pcsxr/files/patch-plugins-bladesio1-Makefile.am (nonexistent) @@ -1,26 +0,0 @@ ---- plugins/bladesio1/Makefile.am.orig 2011-06-30 08:51:19.659732652 +0200 -+++ plugins/bladesio1/Makefile.am 2011-06-30 08:52:16.694874269 +0200 -@@ -1,5 +1,5 @@ --bindir = @libdir@/games/psemu/ --libdir = @libdir@/games/psemu/ -+bindir = @libdir@/pcsxr/ -+libdir = @libdir@/pcsxr/ - - lib_LTLIBRARIES = libBladeSio1.la - -@@ -7,7 +7,7 @@ - libBladeSio1_la_LDFLAGS = -module -avoid-version - - AM_CPPFLAGS = -DLOCALE_DIR=\"${datadir}/locale/\" \ -- -DDATADIR=\"${datadir}/psemu/\" \ -+ -DDATADIR=\"${datadir}/pcsxr/\" \ - $(GTK3_CFLAGS) \ - -I../../libpcsxcore -I../../include - -@@ -16,5 +16,5 @@ - cfgBladeSio1_LDADD = $(GTK3_LIBS) - - glade_DATA = sio1.ui --gladedir = $(datadir)/psemu/ -+gladedir = $(datadir)/pcsxr/ - EXTRA_DIST = $(glade_DATA) Property changes on: head/emulators/pcsxr/files/patch-plugins-bladesio1-Makefile.am ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/emulators/pcsxr/files/patch-plugins-dfxvideo-gpu.c =================================================================== --- head/emulators/pcsxr/files/patch-plugins-dfxvideo-gpu.c (revision 472182) +++ head/emulators/pcsxr/files/patch-plugins-dfxvideo-gpu.c (nonexistent) @@ -1,9 +0,0 @@ ---- plugins/dfxvideo/gpu.c.orig 2010-05-20 05:55:08.652920412 +0000 -+++ plugins/dfxvideo/gpu.c 2010-05-20 05:55:46.907370070 +0000 -@@ -1930,3 +1930,6 @@ - } - - //////////////////////////////////////////////////////////////////////// -+ -+/* missing symbol : do nothing */ -+void CALLBACK GPUclearDynarec(void) {} Property changes on: head/emulators/pcsxr/files/patch-plugins-dfxvideo-gpu.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/emulators/pcsxr/files/patch-plugins-bladesio1-connection.c =================================================================== --- head/emulators/pcsxr/files/patch-plugins-bladesio1-connection.c (revision 472182) +++ head/emulators/pcsxr/files/patch-plugins-bladesio1-connection.c (nonexistent) @@ -1,10 +0,0 @@ ---- plugins/bladesio1/connection.c.orig 2013-09-12 09:19:20.862489051 +0200 -+++ plugins/bladesio1/connection.c 2013-09-12 09:20:25.386489200 +0200 -@@ -25,6 +25,7 @@ - #if defined _WINDOWS - #include - #else -+#include - #include - #include - #include Property changes on: head/emulators/pcsxr/files/patch-plugins-bladesio1-connection.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/emulators/pcsxr/files/patch-plugins-peopsxgl-gpu.c =================================================================== --- head/emulators/pcsxr/files/patch-plugins-peopsxgl-gpu.c (revision 472182) +++ head/emulators/pcsxr/files/patch-plugins-peopsxgl-gpu.c (nonexistent) @@ -1,10 +0,0 @@ ---- plugins/peopsxgl/gpu.c.orig 2010-05-20 05:59:22.148962228 +0000 -+++ plugins/peopsxgl/gpu.c 2010-05-20 06:12:07.650815396 +0000 -@@ -3194,3 +3194,7 @@ - { - dwCoreFlags=dwFlags; - } -+ -+/* missing symbols : do nothing */ -+void CALLBACK GPUclearDynarec(void) {} -+void CALLBACK GPUdisplayText(char * pText) {} Property changes on: head/emulators/pcsxr/files/patch-plugins-peopsxgl-gpu.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/emulators/pcsxr/files/patch-libpcsxcore-socket.c =================================================================== --- head/emulators/pcsxr/files/patch-libpcsxcore-socket.c (revision 472182) +++ head/emulators/pcsxr/files/patch-libpcsxcore-socket.c (nonexistent) @@ -1,10 +0,0 @@ ---- libpcsxcore/socket.c.orig 2011-01-21 18:06:44.210865888 +0100 -+++ libpcsxcore/socket.c 2011-01-21 18:07:58.238538120 +0100 -@@ -23,6 +23,7 @@ - #include "socket.h" - - #ifndef _WIN32 -+#include - #include - #include - #include Property changes on: head/emulators/pcsxr/files/patch-libpcsxcore-socket.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/emulators/pcsxr/files/patch-configure.ac =================================================================== --- head/emulators/pcsxr/files/patch-configure.ac (revision 472182) +++ head/emulators/pcsxr/files/patch-configure.ac (nonexistent) @@ -1,19 +0,0 @@ ---- configure.ac.orig 2013-09-10 11:55:59.000000000 +0200 -+++ configure.ac 2013-09-13 09:42:28.018735076 +0200 -@@ -8,6 +8,7 @@ - AC_CONFIG_HEADERS([include/config.h:include/config.h.in]) - - AC_PROG_CC -+AC_PROG_CXX - AM_PROG_CC_C_O - AC_PROG_INSTALL - AC_STDC_HEADERS -@@ -54,7 +55,7 @@ - AC_CHECK_LIB(dl, dlsym, [LIBS="$LIBS -ldl"], []) - AC_CHECK_LIB(socket, socket, [LIBS="$LIBS -lsocket"], []) - AC_CHECK_LIB(nsl, gethostbyname, [LIBS="$LIBS -lnsl"], []) --AC_CHECK_LIB(umem, umem_alloc, [LIBS="$LIBS -lumem"], []) -+dnl AC_CHECK_LIB(umem, umem_alloc, [LIBS="$LIBS -lumem"], []) - - AM_CONDITIONAL(SOUND_OSS, false) - AM_CONDITIONAL(SOUND_SDL, false) Property changes on: head/emulators/pcsxr/files/patch-configure.ac ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/emulators/pcsxr/files/patch-plugins-dfcdrom-Makefile.am =================================================================== --- head/emulators/pcsxr/files/patch-plugins-dfcdrom-Makefile.am (revision 472182) +++ head/emulators/pcsxr/files/patch-plugins-dfcdrom-Makefile.am (nonexistent) @@ -1,37 +0,0 @@ ---- plugins/dfcdrom/Makefile.am.orig 2011-06-30 08:55:41.398655616 +0200 -+++ plugins/dfcdrom/Makefile.am 2011-06-30 08:57:01.844014733 +0200 -@@ -1,5 +1,5 @@ --bindir = @libdir@/games/psemu/ --libdir = @libdir@/games/psemu/ -+bindir = @libdir@/pcsxr/ -+libdir = @libdir@/pcsxr/ - - lib_LTLIBRARIES = libDFCdrom.la - -@@ -13,8 +13,8 @@ - util.c - - libDFCdrom_la_CFLAGS = --libDFCdrom_la_LDFLAGS = -module -avoid-version --libDFCdrom_la_LIBADD = -lpthread -+libDFCdrom_la_LDFLAGS = -module -avoid-version -pthread -+libDFCdrom_la_LIBADD = - - if USE_LIBCDIO - libDFCdrom_la_CFLAGS += -DUSE_LIBCDIO=1 $(LIBCDIO_CFLAGS) -@@ -22,7 +22,7 @@ - endif - - AM_CPPFLAGS = -DLOCALE_DIR=\"${datadir}/locale/\" \ -- -DDATADIR=\"${datadir}/psemu/\" \ -+ -DDATADIR=\"${datadir}/pcsxr/\" \ - $(GTK3_CFLAGS) \ - -I../../libpcsxcore -I../../include - -@@ -31,5 +31,5 @@ - cfgDFCdrom_LDADD = $(GTK3_LIBS) - - glade_DATA = cdrcfg-0.1df/dfcdrom.ui --gladedir = $(datadir)/psemu/ -+gladedir = $(datadir)/pcsxr/ - EXTRA_DIST = $(glade_DATA) Property changes on: head/emulators/pcsxr/files/patch-plugins-dfcdrom-Makefile.am ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/emulators/pcsxr/files/patch-plugins-dfnet-Makefile.am =================================================================== --- head/emulators/pcsxr/files/patch-plugins-dfnet-Makefile.am (revision 472182) +++ head/emulators/pcsxr/files/patch-plugins-dfnet-Makefile.am (nonexistent) @@ -1,26 +0,0 @@ ---- plugins/dfnet/Makefile.am.orig 2012-11-07 17:26:37.000000000 +0100 -+++ plugins/dfnet/Makefile.am 2012-11-07 17:28:04.000000000 +0100 -@@ -1,5 +1,5 @@ --bindir = @libdir@/games/psemu/ --libdir = @libdir@/games/psemu/ -+bindir = @libdir@/pcsxr/ -+libdir = @libdir@/pcsxr/ - - lib_LTLIBRARIES = libDFNet.la - -@@ -7,7 +7,7 @@ - libDFNet_la_LDFLAGS = -module -avoid-version - - AM_CPPFLAGS = -DLOCALE_DIR=\"${datadir}/locale/\" \ -- -DDATADIR=\"${datadir}/psemu/\" \ -+ -DDATADIR=\"${datadir}/pcsxr/\" \ - $(GTK3_CFLAGS) \ - -I../../libpcsxcore -I../../include - -@@ -16,5 +16,5 @@ - cfgDFNet_LDADD = $(GTK3_LIBS) - - glade_DATA = dfnet.ui --gladedir = $(datadir)/psemu/ -+gladedir = $(datadir)/pcsxr/ - EXTRA_DIST = $(glade_DATA) Property changes on: head/emulators/pcsxr/files/patch-plugins-dfnet-Makefile.am ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/emulators/pcsxr/files/patch-plugins-dfinput-pad.c =================================================================== --- head/emulators/pcsxr/files/patch-plugins-dfinput-pad.c (revision 472182) +++ head/emulators/pcsxr/files/patch-plugins-dfinput-pad.c (nonexistent) @@ -1,9 +0,0 @@ ---- plugins/dfinput/pad.c.orig 2013-04-17 16:44:04.000000000 +0200 -+++ plugins/dfinput/pad.c 2013-04-17 16:46:50.000000000 +0200 -@@ -683,3 +683,6 @@ - long PADtest(void) { - return PSE_PAD_ERR_SUCCESS; - } -+ -+/* missing symbol : do nothing */ -+void PADsetSensitive(int sensitive) {} Property changes on: head/emulators/pcsxr/files/patch-plugins-dfinput-pad.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/emulators/pcsxr/files/patch-plugins-dfxvideo-Makefile.am =================================================================== --- head/emulators/pcsxr/files/patch-plugins-dfxvideo-Makefile.am (revision 472182) +++ head/emulators/pcsxr/files/patch-plugins-dfxvideo-Makefile.am (nonexistent) @@ -1,26 +0,0 @@ ---- plugins/dfxvideo/Makefile.am.orig 2011-06-30 09:12:42.916385383 +0200 -+++ plugins/dfxvideo/Makefile.am 2011-06-30 09:14:44.735162351 +0200 -@@ -7,13 +7,13 @@ - $(STRIP_FPIC) $(NASM) -f elf -d ELF -I${srcdir}/ $< - - AM_CPPFLAGS = -DLOCALE_DIR=\"${datadir}/locale/\" \ -- -DDATADIR=\"${datadir}/psemu/\" \ -+ -DDATADIR=\"${datadir}/pcsxr/\" \ - $(GTK3_CFLAGS)\ - -I../../libpcsxcore \ - -I../../include - --bindir = @libdir@/games/psemu/ --libdir = @libdir@/games/psemu/ -+bindir = @libdir@/pcsxr/ -+libdir = @libdir@/pcsxr/ - - lib_LTLIBRARIES = libDFXVideo.la - -@@ -30,5 +30,5 @@ - cfgDFXVideo_LDADD = $(GTK3_LIBS) -lXext - - glade_DATA = gpucfg-0.1df/dfxvideo.ui --gladedir = $(datadir)/psemu/ -+gladedir = $(datadir)/pcsxr/ - EXTRA_DIST = $(glade_DATA) Property changes on: head/emulators/pcsxr/files/patch-plugins-dfxvideo-Makefile.am ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/emulators/pcsxr/files/patch-libpcsxcore-cdriso.c =================================================================== --- head/emulators/pcsxr/files/patch-libpcsxcore-cdriso.c (revision 472182) +++ head/emulators/pcsxr/files/patch-libpcsxcore-cdriso.c (nonexistent) @@ -1,29 +0,0 @@ -Use zlib's uncompress() function - ---- libpcsxcore/cdriso.c.orig 2017-01-21 13:51:48.486985000 +0000 -+++ libpcsxcore/cdriso.c 2017-01-21 13:53:55.623314000 +0000 -@@ -1210,6 +1210,7 @@ - return ret; - } - -+#if 0 - static int uncompress2(void *out, unsigned long *out_size, void *in, unsigned long in_size) - { - static z_stream z; -@@ -1240,6 +1241,7 @@ - *out_size -= z.avail_out; - return ret == 1 ? 0 : ret; - } -+#endif - - static int cdread_compressed(FILE *f, unsigned int base, void *dest, int sector) - { -@@ -1289,7 +1291,7 @@ - if (is_compressed) { - cdbuffer_size_expect = sizeof(compr_img->buff_raw[0]) << compr_img->block_shift; - cdbuffer_size = cdbuffer_size_expect; -- ret = uncompress2(compr_img->buff_raw[0], &cdbuffer_size, compr_img->buff_compressed, size); -+ ret = uncompress(compr_img->buff_raw[0], &cdbuffer_size, compr_img->buff_compressed, size); - if (ret != 0) { - SysPrintf("uncompress failed with %d for block %d, sector %d\n", - ret, block, sector); Property changes on: head/emulators/pcsxr/files/patch-libpcsxcore-cdriso.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/emulators/pcsxr/files/patch-plugins-dfsound-Makefile.am =================================================================== --- head/emulators/pcsxr/files/patch-plugins-dfsound-Makefile.am (revision 472182) +++ head/emulators/pcsxr/files/patch-plugins-dfsound-Makefile.am (nonexistent) @@ -1,36 +0,0 @@ ---- plugins/dfsound/Makefile.am.orig 2011-07-01 09:14:20.495315356 +0200 -+++ plugins/dfsound/Makefile.am 2011-07-01 09:13:24.000000000 +0200 -@@ -1,15 +1,15 @@ - AM_CPPFLAGS = -I../../include - --bindir = @libdir@/games/psemu/ --libdir = @libdir@/games/psemu/ -+bindir = @libdir@/pcsxr/ -+libdir = @libdir@/pcsxr/ - - lib_LTLIBRARIES = libDFSound.la - - libDFSound_la_SOURCES = adsr.c adsr.h spu.c spu.h cfg.c cfg.h dma.c dma.h gauss_i.h freeze.c reverb.c reverb.h registers.c registers.h externals.c externals.h dsoundoss.h psemuxa.h regs.h xa.c xa.h stdafx.h - - libDFSound_la_CPPFLAGS = $(AM_CPPFLAGS) --libDFSound_la_LDFLAGS = -module -avoid-version --libDFSound_la_LIBADD = -lpthread -lm -+libDFSound_la_LDFLAGS = -module -avoid-version -pthread -+libDFSound_la_LIBADD = -lm - - if SOUND_ALSA - libDFSound_la_SOURCES += alsa.c -@@ -47,11 +47,11 @@ - - bin_PROGRAMS = cfgDFSound - cfgDFSound_CPPFLAGS = -DLOCALE_DIR=\"${datadir}/locale/\" \ -- -DDATADIR=\"${datadir}/psemu/\" \ -+ -DDATADIR=\"${datadir}/pcsxr/\" \ - $(GTK3_CFLAGS) $(AM_CPPFLAGS) - cfgDFSound_SOURCES = spucfg-0.1df/main.c - cfgDFSound_LDADD = $(GTK3_LIBS) - - glade_DATA = spucfg-0.1df/dfsound.ui --gladedir = $(datadir)/psemu/ -+gladedir = $(datadir)/pcsxr/ - EXTRA_DIST = $(glade_DATA) Property changes on: head/emulators/pcsxr/files/patch-plugins-dfsound-Makefile.am ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/emulators/pcsxr/files/patch-plugins-peopsxgl-Makefile.am =================================================================== --- head/emulators/pcsxr/files/patch-plugins-peopsxgl-Makefile.am (revision 472182) +++ head/emulators/pcsxr/files/patch-plugins-peopsxgl-Makefile.am (nonexistent) @@ -1,24 +0,0 @@ ---- plugins/peopsxgl/Makefile.am.orig 2011-01-21 18:18:40.882339497 +0100 -+++ plugins/peopsxgl/Makefile.am 2011-01-21 18:20:06.105901151 +0100 -@@ -1,11 +1,11 @@ - AM_CPPFLAGS = -DPIXMAPDIR=\"${datadir}/pixmaps/\" \ - -DLOCALE_DIR=\"${datadir}/locale/\" \ -- -DDATADIR=\"${datadir}/psemu/\" \ -+ -DDATADIR=\"${datadir}/pcsxr/\" \ - $(GTK3_CFLAGS) \ - -I../../libpcsxcore -I../../include - --bindir = @libdir@/games/psemu/ --libdir = @libdir@/games/psemu/ -+bindir = @libdir@/pcsxr/ -+libdir = @libdir@/pcsxr/ - - lib_LTLIBRARIES = libpeopsxgl.la - -@@ -19,5 +19,5 @@ - cfgpeopsxgl_LDADD = $(GTK3_LIBS) - - glade_DATA = gpucfg/peopsxgl.ui --gladedir = $(datadir)/psemu/ -+gladedir = $(datadir)/pcsxr/ - EXTRA_DIST = $(glade_DATA) Property changes on: head/emulators/pcsxr/files/patch-plugins-peopsxgl-Makefile.am ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/emulators/pcsxr/files/patch-doc-CMakeLists.txt =================================================================== --- head/emulators/pcsxr/files/patch-doc-CMakeLists.txt (nonexistent) +++ head/emulators/pcsxr/files/patch-doc-CMakeLists.txt (revision 472183) @@ -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) + Property changes on: head/emulators/pcsxr/files/patch-doc-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/pcsxr/files/patch-gui-CMakeLists.txt =================================================================== --- head/emulators/pcsxr/files/patch-gui-CMakeLists.txt (nonexistent) +++ head/emulators/pcsxr/files/patch-gui-CMakeLists.txt (revision 472183) @@ -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) Property changes on: head/emulators/pcsxr/files/patch-gui-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/pcsxr/files/patch-gui-po-CMakeLists.txt =================================================================== --- head/emulators/pcsxr/files/patch-gui-po-CMakeLists.txt (nonexistent) +++ head/emulators/pcsxr/files/patch-gui-po-CMakeLists.txt (revision 472183) @@ -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() Property changes on: head/emulators/pcsxr/files/patch-gui-po-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/pcsxr/files/patch-libpcsxcore-CMakeLists.txt =================================================================== --- head/emulators/pcsxr/files/patch-libpcsxcore-CMakeLists.txt (nonexistent) +++ head/emulators/pcsxr/files/patch-libpcsxcore-CMakeLists.txt (revision 472183) @@ -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) Property changes on: head/emulators/pcsxr/files/patch-libpcsxcore-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/pcsxr/files/patch-libpcsxcore-ix86_64-ix86_cpudetect.c =================================================================== --- head/emulators/pcsxr/files/patch-libpcsxcore-ix86_64-ix86_cpudetect.c (nonexistent) +++ head/emulators/pcsxr/files/patch-libpcsxcore-ix86_64-ix86_cpudetect.c (revision 472183) @@ -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 + #include Property changes on: head/emulators/pcsxr/files/patch-libpcsxcore-ix86_64-ix86_cpudetect.c ___________________________________________________________________ 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/pcsxr/files/patch-libpcsxcore-psxcommon.h =================================================================== --- head/emulators/pcsxr/files/patch-libpcsxcore-psxcommon.h (nonexistent) +++ head/emulators/pcsxr/files/patch-libpcsxcore-psxcommon.h (revision 472183) @@ -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 Property changes on: head/emulators/pcsxr/files/patch-libpcsxcore-psxcommon.h ___________________________________________________________________ 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/pcsxr/files/patch-plugins-bladesio1-CMakeLists.txt =================================================================== --- head/emulators/pcsxr/files/patch-plugins-bladesio1-CMakeLists.txt (nonexistent) +++ head/emulators/pcsxr/files/patch-plugins-bladesio1-CMakeLists.txt (revision 472183) @@ -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) Property changes on: head/emulators/pcsxr/files/patch-plugins-bladesio1-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/pcsxr/files/patch-plugins-dfcdrom-CMakeLists.txt =================================================================== --- head/emulators/pcsxr/files/patch-plugins-dfcdrom-CMakeLists.txt (nonexistent) +++ head/emulators/pcsxr/files/patch-plugins-dfcdrom-CMakeLists.txt (revision 472183) @@ -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) Property changes on: head/emulators/pcsxr/files/patch-plugins-dfcdrom-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/pcsxr/files/patch-plugins-dfinput-CMakeLists.txt =================================================================== --- head/emulators/pcsxr/files/patch-plugins-dfinput-CMakeLists.txt (nonexistent) +++ head/emulators/pcsxr/files/patch-plugins-dfinput-CMakeLists.txt (revision 472183) @@ -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) Property changes on: head/emulators/pcsxr/files/patch-plugins-dfinput-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/pcsxr/files/patch-plugins-dfnet-CMakeLists.txt =================================================================== --- head/emulators/pcsxr/files/patch-plugins-dfnet-CMakeLists.txt (nonexistent) +++ head/emulators/pcsxr/files/patch-plugins-dfnet-CMakeLists.txt (revision 472183) @@ -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) Property changes on: head/emulators/pcsxr/files/patch-plugins-dfnet-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/pcsxr/files/patch-plugins-dfsound-CMakeLists.txt =================================================================== --- head/emulators/pcsxr/files/patch-plugins-dfsound-CMakeLists.txt (nonexistent) +++ head/emulators/pcsxr/files/patch-plugins-dfsound-CMakeLists.txt (revision 472183) @@ -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) Property changes on: head/emulators/pcsxr/files/patch-plugins-dfsound-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/pcsxr/files/patch-plugins-dfxvideo-CMakeLists.txt =================================================================== --- head/emulators/pcsxr/files/patch-plugins-dfxvideo-CMakeLists.txt (nonexistent) +++ head/emulators/pcsxr/files/patch-plugins-dfxvideo-CMakeLists.txt (revision 472183) @@ -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) Property changes on: head/emulators/pcsxr/files/patch-plugins-dfxvideo-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/pcsxr/files/patch-plugins-peopsxgl-CMakeLists.txt =================================================================== --- head/emulators/pcsxr/files/patch-plugins-peopsxgl-CMakeLists.txt (nonexistent) +++ head/emulators/pcsxr/files/patch-plugins-peopsxgl-CMakeLists.txt (revision 472183) @@ -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) Property changes on: head/emulators/pcsxr/files/patch-plugins-peopsxgl-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/pcsxr/pkg-plist =================================================================== --- head/emulators/pcsxr/pkg-plist (revision 472182) +++ head/emulators/pcsxr/pkg-plist (revision 472183) @@ -1,44 +1,28 @@ 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 lib/pcsxr/cfgpeopsxgl lib/pcsxr/cfgDFInput lib/pcsxr/cfgDFCdrom lib/pcsxr/cfgDFSound lib/pcsxr/cfgDFNet lib/pcsxr/libBladeSio1.so lib/pcsxr/libDFXVideo.so lib/pcsxr/libpeopsxgl.so lib/pcsxr/libDFInput.so lib/pcsxr/libDFSound.so lib/pcsxr/libDFCdrom.so lib/pcsxr/libDFNet.so +lib/pcsxr/libNullSio1.so