diff mbox

[11/13] gnu: vlc: Fix regression caused by update to qt 5.7.

Message ID 20160821140825.13048-11-david@craven.ch
State New
Headers show

Commit Message

David Craven Aug. 21, 2016, 2:08 p.m. UTC
* gnu/packages/video.scm (vlc)[inputs]: Use qt 5.6.1-1. Add libinput and libxi.
---
 gnu/packages/video.scm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

Comments

Mark H Weaver Aug. 21, 2016, 8:10 p.m. UTC | #1
David Craven <david@craven.ch> writes:
> * gnu/packages/video.scm (vlc)[inputs]: Use qt 5.6.1-1. Add libinput and libxi.

The summary line is a bit misleading, because it leads me to guess that
this commit gets vlc working with Qt 5.7.  Better to write "gnu: vlc:
Use Qt 5.6.1."

Is it necessary to add 'libinput' and 'libxi' to fix this regression, or
is that an unrelated change to add new features?  If the latter, please
add those in a separate commit.

> @@ -635,7 +638,7 @@ audio/video codec library.")
>         ("perl" ,perl)
>         ("pulseaudio" ,pulseaudio)
>         ("python" ,python-wrapper)
> -       ("qtbase" ,qtbase)
> +       ("qtbase" ,qt)

Please change the string to "qt" as well.

      Thanks,
        Mark
David Craven Aug. 21, 2016, 11:06 p.m. UTC | #2
libxi is required for it to build, I don't know why it worked before.
libinput is not strictly required, but I saw libinput.h not found
falling back to ... and since libinput is already in qt's dependency
graph, we can add it. But I'll make it a separate commit.

I left the qtbase string as documentation, as has been done in other
places. Do you think it's a bad idea (to not use the same string as
the package name)?
Leo Famulari Aug. 21, 2016, 11:16 p.m. UTC | #3
On Mon, Aug 22, 2016 at 01:06:39AM +0200, David Craven wrote:
> I left the qtbase string as documentation, as has been done in other
> places. Do you think it's a bad idea (to not use the same string as
> the package name)?

My understanding is that the 'qt' package is not the same thing as the
'qtbase' package. 'qt' is the all-in-one Qt, whereas 'qtbase' is the
base package of the modularized Qt that Efraim has been working on.

So, I do think it's a good idea to use that string as documentation but,
in this case, I think that using "qtbase" is inappropriate. What do you
think?
David Craven Aug. 21, 2016, 11:19 p.m. UTC | #4
> So, I do think it's a good idea to use that string as documentation but,
> in this case, I think that using "qtbase" is inappropriate. What do you
> think?

So what would be a better string? "needs qtbase"?
Leo Famulari Aug. 21, 2016, 11:24 p.m. UTC | #5
On Mon, Aug 22, 2016 at 01:19:05AM +0200, David Craven wrote:
> > So, I do think it's a good idea to use that string as documentation but,
> > in this case, I think that using "qtbase" is inappropriate. What do you
> > think?
> 
> So what would be a better string? "needs qtbase"?

I would just use "qt", and mention that it should instead use qtbase in
a code comment.
David Craven Aug. 21, 2016, 11:24 p.m. UTC | #6
I ended up doing it like this:
 ("qt" ,qt) ; FIXME: reenable modular qt after update - requires building
 ;("qtbase" ,qtbase) with -std=gnu++11.
 ;("qtx11extras" ,qtx11extras)
Mark H Weaver Aug. 22, 2016, 12:21 p.m. UTC | #7
David Craven <david@craven.ch> writes:

> I ended up doing it like this:
>  ("qt" ,qt) ; FIXME: reenable modular qt after update - requires building
>  ;("qtbase" ,qtbase) with -std=gnu++11.
>  ;("qtx11extras" ,qtx11extras)

Sounds good.  Thanks for taking care of these regressions!

     Mark
diff mbox

Patch

diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index 28e49b3..45f8a28 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -53,6 +53,7 @@ 
   #:use-module (gnu packages databases)
   #:use-module (gnu packages elf)
   #:use-module (gnu packages fontutils)
+  #:use-module (gnu packages freedesktop)
   #:use-module (gnu packages fribidi)
   #:use-module (gnu packages gettext)
   #:use-module (gnu packages ghostscript)
@@ -617,6 +618,7 @@  audio/video codec library.")
        ("gnutls" ,gnutls)
        ("libcddb" ,libcddb)
        ("libgcrypt" ,libgcrypt)
+       ("libinput" ,libinput-minimal)
        ("libkate" ,libkate)
        ("libmad" ,libmad)
        ("libogg" ,libogg)
@@ -626,6 +628,7 @@  audio/video codec library.")
        ("libvorbis" ,libvorbis)
        ("libtheora" ,libtheora)
        ("libxext" ,libxext)
+       ("libxi" ,libxi)
        ("libxinerama" ,libxinerama)
        ("libxml2" ,libxml2)
        ("libxpm" ,libxpm)
@@ -635,7 +638,7 @@  audio/video codec library.")
        ("perl" ,perl)
        ("pulseaudio" ,pulseaudio)
        ("python" ,python-wrapper)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qt)
        ;("qtx11extras" ,qtx11extras)
        ("sdl" ,sdl)
        ("sdl-image" ,sdl-image)