Skip to contentSkip to conversation

package/vlc: libX11 is an optional dependency for the qt4 module

PATCH New Bernd Kuhls 2 participants 2 messages Apr 27, 2015

lore
Share & tools
lore

Bernd Kuhls

author
#0 lore raw

PATCH 1/1 package/vlc: libX11 is an optional dependency for the qt4 module

Fixes
http://autobuild.buildroot.net/results/d15/d158095d4caa8f58f1d205aeeb1ae707a1311ea5/
http://autobuild.buildroot.net/results/343/343e2981b60d9d09a4fcd8e2109540f0dc11b402/

Signed-off-by Bernd Kuhls <[email protected]>
---
 package/vlc/0006-qt-x11.patch |   16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 package/vlc/0006-qt-x11.patch
package/vlc/0006-qt-x11.patch new file +16 -0
new file mode 100644
index 0000000..316a31f
@@ -0,0 +1,16 @@
+libX11 is an optional dependency for the qt4 module
+
+Signed-off-by: Bernd Kuhls <[email protected]>
+
+diff -uNr vlc-2.2.1.org/modules/gui/qt4/Makefile.am vlc-2.2.1/modules/gui/qt4/Makefile.am
+--- vlc-2.2.1.org/modules/gui/qt4/Makefile.am	2014-11-29 12:34:15.000000000 +0100
++++ vlc-2.2.1/modules/gui/qt4/Makefile.am	2015-04-27 18:53:36.968611490 +0200
+@@ -22,7 +22,7 @@
+ if HAVE_WIN32
+ libqt4_plugin_la_LIBADD += -lole32 -lcomctl32 -luuid
+ else
+-libqt4_plugin_la_LIBADD += $(X_LIBS) $(X_PRE_LIB) -lX11
++libqt4_plugin_la_LIBADD += $(X_LIBS) $(X_PRE_LIB)
+ endif
+ endif
+ if HAVE_DARWIN
Signature · 1 line
1.7.10.4
Applied
#1 lore raw

PATCH 1/1 package/vlc: libX11 is an optional dependency for the qt4 module

Dear Bernd Kuhls,

Quoted 9 lines · Bernd Kuhls

Fixes
http://autobuild.buildroot.net/results/d15/d158095d4caa8f58f1d205aeeb1ae707a1311ea5/
http://autobuild.buildroot.net/results/343/343e2981b60d9d09a4fcd8e2109540f0dc11b402/

Signed-off-by Bernd Kuhls <[email protected]>
---
 package/vlc/0006-qt-x11.patch |   16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 package/vlc/0006-qt-x11.patch

Applied, thanks, but please submit the patch to upstream VLC.

Thanks again,

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com