--- Begin Message ---
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Dear release team,
please unblock package performous.
It was discovered that the binary package performous-tools stopped
providing two binaries, ss_extract and ss_cover_conv. This happened
presumably due to the imagemagick transition since performous was
unable to successfully detect the latest version of this library. The
error was not fatal and went unnoticed for quite some time. The new
version of performous in unstable fixes this. (#767755)
Since ffmpeg will not be part of Jessie it was also necessary to
replace a specific ffmpeg command in ss_extract with avconv and to
depend on the libav-tools package. (#699400)
I am attaching the debdiff against the package in testing.
Regards,
Markus
unblock performous/0.7.0+git20140715-2
-- System Information:
Debian Release: jessie/sid
APT prefers testing
APT policy: (990, 'testing'), (500, 'unstable')
Architecture: amd64 (x86_64)
Kernel: Linux 3.16-3-amd64 (SMP w/2 CPU cores)
Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru performous-0.7.0+git20140715/debian/changelog performous-0.7.0+git20140715/debian/changelog
--- performous-0.7.0+git20140715/debian/changelog 2014-07-15 17:11:20.000000000 +0200
+++ performous-0.7.0+git20140715/debian/changelog 2014-11-02 15:35:23.000000000 +0100
@@ -1,3 +1,17 @@
+performous (0.7.0+git20140715-2) unstable; urgency=medium
+
+ * Add fix-imagemagick-detection.patch. (Closes: #767755)
+ Detect ImageMagick library and build the ss_extract and ss_cover_conv
+ binaries again which were accidentally dropped.
+ * Add use-avconv.patch. (Closes: #699400)
+ Replace ffmpeg command with avconv for ss_extract tool because ffmpeg
+ will not be available for Jessie.
+ * performous-tools: Depend on libav-tools because ss_extract requires
+ the avconv command.
+ * Move the package to Git. Change Vcs fields accordingly.
+
+ -- Markus Koschany <apo@gambaru.de> Sun, 02 Nov 2014 13:46:41 +0100
+
performous (0.7.0+git20140715-1) unstable; urgency=medium
* Imported Upstream version 0.7.0+git20140715.
diff -Nru performous-0.7.0+git20140715/debian/control performous-0.7.0+git20140715/debian/control
--- performous-0.7.0+git20140715/debian/control 2014-07-15 17:11:20.000000000 +0200
+++ performous-0.7.0+git20140715/debian/control 2014-11-02 15:35:23.000000000 +0100
@@ -30,8 +30,8 @@
pkg-config,
portaudio19-dev
Standards-Version: 3.9.5
-Vcs-Svn: svn://anonscm.debian.org/pkg-games/packages/trunk/performous/
-Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-games/packages/trunk/performous/
+Vcs-Git: git://anonscm.debian.org/pkg-games/performous.git
+Vcs-Browser: http://anonscm.debian.org/cgit/pkg-games/performous.git
Homepage: http://performous.org/
Package: performous
@@ -50,6 +50,7 @@
Package: performous-tools
Architecture: any
Depends:
+ libav-tools,
${misc:Depends},
${shlibs:Depends}
Recommends:
diff -Nru performous-0.7.0+git20140715/debian/patches/fix-imagemagick-detection.patch performous-0.7.0+git20140715/debian/patches/fix-imagemagick-detection.patch
--- performous-0.7.0+git20140715/debian/patches/fix-imagemagick-detection.patch 1970-01-01 01:00:00.000000000 +0100
+++ performous-0.7.0+git20140715/debian/patches/fix-imagemagick-detection.patch 2014-11-02 15:35:23.000000000 +0100
@@ -0,0 +1,37 @@
+From: Markus Koschany <apo@gambaru.de>
+Date: Sun, 2 Nov 2014 13:44:14 +0100
+Subject: fix imagemagick detection
+
+Fix the detection of the ImageMagick library for Debian systems which use
+Multiarch paths. That ensures that ss_extract and ss_cover_conv are built
+again.
+
+Forwarded: https://github.com/performous/performous/pull/113
+---
+ tools/CMakeLists.txt | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
+index 50bdd6f..d96f1db 100644
+--- a/tools/CMakeLists.txt
++++ b/tools/CMakeLists.txt
+@@ -21,13 +21,18 @@ if (APPLE)
+ find_package(ImageMagick COMPONENTS Magick++)
+ include_directories(${ImageMagick_INCLUDE_DIRS})
+ else (APPLE)
+- foreach(lib LibXML++ Z Magick++ 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)
++
++ 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 -Nru performous-0.7.0+git20140715/debian/patches/series performous-0.7.0+git20140715/debian/patches/series
--- performous-0.7.0+git20140715/debian/patches/series 1970-01-01 01:00:00.000000000 +0100
+++ performous-0.7.0+git20140715/debian/patches/series 2014-11-02 15:35:23.000000000 +0100
@@ -0,0 +1,2 @@
+use-avconv.patch
+fix-imagemagick-detection.patch
diff -Nru performous-0.7.0+git20140715/debian/patches/use-avconv.patch performous-0.7.0+git20140715/debian/patches/use-avconv.patch
--- performous-0.7.0+git20140715/debian/patches/use-avconv.patch 1970-01-01 01:00:00.000000000 +0100
+++ performous-0.7.0+git20140715/debian/patches/use-avconv.patch 2014-11-02 15:35:23.000000000 +0100
@@ -0,0 +1,25 @@
+From: Markus Koschany <apo@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");
--- End Message ---
--- Begin Message ---
On Wed, 2014-11-05 at 11:29 +0100, Markus Koschany wrote:
> please unblock package performous.
>
> It was discovered that the binary package performous-tools stopped
> providing two binaries, ss_extract and ss_cover_conv. This happened
> presumably due to the imagemagick transition since performous was
> unable to successfully detect the latest version of this library. The
> error was not fatal and went unnoticed for quite some time. The new
> version of performous in unstable fixes this. (#767755)
Already done a couple of days ago (although that won't have been obvious
until the freeze actually starts tonight, unless you looked at hints
files directly).
Regards,
Adam
--- End Message ---