From patchwork Thu Jun 27 21:58:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Attila Lendvai X-Patchwork-Id: 65703 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 6F49827BBE2; Thu, 27 Jun 2024 23:01:17 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS,T_PDS_PRO_TLD,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 C5C2727BBE9 for ; Thu, 27 Jun 2024 23:01:11 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sMxAr-0008Io-Nh; Thu, 27 Jun 2024 18:01:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sMxAp-0008IN-QU for guix-patches@gnu.org; Thu, 27 Jun 2024 18:01:00 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sMxAp-0002HP-Ho for guix-patches@gnu.org; Thu, 27 Jun 2024 18:00:59 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sMxAs-0005zf-F9 for guix-patches@gnu.org; Thu, 27 Jun 2024 18:01:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71810] [PATCH 1/3] gnu: smplayer: Update to 22.2.0 Resent-From: attila.lendvai@gmail.com Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 27 Jun 2024 22:01:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 71810 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71810@debbugs.gnu.org Cc: Attila Lendvai X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.171952562822982 (code B ref -1); Thu, 27 Jun 2024 22:01:02 +0000 Received: (at submit) by debbugs.gnu.org; 27 Jun 2024 22:00:28 +0000 Received: from localhost ([127.0.0.1]:43554 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sMxAJ-0005yc-O7 for submit@debbugs.gnu.org; Thu, 27 Jun 2024 18:00:28 -0400 Received: from lists.gnu.org ([209.51.188.17]:35482) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sMxAH-0005yN-Tr for submit@debbugs.gnu.org; Thu, 27 Jun 2024 18:00:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sMxA7-00089I-2s for guix-patches@gnu.org; Thu, 27 Jun 2024 18:00:17 -0400 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sMxA5-00026y-5v for guix-patches@gnu.org; Thu, 27 Jun 2024 18:00:14 -0400 Received: by mail-wr1-x429.google.com with SMTP id ffacd0b85a97d-366edce6493so3539299f8f.3 for ; Thu, 27 Jun 2024 15:00:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1719525610; x=1720130410; darn=gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=mQgjIn65PEZcKX/VhkWaX0osa2lbsNAUtia64V7fNVY=; b=J1KPAKUwMG8YKXZqtepTUO3HonIzH8dtGm9O+9QLxL4P6vRRv76RdGrAFWEHC5dQx3 5pGfzJtGWweXHA+KdN43nlqk0hko6aPX7uEvOS/CPBNnrsaTs3TTc+MGCEfQJx0mAhrK akG8ucjA0uyad05bdMRtntJxic/XZ96Yw7gW2lyRKDqmEd3ENkDsguIu1UMAnVgWe3XT hyk00d9ovf/PPiXX5J8KWxhI1brrH7T13iFqVl1TKtbZDnKPSXUkMExdtLrtQbNew3i/ CA9bIwrJzFU7GDPbgeY7FNWnjlpMZtlpuAtItpSHU/tvc3W6Iqpe1IF1imuV3FKnjuSy v6rg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719525610; x=1720130410; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=mQgjIn65PEZcKX/VhkWaX0osa2lbsNAUtia64V7fNVY=; b=R5who98mwvTxm/R18Hj9KPLQ+9oXBIf5l/nH9pEwyKL3f692BWJNqHSOYT5qq82UGP Njz95sYE5zK8y6vHVBPO1es8TS7oCYuB7kHZ/BzisS+buoBg8h1kX8c/z160h1PTwCTg 9R58qtq9nnksuW0CpTZhK0C4oHAm7y4oqPnbW0ePg9H+vTl2mhMO1BhZ6dfGMVBQvsw5 AMLyEkknQAVt1glyitsLjxS/i8KIB/t6ZkrjTXGPEVQ/SKM9LA/1bXh9kKdCkZitlk1X Wddu6Qn0QDOXLnRtYfD1ql4ZKw5eSMNAOB4EMCdlfhYff/oN26kv2Pe/hldEm2581ndH f+xw== X-Gm-Message-State: AOJu0Yx3B2Y4bdukXtRkQ1StPbjbsSzTjkeLNKbClIJ6GHPAmlUTCZoA Pek4Knhcr1q/P2f15GL+GYF8sAN0jfu8c4JREcs3Bn9s5i2qSmhYWpicrg== X-Google-Smtp-Source: AGHT+IHQMSiIEP3bcy9Zvw+0C1oXJKuoPAeqiAywUxkswE87qJaB3cdWov88QAM6lU8xsCfSS5GqCA== X-Received: by 2002:a5d:538f:0:b0:365:ebb6:35df with SMTP id ffacd0b85a97d-366e962df3bmr9037946f8f.58.1719525609768; Thu, 27 Jun 2024 15:00:09 -0700 (PDT) Received: from lelap.lan (2a00-1f40-b161-2920--477.pool6.panelnet.hu. [2a00:1f40:b161:2920::477]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3675a0e16besm399357f8f.62.2024.06.27.15.00.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Jun 2024 15:00:09 -0700 (PDT) From: attila.lendvai@gmail.com X-Google-Original-From: attila@lendvai.name Date: Thu, 27 Jun 2024 23:58:19 +0200 Message-ID: <5708714cc9e486ffdadcb2408cf6479ecbecd220.1719525499.git.attila@lendvai.name> X-Mailer: git-send-email 2.45.1 MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::429; envelope-from=attila.lendvai@gmail.com; helo=mail-wr1-x429.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_PDS_PRO_TLD=0.01 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From: Attila Lendvai * gnu/packages/video.scm (smplayer) [origin]: Build from the git repo. [arguments]: Remove LRELEASE kludge. Change-Id: Iff065784a2b2ef677807e4194ca04ce2ec501fef --- the rationale for sending three patches is that if someone wants to experiment with different versions, then they can easily grab them from the git history. and i had to go step-by-step anyway to find out what version broke, and what was the difference, so i recorded the steps. gnu/packages/video.scm | 29 ++++++++--------------------- 1 file changed, 8 insertions(+), 21 deletions(-) base-commit: 78d946b01162fbe986c6768800e8cfd6e70e67e5 diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 77cdfe9078c..731403f5291 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -2711,15 +2711,15 @@ (define-public mpv (define-public smplayer (package (name "smplayer") - (version "21.10.0") + (version "22.2.0") (source (origin - (method url-fetch) - (uri (string-append - "mirror://sourceforge/smplayer/SMPlayer/" version - "/smplayer-" version ".tar.bz2")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/smplayer-dev/smplayer") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 - (base32 - "12nvcl0cfix1xay9hfi7856vg4lpv8y5b0a22212bsjbvl5g22rc")))) + (base32 "0mcvpm86n9l0nwavnaa1n2jfalgrzdfh92sdjnwx1iga89m4k55s")))) (build-system qt-build-system) (native-inputs (list qttools-5)) @@ -2728,23 +2728,10 @@ (define-public smplayer (arguments (list #:tests? #false ; no tests #:make-flags #~(list (string-append "PREFIX=" #$output) - (string-append "CC=" #+(cc-for-target)) - ;; A KLUDGE to turn off invoking lrelease on the - ;; project for now, because it fails consistently - ;; with "WARNING: Could not find qmake spec - ;; 'default'". See below. - "LRELEASE=true") + (string-append "CC=" #+(cc-for-target))) #:phases #~(modify-phases %standard-phases (delete 'configure) - ;; Due to the above, we must run lrelease separately on each .ts file - ;; (as opposed to running `lrelease-pro smplayer.pro` for the entire - ;; project, as the Makefile does normally without the above kludge). - (add-after 'build 'compile-ts-files - (lambda _ - (for-each (lambda (file) - (invoke "lrelease" file)) - (find-files "./" "\\.ts$")))) (add-after 'install 'wrap-executable (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out"))