Index: head/emulators/pcsxr/Makefile =================================================================== --- head/emulators/pcsxr/Makefile (revision 432458) +++ head/emulators/pcsxr/Makefile (revision 432459) @@ -1,67 +1,67 @@ # Created by: Ganael Laplanche # $FreeBSD$ PORTNAME= pcsxr PORTVERSION= 1.9.94.r87113 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= emulators MASTER_SITES= http://contribs.martymac.org/FreeBSD-ports/distfiles/ \ LOCAL/martymac MAINTAINER= martymac@FreeBSD.org COMMENT= Playstation (PSX) emulator LICENSE= GPLv2 BUILD_DEPENDS= gawk:lang/gawk LIB_DEPENDS= libvorbis.so:audio/libvorbis \ libcdio.so:sysutils/libcdio ONLY_FOR_ARCHS= i386 amd64 GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib USE_CSTD= gnu89 CONFIGURE_ARGS= --enable-opengl --enable-libcdio INSTALL_TARGET= install-strip USE_LDCONFIG= yes USE_GNOME= gtk30 intltool glib20 USE_XORG= x11 xv xext xxf86vm xtst USE_SDL= sdl USE_GL= gl USES= autoreconf desktop-file-utils dos2unix iconv gmake libtool \ pkgconfig tar:bzip2 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 OPTIONS_DEFINE= NLS OPTIONS_SUB= yes NLS_USES= gettext NLS_CONFIGURE_ENABLE= nls .include .if ${ARCH} == "amd64" CONFIGURE_ARGS+= --enable-dynarec=x86_64 .endif # Add ${PREFIX} to plugins' lookup directories and set default CDROM device post-patch: @${REINPLACE_CMD} "s|%%PREFIX%%|${PREFIX}|" \ ${WRKSRC}/gui/LnxMain.c @${REINPLACE_CMD} "s|%%DVD_DEVICE%%|${DEFAULT_DVD_DEVICE}|" \ ${WRKSRC}/plugins/dfcdrom/cdr.h post-install: ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} .include Index: head/emulators/pcsxr/files/patch-libpcsxcore-cdriso.c =================================================================== --- head/emulators/pcsxr/files/patch-libpcsxcore-cdriso.c (nonexistent) +++ head/emulators/pcsxr/files/patch-libpcsxcore-cdriso.c (revision 432459) @@ -0,0 +1,29 @@ +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 ___________________________________________________________________ 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