From patchwork Mon Dec 27 20:15:05 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hartmut Goebel X-Patchwork-Id: 35715 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 0B70027BBEA; Mon, 27 Dec 2021 20:17:12 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 7E48B27BBE9 for ; Mon, 27 Dec 2021 20:17:11 +0000 (GMT) Received: from localhost ([::1]:46998 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n1wQg-00040A-NJ for patchwork@mira.cbaines.net; Mon, 27 Dec 2021 15:17:10 -0500 Received: from eggs.gnu.org ([209.51.188.92]:43250) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n1wPd-00038C-Gd for guix-patches@gnu.org; Mon, 27 Dec 2021 15:16:05 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:32843) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n1wPb-0002mh-66 for guix-patches@gnu.org; Mon, 27 Dec 2021 15:16:05 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1n1wPb-0001Ql-3I for guix-patches@gnu.org; Mon, 27 Dec 2021 15:16:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52832] [PATCH 3/3] gnu: Add etc1tool. Resent-From: Hartmut Goebel Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 27 Dec 2021 20:16:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 52832 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 52832@debbugs.gnu.org X-Debbugs-Original-To: 52832@debbugs.gnu.org, guix-patches@gnu.org Received: via spool by 52832-submit@debbugs.gnu.org id=B52832.16406361185370 (code B ref 52832); Mon, 27 Dec 2021 20:16:03 +0000 Received: (at 52832) by debbugs.gnu.org; 27 Dec 2021 20:15:18 +0000 Received: from localhost ([127.0.0.1]:44380 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n1wOs-0001OY-5V for submit@debbugs.gnu.org; Mon, 27 Dec 2021 15:15:18 -0500 Received: from mout.kundenserver.de ([217.72.192.74]:60839) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n1wOp-0001O3-Ty for 52832@debbugs.gnu.org; Mon, 27 Dec 2021 15:15:16 -0500 Received: from hermia.goebel-consult.de ([87.176.128.206]) by mrelayeu.kundenserver.de (mreue109 [212.227.15.183]) with ESMTPSA (Nemesis) id 1MekvT-1mUFfn0MwX-00akw0; Mon, 27 Dec 2021 21:15:10 +0100 Received: from lenashee.fritz.box (lenashee.goebel-consult.de [192.168.110.2]) by hermia.goebel-consult.de (Postfix) with ESMTP id B273566164; Mon, 27 Dec 2021 21:15:15 +0100 (CET) From: Hartmut Goebel Date: Mon, 27 Dec 2021 21:15:05 +0100 Message-Id: X-Mailer: git-send-email 2.30.2 In-Reply-To: <793e925b111667693a137f3c95b63a7736868db7.1640635864.git.h.goebel@crazy-compilers.com> References: <793e925b111667693a137f3c95b63a7736868db7.1640635864.git.h.goebel@crazy-compilers.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:/rE9bLDY0fCJlaeGWncsvhu3XSutye2ZhyA05NZAKxRXyEFijnO D0AddDS55RIfRT/DxLsvRX0tRR9jmpTp/WnGXQ+5ZCiIphzB0KQxWSb8wYiMb3rFMGyF76p y/zLgkr6uEJJ7hUmMB0ABwip12Np4VPrRpRoUrl9GwZBo31dGpm4tQobrRsWWNpZQO6G5pv jc8BQwKKmB6eOiC8GV9/A== X-UI-Out-Filterresults: notjunk:1;V03:K0:dk/KW7wiXQo=:1WwnhUUDIzQoqpRmQt1yRC G7geFgRGwXLSz0QrA3GCf+Pplxu5j2kwPHiETIhmM1Kt85nrlg/ypyDT049I3injSamMBijqq Wh6sc89lhB2FAvNFz1eOI5NuNI3fHCNcoMmvLjo5zCFG6fj9RiF7c0LB3Gbfe9LOrwRPGdkZC aLh0JuOH76RMZuJywlJyEHb45ZmzXvDt9ncQgTUaaFXFV3DaGkVfXfGgNJ1higuwxxF/XtPy3 esoNmThkqvr/dTbw6lQcAPaGSb+yEWydDexJUdA8si3ohGV+emCpgsPdupY1V28rPeamORsQP rUJjjqHd30ryx2cEHoe1TYjoVrzomidTkYKgRlZqXbyAfecZjHm3YAiYEc1waCi/ynEa7I12P ogUKOeSIuD6fOAlfZK1Mmt2AYltSXHflWcltu3tP4wU/I5CsEsIZ34JTErVqMrt7wSn5ailtA PWCXpRhoujDiHjcK7ke+37yQFYWZLCj2sAjcbVnsEGiOjWsEXEPR96qNXggHK6DqXcprsG9I2 SUzQ9iG64cpSI47C+8kq6R5cvxxuBQfTcRlqi1YoxHZrNjrEYig0WXp/j0Qk1L5i+cXy4Pekg mNh2EIpdE6XzxNvgZ36TihUWev9rO2Xns9afwgVIeo106jGBkWAjUZbYDRejWAJmwSVfl9doK nv7lqttilTePxqma4OGnNASAFmgIIlM55Zi65XF0Bss97Yi8mezKFWZP479kwQu7Ygn8xAuDl S3RxLxUh7DQHi058 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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/android.scm (android-platform-development, etc1tools): New variables. --- gnu/packages/android.scm | 65 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) diff --git a/gnu/packages/android.scm b/gnu/packages/android.scm index 31d388fd15..285ff85c3f 100644 --- a/gnu/packages/android.scm +++ b/gnu/packages/android.scm @@ -45,6 +45,7 @@ #:use-module (gnu packages gcc) #:use-module (gnu packages gnupg) #:use-module (gnu packages golang) + #:use-module (gnu packages image) #:use-module (gnu packages java) #:use-module (gnu packages linux) #:use-module (gnu packages pcre) @@ -190,6 +191,17 @@ use their packages mostly unmodified in our Android NDK build system.") (base32 checksum)))) +(define (android-platform-development version) + (origin + (method git-fetch) + (uri (git-reference + (url "https://android.googlesource.com/platform/development") + (commit (string-append "android-" version)))) + (file-name (string-append "android-platform-development-" + version "-checkout")) + (sha256 + (base32 "0s92961yycg8wsga40i7fvbfmf1a5i6j2gk64j2jiy7s0hfd4rc3")))) + (define (android-platform-frameworks-native version) (origin (method git-fetch) @@ -812,6 +824,59 @@ early 2005. libETC1 provides the encoding and decoding of ETC1 compression algorithm.") (license license:asl2.0))) +(define-public etc1tool + (package + (name "etc1tool") + (version (android-platform-version)) + (source (android-platform-development version)) + (build-system gnu-build-system) + (arguments + `(#:tests? #f + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'create-Makefile + (lambda _ + ;; No useful makefile is shipped, so we create one. + (with-output-to-file "Makefile" + (lambda _ + (display + (string-append + "NAME = etc1tool\n" + "SOURCES = tools/etc1tool/etc1tool.cpp\n" + "CPPFLAGS += -Iinclude\n" + "LDFLAGS += -lpng -lETC1\n" + "$(NAME): $(SOURCES)\n" + " $(CXX) $^ -o $@ $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS)\n" + "build: $(NAME)")) + #t)))) + (add-before 'build 'fix-typos-in-help + (lambda _ + (substitute* "tools/etc1tool/etc1tool.cpp" + ((" apropriate ") " appropriate ")) + #t)) + ;; TODO: Add man-page from Debian + (delete 'configure) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin"))) + (install-file "etc1tool" bin))))))) + (inputs + `(("libetc1" ,libetc1) + ("libpng" ,libpng))) + (home-page "https://developer.android.com/studio/command-line/etc1tool.html") + (synopsis "Encode and decode PNG images to resp. from the ETC1 compression +standard.") + (description + "@command{etc1} is a command line utility that lets you encode PNG images +to the ETC1 compression standard and decode ETC1 compressed images back to +PNG. This tool is part of the Android SDK for working with media files for +game apps. + +The standard for the ETC1 texture format can be found at +@uref{http://www.khronos.org/registry/gles/extensions/OES/OES_compressed_ETC1_RGB8_texture.txt}.") + (license license:asl2.0))) + (define-public git-repo (package (name "git-repo")