From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Claudio Bley Newsgroups: gmane.emacs.devel Subject: [PATCH v2 2/5] w32: add support for recent PNG library version >= 1.5 Date: Wed, 30 Oct 2013 13:43:21 +0100 Message-ID: <8761sfylna.wl%claudio.bley@gmail.com> References: NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset=US-ASCII X-Trace: ger.gmane.org 1383137016 14201 80.91.229.3 (30 Oct 2013 12:43:36 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 30 Oct 2013 12:43:36 +0000 (UTC) To: Emacs-devel Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Oct 30 13:43:41 2013 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1VbV7b-0007jO-5r for ged-emacs-devel@m.gmane.org; Wed, 30 Oct 2013 13:43:39 +0100 Original-Received: from localhost ([::1]:52205 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VbV7a-0006cb-Pl for ged-emacs-devel@m.gmane.org; Wed, 30 Oct 2013 08:43:38 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:57755) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VbV7R-0006UP-Al for emacs-devel@gnu.org; Wed, 30 Oct 2013 08:43:34 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VbV7L-0002tr-Fi for emacs-devel@gnu.org; Wed, 30 Oct 2013 08:43:29 -0400 Original-Received: from mail-ea0-x22c.google.com ([2a00:1450:4013:c01::22c]:38459) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VbV7L-0002tU-8v for emacs-devel@gnu.org; Wed, 30 Oct 2013 08:43:23 -0400 Original-Received: by mail-ea0-f172.google.com with SMTP id r16so634770ead.3 for ; Wed, 30 Oct 2013 05:43:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20120113; h=date:message-id:from:to:subject:in-reply-to:references:user-agent :mime-version:content-type; bh=1f8QEd+MPfC70bTnB6Dm2hotzjEZj5myZ3VZWfc7CSk=; b=t2ZWrEzekNckfkdqrkG6b8Hq1dGSDc0qZjAvawv/MaQiwAg3TUhkD2YG6KRvhAjluN nDW2AlRNPku94esouPGfzMXiyZPrVfg/mZmsKo+CqKIVXzu4BB8RiKXGAp3WGyMk3QHk EirYksNZ/NNGwNPqgHWzTFazRTEwqZUbN5oQoTnKdkW1hw3x9jQa036F0UJRxVs8MFiE 9trQ90UMCCBhLoPSs1tCX4vWOyYzauf91mIB7fDA6gnySYfor7yQqKdsp7PooNJU/FJJ qZG8ealj1ShdamheNCvF6LSWeYjyDrszYNqGEImFibBG/hazvyeyvP1RcqQGXcRikiZA xv/A== X-Received: by 10.14.178.193 with SMTP id f41mr2655eem.148.1383137002446; Wed, 30 Oct 2013 05:43:22 -0700 (PDT) Original-Received: from CLAUDIO-PC.localdomain.de (178-24-125-95-dynip.superkabel.de. [178.24.125.95]) by mx.google.com with ESMTPSA id z12sm83097209eev.6.2013.10.30.05.43.21 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 30 Oct 2013 05:43:21 -0700 (PDT) In-Reply-To: User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI/1.14.6 (Maruoka) FLIM/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL/10.8 Emacs/24.3.50 (i686-pc-mingw32) MULE/6.0 (HANACHIRUSATO) X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:4013:c01::22c X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:164695 Archived-At: The naming scheme of the libpng library on w32 is either libpngXY.dll or libpngXY-XY.dll where X being the major version, Y the minor version number, respectively. --- lisp/term/w32-win.el | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/lisp/term/w32-win.el b/lisp/term/w32-win.el index b1e7d9b..ff3729d 100644 --- a/lisp/term/w32-win.el +++ b/lisp/term/w32-win.el @@ -216,8 +216,15 @@ See the documentation of `create-fontset-from-fontset-spec' for the format.") ;; the version we were compiled against. (If we were compiled ;; without PNG support, libpng-version's value is -1.) (if (>= libpng-version 10400) - ;; libpng14-14.dll is libpng 1.4.3 from GTK+ - '(png "libpng14-14.dll" "libpng14.dll") + (let ((major (/ libpng-version 10000)) + (minor (mod (/ libpng-version 100) 10))) + (list 'png + ;; libpngXY.dll is the default name when building + ;; with CMake or from a lpngXYY tarball on w32, + ;; libpngXY-XY.dll is the DLL name when building + ;; with libtool / autotools + (format "libpng%d%d.dll" major minor) + (format "libpng%d%d-%d%d.dll" major minor major minor))) '(png "libpng12d.dll" "libpng12.dll" "libpng3.dll" "libpng.dll" ;; these are libpng 1.2.8 from GTK+ "libpng13d.dll" "libpng13.dll")) -- 1.8.4.msysgit.0