From patchwork Mon Dec 27 20:11:39 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hartmut Goebel X-Patchwork-Id: 35714 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 BC4B127BBEA; Mon, 27 Dec 2021 20:14:39 +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 4EAAD27BBE9 for ; Mon, 27 Dec 2021 20:14:39 +0000 (GMT) Received: from localhost ([::1]:43708 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n1wOE-0001e5-Ed for patchwork@mira.cbaines.net; Mon, 27 Dec 2021 15:14:38 -0500 Received: from eggs.gnu.org ([209.51.188.92]:42528) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n1wLj-00086u-9M for guix-patches@gnu.org; Mon, 27 Dec 2021 15:12:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:32822) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n1wLi-0001y6-W7 for guix-patches@gnu.org; Mon, 27 Dec 2021 15:12:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1n1wLi-0001I6-JS for guix-patches@gnu.org; Mon, 27 Dec 2021 15:12:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52832] [PATCH 1/3] gnu: Add android-platform-frameworks-native-headers. Resent-From: Hartmut Goebel Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 27 Dec 2021 20:12:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 52832 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 52832@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16406359124940 (code B ref -1); Mon, 27 Dec 2021 20:12:02 +0000 Received: (at submit) by debbugs.gnu.org; 27 Dec 2021 20:11:52 +0000 Received: from localhost ([127.0.0.1]:44368 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n1wLY-0001Hc-5e for submit@debbugs.gnu.org; Mon, 27 Dec 2021 15:11:52 -0500 Received: from lists.gnu.org ([209.51.188.17]:42214) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n1wLV-0001HU-Ku for submit@debbugs.gnu.org; Mon, 27 Dec 2021 15:11:51 -0500 Received: from eggs.gnu.org ([209.51.188.92]:42486) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n1wLV-0007sz-Fx for guix-patches@gnu.org; Mon, 27 Dec 2021 15:11:49 -0500 Received: from mout.kundenserver.de ([212.227.126.134]:46631) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n1wLR-0001qd-MS for guix-patches@gnu.org; Mon, 27 Dec 2021 15:11:47 -0500 Received: from hermia.goebel-consult.de ([87.176.128.206]) by mrelayeu.kundenserver.de (mreue010 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MPp0l-1moWBp0J07-00Mr9Z for ; Mon, 27 Dec 2021 21:11:42 +0100 Received: from lenashee.fritz.box (lenashee.goebel-consult.de [192.168.110.2]) by hermia.goebel-consult.de (Postfix) with ESMTP id 96CBE5F53C; Mon, 27 Dec 2021 21:11:50 +0100 (CET) From: Hartmut Goebel Date: Mon, 27 Dec 2021 21:11:39 +0100 Message-Id: <793e925b111667693a137f3c95b63a7736868db7.1640635864.git.h.goebel@crazy-compilers.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 X-Provags-ID: V03:K1:Rthsavwvcma+fmifwDMqT8k5ut3SxDbEs/GxV4FugAJ/ESC4CE+ p6BHgfkUEIOlQbEFFkFs37zis4J7XMkGq+JXlj3RiHXDw0i4MfZhsYunejhSn/tuzZ3olMr Puuzs4oYAEpJNlU/i7UJOJLPxEF8BEk7LtrrJPyLT4makdyHta/xu4CnhJTrf+KisPWuoE4 7Hf4apCOqJcB5BifrdMbg== X-UI-Out-Filterresults: notjunk:1;V03:K0:dIYtAp5mOo0=:YBZ4CeP7wVxQermArt03kQ xcLXo2oHFmjwgiDV4HxtTkgaNaRrW48MQHyxBIUJXA70zRDFO2XZSGOjYOKMDJjyvjhyTDyOc 4fVbJlOPQ7PYA/crTqhbY3Rm92OpOQ9slnqfiR33iV7el3OdvTjscdJhus35/5Xb5vTRhRCeu Ru2MQed/RV7odYYqt2tjaf74XHKDNo8EPimct9JTiM0BYj2OjmV0bXMoDN0l8lRafCU9e9l+X 0TCUN72wi2Dm2IjyQJfO4YFHKpoVXzNypfyUaft6HnDTMt1bZLnI3N703e2ra0oLTyEuQVYKh Kv+ewRZ81ozSH8kykpurHSH3Hbr1FKtVGeoWI34oDm/vr5IaY/QVGJ2z7SlkOtVnkqMxQ/tiO B2AWcoMx4Til69CZn/YQNmM3jcwVD8fNi9K3DjPjLVqpnq9fyC1wlW119BNNkphCjBDL7D11p 25CjFBGkSrGskbBkt3TO/IqhbRfgT7B5srhVuMqYOHkT6KKr4EtUPgFsC4n5yMFJwnepWSXn9 QgpPu8QzcbiOD2I/iXcR7gvYefYzb/m2617kteblLUB4+P7UBYlFidxCz33mldwEClDlBrgCA fp/rgBIfUv7UHPZVzwRN4yNJijegWcN5sWKavZENPquUihu30/SnRPRUMwkvW1xcY5h5Z8Qpu jO28s+1TvE0b6lUAsnof5M5J822twkH0X+ZVCYdByqnL294lBEUMePrRYoyVoM2qV6/oqrL1D KEhvUQA2WMCzJLha Received-SPF: none client-ip=212.227.126.134; envelope-from=h.goebel@crazy-compilers.com; helo=mout.kundenserver.de X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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/package/android.scm (android-platform-frameworks-native): New function. (android-platform-frameworks-native-headers): New variables. --- gnu/packages/android.scm | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/gnu/packages/android.scm b/gnu/packages/android.scm index 5fa4e6c8e9..226d8259ff 100644 --- a/gnu/packages/android.scm +++ b/gnu/packages/android.scm @@ -190,6 +190,17 @@ use their packages mostly unmodified in our Android NDK build system.") (base32 checksum)))) +(define (android-platform-frameworks-native version) + (origin + (method git-fetch) + (uri (git-reference + (url "https://android.googlesource.com/platform/frameworks/native") + (commit (string-append "android-" version)))) + (file-name (string-append "android-platform-frameworks-native-" + version "-checkout")) + (sha256 + (base32 "00dgx27wma7wzivniy8zyw2443fi2xx8gyxii081m0fwamqd3jrm")))) + (define-public android-liblog (package (name "android-liblog") @@ -728,6 +739,31 @@ it. to be passed to the @code{udev} service.") (license license:gpl3+))) +(define-public android-platform-frameworks-native-headers + (package + (name "android-platform-frameworks-native-headers") + (version (android-platform-version)) + (source (android-platform-frameworks-native version)) + (build-system trivial-build-system) + (arguments + `(#:modules ((guix build utils)) + #:builder + (begin + (use-modules (guix build utils)) + (let ((source (assoc-ref %build-inputs "source")) + (include (string-append %output "/include/android"))) + (mkdir-p include) + (copy-recursively (string-append source "/include/android") + (string-append include)) ; "/android")) + )))) + (home-page "https://android.googlesource.com/platform/frameworks/native/") + (synopsis "Headers for Android development from +android-platform-frameworks-native") + (description "This package contains headers used for developing software +for Android. More precicely the headers from include/android in +platform/frameworks/native.") + (license license:asl2.0))) + (define-public git-repo (package (name "git-repo") From patchwork Mon Dec 27 20:15:04 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hartmut Goebel X-Patchwork-Id: 35716 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 560BF27BBEA; Mon, 27 Dec 2021 20:17:19 +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 134D727BBE9 for ; Mon, 27 Dec 2021 20:17:19 +0000 (GMT) Received: from localhost ([::1]:47438 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n1wQo-0004Hd-5E for patchwork@mira.cbaines.net; Mon, 27 Dec 2021 15:17:18 -0500 Received: from eggs.gnu.org ([209.51.188.92]:43246) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n1wPd-00038A-GH for guix-patches@gnu.org; Mon, 27 Dec 2021 15:16:05 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:32842) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n1wPa-0002mf-Q4 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 1n1wPa-0001QZ-NH for guix-patches@gnu.org; Mon, 27 Dec 2021 15:16:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52832] [PATCH 2/3] gnu: Add libetc1. Resent-From: Hartmut Goebel Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 27 Dec 2021 20:16:02 +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.16406361155355 (code B ref 52832); Mon, 27 Dec 2021 20:16:02 +0000 Received: (at 52832) by debbugs.gnu.org; 27 Dec 2021 20:15:15 +0000 Received: from localhost ([127.0.0.1]:44377 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n1wOo-0001OJ-TX for submit@debbugs.gnu.org; Mon, 27 Dec 2021 15:15:15 -0500 Received: from mout.kundenserver.de ([212.227.126.135]:39245) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n1wOn-0001Nz-7y for 52832@debbugs.gnu.org; Mon, 27 Dec 2021 15:15:13 -0500 Received: from hermia.goebel-consult.de ([87.176.128.206]) by mrelayeu.kundenserver.de (mreue010 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MV5nC-1mtmur1wpi-00S5pK; Mon, 27 Dec 2021 21:15:07 +0100 Received: from lenashee.fritz.box (lenashee.goebel-consult.de [192.168.110.2]) by hermia.goebel-consult.de (Postfix) with ESMTP id A40D05F53C; Mon, 27 Dec 2021 21:15:15 +0100 (CET) From: Hartmut Goebel Date: Mon, 27 Dec 2021 21:15:04 +0100 Message-Id: <3ccef8196e2ff1c09293b09a419169a7839730d3.1640635865.git.h.goebel@crazy-compilers.com> 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:bf7xtfYFKmttPV+vVY4+gfOkAtgcIk2/MPFCiQ6rVfUlW4QVZ/+ PtxWfmG2WP/JcwGDBe1cfBgJzkRnY6T1gcFscEGpLVVQ+A26iiO/vN3kmmJYHnWI6TcoEWs FXgBW0Z24RYoxoDlK6fOuY8SLi2FDxOAXG6psTPBcZhfKNK6DIaYxrlT4eDZGurr3gByOMa qe0t07aIH8KS7YKB1r0WA== X-UI-Out-Filterresults: notjunk:1;V03:K0:99tgIf9rLSE=:TfJmhDW72eclRp/fOM0LS6 4vtOAH7n4CuLC4HvpNl/swTDxt8dPYN83rITe8rI0u6ckrTIX22CsQbUUtPQHb/G3XyuCDPkI cBEzlpXA9xJp16DPcpDfR7MY3Uy7rY9KvpMfMNC2NcyobTtnPz1dVPHgJIrjHpLbKYNsB+GXR OpL7KujRNbwyPDjeNqIDthdeQ8IlLSj7Mftrl6z4OWap66J+FD+ULel2YEvoMVrYm3Zs71RL4 9m411yAGkUU5dEPMTcRC+s4MY6Y5K0Co5kZxgjXSoJzo76YOqk0YMZgjQomna4xVKppyWAD0v WtVNn5PIZC3whmXXiUseeQG/yTY+gSWqqWL/0zUnzu4U5Zq7WjJ/pKL8owAk0slRbgV7avtDD I5oaByjTHYtA0vueACnRl4/EfLywf8THg5XGArr6QNdlLAd+KVLNuekXgQH6i0q/U+XC+ZrwQ 3fP0iFZVMa+hI1v90z0qJTMUY8xnPOk5H9iRTQTZX+reQgnBVCU5dP7nXphQfjMxW7HrZGDXQ y5LPHc2euQ7bKR54H5rCesvedIqdNAdcvqvIZ1RF1xUdbIHbEqo72Ch7DxOc6wptFNXfxoL/s yw3htSrmWPQU15lVmEEPpQ6YZp73ZSNsKHpy0ls1pEjW0RaVH2ZWa3xT9r8O5KX0YEQVOpv7p 88bqUV1I7WJAQNoSnt75MQVXR3PkkJdAjeLiajiwirWk+7glAlMPoszBhoyr4DUZBeBqgdlPn l2ooFpJVyrrf23On 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 (libetc1): New variable. --- gnu/packages/android.scm | 48 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/gnu/packages/android.scm b/gnu/packages/android.scm index 226d8259ff..31d388fd15 100644 --- a/gnu/packages/android.scm +++ b/gnu/packages/android.scm @@ -764,6 +764,54 @@ for Android. More precicely the headers from include/android in platform/frameworks/native.") (license license:asl2.0))) +(define-public libetc1 + (package + (name "libetc1") + (version (android-platform-version)) + (source (android-platform-frameworks-native version)) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ; no tests + #: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 = libETC1\n" + "SOURCES = opengl/libs/ETC1/etc1.cpp\n" + "CXXFLAGS += -fPIC\n" + "CPPFLAGS += -Iopengl/include\n" + "LDFLAGS += -shared -Wl,-soname,$(NAME).so.0\n" + "$(NAME).so.0: $(SOURCES)\n" + " $(CXX) $^ -o $@ $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS)\n" + "build: $(NAME).so.0")) + #t)))) + (add-after 'unpack 'remove-unused-stuff-to-reduce-warnings + (lambda _ + (delete-file-recursively "opengl/libs/tools"))) + (delete 'configure) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (lib (string-append out "/lib")) + (include (string-append out "/include"))) + (install-file "libETC1.so.0" lib) + (with-directory-excursion lib + (symlink "libETC1.so.0" "libETC1.so")) + (copy-recursively "opengl/include/ETC1" + (string-append include "/ETC1")))))))) + (home-page "https://android.googlesource.com/platform/frameworks/native/") + (synopsis "ETC1 compression library") + (description "Ericsson Texture Compression (ETC) is a lossy texture +compression technique developed in collaboration with Ericsson Research in +early 2005. libETC1 provides the encoding and decoding of ETC1 compression +algorithm.") + (license license:asl2.0))) + (define-public git-repo (package (name "git-repo") 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")