[vlc-commits] [Git][videolan/vlc][3.0.x] 4 commits: contrib: ass: remove forced -O3
Jean-Baptiste Kempf (@jbk)
gitlab at videolan.org
Fri Aug 4 21:22:33 UTC 2023
Jean-Baptiste Kempf pushed to branch 3.0.x at VideoLAN / VLC
Commits:
dfdbbf18 by Steve Lhomme at 2023-08-04T20:34:52+00:00
contrib: ass: remove forced -O3
This shouldn't be enforced. We already use -O2 on release builds.
Introduced in 77f2dac1abc04ba5b1dc040c6cf90325622828fa
(cherry picked from commit 4dce5d8ed7dbeb3cbf33ebe17b1fe1dce50abe1c)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
- - - - -
5241032a by Steve Lhomme at 2023-08-04T20:34:52+00:00
contrib: ass: disable tests
And fix fribidi dependencies
(cherry picked from commit 7ebe66444b45a2459fb7737d1ef8e371704c367f)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
- - - - -
b2b0683d by Johannes Kauffmann at 2023-08-04T20:34:52+00:00
contribs: use $(GITHUB) consistently
(cherry picked from commit 2dcd7516a08c38b75c901b19718bd301cbd22af1)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
- - - - -
4d093ebb by Francois Cartegnie at 2023-08-04T20:34:52+00:00
contribs: update libass to 0.17.1
refs #27771
(cherry picked from commit 00e4996d1e0707a3a451a2faeb7b868328e03a2d)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
- - - - -
19 changed files:
- contrib/src/aribb24/rules.mak
- contrib/src/ass/SHA512SUMS
- contrib/src/ass/rules.mak
- contrib/src/caca/rules.mak
- contrib/src/fluidlite/rules.mak
- contrib/src/fribidi/rules.mak
- contrib/src/harfbuzz/rules.mak
- contrib/src/jack/rules.mak
- contrib/src/libdsm/rules.mak
- contrib/src/mfx/rules.mak
- contrib/src/microdns/rules.mak
- contrib/src/mysofa/rules.mak
- contrib/src/nfs/rules.mak
- contrib/src/openjpeg/rules.mak
- contrib/src/protobuf/rules.mak
- contrib/src/smb2/rules.mak
- contrib/src/sparkle/rules.mak
- contrib/src/spatialaudio/rules.mak
- contrib/src/vncclient/rules.mak
Changes:
=====================================
contrib/src/aribb24/rules.mak
=====================================
@@ -1,7 +1,7 @@
# aribb24
ARIBB24_VERSION := 1.0.3
-ARIBB24_URL := https://github.com/nkoriyama/aribb24/archive/v$(ARIBB24_VERSION).tar.gz
+ARIBB24_URL := $(GITHUB)/nkoriyama/aribb24/archive/v$(ARIBB24_VERSION).tar.gz
ifdef GPL
ifdef GNUV3
=====================================
contrib/src/ass/SHA512SUMS
=====================================
@@ -1 +1 @@
-1d2fd02fb2669de7f38ecfa0fe79e3c89da93e09c3cf6bf7b7b811a4808a06fd702da27ba1d9223c9a8a943198e7961b06c808a07e17d6cc6ba2ce70fd802300 libass-0.16.0.tar.gz
+29c3f82e8d68ffc403941805202c4756b65cf48aeadbe9ae5e307ee4f52a5e4d916330ad26ec322aa92ddc72a4f01633033f9f628dbb8d8653a74b3e6eb7f735 libass-0.17.1.tar.gz
=====================================
contrib/src/ass/rules.mak
=====================================
@@ -1,6 +1,6 @@
# ASS
-ASS_VERSION := 0.16.0
-ASS_URL := https://github.com/libass/libass/releases/download/$(ASS_VERSION)/libass-$(ASS_VERSION).tar.gz
+ASS_VERSION := 0.17.1
+ASS_URL := $(GITHUB)/libass/libass/releases/download/$(ASS_VERSION)/libass-$(ASS_VERSION).tar.gz
PKGS += ass
ifeq ($(call need_pkg,"libass"),)
@@ -9,7 +9,6 @@ endif
ifdef HAVE_ANDROID
WITH_FONTCONFIG = 0
-WITH_HARFBUZZ = 1
ifeq ($(ANDROID_ABI), x86)
WITH_ASS_ASM = 0
endif
@@ -20,15 +19,12 @@ WITH_HARFBUZZ = 0
else
ifdef HAVE_DARWIN_OS
WITH_FONTCONFIG = 0
-WITH_HARFBUZZ = 1
else
ifdef HAVE_WINSTORE
WITH_FONTCONFIG = 0
-WITH_HARFBUZZ = 1
WITH_DWRITE = 1
else
WITH_FONTCONFIG = 1
-WITH_HARFBUZZ = 1
endif
endif
endif
@@ -43,8 +39,9 @@ libass: libass-$(ASS_VERSION).tar.gz .sum-ass
$(UNPACK)
$(MOVE)
-DEPS_ass = freetype2 $(DEPS_freetype2) fribidi iconv $(DEPS_iconv)
+DEPS_ass = freetype2 $(DEPS_freetype2) fribidi $(DEPS_fribidi) iconv $(DEPS_iconv) harfbuzz $(DEPS_harfbuzz)
+ASS_CONF = --disable-test
ifneq ($(WITH_FONTCONFIG), 0)
DEPS_ass += fontconfig $(DEPS_fontconfig)
else
@@ -55,24 +52,12 @@ ifeq ($(WITH_DWRITE), 1)
ASS_CONF += --enable-directwrite
endif
-ifneq ($(WITH_HARFBUZZ), 0)
-DEPS_ass += harfbuzz $(DEPS_harfbuzz)
-else
-ASS_CONF += --disable-harfbuzz
-endif
-
ifeq ($(WITH_ASS_ASM), 0)
ASS_CONF += --disable-asm
endif
-ifdef WITH_OPTIMIZATION
-ASS_CFLAGS += -O3
-else
-ASS_CFLAGS += -g
-endif
-
.ass: libass
- cd $< && $(HOSTVARS) CFLAGS="$(CFLAGS) $(ASS_CFLAGS)" ./configure $(HOSTCONF) $(ASS_CONF)
+ cd $< && $(HOSTVARS) ./configure $(HOSTCONF) $(ASS_CONF)
cd $< && $(MAKE)
$(call pkg_static,"libass.pc")
cd $< && $(MAKE) install
=====================================
contrib/src/caca/rules.mak
=====================================
@@ -1,6 +1,6 @@
# CACA
CACA_VERSION := 0.99.beta20
-CACA_URL := https://github.com/cacalabs/libcaca/releases/download/v$(CACA_VERSION)/libcaca-$(CACA_VERSION).tar.gz
+CACA_URL := $(GITHUB)/cacalabs/libcaca/releases/download/v$(CACA_VERSION)/libcaca-$(CACA_VERSION).tar.gz
ifndef HAVE_DARWIN_OS
ifndef HAVE_LINUX # see VLC Trac 17251
=====================================
contrib/src/fluidlite/rules.mak
=====================================
@@ -1,6 +1,6 @@
# fluidlite
-FLUID_GITURL := https://github.com/divideconcept/FluidLite.git
+FLUID_GITURL := $(GITHUB)/divideconcept/FluidLite.git
FLUID_HASH := 238997654efb20e736512847f3f5f6d618de9423
ifdef HAVE_WIN32
=====================================
contrib/src/fribidi/rules.mak
=====================================
@@ -1,6 +1,6 @@
# FRIBIDI
FRIBIDI_VERSION := 1.0.12
-FRIBIDI_URL := https://github.com/fribidi/fribidi/releases/download/v$(FRIBIDI_VERSION)/fribidi-$(FRIBIDI_VERSION).tar.xz
+FRIBIDI_URL := $(GITHUB)/fribidi/fribidi/releases/download/v$(FRIBIDI_VERSION)/fribidi-$(FRIBIDI_VERSION).tar.xz
PKGS += fribidi
ifeq ($(call need_pkg,"fribidi"),)
=====================================
contrib/src/harfbuzz/rules.mak
=====================================
@@ -1,7 +1,7 @@
# HARFBUZZ
HARFBUZZ_VERSION := 3.4.0
-HARFBUZZ_URL := https://github.com/harfbuzz/harfbuzz/releases/download/$(HARFBUZZ_VERSION)/harfbuzz-$(HARFBUZZ_VERSION).tar.xz
+HARFBUZZ_URL := $(GITHUB)/harfbuzz/harfbuzz/releases/download/$(HARFBUZZ_VERSION)/harfbuzz-$(HARFBUZZ_VERSION).tar.xz
PKGS += harfbuzz
ifeq ($(call need_pkg,"harfbuzz"),)
PKGS_FOUND += harfbuzz
=====================================
contrib/src/jack/rules.mak
=====================================
@@ -1,7 +1,7 @@
# JACK
JACK_VERSION := 0.121.3
-JACK_URL := https://github.com/jackaudio/jack1/archive/$(JACK_VERSION).tar.gz
+JACK_URL := $(GITHUB)/jackaudio/jack1/archive/$(JACK_VERSION).tar.gz
# disabled by default for now
#PKGS += jack
=====================================
contrib/src/libdsm/rules.mak
=====================================
@@ -1,7 +1,7 @@
# libdsm
LIBDSM_VERSION := 0.4.3
-LIBDSM_URL := https://github.com/videolabs/libdsm/releases/download/v$(LIBDSM_VERSION)/libdsm-$(LIBDSM_VERSION).tar.xz
+LIBDSM_URL := $(GITHUB)/videolabs/libdsm/releases/download/v$(LIBDSM_VERSION)/libdsm-$(LIBDSM_VERSION).tar.xz
ifeq ($(call need_pkg,"libdsm >= 0.2.0"),)
PKGS_FOUND += libdsm
=====================================
contrib/src/mfx/rules.mak
=====================================
@@ -1,6 +1,6 @@
# mfx (Media SDK)
-mfx_GITURL := https://github.com/lu-zero/mfx_dispatch.git
+mfx_GITURL := $(GITHUB)/lu-zero/mfx_dispatch.git
MFX_GITHASH := 7efc7505465bc1f16fbd1da3d24aa5bd9d46c5ca
ifeq ($(call need_pkg,"mfx"),)
=====================================
contrib/src/microdns/rules.mak
=====================================
@@ -1,7 +1,7 @@
# libmicrodns
LIBMICRODNS_VERSION := 0.1.2
-LIBMICRODNS_URL := https://github.com/videolabs/libmicrodns/releases/download/$(LIBMICRODNS_VERSION)/microdns-$(LIBMICRODNS_VERSION).tar.xz
+LIBMICRODNS_URL := $(GITHUB)/videolabs/libmicrodns/releases/download/$(LIBMICRODNS_VERSION)/microdns-$(LIBMICRODNS_VERSION).tar.xz
ifndef HAVE_DARWIN_OS
ifdef BUILD_NETWORK
=====================================
contrib/src/mysofa/rules.mak
=====================================
@@ -1,7 +1,7 @@
# Mysofa
MYSOFA_VERSION := 0.5
-MYSOFA_URL = https://github.com/hoene/libmysofa/archive/v$(MYSOFA_VERSION).tar.gz
+MYSOFA_URL = $(GITHUB)/hoene/libmysofa/archive/v$(MYSOFA_VERSION).tar.gz
PKGS += mysofa
=====================================
contrib/src/nfs/rules.mak
=====================================
@@ -1,6 +1,6 @@
# NFS
NFS_VERSION := 5.0.1
-NFS_URL := https://github.com/sahlberg/libnfs/archive/libnfs-$(NFS_VERSION).tar.gz
+NFS_URL := $(GITHUB)/sahlberg/libnfs/archive/libnfs-$(NFS_VERSION).tar.gz
PKGS += nfs
ifeq ($(call need_pkg,"libnfs >= 1.10"),)
=====================================
contrib/src/openjpeg/rules.mak
=====================================
@@ -1,7 +1,7 @@
# jpeg
OPENJPEG_VERSION := 2.3.0
-OPENJPEG_URL := https://github.com/uclouvain/openjpeg/archive/v$(OPENJPEG_VERSION).tar.gz
+OPENJPEG_URL := $(GITHUB)/uclouvain/openjpeg/archive/v$(OPENJPEG_VERSION).tar.gz
ifdef HAVE_WIN32
DEPS_openjpeg += pthreads $(DEPS_pthreads)
=====================================
contrib/src/protobuf/rules.mak
=====================================
@@ -1,6 +1,6 @@
# protobuf
PROTOBUF_VERSION := 3.1.0
-PROTOBUF_URL := https://github.com/google/protobuf/releases/download/v$(PROTOBUF_VERSION)/protobuf-cpp-$(PROTOBUF_VERSION).tar.gz
+PROTOBUF_URL := $(GITHUB)/google/protobuf/releases/download/v$(PROTOBUF_VERSION)/protobuf-cpp-$(PROTOBUF_VERSION).tar.gz
PKGS += protobuf
ifeq ($(call need_pkg, "protobuf-lite >= 3.1.0 protobuf-lite < 3.2.0"),)
=====================================
contrib/src/smb2/rules.mak
=====================================
@@ -1,6 +1,6 @@
# SMB2
SMB2_VERSION := 4.0.0
-SMB2_URL := https://github.com/sahlberg/libsmb2/archive/v$(SMB2_VERSION).tar.gz
+SMB2_URL := $(GITHUB)/sahlberg/libsmb2/archive/v$(SMB2_VERSION).tar.gz
ifeq ($(call need_pkg,"smb2"),)
PKGS_FOUND += smb2
=====================================
contrib/src/sparkle/rules.mak
=====================================
@@ -1,7 +1,7 @@
# Sparkle
SPARKLE_VERSION := 1.16.0
-SPARKLE_URL := https://github.com/sparkle-project/Sparkle/archive/$(SPARKLE_VERSION).zip
+SPARKLE_URL := $(GITHUB)/sparkle-project/Sparkle/archive/$(SPARKLE_VERSION).zip
ifdef HAVE_MACOSX
PKGS += sparkle
=====================================
contrib/src/spatialaudio/rules.mak
=====================================
@@ -1,7 +1,7 @@
# Spatialaudio
SPATIALAUDIO_VERSION := 0.3.0
-SPATIALAUDIO_URL = https://github.com/videolabs/libspatialaudio/releases/download/$(SPATIALAUDIO_VERSION)/spatialaudio-$(SPATIALAUDIO_VERSION).tar.bz2
+SPATIALAUDIO_URL = $(GITHUB)/videolabs/libspatialaudio/releases/download/$(SPATIALAUDIO_VERSION)/spatialaudio-$(SPATIALAUDIO_VERSION).tar.bz2
DEPS_spatialaudio = zlib mysofa
=====================================
contrib/src/vncclient/rules.mak
=====================================
@@ -1,7 +1,7 @@
# vncclient
VNCCLIENT_VERSION := 0.9.10
-VNCCLIENT_URL := https://github.com/LibVNC/libvncserver/archive/LibVNCServer-$(VNCCLIENT_VERSION).tar.gz
+VNCCLIENT_URL := $(GITHUB)/LibVNC/libvncserver/archive/LibVNCServer-$(VNCCLIENT_VERSION).tar.gz
ifdef GPL
ifdef BUILD_NETWORK
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/5d4ade565056b7ab7323afdf8078aa54658b47d3...4d093ebb85bbbcc050218802694e03806f1dcb27
--
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/5d4ade565056b7ab7323afdf8078aa54658b47d3...4d093ebb85bbbcc050218802694e03806f1dcb27
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