[vlc-commits] [Git][videolan/vlc][3.0.x] 5 commits: contrib: ogg: update to 1.3.4 and fix typedefs for MacOS
Tristan Matthews (@tmatth)
gitlab at videolan.org
Wed Jun 18 13:46:29 UTC 2025
Tristan Matthews pushed to branch 3.0.x at VideoLAN / VLC
Commits:
a075cd0b by Tristan Matthews at 2025-06-17T08:12:00-04:00
contrib: ogg: update to 1.3.4 and fix typedefs for MacOS
(cherry picked from commit 8c7a70b62f200a612ab0aa2f53e2fde090fddc4a)
(cherry picked from commit 03b3f47bda6f462533c2d8eab74ea44799053b2c)
- - - - -
bb9031aa by Steve Lhomme at 2025-06-17T09:24:57-04:00
contrib: ogg: build with CMake
- - - - -
3c1998d4 by Johannes Kauffmann at 2025-06-17T09:25:36-04:00
contrib: ogg: update to 1.3.5
(cherry picked from commit 8ae3870ca9e5030ff554a56545c6fa7445bfd876)
- - - - -
38f6ba0f by Johannes Kauffmann at 2025-06-17T09:25:36-04:00
contrib: ogg: avoid installing documentation
(cherry picked from commit e3c25c0f35cd2e6d0ce9efc7950a1539923d3189)
- - - - -
b8678c34 by Tristan Matthews at 2025-06-17T09:25:36-04:00
contrib: ogg: update to ogg 1.3.6
(cherry picked from commit e94baffb23596029e90d535a2a3c79ddf6d9bf54)
- - - - -
4 changed files:
- contrib/src/ogg/SHA512SUMS
- − contrib/src/ogg/libogg-configure.patch
- − contrib/src/ogg/libogg-disable-check.patch
- contrib/src/ogg/rules.mak
Changes:
=====================================
contrib/src/ogg/SHA512SUMS
=====================================
@@ -1 +1 @@
-37d8e4329bf7a997a95d84a55c325a5a893ec84bb4d5b7ea638e5cb13201a0619e71ecd9710a8371def69f092c62dcc59ec0a607db246028ee8a62678386260b libogg-1.3.3.tar.xz
+2168548e57e23fadca4aa66351214b23d699bc3aa47f5d065f8b583a3fe85c99333014a6aa38e4021b0e3750115b88258a6c00cac1e1496cdee5f12cdc633814 libogg-1.3.6.tar.xz
=====================================
contrib/src/ogg/libogg-configure.patch deleted
=====================================
@@ -1,56 +0,0 @@
---- libogg-1.3.3/configure.ac 2017-11-07 15:33:00.000000000 -0500
-+++ libogg-1.3.3-new/configure.ac 2017-11-15 16:00:23.786278061 -0500
-@@ -27,17 +27,17 @@
- case $host in
- *-*-irix*)
- DEBUG="-g -signed"
-- CFLAGS="-O2 -w -signed"
-+ EXTRA_CFLAGS="-O2 -w -signed"
- PROFILE="-p -g3 -O2 -signed"
- ;;
- sparc-sun-solaris*)
- DEBUG="-v -g"
-- CFLAGS="-xO4 -fast -w -fsimple -native -xcg92"
-+ EXTRA_CFLAGS="-xO4 -fast -w -fsimple -native -xcg92"
- PROFILE="-v -xpg -g -xO4 -fast -native -fsimple -xcg92 -Dsuncc"
- ;;
- *)
- DEBUG="-g"
-- CFLAGS="-O"
-+ EXTRA_CFLAGS="-O"
- PROFILE="-g -p"
- ;;
- esac
-@@ -45,27 +45,27 @@
- case $host in
- *-*-linux*)
- DEBUG="-g -Wall -fsigned-char"
-- CFLAGS="-O20 -Wall -ffast-math -fsigned-char"
-+ EXTRA_CFLAGS="-O20 -Wall -ffast-math -fsigned-char"
- PROFILE="-Wall -W -pg -g -O20 -ffast-math -fsigned-char"
- ;;
- sparc-sun-*)
- DEBUG="-g -Wall -fsigned-char"
-- CFLAGS="-O20 -ffast-math -fsigned-char"
-+ EXTRA_CFLAGS="-O20 -ffast-math -fsigned-char"
- PROFILE="-pg -g -O20 -fsigned-char"
- ;;
- *-*-darwin*)
- DEBUG="-fno-common -g -Wall -fsigned-char"
-- CFLAGS="-fno-common -O4 -Wall -fsigned-char -ffast-math"
-+ EXTRA_CFLAGS="-fno-common -O3 -Wall -fsigned-char -ffast-math"
- PROFILE="-fno-common -O4 -Wall -pg -g -fsigned-char -ffast-math"
- ;;
- *)
- DEBUG="-g -Wall -fsigned-char"
-- CFLAGS="-O20 -fsigned-char"
-+ EXTRA_CFLAGS="-O20 -fsigned-char"
- PROFILE="-O20 -g -pg -fsigned-char"
- ;;
- esac
- fi
--CFLAGS="$CFLAGS $cflags_save"
-+CFLAGS="$EXTRA_CFLAGS $cflags_save"
- DEBUG="$DEBUG $cflags_save"
- PROFILE="$PROFILE $cflags_save"
-
=====================================
contrib/src/ogg/libogg-disable-check.patch deleted
=====================================
@@ -1,11 +0,0 @@
---- libogg-1.3.3/src/Makefile.am 2017-06-12 13:14:31.000000000 -0400
-+++ libogg-1.3.3-new/src/Makefile.am 2017-11-15 16:03:05.434272042 -0500
-@@ -9,7 +9,7 @@
-
- # build and run the self tests on 'make check'
-
--noinst_PROGRAMS = test_bitwise test_framing
-+noinst_PROGRAMS =
-
- test_bitwise_SOURCES = bitwise.c
- test_bitwise_CFLAGS = -D_V_SELFTEST
=====================================
contrib/src/ogg/rules.mak
=====================================
@@ -1,9 +1,8 @@
# libogg
-OGG_VERSION := 1.3.3
+OGG_VERSION := 1.3.6
OGG_URL := http://downloads.xiph.org/releases/ogg/libogg-$(OGG_VERSION).tar.xz
-#OGG_CVSROOT := :pserver:anoncvs at xiph.org:/usr/local/cvsroot
PKGS += ogg
ifeq ($(call need_pkg,"ogg >= 1.0"),)
@@ -17,13 +16,13 @@ $(TARBALLS)/libogg-$(OGG_VERSION).tar.xz:
libogg: libogg-$(OGG_VERSION).tar.xz .sum-ogg
$(UNPACK)
- $(APPLY) $(SRC)/ogg/libogg-configure.patch
- $(APPLY) $(SRC)/ogg/libogg-disable-check.patch
- $(UPDATE_AUTOCONFIG)
$(MOVE)
-.ogg: libogg
- $(RECONF)
- cd $< && $(HOSTVARS) ./configure $(HOSTCONF)
- cd $< && $(MAKE) install
+OGG_CONF := -DINSTALL_DOCS:BOOL=OFF
+
+.ogg: libogg toolchain.cmake
+ $(CMAKECLEAN)
+ $(HOSTVARS) $(CMAKE) $(OGG_CONF)
+ +$(CMAKEBUILD)
+ $(CMAKEINSTALL)
touch $@
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/3d209f05270dc109a5b737c30c9bee3a51206859...b8678c346501614125ba2093ad670139814c0bac
--
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/3d209f05270dc109a5b737c30c9bee3a51206859...b8678c346501614125ba2093ad670139814c0bac
You're receiving this email because of your account on code.videolan.org.
VideoLAN code repository instance
More information about the vlc-commits
mailing list