[ioquake3] 29/33: Fix shader corruption on OpenBSD

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch debian/master
in repository ioquake3.

commit 6ecfa4f26387f46d2dea62cd632152559a8b7b2e
Author: Mickaël Thomas <mickael9 at gmail.com>
Date:   Mon Oct 16 17:12:43 2017 +0200

    Fix shader corruption on OpenBSD
    
    OpenBSD's sed (and possibly other platforms') interprets `\r` as a
    literal `r` rather than a carriage return, which leads to all `r`
    letters being stripped from the shaders' source.
    
    This fixes the issue by using the POSIX-compliant `tr -d '\r'` to remove
    carriage returns.
    
    Thanks to @ryan-sg for reporting the issue
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 08f7623..2ed9af8 100644
--- a/Makefile
+++ b/Makefile
@@ -1182,7 +1182,7 @@ define DO_REF_STR
 $(echo_cmd) "REF_STR $<"
 $(Q)rm -f $@
 $(Q)echo "const char *fallbackShader_$(notdir $(basename $<)) =" >> $@
-$(Q)cat $< | sed -e 's/^/\"/;s/$$/\\n\"/' -e 's/\r//g' >> $@
+$(Q)cat $< | sed -e 's/^/\"/;s/$$/\\n\"/' | tr -d '\r' >> $@
 $(Q)echo ";" >> $@
 endef
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/ioquake3.git