diff options
Diffstat (limited to 'media-video')
20 files changed, 698 insertions, 178 deletions
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz Binary files differindex 53293b583bbb..6780ea7d121c 100644 --- a/media-video/Manifest.gz +++ b/media-video/Manifest.gz diff --git a/media-video/aegisub/Manifest b/media-video/aegisub/Manifest index 7f729d207f13..cf3922ad578a 100644 --- a/media-video/aegisub/Manifest +++ b/media-video/aegisub/Manifest @@ -5,4 +5,4 @@ AUX 3.2.2_p20160518/aegisub-3.2.2_p20160518-support-system-gtest.patch 2483 BLAK DIST aegisub-3.2.2_p20160518.tar.gz 7438734 BLAKE2B 3a57e5d6fafac2ca95d64d60e8d68b48177aaa0c5fd1438d0b0a133757ef95443c16324fb7effb41506f2b1eb70aab9d34845a91beef0ef81a3658444e24be07 SHA512 8d8775ba0a12735a9756b9abfd65c89519dae4e21afcaedbd18985d1c1021975b1ae909b3bef1121b707c626e1711d56f1823f3b4746eab49e8386536a5e84e6 EBUILD aegisub-3.2.2_p20160518-r2.ebuild 3477 BLAKE2B 371dc9d92c3f07dde0c4adb5d8964a1d8e8200daeb0bb097cb04d4f31356109d5760222612be40ded76494df3ff2476b7ed765e83de32e12192a879cf5092238 SHA512 a3ffee8d55f0f9608ce8e64eacc3560b38f0cd899f443ede1c2bf3fa39bcffdad87e15529654312e3c58ddf5074f118f4e6d15f5f925961bfd4f4d6c4fedea43 EBUILD aegisub-9999.ebuild 3041 BLAKE2B 4c9adee1e3a308b1e7470d6badc8f9af87f68a7ca09d589328a591634f4286123d972c2a8a61859881cdedebcb73dd81a22c74fa5410caac102a2327cf7684b0 SHA512 d2231b788ff67fd79db1c8a353cd87d5e9959f496b80b88cd7ec89f380756b3defe3f0c69a703828b00d63020276fbe749618a555912724c65077914bafe0a9d -MISC metadata.xml 611 BLAKE2B 72533983a2703246aa4370c8fbb0c416befd2d2702192b28b369e0d437cb3b6a993079c5cc58ad10150783234780ff2782120fd19e180929bf216c2db14f6064 SHA512 2cdfbaacbcad852fa6270b86eeb76d7ce7be395ef90bb7607a8e8ea55316893508ce4fdac03688f28a6e358992e83932fc37f3cf27cd6777d24a7086bc9c90e3 +MISC metadata.xml 489 BLAKE2B b26abe2056ef0465a81ea8f9928c6d05053595b5650aff750251173ddce6f5248a30331104710c1b05cafe9641c072764c45f66935b25857785bc833af31174a SHA512 450c45be100ed72d7f0b69fe596862137ea2f421597e99129325bf2f58940600a62e1502ee4d6c7cbbab17b4cbd99da8c481ceb6fec2709452c17d8cb7aaae48 diff --git a/media-video/aegisub/metadata.xml b/media-video/aegisub/metadata.xml index 528141f5f860..03856777598f 100644 --- a/media-video/aegisub/metadata.xml +++ b/media-video/aegisub/metadata.xml @@ -2,13 +2,9 @@ <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> - <email>commendsarnex@gmail.com</email> + <email>sarnex@gentoo.org</email> <name>Nick Sarnie</name> </maintainer> - <maintainer type="project"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> - </maintainer> <use> <flag name="uchardet">Enable charset discovery via <pkg>app-i18n/uchardet</pkg></flag> </use> diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest index d2de2aefad91..e04f868624d8 100644 --- a/media-video/ffmpeg/Manifest +++ b/media-video/ffmpeg/Manifest @@ -17,6 +17,6 @@ EBUILD ffmpeg-3.3.5.ebuild 15958 BLAKE2B c5d4de18818f991e975e5d4e4af6ba49335c1f5 EBUILD ffmpeg-3.3.6.ebuild 15957 BLAKE2B eb439e2f522e49991df4143b4ec69b428e4ea69c97f6aab1d1aa19628d0b311adfb484cd7d807c44b90a8e74c87255992fa8181ad8ddee51ed515424bc7e60b1 SHA512 9329ae807ed9c5e3f63f2ca9c1c658728f924dca5885375438ccc01a22ee9f21da208cfaa62329eb5df77200ba27fc0ffeb3250b6507e6731210b46e973dbd96 EBUILD ffmpeg-3.4.2-r1.ebuild 15633 BLAKE2B 2e5391e267c92cb7a16b6ee26652f536636a49346d7145c0f2974c6daf546a5b01b745c8038156a76161476b51309f8f622f2ceacb92f0ae1c992284d8161a82 SHA512 5a037bc3c6078776338027492ad55237d3328df390528ad2c3fc3edb52817038e2ca38d297b3302fcd522ec34f69cd8f1b3ee6876997f4a95dd5c938af37c07f EBUILD ffmpeg-3.4.2.ebuild 15578 BLAKE2B dd02f1200d7c713f06c606a40386f6432dc4c1b796614e1a4f1faf13e504fd9634e1557d7a70cfb94629228090ca66916510b6328dfde5d0bc0e4cd44a103049 SHA512 b95e7fd722745507d91f23bd365fec8a2193d589bc41821adfb1123fa844bf869eb5e02eb2c3bb936cf4f69b0437fdf875f7bddf821d04105d29b667678abdd8 -EBUILD ffmpeg-4.0.ebuild 16246 BLAKE2B a679ca4d7edb41d99b055e4a7228c15bcc4bbd0f8dc7e3935272c223ae13299c7d1e56c0c7527b8fec3971f63bf1c66c97c505a84483ccede9d07875a5d3f072 SHA512 49990d31b94deb94871ebea86ad9b802cf6ac6dedbd8955af64bb3524147e462904ee8b57d0fb5796ad34f90bfba92770b23d702443c06033832b95ba4754e20 -EBUILD ffmpeg-9999.ebuild 16306 BLAKE2B 907cea2f799f2e20640a063c0bdee755c8b6a5167f52c4d86f4e0b988efab21ea87f17181e5771b0dd58e71fc0167805c4e14ffc12dd4a680fdc3267e17b41ef SHA512 d4779109f7dbc89078c21b46599593efb769a7fbad023c7b7937981116241e372f4ecd3173cadcb1003849dd42be15c426a3e9f85c49117c2d0f68ccf38d49a1 +EBUILD ffmpeg-4.0.ebuild 16461 BLAKE2B e4989ecbe8f21affe84c87617dec6e5ba785bf9bbed740488097c229de8a6a01dbb1e9898bae5276c9fd74dcf084704c559ba03c83f67a5dbb1dd47f21ced3c4 SHA512 1b383d0e60cae4b484dd17e01b34f37359951991f1be5823aa6cb797094b7e281a3f0b41b4b95fadf7cb5a4806a28a26bfa651cf145028b0727d697d91d614dd +EBUILD ffmpeg-9999.ebuild 16521 BLAKE2B 388f7d528159be1ebbba172ec58f0e2b02a509f000ab33a757579311b24b8a169bb1183960694f13bd6796f4f41f117ad0ba514a44e9d29de7a3bb386929566f SHA512 4d0d216c765c6645e9b5d8fc30dd61ab7cafe9663cbc42066793607ebb7c486ecbbee5c08ef9aa81da14ca4aff946e7db306f2f1b197681d6237e447f21777da MISC metadata.xml 6059 BLAKE2B c3bd41f2496c42f3f426f9a06e1ed860f8bf7853b17a1854e5e6211a68ec96bc00aeb239f230c1ff10ae65bf2a2fcb7824dccb8836ab7a3b642ac9208b5bb822 SHA512 43469f265ca75b7ad487bc8b54e47fe632e21af8ec331ff87b0423c534c27b3adcdc92ffd98ea08a24ed3f22584c37b2965977ff600166c1700866841293de85 diff --git a/media-video/ffmpeg/ffmpeg-4.0.ebuild b/media-video/ffmpeg/ffmpeg-4.0.ebuild index 22e4cd2f2d14..480732eac83b 100644 --- a/media-video/ffmpeg/ffmpeg-4.0.ebuild +++ b/media-video/ffmpeg/ffmpeg-4.0.ebuild @@ -64,9 +64,9 @@ fi # foo is added to IUSE. FFMPEG_FLAG_MAP=( +bzip2:bzlib cpudetection:runtime-cpudetect debug gcrypt gnutls gmp - +gpl +hardcoded-tables +iconv lzma +network opencl openssl +postproc - samba:libsmbclient sdl:ffplay sdl:sdl2 vaapi vdpau X:xlib xcb:libxcb - xcb:libxcb-shm xcb:libxcb-xfixes +zlib + +gpl +hardcoded-tables +iconv libressl:libtls lzma +network opencl + openssl +postproc samba:libsmbclient sdl:ffplay sdl:sdl2 vaapi vdpau + X:xlib xcb:libxcb xcb:libxcb-shm xcb:libxcb-xfixes +zlib # libavdevice options cdio:libcdio iec61883:libiec61883 ieee1394:libdc1394 libcaca openal opengl @@ -196,7 +196,6 @@ RDEPEND=" gcrypt? ( >=dev-libs/libgcrypt-1.6:0=[${MULTILIB_USEDEP}] ) gme? ( >=media-libs/game-music-emu-0.6.0[${MULTILIB_USEDEP}] ) gmp? ( >=dev-libs/gmp-6:0=[${MULTILIB_USEDEP}] ) - gnutls? ( !openssl? ( >=net-libs/gnutls-2.12.23-r6:=[${MULTILIB_USEDEP}] ) ) gsm? ( >=media-sound/gsm-1.0.13-r1[${MULTILIB_USEDEP}] ) iconv? ( >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] ) iec61883? ( @@ -224,7 +223,6 @@ RDEPEND=" openal? ( >=media-libs/openal-1.15.1[${MULTILIB_USEDEP}] ) opencl? ( virtual/opencl[${MULTILIB_USEDEP}] ) opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] ) - openssl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] ) opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] ) librtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] ) @@ -257,6 +255,19 @@ RDEPEND=" postproc? ( !media-libs/libpostproc ) " +# Crypto & co provider magic +# - libressl is a useflag meaning it should always favor libressl over openssl +# - libressl and openssl provide more features to ffmpeg than gnutls +# +# The ordering is thus: libressl > openssl > gnutls +RDEPEND="${RDEPEND} + libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] ) + !libressl? ( + openssl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] ) + !openssl? ( gnutls? ( >=net-libs/gnutls-2.12.23-r6:=[${MULTILIB_USEDEP}] ) ) + ) +" + DEPEND="${RDEPEND} >=sys-devel/make-3.81 doc? ( sys-apps/texinfo ) @@ -287,7 +298,7 @@ REQUIRED_USE=" ${GPL_REQUIRED_USE} ${CPU_REQUIRED_USE}" RESTRICT=" - gpl? ( openssl? ( bindist ) fdk? ( bindist ) ) + gpl? ( openssl? ( bindist ) fdk? ( bindist ) libressl? ( bindist ) ) " S=${WORKDIR}/${P/_/-} @@ -312,7 +323,7 @@ multilib_src_configure() { local myconf=( ${EXTRA_FFMPEG_CONF} ) local ffuse=( "${FFMPEG_FLAG_MAP[@]}" ) - use openssl && use gpl && myconf+=( --enable-nonfree ) + use openssl || use libressl && use gpl && myconf+=( --enable-nonfree ) use samba && myconf+=( --enable-version3 ) # Encoders @@ -347,11 +358,10 @@ multilib_src_configure() { myconf+=( $(use_enable ${i%:*} ${i#*:}) ) done - # Incompatible features: openssl and gnutls - # openssl support provides a (strict) superset of gnutls support as of 2017.11.30 - # So, we warn the user and disable gnutls - if use openssl && use gnutls; then - ewarn "openssl and gnutls are mutually exclusive in ${PN}, disabling gnutls since openssl provides more features" + # Incompatible features: openssl or libressl and gnutls + if use libressl ; then + myconf+=( --disable-gnutls --disable-openssl ) + elif use openssl ; then myconf+=( --disable-gnutls ) fi diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild index 40d7a117ea58..bd45bac1d298 100644 --- a/media-video/ffmpeg/ffmpeg-9999.ebuild +++ b/media-video/ffmpeg/ffmpeg-9999.ebuild @@ -64,9 +64,9 @@ fi # foo is added to IUSE. FFMPEG_FLAG_MAP=( +bzip2:bzlib cpudetection:runtime-cpudetect debug gcrypt gnutls gmp - +gpl +hardcoded-tables +iconv lzma +network opencl openssl +postproc - samba:libsmbclient sdl:ffplay sdl:sdl2 vaapi vdpau X:xlib xcb:libxcb - xcb:libxcb-shm xcb:libxcb-xfixes +zlib + +gpl +hardcoded-tables +iconv libressl:libtls lzma +network opencl + openssl +postproc samba:libsmbclient sdl:ffplay sdl:sdl2 vaapi vdpau + X:xlib xcb:libxcb xcb:libxcb-shm xcb:libxcb-xfixes +zlib # libavdevice options cdio:libcdio iec61883:libiec61883 ieee1394:libdc1394 libcaca openal opengl @@ -196,7 +196,6 @@ RDEPEND=" gcrypt? ( >=dev-libs/libgcrypt-1.6:0=[${MULTILIB_USEDEP}] ) gme? ( >=media-libs/game-music-emu-0.6.0[${MULTILIB_USEDEP}] ) gmp? ( >=dev-libs/gmp-6:0=[${MULTILIB_USEDEP}] ) - gnutls? ( !openssl? ( >=net-libs/gnutls-2.12.23-r6:=[${MULTILIB_USEDEP}] ) ) gsm? ( >=media-sound/gsm-1.0.13-r1[${MULTILIB_USEDEP}] ) iconv? ( >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] ) iec61883? ( @@ -224,7 +223,6 @@ RDEPEND=" openal? ( >=media-libs/openal-1.15.1[${MULTILIB_USEDEP}] ) opencl? ( virtual/opencl[${MULTILIB_USEDEP}] ) opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] ) - openssl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] ) opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] ) librtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] ) @@ -257,6 +255,19 @@ RDEPEND=" postproc? ( !media-libs/libpostproc ) " +# Crypto & co provider magic +# - libressl is a useflag meaning it should always favor libressl over openssl +# - libressl and openssl provide more features to ffmpeg than gnutls +# +# The ordering is thus: libressl > openssl > gnutls +RDEPEND="${RDEPEND} + libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] ) + !libressl? ( + openssl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] ) + !openssl? ( gnutls? ( >=net-libs/gnutls-2.12.23-r6:=[${MULTILIB_USEDEP}] ) ) + ) +" + DEPEND="${RDEPEND} >=sys-devel/make-3.81 doc? ( sys-apps/texinfo ) @@ -287,7 +298,7 @@ REQUIRED_USE=" ${GPL_REQUIRED_USE} ${CPU_REQUIRED_USE}" RESTRICT=" - gpl? ( openssl? ( bindist ) fdk? ( bindist ) ) + gpl? ( openssl? ( bindist ) fdk? ( bindist ) libressl? ( bindist ) ) " S=${WORKDIR}/${P/_/-} @@ -312,7 +323,7 @@ multilib_src_configure() { local myconf=( ${EXTRA_FFMPEG_CONF} ) local ffuse=( "${FFMPEG_FLAG_MAP[@]}" ) - use openssl && use gpl && myconf+=( --enable-nonfree ) + use openssl || use libressl && use gpl && myconf+=( --enable-nonfree ) use samba && myconf+=( --enable-version3 ) # Encoders @@ -347,11 +358,10 @@ multilib_src_configure() { myconf+=( $(use_enable ${i%:*} ${i#*:}) ) done - # Incompatible features: openssl and gnutls - # openssl support provides a (strict) superset of gnutls support as of 2017.11.30 - # So, we warn the user and disable gnutls - if use openssl && use gnutls; then - ewarn "openssl and gnutls are mutually exclusive in ${PN}, disabling gnutls since openssl provides more features" + # Incompatible features: openssl or libressl and gnutls + if use libressl ; then + myconf+=( --disable-gnutls --disable-openssl ) + elif use openssl ; then myconf+=( --disable-gnutls ) fi diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest index 89b114ec9255..67de1264aa2f 100644 --- a/media-video/mkvtoolnix/Manifest +++ b/media-video/mkvtoolnix/Manifest @@ -1,6 +1,8 @@ DIST mkvtoolnix-19.0.0.tar.xz 4616780 BLAKE2B 72eb3b1a34bbed0d492098c02c1f60c7ce7f0ea6a8fbff6b88bd9d7af5891dda8c8adb9a0f856c65106fb430b481183ce74b9369590cd4dcfe881d7db84eb06d SHA512 dd18eeffc8a5210ca3c8a287321ad106f63cff8fbe5ad3891460aab7e60f2d5261a3f335f3991524a95724861288593cfb3bd9df6829a2f7751f6a1fdaba0ca6 DIST mkvtoolnix-21.0.0.tar.xz 4682788 BLAKE2B 52d9920fc5b735f7d8af1f6e60828f143a914ce7cd7c635daacb6d2da584b0158f80e0f4d39824130b0c8fcc83b7c3a1215b2e965cb8b47b2b297df2d78414d5 SHA512 881e0c38eee2d36ab9dea5ccaa8ad74e0076cdc13606f873ab58bfeeec09c05e947529d3bad665b1d4df6a816faca30e8a685bc19115f90c18dac3c1ae27c252 +DIST mkvtoolnix-22.0.0.tar.xz 4714712 BLAKE2B 325a0a250db8c6c833b01e6bb613044ca21b4061cbbd516ee6c60388b17c9c3759cf9759af0e2c23091d8044fd86358122e0739bf7d6133be9befca37c6d0294 SHA512 59d299f21d484dc529dafe81a35d3351e4f57abf6a2d8889692d95b9b9ffacdca9b55a3cf373b147f3ff12595590bf98f49af5d22d311b9b2d03f12a4bba00a6 EBUILD mkvtoolnix-19.0.0.ebuild 2549 BLAKE2B f205d940a9fe250d842cfeaffefd389be863556cfbb6d1d2960551c5b16ece35269c9c64f2c110655e38f2cda894c5940bf686fb04602ad997cca05f61ecb0b9 SHA512 e8291ce11ad3871b538ccce78d81e258ff4112098a14587f12a03969a40cec24ddb884a2c9e3c16503ac1272a586e6e61fef8d414c28e9ee526949c97e52124c EBUILD mkvtoolnix-21.0.0-r1.ebuild 2776 BLAKE2B 86398031edf9b7f0a3a4e6f4847e72d2ee9025af58a7ddd524dfad296a15e0b6f79f629f0ddb7ed1ed1cdc629d43d3d74ab4413fcc593e60fb08ddb1ef3b2a2b SHA512 28b5a3406f1f89c2839ed2f859d790c3171740cbff1a871111aeb31a7bedb9df0680cb96c64eb36363af680eb409d1069f5fd9bc33d1840d89ac0b5f6c9f4613 +EBUILD mkvtoolnix-22.0.0.ebuild 2776 BLAKE2B 86398031edf9b7f0a3a4e6f4847e72d2ee9025af58a7ddd524dfad296a15e0b6f79f629f0ddb7ed1ed1cdc629d43d3d74ab4413fcc593e60fb08ddb1ef3b2a2b SHA512 28b5a3406f1f89c2839ed2f859d790c3171740cbff1a871111aeb31a7bedb9df0680cb96c64eb36363af680eb409d1069f5fd9bc33d1840d89ac0b5f6c9f4613 EBUILD mkvtoolnix-9999.ebuild 2776 BLAKE2B 86398031edf9b7f0a3a4e6f4847e72d2ee9025af58a7ddd524dfad296a15e0b6f79f629f0ddb7ed1ed1cdc629d43d3d74ab4413fcc593e60fb08ddb1ef3b2a2b SHA512 28b5a3406f1f89c2839ed2f859d790c3171740cbff1a871111aeb31a7bedb9df0680cb96c64eb36363af680eb409d1069f5fd9bc33d1840d89ac0b5f6c9f4613 MISC metadata.xml 255 BLAKE2B 84855d12acedab301e8e709820ef74f658689209ce914cad2c71d11f4248a7d3356109d93573ed675698031eca1e0b6e0372a61c2a43a9f09840e295f94b74ef SHA512 92b56f4d9c86ad69341e67e8cc74db0bd068e45afdf2f3d3f9ea410fc5e64f3476143b656f2cb3d26b97ae01a967d71766952eba22e2278aab907c20b00ae0e9 diff --git a/media-video/mkvtoolnix/mkvtoolnix-22.0.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-22.0.0.ebuild new file mode 100644 index 000000000000..cc20f8c7ff38 --- /dev/null +++ b/media-video/mkvtoolnix/mkvtoolnix-22.0.0.ebuild @@ -0,0 +1,123 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +inherit toolchain-funcs versionator multiprocessing xdg-utils qmake-utils gnome2-utils + +if [[ ${PV} == "9999" ]] ; then + EGIT_REPO_URI="https://gitlab.com/mbunkus/mkvtoolnix.git" + inherit git-r3 +else + SRC_URI="https://mkvtoolnix.download/sources/${P}.tar.xz" + KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux" +fi + +DESCRIPTION="Tools to create, alter, and inspect Matroska files" +HOMEPAGE="https://mkvtoolnix.download/ https://gitlab.com/mbunkus/mkvtoolnix" + +LICENSE="GPL-2" +SLOT="0" +IUSE="debug pch test qt5" + +# check NEWS.md for build system changes entries for boost/libebml/libmatroska +# version requirement updates and other packaging info +RDEPEND=" + >=dev-libs/boost-1.49.0:= + >=dev-libs/libebml-1.3.5:= + dev-libs/jsoncpp:= + dev-libs/pugixml + media-libs/flac + >=media-libs/libmatroska-1.4.8:= + media-libs/libogg + media-libs/libvorbis + sys-apps/file + sys-libs/zlib + qt5? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5 + dev-qt/qtwidgets:5 + dev-qt/qtconcurrent:5 + dev-qt/qtmultimedia:5 + app-text/cmark + ) +" +DEPEND="${RDEPEND} + dev-ruby/rake + sys-devel/gettext + virtual/pkgconfig + dev-libs/libxslt + app-text/docbook-xsl-stylesheets + app-text/po4a + test? ( dev-cpp/gtest ) +" + +DOCS="AUTHORS NEWS.md README.md" + +pkg_pretend() { + # https://bugs.gentoo.org/419257 + local ver=4.6 + local msg="You need at least GCC ${ver}.x for C++11 range-based 'for' and nullptr support." + if ! version_is_at_least ${ver} $(gcc-version); then + eerror ${msg} + die ${msg} + fi +} + +src_prepare() { + default + [[ ${PV} == "9999" ]] && { ./autogen.sh || die; } +} + +src_configure() { + local myconf + + if use qt5 ; then + # ac/qt5.m4 finds default Qt version set by qtchooser, bug #532600 + myconf+=( + --with-moc=$(qt5_get_bindir)/moc + --with-uic=$(qt5_get_bindir)/uic + --with-rcc=$(qt5_get_bindir)/rcc + --with-qmake=$(qt5_get_bindir)/qmake + ) + fi + + econf \ + $(use_enable debug) \ + $(use_enable qt5 qt) \ + $(usex pch "" --disable-precompiled-headers) \ + "${myconf[@]}" \ + --disable-update-check \ + --disable-optimization \ + --docdir="${EPREFIX}"/usr/share/doc/${PF} \ + --with-boost="${EPREFIX}"/usr \ + --with-boost-libdir="${EPREFIX}"/usr/$(get_libdir) +} + +src_compile() { + rake V=1 -j$(makeopts_jobs) || die +} + +src_test() { + rake V=1 -j$(makeopts_jobs) tests:unit || die + rake V=1 -j$(makeopts_jobs) tests:run_unit || die +} + +src_install() { + DESTDIR="${D}" rake -j$(makeopts_jobs) install || die + + einstalldocs + doman doc/man/*.1 +} + +pkg_postrm() { + xdg_mimeinfo_database_update + xdg_desktop_database_update + gnome2_icon_cache_update +} + +pkg_postinst() { + xdg_mimeinfo_database_update + xdg_desktop_database_update + gnome2_icon_cache_update +} diff --git a/media-video/smplayer/Manifest b/media-video/smplayer/Manifest index 10812ed6ae0c..50d0a0ebbe7c 100644 --- a/media-video/smplayer/Manifest +++ b/media-video/smplayer/Manifest @@ -2,10 +2,8 @@ AUX smplayer-14.9.0.6966-unbundle-qtsingleapplication.patch 566 BLAKE2B bc968335 AUX smplayer-16.4.0-zero-bidi.patch 489 BLAKE2B 50f535154f771e535c244aff2dbd27b60cdbed36f01b4c3f3bf1bd27dbaceb52d41a061aa4d15501c8ae3d0e4bb3adfc2ecd5e0eaee91aa06207738321e7a89a SHA512 acde9545bc1a0659673f6e747291c837ab36b9894bde6d03e419acf579c2f8f581127424dde786496f37308676754319c4f4402f52b620e97a63cdccd1af80d6 AUX smplayer-17.1.0-advertisement_crap.patch 1982 BLAKE2B 22a5027e9d20dca47fed1176e13cd9f8f5c912f51352d07f8fc0dd1f0850dc241483e22524c9fab2b9e20e67d1527f391a791afa2ac96285c4a199801ab96b65 SHA512 7bc1a3e9fb916d3a7e0c4f9bba8bb2adb7a3822e34694f79501e228f700b27633cac2eba237ab4af221c50f07295ecab3093c2a7033578a3e0a91a1e6449570d AUX smplayer-18.2.0-jobserver.patch 423 BLAKE2B 04452fa5992dd2cef5be64dc9a9c78ca775336174dbef69e6054361173886be26d941cabfe2c5b486a05f2b3bee7029b439652d4dfb10e5651a7db68db8b70af SHA512 6bdb6d57be84c1d020c6f2e2f547eda9a0118bfcd0e4d2cdbb940501a0853ec388f359e04a52b8ff9c6c6b38d60f3837ed2c2e127a4df5bf79751486d9ed9ed6 -DIST smplayer-17.11.2.tar.bz2 5033433 BLAKE2B 0fa783172c5b3c68314d656a395db6c953de64057cdf9acc78e4bc448807bc39293ff292183fc167a122f9cf295aac786b52c0465e3d9584c506e1dd9cd73614 SHA512 e0a6e6fc29063b5f82303febdc8243c10276feb4500985e96ce418298c8f10796df44363df3136452a6cb3f8156ebdb4fba3e865a37d433f3d258db493343f81 -DIST smplayer-18.2.2.tar.bz2 5037398 BLAKE2B f1f56885307e423488a75ba7a4421d199c060edcb878a3ef421af9cafbbbd3d451885c5209383f6935c4a5393c3985ac894531a139fa76d478414154038c7f13 SHA512 47ce8dd2b59f182e7826c5e7b8193111889441dc7d5145ed8c4df21137625cbe67da7a991d4121d41453127d1413535efbc0d6197d514a03885d652606610275 DIST smplayer-18.3.0.tar.bz2 5037751 BLAKE2B 74f8b2183dc5cbae212f68ac1c07c3ad28a40ee2119cb1716b4c8d893545ab9139df943b2445103cbb776a8f97a8ac1af0730c9fbacb1e1ad178c411e29ac82b SHA512 cb0ff19c240bf8d92b12b096c9bf627b8365b690a0f9af126f6cda5436e4ed42510a511617fee6edee4cf1fbc79fb04bf05377585bbf93755b784d0471d2d6d4 -EBUILD smplayer-17.11.2.ebuild 3083 BLAKE2B 28ea91680564dd29721212de2084ba86debe81cccc258d4075d39b534526486e55ee94ddda6b9a5ce2ff12fc7d2f985ea6b2ed3b8f9e98b089faba46748b6bca SHA512 a8a9bc7e29d2a2f3a2fa08ea28a762bfe258213980fe2c2057a9ef49d096a62cd1d7e412dd0e82a277a6e4b11539514e717458c773789c747028ea450d5d0a7c -EBUILD smplayer-18.2.2.ebuild 3163 BLAKE2B 2a698b9c5b1c3ea4ab7a3d61a9096c40ed1ba025d9c4d826234fc829485aa55d9ac58d8b76f4cf04cd9381ba6b4f48f3f5dc5d5805235c29a247fcc90d9a8b5b SHA512 91248eee763671e595ae262cdd4bd7af13d2587904bc19424c215db9d84f33dea7002c15414f3aa74f2c5e0c92fe2d3661df641a45202fe7fe9f827cbc98226e -EBUILD smplayer-18.3.0.ebuild 3163 BLAKE2B 2a698b9c5b1c3ea4ab7a3d61a9096c40ed1ba025d9c4d826234fc829485aa55d9ac58d8b76f4cf04cd9381ba6b4f48f3f5dc5d5805235c29a247fcc90d9a8b5b SHA512 91248eee763671e595ae262cdd4bd7af13d2587904bc19424c215db9d84f33dea7002c15414f3aa74f2c5e0c92fe2d3661df641a45202fe7fe9f827cbc98226e +DIST smplayer-18.4.0.tar.bz2 5051804 BLAKE2B 6aea3eb570e4073d5deeca432c4e453ef6dee8e01c00651434f49bed924d750b8b90fe0cbb4a226f5322c18349f2ea75aff573485d3602af280cbee94d93500d SHA512 17d533465e841adbd94af24410bf0cf03fefcc8f5902577a54d3296bbe60b82cf295879b1b5d5407ef191b1609060e95dfe300f857b5d25bd970941a1be3d111 +EBUILD smplayer-18.3.0.ebuild 3161 BLAKE2B d0b0c42c86c69dda82e4c4227ef58572590ef23945ecbc4966cd218322922eb8e52a16b3b0dcb238ac428fb2dbcf7d97c50468af91db4f3048d285be8e823af8 SHA512 bfe19fc290ee23541938d0101ff58fd9f282a8e8a115a6aeaca53acd842792c68aac6ce39bb40a3c4cb9291d6f6bd8d01af2ffcff847d76a3975df5685888beb +EBUILD smplayer-18.4.0.ebuild 3163 BLAKE2B 2a698b9c5b1c3ea4ab7a3d61a9096c40ed1ba025d9c4d826234fc829485aa55d9ac58d8b76f4cf04cd9381ba6b4f48f3f5dc5d5805235c29a247fcc90d9a8b5b SHA512 91248eee763671e595ae262cdd4bd7af13d2587904bc19424c215db9d84f33dea7002c15414f3aa74f2c5e0c92fe2d3661df641a45202fe7fe9f827cbc98226e MISC metadata.xml 886 BLAKE2B 93069f16c27051f346dfd71113b7998f84c09efc7b1b7ad05600f82712e1693368a99bd51e4833cb8ec5c6433ec41f002370e564a2f67aace9e65fea14ce7653 SHA512 e82489ac4436ddbecd44783d694f1056a8a40b278ef941faa236079ad4cfdf0d542cee8c73b7ae1492efe76c2cac31c6a641e2187e01a1210d4b5cd519a839f4 diff --git a/media-video/smplayer/smplayer-17.11.2.ebuild b/media-video/smplayer/smplayer-17.11.2.ebuild deleted file mode 100644 index 3610468fd601..000000000000 --- a/media-video/smplayer/smplayer-17.11.2.ebuild +++ /dev/null @@ -1,132 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PLOCALES="am ar_SY ar bg ca cs da de el en_GB en en_US es et eu fa fi fr gl -he_IL hr hu id it ja ka ko ku lt mk ms_MY nl nn_NO pl pt_BR pt ro_RO ru_RU -sk sl_SI sq_AL sr sv th tr uk_UA uz vi_VN zh_CN zh_TW" -PLOCALE_BACKUP="en_US" - -inherit gnome2-utils l10n qmake-utils xdg-utils - -DESCRIPTION="Great Qt GUI front-end for mplayer/mpv" -HOMEPAGE="http://www.smplayer.eu/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" - -LICENSE="GPL-2+ BSD-2" -SLOT="0" -KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux" -IUSE="autoshutdown bidi debug mpris" - -COMMON_DEPEND=" - dev-qt/qtcore:5 - dev-qt/qtgui:5= - dev-qt/qtnetwork:5[ssl] - dev-qt/qtscript:5 - dev-qt/qtsingleapplication[X,qt5] - dev-qt/qtwidgets:5 - dev-qt/qtxml:5 - sys-libs/zlib - autoshutdown? ( dev-qt/qtdbus:5 ) - mpris? ( dev-qt/qtdbus:5 ) -" -DEPEND="${COMMON_DEPEND} - dev-qt/linguist-tools:5 -" -RDEPEND="${COMMON_DEPEND} - || ( - media-video/mplayer[bidi?,libass,png,X] - ( - >=media-video/mpv-0.15.0[libass,X] - >=net-misc/youtube-dl-2014.11.26 - ) - ) -" - -PATCHES=( - "${FILESDIR}/${PN}-14.9.0.6966-unbundle-qtsingleapplication.patch" # bug 487544 - "${FILESDIR}/${PN}-17.1.0-advertisement_crap.patch" -) - -src_prepare() { - use bidi || PATCHES+=( "${FILESDIR}"/${PN}-16.4.0-zero-bidi.patch ) - - default - - # Upstream Makefile sucks - sed -i -e "/^PREFIX=/ s:/usr/local:${EPREFIX}/usr:" \ - -e "/^DOC_PATH=/ s:packages/smplayer:${PF}:" \ - -e '/\.\/get_svn_revision\.sh/,+2c\ - cd src && $(DEFS) $(MAKE)' \ - Makefile || die - - # Turn off online update checker, bug #479902 - sed -e 's:DEFINES += UPDATE_CHECKER:#&:' \ - -e 's:DEFINES += CHECK_UPGRADED:#&:' \ - -i src/smplayer.pro || die - - # Turn off intrusive share widget - sed -e 's:DEFINES += SHARE_WIDGET:#&:' \ - -i src/smplayer.pro || die - - # Toggle autoshutdown option which pulls in dbus, bug #524392 - if ! use autoshutdown ; then - sed -e 's:DEFINES += AUTO_SHUTDOWN_PC:#&:' \ - -i src/smplayer.pro || die - fi - - # Turn debug message flooding off - if ! use debug ; then - sed -e 's:#\(DEFINES += NO_DEBUG_ON_CONSOLE\):\1:' \ - -i src/smplayer.pro || die - fi - - # MPRIS2 pulls in dbus, bug #553710 - if ! use mpris ; then - sed -e 's:DEFINES += MPRIS2:#&:' \ - -i src/smplayer.pro || die - fi - - # Commented out because it gives false positives - #l10n_find_plocales_changes "${S}"/src/translations ${PN}_ .ts -} - -src_configure() { - cd src || die - eqmake5 -} - -gen_translation() { - local mydir="$(qt5_get_bindir)" - - ebegin "Generating $1 translation" - "${mydir}"/lrelease ${PN}_${1}.ts - eend $? || die "failed to generate $1 translation" -} - -src_compile() { - default - - cd src/translations || die - l10n_for_each_locale_do gen_translation -} - -src_install() { - # remove unneeded copies of the GPL - rm -f Copying* docs/*/gpl.html || die - # don't install empty dirs - rmdir --ignore-fail-on-non-empty docs/* || die - - default -} - -pkg_postinst() { - xdg_desktop_database_update - gnome2_icon_cache_update -} - -pkg_postrm() { - xdg_desktop_database_update - gnome2_icon_cache_update -} diff --git a/media-video/smplayer/smplayer-18.3.0.ebuild b/media-video/smplayer/smplayer-18.3.0.ebuild index 27c383e46b9f..d8ae8f1fe3c6 100644 --- a/media-video/smplayer/smplayer-18.3.0.ebuild +++ b/media-video/smplayer/smplayer-18.3.0.ebuild @@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" LICENSE="GPL-2+ BSD-2" SLOT="0" -KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux" +KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux" IUSE="autoshutdown bidi debug mpris" COMMON_DEPEND=" diff --git a/media-video/smplayer/smplayer-18.2.2.ebuild b/media-video/smplayer/smplayer-18.4.0.ebuild index 27c383e46b9f..27c383e46b9f 100644 --- a/media-video/smplayer/smplayer-18.2.2.ebuild +++ b/media-video/smplayer/smplayer-18.4.0.ebuild diff --git a/media-video/subliminal/Manifest b/media-video/subliminal/Manifest index 98f0339bbb3f..9d1f5996db58 100644 --- a/media-video/subliminal/Manifest +++ b/media-video/subliminal/Manifest @@ -1,6 +1,6 @@ AUX subliminal-2.0.5-add-missing-comma.patch 1196 BLAKE2B 1042b22bf4c6f488ada97c628d98c79e6733816ffe094af9ae45be632edfd0547086911fd3e2154cc13c5ca609bb436a3d73f6825bd8242074be323cee969192 SHA512 82cabee6a7bdc701f73e7115edc975fbde8f0008dff2e4dcf7fcb27b9203dc9efd42b54aa31a632501e3e3ed405638fcb3fb273eff4bf19cbc8085d710d3763b DIST matroska_test_w1_1.zip 184550509 BLAKE2B f111725aa08267661942072c2d4ac019d3d322c4e933aad10afb3aa6f69bb3469114c4400d161e53d8a7618b818b22465177460003804a7ac3e69fa4f4db000d SHA512 f170a8e83dab15228f992b3692330163da2402b8e436c7fa195ac1ecc06cf1eaf1a48d8c99a85c031122c158c2d4006023aae75d5b7805385ba25a6d601cb78f DIST subliminal-2.0.5-r1.tar.gz 4442435 BLAKE2B ea2139bd61344d6a0cb4b48a2b75cbfd29905adc81bca25a332443725fff80bc03b58704d0e6289d44ddc26104e15744f67acb7e0e4eafae584098b02fb4c007 SHA512 b0f99c6b2fa6bc3860c86592bb428c7b4b34836df7a619b19d69b15532a68b4d05369f724131e120d4b390bd91f430aea442aef72ebc00ae8e3d31a457925eec -EBUILD subliminal-2.0.5-r1.ebuild 2389 BLAKE2B 5c538500f21ebaca6df9c1cb23d735d7c733940703ed3247f8abeec51e91e02261376aa5ea3db89fb7751f7c44fd12c3e512f52fef177432e68d6885ba829c4f SHA512 5fe4340181ef24e6df3c861e2b2634b4082061c375096fcd9c63967df7f57ab083947eafe48daa3e7a2caa8995fb1d1f34c805c6019ac69f884ecb57a36b226a -EBUILD subliminal-9999.ebuild 2200 BLAKE2B 26af25404e515d43198db94f13940e1507ae03059a1d29c2d552454b3efc3d6bb37d88339004b606fdfc5cc3e923a736da98cb5013970fbda11f9e33e1ad7208 SHA512 caf8bc3fc7c7c7a5e0deba5e7c0b41cb88c22c1e8f9697a07bd6c40ef6c6a0ed70f9b1e83e7b1149697690860e1a4385314da20127b5a5df9e86c091dff72290 +EBUILD subliminal-2.0.5-r1.ebuild 2390 BLAKE2B 2bf409c62bd16060d4f300f3b39f4e1ae764487589ae9393966134674efe22ca1a97512167d314c115caf073e03eb84be4c7c5568ec10d017d700762d75823dd SHA512 1791ffa5c66ccda423407d32d827c8b192bff2096fbe2804f2a3de5f0a3efeebc36983011473adca8e3895377ddf0d6058c5160bd2686861607ab3cddb06e182 +EBUILD subliminal-9999.ebuild 2201 BLAKE2B 81b8221d442dbb4aef44e69d07c519a5a09e4d451ad96ad0dfd11bec6ce1d985ee98276ae8f6bd8621ceeaae6acc0a4f4fc76392b4aadb5b2dd08b401f468667 SHA512 a5badb96a49668df898c0143e4967c04b8411fbb8f5d2c669722351825cb55540ae1919fa666a299f271d57709511eb0cd9904191ca5d7b15a5550cdc9d009da MISC metadata.xml 549 BLAKE2B 296a55c59aad7c1d33e65258eaa0481ed167e1c78fa4fa8273acf83366c7b9365f30136ed7d0ad1b71bbde76aa4d0c5e3da98f375be9ad20b76ee77c835d6947 SHA512 cccd163878caccdee339a2e19f9cd5b0954477e767284c4183f9e589c0b5fe59353dfec14982e6dea83d91fc2f2d66904f8f40a1e69c7abab4a6d6baabfdc0c4 diff --git a/media-video/subliminal/subliminal-2.0.5-r1.ebuild b/media-video/subliminal/subliminal-2.0.5-r1.ebuild index 4173429f438b..d17857af0c50 100644 --- a/media-video/subliminal/subliminal-2.0.5-r1.ebuild +++ b/media-video/subliminal/subliminal-2.0.5-r1.ebuild @@ -10,7 +10,7 @@ COMMIT_ID='dd74383d1cba82829ce720f2e439a65d13ffe7ef' inherit distutils-r1 vcs-snapshot DESCRIPTION="Python library to search and download subtitles" -HOMEPAGE="https://github.com/Diaoul/subliminal https://pypi.org/project/subliminal" +HOMEPAGE="https://github.com/Diaoul/subliminal https://pypi.org/project/subliminal/" SRC_URI=" https://github.com/Diaoul/${PN}/archive/${COMMIT_ID}.tar.gz -> ${PF}.tar.gz test? ( mirror://sourceforge/matroska/test_files/matroska_test_w1_1.zip ) diff --git a/media-video/subliminal/subliminal-9999.ebuild b/media-video/subliminal/subliminal-9999.ebuild index 00acf627be88..b79e7028e0d3 100644 --- a/media-video/subliminal/subliminal-9999.ebuild +++ b/media-video/subliminal/subliminal-9999.ebuild @@ -9,7 +9,7 @@ PYTHON_REQ_USE='xml(+)' inherit distutils-r1 git-r3 DESCRIPTION="Python library to search and download subtitles" -HOMEPAGE="https://github.com/Diaoul/subliminal https://pypi.org/project/subliminal" +HOMEPAGE="https://github.com/Diaoul/subliminal https://pypi.org/project/subliminal/" EGIT_REPO_URI="https://github.com/Diaoul/${PN}.git" EGIT_BRANCH="develop" SRC_URI="test? ( mirror://sourceforge/matroska/test_files/matroska_test_w1_1.zip )" diff --git a/media-video/syncplay/Manifest b/media-video/syncplay/Manifest index 1506210e9844..aafcd1790d68 100644 --- a/media-video/syncplay/Manifest +++ b/media-video/syncplay/Manifest @@ -1,6 +1,6 @@ DIST syncplay-1.5.0.tar.gz 1588514 BLAKE2B 0f2bddf3500758c3081bdba993b21fe60a0d3af7081c5edd0f684e1d60a2a95edce133a597e79747350e681dd40768226226f0b26e295850a8c218107b1da3e9 SHA512 8a57add8a845c041c02147415fc4b7941a41edfb80fc037c3af4e246d9ca6391be9f3886407470b1b51b8783ad6306e42bb34991e7cbb08eea87e781e3cd2200 DIST syncplay-1.5.1.tar.gz 1603524 BLAKE2B 0d7edb0c2129f67ce457cffb57f5600d0c0d6bee017119efc866d748f63e6e984becd21f88324e19dcac3f0ce52e2e2f1bf65326aab6237ea41b04bdecf26334 SHA512 8d7f99132b49148003dcdc83b5afc3158ebd7ad0b8a161229f8f576e7683e3c432d09793db071239e6344490f6e08d01c9061a32556b5bce6dcd68823b47a0cf EBUILD syncplay-1.5.0.ebuild 1357 BLAKE2B 15add1759de81a51cfc21114825a6bef6cbcceb3f7b6b61ec318a2e9e921f6fdd15decfe7437a2399171720bf8e5831b392cce681200da40b325ed4e1f017a1e SHA512 decf80d28781f046bb5a12493d7dce2c9dbc2a8822446810302b38f3793aeaefc11a029e5cc70c0d17337b6598ba586eb4db97b28acb653c1c8a9349f0371c38 -EBUILD syncplay-1.5.1.ebuild 1390 BLAKE2B 0c6e190237edff9d4095fe4e9118f4d891c6ea4e3346db9a8499e2845cdae5db29a9945c3f9f3167438ae66e0d61e1097ccfc68f74130ef210f3fcd8cdec6251 SHA512 25392de3038e6ceebe77fae8f94ab15b9cc60a6bc473db734436c50a9515f24abbc5606d632c46dc52725c9dad70b8918eb1aaeb978a06ceebd5206c5ec41fce +EBUILD syncplay-1.5.1.ebuild 1397 BLAKE2B 0a8546bdcde3fb4e4acc16f431e91a26cab79d707c190c3d676af7892488d9cab91da329a8ddef0de85f31c2e9ec0d9906199fb64b321a5b6daaba3cc6a03cf0 SHA512 753611aeb237dbe03d37e14dfb7cbfe9f245df8af251ac6719aec75dad35454fce08737956d69e5267eb3e19c10c76c2fa1c8808acb39368808a572b6fee5821 EBUILD syncplay-9999.ebuild 1309 BLAKE2B 44afeec124a7651cc0ade3508372679986ec734065a29f02200a7c08a07adf8428c00b61994dc08a748837641621c85a855126fc0222545677c61c5a6e4ad9d7 SHA512 20927635cf3f40ff0be4c4150c894e2e7b5093b2b0504a3ff0fe0abc6dbe9809a52e445593f06c8a97c3249b7c6fc53a215b7afe9bb1cb2df75a4fe10cdc8ddb MISC metadata.xml 679 BLAKE2B fcbe4ddf714fa5ddd358c8ec03e4b0df2e201971ba0a6fea15e58b05ae3f22f510f332bd946c5021f0efcd087fae0cd31165663bcc974d3eae56b48a2175b4c3 SHA512 e997de8e604c16977c8a3dec989c50e9cbfba327e8447277bdaee835e442d77565c2b2092bede04e64babe34f62e1fcd640cc01d6ef56d4c7572bacb1718b714 diff --git a/media-video/syncplay/syncplay-1.5.1.ebuild b/media-video/syncplay/syncplay-1.5.1.ebuild index 00a24344bbf1..1261425ad26b 100644 --- a/media-video/syncplay/syncplay-1.5.1.ebuild +++ b/media-video/syncplay/syncplay-1.5.1.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://github.com/Syncplay/syncplay/archive/v${PV}.tar.gz -> ${P}.tar. LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64 x86" +KEYWORDS="~amd64 ~ppc64 x86" IUSE="+client +server gui vlc" REQUIRED_USE="vlc? ( client ) gui? ( client ) diff --git a/media-video/transcode/Manifest b/media-video/transcode/Manifest index a2ff9f19e53a..1e181584573c 100644 --- a/media-video/transcode/Manifest +++ b/media-video/transcode/Manifest @@ -1,4 +1,5 @@ +AUX ffmpeg4.patch 28911 BLAKE2B f1189589a39ea9801e1620bd138499f5f5a29429cc7372ebf65b38901f1f4f0b71957a216a65367108660709ea5ca001e5ce68d67dfd478ed471963acef087a3 SHA512 1550b2de1ca0265703513d3b7fca3441f6216d89792dc68e224f5f2d99386275cdfdf7ef7b01abaf69f5de5d9af1f221617697aff6345d3d1b2e5a06d30e1f6d DIST transcode-1.1.7-patchset.tar.bz2 16379 BLAKE2B fbdc188bffeb8751814abfa7e119a1053e482f194bc1b87a721c48e2b66e107df146d38b3ea11a88d066c49d8862489b88b74f61fa36ce3f8a1a782da3762615 SHA512 bedc82aa4fbc17774e34d8fc24799d70b8460c6c1dd728549bcaa5c387492f56e520674fdf8bb976c0b5fcc9ccefb765f2ee26816e0d2b96a83402a21cee3f6d DIST transcode-1.1.7.tar.bz2 2183627 BLAKE2B 25001d4cae83d86e5295917bcd9e2e77dd61637e238394a2d603398baf810201dc61d8b0de5b54a7b8848ac3bcef5fb211e8f2b43ed7da4e56e335b8d4d2fbe1 SHA512 d6f9674f3f5c3346194120585741ca660eb9ee133085cfce9460a14eaa0cf16fdf291761bd1db78e1c784e4d69a9481c7470cf8357dc7638ee3017620500f45f -EBUILD transcode-1.1.7-r3.ebuild 4071 BLAKE2B 8a8bf3f3dd1a0a7ee347facbe3e0c9c20af5eea792f93479e1ec944ebb9d2243cfcfde99f8d94be6e8d2a638270b1065a8158a608ed3bc9e6584e611db2c5576 SHA512 b4ee2af0eed3e432e82b844e06cd6beac7843df0f872c0581758bee35c882609647d1e53db2b8af4b1605a92d1881df92d8ee7588a74b5a4999f7209202f0726 +EBUILD transcode-1.1.7-r3.ebuild 4168 BLAKE2B c599aa76e0b63849fbddf3cafbe246180731be2f15d7fbea23beb825096c3dc5c3afba82b13da16daf316295dce413c7a3bc95dd1abe78875ea4fa7c2097b524 SHA512 9df69b4525f4e0343cb5ce73e3815f4f48a09eb08d64633e4c9aac629959032458f9711f43382892a487387b2659989a97ad877fdf0645f474738d99f1867b12 MISC metadata.xml 619 BLAKE2B fa440f0f00bd7afe2834108078f48dc93dfe5ea38d343587267e2b45f4c4187762fdf16e1f023e4fc3af69d181ec77cbedec4a39df98eb8d4a098b98248c7b56 SHA512 043d39001850f8088e33e7277a579af7cb45b6fd2b3fe4483eb7771340dae8eab14927184f0fab9aedc8934a6d2599ce6231726308079d0ae16e7710f826ad1b diff --git a/media-video/transcode/files/ffmpeg4.patch b/media-video/transcode/files/ffmpeg4.patch new file mode 100644 index 000000000000..9ad765e1c37d --- /dev/null +++ b/media-video/transcode/files/ffmpeg4.patch @@ -0,0 +1,508 @@ +Index: transcode-1.1.7/encode/encode_lavc.c +=================================================================== +--- transcode-1.1.7.orig/encode/encode_lavc.c ++++ transcode-1.1.7/encode/encode_lavc.c +@@ -77,6 +77,13 @@ struct tclavcconfigdata_ { + int luma_elim_threshold; + int chroma_elim_threshold; + int quantizer_noise_shaping; ++ int inter_quant_bias; ++ int intra_quant_bias; ++ int scenechange_factor; ++ int rc_strategy; ++ float rc_initial_cplx; ++ float rc_qsquish; ++ float border_masking; + + /* same as above for flags */ + struct { +@@ -684,7 +691,7 @@ static int tc_lavc_init_multipass(TCLavc + switch (vob->divxmultipass) { + case 1: + CAN_DO_MULTIPASS(multipass_flag); +- pd->ff_vcontext.flags |= CODEC_FLAG_PASS1; ++ pd->ff_vcontext.flags |= AV_CODEC_FLAG_PASS1; + pd->stats_file = fopen(vob->divxlogfile, "w"); + if (pd->stats_file == NULL) { + tc_log_error(MOD_NAME, "could not create 2pass log file" +@@ -694,7 +701,7 @@ static int tc_lavc_init_multipass(TCLavc + break; + case 2: + CAN_DO_MULTIPASS(multipass_flag); +- pd->ff_vcontext.flags |= CODEC_FLAG_PASS2; ++ pd->ff_vcontext.flags |= AV_CODEC_FLAG_PASS2; + pd->stats_file = fopen(vob->divxlogfile, "r"); + if (pd->stats_file == NULL){ + tc_log_error(MOD_NAME, "could not open 2pass log file \"%s\"" +@@ -723,7 +730,7 @@ static int tc_lavc_init_multipass(TCLavc + break; + case 3: + /* fixed qscale :p */ +- pd->ff_vcontext.flags |= CODEC_FLAG_QSCALE; ++ pd->ff_vcontext.flags |= AV_CODEC_FLAG_QSCALE; + pd->ff_venc_frame.quality = vob->divxbitrate; + break; + } +@@ -970,7 +977,7 @@ static void tc_lavc_config_defaults(TCLa + pd->confdata.rc_buffer_size = 0; + pd->confdata.lmin = 2; + pd->confdata.lmax = 31; +- pd->confdata.me_method = ME_EPZS; ++ pd->confdata.me_method = 0; + + memset(&pd->confdata.flags, 0, sizeof(pd->confdata.flags)); + pd->confdata.turbo_setup = 0; +@@ -983,12 +990,12 @@ static void tc_lavc_config_defaults(TCLa + pd->ff_vcontext.me_range = 0; + pd->ff_vcontext.mb_decision = 0; + pd->ff_vcontext.scenechange_threshold = 0; +- pd->ff_vcontext.scenechange_factor = 1; ++ pd->confdata.scenechange_factor = 1; + pd->ff_vcontext.b_frame_strategy = 0; + pd->ff_vcontext.b_sensitivity = 40; + pd->ff_vcontext.brd_scale = 0; + pd->ff_vcontext.bidir_refine = 0; +- pd->ff_vcontext.rc_strategy = 2; ++ pd->confdata.rc_strategy = 2; + pd->ff_vcontext.b_quant_factor = 1.25; + pd->ff_vcontext.i_quant_factor = 0.8; + pd->ff_vcontext.b_quant_offset = 1.25; +@@ -996,8 +1003,8 @@ static void tc_lavc_config_defaults(TCLa + pd->ff_vcontext.qblur = 0.5; + pd->ff_vcontext.qcompress = 0.5; + pd->ff_vcontext.mpeg_quant = 0; +- pd->ff_vcontext.rc_initial_cplx = 0.0; +- pd->ff_vcontext.rc_qsquish = 1.0; ++ pd->confdata.rc_initial_cplx = 0.0; ++ pd->confdata.rc_qsquish = 1.0; + pd->confdata.luma_elim_threshold = 0; + pd->confdata.chroma_elim_threshold = 0; + pd->ff_vcontext.strict_std_compliance = 0; +@@ -1008,7 +1015,7 @@ static void tc_lavc_config_defaults(TCLa + pd->ff_vcontext.temporal_cplx_masking = 0.0; + pd->ff_vcontext.spatial_cplx_masking = 0.0; + pd->ff_vcontext.p_masking = 0.0; +- pd->ff_vcontext.border_masking = 0.0; ++ pd->confdata.border_masking = 0.0; + pd->ff_vcontext.me_pre_cmp = 0; + pd->ff_vcontext.me_cmp = 0; + pd->ff_vcontext.me_sub_cmp = 0; +@@ -1020,8 +1027,6 @@ static void tc_lavc_config_defaults(TCLa + pd->ff_vcontext.pre_me = 1; + pd->ff_vcontext.me_subpel_quality = 8; + pd->ff_vcontext.refs = 1; +- pd->ff_vcontext.intra_quant_bias = FF_DEFAULT_QUANT_BIAS; +- pd->ff_vcontext.inter_quant_bias = FF_DEFAULT_QUANT_BIAS; + pd->ff_vcontext.noise_reduction = 0; + pd->confdata.quantizer_noise_shaping = 0; + pd->ff_vcontext.flags = 0; +@@ -1044,19 +1049,19 @@ static void tc_lavc_config_defaults(TCLa + */ + static void tc_lavc_dispatch_settings(TCLavcPrivateData *pd) + { ++ char buf[1024]; + /* some translation... */ + pd->ff_vcontext.bit_rate_tolerance = pd->confdata.vrate_tolerance * 1000; + pd->ff_vcontext.rc_min_rate = pd->confdata.rc_min_rate * 1000; + pd->ff_vcontext.rc_max_rate = pd->confdata.rc_max_rate * 1000; + pd->ff_vcontext.rc_buffer_size = pd->confdata.rc_buffer_size * 1024; +- pd->ff_vcontext.lmin = (int)(FF_QP2LAMBDA * pd->confdata.lmin + 0.5); +- pd->ff_vcontext.lmax = (int)(FF_QP2LAMBDA * pd->confdata.lmax + 0.5); +- pd->ff_vcontext.me_method = ME_ZERO + pd->confdata.me_method; ++ snprintf(buf, sizeof(buf), "%i", (int)(FF_QP2LAMBDA * pd->confdata.lmin + 0.5)); ++ av_dict_set(&(pd->ff_opts), "lmin", buf, 0); ++ snprintf(buf, sizeof(buf), "%i", (int)(FF_QP2LAMBDA * pd->confdata.lmax + 0.5)); ++ av_dict_set(&(pd->ff_opts), "lmax", buf, 0); + + pd->ff_vcontext.flags = 0; +- SET_FLAG(pd, mv0); + SET_FLAG(pd, qpel); +- SET_FLAG(pd, naq); + SET_FLAG(pd, ilme); + SET_FLAG(pd, ildct); + SET_FLAG(pd, aic); +@@ -1077,8 +1082,8 @@ static void tc_lavc_dispatch_settings(TC + } + if (pd->interlacing.active) { + /* enforce interlacing */ +- pd->ff_vcontext.flags |= CODEC_FLAG_INTERLACED_DCT; +- pd->ff_vcontext.flags |= CODEC_FLAG_INTERLACED_ME; ++ pd->ff_vcontext.flags |= AV_CODEC_FLAG_INTERLACED_DCT; ++ pd->ff_vcontext.flags |= AV_CODEC_FLAG_INTERLACED_ME; + } + if (pd->confdata.flags.alt) { + av_dict_set(&(pd->ff_opts), "alternate_scan", "1", 0); +@@ -1095,15 +1100,31 @@ static void tc_lavc_dispatch_settings(TC + if (pd->confdata.flags.cbp) { + av_dict_set(&(pd->ff_opts), "mpv_flags", "+cbp_rd", 0); + } ++ if (pd->confdata.flags.mv0) { ++ av_dict_set(&(pd->ff_opts), "mpv_flags", "+mv0", 0); ++ } ++ if (pd->confdata.flags.naq) { ++ av_dict_set(&(pd->ff_opts), "mpv_flags", "+naq", 0); ++ } + +- char buf[1024]; + #define set_dict_opt(val, opt) \ + snprintf(buf, sizeof(buf), "%i", pd->confdata.val);\ + av_dict_set(&(pd->ff_opts), opt, buf, 0) ++#define set_dict_float_opt(val, opt) \ ++ snprintf(buf, sizeof(buf), "%f", pd->confdata.val);\ ++ av_dict_set(&(pd->ff_opts), opt, buf, 0) + + set_dict_opt(luma_elim_threshold, "luma_elim_threshold"); + set_dict_opt(chroma_elim_threshold, "chroma_elim_threshold"); + set_dict_opt(quantizer_noise_shaping, "quantizer_noise_shaping"); ++ set_dict_opt(inter_quant_bias, "pbias"); ++ set_dict_opt(intra_quant_bias, "ibias"); ++ set_dict_opt(me_method, "me_method"); ++ set_dict_opt(scenechange_factor, "sc_factor"); ++ set_dict_opt(rc_strategy, "rc_strategy"); ++ set_dict_float_opt(rc_initial_cplx, "rc_init_cplx"); ++ set_dict_float_opt(rc_qsquish, "qsquish"); ++ set_dict_float_opt(border_masking, "border_mask"); + } + + #undef SET_FLAG +@@ -1159,12 +1180,12 @@ static int tc_lavc_read_config(TCLavcPri + { "lmin", PAUX(lmin), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.01, 255.0 }, + { "lmax", PAUX(lmax), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.01, 255.0 }, + { "vqdiff", PCTX(max_qdiff), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31 }, +- { "vmax_b_frames", PCTX(max_b_frames), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, FF_MAX_B_FRAMES }, ++ { "vmax_b_frames", PCTX(max_b_frames), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, INT_MAX }, + { "vme", PAUX(me_method), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 16, }, + { "me_range", PCTX(me_range), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 16000 }, + { "mbd", PCTX(mb_decision), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 3 }, + { "sc_threshold", PCTX(scenechange_threshold), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -1000000, 1000000 }, +- { "sc_factor", PCTX(scenechange_factor), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 16 }, ++ { "sc_factor", PAUX(scenechange_factor), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 16 }, + { "vb_strategy", PCTX(b_frame_strategy), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 10 }, + { "b_sensitivity", PCTX(b_sensitivity), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 100 }, + { "brd_scale", PCTX(brd_scale), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 10 }, +@@ -1175,7 +1196,7 @@ static int tc_lavc_read_config(TCLavcPri + { "vrc_maxrate", PAUX(rc_max_rate), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 24000000 }, + { "vrc_minrate", PAUX(rc_min_rate), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 24000000 }, + { "vrc_buf_size", PAUX(rc_buffer_size), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 4, 24000000 }, +- { "vrc_strategy", PCTX(rc_strategy), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2 }, ++ { "vrc_strategy", PAUX(rc_strategy), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2 }, + { "vb_qfactor", PCTX(b_quant_factor), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, -31.0, 31.0 }, + { "vi_qfactor", PCTX(i_quant_factor), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, -31.0, 31.0 }, + { "vb_qoffset", PCTX(b_quant_offset), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 31.0 }, +@@ -1185,9 +1206,9 @@ static int tc_lavc_read_config(TCLavcPri + { "mpeg_quant", PCTX(mpeg_quant), TCCONF_TYPE_FLAG, 0, 0, 1 }, + // { "vrc_eq", }, // not yet supported + { "vrc_override", rc_override_buf, TCCONF_TYPE_STRING, 0, 0, 0 }, +- { "vrc_init_cplx", PCTX(rc_initial_cplx), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 9999999.0 }, ++ { "vrc_init_cplx", PAUX(rc_initial_cplx), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 9999999.0 }, + // { "vrc_init_occupancy", }, // not yet supported +- { "vqsquish", PCTX(rc_qsquish), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 99.0 }, ++ { "vqsquish", PAUX(rc_qsquish), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 99.0 }, + { "vlelim", PAUX(luma_elim_threshold), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99 }, + { "vcelim", PAUX(chroma_elim_threshold), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99 }, + { "vstrict", PCTX(strict_std_compliance), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99 }, +@@ -1199,7 +1220,7 @@ static int tc_lavc_read_config(TCLavcPri + { "tcplx_mask", PCTX(temporal_cplx_masking), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 1.0 }, + { "scplx_mask", PCTX(spatial_cplx_masking), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 1.0 }, + { "p_mask", PCTX(p_masking), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 1.0 }, +- { "border_mask", PCTX(border_masking), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 1.0 }, ++ { "border_mask", PAUX(border_masking), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 1.0 }, + { "pred", PCTX(prediction_method), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 4 }, + { "precmp", PCTX(me_pre_cmp), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2000 }, + { "cmp", PCTX(me_cmp), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2000 }, +@@ -1212,37 +1233,37 @@ static int tc_lavc_read_config(TCLavcPri + { "pre_me", PCTX(pre_me), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2000}, + { "subq", PCTX(me_subpel_quality), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 8 }, + { "refs", PCTX(refs), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 8 }, +- { "ibias", PCTX(intra_quant_bias), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512 }, +- { "pbias", PCTX(inter_quant_bias), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512 }, ++ { "ibias", PAUX(intra_quant_bias), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512 }, ++ { "pbias", PAUX(inter_quant_bias), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512 }, + { "nr", PCTX(noise_reduction), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 1000000}, + { "qns", PAUX(quantizer_noise_shaping), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 3 }, + { "inter_matrix_file", inter_matrix_file, TCCONF_TYPE_STRING, 0, 0, 0 }, + { "intra_matrix_file", intra_matrix_file, TCCONF_TYPE_STRING, 0, 0, 0 }, + +- { "mv0", PAUX(flags.mv0), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_MV0 }, ++ { "mv0", PAUX(flags.mv0), TCCONF_TYPE_FLAG, 0, 0, 1 }, + { "cbp", PAUX(flags.cbp), TCCONF_TYPE_FLAG, 0, 0, 1 }, +- { "qpel", PAUX(flags.qpel), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_QPEL }, ++ { "qpel", PAUX(flags.qpel), TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_QPEL }, + { "alt", PAUX(flags.alt), TCCONF_TYPE_FLAG, 0, 0, 1 }, +- { "ilme", PAUX(flags.ilme), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_INTERLACED_ME }, +- { "ildct", PAUX(flags.ildct), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_INTERLACED_DCT }, +- { "naq", PAUX(flags.naq), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_NORMALIZE_AQP }, ++ { "ilme", PAUX(flags.ilme), TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_INTERLACED_ME }, ++ { "ildct", PAUX(flags.ildct), TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_INTERLACED_DCT }, ++ { "naq", PAUX(flags.naq), TCCONF_TYPE_FLAG, 0, 0, 1 }, + { "vdpart", PAUX(flags.vdpart), TCCONF_TYPE_FLAG, 0, 0, 1 }, + #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) + { "aic", PAUX(flags.aic), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_H263P_AIC }, + #else +- { "aic", PAUX(flags.aic), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_AC_PRED }, ++ { "aic", PAUX(flags.aic), TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_AC_PRED }, + #endif + { "aiv", PAUX(flags.aiv), TCCONF_TYPE_FLAG, 0, 0, 1 }, + { "umv", PAUX(flags.umv), TCCONF_TYPE_FLAG, 0, 0, 1 }, +- { "psnr", PAUX(flags.psnr), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_PSNR }, ++ { "psnr", PAUX(flags.psnr), TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_PSNR }, + #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) + { "trell", PAUX(flags.trell), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_TRELLIS_QUANT }, + #else + { "trell", PCTX(trellis), TCCONF_TYPE_FLAG, 0, 0, 1 }, + #endif +- { "gray", PAUX(flags.gray), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_GRAY }, +- { "v4mv", PAUX(flags.v4mv), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_4MV }, +- { "closedgop", PAUX(flags.closedgop), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_CLOSED_GOP }, ++ { "gray", PAUX(flags.gray), TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_GRAY }, ++ { "v4mv", PAUX(flags.v4mv), TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_4MV }, ++ { "closedgop", PAUX(flags.closedgop), TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_CLOSED_GOP }, + + // { "turbo", PAUX(turbo_setup), TCCONF_TYPE_FLAG, 0, 0, 1 }, // not yet supported + /* End of the config file */ +Index: transcode-1.1.7/export/export_ffmpeg.c +=================================================================== +--- transcode-1.1.7.orig/export/export_ffmpeg.c ++++ transcode-1.1.7/export/export_ffmpeg.c +@@ -831,14 +831,11 @@ MOD_init + + lavc_venc_context->bit_rate = vob->divxbitrate * 1000; + lavc_venc_context->bit_rate_tolerance = lavc_param_vrate_tolerance * 1000; +- lavc_venc_context->lmin= (int)(FF_QP2LAMBDA * lavc_param_lmin + 0.5); +- lavc_venc_context->lmax= (int)(FF_QP2LAMBDA * lavc_param_lmax + 0.5); + lavc_venc_context->max_qdiff = lavc_param_vqdiff; + lavc_venc_context->qcompress = lavc_param_vqcompress; + lavc_venc_context->qblur = lavc_param_vqblur; + lavc_venc_context->max_b_frames = lavc_param_vmax_b_frames; + lavc_venc_context->b_quant_factor = lavc_param_vb_qfactor; +- lavc_venc_context->rc_strategy = lavc_param_vrc_strategy; + lavc_venc_context->b_frame_strategy = lavc_param_vb_strategy; + lavc_venc_context->b_quant_offset = lavc_param_vb_qoffset; + +@@ -846,8 +843,23 @@ MOD_init + #define set_dict_opt(val, opt) \ + snprintf(buf, sizeof(buf), "%i", val); \ + av_dict_set(&lavc_venc_opts, opt, buf, 0) ++#define set_dict_float_opt(val, opt) \ ++ snprintf(buf, sizeof(buf), "%f", val); \ ++ av_dict_set(&lavc_venc_opts, opt, buf, 0) + set_dict_opt(lavc_param_luma_elim_threshold, "luma_elim_threshold"); + set_dict_opt(lavc_param_chroma_elim_threshold, "chroma_elim_threshold"); ++ set_dict_opt((int)(FF_QP2LAMBDA * lavc_param_lmin + 0.5), "lmin"); ++ set_dict_opt((int)(FF_QP2LAMBDA * lavc_param_lmax + 0.5), "lmax"); ++ set_dict_opt(lavc_param_vrc_strategy, "rc_strategy"); ++ set_dict_float_opt(lavc_param_rc_qsquish, "qsquish"); ++ set_dict_float_opt(lavc_param_rc_qmod_amp, "rc_qmod_amp"); ++ set_dict_opt(lavc_param_rc_qmod_freq, "rc_qmod_freq"); ++ set_dict_opt(lavc_param_rc_eq, "rc_eq"); ++ set_dict_opt(lavc_param_vme, "me_method"); ++ set_dict_opt(lavc_param_ibias, "ibias"); ++ set_dict_opt(lavc_param_pbias, "pbias"); ++ set_dict_float_opt(lavc_param_rc_buffer_aggressivity, "rc_buf_aggressivity"); ++ set_dict_float_opt(lavc_param_rc_initial_cplx, "rc_init_cplx"); + lavc_venc_context->rtp_payload_size = lavc_param_packet_size; + #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) + if (lavc_param_packet_size) +@@ -856,15 +868,9 @@ MOD_init + lavc_venc_context->strict_std_compliance= lavc_param_strict; + lavc_venc_context->i_quant_factor = lavc_param_vi_qfactor; + lavc_venc_context->i_quant_offset = lavc_param_vi_qoffset; +- lavc_venc_context->rc_qsquish = lavc_param_rc_qsquish; +- lavc_venc_context->rc_qmod_amp = lavc_param_rc_qmod_amp; +- lavc_venc_context->rc_qmod_freq = lavc_param_rc_qmod_freq; +- lavc_venc_context->rc_eq = lavc_param_rc_eq; + lavc_venc_context->rc_max_rate = lavc_param_rc_max_rate * 1000; + lavc_venc_context->rc_min_rate = lavc_param_rc_min_rate * 1000; + lavc_venc_context->rc_buffer_size = lavc_param_rc_buffer_size * 1024; +- lavc_venc_context->rc_buffer_aggressivity= lavc_param_rc_buffer_aggressivity; +- lavc_venc_context->rc_initial_cplx = lavc_param_rc_initial_cplx; + lavc_venc_context->debug = lavc_param_debug; + lavc_venc_context->last_predictor_count= lavc_param_last_pred; + lavc_venc_context->pre_me = lavc_param_pre_me; +@@ -872,8 +878,6 @@ MOD_init + lavc_venc_context->pre_dia_size = lavc_param_pre_dia_size; + lavc_venc_context->me_subpel_quality = lavc_param_me_subpel_quality; + lavc_venc_context->me_range = lavc_param_me_range; +- lavc_venc_context->intra_quant_bias = lavc_param_ibias; +- lavc_venc_context->inter_quant_bias = lavc_param_pbias; + lavc_venc_context->coder_type = lavc_param_coder; + lavc_venc_context->context_model = lavc_param_context; + lavc_venc_context->scenechange_threshold= lavc_param_sc_threshold; +@@ -1079,6 +1083,8 @@ MOD_init + lavc_venc_context->flags |= lavc_param_mv0; + if(lavc_param_qp_rd) + av_dict_set(&lavc_venc_opts, "mpv_flags", "+qp_rd", 0); ++ if (lavc_param_normalize_aqp) ++ av_dict_set(&lavc_venc_opts, "mpv_flags", "+naq", 0); + lavc_venc_context->flags |= lavc_param_ilme; + #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) + lavc_venc_context->flags |= lavc_param_trell; +@@ -1087,9 +1093,7 @@ MOD_init + #endif + + if (lavc_param_gray) +- lavc_venc_context->flags |= CODEC_FLAG_GRAY; +- if (lavc_param_normalize_aqp) +- lavc_venc_context->flags |= CODEC_FLAG_NORMALIZE_AQP; ++ lavc_venc_context->flags |= AV_CODEC_FLAG_GRAY; + + switch(vob->encode_fields) { + case TC_ENCODE_FIELDS_TOP_FIRST: +@@ -1107,9 +1111,9 @@ MOD_init + } + + lavc_venc_context->flags |= interlacing_active ? +- CODEC_FLAG_INTERLACED_DCT : 0; ++ AV_CODEC_FLAG_INTERLACED_DCT : 0; + lavc_venc_context->flags |= interlacing_active ? +- CODEC_FLAG_INTERLACED_ME : 0; ++ AV_CODEC_FLAG_INTERLACED_ME : 0; + + lavc_venc_context->flags |= lavc_param_psnr; + do_psnr = lavc_param_psnr; +@@ -1156,7 +1160,7 @@ MOD_init + "encoding."); + return TC_EXPORT_ERROR; + } +- lavc_venc_context->flags |= CODEC_FLAG_PASS1; ++ lavc_venc_context->flags |= AV_CODEC_FLAG_PASS1; + stats_file = fopen(vob->divxlogfile, "w"); + if (stats_file == NULL){ + tc_log_warn(MOD_NAME, "Could not create 2pass log file \"%s\".", +@@ -1170,7 +1174,7 @@ MOD_init + "encoding."); + return TC_EXPORT_ERROR; + } +- lavc_venc_context->flags |= CODEC_FLAG_PASS2; ++ lavc_venc_context->flags |= AV_CODEC_FLAG_PASS2; + stats_file= fopen(vob->divxlogfile, "r"); + if (stats_file==NULL){ + tc_log_warn(MOD_NAME, "Could not open 2pass log file \"%s\" for " +@@ -1201,12 +1205,11 @@ MOD_init + break; + case 3: + /* fixed qscale :p */ +- lavc_venc_context->flags |= CODEC_FLAG_QSCALE; ++ lavc_venc_context->flags |= AV_CODEC_FLAG_QSCALE; + lavc_venc_frame->quality = vob->divxbitrate; + break; + } + +- lavc_venc_context->me_method = ME_ZERO + lavc_param_vme; + + /* FIXME: transcode itself contains "broken ffmpeg default settings", thus we need to override them! */ + if (lavc_param_video_preset && strcmp(lavc_param_video_preset, "none")) { +Index: transcode-1.1.7/export/ffmpeg_cfg.c +=================================================================== +--- transcode-1.1.7.orig/export/ffmpeg_cfg.c ++++ transcode-1.1.7/export/ffmpeg_cfg.c +@@ -93,8 +93,8 @@ int lavc_param_last_pred= 0; + int lavc_param_pre_me= 1; + int lavc_param_me_subpel_quality= 8; + int lavc_param_me_range=0; +-int lavc_param_ibias=FF_DEFAULT_QUANT_BIAS; +-int lavc_param_pbias=FF_DEFAULT_QUANT_BIAS; ++int lavc_param_ibias=0; ++int lavc_param_pbias=0; + int lavc_param_coder=0; + int lavc_param_context=0; + char *lavc_param_intra_matrix = NULL; +@@ -136,7 +136,7 @@ TCConfigEntry lavcopts_conf[]={ + {"vratetol", &lavc_param_vrate_tolerance, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 4, 24000000}, + {"vhq", &lavc_param_mb_decision, TCCONF_TYPE_FLAG, 0, 0, 1}, + {"mbd", &lavc_param_mb_decision, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 9}, +- {"v4mv", &lavc_param_v4mv, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_4MV}, ++ {"v4mv", &lavc_param_v4mv, TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_4MV}, + {"vme", &lavc_param_vme, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 5}, + // {"vqscale", &lavc_param_vqscale, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31}, + // {"vqmin", &lavc_param_vqmin, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31}, +@@ -147,7 +147,7 @@ TCConfigEntry lavcopts_conf[]={ + {"vqcomp", &lavc_param_vqcompress, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 1.0}, + {"vqblur", &lavc_param_vqblur, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 1.0}, + {"vb_qfactor", &lavc_param_vb_qfactor, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, -31.0, 31.0}, +- {"vmax_b_frames", &lavc_param_vmax_b_frames, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, FF_MAX_B_FRAMES}, ++ {"vmax_b_frames", &lavc_param_vmax_b_frames, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, INT_MAX}, + // {"vpass", &lavc_param_vpass, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2}, + {"vrc_strategy", &lavc_param_vrc_strategy, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2}, + {"vb_strategy", &lavc_param_vb_strategy, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 10}, +@@ -158,7 +158,7 @@ TCConfigEntry lavcopts_conf[]={ + {"vstrict", &lavc_param_strict, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99}, + {"vdpart", &lavc_param_data_partitioning, TCCONF_TYPE_FLAG, 0, 0, 1}, + // {"keyint", &lavc_param_keyint, TCCONF_TYPE_INT, 0, 0, 0}, +- {"gray", &lavc_param_gray, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_GRAY}, ++ {"gray", &lavc_param_gray, TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_GRAY}, + {"mpeg_quant", &lavc_param_mpeg_quant, TCCONF_TYPE_FLAG, 0, 0, 1}, + {"vi_qfactor", &lavc_param_vi_qfactor, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, -31.0, 31.0}, + {"vi_qoffset", &lavc_param_vi_qoffset, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 31.0}, +@@ -184,7 +184,7 @@ TCConfigEntry lavcopts_conf[]={ + {"pred", &lavc_param_prediction_method, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 20}, + {"format", &lavc_param_format, TCCONF_TYPE_STRING, 0, 0, 0}, + {"debug", &lavc_param_debug, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 100000000}, +- {"psnr", &lavc_param_psnr, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_PSNR}, ++ {"psnr", &lavc_param_psnr, TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_PSNR}, + {"precmp", &lavc_param_me_pre_cmp, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2000}, + {"cmp", &lavc_param_me_cmp, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2000}, + {"subcmp", &lavc_param_me_sub_cmp, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2000}, +@@ -192,9 +192,9 @@ TCConfigEntry lavcopts_conf[]={ + {"ildctcmp", &lavc_param_ildct_cmp, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2000}, + {"predia", &lavc_param_pre_dia_size, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -2000, 2000}, + {"dia", &lavc_param_dia_size, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -2000, 2000}, +- {"qpel", &lavc_param_qpel, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_QPEL}, ++ {"qpel", &lavc_param_qpel, TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_QPEL}, + #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) +- {"trell", &lavc_param_trell, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_TRELLIS_QUANT}, ++ {"trell", &lavc_param_trell, TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_TRELLIS_QUANT}, + #else + {"trell", &lavc_param_trell, TCCONF_TYPE_FLAG, 0, 0, 1}, + #endif +@@ -203,9 +203,9 @@ TCConfigEntry lavcopts_conf[]={ + {"subq", &lavc_param_me_subpel_quality, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 8}, + {"me_range", &lavc_param_me_range, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 16000}, + #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) +- {"aic", &lavc_param_aic, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_H263P_AIC}, ++ {"aic", &lavc_param_aic, TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_H263P_AIC}, + #else +- {"aic", &lavc_param_aic, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_AC_PRED}, ++ {"aic", &lavc_param_aic, TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_AC_PRED}, + #endif + {"umv", &lavc_param_umv, TCCONF_TYPE_FLAG, 0, 0, 1}, + {"ibias", &lavc_param_ibias, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512}, +@@ -215,20 +215,20 @@ TCConfigEntry lavcopts_conf[]={ + {"intra_matrix", &lavc_param_intra_matrix, TCCONF_TYPE_STRING, 0, 0, 0}, + {"inter_matrix", &lavc_param_inter_matrix, TCCONF_TYPE_STRING, 0, 0, 0}, + {"cbp", &lavc_param_cbp, TCCONF_TYPE_FLAG, 0, 0, 1}, +- {"mv0", &lavc_param_mv0, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_MV0}, ++ {"mv0", &lavc_param_mv0, TCCONF_TYPE_FLAG, 0, 0, 1}, + {"nr", &lavc_param_noise_reduction, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 1000000}, + {"qprd", &lavc_param_qp_rd, TCCONF_TYPE_FLAG, 0, 0, 1}, + {"threads", &lavc_param_threads, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 16}, + {"ss", &lavc_param_ss, TCCONF_TYPE_FLAG, 0, 0, 1}, + {"svcd_sof", &lavc_param_scan_offset, TCCONF_TYPE_FLAG, 0, 0, 1}, + {"alt", &lavc_param_alt, TCCONF_TYPE_FLAG, 0, 0, 1}, +- {"ilme", &lavc_param_ilme, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_INTERLACED_ME}, ++ {"ilme", &lavc_param_ilme, TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_INTERLACED_ME}, + {"inter_threshold", &lavc_param_inter_threshold, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -1000000, 1000000}, + {"sc_threshold", &lavc_param_sc_threshold, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -1000000, 1000000}, + {"top", &lavc_param_top, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -1, 1}, +- {"gmc", &lavc_param_gmc, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_GMC}, +- {"trunc", &lavc_param_trunc, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_TRUNCATED}, +- {"closedgop", &lavc_param_closedgop, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_CLOSED_GOP}, ++ {"gmc", &lavc_param_gmc, TCCONF_TYPE_FLAG, 0, 0, 1}, ++ {"trunc", &lavc_param_trunc, TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_TRUNCATED}, ++ {"closedgop", &lavc_param_closedgop, TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_CLOSED_GOP}, + {"intra_dc_precision", &lavc_param_intra_dc_precision, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 16}, + {"skip_top", &lavc_param_skip_top, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 1000}, + {"skip_bottom", &lavc_param_skip_bottom, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 1000}, +Index: transcode-1.1.7/import/import_ffmpeg.c +=================================================================== +--- transcode-1.1.7.orig/import/import_ffmpeg.c ++++ transcode-1.1.7/import/import_ffmpeg.c +@@ -361,7 +361,7 @@ do_avi: + lavc_dec_context->width = x_dim; + lavc_dec_context->height = y_dim; + +- if (vob->decolor) lavc_dec_context->flags |= CODEC_FLAG_GRAY; ++ if (vob->decolor) lavc_dec_context->flags |= AV_CODEC_FLAG_GRAY; + #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) + lavc_dec_context->error_resilience = 2; + #else diff --git a/media-video/transcode/transcode-1.1.7-r3.ebuild b/media-video/transcode/transcode-1.1.7-r3.ebuild index a5df574512db..f39c9c64c642 100644 --- a/media-video/transcode/transcode-1.1.7-r3.ebuild +++ b/media-video/transcode/transcode-1.1.7-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -78,6 +78,10 @@ src_prepare() { PATCHES+=( "${WORKDIR}"/${P}-patchset/${P}-imagemagick7.patch ) fi + if has_version '>=media-video/ffmpeg-4' ; then + PATCHES+=( "${FILESDIR}/ffmpeg4.patch" ) + fi + default eautoreconf |