diff options
| author |   Sergei Trofimovich <slyfox@gentoo.org> | 2017-03-13 22:22:51 +0000 |
|---|---|---|
| committer | Sergei Trofimovich <slyfox@gentoo.org> | 2017-03-13 22:25:19 +0000 |
| commit | 44c409e4a5840d6242bc5e4c8b47fc44f3d774e6 (patch) | |
| tree | 35526df6cddd15f8d6d6e37a442f4b4fda1ae6ff | |
| parent | dev-python/pyro: Bump version to 4.47 (diff) | |
| download | gentoo-44c409e4a5840d6242bc5e4c8b47fc44f3d774e6.tar.gz gentoo-44c409e4a5840d6242bc5e4c8b47fc44f3d774e6.tar.bz2 gentoo-44c409e4a5840d6242bc5e4c8b47fc44f3d774e6.zip | |
games-fps/openarena: fix build failure against media-libs/libjpeg-turbo, bug #587728
Fix unbundles jdatasrc file. Both providers
media-libs/libjpeg-turbo
and
media-libs/jpeg
implement 'jpeg_mem_src' function. No need to keep the local copy.
Initial fix by Samuel BAUER.
Reported-by: Toralf Förster
Reported-by: watsoon
Bug: https://bugs.gentoo.org/587728
Package-Manager: Portage-2.3.4, Repoman-2.3.2
| -rw-r--r-- | games-fps/openarena/files/openarena-0.8.8-unbundling.patch | 72 |
1 files changed, 2 insertions, 70 deletions
diff --git a/games-fps/openarena/files/openarena-0.8.8-unbundling.patch b/games-fps/openarena/files/openarena-0.8.8-unbundling.patch index 2f108a6c8cb0..b2c872f34cbd 100644 --- a/games-fps/openarena/files/openarena-0.8.8-unbundling.patch +++ b/games-fps/openarena/files/openarena-0.8.8-unbundling.patch @@ -1,6 +1,6 @@ --- openarena-engine-source-0.8.8/Makefile +++ openarena-engine-source-0.8.8/Makefile -@@ -1406,41 +1406,7 @@ +@@ -1406,41 +1406,6 @@ $(B)/client/l_script.o \ $(B)/client/l_struct.o \ \ @@ -21,7 +21,7 @@ - $(B)/client/jcsample.o \ - $(B)/client/jdapimin.o \ - $(B)/client/jdapistd.o \ - $(B)/client/jdatasrc.o \ +- $(B)/client/jdatasrc.o \ - $(B)/client/jdcoefct.o \ - $(B)/client/jdcolor.o \ - $(B)/client/jddctmgr.o \ @@ -42,74 +42,6 @@ \ $(B)/client/tr_animation.o \ $(B)/client/tr_backend.o \ ---- openarena-engine-source-0.8.8/code/jpeg-6b/jdatasrc.c -+++ openarena-engine-source-0.8.8/code/jpeg-6b/jdatasrc.c -@@ -15,9 +15,15 @@ - */ - - /* this is not a core library module, so it doesn't define JPEG_INTERNALS */ --#include "jinclude.h" --#include "jpeglib.h" --#include "jerror.h" -+#include <stdio.h> -+#include <string.h> -+#include <jpeglib.h> -+#include <jerror.h> -+#undef METHODDEF -+#define METHODDEF static -+#undef GLOBAL -+#define GLOBAL -+#define SIZEOF(object) ((size_t) sizeof(object)) - - #ifndef MIN - #define MIN(a, b) ((a)<(b)?(a):(b)) -@@ -44,7 +50,7 @@ - * before any data is actually read. - */ - --METHODDEF(void) -+METHODDEF void - init_source (j_decompress_ptr cinfo) - { - my_src_ptr src = (my_src_ptr) cinfo->src; -@@ -90,7 +96,7 @@ - * the front of the buffer rather than discarding it. - */ - --METHODDEF(boolean) -+METHODDEF boolean - fill_input_buffer (j_decompress_ptr cinfo) - { - my_src_ptr src = (my_src_ptr) cinfo->src; -@@ -129,7 +135,7 @@ - * buffer is the application writer's problem. - */ - --METHODDEF(void) -+METHODDEF void - skip_input_data (j_decompress_ptr cinfo, long num_bytes) - { - my_src_ptr src = (my_src_ptr) cinfo->src; -@@ -170,7 +176,7 @@ - * for error exit. - */ - --METHODDEF(void) -+METHODDEF void - term_source (j_decompress_ptr cinfo) - { - /* no work necessary here */ -@@ -183,8 +189,8 @@ - * for closing it after finishing decompression. - */ - --GLOBAL(void) --jpeg_mem_src (j_decompress_ptr cinfo, unsigned char *inbuf, size_t size) -+GLOBAL void -+jpeg_mem_src (j_decompress_ptr cinfo, unsigned char *inbuf, unsigned long size) - { - my_src_ptr src; - --- openarena-engine-source-0.8.8/code/renderer/tr_image_jpg.c +++ openarena-engine-source-0.8.8/code/renderer/tr_image_jpg.c @@ -31,7 +31,7 @@ |