[vlc-commits] [Git][videolan/vlc][master] 3 commits: contrib: asdcp: Fix .pc generation

[Hugo Beauzée-Luyssen (@chouquette)]

Hugo Beauzée-Luyssen pushed to branch master at VideoLAN / VLC


Commits:
46e590f0 by Hugo Beauzée-Luyssen at 2021-07-28T11:58:14+00: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

- - - - -
a828a4f7 by Hugo Beauzée-Luyssen at 2021-07-28T11:58:14+00:00
contrib: zlib: Fix prefix replacement on win32

- - - - -
512dd949 by Hugo Beauzée-Luyssen at 2021-07-28T11:58:14+00: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

- - - - -


4 changed files:

- contrib/src/asdcplib/adding-pkg-config-file.patch
- contrib/src/asdcplib/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/main.mak
=====================================
@@ -394,7 +394,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/1a2f550dd267c63129cd8d6052f475238bfe7f91...512dd9495f49c8129a2e0341c7c8834f3154235f

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/1a2f550dd267c63129cd8d6052f475238bfe7f91...512dd9495f49c8129a2e0341c7c8834f3154235f
You're receiving this email because of your account on code.videolan.org.