Commit graph

92 commits

Author SHA1 Message Date
aszlig
b017935103
vlc: Fix build for Qt >= 5.7.0
This basically does something similar than the AUR build:

https://aur.archlinux.org/packages/vlc-qt5/

On our side, all there is to do is to force compiling using C++11 mode
and use a patch that the AUR package took from the following upstream
patchwork URL:

https://patches.videolan.org/patch/14061/

Instead of passing CXXFLAGS to the configure script, I'm using sed here
to make sure we don't override flags figured out by configure.

For example if ./configure is used with CXXFLAGS=-std=c++11 appended or
prepended, we have something like:

... -I../include   -std=c++11 -Wall -Wextra -Wsign-compare ...

While if we don't do that at all, we have something like:

... -I../include   -g -O2 -Wall -Wextra -Wsign-compare ...

Another way would be to use NIX_CFLAGS_COMPILE, but that would affect
even compilation of C code and thus resulting in a bunch of warnings
like this:

cc1: warning: command line option '-std=c++11' is valid for C++/ObjC++
              but not for C

So with our approach the flags during build look much better:

... -I../include   -std=c++11 -g -O2 -Wall -Wextra -Wsign-compare ...

Another thing I've changed is that the vlc_qt5 attribute in
all-packages.nix now uses the latest Qt 5 version, because the build for
Qt >= 5.7.0 is now no longer broken.

I've also ordered the preConfigure attribute before the configureFlags
attribute, because it makes more sense in terms of context (pre ->
configure -> post).

Tested by building on x86_64-linux with libsForQt56.vlc, libsForQt58.vlc
and vlc (the Qt 4 version, just to be sure I didn't accidentally break
it).

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @ttuegel
2017-04-19 05:09:47 +02:00
Tuomas Tynkkynen
ffddcc8807 vlc_npapi: Fix hash 2016-09-11 00:21:16 +03:00
Thomas Tuegel
e25a07e92a
qt5.vlc: mark broken with Qt 5.7 2016-09-07 20:57:55 -05:00
Lluís Batlle i Rossell
9ef3a51379 Adding vlc plugin for firefox.
I really wanted it to substitute the html5 player, or at least the direct
player for mp4/webm files in firefox, but I couldn't make it work. The
formats recognized by the firefox internal player were used in all cases. The
plugin worked for formats unknown by firefox.

https://support.mozilla.org/ca/questions/1089501

Nevertheless, as I wrote the nix recipe, I commit it. It may be of interest to
someone else.
2016-08-23 10:16:37 +02:00
Franz Pletz
64ab827873 vlc: 2.2.3 -> 2.2.4 (security)
Fixes CVE-2016-5108.
2016-07-10 10:48:10 +02:00
Tobias Geerinckx-Rice
709eaaf98e
vlc: 2.2.2 -> 2.2.3 2016-05-25 02:06:47 +02:00
Guillaume Maudoux
43cf5d3369 vlc: fixes the two windows issue with qt5
Fixes #14610.
2016-04-12 15:55:44 +02:00
Vladimír Čunát
ed47bb1ca8 qt55.vlc: fix build
I tested it on a video to make sure the bug doesn't appear.
2016-03-28 14:37:25 +02:00
Pascal Wittmann
ab742b42ab vlc: 2.2.1 -> 2.2.2 and take maintainership 2016-02-21 08:03:16 +01:00
Vladimír Čunát
1e04d875db videolan.org sources: prefer http://get.videolan.org
Some of the original URLs were broken now.
It seems that set of mirrors is preferred and faster than the others.
In the x264 case the source isn't there so http://download.videolan.org
is used instead.
2016-02-07 13:21:18 +01:00
Nikolay Amiantov
d573b1e7a9 vlc: add midi support via fluidsynth 2015-12-01 20:46:31 +03:00
Ilya Novoselov
398611fb6c vlc: added live555 dependency 2015-11-05 15:47:04 +01:00
Thomas Tuegel
c9a6d288b5 vlc_qt5: build with Qt 5.5 2015-09-27 15:08:10 -05:00
Vladimír Čunát
76ef7a93e3 Merge: xlibs and x11 attribute cleanup
Frequently using multiple *almost* identical attributes is bad.
2015-09-23 10:42:34 +02:00
Martin Sturm
9e0519e554 vlc: use libsamplerate
Change the sample rate converter used from default "ugly_resampler" to
libsamplerate (aka secret rabbit code).
2015-09-18 10:17:21 +02:00
Vladimír Čunát
88c9f8b574 xlibs: replace occurrences by xorg
This seems to have been confusing people, using both xlibs and xorg, etc.
- Avoided renaming local (and different) xlibs binding in gcc*.
- Fixed cases where both xorg and xlibs were used.
Hopefully everything still works as before.
2015-09-15 12:54:34 +02:00
Vladimír Čunát
0c74f18e4c xlibs.xlibs: remove
It was really ugly that `xlibs.xlibs` meant something else than `xlibs`,
especially when using `with xlibs`, such as in wine.
Also, now `xlibs` is the same as `xorg`.
2015-09-15 11:59:33 +02:00
William A. Kennington III
7297255019 Convert all jack references to libjack2 2015-06-27 00:17:52 -07:00
Eelco Dolstra
ab8a2b0c78 vlc: Don't depend on JACK by default
To reduce dependency bloat, packages should not depend on non-standard
audio systems by default.
2015-06-24 12:20:38 +02:00
William A. Kennington III
b07929b0a3 Use libpulseaudio instead of pulseaudio 2015-05-29 14:32:56 -07:00
Spencer Whitt
01d7d24dbb libdvdnav: 4.2.1 -> 5.0.3
Keeping the old version around for now in order to support mplayer.
2015-05-14 23:26:16 -04:00
William A. Kennington III
f8caa8f940 vlc: 2.2.0 -> 2.2.1 2015-05-10 22:34:53 -07:00
Peter Simons
f30743b86b Revert "VLC wants a newer version of libdvdnav" 2015-03-19 13:19:17 +01:00
Peter Jones
05d6d77c8e VLC wants a newer version of libdvdnav
* Updated libdvdnav/libdvdread to latest versions

  * Removed libdvdnav patches since they have been incorporated into the
    latest release

  * Added `--enable-dvdnav` configure flag to VLC to ensure that if this
    happens again VLC will fail to build
