Skip to Content.
Sympa Menu

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

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 (eed0d7630c56ccc1e2b35f78195daf34f3c3d991)
  • Date: Sun, 18 Oct 2009 16:53:09 -0500

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

dev/null |binary
games-fps/nexuiz/DETAILS | 5
games-fps/nexuiz/HISTORY | 6 +
games-fps/nexuiz/PRE_BUILD | 2
games-fps/nexuiz/libjpeg.patch | 196
+++++++++++++++++++++++++++++++++++++
games-fps/nexuiz/libjpeg.patch.bz2 | 0
6 files changed, 205 insertions(+), 4 deletions(-)

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

nexuiz: => 2.5.2

diff --git a/games-fps/nexuiz/DETAILS b/games-fps/nexuiz/DETAILS
index 2126a9c..5c04957 100755
--- a/games-fps/nexuiz/DETAILS
+++ b/games-fps/nexuiz/DETAILS
@@ -1,9 +1,8 @@
SPELL=nexuiz
- VERSION=251
- PATCHLEVEL=1
+ VERSION=252
SOURCE=$SPELL-$VERSION.zip
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:ac4567259b227495be0dba20548f6836e14f7cb0b0f9028287cbd276660b2854cdb5663cd75eaf76ca6f0e06b74956e4045305215d646e4e3c5dd473eddc1db1
+
SOURCE_HASH=sha512:da661eb2ff1764fed1d5f5547b89e4f9aa47613d41a3999c0202d8858ec2b882e4ef0ec182a81d1bdb25dff2ef65aad6af132009884e3557206941a736c2a68c

if [[ $NEXUIZ_MAPPACK == y ]]; then
SOURCE2=nexmappack_r2.zip
diff --git a/games-fps/nexuiz/HISTORY b/games-fps/nexuiz/HISTORY
index 4286095..eaf7577 100644
--- a/games-fps/nexuiz/HISTORY
+++ b/games-fps/nexuiz/HISTORY
@@ -1,3 +1,9 @@
+2009-10-17 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 252
+ * PRE_BUILD: use new patch
+ * libjpeg.patch: added, to fix jpeg 7 issue
+ * libjpeg.patch.bz2: removed
+
2009-08-15 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: PATCHLEVEL++
* BUILD: moved sources-unpacking to PRE_BUILD
diff --git a/games-fps/nexuiz/PRE_BUILD b/games-fps/nexuiz/PRE_BUILD
index a65bbbd..b663470 100755
--- a/games-fps/nexuiz/PRE_BUILD
+++ b/games-fps/nexuiz/PRE_BUILD
@@ -8,4 +8,4 @@ fi &&
unzip sources/engine*source* &&
unzip sources/game*source* &&

