GNU bug report logs - #30678
[PATCH] Update VLC to 3.0.1

Previous Next

Package: guix-patches;

Reported by: <miles.harvey <at> runbox.com>

Date: Fri, 2 Mar 2018 16:28:01 UTC

Severity: normal

Tags: patch

Merged with 30679

Done: Leo Famulari <leo <at> famulari.name>

Bug is archived. No further changes may be made.

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 30678 in the body.
You can then email your comments to 30678 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

View this report as an mbox folder, status mbox, maintainer mbox


Report forwarded to guix-patches <at> gnu.org:
bug#30678; Package guix-patches. (Fri, 02 Mar 2018 16:28:02 GMT) Full text and rfc822 format available.

Acknowledgement sent to <miles.harvey <at> runbox.com>:
New bug report received and forwarded. Copy sent to guix-patches <at> gnu.org. (Fri, 02 Mar 2018 16:28:02 GMT) Full text and rfc822 format available.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: <miles.harvey <at> runbox.com>
To: "guix-patches" <guix-patches <at> gnu.org>
Subject: [PATCH] Update VLC to 3.0.1
Date: Fri, 02 Mar 2018 09:30:37 +0000 (GMT)
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index 8190b0ffc..d668d8235 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -53,7 +53,6 @@
   #:use-module (guix build-system gnu)
   #:use-module (guix build-system glib-or-gtk)
   #:use-module (guix build-system meson)
-  #:use-module (guix build-system perl)
   #:use-module (guix build-system python)
   #:use-module (guix build-system waf)
   #:use-module (gnu packages)
@@ -61,6 +60,7 @@
   #:use-module (gnu packages audio)
   #:use-module (gnu packages autotools)
   #:use-module (gnu packages avahi)
+  #:use-module (gnu packages backup)
   #:use-module (gnu packages base)
   #:use-module (gnu packages bison)
   #:use-module (gnu packages boost)
@@ -89,10 +89,12 @@
   #:use-module (gnu packages gnupg)
   #:use-module (gnu packages gstreamer)
   #:use-module (gnu packages gtk)
+  #:use-module (gnu packages gcc)
   #:use-module (gnu packages image)
   #:use-module (gnu packages imagemagick)
   #:use-module (gnu packages iso-codes)
   #:use-module (gnu packages libreoffice)
+  #:use-module (gnu packages libusb)
   #:use-module (gnu packages linux)
   #:use-module (gnu packages lua)
   #:use-module (gnu packages m4)
@@ -103,12 +105,14 @@
   #:use-module (gnu packages perl)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages popt)
+  #:use-module (gnu packages protobuf)
   #:use-module (gnu packages pulseaudio)
   #:use-module (gnu packages python)
   #:use-module (gnu packages python-crypto)
   #:use-module (gnu packages python-web)
   #:use-module (gnu packages qt)
   #:use-module (gnu packages ruby)
+  #:use-module (gnu packages samba)
   #:use-module (gnu packages sdl)
   #:use-module (gnu packages serialization)
   #:use-module (gnu packages shells)
@@ -116,6 +120,7 @@
   #:use-module (gnu packages texinfo)
   #:use-module (gnu packages textutils)
   #:use-module (gnu packages tls)
+  #:use-module (gnu packages upnp)
   #:use-module (gnu packages version-control)
   #:use-module (gnu packages vulkan)
   #:use-module (gnu packages web)
