Gentoo Archives: gentoo-commits

From: Joonas Niilola <juippis@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/openh264/files/
Date: Mon, 12 Sep 2022 17:26:36
Message-Id: 1663003534.54100a4ded848d62d925c09824c5143f31da60ea.juippis@gentoo
1 commit: 54100a4ded848d62d925c09824c5143f31da60ea
2 Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
3 AuthorDate: Mon Sep 12 17:22:50 2022 +0000
4 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
5 CommitDate: Mon Sep 12 17:25:34 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54100a4d
7
8 media-libs/openh264: remove unused patch
9
10 Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
11 Portage 3.0.36 / pkgdev 0.2.1 / pkgcheck 0.10.14
12 Closes: https://github.com/gentoo/gentoo/pull/27232
13 Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
14
15 .../files/openh264-2.1.0-pkgconfig-pathfix.patch | 43 ----------------------
16 1 file changed, 43 deletions(-)
17
18 diff --git a/media-libs/openh264/files/openh264-2.1.0-pkgconfig-pathfix.patch b/media-libs/openh264/files/openh264-2.1.0-pkgconfig-pathfix.patch
19 deleted file mode 100644
20 index 275322a01906..000000000000
21 --- a/media-libs/openh264/files/openh264-2.1.0-pkgconfig-pathfix.patch
22 +++ /dev/null
23 @@ -1,43 +0,0 @@
24 -diff --git a/Makefile b/Makefile
25 -index bf398d7..c72b024 100644
26 ---- a/Makefile
27 -+++ b/Makefile
28 -@@ -27,6 +27,7 @@ OBJ=o
29 - DESTDIR=
30 - LIBDIR_NAME=lib
31 - SHAREDLIB_DIR=$(PREFIX)/lib
32 -+INCLUDES_DIR=$(PREFIX)/include
33 - PROJECT_NAME=openh264
34 - MODULE_NAME=gmpopenh264
35 - GMP_API_BRANCH=Firefox39
36 -@@ -285,14 +286,14 @@ endif
37 - endif
38 -
39 - $(PROJECT_NAME).pc: $(PROJECT_NAME).pc.in
40 -- @sed -e 's;@prefix@;$(PREFIX);' -e 's;@libdir@;$(PREFIX)/lib;' -e 's;@VERSION@;$(FULL_VERSION);' -e 's;@LIBS@;;' -e 's;@LIBS_PRIVATE@;$(STATIC_LDFLAGS);' < $< > $@
41 -+ @sed -e 's;@prefix@;$(PREFIX);' -e 's;@libdir@;$(SHAREDLIB_DIR);' -e 's;@includesdir@;$(INCLUDES_DIR);' -e 's;@VERSION@;$(FULL_VERSION);' -e 's;@LIBS@;;' -e 's;@LIBS_PRIVATE@;$(STATIC_LDFLAGS);' < $< > $@
42 -
43 - $(PROJECT_NAME)-static.pc: $(PROJECT_NAME).pc.in
44 -- @sed -e 's;@prefix@;$(PREFIX);' -e 's;@libdir@;$(PREFIX)/lib;' -e 's;@VERSION@;$(FULL_VERSION);' -e 's;@LIBS@;$(STATIC_LDFLAGS);' -e 's;@LIBS_PRIVATE@;;' < $< > $@
45 -+ @sed -e 's;@prefix@;$(PREFIX);' -e 's;@libdir@;$(SHAREDLIB_DIR);' -e 's;@includesdir@;$(INCLUDES_DIR);' -e 's;@VERSION@;$(FULL_VERSION);' -e 's;@LIBS@;$(STATIC_LDFLAGS);' -e 's;@LIBS_PRIVATE@;;' < $< > $@
46 -
47 - install-headers:
48 -- mkdir -p $(DESTDIR)$(PREFIX)/include/wels
49 -- install -m 644 $(SRC_PATH)/codec/api/svc/codec*.h $(DESTDIR)$(PREFIX)/include/wels
50 -+ mkdir -p $(DESTDIR)$(INCLUDES_DIR)/wels
51 -+ install -m 644 $(SRC_PATH)/codec/api/svc/codec*.h $(DESTDIR)$(INCLUDES_DIR)/wels
52 -
53 - install-static-lib: $(LIBPREFIX)$(PROJECT_NAME).$(LIBSUFFIX) install-headers
54 - mkdir -p $(DESTDIR)$(PREFIX)/$(LIBDIR_NAME)
55 -diff --git a/openh264.pc.in b/openh264.pc.in
56 -index f86225c..bee78bc 100644
57 ---- a/openh264.pc.in
58 -+++ b/openh264.pc.in
59 -@@ -1,6 +1,6 @@
60 - prefix=@prefix@
61 - libdir=@libdir@
62 --includedir=${prefix}/include
63 -+includedir=@includesdir@
64 -
65 - Name: OpenH264
66 - Description: OpenH264 is a codec library which supports H.264 encoding and decoding. It is suitable for use in real time applications such as WebRTC.