+++ /dev/null
-# 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
-}
+++ /dev/null
---- 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); \
- } \
- }
-
projects / gentoo.git / commitdiff