From 5b5df25227111ef465caf5c52bcfb66dac3219cd Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 19 Jan 2018 20:11:46 +0000 Subject: gentoo resync : 19.01.2018 --- media-libs/openh264/Manifest | 3 -- .../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 -------- 4 files changed, 98 deletions(-) delete mode 100644 media-libs/openh264/files/openh264-1.5.0-pkgconfig-pathfix.patch delete mode 100644 media-libs/openh264/files/pkgconfig-pathfix.patch delete mode 100644 media-libs/openh264/files/pkgconfig_install.patch (limited to 'media-libs/openh264') diff --git a/media-libs/openh264/Manifest b/media-libs/openh264/Manifest index 6f60a0e3f220..6be1f3afd84b 100644 --- a/media-libs/openh264/Manifest +++ b/media-libs/openh264/Manifest @@ -1,7 +1,4 @@ -AUX openh264-1.5.0-pkgconfig-pathfix.patch 1903 BLAKE2B e1287e4f3bb2453c170c1fb25ff2e784529fffdd770fba3aa0d0431dddd22d17a3160740db40247506a0386e4797696d7009e01c0d669db3b299145c4d631b84 SHA512 054ede3fe66365fd7309f7ea1ac038f640daf4867dcb58d67fbecf62828d1bb49e68f1b8a2ab7b785149c4aca03e4c91c04be5f7cd91b6de8ed8c401c94b0db9 AUX openh264-1.7.0-pkgconfig-pathfix.patch 1921 BLAKE2B 22d3ab7bd9cbe4c0ac638760a0c2b947eb6749a18d61cd3aca22ac84647af24d6dced048f9eae2ae9e9ee9b0813a255a6d1c8a1ff04e3e6ae2bdc1d508c82d7b SHA512 4545c9c2a696d9ceaf463fe74f391614ba41abc51ce00c32b285baf37e34d8e8bc55f2c3288309a2b44a4ff420ed7d1bc2aa26f2214abe65576d267488dd0849 -AUX pkgconfig-pathfix.patch 1921 BLAKE2B 1f807eeca318dd8e78033291e3465f0da92c156b42f3aa848b2af81be4ac5d1980b791e63da41947a9c7ffc3df3eb9b39cb248b61efb49222554c21e9b378126 SHA512 b080d65385e384ea0402d829dabd38959f10b7f0880d3fb3f5611593493e2a2c5679c7f37a48c58c0cbccce04bffdc58a359fd5262614d5c98e98c491c5807d8 -AUX pkgconfig_install.patch 711 BLAKE2B c75f750f3c4419323a34acc4c8490525a1dc6b1c628ea1233a124e4689c6ac1ef4338c5786cc040b9a87fd446708cbbc338fe37b2edfc16298391bdd7c66fe7a SHA512 1d3a38b35ac73cc3af6ae24d9bd537712d66f99faa9687bb8c26b3a45d559ccad6917ea1aff11030ff61c9b4c4e89701584d72e35b80b52c514e5f4e56516fe0 DIST gmp-api-Firefox39.tar.gz 16363 BLAKE2B dd92d851c4f09476f1e394fd42c5e40ea707ac6dcabc3ceee62400eb998f1c98c781fbde581253ddd8f45b7447a0c7fdc61e74ef60b6fc3397cd4bf8995154ab SHA512 da6f05c5f0540be8d4f48d25b947b21214d34a6eed365ee5fa4a38c69f77325add4be902e0dcd9d06be43914a3518ded7e4f2289dab034a24325f0bff201692a DIST openh264-1.7.0.tar.gz 38681895 BLAKE2B 2e0e88bd446fdbea29ea4e863eb391dce1cc271c289165233aa1375e10ce6e60f7be7307eeb7acedd459c3170b57fbc5c7a0e9b6bd0c355be6447fb036192f35 SHA512 3e30584d6adb69c162f5b044f49155c22d44ab8e399f6bf09194593df84475b49979406f3e461d25ef1e4422c2721b975c58bc64d40a143d8493d45380ad96aa EBUILD openh264-1.7.0-r1.ebuild 2929 BLAKE2B 9e72b4b26c0748f1d8293943a1bae1fc90346ed78474e508d7c265dcd86366b8a737ea556b9f58cf9516bb5b91e153402b371af4f2a34813388bf2e93a594d89 SHA512 dd008099e9cea12ad28f5ab1b447cca9308e3cdb3f859818eb5889b540241d7ef7e460fca4d9fd00b964cc65119cd6e5b764e4b0f3902ab42576b06851ed17cd 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 a39823aeee77..000000000000 --- 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 455b91331df4..000000000000 --- 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 50d8715ce6f3..000000000000 --- 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 -- cgit v1.2.3