[Lunar-commits] <moonbase> Nexuiz: fix for jpeg 7

[Paul Bredbury]

commit 70657626d2372aa9ea82896bd23ef19b4369d59d
Author: Paul Bredbury <brebs at lunar-linux.org>
Date:   Fri Aug 28 13:07:32 2009 +0700

    Nexuiz: fix for jpeg 7
    
    Use system jpeg library, to work with jpeg 7.
    
    No need for wrapper scripts.
---
 games/Nexuiz/BUILD      |   18 +++++++++++++-----
 games/Nexuiz/DETAILS    |    6 +++++-
 games/Nexuiz/nexuiz     |    4 ----
 games/Nexuiz/nexuiz-ded |    4 ----
 4 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/games/Nexuiz/BUILD b/games/Nexuiz/BUILD
index 3c605c3..2732013 100644
--- a/games/Nexuiz/BUILD
+++ b/games/Nexuiz/BUILD
@@ -4,13 +4,21 @@
   unzip enginesource????????.zip  &&
   cd darkplaces  &&
   sedit "s:^OPTIM_RELEASE=.*$:OPTIM_RELEASE=$CFLAGS:" makefile.inc  &&
+
+  # Use system jpeg, to work with jpeg 7 as well as jpeg 6b
+  patch_it $SOURCE2 1  &&
+  sedit "1i DP_LINK_TO_LIBJPEG=1" makefile  &&
+  sedit "1i DP_PRELOAD_DEPENDENCIES=1" makefile  &&
+
+  # Look in shared directory automatically
+  # From http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-fps/nexuiz/
+  sedit "s:ifdef DP_.*:DP_FS_BASEDIR=/usr/share/games/$MODULE\n&:" makefile  &&
+
   make -f makefile cl-release sv-release  &&
   prepare_install  &&
   mkdir -p /usr/games /usr/share/games/$MODULE  &&
-  install -m755 darkplaces-glx /usr/share/games/$MODULE/nexuiz-glx  &&
-  install -m755 darkplaces-dedicated /usr/share/games/$MODULE/nexuiz-dedicated  &&
-  cp -a $SOURCE_DIRECTORY/data /usr/share/games/$MODULE/  &&
-  install -m755 $SCRIPT_DIRECTORY/nexuiz /usr/games/  &&
-  install -m755 $SCRIPT_DIRECTORY/nexuiz-ded /usr/games/
+  install -m755 darkplaces-glx /usr/games/nexuiz-glx  &&
+  install -m755 darkplaces-dedicated /usr/games/nexuiz-dedicated  &&
+  cp -a $SOURCE_DIRECTORY/{data,havoc} /usr/share/games/$MODULE/
 
 ) > $C_FIFO 2>&1
diff --git a/games/Nexuiz/DETAILS b/games/Nexuiz/DETAILS
index 77df361..e7d5f36 100644
--- a/games/Nexuiz/DETAILS
+++ b/games/Nexuiz/DETAILS
@@ -1,13 +1,17 @@
           MODULE=Nexuiz
          VERSION=2.5.1
           SOURCE=nexuiz-251.zip
+         SOURCE2=nexuiz-2.5.1-jpeg.patch.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE
       SOURCE_URL=$SFORGE_URL/nexuiz
+     SOURCE2_URL=$PATCH_URL
       SOURCE_VFY=sha1:19b098adea29ea3b66a1082a453e403480faa97d
+     SOURCE2_VFY=sha1:967f84635e079c7e27665ddca7eca050b6b79d77
         WEB_SITE=http://nexuiz.com
          ENTERED=20050603
-         UPDATED=20090618
+         UPDATED=20090828
            SHORT="Multiplayer Deathmatch"
+           PSAFE=no
 
 cat << EOF
 Nexuiz has been in development for 3.5 years by a team of amateur
diff --git a/games/Nexuiz/nexuiz b/games/Nexuiz/nexuiz
deleted file mode 100644
index 474983f..0000000
--- a/games/Nexuiz/nexuiz
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-
-cd /usr/share/games/Nexuiz
-exec ./nexuiz-glx $@
diff --git a/games/Nexuiz/nexuiz-ded b/games/Nexuiz/nexuiz-ded
deleted file mode 100644
index b0b916e..0000000
--- a/games/Nexuiz/nexuiz-ded
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-
-cd /usr/share/games/Nexuiz
-exec ./nexuiz-dedicated $@