From 9465d617f2c8040ab7aa118c4c064b1529c04177 Mon Sep 17 00:00:00 2001 From: Nick Zatkovich Date: Mon, 17 Jul 2017 01:00:59 -0700 Subject: [PATCH 1/5] rename file spries --- sprites/{vile$1.gif => vile[1.gif} | Bin sprites/{vile$2.gif => vile[2.gif} | Bin sprites/{vile$3.gif => vile[3.gif} | Bin sprites/{vile$4.gif => vile[4.gif} | Bin sprites/{vile$5.gif => vile[5.gif} | Bin sprites/{vile$6.gif => vile[6.gif} | Bin sprites/{vile$7.gif => vile[7.gif} | Bin sprites/{vile$8.gif => vile[8.gif} | Bin sprites/{vile#1.gif => vile]1.gif} | Bin sprites/{vile#2.gif => vile]2.gif} | Bin sprites/{vile#3.gif => vile]3.gif} | Bin sprites/{vile#4.gif => vile]4.gif} | Bin sprites/{vile#5.gif => vile]5.gif} | Bin sprites/{vile#6.gif => vile]6.gif} | Bin sprites/{vile#7.gif => vile]7.gif} | Bin sprites/{vile#8.gif => vile]8.gif} | Bin sprites/{vile@1.gif => vile^1.gif} | Bin sprites/{vile@2.gif => vile^2.gif} | Bin sprites/{vile@3.gif => vile^3.gif} | Bin sprites/{vile@4.gif => vile^4.gif} | Bin sprites/{vile@5.gif => vile^5.gif} | Bin sprites/{vile@6.gif => vile^6.gif} | Bin sprites/{vile@7.gif => vile^7.gif} | Bin sprites/{vile@8.gif => vile^8.gif} | Bin 24 files changed, 0 insertions(+), 0 deletions(-) rename sprites/{vile$1.gif => vile[1.gif} (100%) rename sprites/{vile$2.gif => vile[2.gif} (100%) rename sprites/{vile$3.gif => vile[3.gif} (100%) rename sprites/{vile$4.gif => vile[4.gif} (100%) rename sprites/{vile$5.gif => vile[5.gif} (100%) rename sprites/{vile$6.gif => vile[6.gif} (100%) rename sprites/{vile$7.gif => vile[7.gif} (100%) rename sprites/{vile$8.gif => vile[8.gif} (100%) rename sprites/{vile#1.gif => vile]1.gif} (100%) rename sprites/{vile#2.gif => vile]2.gif} (100%) rename sprites/{vile#3.gif => vile]3.gif} (100%) rename sprites/{vile#4.gif => vile]4.gif} (100%) rename sprites/{vile#5.gif => vile]5.gif} (100%) rename sprites/{vile#6.gif => vile]6.gif} (100%) rename sprites/{vile#7.gif => vile]7.gif} (100%) rename sprites/{vile#8.gif => vile]8.gif} (100%) rename sprites/{vile@1.gif => vile^1.gif} (100%) rename sprites/{vile@2.gif => vile^2.gif} (100%) rename sprites/{vile@3.gif => vile^3.gif} (100%) rename sprites/{vile@4.gif => vile^4.gif} (100%) rename sprites/{vile@5.gif => vile^5.gif} (100%) rename sprites/{vile@6.gif => vile^6.gif} (100%) rename sprites/{vile@7.gif => vile^7.gif} (100%) rename sprites/{vile@8.gif => vile^8.gif} (100%) diff --git a/sprites/vile$1.gif b/sprites/vile[1.gif similarity index 100% rename from sprites/vile$1.gif rename to sprites/vile[1.gif diff --git a/sprites/vile$2.gif b/sprites/vile[2.gif similarity index 100% rename from sprites/vile$2.gif rename to sprites/vile[2.gif diff --git a/sprites/vile$3.gif b/sprites/vile[3.gif similarity index 100% rename from sprites/vile$3.gif rename to sprites/vile[3.gif diff --git a/sprites/vile$4.gif b/sprites/vile[4.gif similarity index 100% rename from sprites/vile$4.gif rename to sprites/vile[4.gif diff --git a/sprites/vile$5.gif b/sprites/vile[5.gif similarity index 100% rename from sprites/vile$5.gif rename to sprites/vile[5.gif diff --git a/sprites/vile$6.gif b/sprites/vile[6.gif similarity index 100% rename from sprites/vile$6.gif rename to sprites/vile[6.gif diff --git a/sprites/vile$7.gif b/sprites/vile[7.gif similarity index 100% rename from sprites/vile$7.gif rename to sprites/vile[7.gif diff --git a/sprites/vile$8.gif b/sprites/vile[8.gif similarity index 100% rename from sprites/vile$8.gif rename to sprites/vile[8.gif diff --git a/sprites/vile#1.gif b/sprites/vile]1.gif similarity index 100% rename from sprites/vile#1.gif rename to sprites/vile]1.gif diff --git a/sprites/vile#2.gif b/sprites/vile]2.gif similarity index 100% rename from sprites/vile#2.gif rename to sprites/vile]2.gif diff --git a/sprites/vile#3.gif b/sprites/vile]3.gif similarity index 100% rename from sprites/vile#3.gif rename to sprites/vile]3.gif diff --git a/sprites/vile#4.gif b/sprites/vile]4.gif similarity index 100% rename from sprites/vile#4.gif rename to sprites/vile]4.gif diff --git a/sprites/vile#5.gif b/sprites/vile]5.gif similarity index 100% rename from sprites/vile#5.gif rename to sprites/vile]5.gif diff --git a/sprites/vile#6.gif b/sprites/vile]6.gif similarity index 100% rename from sprites/vile#6.gif rename to sprites/vile]6.gif diff --git a/sprites/vile#7.gif b/sprites/vile]7.gif similarity index 100% rename from sprites/vile#7.gif rename to sprites/vile]7.gif diff --git a/sprites/vile#8.gif b/sprites/vile]8.gif similarity index 100% rename from sprites/vile#8.gif rename to sprites/vile]8.gif diff --git a/sprites/vile@1.gif b/sprites/vile^1.gif similarity index 100% rename from sprites/vile@1.gif rename to sprites/vile^1.gif diff --git a/sprites/vile@2.gif b/sprites/vile^2.gif similarity index 100% rename from sprites/vile@2.gif rename to sprites/vile^2.gif diff --git a/sprites/vile@3.gif b/sprites/vile^3.gif similarity index 100% rename from sprites/vile@3.gif rename to sprites/vile^3.gif diff --git a/sprites/vile@4.gif b/sprites/vile^4.gif similarity index 100% rename from sprites/vile@4.gif rename to sprites/vile^4.gif diff --git a/sprites/vile@5.gif b/sprites/vile^5.gif similarity index 100% rename from sprites/vile@5.gif rename to sprites/vile^5.gif diff --git a/sprites/vile@6.gif b/sprites/vile^6.gif similarity index 100% rename from sprites/vile@6.gif rename to sprites/vile^6.gif diff --git a/sprites/vile@7.gif b/sprites/vile^7.gif similarity index 100% rename from sprites/vile@7.gif rename to sprites/vile^7.gif diff --git a/sprites/vile@8.gif b/sprites/vile^8.gif similarity index 100% rename from sprites/vile@8.gif rename to sprites/vile^8.gif From b66ab3d298db75fd802b73b3cf685f3a357b9b0b Mon Sep 17 00:00:00 2001 From: Nick Zatkovich Date: Mon, 17 Jul 2017 01:06:17 -0700 Subject: [PATCH 2/5] fix wadinfo-builder to reflect new vile names --- scripts/wadinfo-builder.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/wadinfo-builder.py b/scripts/wadinfo-builder.py index a603ae25..b00a0626 100755 --- a/scripts/wadinfo-builder.py +++ b/scripts/wadinfo-builder.py @@ -91,7 +91,7 @@ def parse_assignment(section, line, match): if override is not None: filename = find_file(section, override.lower()) else: - filename = find_file(section, resource.replace('[', '$').replace(']', '#').replace('\\', '@')) + filename = find_file(section, resource.replace('\\', '^')) # File not found? From 163fa96713778a0aa5a5e2cf8e5f335b83b602f7 Mon Sep 17 00:00:00 2001 From: Nick Zatkovich Date: Mon, 17 Jul 2017 03:05:46 -0700 Subject: [PATCH 3/5] Fix makefile for deutex 5.0 -fullsnd is no longer a valid option --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 5479a051..17907e42 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ VERSION=$(shell git describe --dirty 2>/dev/null || cat VERSION) WADS=wads CPP=scripts/simplecpp DEUTEX=deutex -DEUTEX_BASIC_ARGS=-v0 -fullsnd -rate accept -rgb 0 255 255 +DEUTEX_BASIC_ARGS=-v0 -rate accept -rgb 0 255 255 DEUTEX_ARGS=$(DEUTEX_BASIC_ARGS) -doom2 bootstrap/ FREEDOOM1=$(WADS)/freedoom1.wad From 0bc6c96f47a995446136166eb52c020241e4f0a5 Mon Sep 17 00:00:00 2001 From: Nick Zatkovich Date: Mon, 17 Jul 2017 05:41:04 -0700 Subject: [PATCH 4/5] Update build docs to reflect Deutex 5.0 requirement. --- BUILD-SYSTEM.adoc | 5 ----- COMPILING.adoc | 16 +++++++++------- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/BUILD-SYSTEM.adoc b/BUILD-SYSTEM.adoc index 0769add7..2d8c9da1 100644 --- a/BUILD-SYSTEM.adoc +++ b/BUILD-SYSTEM.adoc @@ -262,11 +262,6 @@ around. Some of them are listed here. “standard” background color of cyan is used instead by providing the +-rgb 0 255 255+ command line parameter. - * By default, deutex attempts to convert sound effects to 11,025Hz - format. To keep the existing sample rate of sound effects, the - following command line parameters are provided: - +-v0 -fullsnd -rate accept+ - * deutex does not allow the exact path to the +texture1.txt+ file to be specified in the configuration file; this used to be a problem but the Freedoom's texture lumps are now built using a custom diff --git a/COMPILING.adoc b/COMPILING.adoc index bf9297c9..d67a9378 100644 --- a/COMPILING.adoc +++ b/COMPILING.adoc @@ -26,14 +26,16 @@ Building the Freedoom IWADs pretty much simply requires the following: * 'Python': Freedoom uses several Python programs in its tree to assist with building the IWADs. Both Python 2.7 and 3.x are fully supported. - * 'DeuTex' 4.4.902: Freedoom depends on some features not present in - the last official release, 4.4.0. Development of DeuTex, - unfortunately, appears to have ceased and is presently abandoned. - Debian includes 4.4.902 in its software repository, while Fedora - has only 4.4.0. If your distribution does not provide 4.4.902, it - is recommended to use Mike Swanson's unofficial + * 'DeuTex' 5.0.0-beta.1: freedoom now requires Deutex 5.0.0-beta.1. + Unfortunately, not all distributions have updated their packages. + If your distribution does not provide 5.0.0-beta.1, it + is recommended to use Mike Swanson's https://github.com/Doom-Utils/deutex[repository], the master branch of - which includes 4.4.902 and some additional patches. + which includes 5.0. You may also make use of the Windows binaries provided + on the official release page + https://github.com/Doom-Utils/deutex/releases[here], + or the Ubuntu PPA + https://launchpad.net/~nzatkovich/+archive/ubuntu/deutex[here]. All or most of this software should already be available in your operating system's software repository, with the likely exception of From 6770d422074157ee0b1eaa9890329959eac59ca7 Mon Sep 17 00:00:00 2001 From: NickZ Date: Mon, 17 Jul 2017 05:52:04 -0700 Subject: [PATCH 5/5] Update language in Compiling.adoc --- COMPILING.adoc | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/COMPILING.adoc b/COMPILING.adoc index d67a9378..09295f5d 100644 --- a/COMPILING.adoc +++ b/COMPILING.adoc @@ -26,12 +26,13 @@ Building the Freedoom IWADs pretty much simply requires the following: * 'Python': Freedoom uses several Python programs in its tree to assist with building the IWADs. Both Python 2.7 and 3.x are fully supported. - * 'DeuTex' 5.0.0-beta.1: freedoom now requires Deutex 5.0.0-beta.1. - Unfortunately, not all distributions have updated their packages. - If your distribution does not provide 5.0.0-beta.1, it + * 'DeuTex' 5.0.0: freedoom now requires Deutex 5.0.0. + This version is fairly new, and distributions have not yet had the + chance to update their packages. + If your distribution does not provide 5.0.0, it is recommended to use Mike Swanson's https://github.com/Doom-Utils/deutex[repository], the master branch of - which includes 5.0. You may also make use of the Windows binaries provided + which includes 5.0.0. You may also make use of the Windows binaries provided on the official release page https://github.com/Doom-Utils/deutex/releases[here], or the Ubuntu PPA