Attachment 212950 Details for Bug 245253 – Sugested svn diff

[patch] Sugested svn diff

openttd-1.10.0.diff (text/plain), 5.46 KB, created by Nuno Teixeira on 2020-04-01 20:19:51 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nuno Teixeira

Created: 2020-04-01 20:19:51 UTC

Size: 5.46 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 530233)
>+++ Makefile	(working copy)
>@@ -2,8 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	openttd
>-DISTVERSION=	1.9.3
>-PORTREVISION=	1
>+DISTVERSION=	1.10.0
> CATEGORIES=	games
> MASTER_SITES=	https://proxy.binaries.openttd.org/openttd-releases/${DISTVERSION}/
> DISTNAME=	${PORTNAME}-${DISTVERSION}-source
>@@ -19,8 +18,7 @@
> USES=		cpe gmake pkgconfig tar:xz
> HAS_CONFIGURE=	yes
> CONFIGURE_ENV=	STRIP="${STRIP_CMD} ${STRIP}"
>-CONFIGURE_ARGS=	--prefix-dir="${PREFIX}" --data-dir="${DATADIR_REL}" \
>-		--without-libtimidity
>+CONFIGURE_ARGS=	--prefix-dir="${PREFIX}" --data-dir="${DATADIR_REL}"
> MAKE_ARGS=	VERBOSE=1
> 
> WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}
>@@ -28,10 +26,10 @@
> 
> SUB_FILES=	pkg-message
> 
>-PORTDOCS=	HOWTO_compile_lang_files.txt README.md admin_network.txt \
>+PORTDOCS=	README.md \
> 		changelog.txt elrail.svg elrail_tile.png elrail_track.png \
> 		known-bugs.txt landscape.html landscape_externals.html \
>-		landscape_grid.html multiplayer.txt obg_format.txt \
>+		landscape_grid.html multiplayer.md obg_format.txt \
> 		obm_format.txt obs_format.txt ottd-colourtext-palette.png \
> 		tileh.png
> 
>@@ -68,7 +66,7 @@
> 		libicu-le-hb.so:devel/icu-le-hb \
> 		libiculx.so:devel/icu-lx \
> 		libfontconfig.so:x11-fonts/fontconfig
>-USE_SDL=	sdl
>+USE_SDL=	sdl2
> INSTALLS_ICONS=	yes
> .endif
> 
>Index: distinfo
>===================================================================
>--- distinfo	(revision 530233)
>+++ distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1568662216
>-SHA256 (openttd-1.9.3-source.tar.xz) = 1988e17f5b6f4b8f423c849ef1c579c21f678722ae4440f87b27a5fea6385846
>-SIZE (openttd-1.9.3-source.tar.xz) = 6659508
>+TIMESTAMP = 1585743720
>+SHA256 (openttd-1.10.0-source.tar.xz) = 1ba21aac9a1de98b23f80fee952b4b9c5e2d3cc4ac187f5203730826b3f0e253
>+SIZE (openttd-1.10.0-source.tar.xz) = 6801228
>Index: files/patch-config.lib
>===================================================================
>--- files/patch-config.lib	(revision 530233)
>+++ files/patch-config.lib	(working copy)
>@@ -1,6 +1,6 @@
>---- config.lib.orig	2016-04-01 18:33:55 UTC
>+--- config.lib.orig	2020-04-01 08:25:41 UTC
> +++ config.lib
>-@@ -816,15 +816,15 @@ check_params() {
>+@@ -810,15 +810,15 @@ check_params() {
>  	pre_detect_with_lzma=$with_lzma
>  	detect_lzma
>  
>@@ -18,7 +18,7 @@
>  			log 1 " If you want to compile without lzma use --without-lzma as parameter"
>  			exit
>  		fi
>-@@ -1468,7 +1468,6 @@ make_cflags_and_ldflags() {
>+@@ -1491,7 +1491,6 @@ make_cflags_and_ldflags() {
>  			# -fomit-frame-pointer and -pg do not go well together (gcc errors they are incompatible)
>  			CFLAGS="-fomit-frame-pointer $CFLAGS"
>  		fi
>@@ -26,12 +26,12 @@
>  	else
>  		OBJS_SUBDIR="debug"
>  
>-@@ -1675,16 +1674,14 @@ make_cflags_and_ldflags() {
>+@@ -1678,16 +1677,14 @@ make_cflags_and_ldflags() {
>  		fi
>  	fi
>  
> -	if [ -n "$lzma_config" ]; then
>--		CFLAGS="$CFLAGS -DWITH_LZMA"
>+-		CFLAGS="$CFLAGS -DWITH_LIBLZMA"
> -		CFLAGS="$CFLAGS `$lzma_config --cflags | tr '\n\r' '  '`"
> -
> -		if [ "$enable_static" != "0" ]; then
>@@ -44,11 +44,11 @@
> -			LIBS="$LIBS `$lzma_config --libs | tr '\n\r' '  '`"
> +			LIBS="$LIBS -llzma"
>  		fi
>-+		CFLAGS="$CFLAGS -DWITH_LZMA"
>++		CFLAGS="$CFLAGS -DWITH_LIBLZMA"
>  	fi
>  
>  	if [ "$with_lzo2" != "0" ]; then
>-@@ -2692,6 +2689,10 @@ detect_lzo2() {
>+@@ -2728,6 +2725,10 @@ detect_lzo2() {
>  	detect_library "$with_lzo2" "lzo2" "liblzo2.a" "lzo/" "lzo1x.h"
>  }
>  
>@@ -56,10 +56,10 @@
> +	detect_library "$with_lzma" "lzma" "liblzma.a" "" "lzma.h"
> +}
> +
>- detect_libtimidity() {
>- 	detect_pkg_config "$with_libtimidity" "libtimidity" "libtimidity_config" "0.1" "1"
>+ detect_fluidsynth() {
>+ 	detect_library "$with_fluidsynth" "fluidsynth" "" "" "fluidsynth.h"
>  }
>-@@ -2756,10 +2757,6 @@ detect_pkg_config() {
>+@@ -2792,10 +2793,6 @@ detect_pkg_config() {
>  	log 1 "checking $2... found"
>  }
>  
>@@ -70,8 +70,8 @@
>  detect_xdg_basedir() {
>  	detect_pkg_config "$with_xdg_basedir" "libxdg-basedir" "xdg_basedir_config" "1.2"
>  }
>-@@ -3523,8 +3520,7 @@ showhelp() {
>- 	echo "  --with-sdl[=\"pkg-config sdl\"]  enables SDL video driver support"
>+@@ -3528,8 +3525,7 @@ showhelp() {
>+ 	echo "  --with-sdl[=\"sdl1|sdl2\"]       enables SDL video driver support"
>  	echo "  --with-zlib[=\"pkg-config zlib\"]"
>  	echo "                                 enables zlib support"
> -	echo "  --with-liblzma[=\"pkg-config liblzma\"]"
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 530233)
>+++ pkg-plist	(working copy)
>@@ -11,6 +11,7 @@
> %%DATADIR%%/ai/compat_1.7.nut
> %%DATADIR%%/ai/compat_1.8.nut
> %%DATADIR%%/ai/compat_1.9.nut
>+%%DATADIR%%/ai/compat_1.10.nut
> %%DATADIR%%/baseset/no_music.obm
> %%DATADIR%%/baseset/no_sound.obs
> %%DATADIR%%/baseset/openttd.grf
>@@ -32,6 +33,7 @@
> %%DATADIR%%/game/compat_1.7.nut
> %%DATADIR%%/game/compat_1.8.nut
> %%DATADIR%%/game/compat_1.9.nut
>+%%DATADIR%%/game/compat_1.10.nut
> %%DATADIR%%/lang/afrikaans.lng
> %%DATADIR%%/lang/arabic_egypt.lng
> %%DATADIR%%/lang/basque.lng
>@@ -97,10 +99,10 @@
> %%DATADIR%%/scripts/pre_dedicated.scr.example
> %%DATADIR%%/scripts/pre_server.scr.example
> %%DATADIR%%/scripts/readme.txt
>+share/icons/hicolor/128x128/apps/openttd.png
> share/icons/hicolor/16x16/apps/openttd.png
>+share/icons/hicolor/256x256/apps/openttd.png
> share/icons/hicolor/32x32/apps/openttd.png
> share/icons/hicolor/48x48/apps/openttd.png
> share/icons/hicolor/64x64/apps/openttd.png
>-share/icons/hicolor/128x128/apps/openttd.png
>-share/icons/hicolor/256x256/apps/openttd.png
> share/pixmaps/openttd.32.xpm

Actions: View | Diff

Attachments on bug 245253: 212950