From debbugs-submit-bounces@debbugs.gnu.org Thu Jul 05 16:00:10 2018 Received: (at submit) by debbugs.gnu.org; 5 Jul 2018 20:00:10 +0000 Received: from localhost ([127.0.0.1]:47993 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fbAQD-0004gI-Ra for submit@debbugs.gnu.org; Thu, 05 Jul 2018 16:00:10 -0400 Received: from eggs.gnu.org ([208.118.235.92]:57217) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fbAQB-0004f4-5p for submit@debbugs.gnu.org; Thu, 05 Jul 2018 16:00:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fbAQ5-0002XG-BB for submit@debbugs.gnu.org; Thu, 05 Jul 2018 16:00:01 -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.0 required=5.0 tests=BAYES_20,FREEMAIL_FROM, T_DKIM_INVALID autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:53453) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fbAQ5-0002Wr-8I for submit@debbugs.gnu.org; Thu, 05 Jul 2018 16:00:01 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48165) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fbAQ3-0002EE-22 for guix-patches@gnu.org; Thu, 05 Jul 2018 16:00:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fbAPy-0002Sh-2O for guix-patches@gnu.org; Thu, 05 Jul 2018 15:59:59 -0400 Received: from mail-lj1-x241.google.com ([2a00:1450:4864:20::241]:39981) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fbAPx-0002Rw-Qu for guix-patches@gnu.org; Thu, 05 Jul 2018 15:59:53 -0400 Received: by mail-lj1-x241.google.com with SMTP id a6-v6so7534107ljj.7 for ; Thu, 05 Jul 2018 12:59:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=TSwMXU6R6S0mG5WgYb8zIcNhvU7+mLypwZDlkRK+PSQ=; b=VS2fQHDc5hW9EUh5S1gGE5A9suQ9wEXKvhfDMzlpPZRszb0XW45E+g+FoAt2bX40Pz f8sxGkc4mY7rJAjNguItOHy1B6KiuUjK84n2Ivd25aJMU8e8RBGdwi2ocPECiRLdFfs1 rgmh9R1m3JXB6YKFCx0SxemO4rDHUrnZKD87vObwM1yUXuNQnGG7OSmLZCLxhBNJdHvE p50CZZ9aeFkT0udy2DNm3RGfWKIKJyEzW4uTW7NxKW6B/0x7unPiu6iYqnjRlpCOpP8p P56zemFUzsxrfs4B3zTzvXdhDOUSqWCC6ypdK3Q79eXSJC010dRCApmRb9jvL1mFdeqi 2foQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=TSwMXU6R6S0mG5WgYb8zIcNhvU7+mLypwZDlkRK+PSQ=; b=S3uXwsy8vBWesMBWzFP2JmK5b2dO6tCNc3AhkECXKL4aK2IToqGrAwlTOkn38tiQKm +p8CKZV+oic6gbjkNix4j4VnZnLbn81kljHASMqqE2a47qPNekjg8mjyDx94kh7bPYE3 zahrOsB7iYPIL3+lcPxfHl5XVkeK2O/CdtuHYa7hNsrnt9u0PTI1rrec5C7kZJhw56Fb orynhyTdZaVOVDs2MApmJrXJSrzGmEiKmB955BELIRkD0M25xeZlAVFEWo1GgIqMVRxX a9y3Xj9bF7p3OveJi+8ruqkAtFEIFOKZTfYX6wwDm/1sfvex+LwaTtAGr3hKEwCeQ+Ed Bmeg== X-Gm-Message-State: APt69E1BvE0QgymzEK7suV0yMaGtvOvqIYoFkGnosdMKRvDslvdmSyoD wXITt76AQIEmOoafWTMgfz+gQQ== X-Google-Smtp-Source: AAOMgpdZXMTEbdIyxFpeYamDQMNj5EP/kQtHE6B2Upf58EzlfS+tAYr2eC8jUXtRy6InAolBlGLA0Q== X-Received: by 2002:a2e:750d:: with SMTP id q13-v6mr4990968ljc.56.1530820791856; Thu, 05 Jul 2018 12:59:51 -0700 (PDT) Received: from leviafan ([217.107.194.36]) by smtp.gmail.com with ESMTPSA id l20-v6sm1639910lfg.14.2018.07.05.12.59.50 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 05 Jul 2018 12:59:50 -0700 (PDT) From: Alex Kost To: guix-patches@gnu.org Subject: Fix the build of openscenegraph and openmw Date: Thu, 05 Jul 2018 22:59:52 +0300 Message-ID: <87lgapo3lz.fsf@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. 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.0 (----) X-Debbugs-Envelope-To: submit 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: -5.0 (-----) Currently, =E2=80=98openscenegraph=E2=80=99 and =E2=80=98openmw=E2=80=99 fa= il to build on hydra. The upcoming patches fix these fails. The problem with openscenegraph was the absence of pkg-config. And the problem with openmw is that its current (which is the latest) version does not support qt 5.11, but it is supported in the recent git checkout, so I updated it to one of the latest commits, is it OK? Also I didn't reindented the package definition of openmw, because the introduced =E2=80=98let=E2=80=99 (with commit and revision) will be removed= again after the next update. --=20 Alex From debbugs-submit-bounces@debbugs.gnu.org Thu Jul 05 16:07:14 2018 Received: (at 32063) by debbugs.gnu.org; 5 Jul 2018 20:07:14 +0000 Received: from localhost ([127.0.0.1]:47999 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fbAWx-0004q6-Lm for submit@debbugs.gnu.org; Thu, 05 Jul 2018 16:07:14 -0400 Received: from mail-lf0-f49.google.com ([209.85.215.49]:39607) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fbAWv-0004pc-NB for 32063@debbugs.gnu.org; Thu, 05 Jul 2018 16:07:06 -0400 Received: by mail-lf0-f49.google.com with SMTP id a134-v6so7956494lfe.6 for <32063@debbugs.gnu.org>; Thu, 05 Jul 2018 13:07:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=PRiDtJsLutBjtoAX+sYua8qMMbD1QwRND6TpCqYubvQ=; b=TR1J5FzpC47t1g7/8wihiwD2NAlB6uYbCfJa8I1Rl12Yuzd9xgslZIk+zIbS7IU+rV dC8fPFE+KN8f9QBIK87Wsj6qUpcsxw5pa66njiGDAcIKQhi4y1u/R0FVQOZEhx9fAcK/ EuuVGeXJ/tJMoSo+6+KNW2g+O1GaR8ONmZm1zDxslr65sas/2vXRBf/dtZz8LVdyhMkY 3ED3BXGTFX2Yg8piW04Pt1iWDqjzp437D2wV132HYbxbIArGwp1DbMsfabkNRk647tsM m9XnHn0umXzfcSzqGG+NOlnbUarz3SbyFDA+MfVuSA9I4HtpIM68g9wSiR+dbyV2koca 5gZw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=PRiDtJsLutBjtoAX+sYua8qMMbD1QwRND6TpCqYubvQ=; b=p/CCYCwmZ4K2WAkLYSlkGpHgx6vy6/KQPHTnIEGapYxrCWniX//0EdQThRSS9YGMuU XY3siP8Ruk8OBeIoevEXEXGZ765ajrmzCwYaIvhDMujEoT3PU0MKaL759o0wnc5Fa6WJ FXTwIeVYkle99ID7epkVtAZtrGG6/CG13r+c3k5nagESq8zARenKp1NA2lbsAo6SQVBE flUMwqnB+SvODTATf2/H3pjkABI3nrRztO/jKaZsJC8s3I5DT/bXJfjr3GtJ0uyGmmwS 7J9ZABQEVYLadJSnAPcco9YDxuoESzVrbRZ0DQfESoStSWTCz7M43pWDLf+vKLM6XUsE KeoA== X-Gm-Message-State: APt69E00x6Ui1CI0Ix48NVaU6HWgXKiLTQITt/HIYPPxFnl0Xs6SnfAW GyBPT+KdVhfa/ubHJStYnANVcQ== X-Google-Smtp-Source: AAOMgpeTI3QZLvqidhQoLXG5QBdvcesvOu4GzufUegW5QnD9fj4ff5dNVLYELjiZZDHzvvElc6dRJQ== X-Received: by 2002:a19:e40d:: with SMTP id b13-v6mr5548721lfh.141.1530821219989; Thu, 05 Jul 2018 13:06:59 -0700 (PDT) Received: from localhost.localdomain ([217.107.194.36]) by smtp.gmail.com with ESMTPSA id n73-v6sm1629803lfn.60.2018.07.05.13.06.59 for <32063@debbugs.gnu.org> (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 05 Jul 2018 13:06:59 -0700 (PDT) From: Alex Kost To: 32063@debbugs.gnu.org Subject: [PATCH 2/2] gnu: openmw: Update to a checkout version. Date: Thu, 5 Jul 2018 23:06:15 +0300 Message-Id: <20180705200615.3246-2-alezost@gmail.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180705200615.3246-1-alezost@gmail.com> References: <20180705200615.3246-1-alezost@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 32063 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: -1.0 (-) * gnu/packages/game-development.scm (openmw): Update to the latest commit to fix the build. --- gnu/packages/game-development.scm | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index a715c958c..e3750b1b8 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2014 Tomáš Čech ;;; Copyright © 2015 Mark H Weaver ;;; Copyright © 2015, 2018 Ludovic Courtès -;;; Copyright © 2015 Alex Kost +;;; Copyright © 2015, 2018 Alex Kost ;;; Copyright © 2015, 2016, 2017 David Thompson ;;; Copyright © 2016, 2017, 2018 Efraim Flashner ;;; Copyright © 2016, 2017 Kei Kebreau @@ -1019,18 +1019,23 @@ of use.") (license license:expat))) (define-public openmw + ;; XXX The current version does not support qt 5.11, but the upcoming + ;; version (0.44) will do. + (let ((commit "5bc073603e8c7887e015a0ef41b4cefd6e688aaf") + (revision "1")) (package (name "openmw") - (version "0.43.0") + (version (git-version "0.43" revision commit)) (source (origin - (method url-fetch) - (uri - (string-append "https://github.com/OpenMW/openmw/archive/" - name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/OpenMW/openmw.git") + (commit commit))) + (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "11phjx7b3mv4n295xgq25lkcwq0mgr35i5k05hf1h77y6n6jbw64")))) + "1sp4n3f1syvv0iz7n72wh226fyc0jh98cg8bvs574jvvqx6qn851")))) (build-system cmake-build-system) (arguments `(#:tests? #f ; No test target @@ -1057,7 +1062,7 @@ the 2002 open-world RPG Morrowind. The engine comes with its own editor, called OpenMW-CS which allows the user to edit or create their own original games.") (home-page "https://openmw.org") - (license license:gpl3))) + (license license:gpl3)))) (define-public godot (package -- 2.18.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Jul 05 16:07:18 2018 Received: (at 32063) by debbugs.gnu.org; 5 Jul 2018 20:07:18 +0000 Received: from localhost ([127.0.0.1]:48001 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fbAX4-0004qK-K9 for submit@debbugs.gnu.org; Thu, 05 Jul 2018 16:07:18 -0400 Received: from mail-lf0-f41.google.com ([209.85.215.41]:40359) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fbAWv-0004pb-86 for 32063@debbugs.gnu.org; Thu, 05 Jul 2018 16:07:08 -0400 Received: by mail-lf0-f41.google.com with SMTP id y200-v6so7959821lfd.7 for <32063@debbugs.gnu.org>; Thu, 05 Jul 2018 13:07:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=1j1jz40f4HMTmbWbe0YUCHTGXpL+fJjP1DwrnHGr2kk=; b=QJMwVUJ3El1Z48/rCX0QxtE1TyyIqRK3D2pY3ciigtCSG//SBkcrI57ezH9dF4bQWj xUKVNUeVMGSbl0IYqm+CUiN7ANnAwnKcJIKvFQCAFbFpXzXJgLcd6xHWxtKuMvfU83qp DGVEeW8uQEjiJ0onI5cn9KBaOja7nnQ4Z9rZu4h6mz8tyO343GveJtAXQoYBWNtVTEOO Pou7P2o5T0f5PJ/Cvr5Q7QotzEbDvO7ze7KnF9cZtCv5Nk94cVJ1yFzImLjplVMLPjEi 7rHINJHC1nzSmc0AmoRB6HRkQ3Frp5At0roKR4MP8vXAcEmJs0l7V7Ew7kSp3xJrf8zX OJPA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=1j1jz40f4HMTmbWbe0YUCHTGXpL+fJjP1DwrnHGr2kk=; b=TmUfPtx0wfWZeI98nw21qyolIaCrxCHbKZZt7KPK1MYaMdJdIuA/hMeNuOEk6YADbS sWsKJja/rXHKFckvp0CAp4LkkPKBH9dyeOm51DJw70p1KXr8abzSUDSKQrkcVbnU7p5B Et15fOEFtXDcX6qXfiHso4dJjrWoyu2hRc4fcc5drVerkOuF5z508nZsQ3QT8m7tcrd2 nk/Gm8jXTqDdTKBuKTP6rgtnsw59TmPjSTqDbB3MRfNP8tk/fPLGn4pe9HU6m6SJ1haY 0iZT+XFAP/rgYgajeOwO6mUBjy4za5MUXyy/hknu9GPvgp8vFWJn8HVGYWDLMEddpvhb dBtw== X-Gm-Message-State: APt69E2IkhqHL4mvm+JbHE1HGiq6mGE0FB4Ln10jkeIvmJhclEvuBr85 ND8FvzwSeRotLIw/QfSD2RiMHA== X-Google-Smtp-Source: AAOMgpf84Hta4GS3rkBx0EdrYryC046TSccwy3DQnpr9uNNAchxR87TUZ1PNglylIguAx/xMEMltow== X-Received: by 2002:a19:e803:: with SMTP id f3-v6mr5570678lfh.84.1530821219041; Thu, 05 Jul 2018 13:06:59 -0700 (PDT) Received: from localhost.localdomain ([217.107.194.36]) by smtp.gmail.com with ESMTPSA id n73-v6sm1629803lfn.60.2018.07.05.13.06.58 for <32063@debbugs.gnu.org> (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 05 Jul 2018 13:06:58 -0700 (PDT) From: Alex Kost To: 32063@debbugs.gnu.org Subject: [PATCH 1/2] gnu: openscenegraph: Update to 3.6.2. Date: Thu, 5 Jul 2018 23:06:14 +0300 Message-Id: <20180705200615.3246-1-alezost@gmail.com> X-Mailer: git-send-email 2.18.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 32063 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: -1.0 (-) * gnu/packages/graphics.scm (openscenegraph): Update to 3.6.2. [source]: Use the new url and 'git-fetch' method. [properties]: Add 'upstream-name'. [native-inputs]: Add 'pkg-config'. [inputs]: Add 'libxrandr'. * gnu/packages/patches/openscenegraph-ffmpeg3.patch: Remove file. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - gnu/packages/graphics.scm | 21 ++- .../patches/openscenegraph-ffmpeg3.patch | 156 ------------------ 3 files changed, 13 insertions(+), 165 deletions(-) delete mode 100644 gnu/packages/patches/openscenegraph-ffmpeg3.patch diff --git a/gnu/local.mk b/gnu/local.mk index 10b61ba1b..a86827b17 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -984,7 +984,6 @@ dist_patch_DATA = \ %D%/packages/patches/openfoam-4.1-cleanup.patch \ %D%/packages/patches/openldap-CVE-2017-9287.patch \ %D%/packages/patches/openocd-nrf52.patch \ - %D%/packages/patches/openscenegraph-ffmpeg3.patch \ %D%/packages/patches/opensmtpd-fix-crash.patch \ %D%/packages/patches/openssl-runpath.patch \ %D%/packages/patches/openssl-1.0.2-CVE-2018-0495.patch \ diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index fffe97265..65f023a48 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -9,6 +9,7 @@ ;;; Copyright © 2017, 2018 Ben Woodcroft ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018 Mathieu Othacehe +;;; Copyright © 2018 Alex Kost ;;; ;;; This file is part of GNU Guix. ;;; @@ -408,17 +409,19 @@ visual effects work for film.") (define-public openscenegraph (package (name "openscenegraph") - (version "3.4.0") + (version "3.6.2") (source (origin - (method url-fetch) - (uri (string-append "http://trac.openscenegraph.org/downloads/developer_releases/" - "OpenSceneGraph-" version ".zip")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/openscenegraph/OpenSceneGraph") + (commit (string-append "OpenSceneGraph-" version)))) (sha256 (base32 - "03h4wfqqk7rf3mpz0sa99gy715cwpala7964z2npd8jxfn27swjw")) - (patches (search-patches "openscenegraph-ffmpeg3.patch")) - (file-name (string-append name "-" version ".zip")))) + "03jk6lclyd4biniaw04w7j0z1spkm69f1c19i37b8v9x3zv1p1id")) + (file-name (string-append name "-" version "-checkout")))) + (properties + `((upstream-name . "OpenSceneGraph"))) (build-system cmake-build-system) (arguments `(#:tests? #f ; no test target available @@ -430,11 +433,13 @@ visual effects work for film.") (assoc-ref %outputs "out") "/lib:" (assoc-ref %outputs "out") "/lib64")))) (native-inputs - `(("unzip" ,unzip))) + `(("pkg-config" ,pkg-config) + ("unzip" ,unzip))) (inputs `(("giflib" ,giflib) ("jasper" ,jasper) ("librsvg" ,librsvg) + ("libxrandr" ,libxrandr) ("pth" ,pth) ("qtbase" ,qtbase) ("ffmpeg" ,ffmpeg) diff --git a/gnu/packages/patches/openscenegraph-ffmpeg3.patch b/gnu/packages/patches/openscenegraph-ffmpeg3.patch deleted file mode 100644 index 02c04a558..000000000 --- a/gnu/packages/patches/openscenegraph-ffmpeg3.patch +++ /dev/null @@ -1,156 +0,0 @@ -Description: Replace deprecated FFmpeg API -Author: Andreas Cadhalpun -See . ---- a/src/osgPlugins/ffmpeg/FFmpegDecoderVideo.cpp -+++ b/src/osgPlugins/ffmpeg/FFmpegDecoderVideo.cpp -@@ -71,7 +71,7 @@ void FFmpegDecoderVideo::open(AVStream * - findAspectRatio(); - - // Find out whether we support Alpha channel -- m_alpha_channel = (m_context->pix_fmt == PIX_FMT_YUVA420P); -+ m_alpha_channel = (m_context->pix_fmt == AV_PIX_FMT_YUVA420P); - - // Find out the framerate - m_frame_rate = av_q2d(stream->avg_frame_rate); -@@ -91,20 +91,19 @@ void FFmpegDecoderVideo::open(AVStream * - throw std::runtime_error("avcodec_open() failed"); - - // Allocate video frame -- m_frame.reset(avcodec_alloc_frame()); -+ m_frame.reset(av_frame_alloc()); - - // Allocate converted RGB frame -- m_frame_rgba.reset(avcodec_alloc_frame()); -- m_buffer_rgba[0].resize(avpicture_get_size(PIX_FMT_RGB24, width(), height())); -+ m_frame_rgba.reset(av_frame_alloc()); -+ m_buffer_rgba[0].resize(avpicture_get_size(AV_PIX_FMT_RGB24, width(), height())); - m_buffer_rgba[1].resize(m_buffer_rgba[0].size()); - - // Assign appropriate parts of the buffer to image planes in m_frame_rgba -- avpicture_fill((AVPicture *) (m_frame_rgba).get(), &(m_buffer_rgba[0])[0], PIX_FMT_RGB24, width(), height()); -+ avpicture_fill((AVPicture *) (m_frame_rgba).get(), &(m_buffer_rgba[0])[0], AV_PIX_FMT_RGB24, width(), height()); - - // Override get_buffer()/release_buffer() from codec context in order to retrieve the PTS of each frame. - m_context->opaque = this; -- m_context->get_buffer = getBuffer; -- m_context->release_buffer = releaseBuffer; -+ m_context->get_buffer2 = getBuffer; - } - - -@@ -263,8 +262,8 @@ int FFmpegDecoderVideo::convert(AVPictur - #ifdef USE_SWSCALE - if (m_swscale_ctx==0) - { -- m_swscale_ctx = sws_getContext(src_width, src_height, (PixelFormat) src_pix_fmt, -- src_width, src_height, (PixelFormat) dst_pix_fmt, -+ m_swscale_ctx = sws_getContext(src_width, src_height, (AVPixelFormat) src_pix_fmt, -+ src_width, src_height, (AVPixelFormat) dst_pix_fmt, - /*SWS_BILINEAR*/ SWS_BICUBIC, NULL, NULL, NULL); - } - -@@ -311,14 +310,14 @@ void FFmpegDecoderVideo::publishFrame(co - AVPicture * const dst = (AVPicture *) m_frame_rgba.get(); - - // Assign appropriate parts of the buffer to image planes in m_frame_rgba -- avpicture_fill((AVPicture *) (m_frame_rgba).get(), &(m_buffer_rgba[m_writeBuffer])[0], PIX_FMT_RGB24, width(), height()); -+ avpicture_fill((AVPicture *) (m_frame_rgba).get(), &(m_buffer_rgba[m_writeBuffer])[0], AV_PIX_FMT_RGB24, width(), height()); - - // Convert YUVA420p (i.e. YUV420p plus alpha channel) using our own routine - -- if (m_context->pix_fmt == PIX_FMT_YUVA420P) -+ if (m_context->pix_fmt == AV_PIX_FMT_YUVA420P) - yuva420pToRgba(dst, src, width(), height()); - else -- convert(dst, PIX_FMT_RGB24, src, m_context->pix_fmt, width(), height()); -+ convert(dst, AV_PIX_FMT_RGB24, src, m_context->pix_fmt, width(), height()); - - // Wait 'delay' seconds before publishing the picture. - int i_delay = static_cast(delay * 1000000 + 0.5); -@@ -345,7 +344,7 @@ void FFmpegDecoderVideo::publishFrame(co - - void FFmpegDecoderVideo::yuva420pToRgba(AVPicture * const dst, AVPicture * const src, int width, int height) - { -- convert(dst, PIX_FMT_RGB24, src, m_context->pix_fmt, width, height); -+ convert(dst, AV_PIX_FMT_RGB24, src, m_context->pix_fmt, width, height); - - const size_t bpp = 4; - -@@ -363,31 +362,28 @@ void FFmpegDecoderVideo::yuva420pToRgba( - } - } - -- -- --int FFmpegDecoderVideo::getBuffer(AVCodecContext * const context, AVFrame * const picture) -+int FFmpegDecoderVideo::getBuffer(AVCodecContext * const context, AVFrame * const picture, int flags) - { -+ AVBufferRef *ref; - const FFmpegDecoderVideo * const this_ = reinterpret_cast(context->opaque); - -- const int result = avcodec_default_get_buffer(context, picture); -+ const int result = avcodec_default_get_buffer2(context, picture, flags); - int64_t * p_pts = reinterpret_cast( av_malloc(sizeof(int64_t)) ); - - *p_pts = this_->m_packet_pts; - picture->opaque = p_pts; - -+ ref = av_buffer_create((uint8_t *)picture->opaque, sizeof(int64_t), FFmpegDecoderVideo::freeBuffer, picture->buf[0], flags); -+ picture->buf[0] = ref; -+ - return result; - } - -- -- --void FFmpegDecoderVideo::releaseBuffer(AVCodecContext * const context, AVFrame * const picture) -+void FFmpegDecoderVideo::freeBuffer(void *opaque, uint8_t *data) - { -- if (picture != 0) -- av_freep(&picture->opaque); -- -- avcodec_default_release_buffer(context, picture); -+ AVBufferRef *ref = (AVBufferRef *)opaque; -+ av_buffer_unref(&ref); -+ av_free(data); - } - -- -- - } // namespace osgFFmpeg ---- a/src/osgPlugins/ffmpeg/FFmpegDecoderVideo.hpp -+++ b/src/osgPlugins/ffmpeg/FFmpegDecoderVideo.hpp -@@ -94,8 +94,8 @@ private: - int src_pix_fmt, int src_width, int src_height); - - -- static int getBuffer(AVCodecContext * context, AVFrame * picture); -- static void releaseBuffer(AVCodecContext * context, AVFrame * picture); -+ static int getBuffer(AVCodecContext * context, AVFrame * picture, int flags); -+ static void freeBuffer(void * opaque, uint8_t *data); - - PacketQueue & m_packets; - FFmpegClocks & m_clocks; ---- a/src/osgPlugins/ffmpeg/FFmpegParameters.cpp -+++ b/src/osgPlugins/ffmpeg/FFmpegParameters.cpp -@@ -19,7 +19,7 @@ extern "C" - #include - } - --inline PixelFormat osg_av_get_pix_fmt(const char *name) { return av_get_pix_fmt(name); } -+inline AVPixelFormat osg_av_get_pix_fmt(const char *name) { return av_get_pix_fmt(name); } - - - namespace osgFFmpeg { ---- a/src/osgPlugins/ffmpeg/FFmpegDecoderAudio.cpp 2016-02-18 21:25:39.627923629 +0000 -+++ b/src/osgPlugins/ffmpeg/FFmpegDecoderAudio.cpp 2016-02-18 21:26:17.071140100 +0000 -@@ -227,8 +227,7 @@ - if (avcodec_open2(m_context, p_codec, NULL) < 0) - throw std::runtime_error("avcodec_open() failed"); - -- m_context->get_buffer = avcodec_default_get_buffer; -- m_context->release_buffer = avcodec_default_release_buffer; -+ m_context->get_buffer2 = avcodec_default_get_buffer2; - - } - -- 2.18.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Jul 09 08:39:34 2018 Received: (at 32063) by debbugs.gnu.org; 9 Jul 2018 12:39:34 +0000 Received: from localhost ([127.0.0.1]:51814 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fcVS2-00030V-6Y for submit@debbugs.gnu.org; Mon, 09 Jul 2018 08:39:34 -0400 Received: from eggs.gnu.org ([208.118.235.92]:36581) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fcVS0-00030J-UM for 32063@debbugs.gnu.org; Mon, 09 Jul 2018 08:39:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fcVRs-0003sK-If for 32063@debbugs.gnu.org; Mon, 09 Jul 2018 08:39:27 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:53793) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fcVRs-0003sG-Ex; Mon, 09 Jul 2018 08:39:24 -0400 Received: from [193.50.110.150] (port=58576 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1fcVRs-0000pJ-1E; Mon, 09 Jul 2018 08:39:24 -0400 From: ludo@gnu.org (Ludovic =?utf-8?Q?Court=C3=A8s?=) To: Alex Kost Subject: Re: [bug#32063] Fix the build of openscenegraph and openmw References: <87lgapo3lz.fsf@gmail.com> X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: 21 Messidor an 226 de la =?utf-8?Q?R=C3=A9volution?= X-PGP-Key-ID: 0x090B11993D9AEBB5 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5 X-OS: x86_64-pc-linux-gnu Date: Mon, 09 Jul 2018 14:39:22 +0200 In-Reply-To: <87lgapo3lz.fsf@gmail.com> (Alex Kost's message of "Thu, 05 Jul 2018 22:59:52 +0300") Message-ID: <87a7r0h9c5.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.0 (-----) X-Debbugs-Envelope-To: 32063 Cc: 32063@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: -6.0 (------) Hi Alex, Alex Kost skribis: > Currently, =E2=80=98openscenegraph=E2=80=99 and =E2=80=98openmw=E2=80=99 = fail to build on hydra. The > upcoming patches fix these fails. > > The problem with openscenegraph was the absence of pkg-config. > > And the problem with openmw is that its current (which is the latest) > version does not support qt 5.11, but it is supported in the recent git > checkout, so I updated it to one of the latest commits, is it OK? > > Also I didn't reindented the package definition of openmw, because the > introduced =E2=80=98let=E2=80=99 (with commit and revision) will be remov= ed again after > the next update. I think you can go ahead and push both. Thanks for fixing it! Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Mon Jul 09 12:28:46 2018 Received: (at 32063-done) by debbugs.gnu.org; 9 Jul 2018 16:28:46 +0000 Received: from localhost ([127.0.0.1]:52712 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fcZ1p-0006CX-QY for submit@debbugs.gnu.org; Mon, 09 Jul 2018 12:28:45 -0400 Received: from mail-lj1-f173.google.com ([209.85.208.173]:45639) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fcZ1o-0006CL-Mi for 32063-done@debbugs.gnu.org; Mon, 09 Jul 2018 12:28:45 -0400 Received: by mail-lj1-f173.google.com with SMTP id q5-v6so14541012ljh.12 for <32063-done@debbugs.gnu.org>; Mon, 09 Jul 2018 09:28:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version:content-transfer-encoding; bh=kaCGL4jpAGv2Yrx1nGwVcvn2C++jFusYv07Q/FSA2/I=; b=gsXc80AykS9p6YJDiOm/0F+ePJ1h00Zhp2qvCp3PE6Ui3qeP6cZViO6IBDAyc3aj34 d5Iw5iZZ6O7dp1I+ESDPvdHLIkLa3V5qT+Q/q4tyFsf3j6lxxmpRqrxfJpr+OFvZDl1i n2xjMUok5yrU+lEgmRVE9y7P7s1pns9QEtVCSCXRF6N9JGlS4z8T+dDQLYaristNuzGf NLcjvKQNXvEEcfpc2370smEx8PQjd86QL1LKCG3CLZP5aWeyxmVkF7uVldJGNO0P7V7g X7SU6jhJJfylHLYol9orWQ9UxhSv4F+CreZLk4qYfWSI8yod8EoCZ/TcidyN7VtydTxz j2hw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version:content-transfer-encoding; bh=kaCGL4jpAGv2Yrx1nGwVcvn2C++jFusYv07Q/FSA2/I=; b=CSajyp+9NbNY5tuYgNJFK3eJ7/DNUGFFyWlApkpZmK1B+S1QGpTkRqx6MZdA6sN9hT z4Y/6KFLOv0AGxqnGSOww/DIxHQlAb21HBtM1tUXTggnmhLay2UjfgyDkG3kU+mIdE5C DlGFvCUc2J0oXrgvK10iqPHGEbnzauvjgmv3GmpcUL3LCZ/MMAMF32nS1SBNFJGQIWHd YsNmvkP2cRxR0XsCcKAeJqYobfclvlItcq+Xa3bxQuGy90FofQff9t+Q7gu92gkLsjun klq61LHdSUeSUMucWzXeQLdYvqRPfPvGvYlkhfo1X5Nfq8hI67tb7kZ2PabAtbOjUlz6 YvBA== X-Gm-Message-State: APt69E1Mq5Y0PDboUkgBozL3f+kL+PkS075mgGGBz/YL4qP0zVPh+UYl nwP7EWxMDZHGag6cnaHMpmpMqQ== X-Google-Smtp-Source: AAOMgpcBFtAQAmkP88PFvI2tRX9Y7nSfpQGnkoAfuCBOA1l4W7mJfvoIEknzeg0UI98wr0OVvAs2ew== X-Received: by 2002:a2e:52c3:: with SMTP id n64-v6mr12594997lje.90.1531153718795; Mon, 09 Jul 2018 09:28:38 -0700 (PDT) Received: from leviafan ([217.107.194.24]) by smtp.gmail.com with ESMTPSA id 102-v6sm4238088lfr.35.2018.07.09.09.28.37 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 09 Jul 2018 09:28:37 -0700 (PDT) From: Alex Kost To: ludo@gnu.org (Ludovic =?utf-8?Q?Court=C3=A8s?=) Subject: Re: [bug#32063] Fix the build of openscenegraph and openmw References: <87lgapo3lz.fsf@gmail.com> <87a7r0h9c5.fsf@gnu.org> Date: Mon, 09 Jul 2018 19:28:37 +0300 In-Reply-To: <87a7r0h9c5.fsf@gnu.org> ("Ludovic \=\?utf-8\?Q\?Court\=C3\=A8s\=22'\?\= \=\?utf-8\?Q\?s\?\= message of "Mon, 09 Jul 2018 14:39:22 +0200") Message-ID: <877em4qsp6.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 32063-done Cc: 32063-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: -1.0 (-) Ludovic Court=C3=A8s (2018-07-09 14:39 +0200) wrote: > Hi Alex, > > Alex Kost skribis: > >> Currently, =E2=80=98openscenegraph=E2=80=99 and =E2=80=98openmw=E2=80=99= fail to build on hydra. The >> upcoming patches fix these fails. >> >> The problem with openscenegraph was the absence of pkg-config. >> >> And the problem with openmw is that its current (which is the latest) >> version does not support qt 5.11, but it is supported in the recent git >> checkout, so I updated it to one of the latest commits, is it OK? >> >> Also I didn't reindented the package definition of openmw, because the >> introduced =E2=80=98let=E2=80=99 (with commit and revision) will be remo= ved again after >> the next update. > > I think you can go ahead and push both. > > Thanks for fixing it! Pushed, thanks! --=20 Alex From unknown Fri Aug 08 22:54:03 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, 07 Aug 2018 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