From f5079d780922a2dd8408cd8f3cab98186e05fa88 Mon Sep 17 00:00:00 2001 From: "A. Wilcox" Date: Sat, 21 Jul 2018 21:44:10 -0500 Subject: user/vlc: see commit message - Use Lua 5.3 instead of 5.2. (One Lua to Rule Them All) - Enable some more libs that we already ship. - Disable Wayland. - Fix video_chroma on big endian. - Add -lang since we ship gettext-tiny and that means we get translations now! - Re-order makedepends to be slightly easier to scan through. - Take ownership. - Fix license. - Modernise style. - Alphabetise patch list. - Remove odd whitespace. --- user/vlc/APKBUILD | 143 ++++++++++++++++-------------------------------------- 1 file changed, 43 insertions(+), 100 deletions(-) (limited to 'user/vlc/APKBUILD') diff --git a/user/vlc/APKBUILD b/user/vlc/APKBUILD index a11b883f7..5f936cac8 100644 --- a/user/vlc/APKBUILD +++ b/user/vlc/APKBUILD @@ -1,26 +1,20 @@ # Contributor: Łukasz Jendrysik # Contributor: Leonardo Arena -# Maintainer: Natanael Copa +# Maintainer: A. Wilcox pkgname=vlc pkgver=3.0.3 -_pkgver=${pkgver/_/-} -_ver=${_pkgver%[a-z]} -pkgrel=1 -pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player" +pkgrel=2 +pkgdesc="Multi-platform MPEG, VCD/DVD, and DivX player" triggers="vlc-libs.trigger=/usr/lib/vlc/plugins" pkgusers="vlc" pkggroups="vlc" url="https://www.videolan.org/vlc/" arch="all" -license="GPL-2.0-or-later" +license="GPL-2.0+" options="!checkroot textrel" -subpackages="$pkgname-dev - $pkgname-doc - $pkgname-qt - $pkgname-xorg - $pkgname-daemon::noarch - $pkgname-libs - $pkgname-plugins +subpackages="$pkgname-dev $pkgname-doc $pkgname-qt $pkgname-xorg + $pkgname-daemon::noarch $pkgname-libs $pkgname-plugins + $pkgname-lang $pkgname-plugins-access:plugins_access $pkgname-plugins-access_output:plugins_access_output @@ -46,91 +40,40 @@ subpackages="$pkgname-dev $pkgname-plugins-video_output:plugins_video_output $pkgname-plugins-visualization:plugins_visualization" depends="ttf-dejavu $pkgname-plugins" -makedepends=" - a52dec-dev - alsa-lib-dev - automake - autoconf - bison - libtool - dbus-dev - faad2-dev - ffmpeg-dev - flac-dev - flex - fluidsynth-dev - freetype-dev - fribidi-dev - gtk+3.0-dev - libbluray-dev>=0.2.1 libbluray-dev<20100000 - libavc1394-dev - libcddb-dev - libdc1394-dev>=2.1.0 - libdca-dev - libdvbpsi-dev - libdvdnav-dev - libdvdread-dev - libgcrypt-dev - libice-dev - libjpeg-turbo-dev - libmad-dev - libmatroska-dev - libmpeg2-dev - libnotify-dev - libogg-dev - libraw1394-dev>=2.0.1 - librsvg-dev - libshout-dev - libsm-dev - libtheora-dev - libva-dev - libvdpau-dev - libvorbis-dev - libvpx-dev - libx11-dev - libxext-dev - libxinerama-dev - libxml2-dev - libxpm-dev - libxv-dev - live-media-dev>=2012.01.26 - lua5.2-dev - mesa-dev - ncurses-dev - opus-dev - pkgconfig - pulseaudio-dev - qt5-qtbase-dev - qt5-qtsvg-dev - qt5-qtx11extras-dev - sdl2-dev - speex-dev - speexdsp-dev - sysfsutils-dev - taglib-dev - eudev-dev - v4l-utils-dev - wayland-protocols - x264-dev - x265-dev - xcb-util-renderutil-dev - xcb-util-keysyms-dev +# Generic dependencies, then X11, then multimedia libraries +makedepends="autoconf automake bison eudev-dev flex libarchive-dev + libgcrypt-dev libtool libxml2-dev lua5.3-dev ncurses-dev sysfsutils-dev + + dbus-dev freetype-dev fribidi-dev gtk+3.0-dev libice-dev libnotify-dev + libjpeg-turbo-dev libsm-dev libx11-dev libxext-dev libxinerama-dev + libxpm-dev libxv-dev mesa-dev qt5-qtbase-dev qt5-qtsvg-dev sdl2-dev + qt5-qtx11extras-dev xcb-util-keysyms-dev xcb-util-renderutil-dev xdg-utils + + a52dec-dev alsa-lib-dev faad2-dev ffmpeg-dev flac-dev fluidsynth-dev + libaacs-dev libavc1394-dev libbluray-dev>=0.2.1 libbluray-dev<20100000 + libcddb-dev libdc1394-dev>=2.1.0 libdca-dev libdvbpsi-dev libdvdnav-dev + libdvdread-dev libmad-dev libmatroska-dev libmpeg2-dev libogg-dev + libraw1394-dev>=2.0.1 librsvg-dev libshout-dev libtheora-dev libva-dev + libvdpau-dev libvorbis-dev libvpx-dev live-media-dev>=2012.01.26 + opus-dev pulseaudio-dev speex-dev speexdsp-dev taglib-dev v4l-utils-dev + x264-dev x265-dev gstreamer-dev gst-plugins-base-dev " -source="http://get.videolan.org/vlc/$_ver/vlc-$_ver.tar.xz - omxil-rpi-codecs.patch +source="https://get.videolan.org/vlc/$pkgver/vlc-$pkgver.tar.xz check-headless.patch disable-sub-autodetect-fuzzy-1-test.patch + endian-fix.patch fribidi-update.patch + lua.patch + omxil-rpi-codecs.patch tar-compat.patch test-s390x.patch - vlc-libs.trigger" - -builddir="$srcdir"/$pkgname-$_ver + vlc-libs.trigger + " prepare() { default_prepare - NOCONFIGURE=1 ./bootstrap + NOCONFIGURE=1 ./bootstrap } build() { @@ -142,32 +85,35 @@ build() { arm*) _arch_opts="--enable-omxil --enable-omxil-vout --enable-rpi-omxil" ;; aarch64) _arch_opts="--enable-neon" ;; ppc64*) _arch_opts="--enable-altivec" ;; + x86* | pmmx) _arch_opts="--disable-mmx --disable-sse" ;; esac - LUA=lua5.2 \ - LUAC=luac5.2 \ BUILDCC="${CC:-gcc} -std=c99" \ ./configure \ --build=$CBUILD \ --host=$CHOST \ --prefix=/usr \ - --disable-mmx \ - --disable-sse \ --enable-nls \ --enable-optimizations \ --enable-optimize-memory \ --disable-rpath \ + --disable-wayland \ + --enable-dbus \ + --enable-notify \ + --enable-ncurses \ + --enable-pulse \ + --enable-qt \ + --enable-udev \ --enable-a52 \ --enable-avcodec \ --enable-avformat \ --enable-bluray \ --enable-cdda \ - --enable-dbus \ --enable-dc1394 \ --enable-dca \ --enable-dvbpsi \ - --enable-dvdread \ --enable-dvdnav \ + --enable-dvdread \ --enable-faad \ --enable-flac \ --enable-fluidsynth \ @@ -178,13 +124,9 @@ build() { --enable-live555 \ --enable-mad \ --enable-merge-ffmpeg \ - --enable-notify \ - --enable-ncurses \ --enable-ogg \ --enable-opus \ --enable-png \ - --enable-pulse \ - --enable-qt \ --enable-realrtsp \ --enable-shout \ --enable-skins2 \ @@ -192,7 +134,6 @@ build() { --enable-sout \ --enable-taglib \ --enable-theora \ - --enable-udev \ --enable-v4l2 \ --enable-vdpau \ --enable-vlm \ @@ -353,10 +294,12 @@ plugins_video_output() { _mv_plugins video_output; } plugins_visualization() { _mv_plugins visualization; } sha512sums="1569cefa6623b2631a832679bc9a63ebeba222901e5221d254e896a68d2ee467054da8de9eda566924e80a11bb29a673a9f0c4243793845547d8027b58a238ab vlc-3.0.3.tar.xz -e13e398b7bfd977f6e099bcb6cf8dc5cd5bad6dea3eff715881826246dc4329468846084aff2576de2b7fd28d3f06e7c327a6e4511a28d22e5cd198a81146c89 omxil-rpi-codecs.patch 22d80df599b8b65a5439cefbb7140af8e9530f326d54945da3769af65f37518b99ec2cc8647aafd2763324a0698280915afe043cc87e5720c4694881ed35bffa check-headless.patch e214b407235cb3afb8bec93f20c9b42957b57e6fd3960679d3d4235e77762e03e64d03c01f00ef63d589e7c85aaad02ce6abbeeccd66b1867bc92451a5b5e9b0 disable-sub-autodetect-fuzzy-1-test.patch +e063c727d952465bbea33f669db49190427521dc8e2291e9a5cbb0f5e8e879bd3ba76855e44bd4630948e30c4329d27bd928f95de20fe1050d5e839778a4d012 endian-fix.patch 3338531d385f76d9eedf10498d1b0b78565c531eedb3018d4500e377815f9ccbfcc16ec398cb8559bcc624f65b61d376125c4a5e6880cbad90ec9880dd4b9ce5 fribidi-update.patch +35f83e38a6a0dd1e3c37e3dc6d63b1406d2f9454ed246854c1408d6f35ad74b743c5b0dbc19442bab65aad4268707ffa85bfda9e72b2d711c1d3412d955bf150 lua.patch +e13e398b7bfd977f6e099bcb6cf8dc5cd5bad6dea3eff715881826246dc4329468846084aff2576de2b7fd28d3f06e7c327a6e4511a28d22e5cd198a81146c89 omxil-rpi-codecs.patch a117ca4d7fd66a5f959fdeaddfdce2f8442fe9f2c13995bb7f4792a7745c00813813aa962f76e957e3b0735344a5dc000e0644ce09f23458802a2932231655c3 tar-compat.patch c0107655249687655846a9547ca1a5670b9207443180600e7a149c69ffb96d7226787c19b018d4033db9b284c1a5faa8d7d42188ed40c3b8bb051256febf11c5 test-s390x.patch b67b6e21e9d4027aef1006e6057f9ba8e65ce3895b08f7b911b1675cff9bc423f64ee2c187c584860e9e5d4635a30408a7781add9694d9bba753eac37f357406 vlc-libs.trigger" -- cgit v1.2.3-70-g09d2