Hugo Beauzée-Luyssen pushed to branch 3.0.x at VideoLAN / VLC
Commits:
a2984547 by Hugo Beauzée-Luyssen at 2021-07-26T14:37:43+02:00
contrib: glew: Ensure the .pc has a valid prefix configured
- - - - -
8eb32da6 by Alexandre Janniaux at 2021-07-26T14:37:43+02:00
contrib: lua: rewrite prefix in pkg-config file
This patch enable the writing of the pkg-config file for all platforms
and enforce the correct prefix= value in the file. Previously the
pkg-config file was never installed for linux platforms so it was using
the file detection in the configure.ac, which is the last method of
detection.
If a newer lua was detected that was not in the contrib file
autodetection, it would build the lua contrib but still configure with
the newer one, which means that contrib includes will be used and then
it will be linked to the detected external lua.
In particular, on Archlinux, when using the default lua (5.3) version,
the contrib would be built but it will still link lua5.3 which has no
symbol for the luaL_register function used when header version is less
than or equal to 5.2.
With previous change, as `lua >= 5.1` is tested first, contrib will be
used first if built whatever the version of lua on the platform, so in
the worst case we only build lua from the contrib too often (like
previously) instead of failing link on some platforms too.
(cherry picked from commit 401743565a1387340611a3adbbd3105e3cffa7df)
Signed-off-by: Hugo Beauzée-Luyssen <h...@beauzee.fr>
- - - - -
7367146b by Hugo Beauzée-Luyssen at 2021-07-28T15:05:56+02:00
contrib: asdcp: Fix .pc generation
This will abide by the configured prefix, and install the .pc as any
other file instead of copying it manually
(cherry picked from commit 46e590f012199fe32590b0a107d87d0997120a2c)
Signed-off-by: Hugo Beauzée-Luyssen <h...@beauzee.fr>
- - - - -
5880da10 by Hugo Beauzée-Luyssen at 2021-07-28T15:05:56+02:00
contrib: zlib: Fix prefix replacement on win32
(cherry picked from commit a828a4f7d93e91b008bcd9ae7093f333ad48e150)
Signed-off-by: Hugo Beauzée-Luyssen <h...@beauzee.fr>
- - - - -
17a2ed21 by Hugo Beauzée-Luyssen at 2021-07-28T15:05:56+02:00
contrib: Ensure cmake won't interpret the provided prefix
We already provide an absolute path, which cmake might try to interpret
and convert to an equivalent value.
This works, except when we try to replace the prefix we provided by
@@CONTRIB_PREFIX@@ in change_prefix.sh, which leads to .pc files being
present but unusable
(cherry picked from commit 512dd9495f49c8129a2e0341c7c8834f3154235f)
Signed-off-by: Hugo Beauzée-Luyssen <h...@beauzee.fr>
- - - - -
6 changed files:
- contrib/src/asdcplib/adding-pkg-config-file.patch
- contrib/src/asdcplib/rules.mak
- contrib/src/glew/rules.mak
- contrib/src/lua/rules.mak
- contrib/src/main.mak
- contrib/src/zlib/rules.mak
Changes:
=====================================
contrib/src/asdcplib/adding-pkg-config-file.patch
=====================================
@@ -8,16 +8,16 @@ Subject: [PATCH 5/5] adding pkg-config file
1 file changed, 10 insertions(+)
create mode 100644 asdcplib.pc
-diff --git a/asdcplib.pc b/asdcplib.pc
+diff --git a/asdcplib.pc.in b/asdcplib.pc.in
new file mode 100644
index 0000000..36fdd12
--- /dev/null
-+++ b/asdcplib.pc
++++ b/asdcplib.pc.in
@@ -0,0 +1,10 @@
-+prefix=/usr/local
-+exec_prefix=${prefix}
-+includedir=${prefix}/include
-+libdir=${exec_prefix}/lib
++prefix=@prefix@
++exec_prefix=@exec_prefix@
++includedir=@incudedir@
++libdir=@libdir@
+
+Name: asdcplib
+Description: The asdcp library
@@ -27,3 +27,22 @@ index 0000000..36fdd12
--
2.11.0
+--- asdcplib/configure.ac.old 2021-07-23 12:28:12.527748193 +0200
++++ asdcplib/configure.ac 2021-07-23 12:28:37.223750245 +0200
+@@ -142,5 +142,6 @@
+ AC_CONFIG_FILES([Makefile
+ src/Makefile
+ win32/Makefile
+- win32/Makefile.mak:win32/Makefile.wmk])
++ win32/Makefile.mak:win32/Makefile.wmk
++ asdcplib.pc])
+ AC_OUTPUT
+--- asdcplib/Makefile.am 2021-07-23 12:38:49.607823290 +0200
++++ asdcplib/Makefile.am.old 2021-07-23 12:39:46.655848784 +0200
+@@ -28,3 +28,6 @@
+ SUBDIRS = src win32
+
+ ACLOCAL_AMFLAGS = -I m4
++pkgconfigdir = $(libdir)/pkgconfig
++pkgconfig_DATA = asdcplib.pc
++CLEANFILES = asdcplib.pc
=====================================
contrib/src/asdcplib/rules.mak
=====================================
@@ -36,6 +36,4 @@ DEPS_asdcplib = nettle $(DEPS_nettle)
$(RECONF)
cd $< && $(HOSTVARS) ./configure $(HOSTCONF) --enable-freedist
--enable-dev-headers --with-nettle=$(PREFIX)
cd $< && $(MAKE) install
- mkdir -p -- "$(PREFIX)/lib/pkgconfig"
- cp $</asdcplib.pc "$(PREFIX)/lib/pkgconfig/"
touch $@
=====================================
contrib/src/glew/rules.mak
=====================================
@@ -19,7 +19,7 @@ endif
$(MOVE)
.glew: glew
- cd $< && $(HOSTVARS) CFLAGS="$(CFLAGS) -DGLEW_STATIC" $(MAKE)
+ cd $< && $(HOSTVARS) GLEW_DEST=$(PREFIX) CFLAGS="$(CFLAGS)
-DGLEW_STATIC" $(MAKE)
cd $< && $(HOSTVARS) GLEW_DEST=$(PREFIX) $(MAKE) install
ifdef HAVE_WIN32
-rm $(PREFIX)/lib/*glew32.dll*
=====================================
contrib/src/lua/rules.mak
=====================================
@@ -80,9 +80,9 @@ endif
cd $< && $(HOSTVARS) $(MAKE) install INSTALL_TOP="$(PREFIX)"
ifdef HAVE_WIN32
cd $< && $(RANLIB) "$(PREFIX)/lib/liblua.a"
- mkdir -p -- "$(PREFIX)/lib/pkgconfig"
- cp $</etc/lua.pc "$(PREFIX)/lib/pkgconfig/"
endif
+ mkdir -p -- "$(PREFIX)/lib/pkgconfig"
+ sed "s#^prefix=.*#prefix=$(PREFIX)#" $</etc/lua.pc >
"$(PREFIX)/lib/pkgconfig/lua.pc"
touch $@
.sum-luac: .sum-lua
=====================================
contrib/src/main.mak
=====================================
@@ -380,7 +380,7 @@ RECONF = mkdir -p -- $(PREFIX)/share/aclocal && \
cd $< && $(AUTORECONF) -fiv $(ACLOCAL_AMFLAGS)
CMAKEBUILD := cmake --build
CMAKE = cmake . -DCMAKE_TOOLCHAIN_FILE=$(abspath toolchain.cmake) \
- -DCMAKE_INSTALL_PREFIX=$(PREFIX) \
+ -DCMAKE_INSTALL_PREFIX:STRING=$(PREFIX) \
-DBUILD_SHARED_LIBS:BOOL=OFF
ifdef HAVE_WIN32
CMAKE += -DCMAKE_DEBUG_POSTFIX:STRING=
=====================================
contrib/src/zlib/rules.mak
=====================================
@@ -25,7 +25,7 @@ zlib: zlib-$(ZLIB_VERSION).tar.gz .sum-zlib
.zlib: zlib
ifdef HAVE_WIN32
- cd $< && $(HOSTVARS) $(MAKE) -fwin32/Makefile.gcc install $(HOSTVARS)
$(ZLIB_CONFIG_VARS) LD="$(CC)" INCLUDE_PATH="$(PREFIX)/include"
LIBRARY_PATH="$(PREFIX)/lib" BINARY_PATH="$(PREFIX)/bin"
+ cd $< && $(HOSTVARS) $(MAKE) -fwin32/Makefile.gcc install $(HOSTVARS)
$(ZLIB_CONFIG_VARS) LD="$(CC)" prefix="$(PREFIX)"
INCLUDE_PATH="$(PREFIX)/include" LIBRARY_PATH="$(PREFIX)/lib"
BINARY_PATH="$(PREFIX)/bin"
else
cd $< && $(HOSTVARS_PIC) $(ZLIB_CONFIG_VARS) ./configure
--prefix=$(PREFIX) --static
cd $< && $(MAKE) install
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/compare/15be8514b1475012853106c242dd7eaf80d7e0f1...17a2ed216477d749120aaef71758ff31cb1b34d0
--
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/compare/15be8514b1475012853106c242dd7eaf80d7e0f1...17a2ed216477d749120aaef71758ff31cb1b34d0
You're receiving this email because of your account on code.videolan.org.
_______________________________________________
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
