From patchwork Sun Jan 19 23:20:06 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marius Bakke X-Patchwork-Id: 19918 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 922E017AB7; Sun, 19 Jan 2020 23:21:19 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 0DFFD17AB7 for ; Sun, 19 Jan 2020 23:21:19 +0000 (GMT) Received: from localhost ([::1]:55080 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1itJsc-0004s5-0v for patchwork@mira.cbaines.net; Sun, 19 Jan 2020 18:21:18 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:58396) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1itJsP-0004pv-5Y for guix-patches@gnu.org; Sun, 19 Jan 2020 18:21:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1itJsN-0001K9-NI for guix-patches@gnu.org; Sun, 19 Jan 2020 18:21:05 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:38167) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1itJsM-0001JQ-Vk for guix-patches@gnu.org; Sun, 19 Jan 2020 18:21:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1itJsM-0007Yy-T7 for guix-patches@gnu.org; Sun, 19 Jan 2020 18:21:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#39197] [PATCH core-updates 4/4] gnu: Deprecate the 'libjpeg' variable. Resent-From: Marius Bakke Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 19 Jan 2020 23:21:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 39197 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 39197@debbugs.gnu.org Received: via spool by 39197-submit@debbugs.gnu.org id=B39197.157947602628985 (code B ref 39197); Sun, 19 Jan 2020 23:21:02 +0000 Received: (at 39197) by debbugs.gnu.org; 19 Jan 2020 23:20:26 +0000 Received: from localhost ([127.0.0.1]:44136 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1itJrm-0007XK-3X for submit@debbugs.gnu.org; Sun, 19 Jan 2020 18:20:26 -0500 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:43915) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1itJre-0007Wa-Jy for 39197@debbugs.gnu.org; Sun, 19 Jan 2020 18:20:19 -0500 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 8795B21A09 for <39197@debbugs.gnu.org>; Sun, 19 Jan 2020 18:20:13 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Sun, 19 Jan 2020 18:20:13 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=fm1; bh=0SUADYV9NlgxS m5qmXq26AiukVty2Zk24CNJ7nWs4D8=; b=dHcfSlfhtqnCrRJUaNQ4NqrCNDec3 rgACdLN0B+C8ibAr4ZR29NPLOHaRk2qxila8hsM7Zl3QfeAg6t5qtDq9nrbQ980n 14eWUAFzZlvoR0uteoEDREGd+XUt7f3zwln8wt1AScEoLfE5qqVOEjjUxbRuwpZt PRZ1GAVVAg6PVcHH41rz4xmWP2uNr4Svaeq2kjjKIpvdvmDVsvQnscwUDgybp/Sn vygbJNCXeb6+0n/T8EP1ATEKadKGd/GMUmdAY0XrJ4BfjdjS5pENeqn1u5a6505D kjQNkFAemdyFENs3BQ/eTGJF17eFVtDDyhVBjZ+Urr8i3Y8DTbR0NW0jQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-transfer-encoding:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm1; bh=0SUADYV9NlgxSm5qmXq26AiukVty2Zk24CNJ7nWs4D8=; b=YP548uZ/ u+yCATXgVnkE3G187vDbbUgFjvn6GjPnNLn6uPvl0iVuD4Od4X18S/h7Ei+2zUyq 1FqqdONKpyi3z8YCwu7h19kwwFIeFb+ZulwEYd8vZRg/cwa3uZ7eD7L39J9tC3cg 9PGJESgpsKQOUvjtBY9Qvvmxax9o5meUdd3qexzl0K+QQVZt4lFSq9MsfG5EKsZk SfCoRl9kI9KFV54DngyJ+74/Wv6D6rSSnINgGrH39+5LK7A7VWl7zbsSmdD4h/gD GHdaoP3Y8mU1hrv4Y5LcstlegD+NkcFlo9BQ8hK19k61EchZfA2IYimXQn9/YVQR B0/SdPBU+pEeAQ== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedugedrudeggddtjecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffojghfggfgsedtkeertd ertddtnecuhfhrohhmpeforghrihhushcuuegrkhhkvgcuoehmsggrkhhkvgesfhgrshht mhgrihhlrdgtohhmqeenucffohhmrghinhepihhjghdrohhrghenucfkphepkeegrddvtd dvrdeiledrvdehfeenucfrrghrrghmpehmrghilhhfrhhomhepmhgsrghkkhgvsehfrghs thhmrghilhdrtghomhenucevlhhushhtvghrufhiiigvpedt X-ME-Proxy: Received: from localhost (ti0006q161-3035.bb.online.no [84.202.69.253]) by mail.messagingengine.com (Postfix) with ESMTPA id 0995580059 for <39197@debbugs.gnu.org>; Sun, 19 Jan 2020 18:20:12 -0500 (EST) From: Marius Bakke Date: Mon, 20 Jan 2020 00:20:06 +0100 Message-Id: <20200119232006.12303-4-mbakke@fastmail.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200119232006.12303-1-mbakke@fastmail.com> References: <20200119231651.11874-1-mbakke@fastmail.com> <20200119232006.12303-1-mbakke@fastmail.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/image.scm (libjpeg, libjpeg-8): Rename to ... (ijg-libjpeg, ijg-libjpeg-8): ... this. (libjpeg): Define as deprecated by LIBJPEG-TURBO. * gnu/packages/emulators.scm (mame)[inputs]: Change from LIBJPEG-8 to IJG-LIBJPEG-8. * gnu/packages/games.scm (stepmania)[inputs]: Likewise. * gnu/packages/qt.scm (qt-4)[inputs]: Likewise. --- gnu/packages/emulators.scm | 2 +- gnu/packages/games.scm | 2 +- gnu/packages/image.scm | 9 ++++++--- gnu/packages/qt.scm | 2 +- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index ffcdc65265..aba5ce4ff4 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -1425,7 +1425,7 @@ play them on systems for which they were never designed!") ("flac" ,flac) ("fontconfig" ,fontconfig) ("glm" ,glm) - ("libjpeg" ,libjpeg-8) ;jpeg_read_header argument error in libjpeg-9 + ("libjpeg" ,ijg-libjpeg-8) ;jpeg_read_header argument error in libjpeg-9 ("libxi" ,libxi) ("libxinerama" ,libxinerama) ("lua" ,lua) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index e3b3a5f6e5..ae97f05b0d 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -6566,7 +6566,7 @@ civilized than your own.") ("gtk+" ,gtk+-2) ("jsoncpp" ,jsoncpp) ("libpng" ,libpng) - ("libjpeg" ,libjpeg-8) + ("libjpeg" ,ijg-libjpeg-8) ("libmad" ,libmad) ("libogg" ,libogg) ("libva" ,libva) diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 65acf7638f..a7e207e07a 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -82,6 +82,7 @@ #:use-module (guix build-system meson) #:use-module (guix build-system python) #:use-module (guix build-system scons) + #:use-module (guix deprecation) #:use-module (srfi srfi-1)) (define-public libpng @@ -363,7 +364,7 @@ Features: @end enumerate") (license license:gpl3+))) -(define-public libjpeg +(define-public ijg-libjpeg (package (name "libjpeg") (version "9c") @@ -392,8 +393,8 @@ lossless JPEG manipulations such as rotation, scaling or cropping: (license license:ijg) (home-page "https://www.ijg.org/"))) -(define-public libjpeg-8 - (package (inherit libjpeg) +(define-public ijg-libjpeg-8 + (package (inherit ijg-libjpeg) (version "8d") (source (origin (method url-fetch) @@ -1522,6 +1523,8 @@ and decompress to 32-bit and big-endian pixel buffers (RGBX, XBGR, etc.).") license:ijg ;the libjpeg library and associated tools license:zlib)))) ;the libjpeg-turbo SIMD extensions +(define-deprecated libjpeg libjpeg-turbo) + (define-public niftilib (package (name "niftilib") diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 4011970643..a105ba9c1f 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -215,7 +215,7 @@ system, and the core design of Django is reused in Grantlee.") ("xcb-util-renderutil" ,xcb-util-renderutil) ("xcb-util-wm" ,xcb-util-wm) ("zlib" ,zlib) - ("libjpeg" ,libjpeg-8) + ("libjpeg" ,ijg-libjpeg-8) ("libsm" ,libsm) ("openssl" ,openssl-1.0))) (native-inputs