summaryrefslogtreecommitdiffstats
path: root/package
diff options
context:
space:
mode:
authorBernd Kuhls <bernd.kuhls@t-online.de>2015-04-27 19:01:25 +0200
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>2015-04-27 23:30:41 +0200
commita14570fe719848b4c8a4522565ac9fd39280c6f0 (patch)
treedb0da64e7f656df44aa29158fb2d47f966d9d844 /package
parent968cf1fc8df2eaea0ddc8e03fea09bbd4f143249 (diff)
downloadbuildroot-a14570fe719848b4c8a4522565ac9fd39280c6f0.tar.gz
buildroot-a14570fe719848b4c8a4522565ac9fd39280c6f0.zip
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 <bernd.kuhls@t-online.de> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package')
-rw-r--r--package/vlc/0006-qt-x11.patch16
1 files changed, 16 insertions, 0 deletions
diff --git a/package/vlc/0006-qt-x11.patch b/package/vlc/0006-qt-x11.patch
new file mode 100644
index 0000000000..316a31fd8f
--- /dev/null
+++ b/package/vlc/0006-qt-x11.patch
@@ -0,0 +1,16 @@
+libX11 is an optional dependency for the qt4 module
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+
+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
OpenPOWER on IntegriCloud