@@ -810,7 +815,7 @@ audio/video codec library.")
 (define-public vlc
   (package
     (name "vlc")
-    (version "2.2.8")
+    (version "3.0.1")
     (source (origin
              (method url-fetch)
              (uri (string-append
@@ -818,10 +823,11 @@ audio/video codec library.")
                    version "/vlc-" version ".tar.xz"))
              (sha256
               (base32
-               "1v32snw46rkgbdqdy3dssl2y13i8p2cr1cw1i18r6vdmiy24dw4v"))))
+               "008krfhykm9447wc1kkw82bsw3f6ikljgrqyb1sinwlxnkghqw6f"))))
     (build-system gnu-build-system)
     (native-inputs
      `(("git" ,git) ; needed for a test
+       ("gcc" ,gcc)
        ("pkg-config" ,pkg-config)))
     ;; FIXME: Add optional inputs once available.
     (inputs
@@ -829,7 +835,7 @@ audio/video codec library.")
        ("avahi" ,avahi)
        ("dbus" ,dbus)
        ("flac" ,flac)
-       ("ffmpeg" ,ffmpeg-2.8)               ;fails to build against ffmpeg 3.0
+       ("ffmpeg" ,ffmpeg)
        ("fontconfig" ,fontconfig)
        ("freetype" ,freetype)
        ("gnutls" ,gnutls)
@@ -857,16 +863,54 @@ audio/video codec library.")
        ("perl" ,perl)
        ("pulseaudio" ,pulseaudio)
        ("python" ,python-wrapper)
-       ("qtbase" ,qtbase)
+       ;; Qt required instead of just qtbase as it was
+       ;; before, otherwise check_POTFILES.sh test fails.
+       ("qt" ,qt) 
        ("qtx11extras" ,qtx11extras)
        ("sdl" ,sdl)
        ("sdl-image" ,sdl-image)
        ("speex" ,speex)
        ("x265" ,x265)
-       ("xcb-util-keysyms" ,xcb-util-keysyms)))
+       ("xcb-util-keysyms" ,xcb-util-keysyms)
+       ;Optional inputs
+       ;("lua" ,lua) ;Configure phase doesn't find this
+       ("libarchive" ,libarchive)
+       ("livemedia-utils" ,livemedia-utils)
+       ("libbluray" ,libbluray)
+       ("samba" ,samba)
+       ;("nfs-utils" ,(@ (gnu packages nfs) nfs-utils)) ;configure phase doesn't find this
+       ;("freerdp" ,(@ (gnu packages rdesktop) freerdp)) ;causes compilation failure
+       ("libshout" ,libshout)
+       ("libebml" ,libebml)
+       ("libmatroska" ,libmatroska)
+       ("libmodplug" ,libmodplug)
+       ("mpg123" ,mpg123)
+       ;("gstreamer"
+       ; ,(@ (gnu packages gstreamer) gstreamer)) ;configure phase doesn't find this.
+       ("libva" ,libva)
+       ("twolame" ,twolame)
+       ("libdca" ,libdca)
+       ("libmpeg2" ,libmpeg2)
+       ("speexdsp" ,speexdsp)
+       ("fluidsynth" ,fluidsynth)
+       ("libass" ,libass)
+       ("fribidi" ,fribidi)
+       ("librsvg" ,librsvg)
+       ("libcaca" ,libcaca)
+       ("jack" ,jack-1)
+       ("soxr" ,soxr)
+       ("chromaprint" ,chromaprint)
+       ("protobuf" ,protobuf)
+       ("eudev" ,eudev)
+       ("libmtp" ,libmtp)
+       ("libupnp" ,libupnp)
+       ("taglib" ,taglib)
+       ("libsecret" ,libsecret)
+       ("libnotify" ,libnotify)))
     (arguments
      `(#:configure-flags
        `("CXXFLAGS=-std=gnu++11"
+         "BUILDCC=gcc"
          ,(string-append "LDFLAGS=-Wl,-rpath -Wl,"
                          (assoc-ref %build-inputs "ffmpeg")
                          "/lib"))                 ;needed for the tests
@@ -883,10 +927,12 @@ audio/video codec library.")
                ;; which fails in our sandboxed build system
                (substitute* "test/run_vlc.sh"
                  (("./vlc --ignore-config") "echo"))
-               ;; XXX Likely not needed for >2.2.6.
-               (substitute* "modules/gui/qt4/components/interface_widgets.cpp"
-                 (("<qx11info_x11.h>") "<QtX11Extras/qx11info_x11.h>"))
                #t)))
+         (add-after 'build 'fix-misnamed-appdata
+           ;; vlc.appdata.xml.in gets created instead of vlc.appdata.xml, so
+	   ;; we copy it to the correct name - This solution is hacky, if the
+	   ;; root cause is found then please supply a patch.
+           (lambda _ (copy-file "share/vlc.appdata.xml.in" "share/vlc.appdata.xml")))
          (add-after 'install 'regenerate-plugin-cache
            (lambda* (#:key outputs #:allow-other-keys)
              ;; The 'install-exec-hook' rule in the top-level Makefile.am




Merged 30678 30679. Request was from ludo <at> gnu.org (Ludovic Courtès) to control <at> debbugs.gnu.org. (Sat, 03 Mar 2018 21:24:01 GMT) Full text and rfc822 format available.

Information forwarded to guix-patches <at> gnu.org:
bug#30678; Package guix-patches. (Mon, 26 Mar 2018 18:31:02 GMT) Full text and rfc822 format available.

Message #10 received at 30678 <at> debbugs.gnu.org (full text, mbox):

From: Marius Bakke <mbakke <at> fastmail.com>
To: miles.harvey <at> runbox.com, 30678 <at> debbugs.gnu.org
Subject: Re: [bug#30678] [PATCH] Update VLC to 3.0.1
Date: Mon, 26 Mar 2018 20:30:38 +0200
[Message part 1 (text/plain, inline)]
Hello!

Sorry for the sloooow response.

miles.harvey <at> runbox.com writes:

> diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
> index 8190b0ffc..d668d8235 100644
> --- a/gnu/packages/video.scm
> +++ b/gnu/packages/video.scm

Can you resubmit this patch using "git format-patch"?  Please also take
a look at the git log for conventions.  Some comments below.

>      (build-system gnu-build-system)
>      (native-inputs
>       `(("git" ,git) ; needed for a test
> +       ("gcc" ,gcc)

Do you know why GCC is needed?  Normally the one provided by
gnu-build-system is sufficient.

> @@ -857,16 +863,54 @@ audio/video codec library.")
>         ("perl" ,perl)
>         ("pulseaudio" ,pulseaudio)
>         ("python" ,python-wrapper)
> -       ("qtbase" ,qtbase)
> +       ;; Qt required instead of just qtbase as it was
> +       ;; before, otherwise check_POTFILES.sh test fails.
> +       ("qt" ,qt) 

The "qt" package frequently lags behind the "modular" Qt, so we try to
get rid of the former.  Maybe it requires some of the other Qt
"modules"?  What is the error message?

>         ("qtx11extras" ,qtx11extras)
>         ("sdl" ,sdl)
>         ("sdl-image" ,sdl-image)
>         ("speex" ,speex)
>         ("x265" ,x265)
> -       ("xcb-util-keysyms" ,xcb-util-keysyms)))
> +       ("xcb-util-keysyms" ,xcb-util-keysyms)
> +       ;Optional inputs
> +       ;("lua" ,lua) ;Configure phase doesn't find this
> +       ("libarchive" ,libarchive)
> +       ("livemedia-utils" ,livemedia-utils)
> +       ("libbluray" ,libbluray)
> +       ("samba" ,samba)
> +       ;("nfs-utils" ,(@ (gnu packages nfs) nfs-utils)) ;configure phase doesn't find this
> +       ;("freerdp" ,(@ (gnu packages rdesktop) freerdp)) ;causes compilation failure
> +       ("libshout" ,libshout)
> +       ("libebml" ,libebml)
> +       ("libmatroska" ,libmatroska)
> +       ("libmodplug" ,libmodplug)
> +       ("mpg123" ,mpg123)
> +       ;("gstreamer"
> +       ; ,(@ (gnu packages gstreamer) gstreamer)) ;configure phase doesn't find this.
> +       ("libva" ,libva)
> +       ("twolame" ,twolame)
> +       ("libdca" ,libdca)
> +       ("libmpeg2" ,libmpeg2)
> +       ("speexdsp" ,speexdsp)
> +       ("fluidsynth" ,fluidsynth)
> +       ("libass" ,libass)
> +       ("fribidi" ,fribidi)
> +       ("librsvg" ,librsvg)
> +       ("libcaca" ,libcaca)
> +       ("jack" ,jack-1)
> +       ("soxr" ,soxr)
> +       ("chromaprint" ,chromaprint)
> +       ("protobuf" ,protobuf)
> +       ("eudev" ,eudev)
> +       ("libmtp" ,libmtp)
> +       ("libupnp" ,libupnp)
> +       ("taglib" ,taglib)
> +       ("libsecret" ,libsecret)
> +       ("libnotify" ,libnotify)))

