Attachment 172456 Details for Bug 210826 – patch

[patch] patch

retroarch.patch (text/plain), 7.95 KB, created by Yuri Victorovich on 2016-07-13 08:32:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yuri Victorovich

Created: 2016-07-13 08:32:15 UTC

Size: 7.95 KB

patch

obsolete

>Index: games/retroarch/Makefile
>===================================================================
>--- games/retroarch/Makefile	(revision 418058)
>+++ games/retroarch/Makefile	(working copy)
>@@ -2,9 +2,8 @@
> # $FreeBSD$
> 
> PORTNAME=	RetroArch
>-PORTVERSION=	1.2.2
>+PORTVERSION=	1.3.4
> DISTVERSIONPREFIX=	v
>-PORTREVISION=	1
> CATEGORIES=	games
> 
> MAINTAINER=	yuri@rawbw.com
>@@ -14,7 +13,8 @@
> LICENSE_FILE=	${WRKSRC}/COPYING
> 
> LIB_DEPENDS=	libxkbcommon.so:x11/libxkbcommon \
>-		libdrm.so:graphics/libdrm
>+		libdrm.so:graphics/libdrm \
>+		libass.so:multimedia/libass
> 
> OPTIONS_DEFINE=	FFMPEG OSS JACK PULSEAUDIO ALSA SDL OPENGL OPENAL NETPLAY PYTHON V4L FREETYPE FBO
> OPTIONS_DEFAULT=FFMPEG OSS PULSEAUDIO SDL OPENGL OPENAL NETPLAY PYTHON V4L FREETYPE FBO
>@@ -35,7 +35,7 @@
> SDL_USE=		SDL=sdl2 image2
> SDL_CONFIGURE_ON=	--disable-sdl --enable-sdl2
> SDL_CONFIGURE_OFF=	--disable-sdl --disable-sdl2
>-OPENGL_USE=		GL=gl,gbm
>+OPENGL_USE=		GL=gl,egl,gbm
> OPENGL_CONFIGURE_ENABLE=opengl
> OPENAL_USES=		openal:soft
> OPENAL_CONFIGURE_ENABLE=al
>@@ -53,6 +53,8 @@
> LDFLAGS+=	-pthread
> CONFIGURE_ARGS+=--enable-threads
> 
>+BROKEN_FreeBSD_9=	does not build on FreeBSD 9.x
>+
> USE_GITHUB=	yes
> GH_ACCOUNT=	libretro
> 
>@@ -60,19 +62,16 @@
> GNU_CONFIGURE=	yes
> CONFIGURE_ARGS+=--global-config-dir=${LOCALBASE}/etc
> USES=		compiler:c++11-lib gmake pkgconfig
>-USE_XORG=	x11 xext xinerama xv xxf86vm
>+USE_XORG=	x11 xcb xext xinerama xv xxf86vm
> 
>-MAN1PAGES=	retroarch-cg2glsl.1 retroarch-joyconfig.1 retroarch.1
>+MAN1PAGES=	retroarch-cg2glsl.1 retroarch.1
> 
> post-patch:
> 	@${REINPLACE_CMD} -e 's|<malloc.h>|<stdlib.h>|' \
> 		${WRKSRC}/camera/drivers/video4linux2.c \
>-		${WRKSRC}/deps/zlib/zutil.h \
> 		${WRKSRC}/gfx/drivers/*.c \
>-		${WRKSRC}/libretro-common/formats/png/rpng_decode.c \
> 		${WRKSRC}/libretro-common/libco/armeabi.c \
>-		${WRKSRC}/logger/netlogger/psl1ght_logger.c \
>-		${WRKSRC}/wii/mem2_manager.c
>+		${WRKSRC}/memory/wii/mem2_manager.c
> 	@${REINPLACE_CMD} -e 's|<asm/types.h>|<sys/types.h>|' \
> 		${WRKSRC}/camera/drivers/video4linux2.c
> 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
>@@ -81,11 +80,9 @@
> post-install:
> 	if [ -n "${STRIP}" ]; then \
> 	        ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/retroarch; \
>-	        ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/retroarch-joyconfig; \
> 	fi
> 	${GZIP_CMD} ${STAGEDIR}${PREFIX}/man/man1/retroarch.1
> 	${GZIP_CMD} ${STAGEDIR}${PREFIX}/man/man1/retroarch-cg2glsl.1
>-	${GZIP_CMD} ${STAGEDIR}${PREFIX}/man/man1/retroarch-joyconfig.1
> 	${RM} -rf ${STAGEDIR}${PREFIX}/share/man
> 	@${REINPLACE_CMD} -e 's|# libretro_directory =|libretro_directory = "${PREFIX}/libexec/libretro"|' \
> 		${STAGEDIR}${PREFIX}/etc/retroarch.cfg
>Index: games/retroarch/distinfo
>===================================================================
>--- games/retroarch/distinfo	(revision 418058)
>+++ games/retroarch/distinfo	(working copy)
>@@ -1,2 +1,3 @@
>-SHA256 (libretro-RetroArch-v1.2.2_GH0.tar.gz) = 1113f75f6ddb790174b0f9e0fc82ff4875e8a4d39262428a6ba4a931a147b9af
>-SIZE (libretro-RetroArch-v1.2.2_GH0.tar.gz) = 9155016
>+TIMESTAMP = 1467661675
>+SHA256 (libretro-RetroArch-v1.3.4_GH0.tar.gz) = a5733a0f4ad828afd00fa2a059deb6538939d46a2aefc4a566c30300a40efb1c
>+SIZE (libretro-RetroArch-v1.3.4_GH0.tar.gz) = 11652146
>Index: games/retroarch/files/patch-libretro-common_include_streams_interface__stream.h
>===================================================================
>--- games/retroarch/files/patch-libretro-common_include_streams_interface__stream.h	(nonexistent)
>+++ games/retroarch/files/patch-libretro-common_include_streams_interface__stream.h	(working copy)
>@@ -0,0 +1,11 @@
>+--- libretro-common/include/streams/interface_stream.h.orig	2016-05-02 20:17:12 UTC
>++++ libretro-common/include/streams/interface_stream.h
>+@@ -29,6 +29,8 @@
>+ #include <retro_common_api.h>
>+ #include <boolean.h>
>+ 
>++#include <sys/types.h>
>++
>+ enum intfstream_type
>+ {
>+    INTFSTREAM_FILE = 0,
>
>Property changes on: games/retroarch/files/patch-libretro-common_include_streams_interface__stream.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: games/retroarch/files/patch-libretro-common_net_net__ifinfo.c
>===================================================================
>--- games/retroarch/files/patch-libretro-common_net_net__ifinfo.c	(nonexistent)
>+++ games/retroarch/files/patch-libretro-common_net_net__ifinfo.c	(working copy)
>@@ -0,0 +1,11 @@
>+--- libretro-common/net/net_ifinfo.c.orig	2016-07-04 20:02:01 UTC
>++++ libretro-common/net/net_ifinfo.c
>+@@ -44,6 +44,8 @@
>+ 
>+ #include <net/net_ifinfo.h>
>+ 
>++#include <netinet/in.h>
>++
>+ void net_ifinfo_free(net_ifinfo_t *list)
>+ {
>+    unsigned k;
>
>Property changes on: games/retroarch/files/patch-libretro-common_net_net__ifinfo.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: games/retroarch/files/patch-libretro-common_rthreads_rthreads.c
>===================================================================
>--- games/retroarch/files/patch-libretro-common_rthreads_rthreads.c	(nonexistent)
>+++ games/retroarch/files/patch-libretro-common_rthreads_rthreads.c	(working copy)
>@@ -0,0 +1,11 @@
>+--- libretro-common/rthreads/rthreads.c.orig	2016-05-02 20:17:12 UTC
>++++ libretro-common/rthreads/rthreads.c
>+@@ -53,6 +53,8 @@
>+ #include <mach/mach.h>
>+ #endif
>+ 
>++#include <sys/time.h>
>++
>+ struct thread_data
>+ {
>+    void (*func)(void*);
>
>Property changes on: games/retroarch/files/patch-libretro-common_rthreads_rthreads.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: games/retroarch/files/patch-qb_config.libs.sh
>===================================================================
>--- games/retroarch/files/patch-qb_config.libs.sh	(revision 418058)
>+++ games/retroarch/files/patch-qb_config.libs.sh	(working copy)
>@@ -1,4 +1,4 @@
>---- qb/config.libs.sh.orig	2015-07-19 09:50:27 UTC
>+--- qb/config.libs.sh.orig	2016-05-02 20:17:12 UTC
> +++ qb/config.libs.sh
> @@ -31,6 +31,9 @@ fi
>  
>@@ -10,7 +10,7 @@
>  [ "$OS" = 'Darwin' ] && HAVE_X11=no # X11 breaks on recent OSXes even if present.
>  
>  [ -d /opt/vc/lib ] && add_library_dirs /opt/vc/lib
>-@@ -125,11 +128,11 @@ fi
>+@@ -130,11 +133,11 @@ fi
>     add_define_make libretro "$LIBRETRO"
>  }
>  
>@@ -26,7 +26,7 @@
>  
>  if [ "$OS" = 'Win32' ]; then
>     HAVE_THREADS=yes
>-@@ -182,7 +185,7 @@ fi
>+@@ -189,7 +192,7 @@ fi
>  check_pkgconf ALSA alsa
>  check_header OSS sys/soundcard.h
>  check_header OSS_BSD soundcard.h
>Index: games/retroarch/files/patch-qb_qb.params.sh
>===================================================================
>--- games/retroarch/files/patch-qb_qb.params.sh	(revision 418058)
>+++ games/retroarch/files/patch-qb_qb.params.sh	(working copy)
>@@ -1,6 +1,6 @@
>---- qb/qb.params.sh.orig	2015-07-19 09:50:27 UTC
>+--- qb/qb.params.sh.orig	2016-05-02 20:17:12 UTC
> +++ qb/qb.params.sh
>-@@ -59,6 +59,9 @@ parse_input() # Parse stuff :V
>+@@ -63,6 +63,9 @@ parse_input() # Parse stuff :V
>  	while [ "$1" ]; do
>  		case "$1" in
>  			--prefix=*) PREFIX=${1##--prefix=};;
>Index: games/retroarch/pkg-plist
>===================================================================
>--- games/retroarch/pkg-plist	(revision 418058)
>+++ games/retroarch/pkg-plist	(working copy)
>@@ -1,9 +1,7 @@
> bin/retroarch
> bin/retroarch-cg2glsl
>-bin/retroarch-joyconfig
> etc/retroarch.cfg
> man/man1/retroarch-cg2glsl.1.gz
>-man/man1/retroarch-joyconfig.1.gz
> man/man1/retroarch.1.gz
>-share/pixmaps/retroarch.png
> share/pixmaps/retroarch.svg
>+share/applications/retroarch.desktop

Actions: View | Diff

Attachments on bug 210826: 172118 | 172456