Author: malat Date: 2012-05-04 10:38:29 +0000 (Fri, 04 May 2012) New Revision: 10683
Added: trunk/packages/vxl/trunk/debian/patches/png15.patch Modified: trunk/packages/vxl/trunk/debian/changelog trunk/packages/vxl/trunk/debian/copyright trunk/packages/vxl/trunk/debian/patches/series trunk/packages/vxl/trunk/debian/rules Log: Fix png compilation Modified: trunk/packages/vxl/trunk/debian/changelog =================================================================== --- trunk/packages/vxl/trunk/debian/changelog 2012-05-04 10:10:33 UTC (rev 10682) +++ trunk/packages/vxl/trunk/debian/changelog 2012-05-04 10:38:29 UTC (rev 10683) @@ -1,11 +1,12 @@ vxl (1.14.0-16) UNRELEASED; urgency=low - * Use my @d.o alias - * Remove DMUA flag, not required + * Use my @d.o alias, remove DMUA flag, not required * Set LDFLAGS to remove lintian warnings * Update d/copyright to use dep5 * Bump Std-Vers to 3.9.3, no changes needed - * Explicitly prefer libtiff5-dev in d/control + * Explicitly prefer libtiff5-dev in d/control. Closes: #665026 + * Fix compilation with png1.5. Closes: #650570 + * Fix lintian warning about FSF address -- Mathieu Malaterre <[email protected]> Wed, 11 Apr 2012 10:21:29 +0200 Modified: trunk/packages/vxl/trunk/debian/copyright =================================================================== --- trunk/packages/vxl/trunk/debian/copyright 2012-05-04 10:10:33 UTC (rev 10682) +++ trunk/packages/vxl/trunk/debian/copyright 2012-05-04 10:38:29 UTC (rev 10683) @@ -88,8 +88,8 @@ . You should have received a copy of the GNU General Public License along with VRweb; see the file LICENCE. If not, write to the - Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. + Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, + Boston, MA 02110-1301, USA. Files: v3p/zlib/* Copyright: Added: trunk/packages/vxl/trunk/debian/patches/png15.patch =================================================================== --- trunk/packages/vxl/trunk/debian/patches/png15.patch (rev 0) +++ trunk/packages/vxl/trunk/debian/patches/png15.patch 2012-05-04 10:38:29 UTC (rev 10683) @@ -0,0 +1,50 @@ +Description: fix build against newer libpng + Remove direct access to png_info struct, and use png_get_* functions + instead. This is required with newer versions of libpng (1.5 at least) + which no longer support directly accessing said struct. +Author: Matthew Woehlke <[email protected]> +Bug-Debian: http://bugs.debian.org/650570 +Origin: upstream, http://vxl.svn.sf.net/viewvc/vxl?view=revision&revision=34802 + +--- vxl-1.14.0.orig/core/vil/file_formats/vil_png.cxx ++++ vxl-1.14.0/core/vil/file_formats/vil_png.cxx +@@ -189,15 +189,15 @@ struct vil_png_structures + + bool alloc_image() + { +- rows = new png_byte* [info_ptr->height]; ++ rows = new png_byte* [png_get_image_height(png_ptr, info_ptr)]; + if (rows == 0) + return ok = problem("couldn't allocate space for image"); + + unsigned long linesize; + if (png_get_bit_depth(png_ptr, info_ptr) == 16) +- linesize = 2 * info_ptr->width; ++ linesize = 2 * png_get_image_width(png_ptr, info_ptr); + else +- linesize = info_ptr->width; ++ linesize = png_get_image_width(png_ptr, info_ptr); + + if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_GRAY_ALPHA) + linesize *= 2; +--- vxl-1.14.0.orig/core/vil1/file_formats/vil1_png.cxx ++++ vxl-1.14.0/core/vil1/file_formats/vil1_png.cxx +@@ -181,15 +181,15 @@ struct vil1_png_structures + + bool alloc_image() + { +- rows = new png_byte* [info_ptr->height]; ++ rows = new png_byte* [png_get_image_height(png_ptr, info_ptr)]; + if (rows == 0) + return ok = problem("couldn't allocate space for image"); + + unsigned long linesize; + if (png_get_bit_depth( png_ptr, info_ptr ) == 16) +- linesize = 2 * info_ptr->width; ++ linesize = 2 * png_get_image_width(png_ptr, info_ptr); + else +- linesize = info_ptr->width; ++ linesize = png_get_image_width(png_ptr, info_ptr); + + if (png_get_color_type( png_ptr, info_ptr ) == PNG_COLOR_TYPE_GRAY_ALPHA) + linesize *= 2; Modified: trunk/packages/vxl/trunk/debian/patches/series =================================================================== --- trunk/packages/vxl/trunk/debian/patches/series 2012-05-04 10:10:33 UTC (rev 10682) +++ trunk/packages/vxl/trunk/debian/patches/series 2012-05-04 10:38:29 UTC (rev 10683) @@ -9,3 +9,4 @@ libav_trunk.patch ffmpeg_C99.patch removedoxyen.patch +png15.patch Modified: trunk/packages/vxl/trunk/debian/rules =================================================================== --- trunk/packages/vxl/trunk/debian/rules 2012-05-04 10:10:33 UTC (rev 10682) +++ trunk/packages/vxl/trunk/debian/rules 2012-05-04 10:38:29 UTC (rev 10683) @@ -38,6 +38,8 @@ -DBUILD_CORE_UTILITIES:BOOL=ON \ -DBUILD_CORE_VIDEO:BOOL=ON \ -DBUILD_EXAMPLES:BOOL=OFF \ + -DPYTHON_INCLUDE_DIR="/usr/include/python2.7" \ + -DPYTHON_LIBRARY="/usr/lib/python2.7/config/libpython2.7.so" \ -DBUILD_TESTING:BOOL=ON pkg_lib = libvxl$(SOVERSION) _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
