aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpsykose <alice@ayaya.dev>2022-08-26 09:46:17 +0000
committeralice <alice@ayaya.dev>2022-08-26 09:49:42 +0000
commitd1c10444fd2717c54b2e9dd5b65fc7bb6c9299f9 (patch)
treefabe3ace572e043c52e0e5c22d20834a43c7e569
parent4ba74dac9339ec378e26508faadee408848c1e35 (diff)
community/vlc: improve
clean up a little, add lto, add omxil aarch64
-rw-r--r--community/vlc/APKBUILD87
-rw-r--r--community/vlc/test-s390x.patch13
2 files changed, 41 insertions, 59 deletions
diff --git a/community/vlc/APKBUILD b/community/vlc/APKBUILD
index fb521b94046..2d28d44b31d 100644
--- a/community/vlc/APKBUILD
+++ b/community/vlc/APKBUILD
@@ -3,7 +3,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=vlc
pkgver=3.0.17.4
-pkgrel=4
+pkgrel=5
pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player"
triggers="vlc-libs.trigger=/usr/lib/vlc/plugins"
pkgusers="vlc"
@@ -13,7 +13,8 @@ url="https://www.videolan.org/vlc/"
# s390x has a failing test (chroma_copy_test)
arch="all !armhf !s390x"
license="GPL-2.0-or-later"
-subpackages="$pkgname-dev
+subpackages="
+ $pkgname-dev
$pkgname-doc
$pkgname-qt
$pkgname-daemon::noarch
@@ -23,23 +24,24 @@ depends="ttf-dejavu"
makedepends="
a52dec-dev
alsa-lib-dev
- automake
autoconf
+ automake
avahi-dev
bison
- libtool
dav1d-dev
dbus-dev
+ eudev-dev
faad2-dev
ffmpeg4-dev
flac-dev
flex
freetype-dev
+ gnutls-dev
gtk+3.0-dev
- libbluray-dev>=0.2.1 libbluray-dev<20100000
libavc1394-dev
+ libbluray-dev
libcddb-dev
- libdc1394-dev>=2.1.0
+ libdc1394-dev
libdvbpsi-dev
libdvdnav-dev
libdvdread-dev
@@ -50,12 +52,14 @@ makedepends="
libmpeg2-dev
libnotify-dev
libogg-dev
- libraw1394-dev>=2.0.1
+ libplacebo-dev
+ libraw1394-dev
librsvg-dev
libshout-dev
libsm-dev
libsrt-dev
libtheora-dev
+ libtool
libva-dev
libvdpau-dev
libvorbis-dev
@@ -66,37 +70,35 @@ makedepends="
libxml2-dev
libxpm-dev
libxv-dev
- live-media-dev>=2012.01.26
+ live-media-dev
lua5.2-dev
mesa-dev
ncurses-dev
opus-dev
pkgconfig
+ pulseaudio-dev
qt5-qtbase-dev
qt5-qtsvg-dev
qt5-qtx11extras-dev
+ samba-dev
sdl2-dev
speex-dev
speexdsp-dev
sysfsutils-dev
taglib-dev
- eudev-dev
v4l-utils-dev
+ wayland-dev
wayland-protocols
x264-dev
x265-dev
- xcb-util-renderutil-dev
xcb-util-keysyms-dev
+ xcb-util-renderutil-dev
xdg-utils
- samba-dev
- gnutls-dev
- pulseaudio-dev
"
source="https://download.videolan.org/vlc/$pkgver/vlc-$pkgver.tar.xz
omxil-rpi-codecs.patch
check-headless.patch
disable-sub-autodetect-fuzzy-1-test.patch
- test-s390x.patch
fribidi_allow_deprecated.patch
dav1d-1.0.0.patch
vlc-live-media-2021.patch
@@ -126,22 +128,23 @@ prepare() {
}
build() {
- local _arch_opts=
- export CFLAGS="$CFLAGS -D_GNU_SOURCE -fcommon"
-
case "$CARCH" in
- arm*) _arch_opts="--enable-omxil --enable-omxil-vout --enable-rpi-omxil" ;;
+ aarch64|arm*)
+ local arch_opts="--enable-omxil --enable-omxil-vout --enable-rpi-omxil"
+ ;;
esac
+ CFLAGS="$CFLAGS -fcommon -flto=auto -fno-fat-lto-objects -fno-plt" \
+ CXXFLAGS="$CXXFLAGS -flto=auto -fno-fat-lto-objects -fno-plt" \
LUA=lua5.2 \
LUAC=luac5.2 \
- BUILDCC="${CC:-gcc} -std=c99" \
./configure \
--build=$CBUILD \
--host=$CHOST \
--prefix=/usr \
--disable-nls \
--disable-rpath \
+ --disable-static \
--enable-a52 \
--enable-avcodec \
--enable-avformat \
@@ -150,11 +153,13 @@ build() {
--enable-dbus \
--enable-dc1394 \
--enable-dvbpsi \
- --enable-dvdread \
--enable-dvdnav \
+ --enable-dvdread \
--enable-faad \
--enable-flac \
+ --enable-gnutls \
--enable-libcddb \
+ --enable-libplacebo \
--enable-libva \
--enable-live555 \
--enable-merge-ffmpeg \
@@ -162,8 +167,8 @@ build() {
--enable-realrtsp \
--enable-shout \
--enable-skins2 \
- --enable-speex \
--enable-sout \
+ --enable-speex \
--enable-srt \
--enable-taglib \
--enable-theora \
@@ -174,8 +179,7 @@ build() {
--enable-wma-fixed \
--enable-x264 \
--enable-xvideo \
- --enable-gnutls \
- $_arch_opts
+ $arch_opts
make
}
@@ -187,36 +191,31 @@ package() {
# delete unneeded mozilla and kde support files
rm -rf "$pkgdir"/usr/lib/mozilla
rm -rf "$pkgdir"/usr/share/kde4
+
+ install -D -m755 "$srcdir"/vlc.initd "$pkgdir"/etc/init.d/vlc
+ install -D -m664 "$srcdir"/vlc.confd "$pkgdir"/etc/conf.d/vlc
+ install -d -o vlc -g vlc "$pkgdir"/var/log/vlc
}
check() {
make check
}
-_mv() {
- local dir=${1%/*}
- mkdir -p "$subpkgdir"/$dir
- mv "$1" "$subpkgdir"/$dir/
-}
-
qt() {
pkgdesc="Qt frontend for VLC"
depends="vlc=$pkgver-r$pkgrel"
cd "$pkgdir"
# scan for elf files that directly or indirectly depends on
# libQt* libraries
- cd "$pkgdir"
for i in $(find . -type f ); do
if ldd $i 2>/dev/null | grep -q "libQt"; then
- _mv "$i"
+ amove "$i"
fi
done
- for i in ./usr/bin/qvlc \
- ./usr/share/applications/vlc.desktop \
- ./usr/share/metainfo/vlc.appdata.xml \
- $(find ./usr/share/icons -type f); do
- _mv "$i"
- done
+ amove usr/share/icons \
+ usr/share/applications \
+ usr/share/metainfo \
+ usr/bin/qvlc
}
daemon() {
@@ -224,19 +223,16 @@ daemon() {
install="vlc-daemon.pre-install"
depends="vlc=$pkgver-r$pkgrel"
- mkdir -p "$subpkgdir"
- cd "$pkgdir"
- install -D -m755 "$srcdir"/vlc.initd $subpkgdir/etc/init.d/vlc
- install -D -m664 "$srcdir"/vlc.confd $subpkgdir/etc/conf.d/vlc
- install -d -o vlc -g vlc "$subpkgdir"/var/log/vlc
+ amove etc/init.d
+ amove etc/conf.d
+ amove var/log/vlc
}
libs() {
depends=""
- mkdir -p "$subpkgdir"/usr/lib/vlc
- mv "$pkgdir"/usr/lib/vlc/vlc-cache-gen \
- "$subpkgdir"/usr/lib/vlc/
default_libs
+
+ amove usr/lib/vlc/vlc-cache-gen
}
sha512sums="
@@ -244,7 +240,6 @@ dac14c6586603c064294672eb878253e52b3a7bef431fb10303345e5400591b5c1f2d452a2af03f5
e13e398b7bfd977f6e099bcb6cf8dc5cd5bad6dea3eff715881826246dc4329468846084aff2576de2b7fd28d3f06e7c327a6e4511a28d22e5cd198a81146c89 omxil-rpi-codecs.patch
22d80df599b8b65a5439cefbb7140af8e9530f326d54945da3769af65f37518b99ec2cc8647aafd2763324a0698280915afe043cc87e5720c4694881ed35bffa check-headless.patch
e214b407235cb3afb8bec93f20c9b42957b57e6fd3960679d3d4235e77762e03e64d03c01f00ef63d589e7c85aaad02ce6abbeeccd66b1867bc92451a5b5e9b0 disable-sub-autodetect-fuzzy-1-test.patch
-c0107655249687655846a9547ca1a5670b9207443180600e7a149c69ffb96d7226787c19b018d4033db9b284c1a5faa8d7d42188ed40c3b8bb051256febf11c5 test-s390x.patch
8230a83306905cdda07fecdb6cb2b791196034775cc5c8986ab63e97cd3476317544011cbce92948059ac9f7b57ef450cd71820f0f134bc3ab3bed38463a67c3 fribidi_allow_deprecated.patch
b45ebe4fd932fd40fe3e3a993ce38ceabfd3e95b0b37dc7d272c6e7465f0cb4d63c9dd1e46d181f8147c99ec5a92e99382d1ab15299c0af7797735079ec248e9 dav1d-1.0.0.patch
ad17d6f4f2cc83841c1c89623c339ec3ee94f6084ea980e2c8cbc3903854c85e5396e31bfd8dc90745b41794670903d854c4d282d8adec263087a9d47b226ccc vlc-live-media-2021.patch
diff --git a/community/vlc/test-s390x.patch b/community/vlc/test-s390x.patch
deleted file mode 100644
index 8f221ee061e..00000000000
--- a/community/vlc/test-s390x.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/test/modules/packetizer/hxxx.c b/test/modules/packetizer/hxxx.c
-index 93362a1..e1b7604 100644
---- a/test/modules/packetizer/hxxx.c
-+++ b/test/modules/packetizer/hxxx.c
-@@ -210,7 +210,7 @@ static void test_annexb()
-
- int main( void )
- {
-- test_annexb();
-+ //test_annexb();
-
- return 0;
- }