media-libs/avidemux-core: Undo changes from bug #461496

Undo the hardcoding of the build path in an installable cmake module.
Causes failure in the configure phase of media-video/avidemux-2.6.20 and doesn't appear
to be neccesary anymore.  Revbump avidemux-core-2.6.20.

Package-Manager: Portage-2.3.6, Repoman-2.3.2

diff --git a/media-libs/avidemux-core/avidemux-core-2.6.20-r1.ebuild b/media-libs/avidemux-core/avidemux-core-2.6.20-r1.ebuild
new file mode 100644 (file)
index 0000000..16e22ff
--- /dev/null
+++ b/media-libs/avidemux-core/avidemux-core-2.6.20-r1.ebuild
@@ -0,0 +1,104 @@
+# 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 video_cards_fglrx 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 )
+       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}"
+CMAKE_USE_DIR="${S}/${PN/-/_}"
+
+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)"
+               -DXVBA="$(usex video_cards_fglrx)"
+               -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/avidemux-core-9999.ebuild b/media-libs/avidemux-core/avidemux-core-9999.ebuild
index 3a7af781cc14e740e0a61ab4f53c5e85e03a389c..16e22ff152f203d1acf6bfa4adcb1d8f21186b18 100644 (file)
--- a/media-libs/avidemux-core/avidemux-core-9999.ebuild
+++ b/media-libs/avidemux-core/avidemux-core-9999.ebuild
@@ -65,10 +65,6 @@ src_prepare() {
                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(\"${WORKDIR}/${P}_build/ffmpeg/source/\"):g" cmake/admFFmpegUtil.cmake \
-                       || die "Failed to avoid existing avidemux installation from making the build fail."
        fi
 }