diff options
| -rw-r--r-- | media-video/lives/ChangeLog | 12 | ||||
| -rw-r--r-- | media-video/lives/Manifest | 9 | ||||
| -rw-r--r-- | media-video/lives/files/lives-1.6.0-fix-typo-callbacks.c.patch | 11 | ||||
| -rw-r--r-- | media-video/lives/files/lives-2.2.8-config_doxygen.patch (renamed from media-video/lives/files/lives-1.4.2-config_doxygen.patch) | 17 | ||||
| -rw-r--r-- | media-video/lives/files/lives-2.2.8-dont-modify-live-filesystem.patch | 11 | ||||
| -rw-r--r-- | media-video/lives/lives-1.6.1.ebuild | 79 | ||||
| -rw-r--r-- | media-video/lives/lives-2.2.8.ebuild (renamed from media-video/lives/lives-2.0.5.ebuild) | 13 |
7 files changed, 38 insertions, 114 deletions
diff --git a/media-video/lives/ChangeLog b/media-video/lives/ChangeLog index 3961ae6..70e93bd 100644 --- a/media-video/lives/ChangeLog +++ b/media-video/lives/ChangeLog @@ -1,7 +1,17 @@ # ChangeLog for media-video/lives -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*lives-2.2.8 (26 Apr 2015) + + 26 Apr 2015; Dustin Polke <DuPol@gmx.de> -lives-1.6.1.ebuild, + -lives-2.0.5.ebuild, +lives-2.2.8.ebuild, + -files/lives-1.4.2-config_doxygen.patch, + -files/lives-1.6.0-fix-typo-callbacks.c.patch, + +files/lives-2.2.8-config_doxygen.patch, + +files/lives-2.2.8-dont-modify-live-filesystem.patch: + Version bump and drop old. + *lives-2.0.5 (07 Jul 2013) 07 Jul 2013; Dustin Polke <DuPol@gmx.de> -lives-1.6.0.ebuild, diff --git a/media-video/lives/Manifest b/media-video/lives/Manifest index 9e0d3d0..a75d999 100644 --- a/media-video/lives/Manifest +++ b/media-video/lives/Manifest @@ -1,8 +1 @@ -AUX lives-1.4.2-config_doxygen.patch 1107 SHA256 2c486b0e73ef44b91d0d8fc09bcb3eb053f89fcead76664fb964cb0ed3a7573a SHA512 fa0cd372ff72a758c163d279f689923c48a82f039c83e0793a750c1f65ea0b3824515e32b109867816aec112aee74e008ce7f51c1cbb8b732bfa3753de4e687d WHIRLPOOL a07d4e83fd65705877849339058123e1d5c6fb3d3030d279d17aa7298194bcd7fc483d81d39e6bb9952a72aefd6f611403531991f3f1a2561b68007822541a8e -AUX lives-1.6.0-fix-typo-callbacks.c.patch 399 SHA256 dce371dddb1e57864aacac476b1d318d71077b54ff94f3cf8cbc13dd03fb9f69 SHA512 d6aabccc70939565632383839eeaa9fd8e4d50af04298fd6ca9caafce8323855a41eab99c89799f27148df40f52e4b6a5fd64adb0fe54493ded2c17581821708 WHIRLPOOL 716550a7bc33f4f91a7bd24c75800c67f30c446540ccdd4c19b04152c6f78140bf7b841cd6f36a42fb9d4f7551a2f23eaaeaa06552c71146c0bbff9cfe84c866 -DIST LiVES-1.6.1.tar.bz2 3372854 SHA256 cb0dc4e909e78db79e33f3dbd0464522cdc494442bd79670d05756ad4d5b9cb7 SHA512 c84ae4e94f306ff166989445b6bf6bc463e5f9a0fe0dee9fe6d70d3eddb518102697c94da7a8a2059d45a66f3696272367e7229d209b3f0f249eb35c79fc3d00 WHIRLPOOL 5a5aa873d9a45da4495e62970102ff3da6830360c70838f15f0203eea31f11260d873e99724bfbede4b2ff7ea68441c8311435c172bcbad522a7193ebe3aea4e -DIST LiVES-2.0.5.tar.bz2 3518054 SHA256 28c75b035594f4a3490fb4f4dd419cc02912ca20ec456cbe957b226df2b24f78 SHA512 ec7610bb3769e59b50b352f0c718a50794ebe8dffd0a8890d9ea1ba6ea4b5302197e3e7308686d0fcc37fdc731eda4e316547bb6df925a7b66fec693f6ed38d3 WHIRLPOOL e6c976318ebb0b6a0da1cad6736106ca4f8ae3a01270a81869531b19330aea908c4d753ae68daa0e6a140952a757c5c4760a9c9625d4e12a16d4bd45211a2557 -EBUILD lives-1.6.1.ebuild 2071 SHA256 32ab8981c9defb7b3ac01735e2d394372912f5967ce53d36c627ff3008d99934 SHA512 a56148d8bef2224ba0410835d9ee5cf166c6e65f6f36aba2e73b79e4aac604edfc1c3d357af1e9b6ab97017addc918bb42fb3cf6017618bd4a0e8f3ab59b1a37 WHIRLPOOL ea4a3472ab8e78457859a9a155a5e771b88040833ec016388feea50436ccac88c643bbc1612c4d5fbda832b767da1cfb923c7b6b5fa321b13e4c1aff0e8df0bd -EBUILD lives-2.0.5.ebuild 2190 SHA256 95764607982e2a3667390b304ea486ca8ae89811932f7aecf942fce798461c01 SHA512 cc79c8b5dd3ac4b3acb069874307229dfa6fcdd818952076ebc247afc57dc9d56f61c520ef8fcb9559ca5bf1eb41084c3924e2e9dbac203a982861b5d464fbd7 WHIRLPOOL 8b34b9dbc2b9b330d05dd00ed05994ef5bf144bdc7e1f25cc3757731c692fe5b28239eb4ffee913a50211c0a8296c0b340803ad6f88f83dc271920140e10220f -MISC ChangeLog 2308 SHA256 04e854b7ed7261d9556d1309b934eb3141e335b5658ded14b55f93d7caa8bff3 SHA512 a71f71fa3c1f45b047514135c51bc37e9a1e3b668a5a0d53ca34c86db349335ee8e3869e7351e89c9f2e065e660775943dcf9c2bfe0ccab5d07e23379289527d WHIRLPOOL 54797b2becbaa2a9ee3472245f74e084fb04294c2d652e84dc117cbc2e9a89d69601a942b9052990e5c43f84a67db50f5087a0e81de1a8fbcd3c2f410322206e -MISC metadata.xml 353 SHA256 1b6cbbf1654efc9e3faef54758a4d096a6b5da88b4c93e8acbfab9d0eb4e3e8b SHA512 ff2e33059c42d2830b918a0b19874473f29814eed00d91c25ba16086d0ebf79ff7a11246334d9db1b10e92838c3c358143167b83faef6576fd00ad1ce09ce297 WHIRLPOOL 8e02a7391078c472c3bfe68323749a1644e23e827b3706d14faf028819c2048dc41700313b1ceb6ec0d97499e34a8f355d1b716baec78cb463ad70aa0d74794c +DIST LiVES-2.2.8.tar.bz2 3623972 SHA256 81b1b301b285ef763232a84268719008f11721ce8ac86ccfe53dc24a4886951b SHA512 713265b6604a0beae89c65816812b9d2e8cd56af919f1618fbb013cdf1c734eb37e54723dd663fcd09c018a6b471ad05d373f5e72d1fabe54d183a679140ad24 WHIRLPOOL 9780e0a5423a852104599a7b82220d0ce77626a9e4e2c01c02968a4936bea5abcf67fbd62d58c77adece889cb8fa5547f345f4e06fbdf5d2d4f9db53ff5cc0b9 diff --git a/media-video/lives/files/lives-1.6.0-fix-typo-callbacks.c.patch b/media-video/lives/files/lives-1.6.0-fix-typo-callbacks.c.patch deleted file mode 100644 index 22a293c..0000000 --- a/media-video/lives/files/lives-1.6.0-fix-typo-callbacks.c.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src/callbacks.c.orig -+++ src/callbacks.c -@@ -3800,7 +3800,7 @@ on_record_perf_activate - lives_alarm_clear(alarm_handle); - frames_written=mainw->jackd->frames_written; - seek_pos=mainw->jackd->seek_pos; -- audio_ticks=mainw->pulsed->audio_ticks; -+ audio_ticks=mainw->jackd->audio_ticks; - - jack_message.command=ASERVER_CMD_FILE_CLOSE; - jack_message.data=NULL; diff --git a/media-video/lives/files/lives-1.4.2-config_doxygen.patch b/media-video/lives/files/lives-2.2.8-config_doxygen.patch index 022d303..bd63b08 100644 --- a/media-video/lives/files/lives-1.4.2-config_doxygen.patch +++ b/media-video/lives/files/lives-2.2.8-config_doxygen.patch @@ -1,12 +1,11 @@ ---- configure.in.orig 2011-04-16 15:27:49.624886971 +0200 -+++ configure.in 2011-04-16 15:29:49.391886971 +0200 -@@ -116,20 +116,18 @@ fi +--- configure.ac.orig ++++ configure.ac +@@ -147,21 +147,19 @@ fi - # Check for doxygen + dnl Check for doxygen -AC_ARG_ENABLE( doxygen, [ --disable-doxygen Disable doxygen documentation.] , disable_doxygen=yes) -+AC_ARG_ENABLE( doxygen, [ --disable-doxygen Disable doxygen documentation.]) - +- -if test "x$disable_doxygen" != "xyes" ; then - -AC_PATH_PROG(DOXYGEN, doxygen, no) @@ -19,6 +18,9 @@ - echo "Doxygen documentation disabled, not checking" - DOXYGEN=no -fi +- ++AC_ARG_ENABLE( doxygen, [ --disable-doxygen Disable doxygen documentation.]) ++ +AS_IF([test "x$enable_doxygen" != "xno"], +[AC_PATH_PROG(DOXYGEN, doxygen, no)], +[echo "Doxygen documentation disabled, not checking" @@ -29,6 +31,7 @@ + [test "x$enable_doxygen" = "xyes"],[AC_MSG_ERROR([Cannot find doxygen, make sure it is installed in your PATH])], + [test "x$enable_doxygen" = "x"],[echo "Cannot find doxygen, will not build sourcecode documentation"]) +]) - ++ AM_CONDITIONAL(HAVE_DOXYGEN, test x$DOXYGEN != xno) + diff --git a/media-video/lives/files/lives-2.2.8-dont-modify-live-filesystem.patch b/media-video/lives/files/lives-2.2.8-dont-modify-live-filesystem.patch new file mode 100644 index 0000000..5e3b068 --- /dev/null +++ b/media-video/lives/files/lives-2.2.8-dont-modify-live-filesystem.patch @@ -0,0 +1,11 @@ +--- libweed/Makefile.am.orig 2015-04-26 18:24:27.478211807 +0200 ++++ libweed/Makefile.am 2015-04-26 18:24:48.410211572 +0200 +@@ -79,7 +79,7 @@ uninstall-local: + + + install-exec-hook: +- rm -f /usr/lib/libweed*.la ++# rm -f /usr/lib/libweed*.la + ## The following is removed as it breaks packaging. + # /sbin/ldconfig + diff --git a/media-video/lives/lives-1.6.1.ebuild b/media-video/lives/lives-1.6.1.ebuild deleted file mode 100644 index 5ff690c..0000000 --- a/media-video/lives/lives-1.6.1.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="4" - -inherit eutils autotools - -MY_P="LiVES-${PV}" -DESCRIPTION="LiVES is a Video Editing System" -HOMEPAGE="http://lives.sf.net" -SRC_URI="http://www.xs4all.nl/~salsaman/lives/current/${MY_P}.tar.bz2" - # sf.net only has rpms for this version - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~x86 ~ppc ~amd64" -IUSE="doc libvisual matroska nls ogg theora" #static-libs - -RDEPEND=">=media-video/mplayer-0.90-r2[encode,jpeg,png] - >=media-gfx/imagemagick-5.5.6[jpeg,png] - >=dev-lang/perl-5.8.0-r12 - >=x11-libs/gtk+-2.4:2 - virtual/jpeg - x11-libs/gdk-pixbuf - media-sound/sox - >=dev-lang/python-2.3.4 - media-libs/libsdl - media-video/mjpegtools - media-sound/jack-audio-connection-kit - virtual/ffmpeg - virtual/cdrtools - sys-libs/libavc1394 - libvisual? ( media-libs/libvisual ) - matroska? ( media-video/mkvtoolnix - media-libs/libmatroska ) - ogg? ( media-sound/ogmtools ) - theora? ( media-libs/libtheora )" -DEPEND="${RDEPEND} - doc? ( app-doc/doxygen )" - -src_prepare() { - epatch "${FILESDIR}"/${PN}-1.4.2-config_doxygen.patch - epatch "${FILESDIR}"/${PN}-1.6.0-fix-typo-callbacks.c.patch - - # Don't try to detect installed copies wrt #295293 - sed -i -e '/^PKG_CHECK_MODULES(WEED/s:true:false:' configure.in || die - sed -i -e '/test/s:sendOSC:dIsAbLeAuToMaGiC:' \ - libOSC/sendOSC/Makefile.am || die - - # Use python 2.x as per reference in plugins - sed -i \ - -e '/#!.*env/s:python:python2:' \ - lives-plugins/plugins/encoders/multi_encoder* \ - lives-plugins/marcos-encoders/lives_*_encoder* || die - - AT_M4DIR="mk/autoconf" eautoreconf -} - -src_configure() { - #$(use_enable static-libs static) \ - econf \ - -disable-static \ - $(use_enable libvisual) \ - $(use_enable nls) \ - $(use_enable doc doxygen) -} - -src_install() { - emake -j1 DESTDIR="${D}" install - - rm -f "${ED}"usr/bin/lives #384727 - dosym lives-exe /usr/bin/lives - - dodoc AUTHORS BUGS ChangeLog FEATURES GETTING.STARTED NEWS README - - find "${ED}"usr -name '*.la' -exec rm -f {} + - rm -f "${ED}"usr/lib*/libweed-*.a -} diff --git a/media-video/lives/lives-2.0.5.ebuild b/media-video/lives/lives-2.2.8.ebuild index 4def4ec..b197f2b 100644 --- a/media-video/lives/lives-2.0.5.ebuild +++ b/media-video/lives/lives-2.2.8.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ @@ -40,18 +40,15 @@ DEPEND="${RDEPEND} >=sys-devel/automake-1.7 sys-devel/autoconf:2.5 sys-devel/gettext - || ( - sys-devel/libtool:2 - sys-devel/libtool:1.5 - ) + sys-devel/libtool:2 doc? ( app-doc/doxygen )" src_prepare() { - epatch "${FILESDIR}"/${PN}-1.4.2-config_doxygen.patch - #epatch "${FILESDIR}"/${PN}-1.6.0-fix-typo-callbacks.c.patch + epatch "${FILESDIR}"/${P}-config_doxygen.patch + epatch "${FILESDIR}"/${P}-dont-modify-live-filesystem.patch # Don't try to detect installed copies wrt #295293 - sed -i -e '/^PKG_CHECK_MODULES(WEED/s:true:false:' configure.in || die + sed -i -e '/^PKG_CHECK_MODULES(WEED/s:true:false:' configure.ac || die sed -i -e '/test/s:sendOSC:dIsAbLeAuToMaGiC:' \ libOSC/sendOSC/Makefile.am || die |