Attachment 172833 Details for Bug 211167 – Proposed patch (since 418497 revision)

[patch] Proposed patch (since 418497 revision)

retroarch.diff (text/plain), 5.41 KB, created by lightside on 2016-07-22 12:07:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: lightside

Created: 2016-07-22 12:07:48 UTC

Size: 5.41 KB

patch

obsolete

>diff -ruN retroarch.orig/Makefile retroarch/Makefile
>--- retroarch.orig/Makefile	2016-07-13 22:38:47.000000000 +0400
>+++ retroarch/Makefile	2016-07-22 14:59:04.240872000 +0400
>@@ -2,7 +2,7 @@
> # $FreeBSD: head/games/retroarch/Makefile 418497 2016-07-13 18:38:47Z pawel $
> 
> PORTNAME=	RetroArch
>-PORTVERSION=	1.3.4
>+PORTVERSION=	1.3.6
> DISTVERSIONPREFIX=	v
> CATEGORIES=	games
> 
>@@ -52,6 +52,7 @@
> CFLAGS+=	-pthread
> LDFLAGS+=	-pthread
> CONFIGURE_ARGS+=--enable-threads
>+CONFIGURE_ENV+=	MAN_DIR=${MANPREFIX}/man
> 
> BROKEN_FreeBSD_9=	does not build on FreeBSD 9.x
> 
>@@ -64,8 +65,6 @@
> USES=		compiler:c++11-lib gmake pkgconfig
> USE_XORG=	x11 xcb xext xinerama xv xxf86vm
> 
>-MAN1PAGES=	retroarch-cg2glsl.1 retroarch.1
>-
> post-patch:
> 	@${REINPLACE_CMD} -e 's|<malloc.h>|<stdlib.h>|' \
> 		${WRKSRC}/camera/drivers/video4linux2.c \
>@@ -74,16 +73,16 @@
> 		${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}|' \
>+	@${REINPLACE_CMD} -e '/^add_define_make DYLIB_LIB/s|$$|;\
>+		add_include_dirs ${LOCALBASE}/include;\
>+		add_library_dirs ${LOCALBASE}/lib| ; \
>+		/^check_lib OSS_LIB/d' \
> 		${WRKSRC}/qb/config.libs.sh
> 
> post-install:
> 	if [ -n "${STRIP}" ]; then \
> 	        ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/retroarch; \
> 	fi
>-	${GZIP_CMD} ${STAGEDIR}${PREFIX}/man/man1/retroarch.1
>-	${GZIP_CMD} ${STAGEDIR}${PREFIX}/man/man1/retroarch-cg2glsl.1
>-	${RM} -rf ${STAGEDIR}${PREFIX}/share/man
> 	@${REINPLACE_CMD} -e 's|# libretro_directory =|libretro_directory = "${PREFIX}/libexec/libretro"|' \
> 		${STAGEDIR}${PREFIX}/etc/retroarch.cfg
> 
>diff -ruN retroarch.orig/distinfo retroarch/distinfo
>--- retroarch.orig/distinfo	2016-07-13 22:38:47.000000000 +0400
>+++ retroarch/distinfo	2016-07-22 06:07:02.494400000 +0400
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1467661675
>-SHA256 (libretro-RetroArch-v1.3.4_GH0.tar.gz) = a5733a0f4ad828afd00fa2a059deb6538939d46a2aefc4a566c30300a40efb1c
>-SIZE (libretro-RetroArch-v1.3.4_GH0.tar.gz) = 11652146
>+TIMESTAMP = 1468710318
>+SHA256 (libretro-RetroArch-v1.3.6_GH0.tar.gz) = bed4201e49b2e97809e97df07d08c752879af0274feec93965a07cf6140759f5
>+SIZE (libretro-RetroArch-v1.3.6_GH0.tar.gz) = 11967473
>diff -ruN retroarch.orig/files/patch-libretro-common_rthreads_rthreads.c retroarch/files/patch-libretro-common_rthreads_rthreads.c
>--- retroarch.orig/files/patch-libretro-common_rthreads_rthreads.c	2016-07-13 22:38:47.000000000 +0400
>+++ retroarch/files/patch-libretro-common_rthreads_rthreads.c	2016-07-22 06:32:57.460980000 +0400
>@@ -1,6 +1,6 @@
>---- libretro-common/rthreads/rthreads.c.orig	2016-05-02 20:17:12 UTC
>+--- libretro-common/rthreads/rthreads.c.orig	2016-07-16 23:05:18 UTC
> +++ libretro-common/rthreads/rthreads.c
>-@@ -53,6 +53,8 @@
>+@@ -57,6 +57,8 @@
>  #include <mach/mach.h>
>  #endif
>  
>diff -ruN retroarch.orig/files/patch-qb_config.libs.sh retroarch/files/patch-qb_config.libs.sh
>--- retroarch.orig/files/patch-qb_config.libs.sh	2016-07-13 22:38:47.000000000 +0400
>+++ retroarch/files/patch-qb_config.libs.sh	1970-01-01 03:00:00.000000000 +0300
>@@ -1,37 +0,0 @@
>---- qb/config.libs.sh.orig	2016-05-02 20:17:12 UTC
>-+++ qb/config.libs.sh
>-@@ -31,6 +31,9 @@ fi
>- 
>- add_define_make DYLIB_LIB "$DYLIB"
>- 
>-+add_include_dirs /usr/local/include
>-+add_library_dirs /usr/local/lib
>-+
>- [ "$OS" = 'Darwin' ] && HAVE_X11=no # X11 breaks on recent OSXes even if present.
>- 
>- [ -d /opt/vc/lib ] && add_library_dirs /opt/vc/lib
>-@@ -130,11 +133,11 @@ fi
>-    add_define_make libretro "$LIBRETRO"
>- }
>- 
>--if [ "$MAN_DIR" ]; then
>-+#if [ "$MAN_DIR" ]; then
>-    add_define_make MAN_DIR "$MAN_DIR"
>--else
>--   add_define_make MAN_DIR "${PREFIX}/share/man/man1"
>--fi
>-+#else
>-+   add_define_make MAN_DIR "${PREFIX}/man/man1"
>-+#fi
>- 
>- if [ "$OS" = 'Win32' ]; then
>-    HAVE_THREADS=yes
>-@@ -189,7 +192,7 @@ fi
>- check_pkgconf ALSA alsa
>- check_header OSS sys/soundcard.h
>- check_header OSS_BSD soundcard.h
>--check_lib OSS_LIB -lossaudio
>-+#check_lib OSS_LIB -lossaudio
>- 
>- if [ "$OS" = 'Darwin' ]; then
>-    check_lib AL "-framework OpenAL" alcOpenDevice
>diff -ruN retroarch.orig/files/patch-qb_qb.params.sh retroarch/files/patch-qb_qb.params.sh
>--- retroarch.orig/files/patch-qb_qb.params.sh	2016-07-13 22:38:47.000000000 +0400
>+++ retroarch/files/patch-qb_qb.params.sh	2016-07-22 08:18:32.795025000 +0400
>@@ -1,12 +1,14 @@
>---- qb/qb.params.sh.orig	2016-05-02 20:17:12 UTC
>+--- qb/qb.params.sh.orig	2016-07-15 20:24:15 UTC
> +++ qb/qb.params.sh
>-@@ -63,6 +63,9 @@ parse_input() # Parse stuff :V
>- 	while [ "$1" ]; do
>- 		case "$1" in
>- 			--prefix=*) PREFIX=${1##--prefix=};;
>-+			--build=*) ;;
>-+			--x-includes=*) ;;
>-+			--x-libraries=*) ;;
>- 			--global-config-dir=*) GLOBAL_CONFIG_DIR=${1##--global-config-dir=};;
>- 			--host=*) CROSS_COMPILE=${1##--host=}-;;
>- 			--enable-*)
>+@@ -79,7 +79,10 @@ parse_input() # Parse stuff :V
>+ 				opt_exists "${arg%%=*}" "$1"
>+ 				eval "$opt=\"$val\""
>+ 			;;
>+-			-h|--help) print_help; exit 0;;
>++			--x-*)
>++			;;
>++			--build*)
>++			;;
>+ 			*) echo "Unknown option $1"; exit 1;;
>+ 		esac
>+ 		shift
>diff -ruN retroarch.orig/pkg-plist retroarch/pkg-plist
>--- retroarch.orig/pkg-plist	2016-07-13 22:38:47.000000000 +0400
>+++ retroarch/pkg-plist	2016-07-22 06:21:21.508514000 +0400
>@@ -1,7 +1,7 @@
> bin/retroarch
> bin/retroarch-cg2glsl
> etc/retroarch.cfg
>-man/man1/retroarch-cg2glsl.1.gz
>-man/man1/retroarch.1.gz
>+man/man6/retroarch-cg2glsl.6.gz
>+man/man6/retroarch.6.gz
> share/pixmaps/retroarch.svg
> share/applications/retroarch.desktop

Flags:

yuri: maintainer-approval+

Actions: View | Diff

Attachments on bug 211167: 172601 | 172677 | 172826 | 172830 | 172833