alarm/vlc-rpi to 3.0.21-4

Sync PKGBUILD with Arch Linux/build errors on armv7h are still present
so keep taglib workaround in place.
This commit is contained in:
graysky 2024-10-28 10:48:21 -04:00
parent 7f557be653
commit 7293577689

View file

@ -4,210 +4,131 @@
# Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
# Contributor: Martin Sandsmark <martin.sandsmark@kde.org>
pkgname=vlc-rpi
pkgbase=vlc-rpi
pkgname=(vlc-rpi libvlc-rpi)
_pkgname=vlc
_vlcver=3.0.21
# optional fixup version including hyphen
_vlcfixupver=
pkgver=${_vlcver}${_vlcfixupver//-/.r}
pkgrel=3
pkgver=$_vlcver${_vlcfixupver//-/.r}
pkgrel=4
pkgdesc='Multi-platform MPEG, VCD/DVD, and DivX player with hw accel for RPi 3 and above'
url='https://www.videolan.org/vlc/'
url=https://www.videolan.org/vlc/
arch=(aarch64 armv7h)
license=(
'GPL-2.0-or-later'
'LGPL-2.1-or-later'
)
# NOTE: switch to ffmpeg-rpi which is basically debian's stuff patched with hw accel
depends=(
'a52dec'
'abseil-cpp'
'aribb24'
'bash'
'cairo'
'dbus'
'faad2'
'ffmpeg-rpi'
'fontconfig'
'freetype2'
'fribidi'
'gcc-libs'
'gdk-pixbuf2'
'glib2'
'glibc'
'gnutls'
'harfbuzz'
'hicolor-icon-theme'
'libarchive'
'libdca'
'libdvbpsi'
'libglvnd'
'libidn'
'libmad'
'libomxil-bellagio'
'libmatroska'
'libmpcdec'
'libmpeg2'
'libproxy'
'libsecret'
'libtar'
'libupnp' 'libixml.so' 'libupnp.so'
'libva'
'libx11'
'libxcb'
'libxinerama'
'libxml2'
'libxpm'
'lua'
'qt5-base'
'qt5-svg'
'qt5-x11extras'
'wayland'
'xcb-util-keysyms'
'zlib'
GPL-2.0-or-later
LGPL-2.1-or-later
)
makedepends=(
'aalib'
'alsa-lib'
'aom'
'aribb25'
'avahi'
'dav1d'
'flac'
'fluidsynth'
'gst-plugins-base-libs'
'gtk3'
'jack'
'libass'
'libavc1394'
'libbluray'
'libcaca'
'libdc1394'
'libdvdcss'
'libdvdnav'
'libdvdread'
'libgme'
'libgoom2'
'libjpeg-turbo'
'libkate'
'libmicrodns'
'libmodplug'
'libmtp'
'libnotify'
'libnfs'
'libogg'
'libomxil-bellagio'
'libpng'
'libpulse'
'librsvg'
'libsamplerate'
'libshout'
'libsoxr'
'libssh2'
'libtheora'
'libtiger'
'libvorbis'
'libvpx'
'lirc'
'live-media'
'mesa'
'mpg123'
'opus'
'pcsclite'
'projectm'
'protobuf'
'sdl_image'
'smbclient'
'speex'
'srt'
'systemd-libs'
'twolame'
'vcdimager'
'wayland-protocols'
'x264' 'libx264.so'
'x265' 'libx265.so'
'xosd'
'zvbi'
a52dec
aalib
abseil-cpp
alsa-lib
aom
aribb24
aribb25
avahi
bash
cairo
dav1d
dbus
faad2
ffmpeg-rpi
flac
fluidsynth
fontconfig
freetype2
fribidi
gcc-libs
gdk-pixbuf2
glib2
glibc
gnutls
gst-plugins-base-libs
gtk3
harfbuzz
hicolor-icon-theme
jack
libarchive
libass
libavc1394
libbluray
libcaca
libdca
libdc1394
libdvbpsi
libdvdcss
libdvdnav
libdvdread
libglvnd
libgme
libgoom2
libjpeg-turbo
libkate
libmad
libmatroska
libmicrodns
libmodplug
libmpcdec
libmpeg2
libmtp
libnotify
libnfs
libogg
libomxil-bellagio
libpng
libproxy
libpulse
librsvg
libsamplerate
libsecret
libshout
libsoxr
libssh2
libtar
libtheora
libtiger
libupnp
libva
libvorbis
libvpx
libx11
libxcb
libxinerama
libxml2
libxpm
lirc
live-media
lua
mesa
mpg123
opus
pcsclite
projectm
protobuf
qt5-base
qt5-svg
qt5-x11extras
sdl_image
smbclient
speex
srt
systemd-libs
twolame
vcdimager
wayland
wayland-protocols
x264
x265
xcb-util-keysyms
xosd
zlib
zvbi
)
makedepends_aarch64=('taglib')
optdepends=(
'aalib: ASCII art video output'
'alsa-lib: ALSA audio output'
'aom: AOM AV1 codec'
'aribb25: aribcam support'
'avahi: service discovery using bonjour protocol'
'dav1d: dav1d AV1 decoder'
'flac: Free Lossless Audio Codec plugin'
'fluidsynth: FluidSynth based MIDI playback plugin'
'gnu-free-fonts: subtitle font'
'gst-plugins-base-libs: for libgst plugins'
'gstreamer: for libgst plugins'
'gtk3: notification plugin'
'jack: jack audio server'
'kwallet: kwallet keystore'
'libass: Subtitle support'
'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'
'libdvdcss: decoding encrypted DVDs'
'libdvdnav: DVD with navigation input module'
'libdvdread: DVD input module'
'libgme: Game Music Emu plugin'
'libgoom2: Goom visualization'
'libjpeg-turbo: JPEG support'
'libkate: Kate codec'
'libmodplug: MOD output plugin'
'libmicrodns: mDNS services discovery (chromecast etc)'
'libmtp: MTP devices discovery'
'libnfs: NFS access'
'libnotify: notification plugin'
'libogg: Ogg and OggSpots codec'
'libpng: PNG support'
'libpulse: PulseAudio audio output'
'libraw1394: IEEE 1394 access plugin'
'librsvg: SVG plugin'
'libsamplerate: audio Resampler'
'libshout: shoutcast/icecast output plugin'
'libsoxr: SoX audio Resampler'
'libssh2: sftp access'
'libtheora: theora codec'
'libtiger: Tiger rendering for Kate streams'
'libva-intel-driver: video backend intel'
'libva-vdpau-driver: vdpau backend nvidia'
'libvorbis: Vorbis decoder/encoder'
'libvpx: VP8 and VP9 codec'
'lirc: lirc control'
'live-media: streaming over RTSP'
'lua-socket: http interface'
'mpg123: mpg123 codec'
'ncurses: ncurses interface'
'opus: opus codec'
'pcsclite: aribcam support'
'projectm: ProjectM visualisation'
'protobuf: chromecast streaming'
'sdl12-compat: SDL image support'
'sdl_image: SDL image support'
'smbclient: SMB access plugin'
'speex: Speex codec'
'speexdsp: Speex codec'
'srt: SRT input/output plugin'
'systemd-libs: udev services discovery'
'ttf-dejavu: subtitle font'
'twolame: TwoLAME mpeg2 encoder plugin'
'vcdimager: navigate VCD with libvcdinfo'
'x264: H264 encoding'
'x265: HEVC/H.265 encoder'
'zvbi: VBI/Teletext/webcam/v4l2 capture/decoding'
)
conflicts=('vlc-plugin' 'vlc')
provides=('vlc')
replaces=('vlc-plugin')
options=('!emptydirs')
install='vlc.install'
makedepends_aarch64=(taglib)
options=(!emptydirs)
source=(
https://download.videolan.org/${_pkgname}/${_vlcver}/${_pkgname}-${_vlcver}${_vlcfixupver}.tar.xz{,.asc}
https://download.videolan.org/$_pkgname/$_vlcver/$_pkgname-$_vlcver$_vlcfixupver.tar.xz{,.asc}
update-vlc-plugin-cache.hook
taglib-2.patch
99-vlc.rules
@ -228,7 +149,7 @@ sha256sums=('24dbbe1d7dfaeea0994d5def0bbde200177347136dbfe573f5b6a4cee25afbb0'
validpgpkeys=('65F7C6B4206BD057A7EB73787180713BE58D1ADC') # VideoLAN Release Signing Key
prepare() {
cd ${_pkgname}-${_vlcver}
cd $_pkgname-$_vlcver
sed -e 's:truetype/ttf-dejavu:TTF:g' -i modules/visualization/projectm.cpp
sed -e 's|-Werror-implicit-function-declaration||g' -i configure
sed 's|whoami|echo builduser|g' -i configure
@ -245,7 +166,120 @@ prepare() {
}
build() {
cd ${_pkgname}-${_vlcver}
local configure_options=(
--enable-omxil
--enable-omxil-vout
--enable-rpi-omxil
)
# Build errors on armv7h are centered around taglib even with
# the Arch patch so build without taglib for armv7h.
if [[ $CARCH == "aarch64" ]]; then
configure_options+=( --enable-taglib )
elif [[ $CARCH == "armv7h" ]]; then
configure_options+=( --disable-taglib )
fi
configure_options+=(
--disable-chromaprint
--disable-fdkaac
--disable-libgcrypt
--disable-libplacebo
--disable-opencv
--disable-rpath
--disable-schroedinger
--disable-update-check
--enable-a52
--enable-aa
--enable-alsa
--enable-aom
--enable-archive
--enable-aribsub
--enable-aribcam
--enable-avahi
--enable-avcodec
--enable-avformat
--enable-bluray
--enable-caca
--enable-chromecast
--enable-dav1d
--enable-dc1394
--enable-dca
--enable-dv1394
--enable-dvbpsi
--enable-dvdnav
--enable-dvdread
--enable-faad
--enable-flac
--enable-fluidsynth
--enable-fontconfig
--enable-freetype
--enable-fribidi
--enable-gnutls
--enable-gme
--enable-goom
--enable-gst-decode
--enable-harfbuzz
--enable-jack
--enable-jpeg
--enable-kate
--enable-kwallet
--enable-libass
--enable-libmpeg2
--enable-libtar
--enable-libva
--enable-libxml2
--enable-lirc
--enable-live555
--enable-mad
--enable-matroska
--enable-mod
--enable-mpc
--enable-mpg123
--enable-microdns
--enable-mtp
--enable-ncurses
--enable-nfs
--enable-nls
--enable-notify
--enable-ogg
--enable-oggspots
--enable-opus
--enable-png
--enable-postproc
--enable-projectm
--enable-pulse
--enable-qt
--enable-realrtsp
--enable-samplerate
--enable-sdl-image
--enable-secret
--enable-sftp
--enable-shout
--enable-skins2
--enable-smbclient
--enable-soxr
--enable-speex
--enable-srt
--enable-svg
--enable-svgdec
--enable-tiger
--enable-twolame
--enable-upnp
--enable-vdpau
--enable-vlc
--enable-vorbis
--enable-vpx
--enable-wayland
--enable-x264
--enable-x265
--enable-zvbi
--prefix=/usr
--sysconfdir=/etc
--with-kde-solid=/usr/share/solid/actions/
)
cd $_pkgname-$_vlcver
export CFLAGS+=" -I/usr/include/samba-4.0 -ffat-lto-objects -I/usr/include/ffmpeg-rpi -Wno-incompatible-pointer-types"
export CPPFLAGS+=" -I/usr/include/samba-4.0"
@ -256,131 +290,163 @@ build() {
export RCC=/usr/bin/rcc-qt5
export PKG_CONFIG_PATH="/usr/lib/ffmpeg-rpi/pkgconfig/:$PKG_CONFIG_PATH"
_args=(
--prefix=/usr
--sysconfdir=/etc
--with-kde-solid=/usr/share/solid/actions/
--disable-rpath
--enable-omxil
--enable-omxil-vout
--enable-rpi-omxil
--enable-gles2
--enable-nls
--enable-archive
--enable-live555
--enable-dc1394
--enable-dv1394
--enable-dvdread
--enable-dvdnav
--enable-bluray
--disable-opencv
--enable-smbclient
--enable-sftp
--enable-nfs
--enable-realrtsp
--enable-dvbpsi
--enable-gme
--enable-ogg
--enable-shout
--enable-matroska
--enable-mod
--enable-mpc
--enable-mad
--enable-mpg123
--enable-gst-decode
--enable-avcodec
--enable-libva
--enable-avformat
--enable-postproc
--enable-faad
--enable-vpx
--enable-twolame
--disable-fdkaac
--enable-a52
--enable-dca
--enable-flac
--enable-fluidsynth
--enable-libmpeg2
--enable-vorbis
--enable-speex
--enable-opus
--enable-oggspots
--disable-schroedinger
--enable-png
--enable-jpeg
--enable-x264
--enable-x265
--enable-zvbi
--enable-libass
--enable-kate
--enable-tiger
--enable-vdpau
--enable-wayland
--enable-sdl-image
--enable-freetype
--enable-fribidi
--enable-harfbuzz
--enable-fontconfig
--enable-svg
--enable-svgdec
--enable-aa
--enable-caca
--enable-pulse
--enable-alsa
--enable-jack
--enable-samplerate
--enable-soxr
--disable-chromaprint
--enable-chromecast
--enable-qt
--enable-skins2
--enable-libtar
--enable-ncurses
--enable-lirc
--enable-goom
--enable-projectm
--enable-avahi
--enable-mtp
--enable-upnp
--enable-microdns
--enable-libxml2
--disable-libgcrypt
--enable-gnutls
--enable-secret
--enable-kwallet
--disable-update-check
--enable-notify
--disable-libplacebo
--enable-vlc
--enable-aribsub
--enable-aribcam
--enable-aom
--enable-srt
--enable-dav1d
)
if [[ $CARCH == "aarch64" ]]; then
_args+=( --enable-taglib )
elif [[ $CARCH == "armv7h" ]]; then
_args+=( --disable-taglib )
fi
./configure "${_args[@]}"
./configure "${configure_options[@]}"
# prevent excessive overlinking due to libtool
sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
make
}
package() {
cd ${_pkgname}-${_vlcver}
_pick() {
local p="$1" f d; shift
for f; do
d="$srcdir/$p/${f#$pkgdir/}"
mkdir -p "$(dirname "$d")"
mv "$f" "$d"
rmdir -p --ignore-fail-on-non-empty "$(dirname "$f")"
done
}
make DESTDIR="${pkgdir}" install
package_vlc-rpi() {
depends=(
libomxil-bellagio
a52dec
abseil-cpp
aribb24
bash
cairo
dbus
faad2
ffmpeg-rpi
fontconfig
freetype2
fribidi
gcc-libs
gdk-pixbuf2
glib2
glibc
gnutls
harfbuzz
hicolor-icon-theme
libarchive
libdca
libdvbpsi
libglvnd
libidn
libmad
libmatroska
libmpcdec
libmpeg2
libproxy
libsecret
libtar
libupnp
libva
libvlc-rpi
libx11
libxcb
libxinerama
libxml2
libxpm
lua
qt5-base
qt5-svg
qt5-x11extras
taglib
wayland
xcb-util-keysyms
zlib
)
optdepends=(
'aalib: ASCII art video output'
'alsa-lib: ALSA audio output'
'aom: AOM AV1 codec'
'aribb25: aribcam support'
'avahi: service discovery using bonjour protocol'
'dav1d: dav1d AV1 decoder'
'flac: Free Lossless Audio Codec plugin'
'fluidsynth: FluidSynth based MIDI playback plugin'
'gnu-free-fonts: subtitle font'
'gst-plugins-base-libs: for libgst plugins'
'gstreamer: for libgst plugins'
'gtk3: notification plugin'
'jack: jack audio server'
'kwallet: kwallet keystore'
'libass: Subtitle support'
'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'
'libdvdcss: decoding encrypted DVDs'
'libdvdnav: DVD with navigation input module'
'libdvdread: DVD input module'
'libgme: Game Music Emu plugin'
'libgoom2: Goom visualization'
'libjpeg-turbo: JPEG support'
'libkate: Kate codec'
'libmodplug: MOD output plugin'
'libmicrodns: mDNS services discovery (chromecast etc)'
'libmtp: MTP devices discovery'
'libnfs: NFS access'
'libnotify: notification plugin'
'libogg: Ogg and OggSpots codec'
'libpng: PNG support'
'libpulse: PulseAudio audio output'
'libraw1394: IEEE 1394 access plugin'
'librsvg: SVG plugin'
'libsamplerate: audio Resampler'
'libshout: shoutcast/icecast output plugin'
'libsoxr: SoX audio Resampler'
'libssh2: sftp access'
'libtheora: theora codec'
'libtiger: Tiger rendering for Kate streams'
'libva-intel-driver: video backend intel'
'libva-vdpau-driver: vdpau backend nvidia'
'libvorbis: Vorbis decoder/encoder'
'libvpx: VP8 and VP9 codec'
'lirc: lirc control'
'live-media: streaming over RTSP'
'lua-socket: http interface'
'mpg123: mpg123 codec'
'ncurses: ncurses interface'
'opus: opus codec'
'pcsclite: aribcam support'
'projectm: ProjectM visualisation'
'protobuf: chromecast streaming'
'sdl12-compat: SDL image support'
'sdl_image: SDL image support'
'smbclient: SMB access plugin'
'speex: Speex codec'
'speexdsp: Speex codec'
'srt: SRT input/output plugin'
'systemd-libs: udev services discovery'
'ttf-dejavu: subtitle font'
'twolame: TwoLAME mpeg2 encoder plugin'
'vcdimager: navigate VCD with libvcdinfo'
'x264: H264 encoding'
'x265: HEVC/H.265 encoder'
'zvbi: VBI/Teletext/webcam/v4l2 capture/decoding'
)
provides=(vlc)
conflicts=(vlc vlc-plugin)
replaces=(vlc-plugin)
cd $_pkgname-$_vlcver
make DESTDIR="$pkgdir" install
(
cd "$pkgdir"
_pick lib$pkgname usr/include
_pick lib$pkgname usr/lib/libvlc*
_pick lib$pkgname usr/lib/pkgconfig/libvlc.pc
)
for res in 16 32 48 128 256; do
install -Dm 644 "${srcdir}/vlc-${_vlcver}/share/icons/${res}x${res}/vlc.png" \
"${pkgdir}/usr/share/icons/hicolor/${res}x${res}/apps/vlc.png"
install -Dm 644 share/icons/${res}x$res/vlc.png -t "$pkgdir/usr/share/icons/hicolor/${res}x$res/apps/"
done
install -Dm 644 "${srcdir}/update-vlc-plugin-cache.hook" -t "${pkgdir}/usr/share/libalpm/hooks"
install -Dm 644 ../update-vlc-plugin-cache.hook -t "$pkgdir/usr/share/libalpm/hooks/"
# setup video drivers
install -Dm0644 "$srcdir/vlc.config.txt" "$pkgdir/boot/vlc.config.txt"
@ -389,5 +455,17 @@ package() {
install -Dm0644 "$srcdir/99-vlc.rules" "$pkgdir/usr/lib/udev/rules.d/99-vlc.rules"
}
# vim: ts=2 sw=2 et:
package_libvlc-rpi() {
pkgdesc+=" - library"
provides=(libvlc)
conflicts=(libvlc)
depends=(
dbus
gcc-libs
glibc
)
mv -v $pkgname/* "$pkgdir"
}
# vim: ts=2 sw=2 et: