Merge lp:~sil2100/qtvideo-node/fix_ftbfs_with_new_libhybris into lp:qtvideo-node

Proposed by Łukasz Zemczak
Status: Merged
Approved by: Ricardo Salveti
Approved revision: 31
Merged at revision: 31
Proposed branch: lp:~sil2100/qtvideo-node/fix_ftbfs_with_new_libhybris
Merge into: lp:qtvideo-node
Diff against target: 11 lines (+1/-1)
1 file modified
src/src.pro (+1/-1)
To merge this branch: bzr merge lp:~sil2100/qtvideo-node/fix_ftbfs_with_new_libhybris
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Ricardo Salveti (community) Approve
Review via email: mp+167509@code.launchpad.net

Commit message

With the new libhybris, it's not called -lmediaplayer but -lmedia

Description of the change

- Problem:

FTBFS with the new libhybris. The problem is, -lmediaplayer cannot be found, as it has been changed to media.so (-lmedia).

- Fix:

Change from -lmediaplayer to -lmedia

- Tests:

N/A

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Ricardo Salveti (rsalveti) wrote :

Good, thanks.

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/src.pro'
2--- src/src.pro 2013-03-12 18:02:14 +0000
3+++ src/src.pro 2013-06-05 11:51:07 +0000
4@@ -11,7 +11,7 @@
5 INSTALLS = target
6
7 INCLUDEPATH += /usr/include/hybris/camera /usr/include/hybris/media /usr/include/libqtubuntu-media-signals
8-LIBS += -lhybris_ics -lcamera -lmediaplayer -lqtubuntu-media-signals
9+LIBS += -lhybris_ics -lcamera -lmedia -lqtubuntu-media-signals
10
11 OTHER_FILES += shadervideonode.json
12

Subscribers

People subscribed via source and target branches