[vlc-devel] [PATCH] contrib: bitstream: fix .pc file install path

[Marvin Scholz]

On 16 Dec 2019, at 15:28, Rémi Denis-Courmont wrote:

> Datadir is correct, since the bitstream installation is presumably 
> platform-independent.
>

Thanks.

Indeed, I failed to notice that this is a headers-only project, so there
never is a library installed to lib…

Disregard this patch. Sorry for the noise.

> Le 16 décembre 2019 13:47:28 GMT+02:00, Marvin Scholz 
> <epirat07 at gmail.com> a écrit :
>> Previously it would be installed to share/pkgconfig instead
>> of lib/pkgconfig
>> ---
>> .../src/bitstream/fix-pc-file-install.patch   | 25 
>> +++++++++++++++++++
>> contrib/src/bitstream/rules.mak               |  1 +
>> 2 files changed, 26 insertions(+)
>> create mode 100644 contrib/src/bitstream/fix-pc-file-install.patch
>>
>> diff --git a/contrib/src/bitstream/fix-pc-file-install.patch
>> b/contrib/src/bitstream/fix-pc-file-install.patch
>> new file mode 100644
>> index 0000000000..7738e6af5a
>> --- /dev/null
>> +++ b/contrib/src/bitstream/fix-pc-file-install.patch
>> @@ -0,0 +1,25 @@
>> +From 5b60a66d4f56c0e9be17742601a8eb66b9f701e7 Mon Sep 17 00:00:00 
>> 2001
>> +From: Marvin Scholz <epirat07 at gmail.com>
>> +Date: Mon, 16 Dec 2019 12:31:27 +0100
>> +Subject: [PATCH] Makefile: Install .pc file to lib/pkgconfig
>> +
>> +---
>> + Makefile | 2 +-
>> + 1 file changed, 1 insertion(+), 1 deletion(-)
>> +
>> +diff --git a/Makefile b/Makefile
>> +index 1c8d719..12537d6 100644
>> +--- a/Makefile
>> ++++ b/Makefile
>> +@@ -3,7 +3,7 @@ INCLUDEDIR = $(PREFIX)/include
>> + LIBDIR = $(PREFIX)/lib
>> + DATADIR = $(PREFIX)/share
>> + INCLUDE = $(DESTDIR)$(INCLUDEDIR)/bitstream
>> +-PKGCONFIG = $(DESTDIR)$(DATADIR)/pkgconfig
>> ++PKGCONFIG = $(DESTDIR)$(LIBDIR)/pkgconfig
>> + VERSION = 1.5
>> +
>> + all:
>> +--
>> +2.22.0
>> +
>> diff --git a/contrib/src/bitstream/rules.mak
>> b/contrib/src/bitstream/rules.mak
>> index 0310f8a25b..17c1837196 100644
>> --- a/contrib/src/bitstream/rules.mak
>> +++ b/contrib/src/bitstream/rules.mak
>> @@ -15,6 +15,7 @@ bitstream: bitstream-$(BITSTREAM_VERSION).tar.xz
>> .sum-bitstream
>> 	rm -rf $@-$(BITSTREAM_VERSION) $@
>> 	mkdir -p $@-$(BITSTREAM_VERSION)
>> 	tar xvf "$<" --strip-components=1 -C $@-$(BITSTREAM_VERSION)
>> +	$(APPLY) $(SRC)/bitstream/fix-pc-file-install.patch
>> 	$(MOVE)
>>
>> .bitstream: bitstream
>> -- 
>> 2.20.1 (Apple Git-117)
>>
>> _______________________________________________
>> vlc-devel mailing list
>> To unsubscribe or modify your subscription options:
>> https://mailman.videolan.org/listinfo/vlc-devel
>
> -- 
> Envoyé de mon appareil Android avec Courriel K-9 Mail. Veuillez 
> excuser ma brièveté._______________________________________________
> vlc-devel mailing list
> To unsubscribe or modify your subscription options:
> https://mailman.videolan.org/listinfo/vlc-devel