From mboxrd@z Thu Jan 1 00:00:00 1970 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 Subject: [bug#34050] [PATCH] gnu: Add libaom and activate AV1 support in ffmpeg. updated Resent-Message-ID: References: <871s5iemss.fsf@web.de> 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 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 34050@debbugs.gnu.org --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable The following patch now avoids breaking ffmpeg-3.4. From=20f4406df33f1ed6dd64757f43ea7354fd5a88d2d3 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 =2D-- 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 =2D-- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -237,6 +237,40 @@ A/52 standard is used in a variety of applications, in= cluding digital television and DVD. It is also known as AC-3.") (license license:gpl2+))) =20 +(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=3DYES" + "-DENABLE_PIC=3DTRUE" + "-DAOM_TARGET_CPU=3Dgeneric" + (string-append "-DCMAKE_INSTALL_PREFIX=3D" + (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 =2D "0b59qk5wpc5ksiha76jbhb859g5gxa4w0k6afh3kgvgajiivs73l")))= ))) + "0b59qk5wpc5ksiha76jbhb859g5gxa4w0k6afh3kgvgajiivs73l")))) + (arguments + (substitute-keyword-arguments (package-arguments ffmpeg) + ((#:configure-flags flags) + `(delete "--enable-libaom" ,flags)))) + (inputs (fold alist-delete + (package-inputs ffmpeg) + '("libaom"))))) =20 (define-public ffmpegthumbnailer (package =2D-=20 2.19.2 =2D-=20 Unpolitisch sein hei=C3=9Ft politisch sein ohne es zu merken --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEE801qEjXQSQPNItXAE++NRSQDw+sFAlxCXa4ACgkQE++NRSQD w+sWAw//dg8wwGmuY6lKgMCbJhlRcG5mPx13P8o/VySX8ag29/1/LZAzpcmfeWXy 9SWeqNWrlY37lxSd+3aDcN/z63KX0U3e4VEOPweV028ZZK0WXjaYDmxNPtigcrXW IXzAqG3nSoZMKs78LBdoKw5kkJ/Dk9eoJw+qIrWfJCPhwrdPYkLRxWu6OhwfNNhr CuAAlXtGSwo2ctW9dc0JTOVNIOiBcUROkxQns9hVn6dqV7GQId1OpuaDXby355eQ 7QuAj5QtuMq6TUJ6DQxMw9qvO21uRsIpT8YpNo11WK4mZvksl7cZSRHGNsFkWZbT MTgdUkHBvulz5Qo/JQsjuj3eAW9ZnZVGAbswzQ8RiKDDC4TNsRs/Zpo96BTDP683 mN4aTkh2IkfarONnJSrCayTfzFVKLd0abODomqF3C63c+w9lEXS/lPl+A3UKVYAT wVdxgYs+bwhIz1NiftOYDSjWzu9FBJIc/3gKrIRrp40TnHCJ2T/wS6oR2r3HPGwx SL1OHLcR+dWjxU3d+io4hPhotkBgD8N0tn1HdniGna5bUwHGjxw3VwaxgnnFTwPo bJyhSf4ub9yh0LL1OnVW9rQ5/PYCMHwW++bmP+hTEFe9YcsrVEX5TOvDsS1JB0AP D6GUjGO2u+gqBjc+8uAdsk3MPyCskxzTmv6SDPwKbB+ijj7FxiyIswQBAQgAHRYh BN0ovebZh1yrzkqLHdzPDbMLwQVIBQJcQl2uAAoJENzPDbMLwQVIHXsD/1sCRVBG mOtesPZuOZ2+bUbp9mjTk5oTGQC45mz54+BQjgLoHAMadWihgO5I5oB2/YBondfe dIwFhr00foY01MkQXQyhN2WVwY3E9YJw7NrioVF/bPkcmd1KbwG/KYI0di0pB38F bvzY111CWQZLlooZ8G7ac2WAh1pbMX4aIRX1 =Oa0G -----END PGP SIGNATURE----- --=-=-=--