diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2020-08-25 10:45:55 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2020-08-25 10:45:55 +0100 |
| commit | 3cf7c3ef441822c889356fd1812ebf2944a59851 (patch) | |
| tree | c513fe68548b40365c1c2ebfe35c58ad431cdd77 /media-libs/avidemux-core | |
| parent | 05b8b0e0af1d72e51a3ee61522941bf7605cd01c (diff) | |
gentoo resync : 25.08.2020
Diffstat (limited to 'media-libs/avidemux-core')
| -rw-r--r-- | media-libs/avidemux-core/Manifest | 6 | ||||
| -rw-r--r-- | media-libs/avidemux-core/avidemux-core-2.7.6.ebuild (renamed from media-libs/avidemux-core/avidemux-core-2.7.3-r1.ebuild) | 24 | ||||
| -rw-r--r-- | media-libs/avidemux-core/files/avidemux-core-2.7.3-permissions.patch | 28 | ||||
| -rw-r--r-- | media-libs/avidemux-core/files/avidemux-core-2.7.6-ffmpeg-flags.patch | 8 |
4 files changed, 29 insertions, 37 deletions
diff --git a/media-libs/avidemux-core/Manifest b/media-libs/avidemux-core/Manifest index 0cd58db5ad44..24c1f5e05a3f 100644 --- a/media-libs/avidemux-core/Manifest +++ b/media-libs/avidemux-core/Manifest @@ -1,6 +1,6 @@ -AUX avidemux-core-2.7.3-permissions.patch 1079 BLAKE2B 64e4b1718ef91051253b0d09a69acbd11fb2467d48a62443b4ccd2ca89feee454d1ed35542c49fbf94c217397bd363e6aefc6a3bf13498af9a57eb6fdf32b5ba SHA512 d9c316b76cedd2119a3fdae1810846358f7addf21258021ba896f0e1dd7d68d27db5f7e97b53e284806482334ccd016833a2f8b24f50cddd28ac6cfdf28dfce3 -DIST avidemux-2.7.3.tar.gz 23772654 BLAKE2B f946c267140bc8aebda2ce027ed8cb7c84a98a401255d3e0cdaf7498680e8bd9c78a33c122cb177d397ed2dd6bc3c29d7508578028c2964c2897279bf860b62d SHA512 d7761de1c40de1b824efbcf24173ea738a2e0ba7fa41cefa09e7bac3ec97f3af4b04201e36f9de50ade2b09e394aa99ed1d4907f90bb132f9896e8f1b5e82d7a +AUX avidemux-core-2.7.6-ffmpeg-flags.patch 303 BLAKE2B 9b8a1f14bb7ce12c48f96f732228fb97783e8dd79a9e7f8fa4913a1536f93f0eb384c92946816e78f65ba5cb31a062de95992069d43bc5f28468d017d39a2bcb SHA512 25d41f677c71a76528f2b09ff06643a38cf04de6c32c8c4f272ace7043d373670abbf85cf7219a2a3f65d23f9eba314fdecf1938b9550f6b916b25711a95aea2 DIST avidemux-2.7.4.tar.gz 23815808 BLAKE2B 3a7206f04f568f28dd4d5116c580dd780b057a59e94dd61a2abe5dadfa557291a0c50f917ad1926f9f9a82d01af065c06138f954320e2d9c174fda7583a6b265 SHA512 36d857837cd6a74039a414df16367cd8cbf615173bcc531e57dc0dbfc2e002b1c0c4a80cef73a0d8f25d305deca809af0b5cbcdbad8c311324fa2e64381fd10b -EBUILD avidemux-core-2.7.3-r1.ebuild 2265 BLAKE2B 6d1b909ce168db29a92bb68939afa888dda302be61202cfcd2041fd43754b6f4769cb22634aa25ef8dd9bcebf90b1931462bdf10bd10095c081fbe4d2193fd38 SHA512 3a94343262b771030e57447ffb16abd849b4d48beda52d646cddc1a1ce5efa8e4e8644a1d2d7cdb78da23298cb8525ff8ea2bc51f8f21ff75bd692efddb74902 +DIST avidemux-2.7.6.tar.gz 21963753 BLAKE2B 6ca343f90c37844ebfd61123badccefb7327cbf500723c031257cf26500a5b6d98955568c2a9c0d182af68f162e878459a51e6049485937f9b01b4439b32e5e0 SHA512 bc60c733168d40d5b39cc7dd1f74b3f1315e9727302478ef1621e18748bad3400bcfd4d5199862c3093ad9df51385b6b2a96f0f8fedf9bf1c00060327545fb0f EBUILD avidemux-core-2.7.4-r1.ebuild 2202 BLAKE2B d045271402de0011830182fa76a50d8b58f35d4857391d6d7c7168ea0d3452e922876a991852713e2e79ce8f85d5a60bf52d2cea82f72ba3306b13597ececfc2 SHA512 af39b9372a05c1785f2badc702cc1d4487eb8d9db597745c0f84f1cf86ba3986d63f929d175e74018221e2a13da028bb26fa7edcf3146be24638f5c4e5aeccf9 +EBUILD avidemux-core-2.7.6.ebuild 2568 BLAKE2B 6f0109c9a19488d145ed383304a1a83a5a53fd5db64e94f221fd4e843a1c9fdc4321e65aef3755a91b7beeb549017424b5d1ffd580dc7c9b22cb5cc176f3faf5 SHA512 4a63d66563f311cceb314353d265013b6dfac33cf6db2e1196b48644ba784354bed8a62cc291780ffa4d12d67bb5af780aa7741af1c23f7020616e3ae2c3f8b0 MISC metadata.xml 569 BLAKE2B 19e9f892bf6e5c63f2054dfd44beef6b394fcdeecbb2e91edf01e7e9370b7a32c21529ad566921d46992f14d00943ac69e5f0f55cff8406d48ee84dc6515619c SHA512 58e100ccdc3e1145703d4feef2776bdf4ccfcc44dc9e04f1e79f5ea1b89f6ae59c386794028328f27d8715cd00abb410cb6970f1b72c1646750babf742fe3270 diff --git a/media-libs/avidemux-core/avidemux-core-2.7.3-r1.ebuild b/media-libs/avidemux-core/avidemux-core-2.7.6.ebuild index 1b987f4d1e1d..ac6eace06eb4 100644 --- a/media-libs/avidemux-core/avidemux-core-2.7.3-r1.ebuild +++ b/media-libs/avidemux-core/avidemux-core-2.7.6.ebuild @@ -5,7 +5,7 @@ EAPI=7 CMAKE_MAKEFILE_GENERATOR="emake" -inherit cmake +inherit cmake toolchain-funcs DESCRIPTION="Core libraries for simple video cutting, filtering and encoding tasks" HOMEPAGE="http://fixounet.free.fr/avidemux" @@ -36,11 +36,11 @@ BDEPEND="virtual/pkgconfig !system-ffmpeg? ( dev-lang/yasm[nls=] ) " +PATCHES=( "${FILESDIR}"/avidemux-core-2.7.6-ffmpeg-flags.patch ) + S="${WORKDIR}/avidemux2-${PV}" CMAKE_USE_DIR="${S}/${PN/-/_}" -PATCHES=( "${FILESDIR}"/${P}-permissions.patch ) - src_prepare() { cmake_src_prepare @@ -55,6 +55,20 @@ src_prepare() { -i avidemux/commonCmakeApplication.cmake || die "${error}" sed -e 's/include(admFFmpegBuild)//g' \ -i avidemux_core/CMakeLists.txt || die "${error}" + else + local ffmpeg_args=( + --cc=$(tc-getCC) + --cxx=$(tc-getCXX) + --ar=$(tc-getAR) + --nm=$(tc-getNM) + --ranlib=$(tc-getRANLIB) + "--optflags='${CFLAGS}'" + ) + + sed -i \ + -e "s/@@GENTOO_FFMPEG_FLAGS@@/${ffmpeg_args[*]}/" \ + cmake/ffmpeg_configure.sh.cmake \ + || die fi } @@ -72,9 +86,7 @@ src_configure() { -DXVIDEO="$(usex xv)" ) - if use debug ; then - mycmakeargs+=( -DVERBOSE=1 -DADM_DEBUG=1 ) - fi + use debug && mycmakeargs+=( -DVERBOSE=1 -DADM_DEBUG=1 ) cmake_src_configure } diff --git a/media-libs/avidemux-core/files/avidemux-core-2.7.3-permissions.patch b/media-libs/avidemux-core/files/avidemux-core-2.7.3-permissions.patch deleted file mode 100644 index 0f8ee21632e5..000000000000 --- a/media-libs/avidemux-core/files/avidemux-core-2.7.3-permissions.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 7c5c267987b90cf0b61ca98e9f8b6db2c0cdb84f Mon Sep 17 00:00:00 2001 -From: Stefan Strogin <steils@gentoo.org> -Date: Wed, 14 Aug 2019 03:35:01 +0300 -Subject: [PATCH] [cmake] Fix library permissions - -Upstream-Status: Submitted -[https://github.com/mean00/avidemux2/pull/179] -Signed-off-by: Stefan Strogin <steils@gentoo.org> ---- - cmake/admInstallDir.cmake | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/cmake/admInstallDir.cmake b/cmake/admInstallDir.cmake -index ab16f283d..5af762626 100644 ---- a/cmake/admInstallDir.cmake -+++ b/cmake/admInstallDir.cmake -@@ -55,7 +55,7 @@ ENDMACRO(ADM_INSTALL_LIB ) - MACRO (ADM_INSTALL_LIB_FILES files) - INSTALL(FILES ${files} - DESTINATION ${AVIDEMUX_LIB_DIR} -- PERMISSIONS WORLD_READ WORLD_EXECUTE OWNER_WRITE OWNER_READ OWNER_EXECUTE -+ PERMISSIONS WORLD_READ WORLD_EXECUTE GROUP_READ GROUP_EXECUTE OWNER_WRITE OWNER_READ OWNER_EXECUTE - COMPONENT runtime - ) - ENDMACRO (ADM_INSTALL_LIB_FILES) --- -2.22.0 - diff --git a/media-libs/avidemux-core/files/avidemux-core-2.7.6-ffmpeg-flags.patch b/media-libs/avidemux-core/files/avidemux-core-2.7.6-ffmpeg-flags.patch new file mode 100644 index 000000000000..48e58be6d28f --- /dev/null +++ b/media-libs/avidemux-core/files/avidemux-core-2.7.6-ffmpeg-flags.patch @@ -0,0 +1,8 @@ +--- a/cmake/ffmpeg_configure.sh.cmake ++++ b/cmake/ffmpeg_configure.sh.cmake +@@ -1,2 +1,2 @@ + export PATH=${FF_ENV_PATH}:$PATH
+-${FFMPEG_SOURCE_DIR}/configure ${FFMPEG_FLAGS} +\ No newline at end of file ++${FFMPEG_SOURCE_DIR}/configure ${FFMPEG_FLAGS} @@GENTOO_FFMPEG_FLAGS@@ +\ No newline at end of file |