[corsix-th] 01/01: drop patches merged upstream

[Alexandre Detiste]

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

detiste-guest pushed a commit to branch master
in repository corsix-th.

commit d90e2052f478760ff13580c88501794b1c21827a
Author: Phil Morrell <debian at emorrp1.name>
Date:   Mon Apr 18 20:15:35 2016 +0100

    drop patches merged upstream
---
 debian/patches/lua.patch                           | 18 ------
 debian/patches/series                              |  2 -
 debian/patches/use-AVPixelFormat-and-related.patch | 65 ----------------------
 3 files changed, 85 deletions(-)

diff --git a/debian/patches/lua.patch b/debian/patches/lua.patch
deleted file mode 100644
index 4aa9ba0..0000000
--- a/debian/patches/lua.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Subject: find lua 5.2
-Author: Christoph Korn <christoph.korn at getdeb.net>
-Forwarded: not needed, see https://github.com/CorsixTH/CorsixTH/pull/899
-
-===================================================================
---- corsix-th-0.50.orig/CMake/FindLua.cmake	2015-08-30 22:29:45.000000000 +0200
-+++ corsix-th-0.50/CMake/FindLua.cmake	2015-09-17 21:02:42.749389729 +0200
-@@ -26,8 +26,8 @@
-     SET (LUA_INCLUDE_DIRS include/luajit-2.0 include)
- ELSE (WITH_LUAJIT)
-     SET (LUA_INTERPRETER_TYPE "Lua")
--    SET (LUA_LIBRARY_NAME lua53 lua52 lua5.1 lua51 lua lua-5.1 liblua)
--    SET (LUA_INCLUDE_DIRS include include/lua include/lua5.1 include/lua51 include/lua-5.1)
-+    SET (LUA_LIBRARY_NAME lua53 lua5.2 lua52 lua5.1 lua51 lua lua-5.1 liblua)
-+    SET (LUA_INCLUDE_DIRS include include/lua include/lua5.2 include/lua5.1 include/lua51 include/lua-5.1)
- ENDIF(WITH_LUAJIT)
- 
- FIND_PATH (LUA_INCLUDE_DIR lua.h
diff --git a/debian/patches/series b/debian/patches/series
index f52af59..e0a6f1e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
-lua.patch
 default_config.patch
-use-AVPixelFormat-and-related.patch
diff --git a/debian/patches/use-AVPixelFormat-and-related.patch b/debian/patches/use-AVPixelFormat-and-related.patch
deleted file mode 100644
index 4c91c0a..0000000
--- a/debian/patches/use-AVPixelFormat-and-related.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-Author: "Stephen E. Baker" <baker.stephen.e at gmail.com>
-Subject: Use AVPixelFormat and related
-Origin: backport, commit:9260930
-Bug: https://github.com/CorsixTH/CorsixTH/issues/1042
-Bug-Debian: https://bugs.debian.org/821415
-Reviewed-by: Phil Morrell <debian at emorrp1.name>
-Forwarded: not-needed
-Applied-Upstream: v0.60-beta1, commit:9260930
-Last-Update: 2016-04-18
-
-Non AV prefixed PixelFormat and PIX_FMT_* enums have been deprecated for years.
-They have been removed in git for both libav and ffmpeg. This patch uses the
-newer replacements while retaining compatibility for old ffmpeg and libav
-versions.
-
-backport: s/nullptr/NULL/g, quilt refresh, DEP3
----
- CorsixTH/Src/th_movie.cpp | 4 ++--
- CorsixTH/Src/th_movie.h   | 8 +++++++-
- 2 files changed, 9 insertions(+), 3 deletions(-)
-
---- a/CorsixTH/Src/th_movie.cpp
-+++ b/CorsixTH/Src/th_movie.cpp
-@@ -69,7 +69,7 @@
- 
- THMoviePicture::THMoviePicture():
-     m_pTexture(NULL),
--    m_pixelFormat(PIX_FMT_RGB24)
-+    m_pixelFormat(AV_PIX_FMT_RGB24)
- {
-     m_pMutex = SDL_CreateMutex();
-     m_pCond = SDL_CreateCond();
-@@ -270,7 +270,7 @@
- 
-     if(pMoviePicture->m_pTexture)
-     {
--        m_pSwsContext = sws_getCachedContext(m_pSwsContext, pFrame->width, pFrame->height, (PixelFormat)pFrame->format, pMoviePicture->m_iWidth, pMoviePicture->m_iHeight, pMoviePicture->m_pixelFormat, SWS_BICUBIC, NULL, NULL, NULL);
-+        m_pSwsContext = sws_getCachedContext(m_pSwsContext, pFrame->width, pFrame->height, (AVPixelFormat)pFrame->format, pMoviePicture->m_iWidth, pMoviePicture->m_iHeight, pMoviePicture->m_pixelFormat, SWS_BICUBIC, NULL, NULL, NULL);
-         if(m_pSwsContext == NULL)
-         {
-             SDL_UnlockMutex(m_aPictureQueue[m_iWriteIndex].m_pMutex);
---- a/CorsixTH/Src/th_movie.h
-+++ b/CorsixTH/Src/th_movie.h
-@@ -48,6 +48,12 @@
- #endif
- }
- 
-+#if (defined(CORSIX_TH_USE_FFMEPG) && LIBAVUTIL_VERSION_INT < AV_VERSION_INT(51, 74, 100)) || \
-+    (defined(CORSIX_TH_USE_LIBAV) && LIBAVUTIL_VERSION_INT < AV_VERSION_INT(51, 42, 0))
-+#define AVPixelFormat PixelFormat
-+#define AV_PIX_FMT_RBG24 PIX_FMT_RGB24
-+#endif
-+
- struct SDL_Renderer;
- struct SDL_Texture;
- struct SDL_Window;
-@@ -66,7 +72,7 @@
-     void draw(SDL_Renderer *pRenderer);
- 
-     SDL_Texture *m_pTexture;
--    PixelFormat m_pixelFormat;
-+    AVPixelFormat m_pixelFormat;
-     int m_iX, m_iY, m_iWidth, m_iHeight;
-     double m_dPts;
-     SDL_mutex *m_pMutex;

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