2015-03-18 14:37:12 -06:00
Domen Kožar
362ba73ac6 vlc: 2.1.5 -> 2.2.0 2015-02-28 23:24:10 +01:00
Thomas Tuegel
8cf78bf5f4 update various packages to use Qt 5.4 2015-02-21 11:39:20 -06:00
Matej Cotman
eebc60d7f9 vlc: change url 2014-12-19 15:22:31 +01:00
Thomas Tuegel
66ebc65cd3 phonon-backend-vlc: add Qt 5 support 2014-11-20 11:11:12 -06:00
Bjørn Forsman
62d0a320b3 Revert "Remove obsolete jackaudio version 1."
This reverts commit bdb77826d9.

Jack1 is not obsolete and neither jack1 nor jack2 is called 'jackaudio'.

Q: What's the difference between Jack1 and Jack2?
A: http://trac.jackaudio.org/wiki/Q_differenc_jack1_jack2
2014-07-31 12:52:29 +02:00
Vladimír Čunát
be07584397 vlc: minor update 2014-07-30 09:31:24 +02:00
Peter Simons
bdb77826d9 Remove obsolete jackaudio version 1. 2014-07-28 20:32:52 +02:00
Bjørn Forsman
f6f2f38a6e jack: change package and attr names to 'jack1' and 'jack2'
Currently, we have a 'jack' package with attrname 'jack1d' and a
'jackdbus' package with attrname 'jackaudio'. Make it consistent 'jack1'
and 'jack2' in both package name and attrname.

This aligns the naming with what can be found on the JACK homepage.

Q: what's the difference between jack1 and jack2?
A: http://trac.jackaudio.org/wiki/Q_differenc_jack1_jack2
2014-07-23 20:22:14 +02:00
ambrop7@gmail.com
0b1e408b6b vlc: Build with VDPAU support (close #2096) 2014-04-02 23:14:18 +02:00
Matej Cotman
13bc37ed3e vlc: ncurses support (close #2012) 2014-03-23 20:21:16 +01:00
Evgeny Egorochkin
d380290640 vlc: update from 2.1.3 to 2.1.4 2014-02-27 18:35:34 +02:00
Moritz Ulrich
c7eb4982f3 vlc: update from 2.1.2 to 2.1.3 2014-02-16 16:35:35 +01:00
William A. Kennington III
b05d8d8310 vlc: Update from 2.1.1 -> 2.1.2 2013-12-29 21:35:01 +01:00
Domen Kožar
c1df906704 vlc: specify meta.platforms 2013-12-08 19:19:11 +01:00
Domen Kožar
32cd0be64c vlc: add mkv support 2013-12-08 19:18:59 +01:00
Vladimír Čunát
ac6bc8c990 vlc: minor update 2.1.0 -> .1 2013-11-14 22:57:26 +01:00
Domen Kožar
71d19afafd vlc: 2.0.8a -> 2.1.0 2013-09-26 16:37:58 +02:00
Jonas Hoersch
786ff721c8 vlc: update to version 2.0.8a
this new release together with an updated ffmpeg solves segfaults
errors, i was having for some videos.
2013-09-16 07:08:43 +02:00
Jonas Hoersch
e72c2ddee4 vlc: update to version 2.0.8 2013-08-19 22:03:54 +02:00
Vladimír Čunát
f724a5314b flac: update, enable tests
Fix includes in VLC.
Tried a few other programs using it, seems fine.
2013-06-11 15:48:42 +02:00
Mathijs Kwik
ca392fb8a9 vlc: upgrade to 2.0.6 2013-04-12 11:40:33 +02:00
Mathijs Kwik
fd76305a9b vlc: enable support for the opus codec 2013-04-08 08:38:10 +02:00
Eelco Dolstra
5bb548d2e4 Merge remote-tracking branch 'origin/master' into stdenv-updates 2013-01-17 14:19:14 +01:00
Vladimír Čunát
479b58d706 Update vlc (minor bugfix). 2013-01-14 12:21:22 +01:00
Eelco Dolstra
ab3eeabfed Rename buildNativeInputs -> nativeBuildInputs
Likewise for propagatedBuildNativeInputs, etc.  "buildNativeInputs"
sounds like an imperative rather than a noun phrase.
2012-12-28 19:20:09 +01:00
Eduard Carreras
76d8f6b7be VLC: update to v2.0.4 2012-10-19 18:57:19 +02:00