git » vlc.git » commit 590dc13

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..a43258a
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+/src/
+/pkg/
diff --git a/PKGBUILD b/PKGBUILD
index 1e631de..86c9108 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,7 +11,7 @@ pkgver=${_vlcver}${_vlcfixupver//-/.r}
 pkgrel=9
 pkgdesc='Multi-platform MPEG, VCD/DVD, and DivX player'
 url='https://www.videolan.org/vlc/'
-arch=('x86_64')
+arch=('x86_64' 'armv7h')
 license=(
   'GPL-2.0-or-later'
   'LGPL-2.1-or-later'
@@ -24,7 +24,7 @@ depends=(
   'cairo'
   'dbus'
   'faad2'
-  'ffmpeg4.4'  # NOTE: switch to ffmpeg4.4, as ffmpeg >= 5 requires extensive changes disabling VAAPI (only supported with vlc >= 4)
+  'ffmpeg' #'4.4'  # NOTE: switch to ffmpeg4.4, as ffmpeg >= 5 requires extensive changes disabling VAAPI (only supported with vlc >= 4)
   'fontconfig'
   'freetype2'
   'fribidi'
@@ -48,7 +48,7 @@ depends=(
   'libsecret'
   'libtar'
   'libupnp' 'libixml.so' 'libupnp.so'
-  'libva'
+#  'libva'
   'libx11'
   'libxcb'
   'libxinerama'
@@ -58,7 +58,7 @@ depends=(
   'qt5-base'
   'qt5-svg'
   'qt5-x11extras'
-  'taglib'
+  'taglib1'
   'wayland'
   'xcb-util-keysyms'
   'zlib'
@@ -74,12 +74,12 @@ makedepends=(
   'fluidsynth'
   'gst-plugins-base-libs'
   'gtk3'
-  'jack'
+#  'jack'
   'libass'
-  'libavc1394'
-  'libbluray'
+#  'libavc1394'
+#  'libbluray'
   'libcaca'
-  'libdc1394'
+#  'libdc1394'
   'libdvdcss'
   'libdvdnav'
   'libdvdread'
@@ -138,14 +138,14 @@ optdepends=(
   'gst-plugins-base-libs: for libgst plugins'
   'gstreamer: for libgst plugins'
   'gtk3: notification plugin'
-  'jack: jack audio server'
+#  'jack: jack audio server'
   'kwallet: kwallet keystore'
   'libass: Subtitle support'
-  'libavc1394: devices using the 1394ta AV/C'
-  'libbluray: Blu-Ray video input'
+#  'libavc1394: devices using the 1394ta AV/C'
+#  'libbluray: Blu-Ray video input'
   'libcaca: colored ASCII art video output'
   'libcdio: audio CD playback'
-  'libdc1394: IEEE 1394 access plugin'
+#  'libdc1394: IEEE 1394 access plugin'
   'libdvdcss: decoding encrypted DVDs'
   'libdvdnav: DVD with navigation input module'
   'libdvdread: DVD input module'
@@ -169,8 +169,8 @@ optdepends=(
   'libssh2: sftp access'
   'libtheora: theora codec'
   'libtiger: Tiger rendering for Kate streams'
-  'libva-intel-driver: video backend intel'
-  'libva-vdpau-driver: vdpau backend nvidia'
+#  'libva-intel-driver: video backend intel'
+#  'libva-vdpau-driver: vdpau backend nvidia'
   'libvorbis: Vorbis decoder/encoder'
   'libvpx: VP8 and VP9 codec'
   'lirc: lirc control'
@@ -202,12 +202,8 @@ options=('!emptydirs')
 source=(
   https://download.videolan.org/${pkgname}/${_vlcver}/${pkgname}-${_vlcver}${_vlcfixupver}.tar.xz{,.asc}
   update-vlc-plugin-cache.hook
-  taglib-2.patch
+  #taglib-2.patch
 )
-sha512sums=('02e58fb52dd75bf483ac4b298aecf86463b13d4782173d164adba6e4552d9262ff5e2ee1cbe1bce2c8a809801b79f328c6a8c475d34ae62aefaea02ae5ade406'
-            'SKIP'
-            'b247510ffeadfd439a5dadd170c91900b6cdb05b5ca00d38b1a17c720ffe5a9f75a32e0cb1af5ebefdf1c23c5acc53513ed983a736e8fa30dd8fad237ef49dd3'
-            'ea0d1e1dfed16dac8f9027eb55d987dee59630568b9744ceb42bfa134ea9295252d83574f3d793a76a5be3b02661c1731ed366003b6b55b2d7f02fde70586ff3')
 validpgpkeys=('65F7C6B4206BD057A7EB73787180713BE58D1ADC') # VideoLAN Release Signing Key
 
 prepare() {
@@ -229,15 +225,17 @@ prepare() {
 
 build() {
   cd ${pkgname}-${_vlcver}
+  # Use taglib1
+  export PKG_CONFIG_PATH="/usr/lib/taglib1/pkgconfig"
 
   export CFLAGS+=" -I/usr/include/samba-4.0 -ffat-lto-objects"
   export CPPFLAGS+=" -I/usr/include/samba-4.0"
   export CXXFLAGS+=" -std=c++17"
-  export PKG_CONFIG_PATH="/usr/lib/ffmpeg4.4/pkgconfig"
+  # export PKG_CONFIG_PATH="/usr/lib/ffmpeg4.4/pkgconfig"
   export LUAC=/usr/bin/luac
   export LUA_LIBS="$(pkg-config --libs lua)"
   export RCC=/usr/bin/rcc-qt5
-  export PKG_CONFIG_PATH="/usr/lib/ffmpeg4.4/pkgconfig/:$PKG_CONFIG_PATH"
+  # export PKG_CONFIG_PATH="/usr/lib/ffmpeg4.4/pkgconfig/:$PKG_CONFIG_PATH"
 
   ./configure \
     --prefix=/usr \
@@ -247,11 +245,11 @@ build() {
     --enable-nls \
     --enable-archive \
     --enable-live555 \
-    --enable-dc1394 \
-    --enable-dv1394 \
+    --disable-dc1394 \
+    --disable-dv1394 \
     --enable-dvdread \
     --enable-dvdnav \
-    --enable-bluray \
+    --disable-bluray \
     --disable-opencv \
     --enable-smbclient \
     --enable-sftp \
@@ -268,7 +266,7 @@ build() {
     --enable-mpg123 \
     --enable-gst-decode \
     --enable-avcodec \
-    --enable-libva \
+    --disable-libva \
     --enable-avformat \
     --enable-postproc \
     --enable-faad \
@@ -293,7 +291,7 @@ build() {
     --enable-libass \
     --enable-kate \
     --enable-tiger \
-    --enable-vdpau \
+    --disable-vdpau \
     --enable-wayland \
     --enable-sdl-image \
     --enable-freetype \
@@ -306,7 +304,7 @@ build() {
     --enable-caca \
     --enable-pulse \
     --enable-alsa \
-    --enable-jack \
+    --disable-jack \
     --enable-samplerate \
     --enable-soxr \
     --disable-chromaprint \
@@ -356,3 +354,6 @@ package() {
 }
 
 # vim: ts=2 sw=2 et:
+sha256sums=('adc7285b4d2721cddf40eb5270cada2aaa10a334cb546fd55a06353447ba29b5'
+            'SKIP'
+            'b98043683dd90d3f5a3f501212dfc629839b661100de5ac79fd30cb7b4a06f13')