1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-28 00:22:13 +00:00
nixpkgs/pkgs/applications/video
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
..
aegisub
avidemux avidemux: 2.6.16 -> 2.6.18 2017-01-12 20:13:12 +01:00
avxsynth
bomi treewide: quote homepages in my packages 2017-01-31 03:27:10 +03:00
byzanz Remove myself from maintainers 2017-01-31 11:00:14 +01:00
cinelerra Add fixed cinelerra 2017-01-28 20:12:51 +01:00
clipgrab clipgrab: 3.6.1 -> 3.6.2 2017-01-26 03:52:48 +01:00
coriander treewide: explicitly specify gtk and related package versions 2016-09-12 18:26:06 +03:00
devede devede: 3.23.0 → 4.8.8 2017-03-05 14:48:22 +01:00
dvb-apps
dvd-slideshow Replace hard coded /bin/bash occurrences 2016-10-04 20:15:37 +02:00
dvdauthor
dvdbackup
dvdstyler dvdstyler: init at 3.0.3 2017-03-06 17:36:28 +01:00
gnome-mplayer gnome_mplayer: fix src and build 2017-03-18 12:47:57 +01:00
gnome-mpv
gpac Disable bunch of non-compiling packages on Darwin 2016-09-01 20:39:33 +03:00
handbrake handbrake: 1.0.3 -> 1.0.7 2017-04-16 19:42:32 +08:00
k9copy
kazam treewide: explicitly specify gtk and related package versions 2016-09-12 18:26:06 +03:00
key-mon key-mon: do not use top-level python packages 2016-09-25 23:59:21 +02:00
kino treewide: explicitly specify gtk and related package versions 2016-09-12 18:26:06 +03:00
kmplayer kde4.kdelibs -> kdelibs4 2017-02-24 17:16:28 -06:00
kodi Kodi: use kodi fork of libdvdnav/libdvdread. Fix #24153 (dvd playback) 2017-04-07 07:55:07 +02:00
linuxstopmotion
lxdvdrip
makemkv makemkv: 1.9.10 -> 1.10.4 2017-01-14 18:33:35 +01:00
mediathekview
minitube
miro gst-plugins-base: align attrname with pkgname 2017-02-27 12:16:26 +01:00
mjpg-streamer
mkcast treewide: explicitly specify gtk and related package versions 2016-09-12 18:26:06 +03:00
mkvtoolnix mkvtoolnix-cli: fix build on darwin 2017-03-13 21:20:26 +00:00
motion motion: init at 4.0.1 2016-11-08 10:55:13 +11:00
mplayer treewide: purge maintainers.urkud 2017-03-27 19:52:29 +02:00
mpv mpv: 0.23.0 -> 0.24.0 2017-02-26 10:26:12 +01:00
mythtv
natron natron: init at 2.1.9 2017-01-06 15:49:35 +11:00
obs-studio obs-studio: use upstream crash fixes, drop patch 2017-03-25 21:08:08 -07:00
ogmtools
omxplayer
openshot-qt openshot-qt: 2.2.0 -> 2.3.1 (#24868) 2017-04-16 21:09:22 +02:00
p2pvc
pitivi Python: more evaluation fixups. 2016-10-14 00:03:12 +02:00
qarte qarte: 3.2.0+146 -> 3.2.0+158 2017-01-14 17:04:51 +01:00
qgifer
quvi libquvi: specify glib dependency 2016-11-24 01:17:55 +03:00
recordmydesktop Remove myself from maintainers 2017-01-31 11:00:14 +01:00
shotcut Updating shotcut to 17.02. 2017-02-02 10:25:47 +01:00
simplescreenrecorder simplescreenrecorder: 0.3.6 -> 0.3.8 2017-03-06 07:56:33 -05:00
smplayer smplayer: 17.2.0 -> 17.3.0 2017-03-08 23:02:03 +01:00
smtube smtube: 16.7.2 -> 17.1.0 2017-02-11 13:46:42 +01:00
streamlink streamlink: 0.3.0 -> 0.5.0 2017-04-17 01:24:28 +02:00
subtitleeditor subtitle-editor: fix build 2017-02-12 21:14:09 +01:00
tivodecode
uvccapture
vlc vlc: Fix build for Qt >= 5.7.0 2017-04-19 05:09:47 +02:00
vokoscreen vokoscreen: don't use qt.full 2017-02-03 18:21:16 +03:00
w_scan w_scan: init at 20161022 2016-11-14 17:20:23 +01:00
wxcam
xawtv
xine-ui
xvidcap treewide: explicitly specify gtk and related package versions 2016-09-12 18:26:06 +03:00
zdfmediathk