From dd74b0f027a58537384c6de52365a76d224a46cb Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 23 Sep 2009 06:44:26 +0200 Subject: [PATCH] qt-x11-opensource: - build and install xinerama support only if needed --- packages/x11/toolkits/qt-x11-opensource/build | 8 +++++++- packages/x11/toolkits/qt-x11-opensource/install | 4 ++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/packages/x11/toolkits/qt-x11-opensource/build b/packages/x11/toolkits/qt-x11-opensource/build index 94fccdf5f0..c15d3d4f95 100755 --- a/packages/x11/toolkits/qt-x11-opensource/build +++ b/packages/x11/toolkits/qt-x11-opensource/build @@ -16,11 +16,17 @@ $SCRIPTS/build libXext $SCRIPTS/build libXfixes $SCRIPTS/build libXrandr $SCRIPTS/build libXrender -$SCRIPTS/build libXinerama $SCRIPTS/build fontconfig $SCRIPTS/build $MESA $SCRIPTS/build mysql +if [ $XINERAMA = yes ]; then + $SCRIPTS/build libXinerama + QTX11_CONFIG="$QTX11_CONFIG -xinerama" +else + QTX11_CONFIG="$QTX11_CONFIG -no-xinerama" +fi + cd $PKG_BUILD unset CC diff --git a/packages/x11/toolkits/qt-x11-opensource/install b/packages/x11/toolkits/qt-x11-opensource/install index 66eebec97f..45d9867aff 100755 --- a/packages/x11/toolkits/qt-x11-opensource/install +++ b/packages/x11/toolkits/qt-x11-opensource/install @@ -19,6 +19,10 @@ $SCRIPTS/install fontconfig $SCRIPTS/install $MESA $SCRIPTS/install mysql +if [ $XINERAMA = yes ]; then + $SCRIPTS/install libXinerama +fi + mkdir -p $INSTALL/usr/lib cp -PR $PKG_BUILD/lib/libQt3Support.so* $INSTALL/usr/lib cp -PR $PKG_BUILD/lib/libQtCore.so* $INSTALL/usr/lib