summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2013-07-12 13:09:11 +0000
committerAlexis Ballier <aballier@gentoo.org>2013-07-12 13:09:11 +0000
commit5a3493181fc21b0b799ef532527b6d1aecb8f9ef (patch)
tree83aaf0ff27120b765f346c524aba5a441cfbedce
parentVersion bump. Set target-arch for cross-compiling, bug #447746 (diff)
downloadgentoo-2-5a3493181fc21b0b799ef532527b6d1aecb8f9ef.tar.gz
gentoo-2-5a3493181fc21b0b799ef532527b6d1aecb8f9ef.tar.bz2
gentoo-2-5a3493181fc21b0b799ef532527b6d1aecb8f9ef.zip
remove old
(Portage version: 2.2.0_alpha188/cvs/Linux x86_64, signed Manifest commit with key 160F534A)
-rw-r--r--media-libs/mlt/ChangeLog7
-rw-r--r--media-libs/mlt/files/mlt-0.7.8-libavcodec54.patch19
-rw-r--r--media-libs/mlt/files/mlt-0.8.6-kdelibs-automagic.patch94
-rw-r--r--media-libs/mlt/mlt-0.7.8.ebuild176
-rw-r--r--media-libs/mlt/mlt-0.8.6-r1.ebuild180
5 files changed, 6 insertions, 470 deletions
diff --git a/media-libs/mlt/ChangeLog b/media-libs/mlt/ChangeLog
index 444e1f3e7749..44caeb56ba9b 100644
--- a/media-libs/mlt/ChangeLog
+++ b/media-libs/mlt/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for media-libs/mlt
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mlt/ChangeLog,v 1.105 2013/07/12 13:05:57 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mlt/ChangeLog,v 1.106 2013/07/12 13:09:11 aballier Exp $
+
+ 12 Jul 2013; Alexis Ballier <aballier@gentoo.org> -mlt-0.7.8.ebuild,
+ -mlt-0.8.6-r1.ebuild, -files/mlt-0.7.8-libavcodec54.patch,
+ -files/mlt-0.8.6-kdelibs-automagic.patch:
+ remove old
*mlt-0.9.0 (12 Jul 2013)
diff --git a/media-libs/mlt/files/mlt-0.7.8-libavcodec54.patch b/media-libs/mlt/files/mlt-0.7.8-libavcodec54.patch
deleted file mode 100644
index 4d8d4e8c3ded..000000000000
--- a/media-libs/mlt/files/mlt-0.7.8-libavcodec54.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Index: mlt-0.7.8/src/modules/avformat/vdpau.c
-===================================================================
---- mlt-0.7.8.orig/src/modules/avformat/vdpau.c
-+++ mlt-0.7.8/src/modules/avformat/vdpau.c
-@@ -152,14 +152,12 @@ static int vdpau_get_buffer( AVCodecCont
- frame->reordered_opaque = codec_context->reordered_opaque;
- if ( frame->reference )
- {
-- frame->age = self->vdpau->ip_age[0];
- self->vdpau->ip_age[0] = self->vdpau->ip_age[1] + 1;
- self->vdpau->ip_age[1] = 1;
- self->vdpau->b_age++;
- }
- else
- {
-- frame->age = self->vdpau->b_age;
- self->vdpau->ip_age[0] ++;
- self->vdpau->ip_age[1] ++;
- self->vdpau->b_age = 1;
diff --git a/media-libs/mlt/files/mlt-0.8.6-kdelibs-automagic.patch b/media-libs/mlt/files/mlt-0.8.6-kdelibs-automagic.patch
deleted file mode 100644
index c1d561204d51..000000000000
--- a/media-libs/mlt/files/mlt-0.8.6-kdelibs-automagic.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-diff --git a/src/modules/qimage/configure b/src/modules/qimage/configure
-index a75b75a..04a93d5 100755
---- a/src/modules/qimage/configure
-+++ b/src/modules/qimage/configure
-@@ -12,6 +12,7 @@ QImage options:
- --kde-includedir - Location of KDE include directory [/usr/include/kde]
- --exif-libdir - Location of libexif lib directory [/usr/lib]
- --exif-includedir - Location of libexif include directory [/usr/include/libexif]
-+ --without-kde - Don't link to KDE libraries
-
- EOF
-
-@@ -42,6 +43,7 @@ else
-
- export force_qt3=
- export qt4_found=
-+ export without_kde=
-
- for i in "$@"
- do
-@@ -53,6 +55,7 @@ else
- --exif-libdir=* ) exif_libdir="${i#--exif-libdir=}" ;;
- --exif-includedir=* ) exif_includedir="${i#--exif-includedir=}" ;;
- --force-qt3 ) force_qt3="true" ;;
-+ --without-kde ) without_kde="true" ;;
- esac
- done
-
-@@ -112,7 +115,7 @@ else
- echo QTLIBS=-L$qimage_libdir -lQtCore -lQtGui -lQtXml -lQtSvg >> config.mak
- fi
- else
-- if [ -d "$kde_includedir" ]
-+ if [ "$without_kde" = "" ] && [ -d "$kde_includedir" ]
- then
- echo "#define USE_KDE3" >> config.h
- echo "USE_KDE3=1" >> config.mak
-@@ -121,7 +124,7 @@ else
- echo QTCXXFLAGS=-I$qimage_includedir -I$kde_includedir -DQT_THREAD_SUPPORT >> config.mak
- echo QTLIBS=-L$qimage_libdir -L$kde_libdir -lqt-mt >> config.mak
- else
-- echo "qimage: KDE environment not found - disabling extra image formats"
-+ echo "qimage: KDE environment not found or disabled by request - disabling extra image formats"
- echo "#define USE_QT3" >> config.h
- echo "USE_QT3=1" >> config.mak
- echo QTCXXFLAGS=-I$qimage_includedir -DQT_THREAD_SUPPORT>> config.mak
-@@ -144,26 +147,29 @@ else
- fi
- fi
-
-- kde4-config
-- if [ $? -eq 0 ] && [ "$qt4_found" != "" ]
-+ if [ "$without_kde" = "" ]
- then
-- # test if we have KDE4, required on some systems to get QImage extra formats (xcf, ...)
-- if [ "$kde_includedir" = "" ]
-+ kde4-config
-+ if [ $? -eq 0 ] && [ "$qt4_found" != "" ]
- then
-- kde_includedir=`kde4-config --install include`
-- fi
-- if [ "$kde_libdir" = "" ]
-- then
-- kde_libdir=`kde4-config --install lib`
-- fi
-- if [ -d "$kde_includedir" ] && [ -d "$kde_libdir" ]
-- then
-- echo "KDE version 4.x detected, will enable extra image formats"
-- echo "#define USE_KDE4" >> config.h
-- echo "USE_KDE4=1" >> config.mak
-- echo KDECXXFLAGS=-I$kde_includedir >> config.mak
-- # the -L with kde4/devel is for Fedora
-- echo KDELIBS=-L$kde_libdir -L${kde_libdir}/kde4/devel -lkdecore >> config.mak
-+ # test if we have KDE4, required on some systems to get QImage extra formats (xcf, ...)
-+ if [ "$kde_includedir" = "" ]
-+ then
-+ kde_includedir=`kde4-config --install include`
-+ fi
-+ if [ "$kde_libdir" = "" ]
-+ then
-+ kde_libdir=`kde4-config --install lib`
-+ fi
-+ if [ -d "$kde_includedir" ] && [ -d "$kde_libdir" ]
-+ then
-+ echo "KDE version 4.x detected, will enable extra image formats"
-+ echo "#define USE_KDE4" >> config.h
-+ echo "USE_KDE4=1" >> config.mak
-+ echo KDECXXFLAGS=-I$kde_includedir >> config.mak
-+ # the -L with kde4/devel is for Fedora
-+ echo KDELIBS=-L$kde_libdir -L${kde_libdir}/kde4/devel -lkdecore >> config.mak
-+ fi
- fi
- fi
-
diff --git a/media-libs/mlt/mlt-0.7.8.ebuild b/media-libs/mlt/mlt-0.7.8.ebuild
deleted file mode 100644
index a09c40c983cc..000000000000
--- a/media-libs/mlt/mlt-0.7.8.ebuild
+++ /dev/null
@@ -1,176 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mlt/mlt-0.7.8.ebuild,v 1.6 2013/03/02 21:46:11 hwoarang Exp $
-
-EAPI=4
-PYTHON_DEPEND="python? 2:2.6"
-inherit eutils toolchain-funcs multilib python
-
-DESCRIPTION="An open source multimedia framework, designed and developed for television broadcasting"
-HOMEPAGE="http://www.mltframework.org/"
-SRC_URI="mirror://sourceforge/mlt/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="compressed-lumas dv debug ffmpeg frei0r gtk jack kde libsamplerate melt
-mmx qt4 quicktime rtaudio sdl sse sse2 swfdec vorbis xine xml lua python ruby vdpau" # java perl php tcl
-IUSE="${IUSE} kernel_linux"
-
-#rtaudio will use OSS on non linux OSes
-RDEPEND="ffmpeg? ( virtual/ffmpeg[vdpau?] )
- dv? ( >=media-libs/libdv-0.104 )
- xml? ( >=dev-libs/libxml2-2.5 )
- vorbis? ( >=media-libs/libvorbis-1.1.2 )
- sdl? ( >=media-libs/libsdl-1.2.10
- >=media-libs/sdl-image-1.2.4 )
- libsamplerate? ( >=media-libs/libsamplerate-0.1.2 )
- jack? ( media-sound/jack-audio-connection-kit
- media-libs/ladspa-sdk
- >=dev-libs/libxml2-2.5 )
- frei0r? ( media-plugins/frei0r-plugins )
- gtk? ( x11-libs/gtk+:2
- media-libs/libexif
- x11-libs/pango )
- quicktime? ( media-libs/libquicktime )
- rtaudio? ( kernel_linux? ( media-libs/alsa-lib ) )
- swfdec? ( media-libs/swfdec )
- xine? ( >=media-libs/xine-lib-1.1.2_pre20060328-r7 )
- qt4? ( dev-qt/qtgui:4 dev-qt/qtsvg:4 media-libs/libexif )
- !media-libs/mlt++
- lua? ( >=dev-lang/lua-5.1.4-r4 )
- ruby? ( dev-lang/ruby )"
-# sox? ( media-sound/sox )
-# java? ( >=virtual/jre-1.5 )
-# perl? ( dev-lang/perl )
-# php? ( dev-lang/php )
-# tcl? ( dev-lang/tcl )
-
-SWIG_DEPEND=">=dev-lang/swig-2.0"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- compressed-lumas? ( || ( media-gfx/imagemagick[png]
- media-gfx/graphicsmagick[imagemagick,png] ) )
- lua? ( ${SWIG_DEPEND} virtual/pkgconfig )
- python? ( ${SWIG_DEPEND} )
- ruby? ( ${SWIG_DEPEND} )"
-# java? ( ${SWIG_DEPEND} >=virtual/jdk-1.5 )
-# perl? ( ${SWIG_DEPEND} )
-# php? ( ${SWIG_DEPEND} )
-# tcl? ( ${SWIG_DEPEND} )
-
-pkg_setup() {
- python_set_active_version 2
- python_pkg_setup
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-0.7.2-ruby-link.patch \
- "${FILESDIR}"/${PN}-0.7.8-libavcodec54.patch
- # respect CFLAGS LDFLAGS when building shared libraries. Bug #308873
- for x in python lua; do
- sed -i "/mlt.so/s: -lmlt++ :& ${CFLAGS} ${LDFLAGS} :" src/swig/$x/build || die
- done
- sed -i "/^LDFLAGS/s: += :& ${LDFLAGS} :" src/swig/ruby/build || die
-}
-
-src_configure() {
- tc-export CC CXX
-
- local myconf="--enable-gpl
- --enable-motion-est
- $(use_enable debug)
- $(use_enable dv)
- $(use_enable sse)
- $(use_enable sse2)
- $(use_enable swfdec)
- $(use_enable gtk gtk2)
- $(use_enable vorbis)
- $(use_enable sdl)
- $(use_enable jack jackrack)
- $(use_enable ffmpeg avformat)
- $(use_enable frei0r)
- $(use_enable melt)
- $(use_enable libsamplerate resample)
- $(use_enable rtaudio)
- $(use vdpau && echo ' --avformat-vdpau')
- $(use_enable xml)
- $(use_enable xine)
- $(use_enable kde kdenlive)
- $(use_enable qt4 qimage)
- --disable-sox"
- #$(use_enable sox) FIXME
-
- use ffmpeg && myconf="${myconf} --avformat-swscale"
-
- (use quicktime && use dv) || myconf="${myconf} --disable-kino"
-
- use compressed-lumas && myconf="${myconf} --luma-compress"
-
- ( use x86 || use amd64 ) && \
- myconf="${myconf} $(use_enable mmx)" ||
- myconf="${myconf} --disable-mmx"
-
- use melt || sed -i -e "s;src/melt;;" Makefile
-
- # TODO: add swig language bindings
- # see also http://www.mltframework.org/twiki/bin/view/MLT/ExtremeMakeover
-
- local swig_lang
- # TODO: java perl php tcl
- for i in lua python ruby ; do
- use $i && swig_lang="${swig_lang} $i"
- done
- [ -z "${swig_lang}" ] && swig_lang="none"
-
- econf ${myconf} --swig-languages="${swig_lang}"
- sed -i -e s/^OPT/#OPT/ "${S}/config.mak"
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die
- dodoc AUTHORS ChangeLog NEWS README docs/*.txt
-
- dodir /usr/share/${PN}
- insinto /usr/share/${PN}
- doins -r demo
-
- docinto swig
-
- # Install SWIG bindings
- if use lua; then
- cd "${S}"/src/swig/lua
- exeinto $(pkg-config --variable INSTALL_CMOD lua)
- doexe mlt.so || die
- dodoc play.lua
- fi
-
- if use python; then
- cd "${S}"/src/swig/python
- insinto $(python_get_sitedir)
- doins mlt.py || die
- exeinto $(python_get_sitedir)
- doexe _mlt.so || die
- dodoc play.py
- fi
-
- if use ruby; then
- cd "${S}"/src/swig/ruby
- exeinto $("${EPREFIX}"/usr/bin/ruby -r rbconfig -e 'print Config::CONFIG["sitearchdir"]')
- doexe mlt.so || die
- dodoc play.rb thumbs.rb
- fi
- # TODO: java perl php tcl
-}
-
-pkg_postinst() {
- if use python; then
- python_mod_optimize mlt.py
- fi
-}
-
-pkg_postrm() {
- if use python; then
- python_mod_cleanup mlt.py
- fi
-}
diff --git a/media-libs/mlt/mlt-0.8.6-r1.ebuild b/media-libs/mlt/mlt-0.8.6-r1.ebuild
deleted file mode 100644
index 5ddad71a2b6e..000000000000
--- a/media-libs/mlt/mlt-0.8.6-r1.ebuild
+++ /dev/null
@@ -1,180 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mlt/mlt-0.8.6-r1.ebuild,v 1.2 2013/03/02 21:46:11 hwoarang Exp $
-
-EAPI=4
-PYTHON_DEPEND="python? 2:2.6"
-inherit eutils toolchain-funcs multilib python
-
-DESCRIPTION="An open source multimedia framework, designed and developed for television broadcasting"
-HOMEPAGE="http://www.mltframework.org/"
-SRC_URI="mirror://sourceforge/mlt/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="compressed-lumas dv debug ffmpeg frei0r gtk jack kde kdenlive libsamplerate melt
-mmx qt4 quicktime rtaudio sdl sse sse2 swfdec vorbis xine xml lua python ruby vdpau" # java perl php tcl
-IUSE="${IUSE} kernel_linux"
-
-#rtaudio will use OSS on non linux OSes
-RDEPEND="ffmpeg? ( virtual/ffmpeg[vdpau?] )
- dv? ( >=media-libs/libdv-0.104 )
- xml? ( >=dev-libs/libxml2-2.5 )
- vorbis? ( >=media-libs/libvorbis-1.1.2 )
- sdl? ( >=media-libs/libsdl-1.2.10[X,opengl]
- >=media-libs/sdl-image-1.2.4 )
- libsamplerate? ( >=media-libs/libsamplerate-0.1.2 )
- jack? ( media-sound/jack-audio-connection-kit
- media-libs/ladspa-sdk
- >=dev-libs/libxml2-2.5 )
- frei0r? ( media-plugins/frei0r-plugins )
- gtk? ( x11-libs/gtk+:2
- media-libs/libexif
- x11-libs/pango )
- quicktime? ( media-libs/libquicktime )
- rtaudio? ( kernel_linux? ( media-libs/alsa-lib ) )
- swfdec? ( media-libs/swfdec )
- xine? ( >=media-libs/xine-lib-1.1.2_pre20060328-r7 )
- qt4? ( dev-qt/qtgui:4
- dev-qt/qtsvg:4
- media-libs/libexif )
- kde? ( kde-base/kdelibs:4
- media-libs/libexif )
- !media-libs/mlt++
- lua? ( >=dev-lang/lua-5.1.4-r4 )
- ruby? ( dev-lang/ruby )"
-# sox? ( media-sound/sox )
-# java? ( >=virtual/jre-1.5 )
-# perl? ( dev-lang/perl )
-# php? ( dev-lang/php )
-# tcl? ( dev-lang/tcl )
-
-SWIG_DEPEND=">=dev-lang/swig-2.0"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- compressed-lumas? ( || ( media-gfx/imagemagick[png]
- media-gfx/graphicsmagick[imagemagick,png] ) )
- lua? ( ${SWIG_DEPEND} virtual/pkgconfig )
- python? ( ${SWIG_DEPEND} )
- ruby? ( ${SWIG_DEPEND} )"
-# java? ( ${SWIG_DEPEND} >=virtual/jdk-1.5 )
-# perl? ( ${SWIG_DEPEND} )
-# php? ( ${SWIG_DEPEND} )
-# tcl? ( ${SWIG_DEPEND} )
-
-pkg_setup() {
- python_set_active_version 2
- python_pkg_setup
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-0.8.6-ruby-link.patch
- epatch "${FILESDIR}"/${P}-kdelibs-automagic.patch
-
- # respect CFLAGS LDFLAGS when building shared libraries. Bug #308873
- for x in python lua; do
- sed -i "/mlt.so/s: -lmlt++ :& ${CFLAGS} ${LDFLAGS} :" src/swig/$x/build || die
- done
- sed -i "/^LDFLAGS/s: += :& ${LDFLAGS} :" src/swig/ruby/build || die
-}
-
-src_configure() {
- tc-export CC CXX
-
- local myconf="--enable-gpl
- --enable-motion-est
- $(use_enable debug)
- $(use_enable dv)
- $(use_enable sse)
- $(use_enable sse2)
- $(use_enable swfdec)
- $(use_enable gtk gtk2)
- $(use_enable vorbis)
- $(use_enable sdl)
- $(use_enable jack jackrack)
- $(use_enable ffmpeg avformat)
- $(use_enable frei0r)
- $(use_enable melt)
- $(use_enable libsamplerate resample)
- $(use_enable rtaudio)
- $(use vdpau && echo ' --avformat-vdpau')
- $(use_enable xml)
- $(use_enable xine)
- $(use_enable kdenlive)
- $(use_enable qt4 qimage)
- --disable-sox"
- #$(use_enable sox) FIXME
-
- use ffmpeg && myconf="${myconf} --avformat-swscale"
- use kde || myconf="${myconf} --without-kde"
- (use quicktime && use dv) || myconf="${myconf} --disable-kino"
- use compressed-lumas && myconf="${myconf} --luma-compress"
-
- ( use x86 || use amd64 ) && \
- myconf="${myconf} $(use_enable mmx)" ||
- myconf="${myconf} --disable-mmx"
-
- use melt || sed -i -e "s;src/melt;;" Makefile
-
- # TODO: add swig language bindings
- # see also http://www.mltframework.org/twiki/bin/view/MLT/ExtremeMakeover
-
- local swig_lang
- # TODO: java perl php tcl
- for i in lua python ruby ; do
- use $i && swig_lang="${swig_lang} $i"
- done
- [ -z "${swig_lang}" ] && swig_lang="none"
-
- econf ${myconf} --swig-languages="${swig_lang}"
- sed -i -e s/^OPT/#OPT/ "${S}/config.mak"
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die
- dodoc AUTHORS ChangeLog NEWS README docs/*.txt
-
- dodir /usr/share/${PN}
- insinto /usr/share/${PN}
- doins -r demo
-
- docinto swig
-
- # Install SWIG bindings
- if use lua; then
- cd "${S}"/src/swig/lua
- exeinto $(pkg-config --variable INSTALL_CMOD lua)
- doexe mlt.so || die
- dodoc play.lua
- fi
-
- if use python; then
- cd "${S}"/src/swig/python
- insinto $(python_get_sitedir)
- doins mlt.py || die
- exeinto $(python_get_sitedir)
- doexe _mlt.so || die
- dodoc play.py
- fi
-
- if use ruby; then
- cd "${S}"/src/swig/ruby
- exeinto $("${EPREFIX}"/usr/bin/ruby -r rbconfig -e 'print Config::CONFIG["sitearchdir"]')
- doexe mlt.so || die
- dodoc play.rb thumbs.rb
- fi
- # TODO: java perl php tcl
-}
-
-pkg_postinst() {
- if use python; then
- python_mod_optimize mlt.py
- fi
-}
-
-pkg_postrm() {
- if use python; then
- python_mod_cleanup mlt.py
- fi
-}