-bzcat "$SPELL_DIRECTORY/libjpeg.patch.bz2" | patch -p0
+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..0e333af
--- /dev/null
+++ b/games-fps/nexuiz/libjpeg.patch
@@ -0,0 +1,196 @@
+--- 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;
+@@ -130,6 +130,41 @@ struct jpeg_source_mgr
+ void (*term_source) (j_decompress_ptr cinfo);
+ };
+
++/* Types for JPEG compression parameters and working tables. */
++
++
++/* DCT coefficient quantization tables. */
++
++typedef struct {
++ /* This array gives the coefficient quantizers in natural array order
++ * (not the zigzag order in which they are stored in a JPEG DQT marker).
++ * CAUTION: IJG versions prior to v6a kept this array in zigzag order.
++ */
++ unsigned short quantval[DCTSIZE2]; /* quantization step for each
coefficient */
++ /* This field is used only during compression. It's initialized FALSE
when
++ * the table is created, and set TRUE when it's been output to the file.
++ * You could suppress output of a table by setting this to TRUE.
++ * (See jpeg_suppress_tables for an example.)
++ */
++ jboolean sent_table; /* TRUE when table has been
output */
++} JQUANT_TBL;
++
++
++/* Huffman coding tables. */
++
++typedef struct {
++ /* These two fields directly represent the contents of a JPEG DHT marker
*/
++ unsigned char bits[17]; /* bits[k] = # of symbols with codes of */
++ /* length k bits; bits[0] is unused */
++ unsigned char huffval[256]; /* The symbols, in order of incr code length
*/
++ /* This field is used only during compression. It's initialized FALSE
when
++ * the table is created, and set TRUE when it's been output to the file.
++ * You could suppress output of a table by setting this to TRUE.
++ * (See jpeg_suppress_tables for an example.)
++ */
++ jboolean sent_table; /* TRUE when table has been output */
++} JHUFF_TBL;
++
+ typedef struct {
+ /* These values are fixed over the whole image. */
+ /* For compression, they must be supplied by parameter setup; */
+@@ -161,12 +196,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 */
+@@ -195,6 +231,15 @@ typedef struct {
+ void * dct_table;
+ } jpeg_component_info;
+
++/* The script for encoding a multiple-scan file is an array of these: */
++
++typedef struct {
++ int comps_in_scan; /* number of components encoded in this scan
*/
++ int component_index[MAX_COMPS_IN_SCAN]; /* their SOF/comp_info[] indexes
*/
++ int Ss, Se; /* progressive JPEG spectral selection parms
*/
++ int Ah, Al; /* progressive JPEG successive approx. parms
*/
++} jpeg_scan_info;
++
+ struct jpeg_decompress_struct
+ {
+ struct jpeg_error_mgr *err; // USED
+@@ -268,7 +313,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;
+@@ -297,35 +343,45 @@ struct jpeg_compress_struct
+ {
+ struct jpeg_error_mgr *err;
+ struct jpeg_memory_mgr *mem;
+- void *progress;
++ struct jpeg_profress_mgr *progress;
+ void *client_data;
+ jboolean is_decompressor;
+ int global_state;
+
+- void *dest;
++ struct jpeg_destination_mgr *dest;
+ JDIMENSION image_width;
+ JDIMENSION image_height;
+ int input_components;
+ J_COLOR_SPACE in_color_space;
+ double input_gamma;
+- int data_precision;
++ unsigned int scale_num, scale_denom;
++
++ JDIMENSION jpeg_width;
++ JDIMENSION jpeg_height;
+
++ int data_precision;
+ int num_components;
++
+ J_COLOR_SPACE jpeg_color_space;
+ jpeg_component_info *comp_info;
+- void *quant_tbl_ptrs[NUM_QUANT_TBLS];
+- void *dc_huff_tbl_ptrs[NUM_HUFF_TBLS];
+- void *ac_huff_tbl_ptrs[NUM_HUFF_TBLS];
++
++ JQUANT_TBL *quant_tbl_ptrs[NUM_QUANT_TBLS];
++ int q_scale_factor[NUM_QUANT_TBLS];
++
++ JHUFF_TBL *dc_huff_tbl_ptrs[NUM_HUFF_TBLS];
++ JHUFF_TBL *ac_huff_tbl_ptrs[NUM_HUFF_TBLS];
++
+ unsigned char arith_dc_L[NUM_ARITH_TBLS];
+ unsigned char arith_dc_U[NUM_ARITH_TBLS];
+ unsigned char arith_ac_K[NUM_ARITH_TBLS];
+
+ int num_scans;
+- const void *scan_info;
++ const jpeg_scan_info *scan_info;
+ jboolean raw_data_in;
+ jboolean arith_code;
+ jboolean optimize_coding;
+ jboolean CCIR601_sampling;
++ jboolean do_fancy_downsampling;
+ int smoothing_factor;
+ J_DCT_METHOD dct_method;
+
+@@ -344,6 +400,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];
+@@ -353,16 +411,16 @@ struct jpeg_compress_struct
+ int MCU_membership[C_MAX_BLOCKS_IN_MCU];
+ int Ss, Se, Ah, Al;
+
+- void *master;
+- void *main;
+- void *prep;
+- void *coef;
+- void *marker;
+- void *cconvert;
+- void *downsample;
+- void *fdct;
+- void *entropy;
+- void *script_space;
++ struct jpeg_comp_master * master;
++ struct jpeg_c_main_controller * main;
++ struct jpeg_c_prep_controller * prep;
++ struct jpeg_c_coef_controller * coef;
++ struct jpeg_marker_writer * marker;
++ struct jpeg_color_converter * cconvert;
++ struct jpeg_downsampler * downsample;
++ struct jpeg_forward_dct * fdct;
++ struct jpeg_entropy_encoder * entropy;
++ jpeg_scan_info * script_space; /* workspace for
jpeg_simple_progression */
+ int script_space_size;
+ };
+
+@@ -473,7 +531,7 @@ qboolean JPEG_OpenLibrary (void)
+ #elif defined(MACOSX)
+ "libjpeg.62.dylib",
+ #else
+- "libjpeg.so.62",
++ "libjpeg.so.7",
+ "libjpeg.so",
+ #endif
+ NULL
diff --git a/games-fps/nexuiz/libjpeg.patch.bz2
b/games-fps/nexuiz/libjpeg.patch.bz2
deleted file mode 100644
index 6a095df..0000000
Binary files a/games-fps/nexuiz/libjpeg.patch.bz2 and /dev/null differ



  • [SM-Commit] GIT changes to master games grimoire by Vlad Glagolev (eed0d7630c56ccc1e2b35f78195daf34f3c3d991), Vlad Glagolev, 10/18/2009

Archive powered by MHonArc 2.6.24.

Top of Page