diff options
Diffstat (limited to 'media-video/ffmpeg')
-rw-r--r-- | media-video/ffmpeg/Manifest | 5 | ||||
-rw-r--r-- | media-video/ffmpeg/ffmpeg-9999.ebuild | 2 | ||||
-rw-r--r-- | media-video/ffmpeg/files/chromium-r1.patch | 36 | ||||
-rw-r--r-- | media-video/ffmpeg/files/chromium.patch | 2 |
4 files changed, 41 insertions, 4 deletions
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest index 3bb7ba54ee62..d1432644a857 100644 --- a/media-video/ffmpeg/Manifest +++ b/media-video/ffmpeg/Manifest @@ -1,4 +1,5 @@ -AUX chromium.patch 1421 BLAKE2B e8e6331c5ddf0a09c1865d3e0b7af84798772b81b638614944de4bbf28ae95069f14f8394615f19d40ab5a09093bd8b46869315ee84f1f928d0b9b4098346d4c SHA512 08bd38c21f4ecb07c4fc015f00eea326255f3014d65c9e5f651e5ba4e0e3b7c135426d1ee94f164e60cdcb018475f2cf5862a9abee011ab7d6e5f38b41b40bdd +AUX chromium-r1.patch 1492 BLAKE2B efa332eb9cc842e2a9fa949c6c00d3c1956ae7ad55b5567e880e48a2fe21325ffcb7a7bc13f726cb8cfad44f0f63e23887c16d9938fcf80ed7427cc2f9253035 SHA512 55d7a06b630ac28c7b8e91112536fd67356664c7c91c3ca38b02733beb91d9a8a28247fd122e4b1d94009ffce5b83d29de10f331323179ae268e42851af10000 +AUX chromium.patch 1420 BLAKE2B 1acf931cd2e635b0b6c2c42d649d1bc92ac59321acc451501c70076d84449fd17b3a95c24a33208994df9aac8f8959a084f0ebaedaf0c997f535008594872bd8 SHA512 1f3f6d08aac64bb8c9d8a974170064b8a3531a6d06cea6fb208439dc687addeaf0c90f7f407dd7e71f50cd524f69c110c92d5276d04fe3bcaf7fb1ff2494ec59 AUX ffmpeg32-openjpeg22.patch 4777 BLAKE2B 4ea7ed6b6b31c6d0d3e99358231ce27f18423aab866ceed75c10bf2c4b514ae4d023f9b0f4dd91346773f2ef2014943a08e6093e53266fa307557da69d766c8b SHA512 0d619b0e353ee9f80dffdb94bedd31b55fb4e6a18a0e60d8ef7119e5012583c1c0531b0b200b41c32caaa71cbade4899f74c9d0ae70d15403ef0aa6f3d77e07d AUX openjpeg22.patch 4770 BLAKE2B b5fd034e2af9d180b2e0ee76e5227fcc948e20bacc5e463c8d7d640db3c3e52dd0f12149e5a095388c3b8db0d7c37bb4080be3141b90fd554c46aa4650585b27 SHA512 8a198910cdf43df83fdf50e372c2ec5d911637dd61768d5ac3a1984f99d1f374f594af9ff6c501b248c390a22898e4964f7d07c81eb3586fa1bebad2c9e00730 AUX openjpeg23.patch 5105 BLAKE2B 64aab97ec21e44f7ab94c9513ebf63e60a76698889ed3cafebec3a25adb07dddffe9358c4c3b29f89b0d0b4c8bb54d9197a5b8ca2e4105c539fd6b513ad5c247 SHA512 a1e3b91add49a80633e19eb49870ecb7ef1493cf3503d121bdeb74f2fcd0320b8e5f04a3505241f7375f4a598f5da651afb92350e3b92412977f55b9193409a7 @@ -14,5 +15,5 @@ EBUILD ffmpeg-3.3.4.ebuild 16107 BLAKE2B 2dabd381f934dde36e6a1cd25c9c44a93a702bc EBUILD ffmpeg-3.3.5.ebuild 16109 BLAKE2B 53b38d47499dc3ec2d9cf5864ef35999032894dc100d935221ef34294610c980d058288c3ff177b4e4ecd21933426cc57a60611133bf74db9065a09bffcb8f11 SHA512 5a3d8e7d84d0cbe1e23918263be4ef1f379f563c81be266d7e7a8333674f056f69db6e3f88fb8e0521a7f4944fd427c5e91f66b277a19b7029834be9810aa616 EBUILD ffmpeg-3.3.6.ebuild 16112 BLAKE2B 9ed6f79b8077b4cb8402963ef7a48bed40a5cfd2cd277ae1fe2a05862927593e060ee18414f0f4226857038c253b4e44e302dfea3e50b3fda610fbc631e7fc02 SHA512 6ca88a7099bfb63c04b6e4a4580de3b4523e58eb04e730da24de4abdd48d7583757f050dc8259cc31090ca34abe06d0741d8f66481b9b3ee380d109008ce3d7c EBUILD ffmpeg-3.4.1.ebuild 15673 BLAKE2B e5b0aecb018af1733c0c013e132e1c5060cff109421a54f63953e4df3a15a275d746981003533e5e4bdc5ade07d2ff17977e93a0a603dc7f5bb82dfe459a69e5 SHA512 061a487f8791b210ef2e593eb5e78382b158113f61b771f92c7c51e17d3d436056f22441f814ed81d23e5b4c3c6281b7853a48433731a89dc142aac08b5d2f39 -EBUILD ffmpeg-9999.ebuild 16054 BLAKE2B 764a29d4cdbb2497c5de98244547e55d1b8ea44fecdf26fdc087019a2589087864d9efb7be58ac8486dddc104353fc65285902c3b8a09a39c881558781c7c856 SHA512 805f234318e8de2db5fbf436d51e76bdec834f75743bd7fc029281f9dfc1b4040ab2392da012393a293dbffe3cb5279b6f61c60c9c65e569cdf8e77e7320f819 +EBUILD ffmpeg-9999.ebuild 16057 BLAKE2B 262d140c3b9e9eb2f663336a77cfa94610401bcc41e5bb81ab50b7eead6bcef70a70b1ce314196557c7f334ff42e7aacdbb5914d50b8611f5a1cba8a77d0314d SHA512 bfdcf1a4c23372da65eb2be595e05975f1b28677ef04a101ee9150b6347a61f4b634a4e50a78a5b58c4514453d523550d5a2af4929a2d03e1ff9525cee454381 MISC metadata.xml 5618 BLAKE2B cfca20347486aaead0039c0a256f31949609fd3c15f35273bd783657052fe8675f08e60cfe0df4c567b88f44f801d17326b6eb77ef39324e3e45e57b09a6001f SHA512 7a235250f9177343afb6ffcf6a3ff77bdc7cf028fd2c26bf84c05c049ebb89ce9d489a86b6b37d1e90262b8b3995c57f201586737e293458d2747ed1bf12e3c3 diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild index f78260745ad0..bae322e21e76 100644 --- a/media-video/ffmpeg/ffmpeg-9999.ebuild +++ b/media-video/ffmpeg/ffmpeg-9999.ebuild @@ -291,7 +291,7 @@ RESTRICT=" S=${WORKDIR}/${P/_/-} PATCHES=( - "${FILESDIR}"/chromium.patch + "${FILESDIR}"/chromium-r1.patch ) MULTILIB_WRAPPED_HEADERS=( diff --git a/media-video/ffmpeg/files/chromium-r1.patch b/media-video/ffmpeg/files/chromium-r1.patch new file mode 100644 index 000000000000..cfe06a7aec8d --- /dev/null +++ b/media-video/ffmpeg/files/chromium-r1.patch @@ -0,0 +1,36 @@ +Allow libffmpeg to be built for Chromium-based browsers +https://patchwork.ffmpeg.org/patch/4500/ + +NOTE: This patch lacks the Makefile include line. We append it +manually instead to make patching across different versions easier. + +diff --git a/ffbuild/libffmpeg.mak b/ffbuild/libffmpeg.mak +new file mode 100644 +index 0000000..992cf3c +--- /dev/null ++++ b/ffbuild/libffmpeg.mak +@@ -0,0 +1,21 @@ ++LIBFFMPEG = $(SLIBPREF)ffmpeg$(SLIBSUF) ++LIBFFMPEG_LINK = $(LD) -shared -Wl,-soname,$(LIBFFMPEG) -Wl,-Bsymbolic -Wl,-z,now -Wl,-z,relro -Wl,-z,defs -Wl,--gc-sections $(LDFLAGS) $(LDLIBFLAGS) -o $(LIBFFMPEG) ++ ++libffmpeg-: libavcodec/$(LIBPREF)avcodec$(LIBSUF) libavformat/$(LIBPREF)avformat$(LIBSUF) libavutil/$(LIBPREF)avutil$(LIBSUF) libswresample/$(LIBPREF)swresample$(LIBSUF) ++ $(LIBFFMPEG_LINK) -Wl,--whole-archive $^ -Wl,--no-whole-archive $(EXTRALIBS-avcodec) $(EXTRALIBS-avformat) $(EXTRALIBS-avutil) $(EXTRALIBS-swresample) ++ ++libffmpeg-yes: libavcodec/$(SLIBPREF)avcodec$(SLIBSUF) libavformat/$(SLIBPREF)avformat$(SLIBSUF) libavutil/$(SLIBPREF)avutil$(SLIBSUF) ++ $(LIBFFMPEG_LINK) -Wl,--no-as-needed -lavcodec -lavformat -lavutil ++ ++$(LIBFFMPEG): libffmpeg-$(CONFIG_SHARED) ++libffmpeg: $(LIBFFMPEG) ++ ++install-libffmpeg: $(LIBFFMPEG) ++ $(Q)mkdir -p "$(SHLIBDIR)/chromium" ++ $(INSTALL) -m 755 $< "$(SHLIBDIR)/chromium/$<" ++ $(STRIP) "$(SHLIBDIR)/chromium/$<" ++ ++uninstall-libffmpeg: ++ $(RM) "$(SHLIBDIR)/chromium/$(LIBFFMPEG)" ++ ++.PHONY: libffmpeg libffmpeg-* install-libffmpeg +-- +2.13.1 + diff --git a/media-video/ffmpeg/files/chromium.patch b/media-video/ffmpeg/files/chromium.patch index 307f31f4a3a5..60a3e5d6cb99 100644 --- a/media-video/ffmpeg/files/chromium.patch +++ b/media-video/ffmpeg/files/chromium.patch @@ -14,7 +14,7 @@ index 0000000..992cf3c +LIBFFMPEG_LINK = $(LD) -shared -Wl,-soname,$(LIBFFMPEG) -Wl,-Bsymbolic -Wl,-z,now -Wl,-z,relro -Wl,-z,defs -Wl,--gc-sections $(LDFLAGS) $(LDLIBFLAGS) -o $(LIBFFMPEG) + +libffmpeg-: libavcodec/$(LIBPREF)avcodec$(LIBSUF) libavformat/$(LIBPREF)avformat$(LIBSUF) libavutil/$(LIBPREF)avutil$(LIBSUF) libswresample/$(LIBPREF)swresample$(LIBSUF) -+ $(LIBFFMPEG_LINK) -Wl,--whole-archive $^ -Wl,--no-whole-archive $(FF_EXTRALIBS) ++ $(LIBFFMPEG_LINK) -Wl,--whole-archive $^ -Wl,--no-whole-archive $(FFEXTRALIBS) + +libffmpeg-yes: libavcodec/$(SLIBPREF)avcodec$(SLIBSUF) libavformat/$(SLIBPREF)avformat$(SLIBSUF) libavutil/$(SLIBPREF)avutil$(SLIBSUF) + $(LIBFFMPEG_LINK) -Wl,--no-as-needed -lavcodec -lavformat -lavutil |