Package: ffmpegthumbnailer
Version: 2.0.6-4
Severity: important
Tags: patch
User: [email protected]
Usertags: libpng15-transition
Hi,
I uploaded libpng 1.5.2 to experimental.
libpng maintainers plan to transition from libpng 1.2 to 1.5.
I am checking build it the package depend to libpng.
I noticed your package FTBFS by libpng 1.5.
I created the patch that revise this problem.
Could you check and apply this patch?
Best regards,
Nobuhiro
-- System Information:
Debian Release: wheezy/sid
APT prefers unstable
APT policy: (500, 'unstable')
Architecture: amd64 (x86_64)
Kernel: Linux 2.6.39-2-amd64 (SMP w/2 CPU cores)
Locale: LANG=ja_JP.UTF-8, LC_CTYPE=ja_JP.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash
--
Nobuhiro Iwamatsu
iwamatsu at {nigauri.org / debian.org}
GPG ID: 40AD1FA6
--
Nobuhiro Iwamatsu
iwamatsu at {nigauri.org / debian.org}
GPG ID: 40AD1FA6
diff -Nru ffmpegthumbnailer-2.0.6/debian/changelog ffmpegthumbnailer-2.0.6/debian/changelog
--- ffmpegthumbnailer-2.0.6/debian/changelog 2011-05-16 07:09:32.000000000 +0900
+++ ffmpegthumbnailer-2.0.6/debian/changelog 2011-05-30 15:11:17.000000000 +0900
@@ -1,3 +1,10 @@
+ffmpegthumbnailer (2.0.6-3.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * linpng transition.
+
+ -- Nobuhiro Iwamatsu <[email protected]> Mon, 30 May 2011 15:11:11 +0900
+
ffmpegthumbnailer (2.0.6-3) unstable; urgency=low
* debian/patches/02_fix-ftbfs-missing-include-NULL.patch: fix FTBFS
diff -Nru ffmpegthumbnailer-2.0.6/debian/patches/debian-changes-2.0.6-3.1 ffmpegthumbnailer-2.0.6/debian/patches/debian-changes-2.0.6-3.1
--- ffmpegthumbnailer-2.0.6/debian/patches/debian-changes-2.0.6-3.1 1970-01-01 09:00:00.000000000 +0900
+++ ffmpegthumbnailer-2.0.6/debian/patches/debian-changes-2.0.6-3.1 2011-05-30 15:11:20.000000000 +0900
@@ -0,0 +1,40 @@
+Description: Upstream changes introduced in version 2.0.6-3.1
+ This patch has been created by dpkg-source during the package build.
+ Here's the last changelog entry, hopefully it gives details on why
+ those changes were made:
+ .
+ ffmpegthumbnailer (2.0.6-3.1) unstable; urgency=low
+ .
+ * Non-maintainer upload.
+ * linpng transition.
+ .
+ The person named in the Author field signed this changelog entry.
+Author: Nobuhiro Iwamatsu <[email protected]>
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: http://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- ffmpegthumbnailer-2.0.6.orig/libffmpegthumbnailer/pngwriter.cpp
++++ ffmpegthumbnailer-2.0.6/libffmpegthumbnailer/pngwriter.cpp
+@@ -49,7 +49,11 @@ PngWriter::PngWriter(std::vector<uint8_t
+ , m_InfoPtr(NULL)
+ {
+ init();
++#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
++ png_set_write_fn(m_PngPtr, (png_voidp) &outputBuffer, writeDataCallback, NULL);
++#else
+ png_set_write_fn(m_PngPtr, (voidp) &outputBuffer, writeDataCallback, NULL);
++#endif
+ }
+
+ PngWriter::~PngWriter()
diff -Nru ffmpegthumbnailer-2.0.6/debian/patches/series ffmpegthumbnailer-2.0.6/debian/patches/series
--- ffmpegthumbnailer-2.0.6/debian/patches/series 2011-05-16 03:57:35.000000000 +0900
+++ ffmpegthumbnailer-2.0.6/debian/patches/series 2011-05-30 15:11:20.000000000 +0900
@@ -1,2 +1,3 @@
01_fix-ftbfs-as-needed.patch
02_fix-ftbfs-missing-include-NULL.patch
+debian-changes-2.0.6-3.1
