[PATCH 0/4] Add x265

[PATCH 0/4] Add x265

[Efraim Flashner]

I've set up x265 to build the binary because it adds all of ~100kb to the
closure. If we add yasm it builds a CPU-specific binary, which doesn't help
us so much, but does allow us to run the tests. I believe the other patches
hit all of the packages that we have that could benefit from having x265 as
an input.

Efraim Flashner (4):
  gnu: Add x265.
  gnu: ffmpeg: Add x265 support.
  gnu: gst-plugins-bad: Add x265 support.
  gnu: vlc: Add x265 support.

 gnu/packages/gstreamer.scm |  3 ++-
 gnu/packages/video.scm     | 31 +++++++++++++++++++++++++++++++
 2 files changed, 33 insertions(+), 1 deletion(-)

-- 
2.10.1

[PATCH 1/4] gnu: Add x265.

[Efraim Flashner]

* gnu/packages/video.scm (x265): New variable.
---
 gnu/packages/video.scm | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index bd82eb8..6000c5b 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -250,6 +250,34 @@ H.264 (MPEG-4 AVC) video streams.")
                     "file://extras/cl.h"
                     "See extras/cl.h in the distribution.")))))
 
+(define-public x265
+  (package
+    (name "x265")
+    (version "2.1")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (string-append "https://download.videolan.org/videolan/x265/"
+                            "x265_" version ".tar.gz"))
+        (sha256
+         (base32
+          "0hx6sr9l7586gs4qds2sj0i1m5brxkaqq3cwmibhfb559fpvkz48"))))
+    (build-system cmake-build-system)
+    (arguments
+     `(#:tests? #f ; tests are skipped if cpu-optimized code isn't built
+       #:phases
+       (modify-phases %standard-phases
+         (add-before 'configure 'prepare-build
+           (lambda _
+             (delete-file-recursively "build")
+             (chdir "source")
+             #t)))))
+    (home-page "http://x265.org/")
+    (synopsis "Library for encoding h.265/HEVC video streams")
+    (description "x265 is a H.265 / HEVC video encoder application library,
+designed to encode video or images into an H.265 / HEVC encoded bitstream.")
+    (license license:gpl2+)))
+
 (define-public libass
   (package
     (name "libass")
-- 
2.10.1

[PATCH 2/4] gnu: ffmpeg: Add x265 support.

[Efraim Flashner]

* gnu/packages/video.scm (ffmpeg)[inputs]: Add x265.
[arguments]: Add '--enable-libx265' flag.
---
 gnu/packages/video.scm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index 6000c5b..f34205b 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -463,6 +463,7 @@ standards (MPEG-2, MPEG-4 ASP/H.263, MPEG-4 AVC/H.264, and VC-1/VMW3).")
        ("soxr" ,soxr)
        ("speex" ,speex)
        ("twolame" ,twolame)
+       ("x265" ,x265)
        ("xvid" ,xvid)
        ("zlib" ,zlib)))
     (native-inputs
@@ -546,6 +547,7 @@ standards (MPEG-2, MPEG-4 ASP/H.263, MPEG-4 AVC/H.264, and VC-1/VMW3).")
          "--enable-libvpx"
          "--enable-libxvid"
          "--enable-libx264"
+         "--enable-libx265"
          "--enable-openal"
          "--enable-opengl"
          "--enable-x11grab"
-- 
2.10.1

[PATCH 3/4] gnu: gst-plugins-bad: Add x265 support.

[Efraim Flashner]

* gnu/packages/gstreamer.scm (gst-plugins-bad)[inputs]: Add x265.
---
 gnu/packages/gstreamer.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm
index b1785e9..4aea514 100644
--- a/gnu/packages/gstreamer.scm
+++ b/gnu/packages/gstreamer.scm
@@ -292,7 +292,7 @@ developers consider to have good quality code and correct functionality.")
      ;;  vo-amrwbenc, vo-aacenc, bs2b, chromaprint, directfb, daala, libdts,
      ;;  faac, flite, libgsm, libde265, libmms, libmimic, mjpegtools,
      ;;  mpeg2enc, libofa, opencv, openh264, openni2, libtimemmgr, wildmidi,
-     ;;  openspc, gme, sbc, schroedinger, zbar, librtmp, spandsp, x265
+     ;;  openspc, gme, sbc, schroedinger, zbar, librtmp, spandsp
      `(("bluez" ,bluez)
        ("curl" ,curl)
        ("faad2" ,faad2)
@@ -328,6 +328,7 @@ developers consider to have good quality code and correct functionality.")
        ;("qtdeclarative" ,qtdeclarative)
        ;("qtx11extras" ,qtx11extras)
        ("soundtouch" ,soundtouch)
+       ("x265" ,x265)
        ("wayland" ,wayland)))
     (home-page "http://gstreamer.freedesktop.org/")
     (synopsis "Plugins for the GStreamer multimedia library")
