* [gentoo-commits] repo/gentoo:master commit in: media-libs/avidemux-core/files/, media-libs/avidemux-core/
@ 2017-06-23 5:58 Alexis Ballier
0 siblings, 0 replies; 4+ messages in thread
From: Alexis Ballier @ 2017-06-23 5:58 UTC (permalink / raw
To: gentoo-commits
commit: 0b9deda9488d7ea978a43f5cf3d49c4319468af6
Author: Peter Levine <plevine457 <AT> gmail <DOT> com>
AuthorDate: Mon May 29 03:38:43 2017 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Fri Jun 23 05:35:34 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b9deda9
media-libs/avidemux-core: Fix building with GCC-6
Bug: https://bugs.gentoo.org/show_bug.cgi?id=594902
Package-Manager: Portage-2.3.6, Repoman-2.3.2
.../avidemux-core/avidemux-core-2.6.8.ebuild | 3 +-
.../files/avidemux-core-2.6.8-gcc6.patch | 50 ++++++++++++++++++++++
2 files changed, 52 insertions(+), 1 deletion(-)
diff --git a/media-libs/avidemux-core/avidemux-core-2.6.8.ebuild b/media-libs/avidemux-core/avidemux-core-2.6.8.ebuild
index 713066eac7f..f7dde42a475 100644
--- a/media-libs/avidemux-core/avidemux-core-2.6.8.ebuild
+++ b/media-libs/avidemux-core/avidemux-core-2.6.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -53,6 +53,7 @@ DEPEND="
S="${WORKDIR}/${MY_P}"
BUILD_DIR="${S}/buildCore"
+PATCHES=( "${FILESDIR}"/${P}-gcc6.patch )
DOCS=( AUTHORS README )
src_prepare() {
diff --git a/media-libs/avidemux-core/files/avidemux-core-2.6.8-gcc6.patch b/media-libs/avidemux-core/files/avidemux-core-2.6.8-gcc6.patch
new file mode 100644
index 00000000000..dbdf8ff93a8
--- /dev/null
+++ b/media-libs/avidemux-core/files/avidemux-core-2.6.8-gcc6.patch
@@ -0,0 +1,50 @@
+--- a/avidemux_core/ADM_coreUtils/src/prefs.cpp
++++ b/avidemux_core/ADM_coreUtils/src/prefs.cpp
+@@ -44,8 +44,8 @@
+ const char *name2;
+ ADM_paramType type;
+ const char *defaultValue;
+- float min;
+- float max;
++ double min;
++ double max;
+ }optionDesc;
+
+ #include "prefs2_pref.h"
+--- a/avidemux_core/ADM_coreAudio/src/ADM_audioStreamBuffered.cpp
++++ b/avidemux_core/ADM_coreAudio/src/ADM_audioStreamBuffered.cpp
+@@ -46,7 +46,7 @@
+ // By construction, the error should be minimal
+ if(newDts!=ADM_AUDIO_NO_DTS)
+ {
+- if( abs(newDts-lastDts)>ADM_MAX_SKEW)
++ if( labs((int64_t)newDts-lastDts)>ADM_MAX_SKEW)
+ {
+ printf("[AudioStream] Warning skew in dts =%"PRId64", \n",(int64_t)newDts-(uint64_t)lastDts);
+ printf("[AudioStream] Warning skew lastDts=%s \n",ADM_us2plain(lastDts));
+--- a/avidemux_core/ADM_coreVideoCodec/src/ADM_ffmp43.cpp
++++ b/avidemux_core/ADM_coreVideoCodec/src/ADM_ffmp43.cpp
+@@ -30,19 +30,19 @@
+ #define WRAP_Open_Template(funcz,argz,display,codecid) \
+ {\
+ AVCodec *codec=funcz(argz);\
+-if(!codec) {GUI_Error_HIG("Codec",QT_TR_NOOP("Internal error finding codec"display));ADM_assert(0);} \
++if(!codec) {GUI_Error_HIG("Codec",QT_TR_NOOP("Internal error finding codec" display));ADM_assert(0);} \
+ codecId=codecid; \
+ _context->workaround_bugs=1*FF_BUG_AUTODETECT +0*FF_BUG_NO_PADDING; \
+ _context->error_concealment=3; \
+ if (avcodec_open(_context, codec) < 0) \
+ { \
+- printf("[lavc] Decoder init: "display" video decoder failed!\n"); \
+- GUI_Error_HIG("Codec","Internal error opening "display); \
++ printf("[lavc] Decoder init: " display " video decoder failed!\n"); \
++ GUI_Error_HIG("Codec","Internal error opening " display); \
+ ADM_assert(0); \
+ } \
+ else \
+ { \
+- printf("[lavc] Decoder init: "display" video decoder initialized! (%s)\n",codec->long_name); \
++ printf("[lavc] Decoder init: " display " video decoder initialized! (%s)\n",codec->long_name); \
+ } \
+ }
+
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/avidemux-core/files/, media-libs/avidemux-core/
@ 2017-10-29 9:34 Andreas Sturmlechner
0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2017-10-29 9:34 UTC (permalink / raw
To: gentoo-commits
commit: a5d748fe480198bbef91213212d99fa36c4d0c08
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 28 22:58:26 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Oct 29 09:34:20 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5d748fe
media-libs/avidemux-core: Drop 2.6.8
Package-Manager: Portage-2.3.13, Repoman-2.3.4
media-libs/avidemux-core/Manifest | 1 -
.../avidemux-core/avidemux-core-2.6.8.ebuild | 111 ---------------------
.../files/avidemux-core-2.6.8-gcc6.patch | 50 ----------
3 files changed, 162 deletions(-)
diff --git a/media-libs/avidemux-core/Manifest b/media-libs/avidemux-core/Manifest
index 6f017f59f92..4bf6be8c5b5 100644
--- a/media-libs/avidemux-core/Manifest
+++ b/media-libs/avidemux-core/Manifest
@@ -1,2 +1 @@
DIST avidemux_2.6.20.tar.gz 20172362 SHA256 03c6cb7fc9eb74688b4fcd5eb654ed7b9c4ffc717a72cc09b08a2d10cdc7ef9f SHA512 d01d0fc24a3004770bd3923c2debc4fa2752eb71df08cfe423746b9c44a2562ca01d82965ed2563b99572a4bed8034b79487199ce330208b51a3b7f87ccf7103 WHIRLPOOL 2e2dc21bed49eeb0cdfefe75fe51f6a84226e7e8e80b063bc0b3d8711a6b91db710611dc0ec06575be69ec8e24f2f9e5b5eb363b9c095267729e85e162a4ce38
-DIST avidemux_2.6.8.tar.gz 17380534 SHA256 02998c235a89894d184d745c94cac37b78bc20e9eb44b318ee2bb83f2507e682 SHA512 57a4042f1a9d46462850871d36950215c5ffb5b66ce2f2cde09d747e946c05adb7a550ac7763c96f4c1bcb2c39881407d9d88bc64c93053741091751495ba0b0 WHIRLPOOL 29f8a6039d82e686e8dfbfc7b23658921834238a4cc6c4de338afdfdc032a9a7cba1c8236789aa6dbcab318ec14c344c19563f153e6cbd63cd265c5fb15b44b6
diff --git a/media-libs/avidemux-core/avidemux-core-2.6.8.ebuild b/media-libs/avidemux-core/avidemux-core-2.6.8.ebuild
deleted file mode 100644
index c47717b8c3d..00000000000
--- a/media-libs/avidemux-core/avidemux-core-2.6.8.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit cmake-utils eutils flag-o-matic
-
-SLOT="2.6"
-
-DESCRIPTION="Core libraries for a video editor designed for simple cutting, filtering and encoding tasks"
-HOMEPAGE="http://fixounet.free.fr/avidemux"
-
-# Multiple licenses because of all the bundled stuff.
-LICENSE="GPL-1 GPL-2 MIT PSF-2 public-domain"
-IUSE="debug nls sdl system-ffmpeg vaapi vdpau video_cards_fglrx xv"
-KEYWORDS="~amd64 ~x86"
-
-MY_PN="${PN/-core/}"
-if [[ ${PV} == *9999* ]] ; then
- KEYWORDS=""
- EGIT_REPO_URI="https://github.com/mean00/avidemux2.git"
-
- inherit git-2
-else
- MY_P="${MY_PN}_${PV}"
- SRC_URI="mirror://sourceforge/${MY_PN}/${MY_PN}/${PV}/${MY_P}.tar.gz"
-fi
-
-# Trying to use virtual; ffmpeg misses aac,cpudetection USE flags now though, are they needed?
-DEPEND="
- !<media-video/avidemux-${PV}:${SLOT}
- dev-db/sqlite:3
- sdl? ( media-libs/libsdl:0 )
- system-ffmpeg? ( >=virtual/ffmpeg-9:0[mp3,theora] )
- xv? ( x11-libs/libXv:0 )
- vaapi? ( x11-libs/libva:0 )
- vdpau? ( x11-libs/libvdpau:0 )
- video_cards_fglrx? (
- || ( >=x11-drivers/ati-drivers-14.12-r3
- x11-libs/xvba-video:0 )
- )"
-RDEPEND="
- $DEPEND
- nls? ( virtual/libintl:0 )
-"
-DEPEND="
- $DEPEND
- virtual/pkgconfig
- nls? ( sys-devel/gettext )
- !system-ffmpeg? ( dev-lang/yasm[nls=] )
-"
-
-S="${WORKDIR}/${MY_P}"
-BUILD_DIR="${S}/buildCore"
-
-PATCHES=( "${FILESDIR}"/${P}-gcc6.patch )
-DOCS=( AUTHORS README )
-
-src_prepare() {
- mkdir "${BUILD_DIR}" || die "Can't create build folder."
-
- cmake-utils_src_prepare
-
- if use system-ffmpeg ; then
- # Preparations to support the system ffmpeg. Currently fails because it depends on files the system ffmpeg doesn't install.
- local error="Failed to remove ffmpeg."
-
- rm -rf cmake/admFFmpeg* cmake/ffmpeg* avidemux_core/ffmpeg_package buildCore/ffmpeg || die "${error}"
- sed -i -e 's/include(admFFmpegUtil)//g' avidemux/commonCmakeApplication.cmake || die "${error}"
- sed -i -e '/registerFFmpeg/d' avidemux/commonCmakeApplication.cmake || die "${error}"
- sed -i -e 's/include(admFFmpegBuild)//g' avidemux_core/CMakeLists.txt || die "${error}"
- else
- # Avoid existing avidemux installations from making the build process fail, bug #461496.
- sed -i -e "s:getFfmpegLibNames(\"\${sourceDir}\"):getFfmpegLibNames(\"${S}/buildCore/ffmpeg/source/\"):g" cmake/admFFmpegUtil.cmake \
- || die "Failed to avoid existing avidemux installation from making the build fail."
- fi
-
- # Add lax vector typing for PowerPC.
- if use ppc || use ppc64 ; then
- append-cflags -flax-vector-conversions
- fi
-
- # See bug 432322.
- use x86 && replace-flags -O0 -O1
-}
-
-src_configure() {
- local mycmakeargs=(
- -DAVIDEMUX_SOURCE_DIR='${S}'
- $(cmake-utils_use nls GETTEXT)
- $(cmake-utils_use sdl SDL)
- $(cmake-utils_use vaapi LIBVA)
- $(cmake-utils_use vdpau VDPAU)
- $(cmake-utils_use video_cards_fglrx XVBA)
- $(cmake-utils_use xv XVIDEO)
- )
-
- if use debug ; then
- mycmakeargs+=( -DVERBOSE=1 -DCMAKE_BUILD_TYPE=Debug -DADM_DEBUG=1 )
- fi
-
- CMAKE_USE_DIR="${S}"/avidemux_core cmake-utils_src_configure
-}
-
-src_compile() {
- cmake-utils_src_compile -j1
-}
-
-src_install() {
- cmake-utils_src_install -j1
-}
diff --git a/media-libs/avidemux-core/files/avidemux-core-2.6.8-gcc6.patch b/media-libs/avidemux-core/files/avidemux-core-2.6.8-gcc6.patch
deleted file mode 100644
index dbdf8ff93a8..00000000000
--- a/media-libs/avidemux-core/files/avidemux-core-2.6.8-gcc6.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- a/avidemux_core/ADM_coreUtils/src/prefs.cpp
-+++ b/avidemux_core/ADM_coreUtils/src/prefs.cpp
-@@ -44,8 +44,8 @@
- const char *name2;
- ADM_paramType type;
- const char *defaultValue;
-- float min;
-- float max;
-+ double min;
-+ double max;
- }optionDesc;
-
- #include "prefs2_pref.h"
---- a/avidemux_core/ADM_coreAudio/src/ADM_audioStreamBuffered.cpp
-+++ b/avidemux_core/ADM_coreAudio/src/ADM_audioStreamBuffered.cpp
-@@ -46,7 +46,7 @@
- // By construction, the error should be minimal
- if(newDts!=ADM_AUDIO_NO_DTS)
- {
-- if( abs(newDts-lastDts)>ADM_MAX_SKEW)
-+ if( labs((int64_t)newDts-lastDts)>ADM_MAX_SKEW)
- {
- printf("[AudioStream] Warning skew in dts =%"PRId64", \n",(int64_t)newDts-(uint64_t)lastDts);
- printf("[AudioStream] Warning skew lastDts=%s \n",ADM_us2plain(lastDts));
---- a/avidemux_core/ADM_coreVideoCodec/src/ADM_ffmp43.cpp
-+++ b/avidemux_core/ADM_coreVideoCodec/src/ADM_ffmp43.cpp
-@@ -30,19 +30,19 @@
- #define WRAP_Open_Template(funcz,argz,display,codecid) \
- {\
- AVCodec *codec=funcz(argz);\
--if(!codec) {GUI_Error_HIG("Codec",QT_TR_NOOP("Internal error finding codec"display));ADM_assert(0);} \
-+if(!codec) {GUI_Error_HIG("Codec",QT_TR_NOOP("Internal error finding codec" display));ADM_assert(0);} \
- codecId=codecid; \
- _context->workaround_bugs=1*FF_BUG_AUTODETECT +0*FF_BUG_NO_PADDING; \
- _context->error_concealment=3; \
- if (avcodec_open(_context, codec) < 0) \
- { \
-- printf("[lavc] Decoder init: "display" video decoder failed!\n"); \
-- GUI_Error_HIG("Codec","Internal error opening "display); \
-+ printf("[lavc] Decoder init: " display " video decoder failed!\n"); \
-+ GUI_Error_HIG("Codec","Internal error opening " display); \
- ADM_assert(0); \
- } \
- else \
- { \
-- printf("[lavc] Decoder init: "display" video decoder initialized! (%s)\n",codec->long_name); \
-+ printf("[lavc] Decoder init: " display " video decoder initialized! (%s)\n",codec->long_name); \
- } \
- }
-
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/avidemux-core/files/, media-libs/avidemux-core/
@ 2019-07-06 10:25 Andreas Sturmlechner
0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2019-07-06 10:25 UTC (permalink / raw
To: gentoo-commits
commit: 8233a5b744d1ecda160cc671ff5b4e04d16d6bae
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 6 09:10:42 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jul 6 10:22:49 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8233a5b7
media-libs/avidemux-core: Drop 2.6.20-r2
Package-Manager: Portage-2.3.68, Repoman-2.3.16
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-libs/avidemux-core/Manifest | 1 -
.../avidemux-core/avidemux-core-2.6.20-r2.ebuild | 101 ---------------------
.../files/avidemux-core-2.6.20-fix-cmake.patch | 18 ----
3 files changed, 120 deletions(-)
diff --git a/media-libs/avidemux-core/Manifest b/media-libs/avidemux-core/Manifest
index c86d53e23df..281d961cf75 100644
--- a/media-libs/avidemux-core/Manifest
+++ b/media-libs/avidemux-core/Manifest
@@ -1,2 +1 @@
-DIST avidemux_2.6.20.tar.gz 20172362 BLAKE2B d458749e470e60b133a177ddf97ee04a665da3f7b2c52e8cc51f907aa5b51d11338ddab9306603b615170b5cf75ec2d3444bd648756bdb724aa442abf7044553 SHA512 d01d0fc24a3004770bd3923c2debc4fa2752eb71df08cfe423746b9c44a2562ca01d82965ed2563b99572a4bed8034b79487199ce330208b51a3b7f87ccf7103
DIST avidemux_2.7.0.tar.gz 21474504 BLAKE2B c6e55a0b5220d6d3746fa06162bf11253145fd28f2f6f744702d5e0342fba85e546a28883eb847139eadd34c94037ebc7d68f5576e7505a85288556468d14b96 SHA512 7c92213d3bd2849dbdb5a1aff2acd6da231fd76c561b756fbf4a1d5a41e9705d609d7a35b6ca6b77ceb3bf5138f861cd24ed16d8fcec4fd713f09a2ff07e9015
diff --git a/media-libs/avidemux-core/avidemux-core-2.6.20-r2.ebuild b/media-libs/avidemux-core/avidemux-core-2.6.20-r2.ebuild
deleted file mode 100644
index 1fad3f21b9f..00000000000
--- a/media-libs/avidemux-core/avidemux-core-2.6.20-r2.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit cmake-utils
-
-DESCRIPTION="Core libraries for a video editor designed for simple cutting, filtering and encoding tasks"
-HOMEPAGE="http://fixounet.free.fr/avidemux"
-
-# Multiple licenses because of all the bundled stuff.
-LICENSE="GPL-1 GPL-2 MIT PSF-2 public-domain"
-SLOT="2.6"
-IUSE="debug nls nvenc sdl system-ffmpeg vaapi vdpau xv"
-
-if [[ ${PV} == *9999* ]] ; then
- EGIT_REPO_URI="https://github.com/mean00/avidemux2.git"
- EGIT_CHECKOUT_DIR=${WORKDIR}
-
- inherit git-r3
-else
- MY_PN="${PN/-core/}"
- MY_P="${MY_PN}_${PV}"
- SRC_URI="mirror://sourceforge/${MY_PN}/${MY_PN}/${PV}/${MY_P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
-fi
-
-# Trying to use virtual; ffmpeg misses aac,cpudetection USE flags now though, are they needed?
-DEPEND="
- !<media-video/avidemux-${PV}:${SLOT}
- dev-db/sqlite:3
- sdl? ( media-libs/libsdl:0 )
- system-ffmpeg? ( >=virtual/ffmpeg-9:0[mp3,theora] )
- xv? ( x11-libs/libXv:0 )
- vaapi? ( x11-libs/libva:0 )
- vdpau? ( x11-libs/libvdpau:0 )
- nvenc? ( media-video/nvidia_video_sdk )
-"
-RDEPEND="
- $DEPEND
- nls? ( virtual/libintl:0 )
-"
-DEPEND="
- $DEPEND
- virtual/pkgconfig
- nls? ( sys-devel/gettext )
- !system-ffmpeg? ( dev-lang/yasm[nls=] )
-"
-
-S="${WORKDIR}/${MY_P}"
-CMAKE_USE_DIR="${S}/${PN/-/_}"
-
-PATCHES=("${FILESDIR}"/${P}-fix-cmake.patch )
-
-src_prepare() {
- cmake-utils_src_prepare
-
- if use system-ffmpeg ; then
- # Preparations to support the system ffmpeg. Currently fails because it depends on files the system ffmpeg doesn't install.
- local error="Failed to remove ffmpeg."
-
- rm -rf cmake/admFFmpeg* cmake/ffmpeg* avidemux_core/ffmpeg_package buildCore/ffmpeg || die "${error}"
- sed -i -e 's/include(admFFmpegUtil)//g' avidemux/commonCmakeApplication.cmake || die "${error}"
- sed -i -e '/registerFFmpeg/d' avidemux/commonCmakeApplication.cmake || die "${error}"
- sed -i -e 's/include(admFFmpegBuild)//g' avidemux_core/CMakeLists.txt || die "${error}"
- fi
-}
-
-src_configure() {
- # Add lax vector typing for PowerPC.
- if use ppc || use ppc64 ; then
- append-cflags -flax-vector-conversions
- fi
-
- # See bug 432322.
- use x86 && replace-flags -O0 -O1
-
- local mycmakeargs=(
- -DAVIDEMUX_SOURCE_DIR='${S}'
- -DGETTEXT="$(usex nls)"
- -DSDL="$(usex sdl)"
- -DLIBVA="$(usex vaapi)"
- -DVDPAU="$(usex vdpau)"
- -DXVIDEO="$(usex xv)"
- -DNVENC="$(usex nvenc)"
- )
-
- if use debug ; then
- mycmakeargs+=( -DVERBOSE=1 -DADM_DEBUG=1 )
- fi
-
- cmake-utils_src_configure
-}
-
-src_compile() {
- cmake-utils_src_compile -j1
-}
-
-src_install() {
- cmake-utils_src_install -j1
-}
diff --git a/media-libs/avidemux-core/files/avidemux-core-2.6.20-fix-cmake.patch b/media-libs/avidemux-core/files/avidemux-core-2.6.20-fix-cmake.patch
deleted file mode 100644
index d7df42d31b5..00000000000
--- a/media-libs/avidemux-core/files/avidemux-core-2.6.20-fix-cmake.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Bug: https://bugs.gentoo.org/625930
-Backported from https://github.com/mean00/avidemux2/commit/c5edc6cf7b3768ac1409c6cef69ab5980a86596a
-
-diff -Naur a/cmake/admCheckX264.cmake b/cmake/admCheckX264.cmake
---- a/cmake/admCheckX264.cmake 2017-04-28 05:22:27.000000000 -0400
-+++ b/cmake/admCheckX264.cmake 2017-10-01 01:38:33.249996381 -0400
-@@ -20,9 +20,9 @@
- ELSE (x264_version LESS 67)
- IF (x264_version GREATER 73)
- FIND_HEADER_AND_LIB(X264 x264.h x264 x264_encoder_open_${x264_version})
-+ ELSE (x264_version GREATER 73)
-+ FIND_HEADER_AND_LIB(X264 x264.h x264 x264_encoder_open)
- ENDIF (x264_version GREATER 73)
-- ELSE (x264_version LESS 67)
-- FIND_HEADER_AND_LIB(X264 x264.h x264 x264_encoder_open)
- ENDIF (x264_version LESS 67)
- IF(X264_FOUND)
- SET(USE_X264 True CACHE BOOL "")
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/avidemux-core/files/, media-libs/avidemux-core/
@ 2019-08-14 2:24 Stefan Strogin
0 siblings, 0 replies; 4+ messages in thread
From: Stefan Strogin @ 2019-08-14 2:24 UTC (permalink / raw
To: gentoo-commits
commit: cb6a366cc2dc907d197cfe9e2f454dea6530e545
Author: Stefan Strogin <steils <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 13 19:26:13 2019 +0000
Commit: Stefan Strogin <steils <AT> gentoo <DOT> org>
CommitDate: Wed Aug 14 01:59:52 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb6a366c
media-libs/avidemux-core: bump version to 2.7.3
- EAPI=7.
- Add patch to fix libraries permissions.
Bug: https://bugs.gentoo.org/657386
Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Stefan Strogin <steils <AT> gentoo.org>
media-libs/avidemux-core/Manifest | 1 +
.../avidemux-core/avidemux-core-2.7.3.ebuild | 88 ++++++++++++++++++++++
.../files/avidemux-core-2.7.3-permissions.patch | 28 +++++++
media-libs/avidemux-core/metadata.xml | 2 +-
4 files changed, 118 insertions(+), 1 deletion(-)
diff --git a/media-libs/avidemux-core/Manifest b/media-libs/avidemux-core/Manifest
index 281d961cf75..e9ad4687cc9 100644
--- a/media-libs/avidemux-core/Manifest
+++ b/media-libs/avidemux-core/Manifest
@@ -1 +1,2 @@
+DIST 2.7.3.tar.gz 23772654 BLAKE2B f946c267140bc8aebda2ce027ed8cb7c84a98a401255d3e0cdaf7498680e8bd9c78a33c122cb177d397ed2dd6bc3c29d7508578028c2964c2897279bf860b62d SHA512 d7761de1c40de1b824efbcf24173ea738a2e0ba7fa41cefa09e7bac3ec97f3af4b04201e36f9de50ade2b09e394aa99ed1d4907f90bb132f9896e8f1b5e82d7a
DIST avidemux_2.7.0.tar.gz 21474504 BLAKE2B c6e55a0b5220d6d3746fa06162bf11253145fd28f2f6f744702d5e0342fba85e546a28883eb847139eadd34c94037ebc7d68f5576e7505a85288556468d14b96 SHA512 7c92213d3bd2849dbdb5a1aff2acd6da231fd76c561b756fbf4a1d5a41e9705d609d7a35b6ca6b77ceb3bf5138f861cd24ed16d8fcec4fd713f09a2ff07e9015
diff --git a/media-libs/avidemux-core/avidemux-core-2.7.3.ebuild b/media-libs/avidemux-core/avidemux-core-2.7.3.ebuild
new file mode 100644
index 00000000000..f8fec3c0f4e
--- /dev/null
+++ b/media-libs/avidemux-core/avidemux-core-2.7.3.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_MAKEFILE_GENERATOR="emake"
+
+inherit cmake-utils
+
+DESCRIPTION="Core libraries for simple video cutting, filtering and encoding tasks"
+HOMEPAGE="http://fixounet.free.fr/avidemux"
+SRC_URI="https://github.com/mean00/avidemux2/archive/${PV}.tar.gz"
+
+# Multiple licenses because of all the bundled stuff.
+LICENSE="GPL-1 GPL-2 MIT PSF-2 public-domain"
+SLOT="2.7"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug nls nvenc sdl system-ffmpeg vaapi vdpau xv"
+
+# Trying to use virtual; ffmpeg misses aac,cpudetection USE flags now though, are they needed?
+DEPEND="dev-db/sqlite:3
+ nvenc? ( media-video/nvidia_video_sdk )
+ sdl? ( media-libs/libsdl:0 )
+ system-ffmpeg? ( >=virtual/ffmpeg-9:0[mp3,theora] )
+ vaapi? ( x11-libs/libva:0= )
+ vdpau? ( x11-libs/libvdpau:0 )
+ xv? ( x11-libs/libXv:0 )
+"
+RDEPEND="${DEPEND}
+ !<media-libs/avidemux-core-${PV}
+ !<media-video/avidemux-${PV}
+ nls? ( virtual/libintl:0 )
+"
+BDEPEND="virtual/pkgconfig
+ nls? ( sys-devel/gettext )
+ !system-ffmpeg? ( dev-lang/yasm[nls=] )
+"
+
+S="${WORKDIR}/avidemux2-${PV}"
+CMAKE_USE_DIR="${S}/${PN/-/_}"
+
+PATCHES=( "${FILESDIR}"/${P}-permissions.patch )
+
+src_prepare() {
+ cmake-utils_src_prepare
+
+ if use system-ffmpeg ; then
+ # Preparations to support the system ffmpeg. Currently fails because
+ # it depends on files the system ffmpeg doesn't install.
+ local error="Failed to remove bundled ffmpeg."
+
+ rm -r cmake/admFFmpeg* cmake/ffmpeg* avidemux_core/ffmpeg_package \
+ buildCore/ffmpeg || die "${error}"
+ sed -e 's/include(admFFmpegUtil)//g' -e '/registerFFmpeg/d' \
+ -i avidemux/commonCmakeApplication.cmake || die "${error}"
+ sed -e 's/include(admFFmpegBuild)//g' \
+ -i avidemux_core/CMakeLists.txt || die "${error}"
+ fi
+}
+
+src_configure() {
+ # See bug 432322.
+ use x86 && replace-flags -O0 -O1
+
+ local mycmakeargs=(
+ -DAVIDEMUX_SOURCE_DIR='${S}'
+ -DGETTEXT="$(usex nls)"
+ -DNVENC="$(usex nvenc)"
+ -DSDL="$(usex sdl)"
+ -DLIBVA="$(usex vaapi)"
+ -DVDPAU="$(usex vdpau)"
+ -DXVIDEO="$(usex xv)"
+ )
+
+ if use debug ; then
+ mycmakeargs+=( -DVERBOSE=1 -DADM_DEBUG=1 )
+ fi
+
+ cmake-utils_src_configure
+}
+
+src_compile() {
+ cmake-utils_src_compile
+}
+
+src_install() {
+ cmake-utils_src_install
+}
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
new file mode 100644
index 00000000000..0f8ee21632e
--- /dev/null
+++ b/media-libs/avidemux-core/files/avidemux-core-2.7.3-permissions.patch
@@ -0,0 +1,28 @@
+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/metadata.xml b/media-libs/avidemux-core/metadata.xml
index efad95d3100..1f4fd12a3a7 100644
--- a/media-libs/avidemux-core/metadata.xml
+++ b/media-libs/avidemux-core/metadata.xml
@@ -10,6 +10,6 @@
<flag name="system-ffmpeg">Use the ffmpeg provided by the system.</flag>
</use>
<upstream>
- <remote-id type="sourceforge">avidemux</remote-id>
+ <remote-id type="github">mean00/avidemux2</remote-id>
</upstream>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-08-14 2:24 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-08-14 2:24 [gentoo-commits] repo/gentoo:master commit in: media-libs/avidemux-core/files/, media-libs/avidemux-core/ Stefan Strogin
-- strict thread matches above, loose matches on Subject: below --
2019-07-06 10:25 Andreas Sturmlechner
2017-10-29 9:34 Andreas Sturmlechner
2017-06-23 5:58 Alexis Ballier
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox