* Re: [PR PATCH] [Updated] vlc: update to 3.0.19.
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-46831@inbox.vuxu.org>
@ 2023-10-25 16:32 ` jadynbrammer
2023-10-25 16:34 ` jadynbrammer
` (19 subsequent siblings)
20 siblings, 0 replies; 21+ messages in thread
From: jadynbrammer @ 2023-10-25 16:32 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 789 bytes --]
There is an updated pull request by jadynbrammer against master on the void-packages repository
https://github.com/jadynbrammer/void-packages update-vlc-to-3.0.19
https://github.com/void-linux/void-packages/pull/46831
vlc: update to 3.0.19.
vlc: update to 3.0.19
#### Testing the changes
- I tested the changes in this PR: **YES** -- vlc runs and I can confirm that FLAC playback is fixed (the main reason I sought this update)
#### Local build testing
- I built this PR locally for my native architecture, x86_64
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- x86_64-musl (crossbuild)
- aarch64 (crossbuild)
- aarch64-musl (crossbuild)
A patch file from https://github.com/void-linux/void-packages/pull/46831.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update-vlc-to-3.0.19-46831.patch --]
[-- Type: text/x-diff, Size: 1535 bytes --]
From c2a1e3389d32d29775e10d77b9d9509df679ff45 Mon Sep 17 00:00:00 2001
From: Jadyn Brammer <jadyn@brammer.social>
Date: Sun, 22 Oct 2023 07:52:10 -0500
Subject: [PATCH] vlc: update to 3.0.19.
vlc: update to 3.0.19
---
common/shlibs | 1 +
srcpkgs/vlc/template | 6 +++---
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index d35612f79a270..148b3e7158839 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -149,6 +149,7 @@ libglapi.so.0 libglapi-7.11_1
libgbm.so.1 libgbm-9.0_1
libOpenGL.so.0 libglvnd-1.3.0_1
libGLX.so.0 libglvnd-1.3.0_1
+libEGL.so libglvnd-1.6.0_1
librsvg-2.so.2 librsvg-2.26.0_1
librist.so.4 librist-0.2.7_1
libdbus-1.so.3 dbus-libs-1.2.10_1
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index be579ce38fe37..d24428db5b846 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
# Template file for 'vlc'
pkgname=vlc
-version=3.0.18
-revision=7
+version=3.0.19
+revision=1
build_style=gnu-configure
configure_args="--disable-gme --disable-libtar --enable-jack
--enable-live555 --disable-fluidsynth --enable-dvdread
@@ -17,7 +17,7 @@ license="GPL-2.0-only, LGPL-2.1-only"
homepage="https://www.videolan.org/vlc/"
changelog="https://www.videolan.org/developers/vlc-branch/NEWS"
distfiles="${VIDEOLAN_SITE}/vlc/${version}/vlc-${version}.tar.xz"
-checksum=57094439c365d8aa8b9b41fa3080cc0eef2befe6025bb5cef722accc625aedec
+checksum=643e3294bafe922324663ca499515b7564f2794575fd7d2b7992d20896381745
lib32disabled=yes
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: vlc: update to 3.0.19.
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-46831@inbox.vuxu.org>
2023-10-25 16:32 ` [PR PATCH] [Updated] vlc: update to 3.0.19 jadynbrammer
@ 2023-10-25 16:34 ` jadynbrammer
2023-10-30 21:15 ` [PR REVIEW] " mhmdanas
` (18 subsequent siblings)
20 siblings, 0 replies; 21+ messages in thread
From: jadynbrammer @ 2023-10-25 16:34 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 306 bytes --]
New comment by jadynbrammer on void-packages repository
https://github.com/void-linux/void-packages/pull/46831#issuecomment-1779653289
Comment:
Figured it out, added a missing shlib entry. Now the crossbuilds for rpi work, but I do not have armv6l/armv7l hardware to actually test the built packages on.
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PR REVIEW] vlc: update to 3.0.19.
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-46831@inbox.vuxu.org>
2023-10-25 16:32 ` [PR PATCH] [Updated] vlc: update to 3.0.19 jadynbrammer
2023-10-25 16:34 ` jadynbrammer
@ 2023-10-30 21:15 ` mhmdanas
2023-10-30 21:37 ` mhmdanas
` (17 subsequent siblings)
20 siblings, 0 replies; 21+ messages in thread
From: mhmdanas @ 2023-10-30 21:15 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 435 bytes --]
New review comment by mhmdanas on void-packages repository
https://github.com/void-linux/void-packages/pull/46831#discussion_r1376809818
Comment:
This isn't really the right fix, we don't want packages linking against unversioned libraries from other packages. `vlc` should be made to link against the versioned library instead probably.
Anyway, I filed a ticket for this: https://github.com/void-linux/void-packages/issues/46974
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PR REVIEW] vlc: update to 3.0.19.
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-46831@inbox.vuxu.org>
` (2 preceding siblings ...)
2023-10-30 21:15 ` [PR REVIEW] " mhmdanas
@ 2023-10-30 21:37 ` mhmdanas
2023-10-30 21:37 ` mhmdanas
` (16 subsequent siblings)
20 siblings, 0 replies; 21+ messages in thread
From: mhmdanas @ 2023-10-30 21:37 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1996 bytes --]
New review comment by mhmdanas on void-packages repository
https://github.com/void-linux/void-packages/pull/46831#discussion_r1376829312
Comment:
Actually, never mind, this worked for me (also has some misc changes in there, don't mind me):
```diff
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index d24428db5b8..baa76782f8e 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -63,7 +63,7 @@ case "$XBPS_TARGET_MACHINE" in
configure_args+=" --disable-altivec"
build_options_default+=" opengl"
;;
- armv[67]*)
+ armv[67]*|aarch64*)
# XXX only for rpi
build_options_default+=" rpi"
;;
@@ -76,20 +76,12 @@ fi
if [ "$build_option_rpi" ]; then
configure_args+=" --enable-omxil --enable-omxil-vout --enable-rpi-omxil"
makedepends+=" rpi-userland-devel"
-
- CFLAGS+=" -I${XBPS_CROSS_BASE}/opt/vc/include"
- CFLAGS+=" -I${XBPS_CROSS_BASE}/opt/vc/include/interface/vcos"
- CFLAGS+=" -I${XBPS_CROSS_BASE}/opt/vc/include/interface/vmcs_host/linux"
- CFLAGS+=" -I${XBPS_CROSS_BASE}/opt/vc/include/interface/vcos/pthreads"
-
- LDFLAGS="-L${XBPS_CROSS_BASE}/opt/vc/lib -Wl,-rpath=/opt/vc/lib -lbcm_host -lvcos -lvchiq_arm"
fi
pre_configure() {
NOCONFIGURE=1 ./bootstrap
- sed -i -e 's;tar cvvzf;tar cvzf;' share/Makefile.am share/Makefile.in
- sed 's|pl_shader_alloc(tc->pl_ctx, NULL, 0, 0);|pl_shader_alloc(tc->pl_ctx, NULL, 0);|' -i modules/video_output/opengl/vout_helper.c
+ vsed -i -e 's;tar cvvzf;tar cvzf;' share/Makefile.am share/Makefile.in
}
@@ -98,7 +90,7 @@ pre_install() {
# install .lua files instead of precompiled .luac ones
# scripts precompiled with 64 bit host compiler won’t run on 32 bit target
# same with respect to endianess
- sed -i -e "s/\(@list='\$(nobase_vlclib_DATA\)/\1:.luac=.lua/" share/Makefile
+ vsed -i -e "s/\(@list='\$(nobase_vlclib_DATA\)/\1:.luac=.lua/" share/Makefile
fi
}
```
Apply and push this diff and remove the common/shlibs change.
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PR REVIEW] vlc: update to 3.0.19.
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-46831@inbox.vuxu.org>
` (3 preceding siblings ...)
2023-10-30 21:37 ` mhmdanas
@ 2023-10-30 21:37 ` mhmdanas
2023-11-09 18:22 ` classabbyamp
` (15 subsequent siblings)
20 siblings, 0 replies; 21+ messages in thread
From: mhmdanas @ 2023-10-30 21:37 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1996 bytes --]
New review comment by mhmdanas on void-packages repository
https://github.com/void-linux/void-packages/pull/46831#discussion_r1376829312
Comment:
Actually, never mind, this worked for me (also has some misc changes in there, don't mind me):
```diff
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index d24428db5b8..baa76782f8e 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -63,7 +63,7 @@ case "$XBPS_TARGET_MACHINE" in
configure_args+=" --disable-altivec"
build_options_default+=" opengl"
;;
- armv[67]*)
+ armv[67]*|aarch64*)
# XXX only for rpi
build_options_default+=" rpi"
;;
@@ -76,20 +76,12 @@ fi
if [ "$build_option_rpi" ]; then
configure_args+=" --enable-omxil --enable-omxil-vout --enable-rpi-omxil"
makedepends+=" rpi-userland-devel"
-
- CFLAGS+=" -I${XBPS_CROSS_BASE}/opt/vc/include"
- CFLAGS+=" -I${XBPS_CROSS_BASE}/opt/vc/include/interface/vcos"
- CFLAGS+=" -I${XBPS_CROSS_BASE}/opt/vc/include/interface/vmcs_host/linux"
- CFLAGS+=" -I${XBPS_CROSS_BASE}/opt/vc/include/interface/vcos/pthreads"
-
- LDFLAGS="-L${XBPS_CROSS_BASE}/opt/vc/lib -Wl,-rpath=/opt/vc/lib -lbcm_host -lvcos -lvchiq_arm"
fi
pre_configure() {
NOCONFIGURE=1 ./bootstrap
- sed -i -e 's;tar cvvzf;tar cvzf;' share/Makefile.am share/Makefile.in
- sed 's|pl_shader_alloc(tc->pl_ctx, NULL, 0, 0);|pl_shader_alloc(tc->pl_ctx, NULL, 0);|' -i modules/video_output/opengl/vout_helper.c
+ vsed -i -e 's;tar cvvzf;tar cvzf;' share/Makefile.am share/Makefile.in
}
@@ -98,7 +90,7 @@ pre_install() {
# install .lua files instead of precompiled .luac ones
# scripts precompiled with 64 bit host compiler won’t run on 32 bit target
# same with respect to endianess
- sed -i -e "s/\(@list='\$(nobase_vlclib_DATA\)/\1:.luac=.lua/" share/Makefile
+ vsed -i -e "s/\(@list='\$(nobase_vlclib_DATA\)/\1:.luac=.lua/" share/Makefile
fi
}
```
Apply and push this diff and remove the common/shlibs change.
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PR REVIEW] vlc: update to 3.0.19.
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-46831@inbox.vuxu.org>
` (4 preceding siblings ...)
2023-10-30 21:37 ` mhmdanas
@ 2023-11-09 18:22 ` classabbyamp
2023-11-09 18:24 ` classabbyamp
` (14 subsequent siblings)
20 siblings, 0 replies; 21+ messages in thread
From: classabbyamp @ 2023-11-09 18:22 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 170 bytes --]
New review comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/46831#discussion_r1388417799
Comment:
fixed in 5b9db217
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: vlc: update to 3.0.19.
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-46831@inbox.vuxu.org>
` (5 preceding siblings ...)
2023-11-09 18:22 ` classabbyamp
@ 2023-11-09 18:24 ` classabbyamp
2023-11-10 20:49 ` [PR PATCH] [Updated] " jadynbrammer
` (13 subsequent siblings)
20 siblings, 0 replies; 21+ messages in thread
From: classabbyamp @ 2023-11-09 18:24 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 189 bytes --]
New comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/46831#issuecomment-1804336613
Comment:
please remove the shlibs change and rebase
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PR PATCH] [Updated] vlc: update to 3.0.19.
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-46831@inbox.vuxu.org>
` (6 preceding siblings ...)
2023-11-09 18:24 ` classabbyamp
@ 2023-11-10 20:49 ` jadynbrammer
2023-11-10 20:54 ` jadynbrammer
` (12 subsequent siblings)
20 siblings, 0 replies; 21+ messages in thread
From: jadynbrammer @ 2023-11-10 20:49 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 789 bytes --]
There is an updated pull request by jadynbrammer against master on the void-packages repository
https://github.com/jadynbrammer/void-packages update-vlc-to-3.0.19
https://github.com/void-linux/void-packages/pull/46831
vlc: update to 3.0.19.
vlc: update to 3.0.19
#### Testing the changes
- I tested the changes in this PR: **YES** -- vlc runs and I can confirm that FLAC playback is fixed (the main reason I sought this update)
#### Local build testing
- I built this PR locally for my native architecture, x86_64
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- x86_64-musl (crossbuild)
- aarch64 (crossbuild)
- aarch64-musl (crossbuild)
A patch file from https://github.com/void-linux/void-packages/pull/46831.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update-vlc-to-3.0.19-46831.patch --]
[-- Type: text/x-diff, Size: 1132 bytes --]
From ca2ece7ce5f5e95aa6a20973bb20fa9e1e6ba2c3 Mon Sep 17 00:00:00 2001
From: Jadyn Brammer <jadyn@brammer.social>
Date: Sun, 22 Oct 2023 07:52:10 -0500
Subject: [PATCH] vlc: update to 3.0.19.
Removed shlibs change as requested.
---
srcpkgs/vlc/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index be579ce38fe37a..d24428db5b8469 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
# Template file for 'vlc'
pkgname=vlc
-version=3.0.18
-revision=7
+version=3.0.19
+revision=1
build_style=gnu-configure
configure_args="--disable-gme --disable-libtar --enable-jack
--enable-live555 --disable-fluidsynth --enable-dvdread
@@ -17,7 +17,7 @@ license="GPL-2.0-only, LGPL-2.1-only"
homepage="https://www.videolan.org/vlc/"
changelog="https://www.videolan.org/developers/vlc-branch/NEWS"
distfiles="${VIDEOLAN_SITE}/vlc/${version}/vlc-${version}.tar.xz"
-checksum=57094439c365d8aa8b9b41fa3080cc0eef2befe6025bb5cef722accc625aedec
+checksum=643e3294bafe922324663ca499515b7564f2794575fd7d2b7992d20896381745
lib32disabled=yes
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: vlc: update to 3.0.19.
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-46831@inbox.vuxu.org>
` (7 preceding siblings ...)
2023-11-10 20:49 ` [PR PATCH] [Updated] " jadynbrammer
@ 2023-11-10 20:54 ` jadynbrammer
2023-11-10 20:55 ` jadynbrammer
` (11 subsequent siblings)
20 siblings, 0 replies; 21+ messages in thread
From: jadynbrammer @ 2023-11-10 20:54 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 367 bytes --]
New comment by jadynbrammer on void-packages repository
https://github.com/void-linux/void-packages/pull/46831#issuecomment-1806418852
Comment:
Updated & Rebased as requested.
Note: I am still learning git, but I think I did everything correctly. If not, please let me know and I'll do my best to correct it! Thank you for your patience with my inexperience ^_^
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: vlc: update to 3.0.19.
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-46831@inbox.vuxu.org>
` (8 preceding siblings ...)
2023-11-10 20:54 ` jadynbrammer
@ 2023-11-10 20:55 ` jadynbrammer
2023-11-10 20:56 ` jadynbrammer
` (10 subsequent siblings)
20 siblings, 0 replies; 21+ messages in thread
From: jadynbrammer @ 2023-11-10 20:55 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 283 bytes --]
New comment by jadynbrammer on void-packages repository
https://github.com/void-linux/void-packages/pull/46831#issuecomment-1806419865
Comment:
Oh... I just saw the second part. Hahha, should have checked here before just reacting to the email. I'll work on merging those changes.
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: vlc: update to 3.0.19.
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-46831@inbox.vuxu.org>
` (9 preceding siblings ...)
2023-11-10 20:55 ` jadynbrammer
@ 2023-11-10 20:56 ` jadynbrammer
2023-11-10 21:06 ` classabbyamp
` (9 subsequent siblings)
20 siblings, 0 replies; 21+ messages in thread
From: jadynbrammer @ 2023-11-10 20:56 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 283 bytes --]
New comment by jadynbrammer on void-packages repository
https://github.com/void-linux/void-packages/pull/46831#issuecomment-1806419865
Comment:
Oh... I just saw the second part. Hahha, should have checked here before just reacting to the email. I'll work on merging those changes.
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: vlc: update to 3.0.19.
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-46831@inbox.vuxu.org>
` (10 preceding siblings ...)
2023-11-10 20:56 ` jadynbrammer
@ 2023-11-10 21:06 ` classabbyamp
2023-11-10 21:17 ` [PR PATCH] [Updated] " jadynbrammer
` (8 subsequent siblings)
20 siblings, 0 replies; 21+ messages in thread
From: classabbyamp @ 2023-11-10 21:06 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 621 bytes --]
New comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/46831#issuecomment-1806434961
Comment:
I think you almost got it.
if `git remote -v` doesn't show a remote like:
```
upstream https://github.com/void-linux/void-packages.git (fetch)
upstream https://github.com/void-linux/void-packages.git (push)
```
add it with `git remote add upstream https://github.com/void-linux/void-packages.git`
then `git pull --rebase upstream master` on your vlc branch and `git push -f` the result. it may say there's a conflict that you'll have to fix, so do that if so.
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PR PATCH] [Updated] vlc: update to 3.0.19.
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-46831@inbox.vuxu.org>
` (11 preceding siblings ...)
2023-11-10 21:06 ` classabbyamp
@ 2023-11-10 21:17 ` jadynbrammer
2023-11-10 21:35 ` jadynbrammer
` (7 subsequent siblings)
20 siblings, 0 replies; 21+ messages in thread
From: jadynbrammer @ 2023-11-10 21:17 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 789 bytes --]
There is an updated pull request by jadynbrammer against master on the void-packages repository
https://github.com/jadynbrammer/void-packages update-vlc-to-3.0.19
https://github.com/void-linux/void-packages/pull/46831
vlc: update to 3.0.19.
vlc: update to 3.0.19
#### Testing the changes
- I tested the changes in this PR: **YES** -- vlc runs and I can confirm that FLAC playback is fixed (the main reason I sought this update)
#### Local build testing
- I built this PR locally for my native architecture, x86_64
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- x86_64-musl (crossbuild)
- aarch64 (crossbuild)
- aarch64-musl (crossbuild)
A patch file from https://github.com/void-linux/void-packages/pull/46831.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update-vlc-to-3.0.19-46831.patch --]
[-- Type: text/x-diff, Size: 1132 bytes --]
From ca2ece7ce5f5e95aa6a20973bb20fa9e1e6ba2c3 Mon Sep 17 00:00:00 2001
From: Jadyn Brammer <jadyn@brammer.social>
Date: Sun, 22 Oct 2023 07:52:10 -0500
Subject: [PATCH] vlc: update to 3.0.19.
Removed shlibs change as requested.
---
srcpkgs/vlc/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index be579ce38fe37a..d24428db5b8469 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
# Template file for 'vlc'
pkgname=vlc
-version=3.0.18
-revision=7
+version=3.0.19
+revision=1
build_style=gnu-configure
configure_args="--disable-gme --disable-libtar --enable-jack
--enable-live555 --disable-fluidsynth --enable-dvdread
@@ -17,7 +17,7 @@ license="GPL-2.0-only, LGPL-2.1-only"
homepage="https://www.videolan.org/vlc/"
changelog="https://www.videolan.org/developers/vlc-branch/NEWS"
distfiles="${VIDEOLAN_SITE}/vlc/${version}/vlc-${version}.tar.xz"
-checksum=57094439c365d8aa8b9b41fa3080cc0eef2befe6025bb5cef722accc625aedec
+checksum=643e3294bafe922324663ca499515b7564f2794575fd7d2b7992d20896381745
lib32disabled=yes
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: vlc: update to 3.0.19.
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-46831@inbox.vuxu.org>
` (12 preceding siblings ...)
2023-11-10 21:17 ` [PR PATCH] [Updated] " jadynbrammer
@ 2023-11-10 21:35 ` jadynbrammer
2023-11-10 21:41 ` classabbyamp
` (6 subsequent siblings)
20 siblings, 0 replies; 21+ messages in thread
From: jadynbrammer @ 2023-11-10 21:35 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 329 bytes --]
New comment by jadynbrammer on void-packages repository
https://github.com/void-linux/void-packages/pull/46831#issuecomment-1806462980
Comment:
After a refresh, github had an option to resolve the conflicts directly in the web page, so I did that. Hopefully that works! If not I can redo it if needed. Thank you for your help!
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: vlc: update to 3.0.19.
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-46831@inbox.vuxu.org>
` (13 preceding siblings ...)
2023-11-10 21:35 ` jadynbrammer
@ 2023-11-10 21:41 ` classabbyamp
2023-11-10 22:03 ` [PR PATCH] [Updated] " jadynbrammer
` (5 subsequent siblings)
20 siblings, 0 replies; 21+ messages in thread
From: classabbyamp @ 2023-11-10 21:41 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 216 bytes --]
New comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/46831#issuecomment-1806473458
Comment:
it's better to do it locally so it doesn't generate that merge commit
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PR PATCH] [Updated] vlc: update to 3.0.19.
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-46831@inbox.vuxu.org>
` (14 preceding siblings ...)
2023-11-10 21:41 ` classabbyamp
@ 2023-11-10 22:03 ` jadynbrammer
2023-11-11 20:11 ` jadynbrammer
` (4 subsequent siblings)
20 siblings, 0 replies; 21+ messages in thread
From: jadynbrammer @ 2023-11-10 22:03 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 789 bytes --]
There is an updated pull request by jadynbrammer against master on the void-packages repository
https://github.com/jadynbrammer/void-packages update-vlc-to-3.0.19
https://github.com/void-linux/void-packages/pull/46831
vlc: update to 3.0.19.
vlc: update to 3.0.19
#### Testing the changes
- I tested the changes in this PR: **YES** -- vlc runs and I can confirm that FLAC playback is fixed (the main reason I sought this update)
#### Local build testing
- I built this PR locally for my native architecture, x86_64
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- x86_64-musl (crossbuild)
- aarch64 (crossbuild)
- aarch64-musl (crossbuild)
A patch file from https://github.com/void-linux/void-packages/pull/46831.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update-vlc-to-3.0.19-46831.patch --]
[-- Type: text/x-diff, Size: 1130 bytes --]
From 5742d582bb5a4e2390c171b9b784b7e4baa39cd3 Mon Sep 17 00:00:00 2001
From: Jadyn Brammer <jadyn@brammer.social>
Date: Sun, 22 Oct 2023 07:52:10 -0500
Subject: [PATCH] vlc: update to 3.0.19.
Removed shlibs change as requested.
---
srcpkgs/vlc/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index c6e7275b514c4..baa76782f8e83 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
# Template file for 'vlc'
pkgname=vlc
-version=3.0.18
-revision=9
+version=3.0.19
+revision=1
build_style=gnu-configure
configure_args="--disable-gme --disable-libtar --enable-jack
--enable-live555 --disable-fluidsynth --enable-dvdread
@@ -17,7 +17,7 @@ license="GPL-2.0-only, LGPL-2.1-only"
homepage="https://www.videolan.org/vlc/"
changelog="https://www.videolan.org/developers/vlc-branch/NEWS"
distfiles="${VIDEOLAN_SITE}/vlc/${version}/vlc-${version}.tar.xz"
-checksum=57094439c365d8aa8b9b41fa3080cc0eef2befe6025bb5cef722accc625aedec
+checksum=643e3294bafe922324663ca499515b7564f2794575fd7d2b7992d20896381745
lib32disabled=yes
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: vlc: update to 3.0.19.
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-46831@inbox.vuxu.org>
` (15 preceding siblings ...)
2023-11-10 22:03 ` [PR PATCH] [Updated] " jadynbrammer
@ 2023-11-11 20:11 ` jadynbrammer
2023-11-11 20:53 ` classabbyamp
` (3 subsequent siblings)
20 siblings, 0 replies; 21+ messages in thread
From: jadynbrammer @ 2023-11-11 20:11 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 816 bytes --]
New comment by jadynbrammer on void-packages repository
https://github.com/void-linux/void-packages/pull/46831#issuecomment-1806906842
Comment:
Ah, the build is now failing due to 'libFLAC.so.8'; Because this file is versioned, is a shlibs addition the correct fix this time?
```diff
diff --git a/common/shlibs b/common/shlibs
index 7e9cee83f84..348a342dbfc 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1465,6 +1465,7 @@ libvlccore.so.9 libvlc-3.0.2_1
libvlc_vdpau.so.0 libvlc-2.2.0_1
libvlc_pulse.so.0 libvlc-3.0.2_1
libvlc_xcb_events.so.0 libvlc-3.0.2_1
+libFLAC.so.8 libvlc-3.0.19_1
libcmocka.so.0 cmocka-1.1.1_1
libbtrfs.so.0 libbtrfs-3.12_1
libreiserfscore.so.0 reiserfsprogs-3.6.27_3
```
It builds successfully with this on my machine.
If this looks good, I'll update the PR.
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: vlc: update to 3.0.19.
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-46831@inbox.vuxu.org>
` (16 preceding siblings ...)
2023-11-11 20:11 ` jadynbrammer
@ 2023-11-11 20:53 ` classabbyamp
2023-11-11 21:30 ` jadynbrammer
` (2 subsequent siblings)
20 siblings, 0 replies; 21+ messages in thread
From: classabbyamp @ 2023-11-11 20:53 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 299 bytes --]
New comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/46831#issuecomment-1806914592
Comment:
don't make that change, we'll just have to wait for the [builders](https://build.voidlinux.org/waterfall) to finish rebuilding stuff for the new libflac
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: vlc: update to 3.0.19.
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-46831@inbox.vuxu.org>
` (17 preceding siblings ...)
2023-11-11 20:53 ` classabbyamp
@ 2023-11-11 21:30 ` jadynbrammer
2023-11-15 17:22 ` [PR PATCH] [Merged]: " Hoshpak
2023-11-15 17:22 ` Hoshpak
20 siblings, 0 replies; 21+ messages in thread
From: jadynbrammer @ 2023-11-11 21:30 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 168 bytes --]
New comment by jadynbrammer on void-packages repository
https://github.com/void-linux/void-packages/pull/46831#issuecomment-1806922015
Comment:
understood! Thanks :)
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PR PATCH] [Merged]: vlc: update to 3.0.19.
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-46831@inbox.vuxu.org>
` (18 preceding siblings ...)
2023-11-11 21:30 ` jadynbrammer
@ 2023-11-15 17:22 ` Hoshpak
2023-11-15 17:22 ` Hoshpak
20 siblings, 0 replies; 21+ messages in thread
From: Hoshpak @ 2023-11-15 17:22 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 610 bytes --]
There's a merged pull request on the void-packages repository
vlc: update to 3.0.19.
https://github.com/void-linux/void-packages/pull/46831
Description:
vlc: update to 3.0.19
#### Testing the changes
- I tested the changes in this PR: **YES** -- vlc runs and I can confirm that FLAC playback is fixed (the main reason I sought this update)
#### Local build testing
- I built this PR locally for my native architecture, x86_64
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- x86_64-musl (crossbuild)
- aarch64 (crossbuild)
- aarch64-musl (crossbuild)
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: vlc: update to 3.0.19.
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-46831@inbox.vuxu.org>
` (19 preceding siblings ...)
2023-11-15 17:22 ` [PR PATCH] [Merged]: " Hoshpak
@ 2023-11-15 17:22 ` Hoshpak
20 siblings, 0 replies; 21+ messages in thread
From: Hoshpak @ 2023-11-15 17:22 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 185 bytes --]
New comment by Hoshpak on void-packages repository
https://github.com/void-linux/void-packages/pull/46831#issuecomment-1812953261
Comment:
@jadynbrammer Thanks for your contribution!
^ permalink raw reply [flat|nested] 21+ messages in thread