summarylogtreecommitdiffstats
path: root/PKGBUILD
diff options
context:
space:
mode:
authorOliver Braunschweig2024-05-23 22:28:20 +0200
committerOliver Braunschweig2024-05-23 22:28:20 +0200
commit874e3bce6bc7188eed92c11e0771b09655e1bd49 (patch)
tree4b9b5acd74a33412d25b27f376460b70a7ecfde7 /PKGBUILD
parent50be2611d3548ccabdf26daa6909a7c70c04e7ce (diff)
downloadaur-vlc-git.tar.gz
Remove gcc14 patch as upstream commit ceae7711 fixes the issue. Fixed detection of QT6.
Diffstat (limited to 'PKGBUILD')
-rw-r--r--PKGBUILD6
1 files changed, 2 insertions, 4 deletions
diff --git a/PKGBUILD b/PKGBUILD
index 9ad3d42523b6..db635194b3fd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,7 +12,7 @@
pkgname="vlc-git"
pkgdesc="Multi-platform MPEG, VCD/DVD, and DivX player"
-pkgver=4.0.0.r28966.g2ddd86c844
+pkgver=4.0.0.r29095.g502824e383
pkgrel=1
url='https://code.videolan.org/videolan/vlc'
arch=('i686' 'x86_64')
@@ -103,11 +103,9 @@ provides=("${_name}=${pkgver}")
options=(!emptydirs)
source=('git+https://code.videolan.org/videolan/vlc.git'
'vlc-live-media-2021.patch'
- 'gcc14.patch'
'update-vlc-plugin-cache.hook')
b2sums=('SKIP'
'76103422a1eaad40d33bfb7897bf25c1b5748729270974bec13f642f2861c4458f0dc07b5fb68d9ba4fae6e44d4a6c8e4d67af7ec10e0c117f1b804dd06868e3'
- 'cdf972dfc98d132a9eeb734c5e40e0203c3ce4b63b40505902ebb02101337652c8f4a8577c2e3975576ebe2d0bda792b9e945d4f7e93583c03a29d1c77ad4e04'
'fe3849f45fb91d3697573a9c23b90b78ff0bef5f94c42bc6e7c14427637f45f2fc86786803fb9b36c657ac2c50f6bf3c860cd763248711308ceab2bfcf7be49a')
pkgver() {
@@ -123,7 +121,6 @@ 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}"/gcc14.patch
sed 's|whoami|echo builduser|g' -i configure
sed 's|hostname -f|echo arch|g' -i configure
autoreconf -vf
@@ -142,6 +139,7 @@ build() {
export LUA_LIBS="$(pkg-config --libs lua5.2)"
export RCC=/usr/lib/qt6/rcc
export QMAKE=/usr/bin/qmake6
+ export QTPATHS6="/usr/lib/qt6/bin/qtpaths6"
export PKG_CONFIG_PATH="/usr/lib/pkgconfig/:$PKG_CONFIG_PATH"
./configure --prefix=/usr \