Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master games grimoire by Vlad Glagolev (bfbddb75bf647e7bcf03f37234493e1d63e290b8)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master games grimoire by Vlad Glagolev (bfbddb75bf647e7bcf03f37234493e1d63e290b8)
  • Date: Fri, 14 Aug 2009 16:34:01 -0500

GIT changes to master games grimoire by Vlad Glagolev
<stealth AT sourcemage.org>:

games-fps/nexuiz/BUILD | 3 --
games-fps/nexuiz/DETAILS | 1
games-fps/nexuiz/HISTORY | 5 +++
games-fps/nexuiz/PRE_BUILD | 7 ++++
games-fps/nexuiz/libjpeg.patch | 58
+++++++++++++++++++++++++++++++++++++++++
5 files changed, 71 insertions(+), 3 deletions(-)

New commits:
commit bfbddb75bf647e7bcf03f37234493e1d63e290b8
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

nexuiz: fixed work with jpeg v7

diff --git a/games-fps/nexuiz/BUILD b/games-fps/nexuiz/BUILD
index c72e7bc..92510e4 100755
--- a/games-fps/nexuiz/BUILD
+++ b/games-fps/nexuiz/BUILD
@@ -1,6 +1,5 @@
-unzip sources/engine*source* &&
-unzip sources/game*source* &&
cd darkplaces &&
+
make_single &&
make release &&
make_normal
diff --git a/games-fps/nexuiz/DETAILS b/games-fps/nexuiz/DETAILS
index 8fa95b9..2126a9c 100755
--- a/games-fps/nexuiz/DETAILS
+++ b/games-fps/nexuiz/DETAILS
@@ -1,5 +1,6 @@
SPELL=nexuiz
VERSION=251
+ PATCHLEVEL=1
SOURCE=$SPELL-$VERSION.zip
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE

SOURCE_HASH=sha512:ac4567259b227495be0dba20548f6836e14f7cb0b0f9028287cbd276660b2854cdb5663cd75eaf76ca6f0e06b74956e4045305215d646e4e3c5dd473eddc1db1
diff --git a/games-fps/nexuiz/HISTORY b/games-fps/nexuiz/HISTORY
index 44958ae..fe091e1 100644
--- a/games-fps/nexuiz/HISTORY
+++ b/games-fps/nexuiz/HISTORY
@@ -1,3 +1,8 @@
+2009-08-15 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: PATCHLEVEL++
+ * BUILD: moved sources-unpacking to PRE_BUILD
+ * libjpeg.patch: added
+
2009-05-02 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 251

diff --git a/games-fps/nexuiz/PRE_BUILD b/games-fps/nexuiz/PRE_BUILD
index ac96e38..b663470 100755
--- a/games-fps/nexuiz/PRE_BUILD
+++ b/games-fps/nexuiz/PRE_BUILD
@@ -3,4 +3,9 @@ cd "$SOURCE_DIRECTORY" &&

if [[ $NEXUIZ_MAPPACK == y ]]; then
unpack_file 2
-fi
+fi &&
+
+unzip sources/engine*source* &&
+unzip sources/game*source* &&
+
+patch -p0 < "$SPELL_DIRECTORY/libjpeg.patch"
diff --git a/games-fps/nexuiz/libjpeg.patch b/games-fps/nexuiz/libjpeg.patch
new file mode 100644
index 0000000..8e4c882
--- /dev/null
+++ b/games-fps/nexuiz/libjpeg.patch
@@ -0,0 +1,58 @@
+--- darkplaces/jpeg.c.orig
++++ darkplaces/jpeg.c
+@@ -46,7 +46,7 @@ typedef unsigned char jboolean;
+ typedef int jboolean;
+ #endif
+
+-#define JPEG_LIB_VERSION 62 // Version 6b
++#define JPEG_LIB_VERSION 70 // Version 7
+
+ typedef void *j_common_ptr;
+ typedef struct jpeg_compress_struct *j_compress_ptr;
+@@ -161,12 +161,13 @@ typedef struct {
+ * Values of 1,2,4,8 are likely to be supported. Note that different
+ * components may receive different IDCT scalings.
+ */
+- int DCT_scaled_size;
++ int DCT_h_scaled_size;
++ int DCT_v_scaled_size;
+ /* The downsampled dimensions are the component's actual, unpadded number
+- * of samples at the main buffer (preprocessing/compression interface),
thus
+- * downsampled_width = ceil(image_width * Hi/Hmax)
+- * and similarly for height. For decompression, IDCT scaling is
included, so
+- * downsampled_width = ceil(image_width * Hi/Hmax *
DCT_scaled_size/DCTSIZE)
++ * of samples at the main buffer (preprocessing/compression interface);
++ * DCT scaling is included, so
++ * downsampled_width = ceil(image_width * Hi/Hmax *
DCT_h_scaled_size/DCTSIZE)
++ * and similarly for height.
+ */
+ JDIMENSION downsampled_width; /* actual width in samples */
+ JDIMENSION downsampled_height; /* actual height in samples */
+@@ -268,7 +269,8 @@ struct jpeg_decompress_struct
+ void *marker_list;
+ int max_h_samp_factor;
+ int max_v_samp_factor;
+- int min_DCT_scaled_size;
++ int min_DCT_h_scaled_size; /* smallest DCT_h_scaled_size of any
component */
++ int min_DCT_v_scaled_size; /* smallest DCT_v_scaled_size of any
component */
+ JDIMENSION total_iMCU_rows;
+ void *sample_range_limit;
+ int comps_in_scan;
+@@ -344,6 +346,8 @@ struct jpeg_compress_struct
+ jboolean progressive_mode;
+ int max_h_samp_factor;
+ int max_v_samp_factor;
++ int min_DCT_h_scaled_size; /* smallest DCT_h_scaled_size of any
component */
++ int min_DCT_v_scaled_size; /* smallest DCT_v_scaled_size of any
component */
+ JDIMENSION total_iMCU_rows;
+ int comps_in_scan;
+ jpeg_component_info *cur_comp_info[MAX_COMPS_IN_SCAN];
+@@ -473,7 +477,7 @@ qboolean JPEG_OpenLibrary (void)
+ #elif defined(MACOSX)
+ "libjpeg.62.dylib",
+ #else
+- "libjpeg.so.62",
++ "libjpeg.so.7",
+ "libjpeg.so",
+ #endif
+ NULL



  • [SM-Commit] GIT changes to master games grimoire by Vlad Glagolev (bfbddb75bf647e7bcf03f37234493e1d63e290b8), Vlad Glagolev, 08/14/2009

Archive powered by MHonArc 2.6.24.

Top of Page