Merge lp:~brandonsnider/vlc/daily-packaging into lp:~videolan/vlc/daily-packaging

Proposed by Brandon Snider
Status: Merged
Merged at revision: 38
Proposed branch: lp:~brandonsnider/vlc/daily-packaging
Merge into: lp:~videolan/vlc/daily-packaging
Diff against target: 23 lines (+0/-3)
2 files modified
debian/vlc.install.in (+0/-1)
debian/vlc.lintian-overrides (+0/-2)
To merge this branch: bzr merge lp:~brandonsnider/vlc/daily-packaging
Reviewer Review Type Date Requested Status
Gianfranco Costamagna Approve
Review via email: mp+291462@code.launchpad.net

Description of the change

Fixed current build failures due to missing usr/lib/vlc/plugins/gui/libqt4_plugin.so and also got rid of the lintian override for that plugin.

To post a comment you must log in.
Revision history for this message
Gianfranco Costamagna (costamagnagianfranco) wrote :

thanks for fixing the branch name!

review: Approve
Revision history for this message
Gianfranco Costamagna (costamagnagianfranco) wrote :

BTW, do you know why the plugin has been removed, or if there is a new one replacing it? Disabling features has to be taken in consideration for vlc

Revision history for this message
Gianfranco Costamagna (costamagnagianfranco) wrote :

I merged it, qt4 support seems to have disappeared in Debian, and because of some wl-asneeded difference it didn't fail on Debian too.

review: Approve
Revision history for this message
Gianfranco Costamagna (costamagnagianfranco) wrote :

I had to revert, qt5 builds seems to make plugins link x11, and fail than because of "Borked" plugins.

I'll see how a qt4 build goes

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/vlc.install.in'
2--- debian/vlc.install.in 2015-09-24 19:56:40 +0000
3+++ debian/vlc.install.in 2016-04-10 18:30:22 +0000
4@@ -11,7 +11,6 @@
5 usr/lib/vlc/plugins/codec/libvaapi_drm_plugin.so
6 usr/lib/vlc/plugins/codec/libvaapi_x11_plugin.so
7 usr/lib/vlc/plugins/control/libxcb_hotkeys_plugin.so
8-usr/lib/vlc/plugins/gui/libqt4_plugin.so
9 usr/lib/vlc/plugins/gui/libskins2_plugin.so
10 usr/lib/vlc/plugins/misc/libxdg_screensaver_plugin.so
11 usr/lib/vlc/plugins/services_discovery/libpulselist_plugin.so
12
13=== modified file 'debian/vlc.lintian-overrides'
14--- debian/vlc.lintian-overrides 2013-10-22 23:04:03 +0000
15+++ debian/vlc.lintian-overrides 2016-04-10 18:30:22 +0000
16@@ -2,7 +2,5 @@
17 vlc binary: desktop-command-not-in-package usr/share/applications/vlc.desktop usr/bin/vlc
18 # The icon is in vlc-data (the arch=all package)
19 vlc binary: menu-icon-missing usr/share/icons/hicolor/32x32/apps/vlc.xpm
20-# Lintian fails to detect UTF-8 names (bug #588661)
21-vlc binary: spelling-error-in-binary usr/lib/vlc/plugins/gui/libqt4_plugin.so ment meant
22 # Hardening compiler flags are correctly passed (bug #695319)
23 vlc binary: hardening-no-fortify-functions usr/lib/vlc/plugins/video_output/libxcb_window_plugin.so

Subscribers

People subscribed via source and target branches

to all changes: