[vlc-commits] [Git][videolan/vlc][3.0.x] 3 commits: contrib: gme: Allow make to communicate with jobserver

[Jean-Baptiste Kempf (@jbk)]

Jean-Baptiste Kempf pushed to branch 3.0.x at VideoLAN / VLC


Commits:
5124982e by Hugo Beauzée-Luyssen at 2022-05-26T11:30:16+00:00
contrib: gme: Allow make to communicate with jobserver

(cherry picked from commit 04170339b27b6327a735d73f664c0bdffd13cdec)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

- - - - -
c430af92 by Alexandre Janniaux at 2022-05-26T11:30:16+00:00
contrib: bump game-music-emu to 0.6.3

(cherry picked from commit bd03115677c3352b4bd0e7977926d18e2fd240a8)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

- - - - -
df371fc2 by Mehdi Sabwat at 2022-05-26T11:30:16+00:00
contrib: disable ubsan in gme

ubsan is enabled in the contrib recipe :
https://bitbucket.org/mpyne/game-music-emu/src/b3d158a30492181fd7c38ef795c8d4dcfd77eaa9/CMakeLists.txt#lines-67

This will require vlc to be always built with ubsan and we don't want this in production.

(cherry picked from commit 2355d2cf3fd5d858e47c11191cf125f0e25fa21f)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

- - - - -


4 changed files:

- contrib/src/gme/SHA512SUMS
- − contrib/src/gme/gme-quotes.patch
- − contrib/src/gme/gme-static.patch
- contrib/src/gme/rules.mak


Changes:

=====================================
contrib/src/gme/SHA512SUMS
=====================================
@@ -1 +1 @@
-06b3544086fae51361706b0417ae1bc3769863c7d060ebabdd09b930d37df973314c43afff32aedaa9ebb74cdeafdeadaac4aa5d448700ee961d79d7fc9012b4  game-music-emu-0.6.1.tar.bz2
+4b20c69ced696bb879c34bcb7ce0f5f276642458d4cebca8ede673eed7d50664e527626e2077f85a3411a26660f1b3f01e43cccd72945e1edb2994421efeb552  game-music-emu-0.6.3.tar.xz


=====================================
contrib/src/gme/gme-quotes.patch deleted
=====================================
@@ -1,19 +0,0 @@
---- game-music-emu/CMakeLists.txt       2013-03-17 03:13:46.000000000 +0100
-+++ game-music-emu.patched/CMakeLists.txt       2013-09-07 13:53:36.000000000 +0200
-@@ -67,14 +67,14 @@
-       string (REGEX MATCH "[3-9]\\.[0-9]\\.[0-9]" _gcc_version "${_gcc_version_info}")
-
-       # gcc <4.1 had poor support for symbol visibility
--      if ((${_gcc_version} VERSION_GREATER "4.1") OR (${_gcc_version} VERSION_EQUAL "4.1"))
-+      if (("${_gcc_version}" VERSION_GREATER "4.1") OR ("${_gcc_version}" VERSION_EQUAL "4.1"))
-          set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden")
-          set (ENABLE_VISIBILITY ON)
-          add_definitions (-DLIBGME_VISIBILITY)
-
-          # GCC >= 4.2 also correctly supports making inline members have hidden
-          # visibility by default.
--         if ((${_gcc_version} VERSION_GREATER "4.2") OR (${_gcc_version} VERSION_EQUAL "4.2"))
-+         if (("${_gcc_version}" VERSION_GREATER "4.2") OR ("${_gcc_version}" VERSION_EQUAL "4.2"))
-             set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility-inlines-hidden")
-          endif()
-       endif()


=====================================
contrib/src/gme/gme-static.patch deleted
=====================================
@@ -1,11 +0,0 @@
---- game-music-emu/gme/CMakeLists.txt	2017-11-21 10:43:46.577551600 +0100
-+++ game-music-emu/gme/CMakeLists.txt.static	2017-11-21 10:43:22.791330000 +0100
-@@ -137,7 +137,7 @@ configure_file(${CMAKE_CURRENT_SOURCE_DI
- # On some platforms we may need to change headers or whatnot based on whether
- # we're building the library or merely using the library. The following is
- # only defined when building the library to allow us to tell which is which.
--add_definitions(-DBLARGG_BUILD_DLL)
-+#add_definitions(-DBLARGG_BUILD_DLL)
- 
- # For the gme_types.h
- include_directories(${CMAKE_CURRENT_BINARY_DIR})


=====================================
contrib/src/gme/rules.mak
=====================================
@@ -1,23 +1,21 @@
 # Game Music Emu
 
-GME_VERSION := 0.6.1
-GME_URL := https://bitbucket.org/mpyne/game-music-emu/downloads/game-music-emu-$(GME_VERSION).tar.bz2
+GME_VERSION := 0.6.3
+GME_URL := https://bitbucket.org/mpyne/game-music-emu/downloads/game-music-emu-$(GME_VERSION).tar.xz
 
 PKGS += gme
 
-$(TARBALLS)/game-music-emu-$(GME_VERSION).tar.bz2:
+$(TARBALLS)/game-music-emu-$(GME_VERSION).tar.xz:
 	$(call download_pkg,$(GME_URL),gme)
 
-.sum-gme: game-music-emu-$(GME_VERSION).tar.bz2
+.sum-gme: game-music-emu-$(GME_VERSION).tar.xz
 
-game-music-emu: game-music-emu-$(GME_VERSION).tar.bz2 .sum-gme
+game-music-emu: game-music-emu-$(GME_VERSION).tar.xz .sum-gme
 	$(UNPACK)
-	$(APPLY) $(SRC)/gme/gme-quotes.patch
 	$(APPLY) $(SRC)/gme/skip-underrun.patch
-	$(APPLY) $(SRC)/gme/gme-static.patch
 	$(MOVE)
 
 .gme: game-music-emu toolchain.cmake
-	cd $< && $(HOSTVARS_PIC) $(CMAKE) .
-	cd $< && $(CMAKEBUILD) . --target install
+	cd $< && $(HOSTVARS_PIC) $(CMAKE) . -DENABLE_UBSAN=OFF
+	+$(CMAKEBUILD) $< --target install
 	touch $@



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/6cf94188f8c9ed1bffee19766f84d7537220cae5...df371fc20a7847f59433af1876dcb39d59042bc8

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/6cf94188f8c9ed1bffee19766f84d7537220cae5...df371fc20a7847f59433af1876dcb39d59042bc8
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance