[dhewm3] 10/13: Add patch to support removal of the two jpeg-files

[Tobias Frost]

This is an automated email from the git hooks/post-receive script.

tobi pushed a commit to branch master
in repository dhewm3.

commit 9de978bc5fe56fa4a342495e258e8ba7964120a1
Author: Tobias Frost <tobi at coldtobi.de>
Date:   Thu Mar 12 10:18:18 2015 +0100

    Add patch to support removal of the two jpeg-files
---
 debian/patches/02-remove-jpeg_memory_src.patch | 75 ++++++++++++++++++++++++++
 debian/patches/series                          |  1 +
 2 files changed, 76 insertions(+)

diff --git a/debian/patches/02-remove-jpeg_memory_src.patch b/debian/patches/02-remove-jpeg_memory_src.patch
new file mode 100644
index 0000000..d8c908a
--- /dev/null
+++ b/debian/patches/02-remove-jpeg_memory_src.patch
@@ -0,0 +1,75 @@
+Description: Patch to support removal of jpeg_memory_src.(ch)
+ As the above two files state in their license grant that a README is required for
+ the license terms, but there is only a README.md.
+ This patch replaces the calls provided
+ by this source by direct calls to the jpeg libarry. This requires that the library has
+ the jpeg_mem_src functions, so this is checked during the build process.
+Author: Tobias Frost <tobi at debian.org
+Bug: https://github.com/dhewm/dhewm3/issues/110
+Forwarded: yes
+Last-Update: 2015-03-12
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/neo/CMakeLists.txt
++++ b/neo/CMakeLists.txt
+@@ -88,6 +88,10 @@
+ set(CMAKE_REQUIRED_LIBRARIES ${JPEG_LIBRARY})
+ CHECK_FUNCTION_EXISTS("jpeg_mem_src" HAVE_JPEG_MEM_SRC)
+ 
++if(NOT HAVE_JPEG_MEM_SRC)
++    message(FATAL_ERROR "jpeg_mem_src is not available")
++endif()
++
+ find_package(OGG REQUIRED)
+ include_directories(${OGG_INCLUDE_DIR})
+ 
+@@ -279,7 +283,6 @@
+ endif()
+ 
+ set(src_renderer
+-	renderer/jpeg_memory_src.cpp
+ 	renderer/Cinematic.cpp
+ 	renderer/GuiModel.cpp
+ 	renderer/Image_files.cpp
+--- a/neo/renderer/Cinematic.cpp
++++ b/neo/renderer/Cinematic.cpp
+@@ -29,7 +29,8 @@
+ #include "sys/platform.h"
+ 
+ #include "framework/FileSystem.h"
+-#include "renderer/jpeg_memory_src.h"
++#include <jpeglib.h>
++#include <jerror.h>
+ #include "renderer/tr_local.h"
+ #include "sound/sound.h"
+ 
+@@ -1309,7 +1310,7 @@
+ 
+   /* Step 2: specify data source (eg, a file) */
+ 
+-  jpeg_memory_src(&cinfo, data, datasize);
++  jpeg_mem_src(&cinfo, data, datasize);
+ 
+   /* Step 3: read file parameters with jpeg_read_header() */
+ 
+--- a/neo/renderer/Image_files.cpp
++++ b/neo/renderer/Image_files.cpp
+@@ -28,7 +28,8 @@
+ 
+ #include "sys/platform.h"
+ 
+-#include "renderer/jpeg_memory_src.h"
++#include <jpeglib.h>
++#include <jerror.h>
+ #include "renderer/tr_local.h"
+ 
+ #include "renderer/Image.h"
+@@ -824,7 +825,7 @@
+ 
+   /* Step 2: specify data source (eg, a file) */
+ 
+-  jpeg_memory_src(&cinfo, fbuffer, len);
++  jpeg_mem_src(&cinfo, fbuffer, len);
+ 
+   /* Step 3: read file parameters with jpeg_read_header() */
+ 
diff --git a/debian/patches/series b/debian/patches/series
index e537492..8b91764 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 01-changedatadir.patch
+02-remove-jpeg_memory_src.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/dhewm3.git