Wooooow, that's a lot of new dependencies!  Can you preserve the
alphabetical sorting of inputs?

Thanks for working on it!
[signature.asc (application/pgp-signature, inline)]

Reply sent to Leo Famulari <leo <at> famulari.name>:
You have taken responsibility. (Wed, 29 Aug 2018 20:57:01 GMT) Full text and rfc822 format available.

Notification sent to <miles.harvey <at> runbox.com>:
bug acknowledged by developer. (Wed, 29 Aug 2018 20:57:01 GMT) Full text and rfc822 format available.

Message #15 received at 30678-done <at> debbugs.gnu.org (full text, mbox):

From: Leo Famulari <leo <at> famulari.name>
To: Marius Bakke <mbakke <at> fastmail.com>
Cc: miles.harvey <at> runbox.com, 30678-done <at> debbugs.gnu.org
Subject: Re: [bug#30678] [PATCH] Update VLC to 3.0.1
Date: Wed, 29 Aug 2018 16:56:23 -0400
[Message part 1 (text/plain, inline)]
VLC was updated to 3.0.3 in commit
d0e23e3940bb122cca5657e89e14ae5b7db49be4, so I think this patch is no
longer needed.

I'm closing the bug; please let me know if it should be re-opened.
[signature.asc (application/pgp-signature, inline)]

Reply sent to Leo Famulari <leo <at> famulari.name>:
You have taken responsibility. (Wed, 29 Aug 2018 20:57:02 GMT) Full text and rfc822 format available.

Notification sent to <pkill9 <at> runbox.com>:
bug acknowledged by developer. (Wed, 29 Aug 2018 20:57:02 GMT) Full text and rfc822 format available.

bug archived. Request was from Debbugs Internal Request <help-debbugs <at> gnu.org> to internal_control <at> debbugs.gnu.org. (Thu, 27 Sep 2018 11:24:07 GMT) Full text and rfc822 format available.

This bug report was last modified 5 years and 184 days ago.

Previous Next


GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.