From patchwork Fri Jan 18 23:13:49 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Dr. Arne Babenhauserheide" X-Patchwork-Id: 765 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 C4AB3169CD; Fri, 18 Jan 2019 23:15:15 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 6937D169BD for ; Fri, 18 Jan 2019 23:15:15 +0000 (GMT) Received: from localhost ([127.0.0.1]:48722 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gkdM1-0002YB-P6 for patchwork@mira.cbaines.net; Fri, 18 Jan 2019 18:15:13 -0500 Received: from eggs.gnu.org ([209.51.188.92]:52118) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gkdLr-0002WU-Ta for guix-patches@gnu.org; Fri, 18 Jan 2019 18:15:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gkdLq-00040I-Qb for guix-patches@gnu.org; Fri, 18 Jan 2019 18:15:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:37874) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gkdLq-0003z1-IC for guix-patches@gnu.org; Fri, 18 Jan 2019 18:15:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gkdLq-0005zG-1d for guix-patches@gnu.org; Fri, 18 Jan 2019 18:15:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#34050] [PATCH] gnu: Add libaom and activate AV1 support in ffmpeg. updated Resent-From: Arne Babenhauserheide Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 18 Jan 2019 23:15:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 34050 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 34050@debbugs.gnu.org Received: via spool by 34050-submit@debbugs.gnu.org id=B34050.154785324222933 (code B ref 34050); Fri, 18 Jan 2019 23:15:01 +0000 Received: (at 34050) by debbugs.gnu.org; 18 Jan 2019 23:14:02 +0000 Received: from localhost ([127.0.0.1]:37155 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gkdKr-0005xf-LE for submit@debbugs.gnu.org; Fri, 18 Jan 2019 18:14:01 -0500 Received: from mout.web.de ([217.72.192.78]:39059) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gkdKo-0005xC-Fc for 34050@debbugs.gnu.org; Fri, 18 Jan 2019 18:13:59 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=web.de; s=dbaedf251592; t=1547853231; bh=5oPGtJPMArkUdGOV+i5MurHwrI0+C/Z3UFRRkoeDfe4=; h=X-UI-Sender-Class:References:From:To:Subject:In-reply-to:Date; b=du4u/kylg9m1ig9zeJ3s90lcemj5OnP9lfGkvBlettKgZcQOU6Ybquu7iDjuz0Qdd GOIfz26EIrALh1AET/Ol31N/26u66qY2CJ3wAtpy5OgEPTRpyS+HL5Wj0nJdB1zjBy GhO9Og0HUAqSgWAs8p/P60IrbMcLzvp3AblSmif8= X-UI-Sender-Class: c548c8c5-30a9-4db5-a2e7-cb6cb037b8f9 Received: from fluss ([80.136.18.3]) by smtp.web.de (mrweb103 [213.165.67.124]) with ESMTPSA (Nemesis) id 0MNtLj-1gqvvY2ISR-007TNx; Sat, 19 Jan 2019 00:13:51 +0100 References: <871s5iemss.fsf@web.de> User-agent: mu4e 1.0; emacs 26.1 From: Arne Babenhauserheide In-reply-to: Date: Sat, 19 Jan 2019 00:13:49 +0100 Message-ID: <87va2l4l02.fsf@web.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:sT0XNMjyM9gN/XMdgcRg1BI0iJ77cMpjfA1tyzUTY8PGZrGS8yo lNQKG9jmvCM4WSHPVp1Kqo5VHLiIJlERiRbWlQPUARrUJK2GUul3Rx8iUORCLuq6YOvT5y2 ssx58rKDPREK3zAKjtbhxyixtNI8A+rNFSksd1Y4Nxod8zJddkbUo4aem249+Mr29XBghO1 vMZbZgfkhs4dgrl6UUlvw== X-UI-Out-Filterresults: notjunk:1;V03:K0:pdK63p79/6Y=:JaBj87jLpA54q/AxMxsyRK 1rUwKuGttnKMB2tLePNQ/YV/qQzb2qiyPF1+tsGHvHvrlB/USy6gR4ZWlUoB51M2Oce3wzn5J eppIqDdD3eO1MhIEZilMNqu3848ZYf8RO14tJjTsIHBQZ4N/z1h6uvqE6os2HZ7w21lHQy5n3 wxK7dmKq1xIFiJA/8ZB207A5xlrq/ti5MxVbyeBig/86oxnycLy/II5Li79JR+1iQAt0NMZYN 6Fm1EUkpwj2Kozq6VJerieaIQ44cNDUN7DSztpbtHWctIV2lIbeTOIdJcbPoNpNNSudeXS8Ju PLGWOFf27seJxiVTCxCO17Td6zkXKdc/utALaFXLfcX7C0/TOOkD/KcWfuM4Yv3JIZ7WtI9Nx D8wpEqMJl9pios+Hv3WYeX7sU51yKmDGue31JSZv7VdUZZnlEITAKe5dGJ/OAvkXICf7nin2m A6xhLNJjfeW+s+O+94gh+CCPfcEk3/ZE/AUtpe9JZjYte496bmrxU4gfxZkrbUy/x9b9yfMPZ 4IM+nadsW+Tl+xvtZXXJGQlj1mcNfck+fp8+M6yMuxPo2NpRsnZbUNuOIQfRYr06hAfHUGxA6 TSF5dVbKQFPxnlmc6VOWCc3aoUFt0ZPm2JtrWQO+P6CQBBZGjjjIgAqBdmNv5zIlfDjJSGOi0 VizldbCJw/55rgSw7PtQlvRkBx7xfFHxrATzvNdXvlrEs/fEiyfJeLqy9+DitxilX17HVh1lD HE2ssRW8dpCK7kzNh2fXUyhdlJdYwlM371hCDMXeM+fwmZ3YYCEfI1henkzWuRYsTtY9m2h4u +CNVz7GMhroz1f+DMst1jFQOgXTW1ZQcJqZQ6D3cwD3DRk1RPPFzsTo36LrEhw8i9hbyE3Jgm HI6lNx2KeZUyEM9+IIZY9jRdHhbLYUQqgikVMe/3ThtKg/2pF5tyQqmY4Mxyf1 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches The following patch now avoids breaking ffmpeg-3.4. From f4406df33f1ed6dd64757f43ea7354fd5a88d2d3 Mon Sep 17 00:00:00 2001 From: Arne Babenhauserheide Date: Sat, 12 Jan 2019 01:24:58 +0100 Subject: [PATCH] gnu: Add libaom and activate AV1 support in ffmpeg. * gnu/packages/video.scm (libaom): New variable. * gnu/packages/video.scm (ffmpeg): Add libaom support. [inputs] new input libaom. [arguments] new configure-flag --enable-libaom. * gnu/packages/video.scm (ffmpeg-3.4): filter out libaom. [inputs] remove inherited libaom [arguments] remove inherited configure-flag --enable-libaom --- gnu/packages/video.scm | 45 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 44 insertions(+), 1 deletion(-) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 947c498c0..a2d56293f 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -237,6 +237,40 @@ A/52 standard is used in a variety of applications, including digital television and DVD. It is also known as AC-3.") (license license:gpl2+))) +(define-public libaom + (package + (name "libaom") + (version "22b150bf040608028a56d8bf39e72f771383d836") ;; master + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://aomedia.googlesource.com/aom/") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1pdd5h3n42607n6qmggz4yv8izhjr2kl6knb3kh7gh4v0vy47h1r")))) + (build-system cmake-build-system) + (native-inputs + `(("git" ,git) + ("perl" ,perl) + ("pkg-config" ,pkg-config) + ("python" ,python))) ; to detect the version + (arguments + `(#:tests? #f ;no check target + #:configure-flags + ;; build dynamic library + (list "-DBUILD_SHARED_LIBS=YES" + "-DENABLE_PIC=TRUE" + "-DAOM_TARGET_CPU=generic" + (string-append "-DCMAKE_INSTALL_PREFIX=" + (assoc-ref %outputs "out"))))) + (home-page "https://aomedia.googlesource.com/aom/") + (synopsis "AV1 Codec Library") + (description "libaom is the reference encoder of AV1.") + (license license:bsd-2))) + + (define-public libmpeg2 (package (name "libmpeg2") @@ -701,6 +735,7 @@ standards (MPEG-2, MPEG-4 ASP/H.263, MPEG-4 AVC/H.264, and VC-1/VMW3).") ("opus" ,opus) ("ladspa" ,ladspa) ("lame" ,lame) + ("libaom" ,libaom) ("libass" ,libass) ("libbluray" ,libbluray) ("libcaca" ,libcaca) @@ -787,6 +822,7 @@ standards (MPEG-2, MPEG-4 ASP/H.263, MPEG-4 AVC/H.264, and VC-1/VMW3).") "--enable-fontconfig" "--enable-gnutls" "--enable-ladspa" + "--enable-libaom" "--enable-libass" "--enable-libbluray" "--enable-libcaca" @@ -869,7 +905,14 @@ audio/video codec library.") version ".tar.xz")) (sha256 (base32 - "0b59qk5wpc5ksiha76jbhb859g5gxa4w0k6afh3kgvgajiivs73l")))))) + "0b59qk5wpc5ksiha76jbhb859g5gxa4w0k6afh3kgvgajiivs73l")))) + (arguments + (substitute-keyword-arguments (package-arguments ffmpeg) + ((#:configure-flags flags) + `(delete "--enable-libaom" ,flags)))) + (inputs (fold alist-delete + (package-inputs ffmpeg) + '("libaom"))))) (define-public ffmpegthumbnailer (package