From 3cf7c3ef441822c889356fd1812ebf2944a59851 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Tue, 25 Aug 2020 10:45:55 +0100
Subject: gentoo resync : 25.08.2020

---
 .../files/avidemux-core-2.7.3-permissions.patch    | 28 ----------------------
 .../files/avidemux-core-2.7.6-ffmpeg-flags.patch   |  8 +++++++
 2 files changed, 8 insertions(+), 28 deletions(-)
 delete mode 100644 media-libs/avidemux-core/files/avidemux-core-2.7.3-permissions.patch
 create mode 100644 media-libs/avidemux-core/files/avidemux-core-2.7.6-ffmpeg-flags.patch

(limited to 'media-libs/avidemux-core/files')

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
-- 
cgit v1.2.3