Attachment 223726 Details for Bug 254674 – git diff output for games/minetest

[patch] git diff output for games/minetest

minetest_git_diff (text/plain), 11.26 KB, created by tigersharke on 2021-03-31 10:02:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tigersharke

Created: 2021-03-31 10:02:24 UTC

Size: 11.26 KB

patch

obsolete

>diff --git a/games/minetest/Makefile b/games/minetest/Makefile
>index 3fd65df5e9..e0e0886022 100644
>--- a/games/minetest/Makefile
>+++ b/games/minetest/Makefile
>@@ -12,44 +12,67 @@ COMMENT=	Near-infinite-world block sandbox game
> LICENSE=	LGPL21+
> LICENSE_FILE=	${WRKSRC}/doc/lgpl-2.1.txt
> 
>-LIB_DEPENDS=	libsqlite3.so:databases/sqlite3 \
>-		libgmp.so:math/gmp \
>-		libjsoncpp.so:devel/jsoncpp
>-
>-USE_GITHUB=	yes
>-GH_ACCOUNT=	minetest
>+LIB_DEPENDS=	libsqlite3.so:databases/sqlite3
> 
> USES=		cmake compiler:c11 iconv:wchar_t
>-CMAKE_ARGS=	-DCUSTOM_MANDIR="${PREFIX}/man" \
>+CMAKE_ARGS=	-DBUILD_UNITTESTS="FALSE" \
>+		-DCMAKE_BUILD_TYPE="MinSizeRel" \
> 		-DCUSTOM_EXAMPLE_CONF_DIR="${PREFIX}/etc" \
>-		-DENABLE_SYSTEM_JSONCPP=ON
>+		-DCUSTOM_MANDIR="${PREFIX}/man"
>+#               -DVERSION_EXTRA="_${PORTREVISION}"  # Except that there is an automatic added dash seperator.
>+# OpenGL_GL_PREFERENCE Allowed values are 'GLVND' and 'LEGACY'
>+# See CMake Policy CMP0072 for reference: cmake --help-policy CMP0072. GLVND is broken on some nvidia setups, so use LEGACY instead.
>+
>+USE_GITHUB=	yes
>+GH_ACCOUNT=	minetest
> 
> LDFLAGS_i386=	-Wl,-znotext
> 
> PORTDATA=	*
> PORTDOCS=	*
> 
>-OPTIONS_DEFINE=	CURL SOUND FREETYPE NCURSES LUAJIT \
>-		DOCS EXAMPLES NLS
>+OPTIONS_DEFINE=	CURL DOCS EXAMPLES FREETYPE LUAJIT NCURSES NLS SOUND SYSTEM_GMP \
>+		SYSTEM_JSONCPP
> OPTIONS_MULTI=	COMP
>+OPTIONS_RADIO=	GRAPHICS
> OPTIONS_GROUP=	DATABASE
> 
> COMP_DESC=		Software components
> OPTIONS_MULTI_COMP=	CLIENT SERVER
> 
>+OPTIONS_RADIO_GRAPHICS=	GLVND LEGACY
>+
>+SYSTEM_GMP_DESC=		Use gmp from ports (ENABLE_SYSTEM_GMP)
>+SYSTEM_GMP_CMAKE_BOOL=		ENABLE_SYSTEM_GMP
>+SYSTEM_GMP_CMAKE_ON=		-DGMP_INCLUDE_DIR="${PREFIX}/include"
>+SYSTEM_GMP_LIB_DEPENDS=		libgmp.so:math/gmp
>+
>+SYSTEM_JSONCPP_DESC=		Use jsoncpp from ports (ENABLE_SYSTEM_JSONCPP)
>+SYSTEM_JSONCPP_CMAKE_BOOL=	ENABLE_SYSTEM_JSONCPP
>+SYSTEM_JSONCPP_CMAKE_ON=	-DJSON_INCLUDE_DIR="${PREFIX}/include/jsoncpp"
>+SYSTEM_JSONCPP_LIB_DEPENDS=	libjsoncpp.so:devel/jsoncpp
>+
>+GRAPHICS_DESC=		Graphics support
>+GLVND_DESC=		Use libOpenGL or libGLX
>+LEGACY_DESC=		Use libGL - where GLVND may be broken on nvidia
>+
>+GLVND_CMAKE_ON=		-DOPENGL_GL_PREFERENCE="GLVND"
>+LEGACY_CMAKE_ON=	-DOPENGL_GL_PREFERENCE="LEGACY"
>+
> DATABASE_DESC=		Database support
>-OPTIONS_GROUP_DATABASE=	PGSQL LEVELDB REDIS SPATIAL
>+OPTIONS_GROUP_DATABASE=	LEVELDB PGSQL REDIS SPATIAL
> 
>-OPTIONS_DEFAULT=	CLIENT SERVER \
>-			CURL SOUND FREETYPE NCURSES LUAJIT
>+OPTIONS_DEFAULT=	CLIENT CURL FREETYPE GLVND LUAJIT NCURSES SERVER SOUND \
>+			SYSTEM_GMP SYSTEM_JSONCPP
> OPTIONS_SUB=		yes
> 
> CLIENT_DESC=		Build client
> CLIENT_CMAKE_BOOL=	BUILD_CLIENT
>-CLIENT_LIB_DEPENDS=	libpng.so:graphics/png \
>-			libIrrlicht.so:x11-toolkits/irrlicht
>+CLIENT_LIB_DEPENDS=	libIrrlicht.so:x11-toolkits/irrlicht \
>+			libpng.so:graphics/png
> CLIENT_USES=		gl jpeg xorg
>-CLIENT_USE=		GL=gl XORG=x11,xext,xxf86vm
>+CLIENT_USE=		GL=gl \
>+			XORG=x11,xext,xxf86vm
> SERVER_DESC=		Build server
> SERVER_CMAKE_BOOL=	BUILD_SERVER
> 
>@@ -81,16 +104,16 @@ SPATIAL_DESC=		Enable SpatialIndex AreaStore backend
> SPATIAL_LIB_DEPENDS=	libspatialindex.so:devel/spatialindex
> SPATIAL_CMAKE_BOOL=	ENABLE_SPATIAL
> 
>-NLS_CMAKE_BOOL=		ENABLE_GETTEXT
>-NLS_USES=		gettext
>-NLS_LDFLAGS=		-L${LOCALBASE}/lib
>+NLS_CMAKE_BOOL=	ENABLE_GETTEXT
>+NLS_USES=	gettext
>+NLS_LDFLAGS=	-L${LOCALBASE}/lib
> 
> .include <bsd.port.options.mk>
> 
> .if ${PORT_OPTIONS:MCLIENT} && ${PORT_OPTIONS:MSOUND}
> USES+=		openal
>-LIB_DEPENDS+=	libvorbis.so:audio/libvorbis \
>-		libogg.so:audio/libogg
>+LIB_DEPENDS+=	libogg.so:audio/libogg \
>+		libvorbis.so:audio/libvorbis
> .endif
> 
> .if ${PORT_OPTIONS:MSERVER}
>@@ -101,15 +124,21 @@ GROUPS=		${PORTNAME}
> 
> # hacky way to not bring irrlicht and X11 depends for server only
> .if ! ${PORT_OPTIONS:MCLIENT} && ${PORT_OPTIONS:MSERVER}
>-BUILD_DEPENDS+=	${NONEXISTENT}:x11-toolkits/irrlicht:patch
>+BUILD_DEPENDS+=		${NONEXISTENT}:x11-toolkits/irrlicht:patch
> IRRLICHT_INCLUDE_DIR=	`${MAKE} -C ${PORTSDIR}/x11-toolkits/irrlicht -V WRKSRC`/include
>-CMAKE_ARGS+=	-DIRRLICHT_INCLUDE_DIR:STRING="${IRRLICHT_INCLUDE_DIR}"
>-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-irrlichtdepend
>+CMAKE_ARGS+=		-DIRRLICHT_INCLUDE_DIR:STRING="${IRRLICHT_INCLUDE_DIR}"
>+EXTRA_PATCHES+=		${FILESDIR}/extra-patch-irrlichtdepend
> .endif
>-
>-post-extract:
>+# From wiki:
>+#  Building without Irrlicht / X dependency
>+# You can build the Minetest server without library dependencies to Irrlicht or any graphical stuff.
>+# You still need the Irrlicht headers for this, so first, download the irrlicht source to somewhere.
>+#
>+# When invoking CMake, use -DBUILD_CLIENT=0 -DIRRLICHT_SOURCE_DIR=/wherever/you/unzipped/the/source.
>+
>+#post-extract:
> # make sure no bundled gmp is used
>-	@${RM} -rf ${WRKSRC}/lib/gmp ${WRKSRC}/lib/jsoncpp
>+#	@${RM} -rf ${WRKSRC}/lib/gmp ${WRKSRC}/lib/jsoncpp
> # bundled lua is OK, there's no option to use system one
> 
> post-patch:
>diff --git a/games/minetest/files/patch-src_CMakeLists.txt b/games/minetest/files/patch-src_CMakeLists.txt
>deleted file mode 100644
>index 3f56c7ea83..0000000000
>--- a/games/minetest/files/patch-src_CMakeLists.txt
>+++ /dev/null
>@@ -1,25 +0,0 @@
>---- src/CMakeLists.txt.orig	2020-07-09 20:04:20 UTC
>-+++ src/CMakeLists.txt
>-@@ -517,9 +517,13 @@ if (CMAKE_VERSION VERSION_GREATER 3.8.1)
>- 	source_group(TREE ${PROJECT_SOURCE_DIR} PREFIX "Source Files" FILES ${server_SRCS})
>- endif()
>- 
>--include_directories(
>-+include_directories(BEFORE
>- 	${PROJECT_BINARY_DIR}
>- 	${PROJECT_SOURCE_DIR}
>-+	${PROJECT_SOURCE_DIR}/script
>-+)
>-+
>-+include_directories(
>- 	${IRRLICHT_INCLUDE_DIR}
>- 	${ZLIB_INCLUDE_DIR}
>- 	${PNG_INCLUDE_DIR}
>-@@ -529,7 +533,6 @@ include_directories(
>- 	${GMP_INCLUDE_DIR}
>- 	${JSON_INCLUDE_DIR}
>- 	${X11_INCLUDE_DIR}
>--	${PROJECT_SOURCE_DIR}/script
>- )
>- 
>- if(USE_GETTEXT)
>diff --git a/games/minetest/Makefile b/games/minetest/Makefile
>index 3fd65df5e9..e0e0886022 100644
>--- a/games/minetest/Makefile
>+++ b/games/minetest/Makefile
>@@ -12,44 +12,67 @@ COMMENT=	Near-infinite-world block sandbox game
> LICENSE=	LGPL21+
> LICENSE_FILE=	${WRKSRC}/doc/lgpl-2.1.txt
> 
>-LIB_DEPENDS=	libsqlite3.so:databases/sqlite3 \
>-		libgmp.so:math/gmp \
>-		libjsoncpp.so:devel/jsoncpp
>-
>-USE_GITHUB=	yes
>-GH_ACCOUNT=	minetest
>+LIB_DEPENDS=	libsqlite3.so:databases/sqlite3
> 
> USES=		cmake compiler:c11 iconv:wchar_t
>-CMAKE_ARGS=	-DCUSTOM_MANDIR="${PREFIX}/man" \
>+CMAKE_ARGS=	-DBUILD_UNITTESTS="FALSE" \
>+		-DCMAKE_BUILD_TYPE="MinSizeRel" \
> 		-DCUSTOM_EXAMPLE_CONF_DIR="${PREFIX}/etc" \
>-		-DENABLE_SYSTEM_JSONCPP=ON
>+		-DCUSTOM_MANDIR="${PREFIX}/man"
>+#               -DVERSION_EXTRA="_${PORTREVISION}"  # Except that there is an automatic added dash seperator.
>+# OpenGL_GL_PREFERENCE Allowed values are 'GLVND' and 'LEGACY'
>+# See CMake Policy CMP0072 for reference: cmake --help-policy CMP0072. GLVND is broken on some nvidia setups, so use LEGACY instead.
>+
>+USE_GITHUB=	yes
>+GH_ACCOUNT=	minetest
> 
> LDFLAGS_i386=	-Wl,-znotext
> 
> PORTDATA=	*
> PORTDOCS=	*
> 
>-OPTIONS_DEFINE=	CURL SOUND FREETYPE NCURSES LUAJIT \
>-		DOCS EXAMPLES NLS
>+OPTIONS_DEFINE=	CURL DOCS EXAMPLES FREETYPE LUAJIT NCURSES NLS SOUND SYSTEM_GMP \
>+		SYSTEM_JSONCPP
> OPTIONS_MULTI=	COMP
>+OPTIONS_RADIO=	GRAPHICS
> OPTIONS_GROUP=	DATABASE
> 
> COMP_DESC=		Software components
> OPTIONS_MULTI_COMP=	CLIENT SERVER
> 
>+OPTIONS_RADIO_GRAPHICS=	GLVND LEGACY
>+
>+SYSTEM_GMP_DESC=		Use gmp from ports (ENABLE_SYSTEM_GMP)
>+SYSTEM_GMP_CMAKE_BOOL=		ENABLE_SYSTEM_GMP
>+SYSTEM_GMP_CMAKE_ON=		-DGMP_INCLUDE_DIR="${PREFIX}/include"
>+SYSTEM_GMP_LIB_DEPENDS=		libgmp.so:math/gmp
>+
>+SYSTEM_JSONCPP_DESC=		Use jsoncpp from ports (ENABLE_SYSTEM_JSONCPP)
>+SYSTEM_JSONCPP_CMAKE_BOOL=	ENABLE_SYSTEM_JSONCPP
>+SYSTEM_JSONCPP_CMAKE_ON=	-DJSON_INCLUDE_DIR="${PREFIX}/include/jsoncpp"
>+SYSTEM_JSONCPP_LIB_DEPENDS=	libjsoncpp.so:devel/jsoncpp
>+
>+GRAPHICS_DESC=		Graphics support
>+GLVND_DESC=		Use libOpenGL or libGLX
>+LEGACY_DESC=		Use libGL - where GLVND may be broken on nvidia
>+
>+GLVND_CMAKE_ON=		-DOPENGL_GL_PREFERENCE="GLVND"
>+LEGACY_CMAKE_ON=	-DOPENGL_GL_PREFERENCE="LEGACY"
>+
> DATABASE_DESC=		Database support
>-OPTIONS_GROUP_DATABASE=	PGSQL LEVELDB REDIS SPATIAL
>+OPTIONS_GROUP_DATABASE=	LEVELDB PGSQL REDIS SPATIAL
> 
>-OPTIONS_DEFAULT=	CLIENT SERVER \
>-			CURL SOUND FREETYPE NCURSES LUAJIT
>+OPTIONS_DEFAULT=	CLIENT CURL FREETYPE GLVND LUAJIT NCURSES SERVER SOUND \
>+			SYSTEM_GMP SYSTEM_JSONCPP
> OPTIONS_SUB=		yes
> 
> CLIENT_DESC=		Build client
> CLIENT_CMAKE_BOOL=	BUILD_CLIENT
>-CLIENT_LIB_DEPENDS=	libpng.so:graphics/png \
>-			libIrrlicht.so:x11-toolkits/irrlicht
>+CLIENT_LIB_DEPENDS=	libIrrlicht.so:x11-toolkits/irrlicht \
>+			libpng.so:graphics/png
> CLIENT_USES=		gl jpeg xorg
>-CLIENT_USE=		GL=gl XORG=x11,xext,xxf86vm
>+CLIENT_USE=		GL=gl \
>+			XORG=x11,xext,xxf86vm
> SERVER_DESC=		Build server
> SERVER_CMAKE_BOOL=	BUILD_SERVER
> 
>@@ -81,16 +104,16 @@ SPATIAL_DESC=		Enable SpatialIndex AreaStore backend
> SPATIAL_LIB_DEPENDS=	libspatialindex.so:devel/spatialindex
> SPATIAL_CMAKE_BOOL=	ENABLE_SPATIAL
> 
>-NLS_CMAKE_BOOL=		ENABLE_GETTEXT
>-NLS_USES=		gettext
>-NLS_LDFLAGS=		-L${LOCALBASE}/lib
>+NLS_CMAKE_BOOL=	ENABLE_GETTEXT
>+NLS_USES=	gettext
>+NLS_LDFLAGS=	-L${LOCALBASE}/lib
> 
> .include <bsd.port.options.mk>
> 
> .if ${PORT_OPTIONS:MCLIENT} && ${PORT_OPTIONS:MSOUND}
> USES+=		openal
>-LIB_DEPENDS+=	libvorbis.so:audio/libvorbis \
>-		libogg.so:audio/libogg
>+LIB_DEPENDS+=	libogg.so:audio/libogg \
>+		libvorbis.so:audio/libvorbis
> .endif
> 
> .if ${PORT_OPTIONS:MSERVER}
>@@ -101,15 +124,21 @@ GROUPS=		${PORTNAME}
> 
> # hacky way to not bring irrlicht and X11 depends for server only
> .if ! ${PORT_OPTIONS:MCLIENT} && ${PORT_OPTIONS:MSERVER}
>-BUILD_DEPENDS+=	${NONEXISTENT}:x11-toolkits/irrlicht:patch
>+BUILD_DEPENDS+=		${NONEXISTENT}:x11-toolkits/irrlicht:patch
> IRRLICHT_INCLUDE_DIR=	`${MAKE} -C ${PORTSDIR}/x11-toolkits/irrlicht -V WRKSRC`/include
>-CMAKE_ARGS+=	-DIRRLICHT_INCLUDE_DIR:STRING="${IRRLICHT_INCLUDE_DIR}"
>-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-irrlichtdepend
>+CMAKE_ARGS+=		-DIRRLICHT_INCLUDE_DIR:STRING="${IRRLICHT_INCLUDE_DIR}"
>+EXTRA_PATCHES+=		${FILESDIR}/extra-patch-irrlichtdepend
> .endif
>-
>-post-extract:
>+# From wiki:
>+#  Building without Irrlicht / X dependency
>+# You can build the Minetest server without library dependencies to Irrlicht or any graphical stuff.
>+# You still need the Irrlicht headers for this, so first, download the irrlicht source to somewhere.
>+#
>+# When invoking CMake, use -DBUILD_CLIENT=0 -DIRRLICHT_SOURCE_DIR=/wherever/you/unzipped/the/source.
>+
>+#post-extract:
> # make sure no bundled gmp is used
>-	@${RM} -rf ${WRKSRC}/lib/gmp ${WRKSRC}/lib/jsoncpp
>+#	@${RM} -rf ${WRKSRC}/lib/gmp ${WRKSRC}/lib/jsoncpp
> # bundled lua is OK, there's no option to use system one
> 
> post-patch:
>diff --git a/games/minetest/files/patch-src_CMakeLists.txt b/games/minetest/files/patch-src_CMakeLists.txt
>deleted file mode 100644
>index 3f56c7ea83..0000000000
>--- a/games/minetest/files/patch-src_CMakeLists.txt
>+++ /dev/null
>@@ -1,25 +0,0 @@
>---- src/CMakeLists.txt.orig	2020-07-09 20:04:20 UTC
>-+++ src/CMakeLists.txt
>-@@ -517,9 +517,13 @@ if (CMAKE_VERSION VERSION_GREATER 3.8.1)
>- 	source_group(TREE ${PROJECT_SOURCE_DIR} PREFIX "Source Files" FILES ${server_SRCS})
>- endif()
>- 
>--include_directories(
>-+include_directories(BEFORE
>- 	${PROJECT_BINARY_DIR}
>- 	${PROJECT_SOURCE_DIR}
>-+	${PROJECT_SOURCE_DIR}/script
>-+)
>-+
>-+include_directories(
>- 	${IRRLICHT_INCLUDE_DIR}
>- 	${ZLIB_INCLUDE_DIR}
>- 	${PNG_INCLUDE_DIR}
>-@@ -529,7 +533,6 @@ include_directories(
>- 	${GMP_INCLUDE_DIR}
>- 	${JSON_INCLUDE_DIR}
>- 	${X11_INCLUDE_DIR}
>--	${PROJECT_SOURCE_DIR}/script
>- )
>- 
>- if(USE_GETTEXT)

Actions: View | Diff

Attachments on bug 254674: 223726 | 223727