diff options
| author | Oliver Braunschweig | 2024-04-06 23:11:54 +0200 |
|---|---|---|
| committer | Oliver Braunschweig | 2024-04-06 23:11:54 +0200 |
| commit | 8ab729c1136f7420637d9ad5c712b9cbe8647ab7 (patch) | |
| tree | f250e850672dc06ca86003252fdb1005eb117b4e | |
| parent | 515efd91925f58ded06c32f13aa0700d8fb00db4 (diff) | |
| download | aur-8ab729c1136f7420637d9ad5c712b9cbe8647ab7.tar.gz | |
Fix build process if both Qt5 and Qt6 is installed due to incorrect detection of contrib qmake
| -rw-r--r-- | .SRCINFO | 6 | ||||
| -rw-r--r-- | PKGBUILD | 6 | ||||
| -rw-r--r-- | qt6.patch | 11 |
3 files changed, 17 insertions, 6 deletions
@@ -1,6 +1,6 @@ pkgbase = vlc-git pkgdesc = Multi-platform MPEG, VCD/DVD, and DivX player - pkgver = 4.0.0.r28440.g02fd6845d3 + pkgver = 4.0.0.r28442.g913729352f pkgrel = 1 url = https://code.videolan.org/videolan/vlc arch = i686 @@ -167,7 +167,7 @@ pkgbase = vlc-git optdepends = aom: AOM AV1 codec optdepends = srt: SRT input/output plugin optdepends = dav1d: dav1d AV1 decoder - provides = vlc=4.0.0.r28440.g02fd6845d3 + provides = vlc=4.0.0.r28442.g913729352f conflicts = vlc options = !emptydirs source = git+https://code.videolan.org/videolan/vlc.git @@ -176,7 +176,7 @@ pkgbase = vlc-git source = update-vlc-plugin-cache.hook b2sums = SKIP b2sums = 76103422a1eaad40d33bfb7897bf25c1b5748729270974bec13f642f2861c4458f0dc07b5fb68d9ba4fae6e44d4a6c8e4d67af7ec10e0c117f1b804dd06868e3 - b2sums = 5995dd79f099b739b3f4f57551420825c4b3088d16340fd6e01beb446bfddc2bff908f0e210f188fb3877c495c2bef134af7b4099546d9276dad9e28863a0c27 + b2sums = 03342d23952f481cd9061e142a0c85b6a469ebab8de48ae845d724625947feeb6e8cbfbd9e10693b5df53f2509be38d645fb738c0da0c9b1b5505567a1edcc3f b2sums = fe3849f45fb91d3697573a9c23b90b78ff0bef5f94c42bc6e7c14427637f45f2fc86786803fb9b36c657ac2c50f6bf3c860cd763248711308ceab2bfcf7be49a pkgname = vlc-git @@ -12,7 +12,7 @@ pkgname="vlc-git" pkgdesc="Multi-platform MPEG, VCD/DVD, and DivX player" -pkgver=4.0.0.r28440.g02fd6845d3 +pkgver=4.0.0.r28442.g913729352f pkgrel=1 url='https://code.videolan.org/videolan/vlc' arch=('i686' 'x86_64') @@ -107,7 +107,7 @@ source=('git+https://code.videolan.org/videolan/vlc.git' 'update-vlc-plugin-cache.hook') b2sums=('SKIP' '76103422a1eaad40d33bfb7897bf25c1b5748729270974bec13f642f2861c4458f0dc07b5fb68d9ba4fae6e44d4a6c8e4d67af7ec10e0c117f1b804dd06868e3' - '5995dd79f099b739b3f4f57551420825c4b3088d16340fd6e01beb446bfddc2bff908f0e210f188fb3877c495c2bef134af7b4099546d9276dad9e28863a0c27' + '03342d23952f481cd9061e142a0c85b6a469ebab8de48ae845d724625947feeb6e8cbfbd9e10693b5df53f2509be38d645fb738c0da0c9b1b5505567a1edcc3f' 'fe3849f45fb91d3697573a9c23b90b78ff0bef5f94c42bc6e7c14427637f45f2fc86786803fb9b36c657ac2c50f6bf3c860cd763248711308ceab2bfcf7be49a') pkgver() { @@ -123,10 +123,10 @@ prepare() { sed -e 's:truetype/ttf-dejavu:TTF:g' -i modules/visualization/projectm.cpp sed -e 's|-Werror-implicit-function-declaration||g' -i configure patch -Np1 < "${srcdir}"/vlc-live-media-2021.patch - patch -Np1 < "${srcdir}"/qt6.patch sed 's|whoami|echo builduser|g' -i configure sed 's|hostname -f|echo arch|g' -i configure autoreconf -vf + patch -Np1 < "${srcdir}"/qt6.patch } build() { diff --git a/qt6.patch b/qt6.patch index 2f653c1f040d..91cc9b9351a1 100644 --- a/qt6.patch +++ b/qt6.patch @@ -24,3 +24,14 @@ if ret.returncode != 0: return None +--- a/configure ++++ b/configure +@@ -61836,7 +61836,7 @@ + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if contribs provide qmake" >&5 + printf %s "checking if contribs provide qmake... " >&6; } +- if test -x "${CONTRIB_DIR}/../bin/qmake${BUILDEXEEXT}" ++ if [ ! -z ${CONTRIB_DIR} ] && [ test -x "${CONTRIB_DIR}/../bin/qmake${BUILDEXEEXT}" ] + then : + + QMAKE="${CONTRIB_DIR}/../bin/qmake${BUILDEXEEXT}" |