* [gentoo-commits] proj/qt:master commit in: media-video/avidemux/
@ 2012-10-07 20:14 Markos Chandras
0 siblings, 0 replies; 6+ messages in thread
From: Markos Chandras @ 2012-10-07 20:14 UTC (permalink / raw
To: gentoo-commits
commit: 5fc0fdda3a336d0e2adc34ff9ed98571e8d70fff
Author: Markos Chandras <hwoarang <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 7 19:46:39 2012 +0000
Commit: Markos Chandras <hwoarang <AT> gentoo <DOT> org>
CommitDate: Sun Oct 7 20:14:25 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=5fc0fdda
media-video/avidemux-2.6.0: Improve ebuild
Fix pending compilation problems. Fix installation.
Try to do what bootStrap.bash script is trying to do but in a cleaner
(sort of) way. There is a lot of testing that needs to be done and
possibly some IUSE clean up.
---
media-video/avidemux/avidemux-2.6.0.ebuild | 220 ++++++++++++++++------------
1 files changed, 126 insertions(+), 94 deletions(-)
diff --git a/media-video/avidemux/avidemux-2.6.0.ebuild b/media-video/avidemux/avidemux-2.6.0.ebuild
index cd1b1be..ac69f03 100644
--- a/media-video/avidemux/avidemux-2.6.0.ebuild
+++ b/media-video/avidemux/avidemux-2.6.0.ebuild
@@ -4,7 +4,7 @@
EAPI=4
PLOCALES="ca cs de el es fr it ja pt_BR ru sr sr@latin tr"
-inherit cmake-utils eutils flag-o-matic l10n
+inherit cmake-utils eutils flag-o-matic l10n toolchain-funcs
MY_P=${PN}_${PV}
@@ -12,59 +12,83 @@ DESCRIPTION="Video editor designed for simple cutting, filtering and encoding ta
HOMEPAGE="http://fixounet.free.fr/avidemux"
SRC_URI="mirror://sourceforge/${PN}/${PV}/${MY_P}.tar.gz"
-LICENSE="GPL-2"
+# Multiple licenses because of all the bundled stuff
+LICENSE="GPL-2 MIT GPL-1 LGPG-1 public-domaini PSF-2"
SLOT="2.6"
KEYWORDS="~amd64 ~x86"
-IUSE="aac aften alsa amr dts gtk jack +mp3 nls opengl oss pulseaudio qt4 sdl
- +truetype vorbis vpx +x264 +xv xvid"
-
-RDEPEND="dev-libs/libxml2
- sys-libs/zlib
- aac? (
- media-libs/faac
- media-libs/faad2
- )
- aften? ( media-libs/aften[cxx] )
- alsa? ( media-libs/alsa-lib )
+IUSE="aften a52 alsa amr arts debug dts esd faa faac faad fontconfig gtk jack
+ lame libsamplerate mmx nls qt4 sdl vdpau vorbis truetype xvid xv oss x264"
+
+RDEPEND="
+ virtual/libiconv
+ dev-libs/libxml2
+ media-libs/libpng
+ >=dev-lang/spidermonkey-1.5-r2
+ gtk? ( >=x11-libs/gtk+-2.6.0:2 )
+ qt4? ( >=x11-libs/qt-gui-4.8.3:4 )
+ x264? ( media-libs/x264 )
+ xvid? ( media-libs/xvid )
+ aften? ( media-libs/aften )
amr? ( media-libs/opencore-amr )
+ lame? ( media-sound/lame )
dts? ( media-libs/libdca )
- gtk? ( x11-libs/gtk+:2 )
+ faad? ( media-libs/faad2 )
+ faac? ( media-libs/faac )
+ vorbis? ( media-libs/libvorbis )
+ alsa? ( >=media-libs/alsa-lib-1.0.3b-r2 )
+ arts? ( >=kde-base/arts-1.2.3 )
+ esd? ( media-sound/esound )
jack? (
- media-libs/libsamplerate
media-sound/jack-audio-connection-kit
+ libsamplerate? ( media-libs/libsamplerate )
)
- mp3? ( media-sound/lame )
- pulseaudio? ( media-sound/pulseaudio )
- qt4? (
- >=x11-libs/qt-gui-4.6:4
- opengl? (
- virtual/opengl
- >=x11-libs/qt-opengl-4.6:4
- )
- )
+ truetype? ( >=media-libs/freetype-2.1.5 )
+ fontconfig? ( media-libs/fontconfig )
sdl? ( media-libs/libsdl )
- truetype? (
- media-libs/freetype:2
- media-libs/fontconfig
- )
- vorbis? ( media-libs/libvorbis )
- vpx? ( media-libs/libvpx )
- x264? ( media-libs/x264 )
- xv? (
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXv
- )
- xvid? ( media-libs/xvid )"
-DEPEND="${RDEPEND}
- dev-lang/yasm
- virtual/pkgconfig
- nls? ( sys-devel/gettext )"
-
+ xv? ( x11-libs/libXv )
+ x11-libs/libX11
+ x11-libs/libXext
+ x11-libs/libXrender
+ vdpau? ( >=x11-drivers/nvidia-drivers-180.60 )
+"
+DEPEND="
+ $RDEPEND
+ oss? ( virtual/os-headers )
+ dev-util/pkgconfig
+ nls? ( sys-devel/gettext )
+"
S=${WORKDIR}/${MY_P}
BUILD_S=${WORKDIR}/${P}_build
-DOCS=( AUTHORS )
+avidemux_build_process() {
+ local BUILDDIR="${1}"
+ local SOURCEDIR="${2}"
+ local mycmakeargs="${3}"
+ EXTRA="${mycmakeargs}"
+ BUILDER="Unix Makefiles"
+ FAKEROOT_DIR="${S}"/gentoo-install
+ SOURCEDIR="${2}"
+ mkdir ${BUILDDIR} && cd "${BUILDDIR}"
+ einfo "Configuring: ${BUILDDIR}"
+ cmake -DFAKEROOT="${FAKEROOT_DIR}" -DAVIDEMUX_SOURCE_DIR="${S}" \
+ -DCMAKE_INSTALL_PREFIX="/usr" \
+ ${EXTRA} -G "${BUILDER}" ../"${SOURCEDIR}/"
+ # for some reason, core needs -j1. That's what they do in their
+ # script as well
+ if [[ ${BUILDDIR} == "buildCore" ]]; then
+ extra_opts="-j1"
+ else
+ unset extra_opts
+ fi
+ einfo "Building: ${BUILDDIR}"
+ emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" ${extra_opts}
+
+ einfo "Fake install: ${BUILDDIR}"
+ # pretend that you installed it somewhere
+ emake DESTDIR="${FAKEROOT_DIR}" ${extra_opts} install
+
+ cd ..
+}
src_prepare() {
base_src_prepare
@@ -91,15 +115,21 @@ src_prepare() {
-e "s!FILE(GLOB.*avidemux.*)!SET(ts_files ${avidemux_ts_files})!" \
"${S}/cmake/Ts.cmake" || die "sed failed"
+ # Fix icon name -> avidemux-2.6.png
+ sed -i -e "/^Icon/ s:${PN}:${PN}-2.6:" ${PN}2.desktop || die
+ # Now rename to not collide with 2.5
+ mv ${PN}2.desktop ${PN}-2.6.desktop
# fix major issues in desktop files wrt bugs #291453, #316599, #430500
- sed -i -re '/^(Exec|Path)/ s:\[\$e\]::' avidemux2-gtk.desktop || die
- sed -i -re '/^Exec/ s:(avidemux2_)gtk:\1qt4:' avidemux2.desktop || die
-
- # don't install Windows-only files
- sed -i -e '/addons\/avsfilter/d' CMakeLists.txt || die
+ # duplicate desktop file
+ cp ${PN}-2.6.desktop ${PN}-2.6-gtk.desktop || die
+ sed -i -re '/^Exec/ s:(avidemux2_)gtk:\1qt4:' ${PN}-2.6.desktop || die
}
src_configure() {
+ true;
+}
+
+src_compile() {
# add lax vector typing for PowerPC
if use ppc || use ppc64; then
append-cflags -flax-vector-conversions
@@ -107,56 +137,58 @@ src_configure() {
# bug 432322
use x86 && replace-flags -O0 -O1
- local mycmakeargs=(
- -DAVIDEMUX_SOURCE_DIR="${S}"
- -DAVIDEMUX_INSTALL_PREFIX="${BUILD_S}"
- -DAVIDEMUX_CORECONFIG_DIR="${BUILD_S}/config"
- -DARTS=OFF
- -DESD=OFF
- $(cmake-utils_use aac FAAC)
- $(cmake-utils_use aac FAAD)
- $(cmake-utils_use aften)
- $(cmake-utils_use alsa)
- $(cmake-utils_use amr OPENCORE_AMRNB)
- $(cmake-utils_use amr OPENCORE_AMRWB)
+ local x mycmakeargs
+ final_targets="buildCore buildCli buildPluginsCommon "
+ final_targets+="buildPluginsCLI "
+ # default args
+ use debug \
+ && POSTFIX="_debug" \
+ && mycmakeargs+="-DVERBOSE=1 -DCMAKE_BUILD_TYPE=Debug"
+
+ mycmakeargs="
+ $(for x in ${IUSE}; do cmake-utils_use $x; done)
$(cmake-utils_use dts LIBDCA)
- $(cmake-utils_use gtk)
- $(cmake-utils_use jack)
- $(cmake-utils_use mp3 LAME)
- $(cmake-utils_use nls GETTEXT)
- $(cmake-utils_use_use opengl)
- $(cmake-utils_use oss)
- $(cmake-utils_use pulseaudio PULSEAUDIOSIMPLE)
- $(cmake-utils_use qt4)
- $(cmake-utils_use sdl)
$(cmake-utils_use truetype FREETYPE2)
- $(cmake-utils_use truetype FONTCONFIG)
- $(cmake-utils_use vorbis)
- $(cmake-utils_use vorbis LIBVORBIS)
- $(cmake-utils_use vpx VPXDEC)
- $(cmake-utils_use x264)
+ $(cmake-utils_use nls GETTEXT)
$(cmake-utils_use xv XVIDEO)
- $(cmake-utils_use xvid)
- )
- cmake-utils_src_configure
-}
-
-src_compile() {
- # first build the application
- cmake-utils_src_compile -j1
-
- # and then go on with plugins
- emake -C "${CMAKE_BUILD_DIR}/plugins"
+ $(cmake-utils_use amr OPENCORE_AMRWB)
+ $(cmake-utils_use amr OPENCORE_AMRNB)
+ "
+
+ # Lets try to do all the s**t that bootStrap.bash is
+ # trying to do
+ use qt4 && with_qt4=1
+ use gtk && with_gtk=1
+
+ avidemux_build_process buildCore avidemux_core${POSTFIX} "${mycmakeargs}"
+ avidemux_build_process buildCli avidemux/cli${POSTFIX} "${mycmakeargs}"
+ mycmakeargs+="-DPLUGIN_UI=COMMON "
+ avidemux_build_process buildPluginsCommon avidemux_plugins${POSTFIX} "${mycmakeargs}"
+ mycmakeargs+="-DPLUGIN_UI=CLI "
+ avidemux_build_process buildPluginsCLI avidemux_plugins${POSTFIX} "${mycmakeargs}"
+
+ if use qt4; then
+ avidemux_build_process buildQt4 avidemux/qt4${POSTFIX} "${mycmakeargs}"
+ mycmakeargs+="-DPLUGIN_UI=QT4 "
+ avidemux_build_process buildPluginsQt4 avidemux_plugins${POSTFIX} "${mycmakeargs}"
+ final_targets+="buildQt4 buildPluginsQt4 "
+ fi
+ if use gtk; then
+ avidemux_build_process buildGtk avidemux_gtk${POSTFIX} "${mycmakeargs}"
+ mycmakeargs+="-DPLUGIN_UI=GTK "
+ avidemux_build_process buildPluginsGtk avidemux_plugins${POSTFIX} "${mycmakeargs}"
+ final_targets+="buildGtk buildPluginsGtk"
+ fi
}
src_install() {
- # install the application
- cmake-utils_src_install
-
- # install plugins
- emake -C "${CMAKE_BUILD_DIR}/plugins" DESTDIR="${D}" install
-
- newicon ${PN}_icon.png ${PN}.png
- use gtk && domenu avidemux2-gtk.desktop
- use qt4 && domenu avidemux2.desktop
+ # everything is installed(?) in ${S}/gentoo-install.
+ # Move it to ${D}.
+ insinto /
+ doins -r "${S}"/gentoo-install/*
+
+ newicon ${PN}_icon.png ${PN}-2.6.png
+ use gtk && domenu ${PN}-2.6-gtk.desktop
+ use qt4 && domenu ${PN}-2.6.desktop
+ dodoc AUTHORS README
}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/qt:master commit in: media-video/avidemux/
@ 2012-10-07 20:16 Markos Chandras
0 siblings, 0 replies; 6+ messages in thread
From: Markos Chandras @ 2012-10-07 20:16 UTC (permalink / raw
To: gentoo-commits
commit: 61e404ef70aa4930700d9741ad70f9c5448319a8
Author: Markos Chandras <hwoarang <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 7 20:16:20 2012 +0000
Commit: Markos Chandras <hwoarang <AT> gentoo <DOT> org>
CommitDate: Sun Oct 7 20:16:20 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=61e404ef
media-video/avidemux-2.6: Fix typo in license
---
media-video/avidemux/avidemux-2.6.0.ebuild | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/media-video/avidemux/avidemux-2.6.0.ebuild b/media-video/avidemux/avidemux-2.6.0.ebuild
index ac69f03..c86edfb 100644
--- a/media-video/avidemux/avidemux-2.6.0.ebuild
+++ b/media-video/avidemux/avidemux-2.6.0.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://fixounet.free.fr/avidemux"
SRC_URI="mirror://sourceforge/${PN}/${PV}/${MY_P}.tar.gz"
# Multiple licenses because of all the bundled stuff
-LICENSE="GPL-2 MIT GPL-1 LGPG-1 public-domaini PSF-2"
+LICENSE="GPL-2 MIT GPL-1 LGPG-1 public-domain PSF-2"
SLOT="2.6"
KEYWORDS="~amd64 ~x86"
IUSE="aften a52 alsa amr arts debug dts esd faa faac faad fontconfig gtk jack
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/qt:master commit in: media-video/avidemux/
@ 2012-10-07 21:31 Markos Chandras
0 siblings, 0 replies; 6+ messages in thread
From: Markos Chandras @ 2012-10-07 21:31 UTC (permalink / raw
To: gentoo-commits
commit: d7f0312ebba0000f062c90b972f6aafe6a94291c
Author: Markos Chandras <hwoarang <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 7 20:23:22 2012 +0000
Commit: Markos Chandras <hwoarang <AT> gentoo <DOT> org>
CommitDate: Sun Oct 7 20:23:22 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=d7f0312e
media-video/avidemux-2.6: Fix desktop files
They use avidemux2 (which is for avidemux-2.5) and not avidemux3.
So if avidemux-2.5 is installed, then it will launch that one.
Lets fix that!
---
media-video/avidemux/avidemux-2.6.0.ebuild | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/media-video/avidemux/avidemux-2.6.0.ebuild b/media-video/avidemux/avidemux-2.6.0.ebuild
index c86edfb..5515781 100644
--- a/media-video/avidemux/avidemux-2.6.0.ebuild
+++ b/media-video/avidemux/avidemux-2.6.0.ebuild
@@ -117,12 +117,17 @@ src_prepare() {
# Fix icon name -> avidemux-2.6.png
sed -i -e "/^Icon/ s:${PN}:${PN}-2.6:" ${PN}2.desktop || die
+ # the desktop file is broken. It uses avidemux2 instead of avidemux3
+ # so it will actually launch avidemux-2.5 if it is installed
+ sed -i -e "/^Exec/ s:${PN}2:${PN}3:" ${PN}2.desktop || die
# Now rename to not collide with 2.5
mv ${PN}2.desktop ${PN}-2.6.desktop
# fix major issues in desktop files wrt bugs #291453, #316599, #430500
# duplicate desktop file
cp ${PN}-2.6.desktop ${PN}-2.6-gtk.desktop || die
- sed -i -re '/^Exec/ s:(avidemux2_)gtk:\1qt4:' ${PN}-2.6.desktop || die
+ # the desktop file is broken. It uses avidemux2 instead of avidemux3
+ # so it will actually launch avidemux-2.5 if it is installed
+ sed -i -re '/^Exec/ s:(avidemux3_)gtk:\1qt4:' ${PN}-2.6.desktop || die
}
src_configure() {
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/qt:master commit in: media-video/avidemux/
@ 2012-10-07 21:31 Markos Chandras
0 siblings, 0 replies; 6+ messages in thread
From: Markos Chandras @ 2012-10-07 21:31 UTC (permalink / raw
To: gentoo-commits
commit: 5f349a253407e15afde68843bfa261f886fc41d9
Author: Markos Chandras <hwoarang <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 7 21:15:52 2012 +0000
Commit: Markos Chandras <hwoarang <AT> gentoo <DOT> org>
CommitDate: Sun Oct 7 21:15:52 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=5f349a25
media-video/avidemux-2.6: Clean up src_compile
---
media-video/avidemux/avidemux-2.6.0.ebuild | 4 ----
1 files changed, 0 insertions(+), 4 deletions(-)
diff --git a/media-video/avidemux/avidemux-2.6.0.ebuild b/media-video/avidemux/avidemux-2.6.0.ebuild
index 5515781..7121645 100644
--- a/media-video/avidemux/avidemux-2.6.0.ebuild
+++ b/media-video/avidemux/avidemux-2.6.0.ebuild
@@ -143,8 +143,6 @@ src_compile() {
use x86 && replace-flags -O0 -O1
local x mycmakeargs
- final_targets="buildCore buildCli buildPluginsCommon "
- final_targets+="buildPluginsCLI "
# default args
use debug \
&& POSTFIX="_debug" \
@@ -176,13 +174,11 @@ src_compile() {
avidemux_build_process buildQt4 avidemux/qt4${POSTFIX} "${mycmakeargs}"
mycmakeargs+="-DPLUGIN_UI=QT4 "
avidemux_build_process buildPluginsQt4 avidemux_plugins${POSTFIX} "${mycmakeargs}"
- final_targets+="buildQt4 buildPluginsQt4 "
fi
if use gtk; then
avidemux_build_process buildGtk avidemux_gtk${POSTFIX} "${mycmakeargs}"
mycmakeargs+="-DPLUGIN_UI=GTK "
avidemux_build_process buildPluginsGtk avidemux_plugins${POSTFIX} "${mycmakeargs}"
- final_targets+="buildGtk buildPluginsGtk"
fi
}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/qt:master commit in: media-video/avidemux/
@ 2012-10-07 21:31 Markos Chandras
0 siblings, 0 replies; 6+ messages in thread
From: Markos Chandras @ 2012-10-07 21:31 UTC (permalink / raw
To: gentoo-commits
commit: 42233eacc0febdeb016f047ae8718778456bacfd
Author: Markos Chandras <hwoarang <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 7 21:17:58 2012 +0000
Commit: Markos Chandras <hwoarang <AT> gentoo <DOT> org>
CommitDate: Sun Oct 7 21:17:58 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=42233eac
media-video/avidemux-2.6: Add executable bit to binaries
---
media-video/avidemux/avidemux-2.6.0.ebuild | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/media-video/avidemux/avidemux-2.6.0.ebuild b/media-video/avidemux/avidemux-2.6.0.ebuild
index 7121645..1b8fd77 100644
--- a/media-video/avidemux/avidemux-2.6.0.ebuild
+++ b/media-video/avidemux/avidemux-2.6.0.ebuild
@@ -187,6 +187,8 @@ src_install() {
# Move it to ${D}.
insinto /
doins -r "${S}"/gentoo-install/*
+ # Mark executables with +x
+ find "${ED}"/usr/bin -exec chmod a+x {} \;
newicon ${PN}_icon.png ${PN}-2.6.png
use gtk && domenu ${PN}-2.6-gtk.desktop
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/qt:master commit in: media-video/avidemux/
@ 2012-10-08 17:33 Markos Chandras
0 siblings, 0 replies; 6+ messages in thread
From: Markos Chandras @ 2012-10-08 17:33 UTC (permalink / raw
To: gentoo-commits
commit: d73842e384e1b59f6e89ee4f07daa1a31adedc9f
Author: Markos Chandras <hwoarang <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 8 17:33:05 2012 +0000
Commit: Markos Chandras <hwoarang <AT> gentoo <DOT> org>
CommitDate: Mon Oct 8 17:33:05 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=d73842e3
media-video/avidemux-2.6.0: Fix gtk building
Thanks to poncho <poncho <AT> spahan.ch>. Bug #431748
---
media-video/avidemux/avidemux-2.6.0.ebuild | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/media-video/avidemux/avidemux-2.6.0.ebuild b/media-video/avidemux/avidemux-2.6.0.ebuild
index 1b8fd77..a0675e1 100644
--- a/media-video/avidemux/avidemux-2.6.0.ebuild
+++ b/media-video/avidemux/avidemux-2.6.0.ebuild
@@ -176,7 +176,7 @@ src_compile() {
avidemux_build_process buildPluginsQt4 avidemux_plugins${POSTFIX} "${mycmakeargs}"
fi
if use gtk; then
- avidemux_build_process buildGtk avidemux_gtk${POSTFIX} "${mycmakeargs}"
+ avidemux_build_process buildGtk avidemux/gtk${POSTFIX} "${mycmakeargs}"
mycmakeargs+="-DPLUGIN_UI=GTK "
avidemux_build_process buildPluginsGtk avidemux_plugins${POSTFIX} "${mycmakeargs}"
fi
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2012-10-08 17:33 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-10-07 20:14 [gentoo-commits] proj/qt:master commit in: media-video/avidemux/ Markos Chandras
-- strict thread matches above, loose matches on Subject: below --
2012-10-07 20:16 Markos Chandras
2012-10-07 21:31 Markos Chandras
2012-10-07 21:31 Markos Chandras
2012-10-07 21:31 Markos Chandras
2012-10-08 17:33 Markos Chandras
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox