From ed5eee6a7992d6dc34d404d645337ba2198aede6 Mon Sep 17 00:00:00 2001
From: Mingcong Bai <jeffbai@aosc.xyz>
Date: Sun, 7 Jan 2024 03:28:20 -0800
Subject: [PATCH 1/2] vlc: update to 3.0.20

- Drop upstreamed patch.
- Lint scripts in accordance with the Styling Manual.
---
 app-multimedia/vlc/autobuild/beyond           |  6 ++--
 app-multimedia/vlc/autobuild/defines          | 32 +++++++++----------
 .../vlc/autobuild/patches/vlc-qt5.11.patch    | 10 ------
 app-multimedia/vlc/autobuild/postinst         |  2 +-
 app-multimedia/vlc/autobuild/prepare          |  8 +++--
 app-multimedia/vlc/spec                       |  5 ++-
 6 files changed, 27 insertions(+), 36 deletions(-)
 delete mode 100644 app-multimedia/vlc/autobuild/patches/vlc-qt5.11.patch

diff --git a/app-multimedia/vlc/autobuild/beyond b/app-multimedia/vlc/autobuild/beyond
index a95c87203df..db5346bfb38 100644
--- a/app-multimedia/vlc/autobuild/beyond
+++ b/app-multimedia/vlc/autobuild/beyond
@@ -1,5 +1,5 @@
-abinfo "Installing Application Icons"
+abinfo "Installing application icons ..."
 for res in 16 32 48 128; do
-  install -Dvm644 "${SRCDIR}/share/icons/${res}x${res}/vlc.png" \
-                  "${PKGDIR}/usr/share/icons/hicolor/${res}x${res}/apps/vlc.png"
+    install -Dvm644 "${SRCDIR}/share/icons/${res}x${res}/vlc.png" \
+        "${PKGDIR}/usr/share/icons/hicolor/${res}x${res}/apps/vlc.png"
 done
diff --git a/app-multimedia/vlc/autobuild/defines b/app-multimedia/vlc/autobuild/defines
index e44667b6f64..47b4dd2edc2 100644
--- a/app-multimedia/vlc/autobuild/defines
+++ b/app-multimedia/vlc/autobuild/defines
@@ -14,22 +14,22 @@ PKGDEP__AMD64="${PKGDEP} libcrystalhd libva-intel-driver"
 PKGDES="Video player from VideoLAN"
 
 AUTOTOOLS_AFTER="
-            --enable-faad
-            --enable-nls
-            --enable-lirc
-            --enable-realrtsp
-            --enable-aa
-            --enable-upnp
-            --enable-opus
-            --enable-sftp
-            --disable-freerdp
-            --disable-xvideo
-            --enable-gles2
-            --enable-qt
-            --enable-jack
-            --enable-bluray
-            --enable-avahi
-            --disable-opencv
+	--enable-faad
+	--enable-nls
+	--enable-lirc
+	--enable-realrtsp
+	--enable-aa
+	--enable-upnp
+	--enable-opus
+	--enable-sftp
+	--disable-freerdp
+	--disable-xvideo
+	--enable-gles2
+	--enable-qt
+	--enable-jack
+	--enable-bluray
+	--enable-avahi
+	--disable-opencv
 "
 AUTOTOOLS_AFTER__AMD64="
 	${AUTOTOOLS_AFTER}
diff --git a/app-multimedia/vlc/autobuild/patches/vlc-qt5.11.patch b/app-multimedia/vlc/autobuild/patches/vlc-qt5.11.patch
deleted file mode 100644
index c99d8988247..00000000000
--- a/app-multimedia/vlc/autobuild/patches/vlc-qt5.11.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/modules/gui/qt/components/simple_preferences.cpp	2018-01-25 17:57:40.000000000 +0100
-+++ b/modules/gui/qt/components/simple_preferences.cpp	2018-03-18 21:08:51.212556781 +0100
-@@ -33,6 +33,7 @@
- #include <vlc_config_cat.h>
- #include <vlc_configuration.h>
- 
-+#include <QButtonGroup>
- #include <QString>
- #include <QFont>
- #include <QToolButton>
diff --git a/app-multimedia/vlc/autobuild/postinst b/app-multimedia/vlc/autobuild/postinst
index c41fdfbdf73..af1fa07ae83 100644
--- a/app-multimedia/vlc/autobuild/postinst
+++ b/app-multimedia/vlc/autobuild/postinst
@@ -1,3 +1,3 @@
 #!/bin/bash
-echo "Refreshing VLC plugin cache..."
+echo "Refreshing VLC plugin cache ..."
 /usr/lib/vlc/vlc-cache-gen /usr/lib/vlc/plugins/
diff --git a/app-multimedia/vlc/autobuild/prepare b/app-multimedia/vlc/autobuild/prepare
index cd1c0d65a02..d29b5a40627 100644
--- a/app-multimedia/vlc/autobuild/prepare
+++ b/app-multimedia/vlc/autobuild/prepare
@@ -1,8 +1,10 @@
-abinfo "Explicitly require build with gcc"
+abinfo "Explicitly require building with GCC ..."
 export BUILDCC=gcc
-abinfo "Adding samba-4.0 to compiler include paths"
+
+abinfo "Adding samba-4.0 to compiler include paths ..."
 export CFLAGS="${CFLAGS} -I/usr/include/samba-4.0 "
 export CPPFLAGS="${CPPFLAGS} -I/usr/include/samba-4.0 "
-abinfo "Adding qt5 to compiler include paths"
+
+abinfo "Adding Qt 5 to compiler include paths ..."
 export QT_SELECT=5
 export CXXFLAGS="${CXXFLAGS} -I/usr/include/qt5 "
diff --git a/app-multimedia/vlc/spec b/app-multimedia/vlc/spec
index e1d7d823566..2f15df3c903 100644
--- a/app-multimedia/vlc/spec
+++ b/app-multimedia/vlc/spec
@@ -1,5 +1,4 @@
-VER=3.0.16
-REL=5
+VER=3.0.20
 SRCS="tbl::https://get.videolan.org/vlc/$VER/vlc-$VER.tar.xz"
-CHKSUMS="sha256::ffae35fc64f625c175571d2346bc5f6207be99762517f15423e74f18399410f6"
+CHKSUMS="sha256::adc7285b4d2721cddf40eb5270cada2aaa10a334cb546fd55a06353447ba29b5"
 CHKUPDATE="anitya::id=6504"

From f9fe5641c4eb20f89cd9b4454efb55a22bf3c19d Mon Sep 17 00:00:00 2001
From: Mingcong Bai <jeffbai@aosc.xyz>
Date: Fri, 19 Jan 2024 20:49:54 -0800
Subject: [PATCH 2/2] vlc: disable parallelism

FIXME: make install is not reliable with parallelism.
---
 app-multimedia/vlc/autobuild/defines | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app-multimedia/vlc/autobuild/defines b/app-multimedia/vlc/autobuild/defines
index 47b4dd2edc2..cb7f46fa033 100644
--- a/app-multimedia/vlc/autobuild/defines
+++ b/app-multimedia/vlc/autobuild/defines
@@ -39,3 +39,6 @@ AUTOTOOLS_AFTER__POWERPC="
 	${AUTOTOOLS_AFTER}
 	--disable-altivec
 "
+
+# FIXME: make install is not reliable with parallelism.
+NOPARALLEL=1