From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E6D20158012 for ; Mon, 12 Sep 2022 17:26:36 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 32F62E0930; Mon, 12 Sep 2022 17:26:36 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1E367E0930 for ; Mon, 12 Sep 2022 17:26:36 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4D8DD335DB2 for ; Mon, 12 Sep 2022 17:26:35 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B43F0509 for ; Mon, 12 Sep 2022 17:26:33 +0000 (UTC) From: "Joonas Niilola" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Joonas Niilola" Message-ID: <1663003534.54100a4ded848d62d925c09824c5143f31da60ea.juippis@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/openh264/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/openh264/files/openh264-2.1.0-pkgconfig-pathfix.patch X-VCS-Directories: media-libs/openh264/files/ X-VCS-Committer: juippis X-VCS-Committer-Name: Joonas Niilola X-VCS-Revision: 54100a4ded848d62d925c09824c5143f31da60ea X-VCS-Branch: master Date: Mon, 12 Sep 2022 17:26:33 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 91faa65d-7d92-4fe1-af8c-9238a88faa36 X-Archives-Hash: ebc49b9ee8ad5b05f23d616aa8278fc2 commit: 54100a4ded848d62d925c09824c5143f31da60ea Author: Michael Mair-Keimberger levelnine at> AuthorDate: Mon Sep 12 17:22:50 2022 +0000 Commit: Joonas Niilola gentoo org> CommitDate: Mon Sep 12 17:25:34 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54100a4d media-libs/openh264: remove unused patch Signed-off-by: Michael Mair-Keimberger levelnine.at> Portage 3.0.36 / pkgdev 0.2.1 / pkgcheck 0.10.14 Closes: https://github.com/gentoo/gentoo/pull/27232 Signed-off-by: Joonas Niilola gentoo.org> .../files/openh264-2.1.0-pkgconfig-pathfix.patch | 43 ---------------------- 1 file changed, 43 deletions(-) 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 deleted file mode 100644 index 275322a01906..000000000000 --- a/media-libs/openh264/files/openh264-2.1.0-pkgconfig-pathfix.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff --git a/Makefile b/Makefile -index bf398d7..c72b024 100644 ---- a/Makefile -+++ b/Makefile -@@ -27,6 +27,7 @@ OBJ=o - DESTDIR= - LIBDIR_NAME=lib - SHAREDLIB_DIR=$(PREFIX)/lib -+INCLUDES_DIR=$(PREFIX)/include - PROJECT_NAME=openh264 - MODULE_NAME=gmpopenh264 - GMP_API_BRANCH=Firefox39 -@@ -285,14 +286,14 @@ endif - endif - - $(PROJECT_NAME).pc: $(PROJECT_NAME).pc.in -- @sed -e 's;@prefix@;$(PREFIX);' -e 's;@libdir@;$(PREFIX)/lib;' -e 's;@VERSION@;$(FULL_VERSION);' -e 's;@LIBS@;;' -e 's;@LIBS_PRIVATE@;$(STATIC_LDFLAGS);' < $< > $@ -+ @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);' < $< > $@ - - $(PROJECT_NAME)-static.pc: $(PROJECT_NAME).pc.in -- @sed -e 's;@prefix@;$(PREFIX);' -e 's;@libdir@;$(PREFIX)/lib;' -e 's;@VERSION@;$(FULL_VERSION);' -e 's;@LIBS@;$(STATIC_LDFLAGS);' -e 's;@LIBS_PRIVATE@;;' < $< > $@ -+ @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@;;' < $< > $@ - - install-headers: -- mkdir -p $(DESTDIR)$(PREFIX)/include/wels -- install -m 644 $(SRC_PATH)/codec/api/svc/codec*.h $(DESTDIR)$(PREFIX)/include/wels -+ mkdir -p $(DESTDIR)$(INCLUDES_DIR)/wels -+ install -m 644 $(SRC_PATH)/codec/api/svc/codec*.h $(DESTDIR)$(INCLUDES_DIR)/wels - - install-static-lib: $(LIBPREFIX)$(PROJECT_NAME).$(LIBSUFFIX) install-headers - mkdir -p $(DESTDIR)$(PREFIX)/$(LIBDIR_NAME) -diff --git a/openh264.pc.in b/openh264.pc.in -index f86225c..bee78bc 100644 ---- a/openh264.pc.in -+++ b/openh264.pc.in -@@ -1,6 +1,6 @@ - prefix=@prefix@ - libdir=@libdir@ --includedir=${prefix}/include -+includedir=@includesdir@ - - Name: OpenH264 - 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.