Attachment 207620 Details for Bug 239141 – stk.patch v2

[patch] stk.patch v2

stk.patch (text/plain), 3.49 KB, created by Val Packett on 2019-09-19 09:51:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Val Packett

Created: 2019-09-19 09:51:09 UTC

Size: 3.49 KB

patch

obsolete

>diff --git c/games/supertuxkart/Makefile i/games/supertuxkart/Makefile
>index 7adc7bf18582..fceea26df2f1 100644
>--- c/games/supertuxkart/Makefile
>+++ i/games/supertuxkart/Makefile
>@@ -21,16 +21,10 @@ LIB_DEPENDS=	libvorbisfile.so:audio/libvorbis \
> 		libfreetype.so:print/freetype2 \
> 		libenet.so:net/enet
> 
>-BROKEN_aarch64=		invokes x86 assembler
>-BROKEN_armv6=		invokes x86 assembler
>-BROKEN_armv7=		invokes x86 assembler
>-BROKEN_mips=		invokes x86 assembler
>-BROKEN_mips64=		invokes x86 assembler
>-BROKEN_sparc64=		invokes x86 assembler
> BROKEN_i386=		does not build (error: this directive must appear between .cfi_startproc and .cfi_endproc directives)
> 
> USES=		alias cmake compiler:c++11-lib gettext gl \
>-		jpeg openal:al pkgconfig sdl tar:xz
>+		jpeg openal:al pkgconfig sdl tar:xz xorg
> USE_GL=		gl glu glew
> USE_SDL=	sdl
> USE_XORG=	x11 xrandr
>@@ -45,8 +39,8 @@ PORTDATA=	*
> CXXFLAGS+=	-DNO_IRR_COMPILE_WITH_JOYSTICK_EVENTS_ \
> 		-D__FREE_BSD_
> 
>-OPTIONS_DEFINE=	FRIBIDI NETTLE
>-OPTIONS_DEFAULT=FRIBIDI NETTLE
>+OPTIONS_DEFINE=	FRIBIDI NETTLE WAYLAND
>+OPTIONS_DEFAULT=FRIBIDI NETTLE WAYLAND
> 
> FRIBIDI_DESC=		Support for right-to-left languages
> FRIBIDI_CMAKE_BOOL=	USE_FRIBIDI
>@@ -57,6 +51,11 @@ NETTLE_LIB_DEPENDS=	libnettle.so:security/nettle
> NETTLE_USES_OFF=	ssl
> NETTLE_CMAKE_BOOL_OFF=	USE_CRYPTO_OPENSSL
> 
>+WAYLAND_CMAKE_BOOL=	ENABLE_WAYLAND_DEVICE
>+WAYLAND_LIB_DEPENDS=	libwayland-egl.so:graphics/wayland \
>+		libxkbcommon.so:x11/libxkbcommon
>+WAYLAND_USE=	GL=egl
>+
> # make sure that as much bundled stuff as possible is not used
> post-extract:
> .for bundled in jpeglib libpng zlib enet glew wiiuse
>diff --git c/games/supertuxkart/files/patch-lib_angelscript_projects_cmake_CMakeLists.txt i/games/supertuxkart/files/patch-lib_angelscript_projects_cmake_CMakeLists.txt
>new file mode 100644
>index 000000000000..3b28129436ff
>--- /dev/null
>+++ i/games/supertuxkart/files/patch-lib_angelscript_projects_cmake_CMakeLists.txt
>@@ -0,0 +1,10 @@
>+--- lib/angelscript/projects/cmake/CMakeLists.txt.orig	2019-09-19 09:41:35 UTC
>++++ lib/angelscript/projects/cmake/CMakeLists.txt
>+@@ -111,7 +111,6 @@ if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "^arm")
>+     enable_language(ASM)
>+     if(CMAKE_ASM_COMPILER_WORKS)
>+         set(ANGELSCRIPT_SOURCE ${ANGELSCRIPT_SOURCE} ../../source/as_callfunc_arm.cpp ../../source/as_callfunc_arm_gcc.S)
>+-        set_property(SOURCE ../../source/as_callfunc_arm_gcc.S APPEND PROPERTY COMPILE_FLAGS " -Wa,-mimplicit-it=always")
>+     else()
>+         message(FATAL ERROR "ARM target requires a working assembler")
>+     endif()
>diff --git c/games/supertuxkart/files/patch-lib_angelscript_source_as__config.h i/games/supertuxkart/files/patch-lib_angelscript_source_as__config.h
>index 029c1d2832b1..efb3c2658614 100644
>--- c/games/supertuxkart/files/patch-lib_angelscript_source_as__config.h
>+++ i/games/supertuxkart/files/patch-lib_angelscript_source_as__config.h
>@@ -1,12 +1,11 @@
>---- lib/angelscript/source/as_config.h.orig	2019-04-20 16:40:12 UTC
>+--- lib/angelscript/source/as_config.h.orig	2019-07-11 00:36:27 UTC
> +++ lib/angelscript/source/as_config.h
>-@@ -953,7 +953,9 @@
>+@@ -953,7 +953,7 @@
>  			#define COMPLEX_RETURN_MASK (asOBJ_APP_CLASS_DESTRUCTOR | asOBJ_APP_CLASS_COPY_CONSTRUCTOR | asOBJ_APP_ARRAY)
>  			#define THISCALL_PASS_OBJECT_POINTER_ON_THE_STACK
>  			#define AS_X86
>-+		#elif defined(__powerpc64__)
>-+			#define AS_MAX_PORTABILITY
>- 		#elif defined(__LP64__)
>+-		#elif defined(__LP64__)
>++		#elif defined(__x86_64__)
>  			#define AS_X64_GCC
>  			#define HAS_128_BIT_PRIMITIVES
>  			#define SPLIT_OBJS_BY_MEMBER_TYPES

Actions: View | Diff

Attachments on bug 239141: 205690 | 207620