Skip to Content.
Sympa Menu

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

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 (9c54da5aa514f7f1a05e266932ac5ddb2fb9a663)
  • Date: Sat, 15 Aug 2009 03:21:24 -0500

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

games-fps/nexuiz/HISTORY | 2 -
games-fps/nexuiz/PRE_BUILD | 2 -
games-fps/nexuiz/libjpeg.patch | 58
-------------------------------------
games-fps/nexuiz/libjpeg.patch.bz2 |binary
4 files changed, 2 insertions(+), 60 deletions(-)

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

nexuiz: replaced proper patch

diff --git a/games-fps/nexuiz/HISTORY b/games-fps/nexuiz/HISTORY
index fe091e1..4286095 100644
--- a/games-fps/nexuiz/HISTORY
+++ b/games-fps/nexuiz/HISTORY
@@ -1,7 +1,7 @@
2009-08-15 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: PATCHLEVEL++
* BUILD: moved sources-unpacking to PRE_BUILD
- * libjpeg.patch: added
+ * libjpeg.patch.bz2: 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 b663470..a65bbbd 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* &&

-patch -p0 < "$SPELL_DIRECTORY/libjpeg.patch"
+bzcat "$SPELL_DIRECTORY/libjpeg.patch.bz2" | patch -p0
diff --git a/games-fps/nexuiz/libjpeg.patch b/games-fps/nexuiz/libjpeg.patch
deleted file mode 100644
index 8e4c882..0000000
--- a/games-fps/nexuiz/libjpeg.patch
+++ /dev/null
@@ -1,58 +0,0 @@
---- 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
diff --git a/games-fps/nexuiz/libjpeg.patch.bz2
b/games-fps/nexuiz/libjpeg.patch.bz2
new file mode 100644
index 0000000..6a095df
Binary files /dev/null and b/games-fps/nexuiz/libjpeg.patch.bz2 differ



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

Archive powered by MHonArc 2.6.24.

Top of Page