Browse Source

qt: Update Qt 5.15.2 and build scripts

Mostly the same package, but fixes numerous bugs with the previous:
missing xcb and related libraries, rpaths of binaries don't link to
each other, directory names are now usable in yuzu.
__refs_pull_4_head
lat9nq 5 years ago
parent
commit
41b2314dab
  1. 22
      icu/build_icu.sh
  2. 22
      icu/start_build.sh
  3. 0
      qt/YOU_MUST_BUILD_AND_INCLUDE_ICU_WITH_QT
  4. 13
      qt/build_qt.sh
  5. BIN
      qt/qt5_5_15_2.tar.xz

22
icu/build_icu.sh

@ -0,0 +1,22 @@
#!/bin/bash
# This script is meant to make it easy to rebuild packages using the
# linux-fresh yuzu-emu container.
# Run this from within the source directory
THIS=$(readlink -e $0)
USER_ID=${1}
GROUP_ID=${2}
VERSION=5_15_2
BASE_NAME=$(readlink -e $(pwd) | sed 's/.*\///g')
ARCHIVE_NAME=${BASE_NAME}_${VERSION}.tar.xz
NUM_CORES=$(nproc)
mkdir build || true
cd build
mkdir out || true
../configure
make -j${NUM_CORES} install DESTDIR=out

22
icu/start_build.sh

@ -0,0 +1,22 @@
#!/bin/bash
# Kicks off the build script using the linux-fresh build container.
if [ "$#" -ne 2 ]; then
echo "usage: $0 <Source directory> <Build script>"
exit
fi
UID=`id -u`
GID=`id -g`
SRC_DIR=$(readlink -e $1)
SRC_DIR_BASENAME=$(basename ${SRC_DIR})
SCRIPT=$(readlink -e $2)
SCRIPT_BASENAME=$(basename ${SCRIPT})
cp ${SCRIPT} ${SRC_DIR}
docker run -v ${SRC_DIR}:/${SRC_DIR_BASENAME} -w /${SRC_DIR_BASENAME} -u root -t yuzuemu/build-environments:linux-fresh /bin/bash /${SRC_DIR_BASENAME}/${SCRIPT_BASENAME} ${UID} ${GID}
exit
SRC_DIR=${SRC_DIR}/qtwebengine
docker run -v ${SRC_DIR}:/${SRC_DIR_BASENAME} -w /${SRC_DIR_BASENAME} -u root -t yuzuemu/build-environments:linux-fresh /bin/bash /${SRC_DIR_BASENAME}/${SCRIPT_BASENAME} ${UID} ${GID}

0
qt/YOU_MUST_BUILD_AND_INCLUDE_ICU_WITH_QT

13
qt/build_qt.sh

@ -17,18 +17,9 @@ NUM_CORES=$(nproc)
mkdir build || true mkdir build || true
cd build cd build
mkdir out || true mkdir out || true
../configure -opensource -confirm-license -prefix $(pwd)/out
../configure -opensource -confirm-license -prefix $(pwd)/out -xcb -xcb-xlib -qpa xcb -xkbcommon -gtk -icu
make -j${NUM_CORES} NINJAJOBS=-j${NUM_CORES} make -j${NUM_CORES} NINJAJOBS=-j${NUM_CORES}
make -j${NUM_CORES} install DESTDIR=out make -j${NUM_CORES} install DESTDIR=out
mkdir -pv ${BASE_NAME}/
mv -v build/out/* ${BASE_NAME}/
cp -v ${THIS} ${BASE_NAME}/
tar cv ${BASE_NAME} | xz -c > ${ARCHIVE_NAME}
if [ -e ${ARCHIVE_NAME} ]; then
echo "hidapi package can be found at $(readlink -e ${ARCHIVE_NAME})"
fi
# Don't forget to include ICU libraries, then run `patchelf --set-rpath '$ORIGIN/../lib' [library]` on all of them

BIN
qt/qt5_5_15_2.tar.xz

Loading…
Cancel
Save