[vlc-commits] [Git][videolan/vlc][master] 2 commits: contrib: add share directory to PKG_CONFIG_PATH

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
f8fe134a by Johannes Kauffmann at 2023-10-05T05:10:48+00:00
contrib: add share directory to PKG_CONFIG_PATH

This is needed for contribs that install .pc files in share/pkgconfig,
like xorg-macros and xcb-proto since 1.16.

- - - - -
8a261aac by Johannes Kauffmann at 2023-10-05T05:10:48+00:00
contrib: add XORG URL variable and use it

- - - - -


6 changed files:

- contrib/src/main.mak
- contrib/src/xau/rules.mak
- contrib/src/xcb-proto/rules.mak
- contrib/src/xcb/rules.mak
- contrib/src/xorg-macros/rules.mak
- contrib/src/xproto/rules.mak


Changes:

=====================================
contrib/src/main.mak
=====================================
@@ -30,6 +30,7 @@ GOOGLE_CODE := https://storage.googleapis.com/google-code-archive-downloads/v2/c
 GNUGPG := https://www.gnupg.org/ftp/gcrypt
 QT := https://download.qt.io/official_releases/qt
 XIPH := https://ftp.osuosl.org/pub/xiph/releases
+XORG := https://www.x.org/releases/individual
 
 #
 # Machine-dependent variables
@@ -251,7 +252,7 @@ endif # HAVE_CROSS_COMPILE
 
 PKG_CONFIG ?= pkg-config
 
-PKG_CONFIG_PATH := $(PREFIX)/lib/pkgconfig:$(PKG_CONFIG_PATH)
+PKG_CONFIG_PATH := $(PREFIX)/lib/pkgconfig:$(PREFIX)/share/pkgconfig:$(PKG_CONFIG_PATH)
 export PKG_CONFIG_PATH
 
 ifndef GIT


=====================================
contrib/src/xau/rules.mak
=====================================
@@ -1,6 +1,6 @@
 XAU_VERSION := 1.0.9
 
-XAU_URL := http://xorg.freedesktop.org/releases/individual/lib/libXau-$(XAU_VERSION).tar.bz2
+XAU_URL := $(XORG)/lib/libXau-$(XAU_VERSION).tar.bz2
 
 $(TARBALLS)/libXau-$(XAU_VERSION).tar.bz2:
 	$(call download_pkg,$(XAU_URL),xcb)


=====================================
contrib/src/xcb-proto/rules.mak
=====================================
@@ -1,7 +1,7 @@
 # X protocol C Proto
 
 XCB_PROTO_VERSION := 1.14
-XCB_PROTO_URL := https://xorg.freedesktop.org/archive/individual/proto/xcb-proto-$(XCB_PROTO_VERSION).tar.gz
+XCB_PROTO_URL := $(XORG)/proto/xcb-proto-$(XCB_PROTO_VERSION).tar.gz
 
 ifeq ($(call need_pkg,"xcb-proto"),)
 PKGS_FOUND += xcb-proto


=====================================
contrib/src/xcb/rules.mak
=====================================
@@ -1,7 +1,7 @@
 # X protocol C language Bindings
 
 XCB_VERSION := 1.14
-XCB_URL := http://xorg.freedesktop.org/archive/individual/lib/libxcb-$(XCB_VERSION).tar.gz
+XCB_URL := $(XORG)/lib/libxcb-$(XCB_VERSION).tar.gz
 
 ifdef HAVE_LINUX
 ifndef HAVE_ANDROID


=====================================
contrib/src/xorg-macros/rules.mak
=====================================
@@ -1,6 +1,6 @@
 UTILS_MACROS_VERSION := 1.19.0
 
-UTILS_MACROS_URL := https://www.x.org/archive/individual/util/util-macros-$(UTILS_MACROS_VERSION).tar.bz2
+UTILS_MACROS_URL := $(XORG)/util/util-macros-$(UTILS_MACROS_VERSION).tar.bz2
 
 $(TARBALLS)/util-macros-$(UTILS_MACROS_VERSION).tar.bz2:
 	$(call download_pkg,$(UTILS_MACROS_URL),xcb)


=====================================
contrib/src/xproto/rules.mak
=====================================
@@ -1,6 +1,6 @@
 XPROTO_VERSION := 7.0.29
 
-XPROTO_URL := http://xorg.freedesktop.org/releases/individual/proto/xproto-$(XPROTO_VERSION).tar.bz2
+XPROTO_URL := $(XORG)/proto/xproto-$(XPROTO_VERSION).tar.bz2
 
 $(TARBALLS)/xproto-$(XPROTO_VERSION).tar.bz2:
 	$(call download_pkg,$(XPROTO_URL),xcb)



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/622a5812e320ac6cfc3d1d2fd638536cf2810ef3...8a261aac6b16a3771361e55b1f5d41227f7e6e9d

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/622a5812e320ac6cfc3d1d2fd638536cf2810ef3...8a261aac6b16a3771361e55b1f5d41227f7e6e9d
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance