[performous] 02/10: Drop all patches. They were merged upstream.
Markus Koschany
apo-guest at moszumanska.debian.org
Sun Aug 9 12:31:53 UTC 2015
This is an automated email from the git hooks/post-receive script.
apo-guest pushed a commit to branch master
in repository performous.
commit 741a847b947883c414d8f1457429990e92ee9312
Author: Markus Koschany <apo at gambaru.de>
Date: Sun Aug 9 13:36:48 2015 +0200
Drop all patches. They were merged upstream.
Use ffmpeg instead of avconv again because the project transitions from libav
to ffmpeg.
---
debian/patches/fix-hyphen-used-as-minus-sign.patch | 22 ----
debian/patches/fix-imagemagick-detection.patch | 62 -----------
debian/patches/fix-spelling-errors.patch | 118 ---------------------
debian/patches/series | 4 -
debian/patches/use-avconv.patch | 25 -----
5 files changed, 231 deletions(-)
diff --git a/debian/patches/fix-hyphen-used-as-minus-sign.patch b/debian/patches/fix-hyphen-used-as-minus-sign.patch
deleted file mode 100644
index e4e3cef..0000000
--- a/debian/patches/fix-hyphen-used-as-minus-sign.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Markus Koschany <apo at gambaru.de>
-Date: Sat, 1 Nov 2014 18:12:08 +0100
-Subject: fix hyphen used as minus sign
-
-Forwarded: https://github.com/performous/performous/pull/111
----
- docs/man/performous.h2m | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/docs/man/performous.h2m b/docs/man/performous.h2m
-index cad1c42..ec1a850 100644
---- a/docs/man/performous.h2m
-+++ b/docs/man/performous.h2m
-@@ -84,7 +84,7 @@ Toggle pitch wave rendering (only when karaoke mode is disabled)
- Hot reload song from disk (useful for making or repairing songs)
-
- [audio device configuration]
--Performous normally autodetects microphones and playback devices correctly, but if this fails on your machine, you will need to configure them in the Audio Devices -screen. Advanced configuration is possible through the command line, just remember to enter the configuration menu and press \fBCtrl+S\fR to save them to your config file so that they don't need to be specified every time the program starts.
-+Performous normally autodetects microphones and playback devices correctly, but if this fails on your machine, you will need to configure them in the Audio Devices screen. Advanced configuration is possible through the command line, just remember to enter the configuration menu and press \fBCtrl+S\fR to save them to your config file so that they don't need to be specified every time the program starts.
-
- The list of available PortAudio devices is printed to the console, but it can also be seen from the GUI.
-
diff --git a/debian/patches/fix-imagemagick-detection.patch b/debian/patches/fix-imagemagick-detection.patch
deleted file mode 100644
index 4757cff..0000000
--- a/debian/patches/fix-imagemagick-detection.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From: Markus Koschany <apo at gambaru.de>
-Date: Sat, 1 Nov 2014 23:22:10 +0100
-Subject: fix imagemagick detection
-
-Forwarded:
-https://github.com/performous/performous/commit/7d304bdfebb5eb988180f3b51798639d945a0441
----
- tools/CMakeLists.txt | 37 +++++++++++++++++++++----------------
- 1 file changed, 21 insertions(+), 16 deletions(-)
-
-diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
-index 50bdd6f..4948f5e 100644
---- a/tools/CMakeLists.txt
-+++ b/tools/CMakeLists.txt
-@@ -8,26 +8,31 @@ include_directories(${Boost_INCLUDE_DIRS})
- # Find all the libs that don't require extra parameters
-
- if (APPLE)
-- foreach(lib LibXML++ Z Jpeg Tiff Png Freetype Z)
-+ foreach(lib LibXML++ Z Jpeg Tiff Png Freetype Z)
- find_package(${lib})
-- if (${lib}_FOUND)
-- include_directories(${${lib}_INCLUDE_DIRS})
-- add_definitions(${${lib}_DEFINITIONS})
-- endif (${lib}_FOUND)
-- endforeach(lib)
-+ if (${lib}_FOUND)
-+ include_directories(${${lib}_INCLUDE_DIRS})
-+ add_definitions(${${lib}_DEFINITIONS})
-+ endif (${lib}_FOUND)
-+ endforeach(lib)
-
-- # CMake cannot properly detect Magick++ on Mac the other way.
-+# CMake cannot properly detect Magick++ on Mac the other way.
-
-- find_package(ImageMagick COMPONENTS Magick++)
-- include_directories(${ImageMagick_INCLUDE_DIRS})
-+ find_package(ImageMagick COMPONENTS Magick++)
-+ include_directories(${ImageMagick_INCLUDE_DIRS})
- else (APPLE)
-- foreach(lib LibXML++ Z Magick++ Jpeg Tiff Png Freetype Z)
-- find_package(${lib})
-- if (${lib}_FOUND)
-- include_directories(${${lib}_INCLUDE_DIRS})
-- add_definitions(${${lib}_DEFINITIONS})
-- endif (${lib}_FOUND)
-- endforeach(lib)
-+ foreach(lib LibXML++ Z Jpeg Tiff Png Freetype Z)
-+ find_package(${lib})
-+ if (${lib}_FOUND)
-+ include_directories(${${lib}_INCLUDE_DIRS})
-+ add_definitions(${${lib}_DEFINITIONS})
-+ endif (${lib}_FOUND)
-+ endforeach(lib)
-+
-+ find_package(ImageMagick COMPONENTS Magick++)
-+ find_package(PkgConfig)
-+ PKG_CHECK_MODULES(IMAGEMAGICK Magick++ MagickWand MagickCore)
-+ include_directories(${ImageMagick_INCLUDE_DIRS})
- endif (APPLE)
-
- # Set default compile flags for GCC
diff --git a/debian/patches/fix-spelling-errors.patch b/debian/patches/fix-spelling-errors.patch
deleted file mode 100644
index 3611698..0000000
--- a/debian/patches/fix-spelling-errors.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-From: Markus Koschany <apo at gambaru.de>
-Date: Wed, 5 Nov 2014 12:20:59 +0100
-Subject: fix spelling errors
-
-Forwarded: https://github.com/performous/performous
----
- game/players.cc | 2 +-
- game/players.hh | 2 +-
- game/songitems.cc | 2 +-
- tools/gh_fsb/fsbext.c | 6 +++---
- tools/scripts/translation_wiki_helper.sh | 2 +-
- tools/ss_cover.cc | 4 ++--
- 6 files changed, 9 insertions(+), 9 deletions(-)
-
-diff --git a/game/players.cc b/game/players.cc
-index c419b1c..99cf19e 100644
---- a/game/players.cc
-+++ b/game/players.cc
-@@ -67,7 +67,7 @@ std::string Players::lookup(int id) const {
- PlayerItem pi;
- pi.id = id;
- auto it = m_players.find(pi);
-- if (it == m_players.end()) return "Unkown Player";
-+ if (it == m_players.end()) return "Unknown Player";
- else return it->name;
- }
-
-diff --git a/game/players.hh b/game/players.hh
-index 2dbb366..5f0e373 100644
---- a/game/players.hh
-+++ b/game/players.hh
-@@ -61,7 +61,7 @@ class Players: boost::noncopyable {
- int lookup(std::string const& name) const;
-
- /** lookup a players name using the playerid.
-- @return the players name or "Unkown Player"
-+ @return the players name or "Unknown Player"
- */
- std::string lookup(int id) const;
-
-diff --git a/game/songitems.cc b/game/songitems.cc
-index 35434f2..9b47c12 100644
---- a/game/songitems.cc
-+++ b/game/songitems.cc
-@@ -92,7 +92,7 @@ std::string SongItems::lookup(int id) const {
- SongItem si;
- si.id = id;
- auto it = m_songs.find(si);
-- if (it == m_songs.end()) return "Unkown Song";
-+ if (it == m_songs.end()) return "Unknown Song";
- else if (!it->song) return it->artist + " - " + it->title;
- else return it->song->artist + " - " + it->song->title;
- }
-diff --git a/tools/gh_fsb/fsbext.c b/tools/gh_fsb/fsbext.c
-index ee561d8..1345324 100644
---- a/tools/gh_fsb/fsbext.c
-+++ b/tools/gh_fsb/fsbext.c
-@@ -192,14 +192,14 @@ int main(int argc, char *argv[]) {
- "-a add header to the output files for making them directly playable,\n"
- " the extracted files are usually header-less (just as they are in the\n"
- " FSB archive) so this option IS very useful and suggested!\n"
-- "-s FILE binary file containing the informations for rebuilding the FSB file\n"
-+ "-s FILE binary file containing the information for rebuilding the FSB file\n"
- "-r rebuild the original file, in short:\n"
- " if you do NOT use -r will be created the binary file with the info\n"
- " if you use -r will be read the binary file (-s) and will be created a\n"
- " new FSB file (so it becomes the output and not the input)\n"
- " Example: fsbext -s files.dat input.fsb\n"
- " fsbext -s files.dat -r output.fsb\n"
-- "-v verbose output, debugging informations\n"
-+ "-v verbose output, debugging information\n"
- "-f FILE dump the list of extracted/listed files in FILE\n"
- "-A option available only with -a, gives the ima_adpcm tag (0x0011)\n"
- " instead of the xbox adpcm one (0x0069) to the output adpcm files\n"
-@@ -272,7 +272,7 @@ int main(int argc, char *argv[]) {
- if(!fdreb) {
- printf("\n"
- "Error: you have selected the rebuild option but you have not specified the\n"
-- " file with the rebuild informations using -s\n");
-+ " file with the rebuild information using -s\n");
- exit(1);
- }
-
-diff --git a/tools/scripts/translation_wiki_helper.sh b/tools/scripts/translation_wiki_helper.sh
-index e6c3107..c957bf3 100755
---- a/tools/scripts/translation_wiki_helper.sh
-+++ b/tools/scripts/translation_wiki_helper.sh
-@@ -84,7 +84,7 @@ get_full_language_name(){
- # for name= will fail => NAME="")
-
- # Fall back to something other than an empty string
-- NAME="Unkown"
-+ NAME="Unknown"
- fi
- fi
- echo "$NAME"
-diff --git a/tools/ss_cover.cc b/tools/ss_cover.cc
-index 3b85420..9ed737f 100644
---- a/tools/ss_cover.cc
-+++ b/tools/ss_cover.cc
-@@ -92,7 +92,7 @@ SingstarCover::SingstarCover(const std::string pak_file, unsigned int track_id)
- std::string xpath_old = std::string("/TPAGE_BIT_SET/TPAGE_BIT[@NAME='") + id + "']";
- n = dom.get_document()->get_root_node()->find(xpath_old, nsmap);
- if (n.empty())
-- throw std::runtime_error("Unable to find cover informations");
-+ throw std::runtime_error("Unable to find cover information");
- }
- xmlpp::Element& e = dynamic_cast<xmlpp::Element&>(*n[0]);
- m_u = boost::lexical_cast<unsigned int>(e.get_attribute("U")->get_value());
-@@ -123,7 +123,7 @@ void SingstarCover::write(const std::string filename) {
- image.depth(8);
- image.magick( "RGBA" );
- image.read(blob);
-- // crop image according to informations stored in xml
-+ // crop image according to information stored in xml
- image.crop( Magick::Geometry(m_width, m_height, m_u, m_v) );
- // write it
- image.write(filename);
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index c64d197..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,4 +0,0 @@
-use-avconv.patch
-fix-imagemagick-detection.patch
-fix-hyphen-used-as-minus-sign.patch
-fix-spelling-errors.patch
diff --git a/debian/patches/use-avconv.patch b/debian/patches/use-avconv.patch
deleted file mode 100644
index 5641b39..0000000
--- a/debian/patches/use-avconv.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From: Markus Koschany <apo at gambaru.de>
-Date: Sun, 2 Nov 2014 00:57:00 +0100
-Subject: use avconv
-
-Use avconv command instead of ffmpeg because the latter is not available on
-Debian systems. This should be revisited for Jessie+1.
-
-Forwarded: not-needed
----
- tools/ss_extract.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tools/ss_extract.cc b/tools/ss_extract.cc
-index 2a94110..6677b8f 100644
---- a/tools/ss_extract.cc
-+++ b/tools/ss_extract.cc
-@@ -213,7 +213,7 @@ struct Process {
- }
- if (g_mkvcompress) {
- std::cerr << ">>> Compressing video into video.m4v" << std::endl;
-- std::string cmd = "ffmpeg -i \"" + (path / "video.mpg").string() + "\" -vcodec libx264 -profile main -crf 25 -threads 0 -metadata album=\"" + song.edition + "\" -metadata author=\"" + song.artist + "\" -metadata comment=\"" + song.genre + "\" -metadata title=\"" + song.title + "\" \"" + (path / "video.m4v\"").string();
-+ std::string cmd = "avconv -i \"" + (path / "video.mpg").string() + "\" -vcodec libx264 -profile main -crf 25 -threads 0 -metadata album=\"" + song.edition + "\" -metadata author=\"" + song.artist + "\" -metadata comment=\"" + song.genre + "\" -metadata title=\"" + song.title + "\" \"" + (path / "video.m4v\"").string();
- std::cerr << cmd << std::endl;
- if (std::system(cmd.c_str()) == 0) { // FIXME: std::system return value is not portable
- fs::remove(path / "video.mpg");
--
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