commit: 5eafe0b025a9346b0246ef58e4045c9de3792313 Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> AuthorDate: Wed Jan 17 10:41:45 2018 +0000 Commit: Ian Stakenvicius <axs <AT> gentoo <DOT> org> CommitDate: Wed Jan 17 14:55:03 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5eafe0b0
media-libs/openh264: remove unused patches Closes: https://github.com/gentoo/gentoo/pull/6890 .../files/openh264-1.5.0-pkgconfig-pathfix.patch | 40 ---------------------- media-libs/openh264/files/pkgconfig-pathfix.patch | 40 ---------------------- media-libs/openh264/files/pkgconfig_install.patch | 15 -------- 3 files changed, 95 deletions(-) diff --git a/media-libs/openh264/files/openh264-1.5.0-pkgconfig-pathfix.patch b/media-libs/openh264/files/openh264-1.5.0-pkgconfig-pathfix.patch deleted file mode 100644 index a39823aeee7..00000000000 --- a/media-libs/openh264/files/openh264-1.5.0-pkgconfig-pathfix.patch +++ /dev/null @@ -1,40 +0,0 @@ ---- a/Makefile 2015-10-19 21:49:05.000000000 -0400 -+++ b/Makefile 2016-02-17 12:16:06.102945631 -0500 -@@ -27,6 +27,7 @@ - DESTDIR= - LIBDIR_NAME=lib - SHAREDLIB_DIR=$(PREFIX)/lib -+INCLUDES_DIR=$(PREFIX)/include - PROJECT_NAME=openh264 - MODULE_NAME=gmpopenh264 - GMP_API_BRANCH=Firefox39 -@@ -244,14 +245,14 @@ - endif - - $(PROJECT_NAME).pc: $(PROJECT_NAME).pc.in -- @sed -e 's;@prefix@;$(PREFIX);' -e 's;@VERSION@;$(VERSION);' -e 's;@LIBS@;;' -e 's;@LIBS_PRIVATE@;$(STATIC_LDFLAGS);' < $< > $@ -+ @sed -e 's;@prefix@;$(PREFIX);' -e 's;@sharedlibdir@;$(SHAREDLIB_DIR);' -e 's;@includesdir@;$(INCLUDES_DIR);' -e 's;@VERSION@;$(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;@VERSION@;$(VERSION);' -e 's;@LIBS@;$(STATIC_LDFLAGS);' -e 's;@LIBS_PRIVATE@;;' < $< > $@ -+ @sed -e 's;@prefix@;$(PREFIX);' -e 's;@sharedlibdir@;$(SHAREDLIB_DIR);' -e 's;@includesdir@;$(INCLUDES_DIR);' -e 's;@VERSION@;$(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) ---- a/openh264.pc.in 2015-10-19 21:49:05.000000000 -0400 -+++ b/openh264.pc.in 2016-02-17 12:17:03.792768147 -0500 -@@ -1,6 +1,6 @@ - prefix=@prefix@ --libdir=${prefix}/lib --includedir=${prefix}/include -+libdir=@sharedlibdir@ -+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. diff --git a/media-libs/openh264/files/pkgconfig-pathfix.patch b/media-libs/openh264/files/pkgconfig-pathfix.patch deleted file mode 100644 index 455b91331df..00000000000 --- a/media-libs/openh264/files/pkgconfig-pathfix.patch +++ /dev/null @@ -1,40 +0,0 @@ ---- a/Makefile 2015-03-25 03:43:00.000000000 -0400 -+++ b/Makefile 2015-06-18 17:28:42.436110085 -0400 -@@ -24,6 +24,7 @@ - OBJ=o - DESTDIR= - SHAREDLIB_DIR=$(PREFIX)/lib -+INCLUDES_DIR=$(PREFIX)/include - PROJECT_NAME=openh264 - MODULE_NAME=gmpopenh264 - GMP_API_BRANCH=Firefox38 -@@ -229,14 +230,14 @@ - endif - - $(PROJECT_NAME).pc: $(PROJECT_NAME).pc.in -- @sed -e 's;@prefix@;$(PREFIX);' -e 's;@VERSION@;$(VERSION);' -e 's;@LIBS@;;' -e 's;@LIBS_PRIVATE@;$(STATIC_LDFLAGS);' < $(PROJECT_NAME).pc.in > $@ -+ @sed -e 's;@prefix@;$(PREFIX);' -e 's;@sharedlibdir@;$(SHAREDLIB_DIR);' -e 's;@includesdir@;$(INCLUDES_DIR);' -e 's;@VERSION@;$(VERSION);' -e 's;@LIBS@;;' -e 's;@LIBS_PRIVATE@;$(STATIC_LDFLAGS);' < $(PROJECT_NAME).pc.in > $@ - - $(PROJECT_NAME)-static.pc: $(PROJECT_NAME).pc.in -- @sed -e 's;@prefix@;$(PREFIX);' -e 's;@VERSION@;$(VERSION);' -e 's;@LIBS@;$(STATIC_LDFLAGS);' -e 's;@LIBS_PRIVATE@;;' < $(PROJECT_NAME).pc.in > $@ -+ @sed -e 's;@prefix@;$(PREFIX);' -e 's;@sharedlibdir@;;' -e 's;@includesdir@;$(INCLUDES_DIR);' -e 's;@VERSION@;$(VERSION);' -e 's;@LIBS@;$(STATIC_LDFLAGS);' -e 's;@LIBS_PRIVATE@;;' < $(PROJECT_NAME).pc.in > $@ - - install-headers: -- mkdir -p $(DESTDIR)/$(PREFIX)/include/wels -- install -m 644 codec/api/svc/codec*.h $(DESTDIR)/$(PREFIX)/include/wels -+ mkdir -p $(DESTDIR)/$(INCLUDES_DIR)/wels -+ install -m 644 codec/api/svc/codec*.h $(DESTDIR)/$(INCLUDES_DIR)/wels - - install-static-lib: $(LIBPREFIX)$(PROJECT_NAME).$(LIBSUFFIX) install-headers - mkdir -p $(DESTDIR)/$(PREFIX)/lib ---- a/openh264.pc.in 2015-06-18 17:32:58.356114757 -0400 -+++ b/openh264.pc.in 2015-06-18 17:31:12.096112817 -0400 -@@ -1,6 +1,6 @@ - prefix=@prefix@ --libdir=${prefix}/lib --includedir=${prefix}/include -+libdir=@sharedlibdir@ -+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. diff --git a/media-libs/openh264/files/pkgconfig_install.patch b/media-libs/openh264/files/pkgconfig_install.patch deleted file mode 100644 index 50d8715ce6f..00000000000 --- a/media-libs/openh264/files/pkgconfig_install.patch +++ /dev/null @@ -1,15 +0,0 @@ -Index: openh264-1.4.0/Makefile -=================================================================== ---- openh264-1.4.0.orig/Makefile -+++ openh264-1.4.0/Makefile -@@ -253,8 +253,8 @@ install-shared: $(LIBPREFIX)$(PROJECT_NA - if [ "$(SHAREDLIBSUFFIXVER)" != "$(SHAREDLIBSUFFIX)" ]; then \ - cp -a $(LIBPREFIX)$(PROJECT_NAME).$(SHAREDLIBSUFFIX) $(DESTDIR)/$(SHAREDLIB_DIR); \ - fi -- mkdir -p $(DESTDIR)/$(PREFIX)/lib/pkgconfig -- install -m 644 $(PROJECT_NAME).pc $(DESTDIR)/$(PREFIX)/lib/pkgconfig -+ mkdir -p $(DESTDIR)/$(SHAREDLIB_DIR)/pkgconfig -+ install -m 644 $(PROJECT_NAME).pc $(DESTDIR)/$(SHAREDLIB_DIR)/pkgconfig - ifneq ($(EXTRA_LIBRARY),) - install -m 644 $(EXTRA_LIBRARY) $(DESTDIR)/$(PREFIX)/lib - endif
