From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tobias Geerinckx-Rice Subject: [PATCH 2/2] gnu: icecat: Use libjpeg-turbo instead of bundled libjpeg. Date: Sun, 27 Nov 2016 21:17:07 +0100 Message-ID: <20161127201707.3789-2-me@tobias.gr> References: <20161127201707.3789-1-me@tobias.gr> Mime-Version: 1.0 Content-Transfer-Encoding: 8bit Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:34493) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cB5t7-0006pO-4x for guix-devel@gnu.org; Sun, 27 Nov 2016 15:17:26 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cB5t4-0007pi-0p for guix-devel@gnu.org; Sun, 27 Nov 2016 15:17:25 -0500 Received: from relay4-d.mail.gandi.net ([217.70.183.196]:41575) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cB5t3-0007pD-RF for guix-devel@gnu.org; Sun, 27 Nov 2016 15:17:21 -0500 Received: from mfilter36-d.gandi.net (mfilter36-d.gandi.net [217.70.178.167]) by relay4-d.mail.gandi.net (Postfix) with ESMTP id 84E5E17209B for ; Sun, 27 Nov 2016 21:17:19 +0100 (CET) Received: from relay4-d.mail.gandi.net ([IPv6:::ffff:217.70.183.196]) by mfilter36-d.gandi.net (mfilter36-d.gandi.net [::ffff:10.0.15.180]) (amavisd-new, port 10024) with ESMTP id fzGn_aKU69jC for ; Sun, 27 Nov 2016 21:17:17 +0100 (CET) Received: from v5.tobias.gr (unknown [91.181.39.59]) (Authenticated sender: me@tobias.gr) by relay4-d.mail.gandi.net (Postfix) with ESMTPSA id AC45D17209D for ; Sun, 27 Nov 2016 21:17:17 +0100 (CET) In-Reply-To: <20161127201707.3789-1-me@tobias.gr> List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: guix-devel@gnu.org * gnu/packages/gnuzilla.scm (icecat)[source]: Remove bundled libjpeg. [inputs]: Add libjpeg-turbo. [arguments]: Use it. --- gnu/packages/gnuzilla.scm | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 3b00d3c..f7a8c7d 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -403,6 +403,7 @@ standards.") "modules/zlib" "modules/libbz2" "ipc/chromium/src/third_party/libevent" + "media/libjpeg" "media/libvpx" "security/nss" "gfx/cairo" @@ -432,6 +433,7 @@ standards.") ("hunspell" ,hunspell) ("libcanberra" ,libcanberra) ("libgnome" ,libgnome) + ("libjpeg-turbo" ,libjpeg-turbo) ("libxft" ,libxft) ("libevent" ,libevent) ("libxinerama" ,libxinerama) @@ -497,6 +499,7 @@ standards.") ;; Avoid bundled libraries. "--with-system-zlib" "--with-system-bz2" + "--with-system-jpeg" ; must be libjpeg-turbo "--with-system-libevent" "--with-system-libvpx" "--with-system-icu" @@ -517,16 +520,6 @@ standards.") ;; Network Graphics (PNG) format"; ;; we probably do not wish to support it. ;; "--with-system-png" - - ;; Fails with "libjpeg-turbo JCS_EXTENSIONS - ;; required". - ;; According to - ;; http://sourceforge.net/projects/libjpeg-turbo/ , - ;; "libjpeg-turbo is a derivative of libjpeg that - ;; uses MMX, SSE, SSE2, and NEON SIMD instructions - ;; to accelerate baseline JPEG compression/ - ;; decompression", so we had better not use it - ;; "--with-system-jpeg" ) #:modules ((ice-9 ftw) -- 2.9.3