diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2022-03-20 00:40:44 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2022-03-20 00:40:44 +0000 |
| commit | 4cbcc855382a06088e2f016f62cafdbcb7e40665 (patch) | |
| tree | 356496503d52354aa6d9f2d36126302fed5f3a73 /media-video/mplayer | |
| parent | fcc5224904648a8e6eb528d7603154160a20022f (diff) | |
gentoo resync : 20.03.2022
Diffstat (limited to 'media-video/mplayer')
| -rw-r--r-- | media-video/mplayer/Manifest | 4 | ||||
| -rw-r--r-- | media-video/mplayer/files/mplayer-1.4-riscv-support.patch | 14 | ||||
| -rw-r--r-- | media-video/mplayer/mplayer-1.4-r1.ebuild | 11 |
3 files changed, 25 insertions, 4 deletions
diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest index 01daa28d0d90..922764f8a1b0 100644 --- a/media-video/mplayer/Manifest +++ b/media-video/mplayer/Manifest @@ -1,11 +1,13 @@ AUX dump_ffmpeg.sh 2529 BLAKE2B 2c945fcf0b430d74c85557f82497dbc4a2a8308ecb34c86e42cc3c6a5eed20496691839355c068ccabf6d20d11d62035231aa208341a1ce9affc44b3e30acfde SHA512 12c15efa5cdb99eac92ff808fa56c6137343cca48b73d5875a7a6b08cf36ebeda5022eb3bae0ba567ff9031d2a0f3b5dbe69ee191ae8ecf48b98a779504df66c AUX ffmpeg44.patch 517 BLAKE2B 432b42b5e89707739768b83332e17eb16008fd636a14e57ea8cef73aaac057e4a33ea1071ff7d1ef56c106a35b297cf9106ccb5ffab383f23e1a98cf451c021d SHA512 95eaa2a524d6b12b87e5f1548fc0565904f6478bce5353da5fbe6892e25da595376c25bfbfd4030b267b9adb2850b1a2c7a3b2f41a19091f4fd35535140865db AUX mplayer-1.3-CVE-2016-4352.patch 617 BLAKE2B 57f85be46230fa0576c6569bafc8c65f24b0a59d3b083c06d2e14fe176505567feca5024bafd73fb1b48960ea95a4705132ed6e2166a31aabcd1e34fc41e3803 SHA512 654bfa8368a02669ba249aa0c1a605f285d4d967b7038285df0ba7b83cd034ac3aff933a564fd6f33c7a153267be19d9eb517a52c8f4b53a6f81b6b2c5558512 +AUX mplayer-1.4-riscv-support.patch 358 BLAKE2B e01cf194ae1293d29e68f721a93affab9aca9979540c69eae1eac5eab93cc377b0d58736902ff33a70d5600a67e490f6a5c4fc8d7c479f4edf0c9bf7ad4132fd SHA512 a940fb85aa2dbb46fb7b5a7a7ab50953e172c6fed983de13e45fb3552d260becb7d3310cc833ff9ab8d0b64c36c7b035fa39584e25b535383e2e9484d4be8026 AUX prepare_mplayer.sh 757 BLAKE2B 5de1cb4b17628dd5443f98a20717f8ed028a76446104a471a669b1c7ed7a5b76a8e86203f436240312ac4814a0ba7dba7856bb4f3723da850188a3003aae8bbb SHA512 0add0707e15d58cee331fc82f884a44b29908c503f9ddcbb63dc01e237e2f457f599bae8644ce49f1af2cc7b3183529364ce30e6748889355c17cb96cecee71a DIST MPlayer-1.4.tar.xz 15054920 BLAKE2B 4777cb31a32d62c393778c581c1913fbf355a36cbe6bcf6f426c90c2c8c70123e8aed4d01faf52ee6b1fba3c49e11fa13185f81ae8582f90c901b90955a1f42b SHA512 8ef71cad187d8c8f81c837279bd3a421b440c892d3347a667670b21c954007e35cf0d15828f0901f347b9c1b053e8da4bc7f0fb6de34382d1e463074923d7b34 DIST font-arial-cp1250.tar.bz2 249705 BLAKE2B eb4366a110d917dc975b8add168ab43b1e8a0db7342647f69f5421fc1170719015c97ffa770e89892cbb4cee8e5b2fb74a4772c8f6cbef9606ee12c3746d78c9 SHA512 4f77ff5ceb8ec6e5d9f8f34d8950a6a6276d1fd5a947772fcbdb6554988b1ea665c12b82f45164f91fb7bd08000cb4afc26fa35beb4c760464160e22b9b8c340 DIST font-arial-iso-8859-1.tar.bz2 234242 BLAKE2B 0671854e1a257d27b502affb59de681942a93990d3ac2575bbf1a6dd9eef026969f2f9ce4e9c11a68ea3d8aed48063f826a1e153f7468437a39791672c92a5d0 SHA512 a1d03b6f09c48f48b7733f3bc0402ceab239a9abf88b860d852ea9fe69b4da690208a79d6f29d30204f5b37becf10672e8e8c0bfef201846d80ec54df617d029 DIST font-arial-iso-8859-2.tar.bz2 222208 BLAKE2B 94b1a04672bf9b4b20a0e6981591e761f751bd637deddcb801855296c525bf3b5e8feb1cb11cef282c0269f2c963ded22846089076e7e6763f258b8a932af454 SHA512 5671e628303fd816f64a51ad10e2f4dd9c3dc1b34c379a2ecf489b83931db7af668aaa4e00e96a00cacd63ed98daeae6b6a4d5925edfb06fc98d3a923f70257d -EBUILD mplayer-1.4-r1.ebuild 16604 BLAKE2B 8846598894f30bdf1a8faab38e1b029910e1e36f00a601efcc91c3bd3041ede0e4c9a910cc4542d0b75ed3ffad425eb0aa2b327c947538836a67c400d1ff4546 SHA512 b436a10cccef6c06163d5740e03e0eaf97a81c544e76e25f5cd927d73ca54410e90ffab672ec44c01d7cfe172331f49e5edcd30bfb36e1fc9798abf9aed48e07 +DIST mplayer-1.4-ffmpeg5.patch.bz2 11428 BLAKE2B 2cc9839333161fd00db87b7dd103e10414c910eb5b21b39454daed36440d54f5947216b80ac91947932c760c21c275328b3a642d0a2c8cd6963fe4b7671c9f90 SHA512 61038ad8ef8a55a99dd7e7a20ff38805c86f6a6ecb876261d0e3f4db7f30f36a9dfedbd6c895fd8168fef8833b856b3d3501a89fd041365ba07c81c3ebd36a69 +EBUILD mplayer-1.4-r1.ebuild 16815 BLAKE2B 8a615d5e25d15e114400fc5655c1011dbae4b53136cbec7b195f81d07a13f3705ac2ef859bbcc09719f8ccd16f9a1fa20c56dc1dd51c6cdf53dc0476f879f605 SHA512 b5e770b6b6de4eca6d236fbe4aa531e95cfd77c65f0e3adb9b184a3a1d90bc131a3396b47105062ea4274504969cf33a7c2491eb6df43a94d13fe27b8c7b030f EBUILD mplayer-9999.ebuild 16565 BLAKE2B 2d6e90e19c2311a42ba341a72fd9c77f3a6a2d1ed732988e0a473a3e012ebab877bb4eeb36529c025b3351bdde409ff61ff4efe738f413f65838fc67b311af51 SHA512 d28abeb0df72c04f859af33416659f9aaadeb960dc2aa245bd83e4bc08b6bb447806d1f4ff7c3a210b8568e2fad8d2d9f9c567d3c2be2acbe3094d97decac4c0 MISC metadata.xml 2464 BLAKE2B 417f17be4528c579dc736323ba1f6cb62dd9f9ac27b67286321ec1f2a29b5102e8a8df368c5f3850a885b00472921df2b3e1ec7be40b10d880a1fb03b4b37ba2 SHA512 038c0ef2141c0c822658733499c1779efee751558bd0420314f67e04fd8ed97e4ec3bcb5b12680b9dc72023346b06f8a0b195dd254328caa3b76b2b0daf1adcc diff --git a/media-video/mplayer/files/mplayer-1.4-riscv-support.patch b/media-video/mplayer/files/mplayer-1.4-riscv-support.patch new file mode 100644 index 000000000000..282cdf3cef85 --- /dev/null +++ b/media-video/mplayer/files/mplayer-1.4-riscv-support.patch @@ -0,0 +1,14 @@ +https://bugs.gentoo.org/812855 + +diff --git a/configure b/configure +index d1aa8cd..bdac866 100755 +--- a/configure ++++ b/configure +@@ -1761,6 +1761,7 @@ if test -z "$_target" ; then + nios2) host_arch=nios2 ;; + vax) host_arch=vax ;; + xtensa*) host_arch=xtensa ;; ++ riscv*) host_arch=generic ;; + *) host_arch=UNKNOWN ;; + esac + } diff --git a/media-video/mplayer/mplayer-1.4-r1.ebuild b/media-video/mplayer/mplayer-1.4-r1.ebuild index daf58bcdb444..a6f47c026ec8 100644 --- a/media-video/mplayer/mplayer-1.4-r1.ebuild +++ b/media-video/mplayer/mplayer-1.4-r1.ebuild @@ -39,6 +39,7 @@ else RELEASE_URI="mirror://gentoo/${P}.tar.xz" fi SRC_URI="${RELEASE_URI} + https://dev.gentoo.org/~aballier/distfiles/${P}-ffmpeg5.patch.bz2 !truetype? ( ${FONT_URI} )" DESCRIPTION="Media Player for Linux" @@ -149,7 +150,7 @@ RDEPEND+=" SLOT="0" LICENSE="GPL-2" if [[ ${PV} != *9999* ]]; then - KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86" + KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86" fi # faac codecs are nonfree @@ -174,6 +175,8 @@ REQUIRED_USE=" xv? ( X )" RESTRICT="faac? ( bindist )" +PATCHES=( "${FILESDIR}/${P}-riscv-support.patch" ) + pkg_setup() { if [[ ${PV} == *9999* ]]; then elog @@ -229,9 +232,11 @@ src_prepare() { subversion_wc_info printf "${ESVN_WC_REVISION}" > $svf else - eapply "${FILESDIR}"/${PN}-1.3-CVE-2016-4352.patch + eapply "${FILESDIR}"/${PN}-1.3-CVE-2016-4352.patch \ + "${FILESDIR}"/ffmpeg44.patch + has_version '>=media-video/ffmpeg-5' && eapply \ + "${WORKDIR}"/${P}-ffmpeg5.patch fi - eapply "${FILESDIR}"/ffmpeg44.patch if [ ! -f VERSION ] ; then [ -f "$svf" ] || die "Missing ${svf}. Did you generate your snapshot with prepare_mplayer.sh?" local sv=$(<$svf) |