diff options
| author | Síle Ekaterin Liszka <sheila@vulpine.house> | 2025-06-29 02:22:47 -0700 |
|---|---|---|
| committer | Síle Ekaterin Liszka <sheila@vulpine.house> | 2025-06-29 14:58:51 -0700 |
| commit | 9adcf8e18bc312a27b5fedb3df260192a3ca5153 (patch) | |
| tree | 21f12c3dfad9ada4a8093bccb01218603c2a1496 | |
| parent | 9f15fe63839a4a0e94618106662a25771902786b (diff) | |
| download | packages-9adcf8e18bc312a27b5fedb3df260192a3ca5153.tar.gz packages-9adcf8e18bc312a27b5fedb3df260192a3ca5153.tar.bz2 packages-9adcf8e18bc312a27b5fedb3df260192a3ca5153.tar.xz packages-9adcf8e18bc312a27b5fedb3df260192a3ca5153.zip | |
user/vlc: use slibtool
| -rw-r--r-- | user/vlc/APKBUILD | 13 | ||||
| -rw-r--r-- | user/vlc/use-libtool-correctly.patch | 14 | ||||
| -rw-r--r-- | user/vlc/use-vlc-static.patch | 12 |
3 files changed, 36 insertions, 3 deletions
diff --git a/user/vlc/APKBUILD b/user/vlc/APKBUILD index bd23a9899..ec33767d3 100644 --- a/user/vlc/APKBUILD +++ b/user/vlc/APKBUILD @@ -17,7 +17,7 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-qt $pkgname-pulse depends="ttf-dejavu xdg-utils" # 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 + libgcrypt-dev slibtool 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 @@ -43,6 +43,8 @@ source="https://get.videolan.org/vlc/$pkgver/vlc-$pkgver.tar.xz omxil-rpi-codecs.patch tar-compat.patch test-s390x.patch + use-libtool-correctly.patch + use-vlc-static.patch $pkgname.initd $pkgname.confd @@ -68,6 +70,9 @@ source="https://get.videolan.org/vlc/$pkgver/vlc-$pkgver.tar.xz prepare() { default_prepare + export LIBTOOL="slibtool" + export LIBTOOLIZE="slibtoolize" + cp /usr/share/slibtool/slibtool.sh . NOCONFIGURE=1 ./bootstrap } @@ -139,7 +144,7 @@ build() { --enable-xvideo \ $_arch_opts - make + make V=1 } package() { @@ -152,7 +157,7 @@ package() { } check() { - make check + make check V=1 } _mv() { @@ -216,5 +221,7 @@ e063c727d952465bbea33f669db49190427521dc8e2291e9a5cbb0f5e8e879bd3ba76855e44bd463 e13e398b7bfd977f6e099bcb6cf8dc5cd5bad6dea3eff715881826246dc4329468846084aff2576de2b7fd28d3f06e7c327a6e4511a28d22e5cd198a81146c89 omxil-rpi-codecs.patch 3557686d76ab26fd401cb8758944b23173e6983f55b34d923d6808a2cc1f8efa9d0de58ab3b1664c713a579d1a94c4fcd8d731327eebd23c599bf037571e5406 tar-compat.patch c0107655249687655846a9547ca1a5670b9207443180600e7a149c69ffb96d7226787c19b018d4033db9b284c1a5faa8d7d42188ed40c3b8bb051256febf11c5 test-s390x.patch +db24a442ddafd64a41d97db95b5f1a321c6b5de865abadfbc9449474f664a7dde38d435013142a435bdb47aba89cbb69a8c85f898290310cce2f3bd4f5a6b4f2 use-libtool-correctly.patch +24c0d75ed6fd99ed0f4b58d23d7037bfcd77f75cdad117a12cb9533754b2b5a7e8ddbc8e9090969e974b312915fab9a3bc0a8e6439303e05275531ff08a2cfac use-vlc-static.patch 55e245190b443dde9c7215ea5210612fcca164900a9a4b025ccf0d1e3fc5206d00b52355b256974421e37c609875627f1db19f0f5a084511aec0daf677ecc9d6 vlc.initd d89190dca1b8b2c3faca5863dc6c7e6eb24e05178e6f75ed752fd3c6a73cb8a42d2625b6e56453296b7096ea868be642ecd42745dac20e7f13fc67dd3c3c7c49 vlc.confd" diff --git a/user/vlc/use-libtool-correctly.patch b/user/vlc/use-libtool-correctly.patch new file mode 100644 index 000000000..b4f12d173 --- /dev/null +++ b/user/vlc/use-libtool-correctly.patch @@ -0,0 +1,14 @@ +diff '--color=auto' -Nurd vlc-3.0.20/test/Makefile.am vlc-3.0.20.new/test/Makefile.am +--- vlc-3.0.20/test/Makefile.am 2023-08-05 03:03:51.000000000 -0700 ++++ vlc-3.0.20.new/test/Makefile.am 2025-06-28 09:50:23.942096181 -0700 +@@ -80,8 +80,8 @@ + + AM_CFLAGS = -DSRCDIR=\"$(srcdir)\" + AM_LDFLAGS = -no-install +-LIBVLCCORE = -L../src/ -lvlccore +-LIBVLC = -L../lib -lvlc ++LIBVLCCORE = ../src/libvlccore.la ++LIBVLC = ../lib/libvlc.la + + test_libvlc_core_SOURCES = libvlc/core.c + test_libvlc_core_LDADD = $(LIBVLC) diff --git a/user/vlc/use-vlc-static.patch b/user/vlc/use-vlc-static.patch new file mode 100644 index 000000000..f9cdf9586 --- /dev/null +++ b/user/vlc/use-vlc-static.patch @@ -0,0 +1,12 @@ +diff '--color=auto' -Nurd vlc-3.0.20/test/run_vlc.sh vlc-3.0.20.new/test/run_vlc.sh +--- vlc-3.0.20/test/run_vlc.sh 2023-02-11 01:33:19.000000000 -0800 ++++ vlc-3.0.20.new/test/run_vlc.sh 2025-06-29 02:08:28.915250802 -0700 +@@ -2,7 +2,7 @@ + + set -e + +-VLC="./vlc -I dummy --ignore-config --rc-fake-tty" ++VLC="bin/vlc-static -I dummy --ignore-config --rc-fake-tty" + + $VLC -H + $VLC -Idummy vlc://quit |