From debbugs-submit-bounces@debbugs.gnu.org Sat Mar 18 11:54:28 2017 Received: (at submit) by debbugs.gnu.org; 18 Mar 2017 15:54:28 +0000 Received: from localhost ([127.0.0.1]:34111 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cpGgR-0001ly-0j for submit@debbugs.gnu.org; Sat, 18 Mar 2017 11:54:28 -0400 Received: from eggs.gnu.org ([208.118.235.92]:48741) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cpGgP-0001ll-51 for submit@debbugs.gnu.org; Sat, 18 Mar 2017 11:54:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cpGgJ-00086A-1o for submit@debbugs.gnu.org; Sat, 18 Mar 2017 11:54:16 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50,FREEMAIL_FROM, T_DKIM_INVALID autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:51127) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cpGgI-000864-V2 for submit@debbugs.gnu.org; Sat, 18 Mar 2017 11:54:14 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39709) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cpGgH-0000sC-Km for guix-patches@gnu.org; Sat, 18 Mar 2017 11:54:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cpGgD-00085S-M5 for guix-patches@gnu.org; Sat, 18 Mar 2017 11:54:13 -0400 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:55264) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cpGgD-000858-2k for guix-patches@gnu.org; Sat, 18 Mar 2017 11:54:09 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id C0C752086D; Sat, 18 Mar 2017 11:54:06 -0400 (EDT) Received: from frontend2 ([10.202.2.161]) by compute5.internal (MEProxy); Sat, 18 Mar 2017 11:54:06 -0400 DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=fastmail.com; h=cc :content-transfer-encoding:content-type:date:from:message-id :mime-version:subject:to:x-me-sender:x-me-sender:x-sasl-enc :x-sasl-enc; s=fm1; bh=LoZNGkuk2YVe+mqXJT8kitS3xUI=; b=h4uqC4EWx kl4YZPQf1zpq1tgR7cK6YcigEBlXKyYAy+cL6wa/8Unx4i7FjI8nKWfhtWKgXCGw gl/PJGR0nmth3QK4y+fe3nutqPX2E/dALMePbAVz+eklTG903DvbhFa3JQXuZsNQ hLvwsUpGycPwod+L6kKkF6AjAWHf6+Pudyh/tA4+gJhzF+0lsi39+iVqy1/ISnnB k/TpMNRKK4HUfqW585DFG3bDr+/rQgXBGYCWuRCivcqMpr8GwAUeIquVCiK1rd4H 8D1wX29WP6pVb4rFPKxdbGx+zoe/l8XaTkgy/gc8MFwqt+6bvSPbA8qY6KbiVw5/ 5R44xnv6SjX1A== DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:from:message-id:mime-version:subject:to:x-me-sender :x-me-sender:x-sasl-enc:x-sasl-enc; s=fm1; bh=LoZNGkuk2YVe+mqXJT 8kitS3xUI=; b=eai4itKh7mK4jPlPAV0mDtyfkM3j8TN7ps+ABfVhaSY2ggSxCE VgQNV4+G38FVk3vGDh4uSf0LiCfCjK2D3/JyUzMjjlGOGiXDg/wl6bocmrHIJAWc F2dKzmqEzD2b0x7/G30k01DDzGz1UW6xkgZqGqpOW/uWfoA5lkeA2H1HF5UTiADU 7li92OfVP0nfPyxCXnm2oqXUlAsC8Nhl6kAOPbdwzKKFq1ajyM9l373TpomUWFQr Nn+HYCio5D4iY41Df7EsxY3aGlTNR7vIo9MsbLXG/DqWJRcrfhkJjADEy1D/OwO+ ciNsaRH05cR2WVGXBYfGcu04t/PHoNBvUYtg== X-ME-Sender: X-Sasl-enc: rzhNeprxvr6Q/eLOStpQsxfNDlZTmQW9spAnUX+/NkWn 1489852446 Received: from localhost (unknown [188.113.81.93]) by mail.messagingengine.com (Postfix) with ESMTPA id 4AC592445F; Sat, 18 Mar 2017 11:54:06 -0400 (EDT) From: Marius Bakke To: guix-patches@gnu.org Subject: [PATCH 1/2] gnu: Add fmt. Date: Sat, 18 Mar 2017 16:54:01 +0100 Message-Id: <20170318155401.28887-1-mbakke@fastmail.com> X-Mailer: git-send-email 2.12.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -4.4 (----) X-Debbugs-Envelope-To: submit Cc: Marius Bakke X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.6 (/) * gnu/packages/pretty-print.scm (fmt): New variable. --- gnu/packages/pretty-print.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/pretty-print.scm b/gnu/packages/pretty-print.scm index 8819b8ada..6987de1b1 100644 --- a/gnu/packages/pretty-print.scm +++ b/gnu/packages/pretty-print.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2014 Eric Bavier ;;; Copyright © 2016 Efraim Flashner ;;; Copyright © 2016 Ricardo Wurmus +;;; Copyright © 2017 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -22,6 +23,7 @@ #:use-module (guix packages) #:use-module (guix licenses) #:use-module (guix download) + #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) #:use-module (gnu packages) #:use-module (gnu packages ghostscript) @@ -147,6 +149,29 @@ It also includes the capability to perform syntax highlighting for several different programming languages.") (license gpl3+))) +(define-public fmt + (package + (name "fmt") + (version "3.0.1") + (source (origin + (method url-fetch) + (uri (string-append + "https://github.com/fmtlib/fmt/archive/" + version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1bavqm4jr16fv5crs5l2lgpffdbd2vmlydlq78sx878nbavjmrnw")))) + (build-system cmake-build-system) + (home-page "http://fmtlib.net/latest/") + (synopsis "Small, safe and fast C++ formatting library") + (description + "@code{fmt} (formerly @code{cppformat}) is a formatting library for C++. +It can be used as a safe alternative to @code{printf} or as a fast alternative +to @code{IOStreams}.") + ;; The library is bsd-2, but documentation and tests include other licenses. + (license (list bsd-2 bsd-3 psfl)))) + (define-public source-highlight (package (name "source-highlight") -- 2.12.0 From debbugs-submit-bounces@debbugs.gnu.org Sat Mar 18 11:56:35 2017 Received: (at 26157) by debbugs.gnu.org; 18 Mar 2017 15:56:35 +0000 Received: from localhost ([127.0.0.1]:34119 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cpGiR-0001pp-Mh for submit@debbugs.gnu.org; Sat, 18 Mar 2017 11:56:34 -0400 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:58831) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cpGiQ-0001ph-1s for 26157@debbugs.gnu.org; Sat, 18 Mar 2017 11:56:27 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 432C92089E; Sat, 18 Mar 2017 11:56:25 -0400 (EDT) Received: from frontend2 ([10.202.2.161]) by compute5.internal (MEProxy); Sat, 18 Mar 2017 11:56:25 -0400 DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=fastmail.com; h=cc :content-transfer-encoding:content-type:date:from:message-id :mime-version:subject:to:x-me-sender:x-me-sender:x-sasl-enc :x-sasl-enc; s=fm1; bh=rnfZunmF0BGi9AdvkcbinPYYGFc=; b=yAjWuic0b iGjHKf3RNQ8mVhZnaSov16XGD87qZ8FOGqYDfck+JaySFK9LWveQdgksRMTgFHVk +yMIrl1WZaoS4QWPLrB8QITqCrYZWgZKaWf21Uwxw2h2Tp7RPD05Ly6FCM+ggqOc iSNi/d1C41nHEB+hdAnNkD04HYQAD0rfbTcL/vadEoDEA/gohqqb9UjH9zncX1qC /D2vjCFeTsmLPo8C9poC7CtSCn/vR+5kY5rIOh8sCham4VNDZpL6tmQhHsw9uJLL f5GhgU5JDU2N4umKxdX5+KCVctbGfHzBMlLxarNHZVfvpTl/qryu4vf2pVlef/ME AB+N7pTzLXk5Q== DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:from:message-id:mime-version:subject:to:x-me-sender :x-me-sender:x-sasl-enc:x-sasl-enc; s=fm1; bh=rnfZunmF0BGi9Advkc binPYYGFc=; b=EqJg/0oGB7Nq9/2wmcVYDRe0QhUXNfOgDtR91TLoBZ5QsLrySI j0DrTIAXPL+abGYaBGm204RbuvfE3JgBqN3f9jrE0XNjL4Ff24imrNUtWOJaK/53 tFAGgBHMKOgyhnhN3PVJIqDwDcNcBpoxQds0VjRcZDT/6ndXJQHz+eor2xj+iQiJ 9gwxa34SyyE+BwrbHfjmYK1/YiYFHZ3iVpJamS/8NyBbI0hHIr34+H575FuWZ/bI tXBM0jlTCLUNeKJtHDMk5wBUwkN6aeLa/tDcTQJKQlSL4DrCl1QpBbaiOT7BCwlC hjKPLP6kC1EfyxhIECG7JRVu5lKg5N5W4nxw== X-ME-Sender: X-Sasl-enc: KTmyRfKbZU+jVtfD9+W4vPe0S7RgVIxMTI0KqWzeSNcf 1489852584 Received: from localhost (unknown [188.113.81.93]) by mail.messagingengine.com (Postfix) with ESMTPA id C4E932436A; Sat, 18 Mar 2017 11:56:24 -0400 (EDT) From: Marius Bakke To: 26157@debbugs.gnu.org Subject: [PATCH 2/2] gnu: kodi: Update to 18.0_alpha-0-4912f8f. Date: Sat, 18 Mar 2017 16:56:22 +0100 Message-Id: <20170318155622.29262-1-mbakke@fastmail.com> X-Mailer: git-send-email 2.12.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 26157 Cc: Marius Bakke X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.0 (/) * gnu/packages/kodi.scm (libdvdnav/kodi, libdvdread/kodi, libdvdcss/kodi): New variables. (kodi): Update to 18.0_alpha-0-4912f8f. [source]: Download from git. Unbundle more stuff. [build-system]: Change to CMAKE-BUILD-SYSTEM. [arguments]: Add #:configure-flag to disable nonfree components. Rework phases to patch bundled software and bootstrap more libraries. [native-inputs]: Remove CMAKE. Add LIBDVDCSS/KODI, LIBDVDNAV/KODI and LIBDVDREAD/KODI. [inputs]: Remove BOOST, BZIP2, ENCA, GPERF, JASPER, LIBMODPLUG, LIBSAMPLERATE, MESA-UTILS and SDL2. Add FMT, GIFLIB, LCMS and LIBDRM. [license]: Update for remaining software bundles. --- gnu/packages/kodi.scm | 274 +++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 213 insertions(+), 61 deletions(-) diff --git a/gnu/packages/kodi.scm b/gnu/packages/kodi.scm index 929894d61..5843b99a6 100644 --- a/gnu/packages/kodi.scm +++ b/gnu/packages/kodi.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015 David Thompson +;;; Copyright © 2017 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -22,13 +23,13 @@ #:use-module (guix packages) #:use-module (guix download) #:use-module (guix git-download) + #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) #:use-module (gnu packages algebra) #:use-module (gnu packages audio) #:use-module (gnu packages autotools) #:use-module (gnu packages avahi) #:use-module (gnu packages base) - #:use-module (gnu packages boost) #:use-module (gnu packages cdrom) #:use-module (gnu packages cmake) #:use-module (gnu packages compression) @@ -52,6 +53,7 @@ #:use-module (gnu packages mp3) #:use-module (gnu packages pcre) #:use-module (gnu packages pkg-config) + #:use-module (gnu packages pretty-print) #:use-module (gnu packages pulseaudio) #:use-module (gnu packages python) #:use-module (gnu packages samba) @@ -119,88 +121,235 @@ generator library for C++.") (home-page "https://github.com/graeme-hill/crossguid") (license license:expat)))) +;; Kodi requires special forks of these libraries. In addition, +;; it insists on downloading and building these as part of the +;; standard build process. To make things easier, we bootstrap +;; them here, so we don't have to worry about it later. +(define libdvdnav/kodi + (let ((commit "981488f7f27554b103cca10c1fbeba027396c94a")) + (package + (name "libdvdnav-bootstrapped") + (version commit) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/xbmc/libdvdnav.git") + (commit commit))) + (file-name (string-append name "-" version "-checkout")) + (sha256 + (base32 + "089pswc51l3avh95zl4cpsh7gh1innh7b2y4xgx840mcmy46ycr8")))) + (build-system gnu-build-system) + (arguments + '(#:tests? #f + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'bootstrap + (lambda _ (zero? (system* "autoreconf" "-vif")))) + (delete 'configure) + (delete 'build) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (copy-recursively "." (assoc-ref outputs "out")) + #t))))) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("libtool" ,libtool) + ("pkg-config" ,pkg-config))) + (home-page "https://github.com/xbmc/libdvdnav") + (synopsis (package-synopsis libdvdnav)) + (description (package-description libdvdnav)) + (license license:gpl2+)))) + +(define libdvdread/kodi + (let ((commit "17d99db97e7b8f23077b342369d3c22a6250affd")) + (package + (name "libdvdread-bootstrapped") + (version commit) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/xbmc/libdvdread.git") + (commit commit))) + (file-name (string-append name "-" version "-checkout")) + (sha256 + (base32 + "1gr5aq1cjr3as9mnwrw29cxn4m6f6pfrxdahkdcjy70q3ldg90sl")))) + (build-system gnu-build-system) + (arguments + '(#:tests? #f + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'bootstrap + (lambda _ (zero? (system* "autoreconf" "-vif")))) + (delete 'configure) + (delete 'build) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (copy-recursively "." (assoc-ref outputs "out")) + #t))))) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("libtool" ,libtool) + ("pkg-config" ,pkg-config))) + (home-page "https://github.com/xbmc/libdvdread") + (synopsis (package-synopsis libdvdread)) + (description (package-description libdvdread)) + (license (list license:gpl2+ license:lgpl2.1+))))) + +(define libdvdcss/kodi + (let ((commit "2f12236bc1c92f73c21e973363f79eb300de603f")) + (package + (name "libdvdcss-bootstrapped") + (version commit) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/xbmc/libdvdcss.git") + (commit commit))) + (file-name (string-append name "-" version "-checkout")) + (sha256 + (base32 + "198r0q73i55ga1dvyqq9nfcri0zq08b94hy8671lg14i3izx44dd")))) + (build-system gnu-build-system) + (arguments + '(#:tests? #f + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'bootstrap + (lambda _ (zero? (system* "autoreconf" "-vif")))) + (delete 'configure) + (delete 'build) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (copy-recursively "." (assoc-ref outputs "out")) + #t))))) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("libtool" ,libtool) + ("pkg-config" ,pkg-config))) + (home-page "https://github.com/xbmc/libdvdcss") + (synopsis (package-synopsis libdvdcss)) + (description (package-description libdvdcss)) + (license license:gpl2+)))) + (define-public kodi + ;; We package the git version since the current released + ;; version was cut while the cmake transition was in turmoil. + (let ((commit "4912f8f868e0847a8a26158e18185c43c2f0e197") + (revision "0")) (package (name "kodi") - (version "16.0") + (version (string-append "18.0_alpha-" revision "-" (string-take commit 7))) (source (origin - (method url-fetch) - (uri (string-append "http://mirrors.kodi.tv/releases/source/" - version "-Jarvis.tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/xbmc/xbmc.git") + (commit commit))) + (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "0iirspvv7czf785l2lqf232dvdaj87srbn9ni97ngvnd6w9yl884")) + "1z5daiwjbij5df2fbxwnxfpprzr05f8fxmx0zjqd1r98ih6yc52r")) (snippet - ;; Delete bundled ffmpeg. - ;; TODO: Delete every other bundled library. '(begin (use-modules (guix build utils)) - (delete-file-recursively "tools/depends/target/ffmpeg"))) + (for-each delete-file-recursively + '("project/BuildDependencies/bin/" + ;; TODO: Purge these jars. + ;;"tools/codegenerator/groovy" + ;; And these sources: + ;; "tools/depend/native/JsonSchemaBuilder" + ;; "tools/depend/native/TexturePacker" + ;; "lib/LibUPnP" + ;; "lib/UnrarXlib" + ;; "lib/gtest" + ;; "lib/cpluff" + ;; "lib/libexif" + "project/Win32BuildSetup/tools/7z")) + #t)) (modules '((guix build utils))))) - (build-system gnu-build-system) + (build-system cmake-build-system) (arguments - '(#:configure-flags '("--with-ffmpeg=shared") ; don't use bundled ffmpeg + '(#:configure-flags + (list "-DENABLE_INTERNAL_FFMPEG=OFF" + "-DENABLE_INTERNAL_CROSSGUID=OFF" + (string-append "-Dlibdvdread_URL=" + (assoc-ref %build-inputs "libdvdread-bootstrapped")) + (string-append "-Dlibdvdnav_URL=" + (assoc-ref %build-inputs "libdvdnav-bootstrapped")) + (string-append "-Dlibdvdcss_URL=" + (assoc-ref %build-inputs "libdvdcss-bootstrapped")) + "-DENABLE_NONFREE=OFF") #:phases (modify-phases %standard-phases - ;; JsonSchemaBuilder is a small tool needed by the build system that - ;; comes bundled with the source. The build system tries to build it - ;; during the bootstrapping phase, which causes serious issues + ;; The build system tries to bootstrap these components + ;; during the build phase, which causes serious issues ;; because there's no time for shebangs to be patched. So, we ;; bootstrap it on our own instead. - (add-after 'unpack 'bootstrap-jsonschemabuilder - (lambda* (#:key inputs #:allow-other-keys) - (let ((dir "tools/depends/native/JsonSchemaBuilder/src")) - (with-directory-excursion dir - (zero? (system* "sh" "autogen.sh")))))) - ;; Now we can do the regular bootstrapping process, but only after - ;; the first round of shebang patching. We must repeat the patching - ;; after bootstrapping so that all of the files generated by the - ;; Autotools et al. are patched appropriately. - (add-after 'patch-source-shebangs 'bootstrap + (add-after 'unpack 'bootstrap-bundled-software (lambda* (#:key inputs #:allow-other-keys) - ;; We bootstrapped JsonSchemaBuilder in the previous phase, so we - ;; need to make sure it isn't done a second time. Otherwise, it - ;; would undo the shebang patching that we worked so hard for. - (substitute* '("tools/depends/native/JsonSchemaBuilder/Makefile") - (("\\./autogen\\.sh") "")) - ;; This essentially does what their 'bootstrap' script does, but - ;; additionally passes the correct CONFIG_SHELL. - (let ((bash (string-append (assoc-ref inputs "bash") "/bin/sh"))) - (define (run-make makefile) - (zero? (system* "make" "-f" makefile - "BOOTSTRAP_STANDALONE=1" - (string-append "CONFIG_SHELL=" bash)))) - (and (run-make "bootstrap.mk") - (run-make "codegenerator.mk"))))) - (add-after 'bootstrap 'patch-source-shebangs-again - (assoc-ref %standard-phases 'patch-source-shebangs)) - ;; 3 tests fail that appear harmless, so we disable them. - (add-before 'check 'disable-some-tests + (let ((dirs '("tools/depends/native/JsonSchemaBuilder/src" + "lib/cpluff"))) + (for-each (lambda (third-party) + (with-directory-excursion third-party + (zero? (system* "autoreconf" "-vif")))) + dirs)))) + (add-after 'bootstrap-bundled-software 'patch-stuff (lambda _ + ;; Prevent the build scripts from calling autoreconf in + ;; the build stage. Otherwise, it would undo the careful + ;; bootstrapping that we've worked so hard for. + (substitute* "cmake/modules/FindLibDvd.cmake" + ;; Let's also use this opportunity to make the freshly + ;; unpackaged source directory writable. + (("autoreconf -vif") "chmod -R u+w .")) + (substitute* "cmake/modules/FindCpluff.cmake" + (("autoreconf -vif") "true")) + (substitute* "lib/cpluff/po/Makefile.in.in" + (("/bin/sh") (which "sh"))) + + ;; Let's disable some tests that are known not to work here. + ;; Doing this later while in the cmake "../build" directory + ;; is trickier. (substitute* '("xbmc/utils/test/TestSystemInfo.cpp") (("TEST_F\\(TestSystemInfo, GetOsPrettyNameWithVersion\\)") "TEST_F(TestSystemInfo, DISABLED_GetOsPrettyNameWithVersion)") (("TEST_F\\(TestSystemInfo, GetOsName\\)") "TEST_F(TestSystemInfo, DISABLED_GetOsName)") (("TEST_F\\(TestSystemInfo, GetOsVersion\\)") - "TEST_F(TestSystemInfo, DISABLED_GetOsVersion)"))))))) + "TEST_F(TestSystemInfo, DISABLED_GetOsVersion)")) + ;; FIXME: Why are these failing. + (substitute* "xbmc/network/test/TestWebServer.cpp" + (("TEST_F\\(TestWebServer, Can") + "TEST_F(TestWebServer, DISABLED_Can")) + #t)) + (add-before 'build 'set-build-environment + (lambda _ + ;; Some bundled build script falls back to /bin/sh + ;; if this is not set. + (setenv "CONFIG_SHELL" (which "sh")) + #t)) + (add-before 'check 'build-kodi-test + (lambda _ + (zero? (system* "make" "kodi-test"))))))) ;; TODO: Add dependencies for: - ;; - vdpau ;; - nfs - ;; - ;; FIXME: libusb detection fails. - ;; - ;; FIXME: As you can see, we use a lot of external libraries, but it seems - ;; that a few bundled ones are still being used. + ;; - cec + ;; - plist + ;; - shairplay (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake) - ("cmake" ,cmake) ("doxygen" ,doxygen) ("gawk" ,gawk) ("gettext" ,gettext-minimal) ("icedtea" ,icedtea) ; needed at build-time only, mandatory + ("libdvdcss-bootstrapped" ,libdvdcss/kodi) + ("libdvdnav-bootstrapped" ,libdvdnav/kodi) + ("libdvdread-bootstrapped" ,libdvdread/kodi) ("libtool" ,libtool) ("pkg-config" ,pkg-config) ("swig" ,swig) @@ -210,38 +359,35 @@ generator library for C++.") `(("alsa-lib" ,alsa-lib) ("avahi" ,avahi) ("bluez" ,bluez) - ("boost" ,boost) - ("bzip2" ,bzip2) ("crossguid" ,crossguid) ("curl" ,curl) ("dcadec" ,dcadec) ("dbus" ,dbus) - ("enca" ,enca) ("eudev" ,eudev) ("ffmpeg" ,ffmpeg) ("flac" ,flac) + ("fmt" ,fmt) ("fontconfig" ,fontconfig) ("freetype" ,freetype) ("fribidi" ,fribidi) + ("giflib" ,giflib) ("glew" ,glew) ("gnutls" ,gnutls) - ("gperf" ,gperf) - ("jasper" ,jasper) ("lame" ,lame) + ("lcms" ,lcms) ("libass" ,libass) ("libbluray" ,libbluray) ("libcap" ,libcap) ("libcdio" ,libcdio) + ("libdrm" ,libdrm) ("libgcrypt" ,libgcrypt) ("libjpeg" ,libjpeg) ("libltdl" ,libltdl) ("libmad" ,libmad) ("libmicrohttpd" ,libmicrohttpd) - ("libmodplug" ,libmodplug) ("libmpeg2" ,libmpeg2) ("libogg" ,libogg) ("libpng" ,libpng) - ("libsamplerate" ,libsamplerate) ("libssh" ,libssh) ("libtiff" ,libtiff) ("libva" ,libva) @@ -254,14 +400,12 @@ generator library for C++.") ("libxt" ,libxt) ("libyajl" ,libyajl) ("lzo" ,lzo) - ("mesa-utils" ,mesa-utils) ("mysql" ,mysql) ("openssl" ,openssl) ("pcre" ,pcre) ("pulseaudio" ,pulseaudio) ("python" ,python-2) ("samba" ,samba) - ("sdl2" ,sdl2) ("sqlite" ,sqlite) ("taglib" ,taglib) ("tinyxml" ,tinyxml) @@ -274,4 +418,12 @@ generator library for C++.") music, games, etc. Kodi is highly customizable and features a theme and plug-in system.") (home-page "http://kodi.tv") - (license license:gpl2+))) + ;; XBMC is largely GPL2+, with some library components as + ;; LGPL2.1+, but the source code is littered with one-off + ;; licensed files. + (license (list license:gpl2+ license:lgpl2.1+ + license:gpl3+ ;WiiRemote client + license:expat ;cpluff, dbwrappers + license:public-domain ;cpluff/examples + license:bsd-3 ;misc + license:bsd-2))))) ;xbmc/freebsd -- 2.12.0 From debbugs-submit-bounces@debbugs.gnu.org Sat Mar 18 12:01:15 2017 Received: (at 26157) by debbugs.gnu.org; 18 Mar 2017 16:01:15 +0000 Received: from localhost ([127.0.0.1]:34129 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cpGmz-0001zL-4A for submit@debbugs.gnu.org; Sat, 18 Mar 2017 12:01:15 -0400 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:36200) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cpGmx-0001zE-Tj for 26157@debbugs.gnu.org; Sat, 18 Mar 2017 12:01:08 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 0117820789 for <26157@debbugs.gnu.org>; Sat, 18 Mar 2017 12:01:06 -0400 (EDT) Received: from frontend2 ([10.202.2.161]) by compute5.internal (MEProxy); Sat, 18 Mar 2017 12:01:05 -0400 DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=fastmail.com; h= content-type:date:from:message-id:mime-version:subject:to :x-me-sender:x-me-sender:x-sasl-enc:x-sasl-enc; s=fm1; bh=Ho/Fih oaCLi3F8TtzfuavDYklJU=; b=pongO8VbimbmqzmRKnGdYLjL9EgC3jWJ/wtyqn OIrI3Y8ws1TXV0HbXkHH3vv2JLJUriuvCsyg1w+3wk3O21eUAFsTNqAopPWr9oi6 /O7RWXivdSp/vUQj3kAa/NyqgrcVOXYjJIOjLj5ZHghQx8Hw5wSdb2yjUfGg8X2V omcyPK+CSOBu/K9Sr+pFEM22xdDOIufBvCOu2E/ZTDKEpskAJseoTJqA3GN1OPuz 1LB0haVYO/hv5E7JoOwzPBYx5dG9eAsz8oSdk/b4HTIc9v+6ZfxNUAXzLLu1D3np lUb0ejTKyVgVc8xs2ZSzrxOAK/rmcmoPSkQtvdfzBYkK+gUg== DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d= messagingengine.com; h=content-type:date:from:message-id :mime-version:subject:to:x-me-sender:x-me-sender:x-sasl-enc :x-sasl-enc; s=fm1; bh=Ho/FihoaCLi3F8TtzfuavDYklJU=; b=gyDqodjru LWBrY7WflA/uuLumd7QIxVi8uyn4Gmw5LYsq7P8iBV/4Iv1u+fCvu1ocUoaOU8iQ cjZ0XwZreoazggHBkNtbOd/N251sl8PCQXGRqBa2i3fFvmRQ0iPg88KOXhttV8FY ooF6w0CvpIBJE0EhJ9DpYwNjaRiXA/4p/Fj0vXH9H34ptzkSF8UJz9VX07Ru+t33 f1srPqBbWMvqkBQBkRTKCImOxwYtdsX2fXHZUnKF/tfl4oNwccvMlV+6ssWZt2RP Zm8dqVlboRwWIZLODtKQROkLWy8oPbqfxX3Oql836SzHQK+QY8dpzD/cbGAfj1gG CIQM7D+KZVD7w== X-ME-Sender: X-Sasl-enc: 1wFqeSbS/zX0GGp1BjDaAzgSbrIUwlsY51jcWmqBjGha 1489852865 Received: from localhost (unknown [188.113.81.93]) by mail.messagingengine.com (Postfix) with ESMTPA id 8586224335 for <26157@debbugs.gnu.org>; Sat, 18 Mar 2017 12:01:05 -0400 (EDT) From: Marius Bakke To: 26157@debbugs.gnu.org Subject: Patch 2/2 User-Agent: Notmuch/0.24 (https://notmuchmail.org) Emacs/25.1.1 (x86_64-unknown-linux-gnu) Date: Sat, 18 Mar 2017 17:01:03 +0100 Message-ID: <87lgs27eww.fsf@kirby.i-did-not-set--mail-host-address--so-tickle-me> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 26157 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.0 (/) --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain Debbugs seems to sporadically drop patches sent throught `git send-email`. Let's try attachment. --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: attachment; filename=0002-gnu-kodi-Update-to-18.0_alpha-0-4912f8f.patch Content-Transfer-Encoding: quoted-printable From=20dc21c0c6786336643b765ba1c40b79eb3d9ff3db Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 3 Mar 2017 02:19:14 +0100 Subject: [PATCH 2/2] gnu: kodi: Update to 18.0_alpha-0-4912f8f. * gnu/packages/kodi.scm (libdvdnav/kodi, libdvdread/kodi, libdvdcss/kodi): = New variables. (kodi): Update to 18.0_alpha-0-4912f8f. [source]: Download from git. Unbundle more stuff. [build-system]: Change to CMAKE-BUILD-SYSTEM. [arguments]: Add #:configure-flag to disable nonfree components. Rework pha= ses to patch bundled software and bootstrap more libraries. [native-inputs]: Remove CMAKE. Add LIBDVDCSS/KODI, LIBDVDNAV/KODI and LIBDVDREAD/KODI. [inputs]: Remove BOOST, BZIP2, ENCA, GPERF, JASPER, LIBMODPLUG, LIBSAMPLERA= TE, MESA-UTILS and SDL2. Add FMT, GIFLIB, LCMS and LIBDRM. [license]: Update for remaining software bundles. =2D-- gnu/packages/kodi.scm | 274 +++++++++++++++++++++++++++++++++++++++-------= ---- 1 file changed, 213 insertions(+), 61 deletions(-) diff --git a/gnu/packages/kodi.scm b/gnu/packages/kodi.scm index 929894d61..5843b99a6 100644 =2D-- a/gnu/packages/kodi.scm +++ b/gnu/packages/kodi.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright =C2=A9 2015 David Thompson +;;; Copyright =C2=A9 2017 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -22,13 +23,13 @@ #:use-module (guix packages) #:use-module (guix download) #:use-module (guix git-download) + #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) #:use-module (gnu packages algebra) #:use-module (gnu packages audio) #:use-module (gnu packages autotools) #:use-module (gnu packages avahi) #:use-module (gnu packages base) =2D #:use-module (gnu packages boost) #:use-module (gnu packages cdrom) #:use-module (gnu packages cmake) #:use-module (gnu packages compression) @@ -52,6 +53,7 @@ #:use-module (gnu packages mp3) #:use-module (gnu packages pcre) #:use-module (gnu packages pkg-config) + #:use-module (gnu packages pretty-print) #:use-module (gnu packages pulseaudio) #:use-module (gnu packages python) #:use-module (gnu packages samba) @@ -119,88 +121,235 @@ generator library for C++.") (home-page "https://github.com/graeme-hill/crossguid") (license license:expat)))) =20 +;; Kodi requires special forks of these libraries. In addition, +;; it insists on downloading and building these as part of the +;; standard build process. To make things easier, we bootstrap +;; them here, so we don't have to worry about it later. +(define libdvdnav/kodi + (let ((commit "981488f7f27554b103cca10c1fbeba027396c94a")) + (package + (name "libdvdnav-bootstrapped") + (version commit) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/xbmc/libdvdnav.git") + (commit commit))) + (file-name (string-append name "-" version "-checkout")) + (sha256 + (base32 + "089pswc51l3avh95zl4cpsh7gh1innh7b2y4xgx840mcmy46ycr8"))= )) + (build-system gnu-build-system) + (arguments + '(#:tests? #f + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'bootstrap + (lambda _ (zero? (system* "autoreconf" "-vif")))) + (delete 'configure) + (delete 'build) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (copy-recursively "." (assoc-ref outputs "out")) + #t))))) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("libtool" ,libtool) + ("pkg-config" ,pkg-config))) + (home-page "https://github.com/xbmc/libdvdnav") + (synopsis (package-synopsis libdvdnav)) + (description (package-description libdvdnav)) + (license license:gpl2+)))) + +(define libdvdread/kodi + (let ((commit "17d99db97e7b8f23077b342369d3c22a6250affd")) + (package + (name "libdvdread-bootstrapped") + (version commit) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/xbmc/libdvdread.git") + (commit commit))) + (file-name (string-append name "-" version "-checkout")) + (sha256 + (base32 + "1gr5aq1cjr3as9mnwrw29cxn4m6f6pfrxdahkdcjy70q3ldg90sl"))= )) + (build-system gnu-build-system) + (arguments + '(#:tests? #f + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'bootstrap + (lambda _ (zero? (system* "autoreconf" "-vif")))) + (delete 'configure) + (delete 'build) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (copy-recursively "." (assoc-ref outputs "out")) + #t))))) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("libtool" ,libtool) + ("pkg-config" ,pkg-config))) + (home-page "https://github.com/xbmc/libdvdread") + (synopsis (package-synopsis libdvdread)) + (description (package-description libdvdread)) + (license (list license:gpl2+ license:lgpl2.1+))))) + +(define libdvdcss/kodi + (let ((commit "2f12236bc1c92f73c21e973363f79eb300de603f")) + (package + (name "libdvdcss-bootstrapped") + (version commit) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/xbmc/libdvdcss.git") + (commit commit))) + (file-name (string-append name "-" version "-checkout")) + (sha256 + (base32 + "198r0q73i55ga1dvyqq9nfcri0zq08b94hy8671lg14i3izx44dd"))= )) + (build-system gnu-build-system) + (arguments + '(#:tests? #f + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'bootstrap + (lambda _ (zero? (system* "autoreconf" "-vif")))) + (delete 'configure) + (delete 'build) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (copy-recursively "." (assoc-ref outputs "out")) + #t))))) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("libtool" ,libtool) + ("pkg-config" ,pkg-config))) + (home-page "https://github.com/xbmc/libdvdcss") + (synopsis (package-synopsis libdvdcss)) + (description (package-description libdvdcss)) + (license license:gpl2+)))) + (define-public kodi + ;; We package the git version since the current released + ;; version was cut while the cmake transition was in turmoil. + (let ((commit "4912f8f868e0847a8a26158e18185c43c2f0e197") + (revision "0")) (package (name "kodi") =2D (version "16.0") + (version (string-append "18.0_alpha-" revision "-" (string-take commit= 7))) (source (origin =2D (method url-fetch) =2D (uri (string-append "http://mirrors.kodi.tv/releases/sourc= e/" =2D version "-Jarvis.tar.gz")) =2D (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/xbmc/xbmc.git") + (commit commit))) + (file-name (string-append name "-" version "-checkout")) (sha256 (base32 =2D "0iirspvv7czf785l2lqf232dvdaj87srbn9ni97ngvnd6w9yl884")) + "1z5daiwjbij5df2fbxwnxfpprzr05f8fxmx0zjqd1r98ih6yc52r")) (snippet =2D ;; Delete bundled ffmpeg. =2D ;; TODO: Delete every other bundled library. '(begin (use-modules (guix build utils)) =2D (delete-file-recursively "tools/depends/target/ffmpeg"= ))) + (for-each delete-file-recursively + '("project/BuildDependencies/bin/" + ;; TODO: Purge these jars. + ;;"tools/codegenerator/groovy" + ;; And these sources: + ;; "tools/depend/native/JsonSchemaBuilder" + ;; "tools/depend/native/TexturePacker" + ;; "lib/LibUPnP" + ;; "lib/UnrarXlib" + ;; "lib/gtest" + ;; "lib/cpluff" + ;; "lib/libexif" + "project/Win32BuildSetup/tools/7z")) + #t)) (modules '((guix build utils))))) =2D (build-system gnu-build-system) + (build-system cmake-build-system) (arguments =2D '(#:configure-flags '("--with-ffmpeg=3Dshared") ; don't use bundled= ffmpeg + '(#:configure-flags + (list "-DENABLE_INTERNAL_FFMPEG=3DOFF" + "-DENABLE_INTERNAL_CROSSGUID=3DOFF" + (string-append "-Dlibdvdread_URL=3D" + (assoc-ref %build-inputs "libdvdread-bootstrap= ped")) + (string-append "-Dlibdvdnav_URL=3D" + (assoc-ref %build-inputs "libdvdnav-bootstrapp= ed")) + (string-append "-Dlibdvdcss_URL=3D" + (assoc-ref %build-inputs "libdvdcss-bootstrapp= ed")) + "-DENABLE_NONFREE=3DOFF") #:phases (modify-phases %standard-phases =2D ;; JsonSchemaBuilder is a small tool needed by the build system= that =2D ;; comes bundled with the source. The build system tries to bu= ild it =2D ;; during the bootstrapping phase, which causes serious issues + ;; The build system tries to bootstrap these components + ;; during the build phase, which causes serious issues ;; because there's no time for shebangs to be patched. So, we ;; bootstrap it on our own instead. =2D (add-after 'unpack 'bootstrap-jsonschemabuilder =2D (lambda* (#:key inputs #:allow-other-keys) =2D (let ((dir "tools/depends/native/JsonSchemaBuilder/src")) =2D (with-directory-excursion dir =2D (zero? (system* "sh" "autogen.sh")))))) =2D ;; Now we can do the regular bootstrapping process, but only af= ter =2D ;; the first round of shebang patching. We must repeat the pat= ching =2D ;; after bootstrapping so that all of the files generated by the =2D ;; Autotools et al. are patched appropriately. =2D (add-after 'patch-source-shebangs 'bootstrap + (add-after 'unpack 'bootstrap-bundled-software (lambda* (#:key inputs #:allow-other-keys) =2D ;; We bootstrapped JsonSchemaBuilder in the previous phase,= so we =2D ;; need to make sure it isn't done a second time. Otherwis= e, it =2D ;; would undo the shebang patching that we worked so hard f= or. =2D (substitute* '("tools/depends/native/JsonSchemaBuilder/Make= file") =2D (("\\./autogen\\.sh") "")) =2D ;; This essentially does what their 'bootstrap' script does= , but =2D ;; additionally passes the correct CONFIG_SHELL. =2D (let ((bash (string-append (assoc-ref inputs "bash") "/bin/= sh"))) =2D (define (run-make makefile) =2D (zero? (system* "make" "-f" makefile =2D "BOOTSTRAP_STANDALONE=3D1" =2D (string-append "CONFIG_SHELL=3D" bash))= )) =2D (and (run-make "bootstrap.mk") =2D (run-make "codegenerator.mk"))))) =2D (add-after 'bootstrap 'patch-source-shebangs-again =2D (assoc-ref %standard-phases 'patch-source-shebangs)) =2D ;; 3 tests fail that appear harmless, so we disable them. =2D (add-before 'check 'disable-some-tests + (let ((dirs '("tools/depends/native/JsonSchemaBuilder/src" + "lib/cpluff"))) + (for-each (lambda (third-party) + (with-directory-excursion third-party + (zero? (system* "autoreconf" "-vif")))) + dirs)))) + (add-after 'bootstrap-bundled-software 'patch-stuff (lambda _ + ;; Prevent the build scripts from calling autoreconf in + ;; the build stage. Otherwise, it would undo the careful + ;; bootstrapping that we've worked so hard for. + (substitute* "cmake/modules/FindLibDvd.cmake" + ;; Let's also use this opportunity to make the freshly + ;; unpackaged source directory writable. + (("autoreconf -vif") "chmod -R u+w .")) + (substitute* "cmake/modules/FindCpluff.cmake" + (("autoreconf -vif") "true")) + (substitute* "lib/cpluff/po/Makefile.in.in" + (("/bin/sh") (which "sh"))) + + ;; Let's disable some tests that are known not to work here. + ;; Doing this later while in the cmake "../build" directory + ;; is trickier. (substitute* '("xbmc/utils/test/TestSystemInfo.cpp") (("TEST_F\\(TestSystemInfo, GetOsPrettyNameWithVersion\\)") "TEST_F(TestSystemInfo, DISABLED_GetOsPrettyNameWithVersio= n)") (("TEST_F\\(TestSystemInfo, GetOsName\\)") "TEST_F(TestSystemInfo, DISABLED_GetOsName)") (("TEST_F\\(TestSystemInfo, GetOsVersion\\)") =2D "TEST_F(TestSystemInfo, DISABLED_GetOsVersion)"))))))) + "TEST_F(TestSystemInfo, DISABLED_GetOsVersion)")) + ;; FIXME: Why are these failing. + (substitute* "xbmc/network/test/TestWebServer.cpp" + (("TEST_F\\(TestWebServer, Can") + "TEST_F(TestWebServer, DISABLED_Can")) + #t)) + (add-before 'build 'set-build-environment + (lambda _ + ;; Some bundled build script falls back to /bin/sh + ;; if this is not set. + (setenv "CONFIG_SHELL" (which "sh")) + #t)) + (add-before 'check 'build-kodi-test + (lambda _ + (zero? (system* "make" "kodi-test"))))))) ;; TODO: Add dependencies for: =2D ;; - vdpau ;; - nfs =2D ;; =2D ;; FIXME: libusb detection fails. =2D ;; =2D ;; FIXME: As you can see, we use a lot of external libraries, but it= seems =2D ;; that a few bundled ones are still being used. + ;; - cec + ;; - plist + ;; - shairplay (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake) =2D ("cmake" ,cmake) ("doxygen" ,doxygen) ("gawk" ,gawk) ("gettext" ,gettext-minimal) ("icedtea" ,icedtea) ; needed at build-time only, mandatory + ("libdvdcss-bootstrapped" ,libdvdcss/kodi) + ("libdvdnav-bootstrapped" ,libdvdnav/kodi) + ("libdvdread-bootstrapped" ,libdvdread/kodi) ("libtool" ,libtool) ("pkg-config" ,pkg-config) ("swig" ,swig) @@ -210,38 +359,35 @@ generator library for C++.") `(("alsa-lib" ,alsa-lib) ("avahi" ,avahi) ("bluez" ,bluez) =2D ("boost" ,boost) =2D ("bzip2" ,bzip2) ("crossguid" ,crossguid) ("curl" ,curl) ("dcadec" ,dcadec) ("dbus" ,dbus) =2D ("enca" ,enca) ("eudev" ,eudev) ("ffmpeg" ,ffmpeg) ("flac" ,flac) + ("fmt" ,fmt) ("fontconfig" ,fontconfig) ("freetype" ,freetype) ("fribidi" ,fribidi) + ("giflib" ,giflib) ("glew" ,glew) ("gnutls" ,gnutls) =2D ("gperf" ,gperf) =2D ("jasper" ,jasper) ("lame" ,lame) + ("lcms" ,lcms) ("libass" ,libass) ("libbluray" ,libbluray) ("libcap" ,libcap) ("libcdio" ,libcdio) + ("libdrm" ,libdrm) ("libgcrypt" ,libgcrypt) ("libjpeg" ,libjpeg) ("libltdl" ,libltdl) ("libmad" ,libmad) ("libmicrohttpd" ,libmicrohttpd) =2D ("libmodplug" ,libmodplug) ("libmpeg2" ,libmpeg2) ("libogg" ,libogg) ("libpng" ,libpng) =2D ("libsamplerate" ,libsamplerate) ("libssh" ,libssh) ("libtiff" ,libtiff) ("libva" ,libva) @@ -254,14 +400,12 @@ generator library for C++.") ("libxt" ,libxt) ("libyajl" ,libyajl) ("lzo" ,lzo) =2D ("mesa-utils" ,mesa-utils) ("mysql" ,mysql) ("openssl" ,openssl) ("pcre" ,pcre) ("pulseaudio" ,pulseaudio) ("python" ,python-2) ("samba" ,samba) =2D ("sdl2" ,sdl2) ("sqlite" ,sqlite) ("taglib" ,taglib) ("tinyxml" ,tinyxml) @@ -274,4 +418,12 @@ generator library for C++.") music, games, etc. Kodi is highly customizable and features a theme and plug-in system.") (home-page "http://kodi.tv") =2D (license license:gpl2+))) + ;; XBMC is largely GPL2+, with some library components as + ;; LGPL2.1+, but the source code is littered with one-off + ;; licensed files. + (license (list license:gpl2+ license:lgpl2.1+ + license:gpl3+ ;WiiRemote client + license:expat ;cpluff, dbwrappers + license:public-domain ;cpluff/examples + license:bsd-3 ;misc + license:bsd-2))))) ;xbmc/freebsd =2D-=20 2.12.0 --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAljNWcAACgkQoqBt8qM6 VPqv1gf/UE427fsR8qCBbB5Y4RF/HIe7MyiTiaFfMd36nF3RAraXnDoeGGpyQIYw valcgd3MdIBwkRfVcaptMNzIBkX2MeA6Y7Dm0DF9KG95G5KOXyyG2VOO2bm9UH5t Q1Ln078/lBetxJYRF6G9h3bKgmyqGlbajDIOvrmeae0yW3V94hPXakWQex3pEVpe ZSVV4Zkd3GovY5qO6L1yuU/m/wtJmGWCikk6/KiMq0jcCVk4zNDgqaKpOvpRKw9R iGlErbqZZrCLz9fbcFbR+tzo1tTe2HsyaFWa0aBQ7oMtg0ifWafvBy16pux7xTfA XIbhQj+ZZvn4nf5AhRanzy1qXKiqZA== =Pg+B -----END PGP SIGNATURE----- --==-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Sat Mar 18 13:07:43 2017 Received: (at 26157) by debbugs.gnu.org; 18 Mar 2017 17:07:43 +0000 Received: from localhost ([127.0.0.1]:34193 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cpHpP-0003pu-MH for submit@debbugs.gnu.org; Sat, 18 Mar 2017 13:07:43 -0400 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:34613) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cpHpN-0003pk-FW for 26157@debbugs.gnu.org; Sat, 18 Mar 2017 13:07:41 -0400 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id CE076206A4; Sat, 18 Mar 2017 13:07:39 -0400 (EDT) Received: from frontend2 ([10.202.2.161]) by compute4.internal (MEProxy); Sat, 18 Mar 2017 13:07:39 -0400 DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=famulari.name; h= cc:content-type:date:from:in-reply-to:message-id:mime-version :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc :x-sasl-enc; s=mesmtp; bh=ciPrPMoMGh/CdDdb6IlEd2hJ/MM=; b=MPDB56 5LO2oZOerXYXW/EQ3UOjyX6KHFyXBISex8qcq8CcRgbAohw/HXw2fzR6tmS3Uyy3 skANBRXCx7QxsOq6z6ZtuXxECDpEJOFphSaRzHTCAwOvsF9JZ/bcaR97dgYZdml5 DzbP8UhLS9XKpV5yPkUBRxCzjsRXSdYnscWZY= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-sender :x-me-sender:x-sasl-enc:x-sasl-enc; s=fm1; bh=ciPrPMoMGh/CdDdb6I lEd2hJ/MM=; b=pl3BcuiIsmKrqmjTfe6pEJAlvHvui4ervVcJMBSy5bee7NNCYS RLnugXcTuw4w3vm1nrfJmrRyWkONcmKCAstGMzN+yh6Xi07b8Y0M4161TdFhhURd xXVgW9cGgOVnR9U+G/zgLjwmZWi/cfTfgezJLH1yBj3qXa9/Ud2qXDwsG6xiQoct cKRTVzGJJ3JKV7LAG6Py94sEEcJfKvv7bUzmJOrrdB2WJN9NWKcqvSA1lBhi1Psw Zoge3UO2pHUmgPBOpihCSE1L7VHkK5a06Jxc33jjIOq36/Jd6Gm3oxgYW00ddRmx XY6B772pB9f2LhsZEkmf3EbGvxQRPoyQ1P4Q== X-ME-Sender: X-Sasl-enc: qozPoAEO9h1c9bMinvyC4tZpUTR+xD4tDmfiscgVYpdg 1489856859 Received: from localhost (c-73-188-17-148.hsd1.pa.comcast.net [73.188.17.148]) by mail.messagingengine.com (Postfix) with ESMTPA id 8C6462444E; Sat, 18 Mar 2017 13:07:39 -0400 (EDT) Date: Sat, 18 Mar 2017 13:07:38 -0400 From: Leo Famulari To: Marius Bakke Subject: Re: bug#26157: [PATCH 1/2] gnu: Add fmt. Message-ID: <20170318170738.GD1512@jasmine> References: <20170318155401.28887-1-mbakke@fastmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="vOmOzSkFvhd7u8Ms" Content-Disposition: inline In-Reply-To: <20170318155401.28887-1-mbakke@fastmail.com> User-Agent: Mutt/1.8.0 (2017-02-23) X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 26157 Cc: 26157@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) --vOmOzSkFvhd7u8Ms Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Sat, Mar 18, 2017 at 04:54:01PM +0100, Marius Bakke wrote: > * gnu/packages/pretty-print.scm (fmt): New variable. > + "https://github.com/fmtlib/fmt/archive/" > + version ".tar.gz")) > + (file-name (string-append name "-" version ".tar.gz")) This is one of those repo snapshot tarballs that GitHub automatically generates when you make a new tag or release. I think we should use 'fmt-3.0.1.zip', because that was prepared specially for the release by the upstream maintainers. > + (synopsis "Small, safe and fast C++ formatting library") I'd leave "safe" out of the synopsis. Like saying it's "different" or "secure", it's only meaningful when we say what it's safe from. For example, safe from a wildebeest stampede, or from printf format-string attacks ;) There's space for this in the description. --vOmOzSkFvhd7u8Ms Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEsFFZSPHn08G5gDigJkb6MLrKfwgFAljNaVoACgkQJkb6MLrK fwgr/hAAgtEozB1ENTGwb80jvtekKrvWBQ5RETGE4yvy8Rz+xqa+10xcL7rRZzp/ /HIN/y31aU7a1lMnA+9AjBfi0iWWr7A2V0F/rz2ih/4iY+KGU9yhFmD62tAVLnSM T+T/73/EK21/vYvjgTP4QQ0quXOhR8RUbRP41FY+sqKTIWOCmvUUjho9/AYl5nue UIMjNfX/FC/O2iSW4QSfgSq4NpwFmCfgrqnS0UgW0HZd9ZL3feJRNwpR0Ej9Gkv0 5mu9PyBZ5PveqKmo/2GBr0xN/Cus4oPNxAPecWuzfZycpKkyDo431kedoglpvkDG QbC3dyznt3ZQpz7CSHc3d7/nCMhMDjjWe0Z9qL89v2sZ5IxUW/Kj8wEIwottv80p CwmOWlz4DznIkGzAX4mxz6RGqEjaP58enVoXvrto1Dc4hlQzsY4GuH++jOYXqaRC MSNIRXsqrVI9VfDRZVSxjQ/TemuTNDSzezQTV3vZOGa9Ty19KzchsuL5NjDPG9Rn wRfbz96EJ/W2Mq/JBbge3ICa5dbUV0w8VyVxvYf2YVpmJxnzmntBNSz0X9XjBsrA GTB0m3W11KbsBaUwvSkmEfNJyznnZqoIck5lVZHBvXlN+IW/G1DtzDRkCmylBuc+ FJOaYUwrx/T/6J2eralPfn9wqAucHjOGf/2E1OzjSGVvQmE18T8= =F+Fv -----END PGP SIGNATURE----- --vOmOzSkFvhd7u8Ms-- From debbugs-submit-bounces@debbugs.gnu.org Sat Mar 18 13:18:52 2017 Received: (at 26157) by debbugs.gnu.org; 18 Mar 2017 17:18:52 +0000 Received: from localhost ([127.0.0.1]:34209 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cpI0C-000487-FP for submit@debbugs.gnu.org; Sat, 18 Mar 2017 13:18:52 -0400 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:59248) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cpI0A-00047z-Ku for 26157@debbugs.gnu.org; Sat, 18 Mar 2017 13:18:50 -0400 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id 92CA72086D; Sat, 18 Mar 2017 13:18:50 -0400 (EDT) Received: from frontend2 ([10.202.2.161]) by compute4.internal (MEProxy); Sat, 18 Mar 2017 13:18:50 -0400 DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=famulari.name; h= cc:content-type:date:from:in-reply-to:message-id:mime-version :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc :x-sasl-enc; s=mesmtp; bh=szNUD8CUSseCLzchQbAnXSr4NOM=; b=rxNtsn 5ICEieGeQsleNpk7s1V4x/kLxcRmEX6cAbaTz74eS5B4aLfqKB0UsWNzfTyd3zQT oZDaq0JuNVmtPfR2ZdU/11IcbI8UEeOMuq+YcHIOU//e6OVv9Vk4M2/ZHKQMpBxx k53PG9KVcpsbTECkEoRxzq+0yN7twDQjiANgU= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-sender :x-me-sender:x-sasl-enc:x-sasl-enc; s=fm1; bh=szNUD8CUSseCLzchQb AnXSr4NOM=; b=HhEwO946ljWKffCsMM6wNHcnGM0H42SwCF+0DlD3KJ1aiRc0Ss MsuOnkXRGEX4nlLlq4mNYmVM0T6N8bAE+kG6kXzNHdYgpebPCM2oRAaX0T3kXzut 8BrGqw8XruonnLDjofZAHDBHeOcFTIs19G1s/eX9/v9rgOO5D/+bShzZv42PO0Gl /E3PoxcPWycNH/8skGu3w1WYYxuHWETtVFxigmiI6dBXhiQDS3Ab7N8PUrI5emao 2hUjlz6QFHkW8TadIi+zsAAtUKtDnVwFem9nDD2aFUB7tDC2ni/U4Tugi4zras9K 6XGXXrHV7IhZSKZioB9D89i1oj/ogKO/CXYg== X-ME-Sender: X-Sasl-enc: gkRiA6X7skPFw3u9o3uOeM/oXc1iyaujL04rps9fkJvK 1489857530 Received: from localhost (c-73-188-17-148.hsd1.pa.comcast.net [73.188.17.148]) by mail.messagingengine.com (Postfix) with ESMTPA id 5317824519; Sat, 18 Mar 2017 13:18:50 -0400 (EDT) Date: Sat, 18 Mar 2017 13:18:48 -0400 From: Leo Famulari To: Marius Bakke Subject: Re: bug#26157: [PATCH 2/2] gnu: kodi: Update to 18.0_alpha-0-4912f8f. Message-ID: <20170318171848.GE1512@jasmine> References: <20170318155401.28887-1-mbakke@fastmail.com> <20170318155622.29262-1-mbakke@fastmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="uxuisgdDHaNETlh8" Content-Disposition: inline In-Reply-To: <20170318155622.29262-1-mbakke@fastmail.com> User-Agent: Mutt/1.8.0 (2017-02-23) X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 26157 Cc: 26157@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) --uxuisgdDHaNETlh8 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Sat, Mar 18, 2017 at 04:56:22PM +0100, Marius Bakke wrote: > * gnu/packages/kodi.scm (libdvdnav/kodi, libdvdread/kodi, libdvdcss/kodi): New > variables. > (kodi): Update to 18.0_alpha-0-4912f8f. > [source]: Download from git. Unbundle more stuff. > [build-system]: Change to CMAKE-BUILD-SYSTEM. > [arguments]: Add #:configure-flag to disable nonfree components. Rework phases > to patch bundled software and bootstrap more libraries. > [native-inputs]: Remove CMAKE. Add LIBDVDCSS/KODI, LIBDVDNAV/KODI and > LIBDVDREAD/KODI. > [inputs]: Remove BOOST, BZIP2, ENCA, GPERF, JASPER, LIBMODPLUG, LIBSAMPLERATE, > MESA-UTILS and SDL2. Add FMT, GIFLIB, LCMS and LIBDRM. > [license]: Update for remaining software bundles. Wow! > +;; Kodi requires special forks of these libraries. In addition, > +;; it insists on downloading and building these as part of the > +;; standard build process. To make things easier, we bootstrap > +;; them here, so we don't have to worry about it later. Can you add a sentence stating that these forks are contained in the Kodi / XBMC repository? For a minute, I wondered how you figured out which commit to use. > (define-public kodi [...] > - ;; JsonSchemaBuilder is a small tool needed by the build system that > - ;; comes bundled with the source. The build system tries to build it > - ;; during the bootstrapping phase, which causes serious issues > + ;; The build system tries to bootstrap these components > + ;; during the build phase, which causes serious issues Nit-pick: these lines could be longer :) > + (add-after 'bootstrap-bundled-software 'patch-stuff > (lambda _ > + ;; Prevent the build scripts from calling autoreconf in > + ;; the build stage. Otherwise, it would undo the careful > + ;; bootstrapping that we've worked so hard for. > + (substitute* "cmake/modules/FindLibDvd.cmake" > + ;; Let's also use this opportunity to make the freshly > + ;; unpackaged source directory writable. > + (("autoreconf -vif") "chmod -R u+w .")) Clever, but perhaps too clever :) I think we should use the Scheme (chmod) procedure to do this separately, if there is a point where the files are unpacked between build phases. --uxuisgdDHaNETlh8 Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEsFFZSPHn08G5gDigJkb6MLrKfwgFAljNa/gACgkQJkb6MLrK fwgb6BAAvnth0KEIxO1AWNjChEOmQdPzqTPjtTqQKnZ/YbCYsZAn1wMpP0WbeYqx D5scqbWYUkz3lhzU+Su0BFRh2iB2hux0KxDCqyXgVYGbH/f/B+GewyFmZW/8SM+l p3BhFEeO1SDzULikBOxq8IvsGbSNxyT+cKqUCyF3JRdSUBlNN2WFiEoc7JNwi4Og ZW4lrbmfHsHDUPv9Ve+BiN9o+lQx4GMFC6buJhff3nrgzyhRYV1jTnnnB03LMpin 08WwA/R1YoWU5qMpnCcOx50dOYgXOMDMIVDSu5MYW6xFGFr2qU3lGsYAVluG3sZd D+khgYYY9nl6Fa9bUSaOiP8zQRb0gQ8XDKctf2nUWsDZeH9D2fCadWj4YoPZWYgO CDBu3Jy3GblwdYUchs49vAoBXzBqXdZxVWfcGVr+yGCxfBvBY/P5HEfI1UlDpaCR tNbqtk2cQLkjkzGO0l7GlHKCVFvpCqtRq8Cy52jb6InQohREu1pgRidzBy0m79sP KwmkevY00wldSFVQqOoPeMFeKTHndOIIVD0YO01bIPq736P8vw4+GtJ5a7yN70wt N44kJ5nUjvhzjBKkeomx8UaPDTHP/9k/12h9QORz0XMhRQ0Bw5B0/ELuCxjNOxPb etNue2mQ3Uo2//wRLIZZYpqyMgNhkp86AJjp9Krfbsr4C21XKo8= =rsyl -----END PGP SIGNATURE----- --uxuisgdDHaNETlh8-- From debbugs-submit-bounces@debbugs.gnu.org Mon Mar 20 12:33:49 2017 Received: (at 26157) by debbugs.gnu.org; 20 Mar 2017 16:33:49 +0000 Received: from localhost ([127.0.0.1]:36547 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cq0Fh-0003qS-Cb for submit@debbugs.gnu.org; Mon, 20 Mar 2017 12:33:49 -0400 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:39225) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cq0Fe-0003qJ-7O for 26157@debbugs.gnu.org; Mon, 20 Mar 2017 12:33:47 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id B0D472076A; Mon, 20 Mar 2017 12:33:45 -0400 (EDT) Received: from frontend2 ([10.202.2.161]) by compute5.internal (MEProxy); Mon, 20 Mar 2017 12:33:45 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= cc:content-type:date:from:in-reply-to:message-id:mime-version :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc :x-sasl-enc; s=fm1; bh=ac7AEajvom0vivx7BWqPK8mYmA/vVyWNkNGwiwAFg v4=; b=guOJ6qq+WZzOdAOHOM444SkRxtgzXjtYLBQtoguABv89JDggAqHMWkAhG OVg/QTk25USRf781GkAl/8ujU7SQkcVYlTqiFEkuOG490VNtBGdKfV9UBXHi07Dt tOb55DizGwbRFCP9jLBDsGSFML2qXGEy0lBxn7wkeZMRcjxi8sZ3CEbc+FH+9Q3d heQ5bg43DXvUQ9fKz7RP8WC4HMi0q63dQpzDYojNWuCgVmLlpevUkCL/8OXXQGLC WDmLOAfl4qtzt5Y4J+Bc0y33CKDGYQ8IHcxeEnocM13aiJTXjcSLA6zCLJoLfTBk TqbbtElcFwU9Hs95/4PserFmNIj9A== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-sender :x-me-sender:x-sasl-enc:x-sasl-enc; s=fm1; bh=ac7AEajvom0vivx7BW qPK8mYmA/vVyWNkNGwiwAFgv4=; b=LvBrWdq/bwElC/4SDGgWHP8d8SllFDjg2e NRGt6pC0VC1SiDiw/ccVkq+sBzq1us8GwT49eFwlxbjVeT34qio4aYWaIo1EiRxU 8QYLEhOxuun72taBkqYebKEn6pbJ6f+pCPg+5xeupcVzMQ7DMmC+d/gBgl8Q6f4K qrRpa8JayHjRNiaVaNGpquMp4KadmrRsbN42fTcWDrrcXzcYJbSEsFOKghbmpdZZ I+4Q3cFWpGSyqkJ+alnn0onWSQnZLL08ZOHtpExB5GoUQ6w0vXHBpYPxCuzgUkwx DCkpxnwgVvLou7Qjp5png/Aj8bH1GV87QkM9D9qLRzBuBYuuNxlQ== X-ME-Sender: X-Sasl-enc: QetiCDBtAGDww5rG7rGrrfsOuoIeuZXRTn06La1GyROZ 1490027625 Received: from localhost (unknown [188.113.81.93]) by mail.messagingengine.com (Postfix) with ESMTPA id 29B5224658; Mon, 20 Mar 2017 12:33:45 -0400 (EDT) From: Marius Bakke To: Leo Famulari Subject: Re: bug#26157: [PATCH 1/2] gnu: Add fmt. In-Reply-To: <20170318170738.GD1512@jasmine> References: <20170318155401.28887-1-mbakke@fastmail.com> <20170318170738.GD1512@jasmine> User-Agent: Notmuch/0.24 (https://notmuchmail.org) Emacs/25.1.1 (x86_64-unknown-linux-gnu) Date: Mon, 20 Mar 2017 17:33:43 +0100 Message-ID: <8737e77vrs.fsf@kirby.i-did-not-set--mail-host-address--so-tickle-me> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 26157 Cc: 26157@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) --=-=-= Content-Type: text/plain Leo Famulari writes: > On Sat, Mar 18, 2017 at 04:54:01PM +0100, Marius Bakke wrote: >> * gnu/packages/pretty-print.scm (fmt): New variable. >> + "https://github.com/fmtlib/fmt/archive/" >> + version ".tar.gz")) >> + (file-name (string-append name "-" version ".tar.gz")) > > This is one of those repo snapshot tarballs that GitHub automatically > generates when you make a new tag or release. I think we should use > 'fmt-3.0.1.zip', because that was prepared specially for the release by > the upstream maintainers. Good catch! Somehow I assumed it was a pre-compiled download or something, since the package does not use autotools. I've changed to this source. >> + (synopsis "Small, safe and fast C++ formatting library") > > I'd leave "safe" out of the synopsis. Like saying it's "different" or > "secure", it's only meaningful when we say what it's safe from. For > example, safe from a wildebeest stampede, or from printf format-string > attacks ;) There's space for this in the description. Agreed :) --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAljQBGcACgkQoqBt8qM6 VPrHgQf/WwVWEdLfYwggOL4fDkO7RjNXv9BG1T9myHBxdRDNNzm8VDb5wvOdZZ5E CZMgZ6wyTKtpSeBYmlKnt4Vy5AUxAnzeLhsefaraIVO8WZTS1HDNuWO1xYLyjGWT 3D6pUvHMWvVhiFvmergM3Vx+I4tHIu6NieqGXDxNOwHEMz/K14GLsgSI5JFYk2li JzGlTwnwe0hChHLLofN/zJr90YaPv5XTS1ow9ZS6BWDGtbMkml86TCDHmVWUfvGC m9AnYrAa7+1q4d03qk35EGOyaqVJwdztOWC3UF9H1HQJbgv1tIbyfbXPp4d3AX/3 PAOaJ4pkyL3NfyTb2kIkT/wWFKOkvw== =UtRf -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Mon Mar 20 12:39:11 2017 Received: (at 26157) by debbugs.gnu.org; 20 Mar 2017 16:39:11 +0000 Received: from localhost ([127.0.0.1]:36553 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cq0Kt-0003ys-0x for submit@debbugs.gnu.org; Mon, 20 Mar 2017 12:39:11 -0400 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:35245) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cq0Kr-0003yk-7m for 26157@debbugs.gnu.org; Mon, 20 Mar 2017 12:39:09 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 9870720A84; Mon, 20 Mar 2017 12:39:07 -0400 (EDT) Received: from frontend2 ([10.202.2.161]) by compute5.internal (MEProxy); Mon, 20 Mar 2017 12:39:07 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= cc:content-type:date:from:in-reply-to:message-id:mime-version :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc :x-sasl-enc; s=fm1; bh=lBq1rp2JwmtVzVnryaQwImWiyOEpbC63tcJrA1rvt jU=; b=12oltwWS6PgixByOpoDBQdPeCNNCZmajlGDLVbd3ssQ3a6CgO1gtkQxkO X1c+7weVwbFuzoZwsAV+EKzEqmRI0zMvhKZ/cBr9U3EptLLn41uLwsCEAtezQMJJ 9PG+6Z45LIJpeETcaQu+vSS5kCAdeaO9bOGQTxTesJbIC7CzCr2+5QRHe0BgoKAX kAjEREXuuO8ePNV/6a2Lh3zwLFaN7G7zUQs1i0TUH05b/tBRrc5UK84QaRdeqlD5 H2zz/9DNJ4CcKCzJZBNM7PPDvttPN7hqyPNHbhIT/j1P+DlrX7vOjwoIJ4rwm5SU JJHx3gchWfC8kRC5wpkEDdGKBWJ6w== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-sender :x-me-sender:x-sasl-enc:x-sasl-enc; s=fm1; bh=lBq1rp2JwmtVzVnrya QwImWiyOEpbC63tcJrA1rvtjU=; b=nfj6JAygfxnzdLHR9sveIKxnxomer6W47d S3F0A2+aQNVlE+6faeuSGO20HneTg6aWOhu3HSs1HJEBBp4BwdSJWEK2q4hUu+wO YlWLhSlOYzX2X9aQsV6SktrmjM/CSRppjpM4Gc5SiHLm1Y5/4WaUb1i+hNLSV1NP FszSJEH1z6ksggn3EKik4kNRFWN6gSeur5VUYmcNv/CbN05CoOZCyXNkdYCRkLZr ht81KuK6M+Rpcbngq5TE1RAaesjT0c22fhKFPEfxj9YbYkUzocnzr4ktlj26r3F0 nv9VVACnaCSU6/xdkoZ1yicMVW1fUX7CPSQuIfmUFRtsaweurJDg== X-ME-Sender: X-Sasl-enc: A1G05k1kCfBW6PZIbd1bv2t7l44FpUDqLZppoGnTK7iJ 1490027947 Received: from localhost (unknown [188.113.81.93]) by mail.messagingengine.com (Postfix) with ESMTPA id 32E21246A5; Mon, 20 Mar 2017 12:39:07 -0400 (EDT) From: Marius Bakke To: Leo Famulari Subject: Re: bug#26157: [PATCH 2/2] gnu: kodi: Update to 18.0_alpha-0-4912f8f. In-Reply-To: <20170318171848.GE1512@jasmine> References: <20170318155401.28887-1-mbakke@fastmail.com> <20170318155622.29262-1-mbakke@fastmail.com> <20170318171848.GE1512@jasmine> User-Agent: Notmuch/0.24 (https://notmuchmail.org) Emacs/25.1.1 (x86_64-unknown-linux-gnu) Date: Mon, 20 Mar 2017 17:39:05 +0100 Message-ID: <87zigf6gye.fsf@kirby.i-did-not-set--mail-host-address--so-tickle-me> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 26157 Cc: 26157@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) --=-=-= Content-Type: text/plain Leo Famulari writes: > On Sat, Mar 18, 2017 at 04:56:22PM +0100, Marius Bakke wrote: >> * gnu/packages/kodi.scm (libdvdnav/kodi, libdvdread/kodi, libdvdcss/kodi): New >> variables. >> (kodi): Update to 18.0_alpha-0-4912f8f. >> [source]: Download from git. Unbundle more stuff. >> [build-system]: Change to CMAKE-BUILD-SYSTEM. >> [arguments]: Add #:configure-flag to disable nonfree components. Rework phases >> to patch bundled software and bootstrap more libraries. >> [native-inputs]: Remove CMAKE. Add LIBDVDCSS/KODI, LIBDVDNAV/KODI and >> LIBDVDREAD/KODI. >> [inputs]: Remove BOOST, BZIP2, ENCA, GPERF, JASPER, LIBMODPLUG, LIBSAMPLERATE, >> MESA-UTILS and SDL2. Add FMT, GIFLIB, LCMS and LIBDRM. >> [license]: Update for remaining software bundles. > > Wow! > >> +;; Kodi requires special forks of these libraries. In addition, >> +;; it insists on downloading and building these as part of the >> +;; standard build process. To make things easier, we bootstrap >> +;; them here, so we don't have to worry about it later. > > Can you add a sentence stating that these forks are contained in the > Kodi / XBMC repository? For a minute, I wondered how you figured out > which commit to use. Yep, thanks for pointing it out. > >> (define-public kodi > > [...] > >> - ;; JsonSchemaBuilder is a small tool needed by the build system that >> - ;; comes bundled with the source. The build system tries to build it >> - ;; during the bootstrapping phase, which causes serious issues >> + ;; The build system tries to bootstrap these components >> + ;; during the build phase, which causes serious issues > > Nit-pick: these lines could be longer :) > >> + (add-after 'bootstrap-bundled-software 'patch-stuff >> (lambda _ >> + ;; Prevent the build scripts from calling autoreconf in >> + ;; the build stage. Otherwise, it would undo the careful >> + ;; bootstrapping that we've worked so hard for. >> + (substitute* "cmake/modules/FindLibDvd.cmake" >> + ;; Let's also use this opportunity to make the freshly >> + ;; unpackaged source directory writable. >> + (("autoreconf -vif") "chmod -R u+w .")) > > Clever, but perhaps too clever :) I think we should use the Scheme > (chmod) procedure to do this separately, if there is a point where the > files are unpacked between build phases. Unfortunately, this is the only good opportunity to do this. They are "downloaded", unpacked and bootstrapped from that cmake file, which is invoked in the 'build' phase, and my attempts to wrangle this in a separate phase were unsuccessful (hence the top-level bootstrapped variables). I will make it clearer why we have to do this. Will test the latest upstream git source and commit these later today unless there are more comments :) --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAljQBakACgkQoqBt8qM6 VPpeegf/QbV1zCYVMkSsJfJ2X9sS1r3RkHVrkRjSezqkzgSxOXORCNgWsMbohpm6 +T6/N1349IK1eRRbHxlvtkXqSePeOkUjq0Oq26F3tHH78t+AsbfGgDpOPvPL+OqN WTiHlvBkeOQDJxuzt5z/YJicFF6do0D2GE3smT6cAgiGQ9OKGVn2MRqvKpm3hJbT nyktVaWIuKKh6UgQZc0tji+hMXYiJeUyNZyF5M9A0RZxiB5PQbaMA0bfaIWBpvIe jQaArJpNIbZLPh1ghRZTj+KSSYXm8sX1fXzf/koyfz61yWk2RkHJYg6P+y9gggrz syTupLpk8WUpLZA52H3YKbYvVgtthA== =eKub -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Mon Mar 20 14:08:31 2017 Received: (at 26157) by debbugs.gnu.org; 20 Mar 2017 18:08:31 +0000 Received: from localhost ([127.0.0.1]:36595 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cq1jL-00068R-9G for submit@debbugs.gnu.org; Mon, 20 Mar 2017 14:08:31 -0400 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:43657) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cq1jJ-00068J-DZ for 26157@debbugs.gnu.org; Mon, 20 Mar 2017 14:08:29 -0400 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id 651DD20A87; Mon, 20 Mar 2017 14:08:29 -0400 (EDT) Received: from frontend2 ([10.202.2.161]) by compute4.internal (MEProxy); Mon, 20 Mar 2017 14:08:29 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=cc:content-type:date:from:in-reply-to:message-id:mime-version :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc :x-sasl-enc; s=mesmtp; bh=7e9pmRQ7hgs0Rl5G8YTHW0FvHsZA6WGrEw3e0p j5jTM=; b=Rupz4Ux5zkXU9nRcNZiwZgpHMliLYQskn9ixhUlRaRF1neyJWpyvaj gbAqtOO57Ssmw6mQ96O2d7vGMijtKyqGcf5TCSVkDoLBvKLHeFIlnGa3UlHXTYsc LsZz4qYyMh0uteeibpDenzvS/N0F7y5qb/JmemRsgyXrqt63ancLc= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-sender :x-me-sender:x-sasl-enc:x-sasl-enc; s=fm1; bh=7e9pmRQ7hgs0Rl5G8Y THW0FvHsZA6WGrEw3e0pj5jTM=; b=naQEi4YtL8ZR8qAESy0QIqZWa40pX3SSF+ qsexFPVhnN0ffbeX7Bm5LJsqgTB25LZLVDtydMNxuDIYEr3bJeXW79Gqt2gaI0UR QdDCjA3fY2W6G8bP4EudN0QwsAMVgvnmCYw1IWmjuIYEa3dYhd61J6OIh22mXzDq mf472iRbqluWuD2uBjQE9DIk1PbW2rRNvxjfOLjNJAUz6D9npkvfvWYqFLFZ/ylu mS+z7b4BxdmvGXTXFPuSl8aXyRAhHm10uDLRa82Qyd6Wc7TtefudCU0VbGCZC6CU /fNB/W30B2TLOfoBICADXZo9CiAkNQ2XwIsvhXwaSMdDOTTnDuRQ== X-ME-Sender: X-Sasl-enc: AO4Lyr7/0dCOriAI+u2tQbhvZL1if6Mf5jRANG6MJT6h 1490033309 Received: from localhost (c-73-188-17-148.hsd1.pa.comcast.net [73.188.17.148]) by mail.messagingengine.com (Postfix) with ESMTPA id 2CE59246D1; Mon, 20 Mar 2017 14:08:29 -0400 (EDT) Date: Mon, 20 Mar 2017 14:08:28 -0400 From: Leo Famulari To: Marius Bakke Subject: Re: bug#26157: [PATCH 2/2] gnu: kodi: Update to 18.0_alpha-0-4912f8f. Message-ID: <20170320180828.GD3820@jasmine> References: <20170318155401.28887-1-mbakke@fastmail.com> <20170318155622.29262-1-mbakke@fastmail.com> <20170318171848.GE1512@jasmine> <87zigf6gye.fsf@kirby.i-did-not-set--mail-host-address--so-tickle-me> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="1ccMZA6j1vT5UqiK" Content-Disposition: inline In-Reply-To: <87zigf6gye.fsf@kirby.i-did-not-set--mail-host-address--so-tickle-me> User-Agent: Mutt/1.8.0 (2017-02-23) X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 26157 Cc: 26157@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) --1ccMZA6j1vT5UqiK Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Mon, Mar 20, 2017 at 05:39:05PM +0100, Marius Bakke wrote: > Leo Famulari writes: > >> + (add-after 'bootstrap-bundled-software 'patch-stuff > >> (lambda _ > >> + ;; Prevent the build scripts from calling autoreconf in > >> + ;; the build stage. Otherwise, it would undo the careful > >> + ;; bootstrapping that we've worked so hard for. > >> + (substitute* "cmake/modules/FindLibDvd.cmake" > >> + ;; Let's also use this opportunity to make the freshly > >> + ;; unpackaged source directory writable. > >> + (("autoreconf -vif") "chmod -R u+w .")) > > > > Clever, but perhaps too clever :) I think we should use the Scheme > > (chmod) procedure to do this separately, if there is a point where the > > files are unpacked between build phases. >=20 > Unfortunately, this is the only good opportunity to do this. They are > "downloaded", unpacked and bootstrapped from that cmake file, which is > invoked in the 'build' phase, and my attempts to wrangle this in a > separate phase were unsuccessful (hence the top-level bootstrapped > variables). I will make it clearer why we have to do this. I thought it might be something like this, but I figured I'd suggest "the right way" anyways :) --1ccMZA6j1vT5UqiK Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEsFFZSPHn08G5gDigJkb6MLrKfwgFAljQGpwACgkQJkb6MLrK fwiGgw/7Bb4GVH86adSPpuoqMscTs8VKOKyhms+LH2vjpRWkdmppd2965m9WB7Ur AGKw2fG6gaFjiJ2wEz3bShSQhhlzUOn+czqp0gj9vNrfiUtH5RZ6bIYACP4kvMxN MMqvGK0cnSYcBdFcRUE4RYfQCC+tBSnoMqLh3tI+tcUND674sxEE0tHBBKWohGSU IKJNKzloOFnW53GWtt0TnIAPeFT47YQ7U8Yxiw8oeYBe1jzOryQ4/cHOCVk+nB2e JCKN24VXJX+FwQrVs39DfvIpXydVCciOu+IqJpvfsAmVkR2dkSSWe/DIuHB4YiwN B3LweD4fzty3huWoQWKwaqyp3RKQV1AXwJVTvG655GhFd4+ouFjlnhY4XgMQLox6 cb3SJPxwf1DVBJvo8cKVNvzTFxMQOP1lGvVXRR+VvabOXD+Uwtwn2tw6pbTWMBml RrTcFHg4PQjrIsHlVJDo3R7jYtFldHAR6uepOx35VUUP5dLxYcW5tcEWh1QlfxXR 3G+W3//JdnVzRyAUHL+mNtb99tvmHwgunG0jetuRr4CV49aymGOduywFtuJx6f/o k71CE6GLKAuiU7X3+Hr8MKjnQp4T8gzi8Z8gSAHCWLDxCmEQzCmJltiYhiZhyuHP NAQNslKgcSDG9pA8QbFm1/FMTXM1s9tEgufnxUH8YifDlDg8FMo= =W/d8 -----END PGP SIGNATURE----- --1ccMZA6j1vT5UqiK-- From debbugs-submit-bounces@debbugs.gnu.org Mon Mar 20 18:41:56 2017 Received: (at 26157-done) by debbugs.gnu.org; 20 Mar 2017 22:41:56 +0000 Received: from localhost ([127.0.0.1]:36885 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cq5zw-0004PF-BJ for submit@debbugs.gnu.org; Mon, 20 Mar 2017 18:41:56 -0400 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:36074) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cq5zu-0004P7-A6 for 26157-done@debbugs.gnu.org; Mon, 20 Mar 2017 18:41:54 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 33AD3209A8; Mon, 20 Mar 2017 18:41:54 -0400 (EDT) Received: from frontend2 ([10.202.2.161]) by compute5.internal (MEProxy); Mon, 20 Mar 2017 18:41:54 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= cc:content-type:date:from:in-reply-to:message-id:mime-version :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc :x-sasl-enc; s=fm1; bh=kktQ9oEEVGjPPiWOHUSsE/59WllNaJROAJfjznhOU nk=; b=anESyExOIcrR0sy5UipaA2EmfKUDz5zY+OZd5xcmNd50UVd0fipl8fJ6i dReue47Kyn8SckMMuZBhoKCQ4feTH35ubLVPbOi448sJZSzKutKdxUJVlo7vTwmP /qr/N8TURV9jIE63DBvhfy2Fc/NQ51Im1fr8x3Z3cyd1Ioi7LNTRdiSwXrnmEP1p UFAgTJyaCWz3ipVTdt1SHxEMPjuV+xxYO5Mmoak99k3VuPBWVdUWQc+zRjM2j7q2 rVbMK7S+je5GSTAmZaw+bD71a28MkNoP7XDGolzIp71pGJWoI4RCO7EZQPm4rPkS 1A2wY4b4pRb9xum87rC0mKf91H7iw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-sender :x-me-sender:x-sasl-enc:x-sasl-enc; s=fm1; bh=kktQ9oEEVGjPPiWOHU SsE/59WllNaJROAJfjznhOUnk=; b=If9lqRLhkdONJQsy4G6juD/RJU3+30VkI9 voqplhaHqycaSaUbeTyvGPhKf9mXFTXtA/vYft2DWuGJyw8maFlmATc+Tns6vZY9 0D3UvF4jLn4tPAb02p5P7iYIlp3zHN4a8nXE3Jw0U15ePR3WVouLZwEejo5VXeh0 4cFAZbf15OYO+rO8LORzKlDttwXTrJDeg61GcbfESKUdQyc986ViNPvZNeP2mTOD fa/EaR+yhEM/nTdUI+XGMyJs39TBmFtEZ5KjSxvUgWHS7xhlnqGGBfHO8LwXlMku o5lJLnZnQJQ4dllEMoqM9RNZAInwf8zrzTPvkVVZoBHU6wnUWVrQ== X-ME-Sender: X-Sasl-enc: TJZIThyrXCbhrVdLrAAxmtfj3GsvdxrHWYIgkA91CgNT 1490049713 Received: from localhost (unknown [188.113.81.93]) by mail.messagingengine.com (Postfix) with ESMTPA id C1716246A5; Mon, 20 Mar 2017 18:41:53 -0400 (EDT) From: Marius Bakke To: Leo Famulari Subject: Re: bug#26157: [PATCH 2/2] gnu: kodi: Update to 18.0_alpha-0-4912f8f. In-Reply-To: <20170320180828.GD3820@jasmine> References: <20170318155401.28887-1-mbakke@fastmail.com> <20170318155622.29262-1-mbakke@fastmail.com> <20170318171848.GE1512@jasmine> <87zigf6gye.fsf@kirby.i-did-not-set--mail-host-address--so-tickle-me> <20170320180828.GD3820@jasmine> User-Agent: Notmuch/0.24 (https://notmuchmail.org) Emacs/25.1.1 (x86_64-unknown-linux-gnu) Date: Mon, 20 Mar 2017 23:41:51 +0100 Message-ID: <87tw6n605s.fsf@kirby.i-did-not-set--mail-host-address--so-tickle-me> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 26157-done Cc: 26157-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Leo Famulari writes: > On Mon, Mar 20, 2017 at 05:39:05PM +0100, Marius Bakke wrote: >> Leo Famulari writes: >> >> + (add-after 'bootstrap-bundled-software 'patch-stuff >> >> (lambda _ >> >> + ;; Prevent the build scripts from calling autoreconf in >> >> + ;; the build stage. Otherwise, it would undo the caref= ul >> >> + ;; bootstrapping that we've worked so hard for. >> >> + (substitute* "cmake/modules/FindLibDvd.cmake" >> >> + ;; Let's also use this opportunity to make the freshly >> >> + ;; unpackaged source directory writable. >> >> + (("autoreconf -vif") "chmod -R u+w .")) >> > >> > Clever, but perhaps too clever :) I think we should use the Scheme >> > (chmod) procedure to do this separately, if there is a point where the >> > files are unpacked between build phases. >>=20 >> Unfortunately, this is the only good opportunity to do this. They are >> "downloaded", unpacked and bootstrapped from that cmake file, which is >> invoked in the 'build' phase, and my attempts to wrangle this in a >> separate phase were unsuccessful (hence the top-level bootstrapped >> variables). I will make it clearer why we have to do this. > > I thought it might be something like this, but I figured I'd suggest > "the right way" anyways :) Pushed with a couple of other minor improvements and removed inputs :) --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAljQWrAACgkQoqBt8qM6 VPoTcAf/V/xuTxp10L1Av27st89v385DlOOvJq3WmXZToGko++Wgwa1LA2INA5qX 4AfttRHo5d/uOjWcga+7d4ZDf08uR8nCRheBO7BASAW3vRx877Xk5gginZoJ14UY O27Xl0MEA2CDrhcFt9cqrYi5ubVRyKJHwR2cfRi6sHdBHE07Ul8AdDpZGarseLxC 65nSMbPcxKnUfYIwUHQE0OPMxQyv4ROINSDgH6xnzENKMnP2fp6bP/4K2UJUpOdk DrE3QHFwXWtfMSvW5h5qAPczlG3LnlPEzn8nZjtlpKZrpDfP7wmyp5g4XTrYQCH2 VVH02R/vIlF7eB/MRFfGUVbMbEQQgg== =GTwH -----END PGP SIGNATURE----- --=-=-=-- From unknown Mon Jun 23 02:25:32 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Tue, 18 Apr 2017 11:24:04 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator