This is an automated email from the git hooks/post-receive script. smcv pushed a commit to annotated tag 1.42d in repository iortcw.
commit 79967c15163181c2fb0f0eeacf789452fb58b5a5 Author: [email protected] <[email protected]@e65d2741-a53d-b2dc-ae96-bb75fa5e4c4a> Date: Tue Jan 28 01:18:21 2014 +0000 All: Fix check for jpeg_mem_ to work with libjpeg-turbo --- MP/code/rend2/tr_image_jpg.c | 4 ++-- MP/code/renderer/tr_image_jpg.c | 4 ++-- SP/code/rend2/tr_image_jpg.c | 4 ++-- SP/code/renderer/tr_image_jpg.c | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/MP/code/rend2/tr_image_jpg.c b/MP/code/rend2/tr_image_jpg.c index f0ffb71..abe5e65 100644 --- a/MP/code/rend2/tr_image_jpg.c +++ b/MP/code/rend2/tr_image_jpg.c @@ -41,8 +41,8 @@ extern refimport_t ri; #include <jpeglib.h> #ifndef USE_INTERNAL_JPEG -# if JPEG_LIB_VERSION < 80 -# error Need system libjpeg >= 80 +# if JPEG_LIB_VERSION < 80 && !defined(MEM_SRCDST_SUPPORTED) +# error Need system libjpeg >= 80 or jpeg_mem_ support # endif #endif diff --git a/MP/code/renderer/tr_image_jpg.c b/MP/code/renderer/tr_image_jpg.c index 817588b..b16b3df 100644 --- a/MP/code/renderer/tr_image_jpg.c +++ b/MP/code/renderer/tr_image_jpg.c @@ -37,8 +37,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include <jpeglib.h> #ifndef USE_INTERNAL_JPEG -# if JPEG_LIB_VERSION < 80 -# error Need system libjpeg >= 80 +# if JPEG_LIB_VERSION < 80 && !defined(MEM_SRCDST_SUPPORTED) +# error Need system libjpeg >= 80 or jpeg_mem_ support # endif #endif diff --git a/SP/code/rend2/tr_image_jpg.c b/SP/code/rend2/tr_image_jpg.c index f0ffb71..abe5e65 100644 --- a/SP/code/rend2/tr_image_jpg.c +++ b/SP/code/rend2/tr_image_jpg.c @@ -41,8 +41,8 @@ extern refimport_t ri; #include <jpeglib.h> #ifndef USE_INTERNAL_JPEG -# if JPEG_LIB_VERSION < 80 -# error Need system libjpeg >= 80 +# if JPEG_LIB_VERSION < 80 && !defined(MEM_SRCDST_SUPPORTED) +# error Need system libjpeg >= 80 or jpeg_mem_ support # endif #endif diff --git a/SP/code/renderer/tr_image_jpg.c b/SP/code/renderer/tr_image_jpg.c index 817588b..b16b3df 100644 --- a/SP/code/renderer/tr_image_jpg.c +++ b/SP/code/renderer/tr_image_jpg.c @@ -37,8 +37,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include <jpeglib.h> #ifndef USE_INTERNAL_JPEG -# if JPEG_LIB_VERSION < 80 -# error Need system libjpeg >= 80 +# if JPEG_LIB_VERSION < 80 && !defined(MEM_SRCDST_SUPPORTED) +# error Need system libjpeg >= 80 or jpeg_mem_ support # endif #endif -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/iortcw.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