-- 
2.10.1

[PATCH 4/4] gnu: vlc: Add x265 support.

[Efraim Flashner]

* gnu/packages/video.scm (vlc)[inputs]: Add x265.
---
 gnu/packages/video.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index f34205b..ca82d30 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -677,6 +677,7 @@ audio/video codec library.")
        ("sdl" ,sdl)
        ("sdl-image" ,sdl-image)
        ("speex" ,speex)
+       ("x265" ,x265)
        ("xcb-util-keysyms" ,xcb-util-keysyms)))
     (arguments
      `(#:configure-flags
-- 
2.10.1

Re: [PATCH 1/4] gnu: Add x265.

[Marius Bakke]

[-- Attachment #1: Type: text/plain, Size: 1764 bytes --]

Efraim Flashner <efraim@flashner.co.il> writes:

> * gnu/packages/video.scm (x265): New variable.
> ---
>  gnu/packages/video.scm | 28 ++++++++++++++++++++++++++++
>  1 file changed, 28 insertions(+)
>
> diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
> index bd82eb8..6000c5b 100644
> --- a/gnu/packages/video.scm
> +++ b/gnu/packages/video.scm
> @@ -250,6 +250,34 @@ H.264 (MPEG-4 AVC) video streams.")
>                      "file://extras/cl.h"
>                      "See extras/cl.h in the distribution.")))))
>  
> +(define-public x265
> +  (package
> +    (name "x265")
> +    (version "2.1")
> +    (source
> +      (origin
> +        (method url-fetch)
> +        (uri (string-append "https://download.videolan.org/videolan/x265/"
> +                            "x265_" version ".tar.gz"))
> +        (sha256
> +         (base32
> +          "0hx6sr9l7586gs4qds2sj0i1m5brxkaqq3cwmibhfb559fpvkz48"))))
> +    (build-system cmake-build-system)
> +    (arguments
> +     `(#:tests? #f ; tests are skipped if cpu-optimized code isn't built
> +       #:phases
> +       (modify-phases %standard-phases
> +         (add-before 'configure 'prepare-build
> +           (lambda _
> +             (delete-file-recursively "build")
> +             (chdir "source")
> +             #t)))))
> +    (home-page "http://x265.org/")
> +    (synopsis "Library for encoding h.265/HEVC video streams")
> +    (description "x265 is a H.265 / HEVC video encoder application library,
> +designed to encode video or images into an H.265 / HEVC encoded bitstream.")
> +    (license license:gpl2+)))

The files in compat/getopt/ are lgpl2.1+. Unbundling it would be even
better, if possible.

Other than that this LGTM!

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 454 bytes --]

Re: [PATCH 4/4] gnu: vlc: Add x265 support.

[Marius Bakke]

[-- Attachment #1: Type: text/plain, Size: 232 bytes --]

Efraim Flashner <efraim@flashner.co.il> writes:

> * gnu/packages/video.scm (vlc)[inputs]: Add x265.

I've built vlc, gst-plugins-bad and ffmpeg with these patches and x265
is referenced.

Not sure how to test it, but LGTM overall.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 454 bytes --]