[vlc-commits] [Git][videolan/vlc][3.0.x] 4 commits: contrib: glew: switch to GitHub
Steve Lhomme (@robUx4)
gitlab at videolan.org
Mon Jul 20 07:23:39 UTC 2026
Steve Lhomme pushed to branch 3.0.x at VideoLAN / VLC
Commits:
5845c24f by Steve Lhomme at 2026-07-20T08:08:07+02:00
contrib: glew: switch to GitHub
It's the same project with a matching hash.
(cherry picked from commit 2b32e46e75515710aab3929c7e4ceaba076225a6)
Signed-off-by: Steve Lhomme <robux4 at ycbcr.xyz>
- - - - -
12de43ef by Steve Lhomme at 2026-07-20T08:08:08+02:00
contrib: glew: update to 2.3.6
(cherry picked from commit 6383e4f8f3ba73e0f91bb122727ef19b091e2694)
Signed-off-by: Steve Lhomme <robux4 at ycbcr.xyz>
- - - - -
d206cd3b by Steve Lhomme at 2026-07-20T08:08:08+02:00
contrib: glew: do not force compiler flags and don't build .dll
(cherry picked from commit afe91e3dbeccf5159dcbe4cc40433291472a3cac)
Signed-off-by: Steve Lhomme <robux4 at ycbcr.xyz>
- - - - -
48975584 by Steve Lhomme at 2026-07-20T08:08:08+02:00
NEWS: update glew to 2.3.1
- - - - -
10 changed files:
- NEWS
- + contrib/src/glew/0001-Define-GLEW_STATIC-in-pkg-config-file-when-compiled-.patch
- + contrib/src/glew/0002-Link-with-opengl32-on-Windows.patch
- + contrib/src/glew/0003-Link-directly-with-glu32-on-Windows.patch
- + contrib/src/glew/0004-Allow-disabling-the-CMAKE_DEBUG_POSTFIX.patch
- + contrib/src/glew/0005-Do-not-force-compiler-flag.patch
- + contrib/src/glew/0006-Do-not-compile-the-shared-library-with-DBUILD_SHARED.patch
- contrib/src/glew/SHA512SUMS
- − contrib/src/glew/glew-drop-debug-postfix.patch
- contrib/src/glew/rules.mak
Changes:
=====================================
NEWS
=====================================
@@ -76,6 +76,7 @@ Contrib:
* Update flac to 1.4.2
* Update FFmpeg to 8.1.2
* Update gcrypt to 1.12.0
+ * Update glew to 2.3.1
* Update gme to 0.6.4
* Update gnutls to 3.8.13
* Update gpg-error to 1.56
=====================================
contrib/src/glew/0001-Define-GLEW_STATIC-in-pkg-config-file-when-compiled-.patch
=====================================
@@ -0,0 +1,30 @@
+From ff48c25db79dcaaf1b9ec89af9f085b2541cba57 Mon Sep 17 00:00:00 2001
+From: Steve Lhomme <robux4 at ycbcr.xyz>
+Date: Wed, 15 Apr 2026 13:47:23 +0200
+Subject: [PATCH 1/4] Define GLEW_STATIC in pkg-config file when compiled
+ statically
+
+---
+ build/cmake/CMakeLists.txt | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/build/cmake/CMakeLists.txt b/build/cmake/CMakeLists.txt
+index 7b7f8b4..d4eb8a5 100644
+--- a/build/cmake/CMakeLists.txt
++++ b/build/cmake/CMakeLists.txt
+@@ -219,7 +219,11 @@ set (libdir ${CMAKE_INSTALL_FULL_LIBDIR})
+ set (includedir ${CMAKE_INSTALL_FULL_INCLUDEDIR})
+ set (version ${GLEW_VERSION})
+ set (libname ${GLEW_LIB_NAME})
+-set (cflags)
++if(BUILD_SHARED_LIBS)
++ set (cflags)
++else()
++ set (cflags -DGLEW_STATIC)
++endif ()
+ set (requireslib glu)
+
+ # Mac OSX has no glu.pc unless optional X11/GLX is installed
+--
+2.52.0.windows.1
+
=====================================
contrib/src/glew/0002-Link-with-opengl32-on-Windows.patch
=====================================
@@ -0,0 +1,26 @@
+From 0f272be0aaf41e7225188ff44750399bbf5c78d9 Mon Sep 17 00:00:00 2001
+From: Steve Lhomme <robux4 at ycbcr.xyz>
+Date: Wed, 15 Apr 2026 13:54:45 +0200
+Subject: [PATCH 2/4] Link with opengl32 on Windows
+
+---
+ build/cmake/CMakeLists.txt | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/build/cmake/CMakeLists.txt b/build/cmake/CMakeLists.txt
+index d4eb8a5..6c83c50 100644
+--- a/build/cmake/CMakeLists.txt
++++ b/build/cmake/CMakeLists.txt
+@@ -224,6 +224,9 @@ if(BUILD_SHARED_LIBS)
+ else()
+ set (cflags -DGLEW_STATIC)
+ endif ()
++if (WIN32)
++ set (libgl -lopengl32)
++endif ()
+ set (requireslib glu)
+
+ # Mac OSX has no glu.pc unless optional X11/GLX is installed
+--
+2.52.0.windows.1
+
=====================================
contrib/src/glew/0003-Link-directly-with-glu32-on-Windows.patch
=====================================
@@ -0,0 +1,28 @@
+From a4f97da1d0753ba570db3265077f100c3306f137 Mon Sep 17 00:00:00 2001
+From: Steve Lhomme <robux4 at ycbcr.xyz>
+Date: Wed, 15 Apr 2026 13:44:24 +0200
+Subject: [PATCH 3/4] Link directly with glu32 on Windows
+
+---
+ build/cmake/CMakeLists.txt | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/build/cmake/CMakeLists.txt b/build/cmake/CMakeLists.txt
+index 6c83c50..8bcd803 100644
+--- a/build/cmake/CMakeLists.txt
++++ b/build/cmake/CMakeLists.txt
+@@ -233,6 +233,11 @@ set (requireslib glu)
+ if (APPLE)
+ set (requireslib)
+ endif ()
++if (WIN32)
++ # Windows/mingw-w64 doesn't have a glu.pc but has libglu32.a
++ set (requireslib)
++ set (libgl "${libgl} -lglu32")
++endif()
+
+ configure_file (${GLEW_DIR}/glew.pc.in ${CMAKE_CURRENT_BINARY_DIR}/glew.pc @ONLY)
+
+--
+2.52.0.windows.1
+
=====================================
contrib/src/glew/0004-Allow-disabling-the-CMAKE_DEBUG_POSTFIX.patch
=====================================
@@ -0,0 +1,25 @@
+From e19b0eb3bad3305586a21eeeb8f1f3d99c09c8af Mon Sep 17 00:00:00 2001
+From: Steve Lhomme <robux4 at ycbcr.xyz>
+Date: Wed, 15 Apr 2026 13:58:45 +0200
+Subject: [PATCH 4/4] Allow disabling the CMAKE_DEBUG_POSTFIX
+
+---
+ build/cmake/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/build/cmake/CMakeLists.txt b/build/cmake/CMakeLists.txt
+index 8bcd803..4970272 100644
+--- a/build/cmake/CMakeLists.txt
++++ b/build/cmake/CMakeLists.txt
+@@ -7,7 +7,7 @@ endif ()
+
+ include(GNUInstallDirs)
+
+-set(CMAKE_DEBUG_POSTFIX d)
++set(CMAKE_DEBUG_POSTFIX d CACHE STRING "")
+
+ option (BUILD_UTILS "utilities" ON)
+ option (GLEW_REGAL "Regal mode" OFF)
+--
+2.52.0.windows.1
+
=====================================
contrib/src/glew/0005-Do-not-force-compiler-flag.patch
=====================================
@@ -0,0 +1,38 @@
+From 168f2f76d55b828918355aa35fda853766347735 Mon Sep 17 00:00:00 2001
+From: Steve Lhomme <slhomme at matroska.org>
+Date: Fri, 26 Jun 2026 06:46:01 +0200
+Subject: [PATCH 5/6] Do not force compiler flag
+
+- We do want stack protection if it's forced.
+- We don't need to disable standard libraries.
+- Use built-in if you want.
+---
+ build/cmake/CMakeLists.txt | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/build/cmake/CMakeLists.txt b/build/cmake/CMakeLists.txt
+index bd9fc9e..087aaf6 100644
+--- a/build/cmake/CMakeLists.txt
++++ b/build/cmake/CMakeLists.txt
+@@ -133,12 +133,12 @@ if (MSVC)
+ target_link_libraries (glew LINK_PRIVATE libvcruntime.lib)
+ target_link_libraries (glew LINK_PRIVATE msvcrt.lib )
+ string(REGEX REPLACE "/RTC(su|[1su])" "" CMAKE_C_FLAGS_DEBUG ${CMAKE_C_FLAGS_DEBUG})
+-elseif (WIN32 AND ((CMAKE_C_COMPILER_ID MATCHES "GNU") OR (CMAKE_C_COMPILER_ID MATCHES "Clang")))
+- # remove stdlib dependency on windows with GCC and Clang (for similar reasons
+- # as to MSVC - to allow it to be used with any Windows compiler)
+- target_compile_options (glew PRIVATE -fno-builtin -fno-stack-protector)
+- target_compile_options (glew_s PRIVATE -fno-builtin -fno-stack-protector)
+- target_link_libraries (glew LINK_PRIVATE -nostdlib)
++# elseif (WIN32 AND ((CMAKE_C_COMPILER_ID MATCHES "GNU") OR (CMAKE_C_COMPILER_ID MATCHES "Clang")))
++# # remove stdlib dependency on windows with GCC and Clang (for similar reasons
++# # as to MSVC - to allow it to be used with any Windows compiler)
++# target_compile_options (glew PRIVATE -fno-builtin -fno-stack-protector)
++# target_compile_options (glew_s PRIVATE -fno-builtin -fno-stack-protector)
++# target_link_libraries (glew LINK_PRIVATE -nostdlib)
+ endif ()
+
+ if (BUILD_FRAMEWORK)
+--
+2.39.5 (Apple Git-154)
+
=====================================
contrib/src/glew/0006-Do-not-compile-the-shared-library-with-DBUILD_SHARED.patch
=====================================
@@ -0,0 +1,68 @@
+From 94f25bbf055dff046cb865ed73f156ac68ff7c0d Mon Sep 17 00:00:00 2001
+From: Steve Lhomme <slhomme at matroska.org>
+Date: Fri, 26 Jun 2026 06:47:57 +0200
+Subject: [PATCH 6/6] Do not compile the shared library with
+ -DBUILD_SHARED_LIBS=OFF
+
+---
+ build/cmake/CMakeLists.txt | 16 ++++++++++------
+ 1 file changed, 10 insertions(+), 6 deletions(-)
+
+diff --git a/build/cmake/CMakeLists.txt b/build/cmake/CMakeLists.txt
+index 087aaf6..024e4b6 100644
+--- a/build/cmake/CMakeLists.txt
++++ b/build/cmake/CMakeLists.txt
+@@ -111,10 +111,12 @@ if (WIN32)
+ list (APPEND GLEW_SRC_FILES ${GLEW_DIR}/build/glew.rc)
+ endif ()
+
++if(BUILD_SHARED_LIBS)
+ add_library (glew SHARED ${GLEW_PUBLIC_HEADERS_FILES} ${GLEW_SRC_FILES})
+ set_target_properties (glew PROPERTIES COMPILE_DEFINITIONS "GLEW_BUILD" OUTPUT_NAME "${GLEW_LIB_NAME}" PREFIX "${DLL_PREFIX}"
+ VERSION ${GLEW_VERSION}
+ SOVERSION ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR})
++endif()
+ add_library (glew_s STATIC ${GLEW_PUBLIC_HEADERS_FILES} ${GLEW_SRC_FILES})
+ set_target_properties (glew_s PROPERTIES COMPILE_DEFINITIONS "GLEW_STATIC" OUTPUT_NAME "${GLEW_LIB_NAME}" PREFIX lib)
+
+@@ -141,7 +143,7 @@ if (MSVC)
+ # target_link_libraries (glew LINK_PRIVATE -nostdlib)
+ endif ()
+
+-if (BUILD_FRAMEWORK)
++if (BUILD_FRAMEWORK AND BUILD_SHARED_LIBS)
+ set_target_properties(glew PROPERTIES
+ FRAMEWORK TRUE
+ FRAMEWORK_VERSION ${GLEW_VERSION}
+@@ -154,14 +156,11 @@ if (BUILD_FRAMEWORK)
+ )
+ endif()
+
++if(BUILD_SHARED_LIBS)
+ target_link_libraries (glew LINK_PUBLIC ${GLEW_LIBRARIES})
++endif()
+ target_link_libraries (glew_s ${GLEW_LIBRARIES})
+
+-target_compile_definitions(glew_s INTERFACE "GLEW_STATIC")
+-foreach(t glew glew_s)
+- target_include_directories(${t} PUBLIC $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
+-endforeach()
+-
+ set(targets_to_install "")
+ if(BUILD_SHARED_LIBS)
+ list(APPEND targets_to_install glew)
+@@ -169,6 +168,11 @@ else ()
+ list(APPEND targets_to_install glew_s)
+ endif()
+
++target_compile_definitions(glew_s INTERFACE "GLEW_STATIC")
++foreach(t ${targets_to_install})
++ target_include_directories(${t} PUBLIC $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
++endforeach()
++
+ install ( TARGETS ${targets_to_install}
+ EXPORT glew-targets
+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Runtime
+--
+2.52.0.windows.1
+
=====================================
contrib/src/glew/SHA512SUMS
=====================================
@@ -1 +1 @@
-9a9b4d81482ccaac4b476c34ed537585ae754a82ebb51c3efa16d953c25cc3931be46ed2e49e79c730cd8afc6a1b78c97d52cd714044a339c3bc29734cd4d2ab glew-2.1.0.tgz
+cb4caecf32ec0f180c2691dc7769ffc99571c64f259a2663a2b80e788f1c2fd5362c59e0caaeefed6fb78a4070366d244666a657358049b09071b59fae2377e0 glew-2.3.1.tgz
=====================================
contrib/src/glew/glew-drop-debug-postfix.patch deleted
=====================================
@@ -1,11 +0,0 @@
---- glew.pristine/build/cmake/CMakeLists.txt 2017-07-31 14:25:39.000000000 +0300
-+++ glew/build/cmake/CMakeLists.txt 2019-10-27 06:26:55.413590264 +0300
-@@ -13,8 +13,6 @@
- cmake_policy (SET CMP0042 NEW)
- endif()
-
--set(CMAKE_DEBUG_POSTFIX d)
--
- option (BUILD_UTILS "utilities" ON)
- option (GLEW_REGAL "Regal mode" OFF)
- option (GLEW_OSMESA "OSMesa mode" OFF)
=====================================
contrib/src/glew/rules.mak
=====================================
@@ -1,6 +1,6 @@
# GLEW
-GLEW_VERSION := 2.1.0
-GLEW_URL := $(SF)/glew/glew/$(GLEW_VERSION)/glew-$(GLEW_VERSION).tgz
+GLEW_VERSION := 2.3.1
+GLEW_URL := $(GITHUB)/nigels-com/glew/releases/download/glew-$(GLEW_VERSION)/glew-$(GLEW_VERSION).tgz
ifeq ($(call need_pkg,"glew"),)
PKGS_FOUND += glew
@@ -13,12 +13,19 @@ $(TARBALLS)/glew-$(GLEW_VERSION).tgz:
glew: glew-$(GLEW_VERSION).tgz .sum-glew
$(UNPACK)
- $(APPLY) $(SRC)/glew/glew-drop-debug-postfix.patch
+ $(APPLY) $(SRC)/glew/0001-Define-GLEW_STATIC-in-pkg-config-file-when-compiled-.patch
+ $(APPLY) $(SRC)/glew/0002-Link-with-opengl32-on-Windows.patch
+ $(APPLY) $(SRC)/glew/0003-Link-directly-with-glu32-on-Windows.patch
+ $(APPLY) $(SRC)/glew/0004-Allow-disabling-the-CMAKE_DEBUG_POSTFIX.patch
+ $(APPLY) $(SRC)/glew/0005-Do-not-force-compiler-flag.patch
+ $(APPLY) $(SRC)/glew/0006-Do-not-compile-the-shared-library-with-DBUILD_SHARED.patch
$(MOVE)
+GLEW_CONF := -DBUILD_UTILS=OFF
+
.glew: glew toolchain.cmake
$(CMAKECLEAN)
- $(HOSTVARS_CMAKE) $(CMAKE) -S $</build/cmake -DCMAKE_POLICY_VERSION_MINIMUM=3.5
+ $(HOSTVARS_CMAKE) $(CMAKE) -S $</build/cmake $(GLEW_CONF)
+$(CMAKEBUILD)
$(CMAKEINSTALL)
touch $@
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/df010408cc1f91becb0845e12e40498a5eefb0c6...48975584a188053473a7b72a02b3e313227c46f9
--
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/df010408cc1f91becb0845e12e40498a5eefb0c6...48975584a188053473a7b72a02b3e313227c46f9
You're receiving this email because of your account on code.videolan.org. Manage all notifications: https://code.videolan.org/-/profile/notifications | Help: https://code.videolan.org/help
More information about the vlc-commits
mailing list