[dhewm3] 05/05: Remove patch 02-remove-jpeg_memory_src.patch -- applied upstream

[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 e6bb54c4d9ae1db4073ca8704dd1f1290db684a8
Author: Tobias Frost <tobi at coldtobi.de>
Date:   Sun Sep 13 21:25:15 2015 +0200

    Remove patch 02-remove-jpeg_memory_src.patch -- applied upstream
---
 debian/changelog                               |  5 +-
 debian/patches/01-changedatadir.patch          |  2 +-
 debian/patches/02-remove-jpeg_memory_src.patch | 75 --------------------------
 debian/patches/series                          |  1 -
 4 files changed, 4 insertions(+), 79 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c9c2b08..73751c6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,13 @@
-dhewm3 (0+git20150724+dfsg-1) UNRELEASED; urgency=medium
+dhewm3 (0+git20150724+dfsg-1) unstable; urgency=medium
 
   * New upstream git snapshot
+  * Remove patch 02-remove-jpeg_memory_src.patch -- applied upstream
   * Fix recommends to point to dhewm3-d3xp instead of non-existing package
     dhewm3-dx3p (Closes: #795979)
   * Fix description of d/control: It's README.Debian.
   * Fix typo in d/copyright
 
- -- Tobias Frost <tobi at debian.org>  Sun, 13 Sep 2015 18:27:21 +0200
+ -- Tobias Frost <tobi at debian.org>  Sun, 13 Sep 2015 21:25:15 +0200
 
 dhewm3 (0+git20150226+dfsg-1) unstable; urgency=medium
 
diff --git a/debian/patches/01-changedatadir.patch b/debian/patches/01-changedatadir.patch
index 593e930..c9935da 100644
--- a/debian/patches/01-changedatadir.patch
+++ b/debian/patches/01-changedatadir.patch
@@ -5,7 +5,7 @@ Last-Update: 2015-02-14
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/neo/CMakeLists.txt
 +++ b/neo/CMakeLists.txt
-@@ -262,7 +262,7 @@
+@@ -261,7 +261,7 @@
  
  set(bindir		"${CMAKE_INSTALL_FULL_BINDIR}")
  set(libdir		"${CMAKE_INSTALL_FULL_LIBDIR}/dhewm3")
diff --git a/debian/patches/02-remove-jpeg_memory_src.patch b/debian/patches/02-remove-jpeg_memory_src.patch
deleted file mode 100644
index d8c908a..0000000
--- a/debian/patches/02-remove-jpeg_memory_src.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-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 8b91764..e537492 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 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