[vlc-commits] [Git][videolan/vlc][master] 3 commits: contrib: cddb: fix more gcc 14 issues with mingw-w64

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
3dc740c6 by Steve Lhomme at 2025-08-28T08:53:11+00:00
contrib: cddb: fix more gcc 14 issues with mingw-w64

- - - - -
0150e3d5 by Steve Lhomme at 2025-08-28T08:53:11+00:00
contrib: use ftpmirror for GNU packages

It's less overloaded and the recommended URL [^1].

[^1]: https://www.gnu.org/prep/ftp.en.html

- - - - -
20cb70f2 by Steve Lhomme at 2025-08-28T08:53:11+00:00
contrib: gnutls: update to 3.8.10

It builds properly with gcc 14 mingw-w64.

- - - - -


4 changed files:

- contrib/src/cddb/cddb-gcc14-getsockoptfix.patch
- contrib/src/gnutls/SHA512SUMS
- contrib/src/gnutls/rules.mak
- contrib/src/main.mak


Changes:

=====================================
contrib/src/cddb/cddb-gcc14-getsockoptfix.patch
=====================================
@@ -2,15 +2,33 @@
 
 --- b/lib/cddb_net.c	2025-02-28 13:13:17.680209272 +0000
 +++ a/lib/cddb_net.c	2025-02-28 13:15:19.318977753 +0000
-@@ -268,7 +268,7 @@
+@@ -265,10 +265,16 @@ int timeout_connect(int sockfd, const st
+     if (connect(sockfd, addr, len) == -1) {
+         /* check whether we can continue */
+         if (errno == EINPROGRESS) {
++#ifdef _WIN32
++            DWORD rv;
++#define GETSOCKOPT_VAL_TYPE char
++#else
              int rv;
++#define GETSOCKOPT_VAL_TYPE int
++#endif
              fd_set wfds;
              struct timeval tv;
 -            size_t l;
 +            socklen_t l;
-
+ 
              /* set up select time out */
              tv.tv_sec = timeout;
+@@ -288,7 +294,7 @@ int timeout_connect(int sockfd, const st
+             default:
+                 /* we got connected, check error condition */
+                 l = sizeof(rv);
+-                getsockopt(sockfd, SOL_SOCKET, SO_ERROR, &rv, &l);
++                getsockopt(sockfd, SOL_SOCKET, SO_ERROR, (GETSOCKOPT_VAL_TYPE*)&rv, &l);
+                 if (rv) {
+                     /* something went wrong, simulate normal connect behaviour */
+                     errno = rv;
 --- a/configure.ac.orig	2025-03-06 10:32:40.974509646 +0000
 +++ b/configure.ac	2025-03-09 10:13:07.446501285 +0000
 @@ -133,6 +133,21 @@


=====================================
contrib/src/gnutls/SHA512SUMS
=====================================
@@ -1 +1 @@
-74eddba01ce4c2ffdca781c85db3bb52c85f1db3c09813ee2b8ceea0608f92ca3912fd9266f55deb36a8ba4d01802895ca5d5d219e7d9caec45e1a8534e45a84  gnutls-3.8.3.tar.xz
+d453bd4527af95cb3905ce8753ceafd969e3f442ad1d148544a233ebf13285b999930553a805a0511293cc25390bb6a040260df5544a7c55019640f920ad3d92  gnutls-3.8.10.tar.xz


=====================================
contrib/src/gnutls/rules.mak
=====================================
@@ -1,7 +1,7 @@
 # GnuTLS
 
 GNUTLS_MAJVERSION := 3.8
-GNUTLS_VERSION := $(GNUTLS_MAJVERSION).3
+GNUTLS_VERSION := $(GNUTLS_MAJVERSION).10
 GNUTLS_URL := $(GNUGPG)/gnutls/v$(GNUTLS_MAJVERSION)/gnutls-$(GNUTLS_VERSION).tar.xz
 
 # nettle/gmp can't be used with the LGPLv2 license


=====================================
contrib/src/main.mak
=====================================
@@ -21,7 +21,7 @@ QTBASE_VERSION_MAJOR := 6.8
 QTBASE_VERSION := $(QTBASE_VERSION_MAJOR).3
 
 # Common download locations
-GNU ?= https://ftp.gnu.org/gnu
+GNU ?= https://ftpmirror.gnu.org/gnu
 SF := https://downloads.sourceforge.net/project
 VIDEOLAN := https://downloads.videolan.org/pub/videolan
 CONTRIB_VIDEOLAN := https://downloads.videolan.org/pub/contrib



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/1610f7c54264cd50d8d05afc88fa1d3529b645ff...20cb70f22beb160eff022ae69ed3e23c373936f8

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/1610f7c54264cd50d8d05afc88fa1d3529b645ff...20cb70f22beb160eff022ae69ed3e23c373936f8
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance