Browse Source

Previously updated libpng no longer needs special handling.

- 64 bits patch no longer required.
- copying header file no longer required.
early
Minto van der Sluis 18 years ago
parent
commit
c8291558e3
  1. 28
      graphic/libpng/64-config-header.diff
  2. 20
      graphic/libpng/libpng.conf

28
graphic/libpng/64-config-header.diff

@ -1,28 +0,0 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../libpng/64-config-header.diff
# Copyright (C) 2007 The OpenSDE Project
#
# More information can be found in the files COPYING and README.
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
# --- SDE-COPYRIGHT-NOTE-END ---
--- ./pngconf.h.orig 2007-01-05 14:58:52.000000000 +0200
+++ ./pngconf.h 2007-01-11 16:58:35.513932000 +0200
@@ -729,6 +729,9 @@
* PNG_NO_MMX_CODE disables the use of MMX code without changing the API.
* When MMX code is off, then optimized C replacement functions are used.
*/
+
+#define PNG_NO_ASSEMBLER_CODE
+
#if defined(PNG_READ_SUPPORTED) && !defined(PNG_NO_ASSEMBLER_CODE)
# ifndef PNG_ASSEMBLER_CODE_SUPPORTED
# define PNG_ASSEMBLER_CODE_SUPPORTED

20
graphic/libpng/libpng.conf

@ -1,20 +0,0 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../libpng/libpng.conf
# Copyright (C) 2006 The OpenSDE Project
# Copyright (C) 2004 - 2006 The T2 SDE Project
# Copyright (C) 1998 - 2003 Clifford Wolf
#
# More information can be found in the files COPYING and README.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; version 2 of the License. A copy of the
# GNU General Public License can be found in the file COPYING.
# --- SDE-COPYRIGHT-NOTE-END ---
[ $arch != x86 ] && var_append patchfiles ' ' "$confdir/64-config-header.diff"
hook_add postmake 5 "ln -sf libpng12/png.h $root$includedir/png.h ; \
ln -sf libpng12/pngconf.h $root$includedir/pngconf.h"
Loading…
Cancel
Save