Attachment 188992 Details for Bug 224482 – Patch

[patch] Patch

patch-openspades.diff (text/plain), 5.63 KB, created by Kevin Zheng on 2017-12-20 14:14:52 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kevin Zheng

Created: 2017-12-20 14:14:52 UTC

Size: 5.63 KB

patch

obsolete

>diff --git a/games/openspades/Makefile b/games/openspades/Makefile
>index e75fe4173963..abd8ba4ded42 100644
>--- a/games/openspades/Makefile
>+++ b/games/openspades/Makefile
>@@ -2,12 +2,11 @@
> # $FreeBSD$
> 
> PORTNAME=	openspades
>-PORTVERSION=	0.0.12
>+PORTVERSION=	0.1.1c
> DISTVERSIONPREFIX=	v
>-PORTREVISION=	6
> CATEGORIES=	games
>-MASTER_SITES=	http://yvt.jp/files/programs/osppaks/:data
>-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} DevPaks27.zip:data
>+MASTER_SITES=	https://github.com/yvt/openspades-paks/releases/download/r33/:data
>+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} OpenSpadesDevPackage-r33.zip:data
> 
> MAINTAINER=	amdmi3@FreeBSD.org
> COMMENT=	Compatible client of Ace of Spades
>@@ -16,7 +15,8 @@ LICENSE=	GPLv3
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
> BUILD_DEPENDS=	convert:graphics/ImageMagick # for building icons
>-LIB_DEPENDS=	libcurl.so:ftp/curl
>+LIB_DEPENDS=	libcurl.so:ftp/curl \
>+		libopusfile.so:audio/opusfile
> 
> NOT_FOR_ARCHS=		aarch64 powerpc64
> NOT_FOR_ARCHS_REASON=	fails to compile: uses x86 assembly
>@@ -24,7 +24,7 @@ NOT_FOR_ARCHS_REASON=	fails to compile: uses x86 assembly
> USE_GITHUB=	yes
> GH_ACCOUNT=	yvt
> 
>-USES=		cmake compiler:c++11-lib desktop-file-utils
>+USES=		cmake compiler:c++11-lib desktop-file-utils openal
> CMAKE_ARGS=	-DOPENSPADES_RESOURCES=OFF \
> 		-DOPENSPADES_INSTALL_MAN="man/man6" \
> 		-DOPENSPADES_INSTALL_BINARY="bin" \
>@@ -39,10 +39,13 @@ PORTDATA=	*
> OPTIONS_DEFINE=	DOCS
> 
> post-extract:
>-	@${MKDIR} ${WRKSRC}/Resources/DevPak
>-	@${MV} ${WRKDIR}/*.pak ${WRKSRC}/Resources/DevPak/
>+	@${MV} ${WRKDIR}/Nonfree/*.pak ${WRKDIR}/OfficialMods/*.pak \
>+	    ${WRKSRC}/Resources/
> 
> post-patch:
> 	@${REINPLACE_CMD} -e 's|Xext|${LOCALBASE}/lib/lib&.so|' ${WRKSRC}/Sources/CMakeLists.txt
> 
>+post-install:
>+	cd ${WRKSRC}/Resources/ && ${COPYTREE_SHARE} "Gfx Locales Maps Models PackageInfo.json Scripts Shaders Sounds Textures *.pak" ${STAGEDIR}${DATADIR}
>+
> .include <bsd.port.mk>
>diff --git a/games/openspades/distinfo b/games/openspades/distinfo
>index 16019d4b797d..a6cef8e86fd7 100644
>--- a/games/openspades/distinfo
>+++ b/games/openspades/distinfo
>@@ -1,4 +1,5 @@
>-SHA256 (yvt-openspades-v0.0.12_GH0.tar.gz) = f5778f12cf42c46b14ed8decb0a312998839ea9f7927058fb919a3c9182248a9
>-SIZE (yvt-openspades-v0.0.12_GH0.tar.gz) = 1984521
>-SHA256 (DevPaks27.zip) = 668b62d3770f407447e6f45df28928f66a7fe3440c541788f66583f31ae5c717
>-SIZE (DevPaks27.zip) = 19597524
>+TIMESTAMP = 1513120019
>+SHA256 (yvt-openspades-v0.1.1c_GH0.tar.gz) = e51d6b9422aef149944d7f6a28a284291fb322a025b3fee8bd2cc9da622a73c7
>+SIZE (yvt-openspades-v0.1.1c_GH0.tar.gz) = 7337747
>+SHA256 (OpenSpadesDevPackage-r33.zip) = 0927dc323a0b3aba0ee8d1d68d6b544b00fe654740fead6d1faad37aac77a2ad
>+SIZE (OpenSpadesDevPackage-r33.zip) = 4036321
>diff --git a/games/openspades/files/patch-CMakeLists.txt b/games/openspades/files/patch-CMakeLists.txt
>deleted file mode 100644
>index 2aae4d58177d..000000000000
>--- a/games/openspades/files/patch-CMakeLists.txt
>+++ /dev/null
>@@ -1,8 +0,0 @@
>---- CMakeLists.txt.orig	2014-06-23 11:55:03 UTC
>-+++ CMakeLists.txt
>-@@ -1,5 +1,4 @@
>- cmake_minimum_required(VERSION 2.8)
>--set(CMAKE_INSTALL_PREFIX "/usr/local")
>- project(OpenSpades)
>- 
>- set(OpenSpades_VERSION_MAJOR 0)
>diff --git a/games/openspades/files/patch-Sources__CMakeLists.txt b/games/openspades/files/patch-Sources__CMakeLists.txt
>deleted file mode 100644
>index 24a778f6e074..000000000000
>--- a/games/openspades/files/patch-Sources__CMakeLists.txt
>+++ /dev/null
>@@ -1,15 +0,0 @@
>---- Sources/CMakeLists.txt.orig	2014-06-23 11:55:03 UTC
>-+++ Sources/CMakeLists.txt
>-@@ -24,9 +24,9 @@ add_subdirectory(AngelScript/projects/cm
>- add_subdirectory(AngelScript/projects/cmake_addons)
>- set(ANGELSCRIPT_LIBS Angelscript Angelscript_addons)
>- 
>--include_directories(".")
>--include_directories("json/include")
>--include_directories("ENet/include")
>-+include_directories(BEFORE ".")
>-+include_directories(BEFORE "json/include")
>-+include_directories(BEFORE "ENet/include")
>- 
>- if(WIN32)
>- 	if(MINGW)	# = gcc, can someone confirm that this works?
>diff --git a/games/openspades/files/patch-Sources__Core__ConcurrentDispatch.cpp b/games/openspades/files/patch-Sources__Core__ConcurrentDispatch.cpp
>deleted file mode 100644
>index ac8e7d44cac4..000000000000
>--- a/games/openspades/files/patch-Sources__Core__ConcurrentDispatch.cpp
>+++ /dev/null
>@@ -1,20 +0,0 @@
>---- Sources/Core/ConcurrentDispatch.cpp.orig	2014-06-23 11:55:03 UTC
>-+++ Sources/Core/ConcurrentDispatch.cpp
>-@@ -38,7 +38,7 @@
>- #ifndef _MSC_VER
>- #include <unistd.h>
>- #endif
>--#if defined(__GNUC__)
>-+#if defined(__linux__)
>- #include <sys/sysinfo.h>
>- #endif
>- #endif
>-@@ -67,7 +67,7 @@ static int GetNumCores() {
>-         if(count < 1) { count = 1; }
>-     }
>-     return count;
>--#elif defined(__GNUC__)
>-+#elif defined(__linux__)
>-     return get_nprocs();
>- #else
>-     return sysconf(_SC_NPROCESSORS_ONLN);
>diff --git a/games/openspades/files/patch-Sources__Draw__SWFeatureLevel.h b/games/openspades/files/patch-Sources__Draw__SWFeatureLevel.h
>deleted file mode 100644
>index 246431d67c00..000000000000
>--- a/games/openspades/files/patch-Sources__Draw__SWFeatureLevel.h
>+++ /dev/null
>@@ -1,10 +0,0 @@
>---- Sources/Draw/SWFeatureLevel.h.orig	2014-06-23 11:55:03 UTC
>-+++ Sources/Draw/SWFeatureLevel.h
>-@@ -55,6 +55,7 @@
>- #endif
>- 
>- #include <algorithm>
>-+#include <cmath>
>- #include <Core/ConcurrentDispatch.h>
>- #include <Core/Debug.h>
>- 
>diff --git a/games/openspades/pkg-descr b/games/openspades/pkg-descr
>index f704e74b2cd7..e232ad381536 100644
>--- a/games/openspades/pkg-descr
>+++ b/games/openspades/pkg-descr
>@@ -4,4 +4,4 @@ OpenSpades is a compatible client of Ace of Spades 0.75.
> * Uses OpenGL/AL for better visuals.
> * Open source, and cross platform.
> 
>-WWW: http://www.openspades.org/
>+WWW: http://openspades.yvt.jp/

Actions: View | Diff

Attachments on bug 224482: 188992 | 195009 | 200760