[performous] 05/09: Drop all patches. Applied upstream.

Markus Koschany apo-guest at moszumanska.debian.org
Wed Jan 27 19:53:48 UTC 2016


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

apo-guest pushed a commit to branch master
in repository performous.

commit c3b76c5eb6e67ba1bd2135c09a970a2743d04152
Author: Markus Koschany <apo at debian.org>
Date:   Wed Jan 27 20:20:30 2016 +0100

    Drop all patches. Applied upstream.
---
 debian/patches/ffmpeg_2.9.patch         | 21 ---------------------
 debian/patches/reproducible-build.patch | 20 --------------------
 debian/patches/series                   |  2 --
 3 files changed, 43 deletions(-)

diff --git a/debian/patches/ffmpeg_2.9.patch b/debian/patches/ffmpeg_2.9.patch
deleted file mode 100644
index 16fd618..0000000
--- a/debian/patches/ffmpeg_2.9.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Andreas Cadhalpun <andreas.cadhalpun at googlemail.com>
-Date: Sun, 8 Nov 2015 21:13:34 +0100
-Subject: ffmpeg_2.9
-
----
- game/ffmpeg.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/game/ffmpeg.cc b/game/ffmpeg.cc
-index 45bb343..fc4ca44 100644
---- a/game/ffmpeg.cc
-+++ b/game/ffmpeg.cc
-@@ -116,7 +116,7 @@ void FFmpeg::open() {
- 		height = cc->height;
- 		m_swsContext = sws_getContext(
- 		  cc->width, cc->height, cc->pix_fmt,
--		  width, height, PIX_FMT_RGB24,
-+		  width, height, AV_PIX_FMT_RGB24,
- 		  SWS_POINT, nullptr, nullptr, nullptr);
- 		break;
- 	default:  // Should never be reached but avoids compile warnings
diff --git a/debian/patches/reproducible-build.patch b/debian/patches/reproducible-build.patch
deleted file mode 100644
index b5608da..0000000
--- a/debian/patches/reproducible-build.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From: Markus Koschany <apo at debian.org>
-Date: Sun, 8 Nov 2015 21:14:31 +0100
-Subject: reproducible build
-
----
- game/main.cc | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/game/main.cc b/game/main.cc
-index 93c015d..deb051f 100644
---- a/game/main.cc
-+++ b/game/main.cc
-@@ -404,7 +404,6 @@ int main(int argc, char** argv) try {
- 
- void outputOptionalFeatureStatus() {
- 	std::clog << "core/notice: " PACKAGE " " VERSION " starting..."
--	  << "\n  Build date:           " __DATE__
- 	  << "\n  Internationalization: " << (Gettext::enabled() ? "Enabled" : "Disabled")
- 	  << "\n  MIDI Hardware I/O:    " << (input::Hardware::midiEnabled() ? "Enabled" : "Disabled")
- 	  << "\n  Webcam support:       " << (Webcam::enabled() ? "Enabled" : "Disabled")
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 951d8ce..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-ffmpeg_2.9.patch
-reproducible-build.patch

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



More information about the Pkg-games-commits mailing list