Compare revisions

Steve Lhomme · Jean-Baptiste Kempf · Steve Lhomme · Jean-Baptiste Kempf · Johannes Kauffmann · Jean-Baptiste Kempf
--- a/contrib/src/aribb24/rules.mak
+++ b/contrib/src/aribb24/rules.mak
 # 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

--- a/contrib/src/ass/SHA512SUMS
+++ b/contrib/src/ass/SHA512SUMS
-1d2fd02fb2669de7f38ecfa0fe79e3c89da93e09c3cf6bf7b7b811a4808a06fd702da27ba1d9223c9a8a943198e7961b06c808a07e17d6cc6ba2ce70fd802300  libass-0.16.0.tar.gz
+29c3f82e8d68ffc403941805202c4756b65cf48aeadbe9ae5e307ee4f52a5e4d916330ad26ec322aa92ddc72a4f01633033f9f628dbb8d8653a74b3e6eb7f735  libass-0.17.1.tar.gz
--- a/contrib/src/ass/rules.mak
+++ b/contrib/src/ass/rules.mak
 # 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

--- a/contrib/src/caca/rules.mak
+++ b/contrib/src/caca/rules.mak
 # 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

--- a/contrib/src/fluidlite/rules.mak
+++ b/contrib/src/fluidlite/rules.mak
 # fluidlite

-FLUID_GITURL := https://github.com/divideconcept/FluidLite.git
+FLUID_GITURL := $(GITHUB)/divideconcept/FluidLite.git
 FLUID_HASH := 238997654efb20e736512847f3f5f6d618de9423

 ifdef HAVE_WIN32

--- a/contrib/src/fribidi/rules.mak
+++ b/contrib/src/fribidi/rules.mak
 # 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"),)

--- a/contrib/src/harfbuzz/rules.mak
+++ b/contrib/src/harfbuzz/rules.mak
 # 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

--- a/contrib/src/jack/rules.mak
+++ b/contrib/src/jack/rules.mak
 # 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

--- a/contrib/src/libdsm/rules.mak
+++ b/contrib/src/libdsm/rules.mak
 # 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

--- a/contrib/src/mfx/rules.mak
+++ b/contrib/src/mfx/rules.mak
 # 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"),)

--- a/contrib/src/microdns/rules.mak
+++ b/contrib/src/microdns/rules.mak
 # 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

--- a/contrib/src/mysofa/rules.mak
+++ b/contrib/src/mysofa/rules.mak
 # 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


--- a/contrib/src/nfs/rules.mak
+++ b/contrib/src/nfs/rules.mak
 # 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"),)

--- a/contrib/src/openjpeg/rules.mak
+++ b/contrib/src/openjpeg/rules.mak
 # 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)

--- a/contrib/src/protobuf/rules.mak
+++ b/contrib/src/protobuf/rules.mak
 # 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"),)

--- a/contrib/src/smb2/rules.mak
+++ b/contrib/src/smb2/rules.mak
 # 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

--- a/contrib/src/sparkle/rules.mak
+++ b/contrib/src/sparkle/rules.mak
 # 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

--- a/contrib/src/spatialaudio/rules.mak
+++ b/contrib/src/spatialaudio/rules.mak
 # 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


--- a/contrib/src/vncclient/rules.mak
+++ b/contrib/src/vncclient/rules.mak
 # 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
No results found