Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--media-libs/libcaca/ChangeLog8
-rw-r--r--media-libs/libcaca/files/libcaca-0.99_beta4-deoptimise.patch22
-rw-r--r--media-libs/libcaca/libcaca-0.99_beta11.ebuild60
-rw-r--r--media-libs/mlt++/ChangeLog7
-rw-r--r--media-libs/mlt++/files/mlt++-0.3.2-asneeded.patch57
-rw-r--r--media-libs/mlt++/files/mlt++-20060601-relink.patch12
-rw-r--r--media-libs/mlt++/mlt++-0.3.2.ebuild36
-rw-r--r--media-libs/mlt/ChangeLog7
-rw-r--r--media-libs/mlt/files/mlt-0.2.2-motion-est-nonx86.patch37
-rw-r--r--media-libs/mlt/files/mlt-0.3.0-sox1420.patch33
-rw-r--r--media-libs/mlt/mlt-0.3.2.ebuild98
11 files changed, 18 insertions, 359 deletions
diff --git a/media-libs/libcaca/ChangeLog b/media-libs/libcaca/ChangeLog
index d8d994948161..dcb49a7085ba 100644
--- a/media-libs/libcaca/ChangeLog
+++ b/media-libs/libcaca/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-libs/libcaca
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libcaca/ChangeLog,v 1.70 2008/12/02 23:21:33 ranger Exp $
+# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libcaca/ChangeLog,v 1.71 2009/01/30 15:07:01 aballier Exp $
+
+ 30 Jan 2009; Alexis Ballier <aballier@gentoo.org>
+ -files/libcaca-0.99_beta4-deoptimise.patch, -libcaca-0.99_beta11.ebuild:
+ remove old
02 Dec 2008; Brent Baude <ranger@gentoo.org> libcaca-0.99_beta14.ebuild:
stable ppc64, bug 245561
diff --git a/media-libs/libcaca/files/libcaca-0.99_beta4-deoptimise.patch b/media-libs/libcaca/files/libcaca-0.99_beta4-deoptimise.patch
deleted file mode 100644
index 95bd56c8c63c..000000000000
--- a/media-libs/libcaca/files/libcaca-0.99_beta4-deoptimise.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: libcaca-0.99.beta4/configure.ac
-===================================================================
---- libcaca-0.99.beta4.orig/configure.ac
-+++ libcaca-0.99.beta4/configure.ac
-@@ -209,7 +209,7 @@ fi
- if test "${enable_vga}" = "yes"; then
- ac_cv_my_have_vga="yes"
- CPPFLAGS="${CPPFLAGS} -I. -D__KERNEL__ -nostdinc -include kernel/kernel.h"
-- CFLAGS="${CFLAGS} -fno-builtin -O2 -Wall"
-+ CFLAGS="${CFLAGS} -Wall"
- CCASFLAGS="${CCASFLAGS} -I."
- LDFLAGS="${LDFLAGS} -nostdlib -Wl,-N -Wl,-Ttext -Wl,100000"
- AC_DEFINE(USE_VGA, 1, Define to 1 to activate the VGA backend driver)
-@@ -229,7 +229,7 @@ AC_SUBST(MATH_LIBS)
- AC_SUBST(CACA_LIBS)
-
- # Optimizations
--CFLAGS="${CFLAGS} -g -O2 -fno-strength-reduce -fomit-frame-pointer"
-+CFLAGS="${CFLAGS}"
- # Code qui fait des warnings == code de porc == deux baffes dans ta gueule
- # [Jylam] Removed -Wshadow in order to avoid ncurses/gl conflict
- # (Comme quoi on est pas les seuls porcs)
diff --git a/media-libs/libcaca/libcaca-0.99_beta11.ebuild b/media-libs/libcaca/libcaca-0.99_beta11.ebuild
deleted file mode 100644
index 276ce737822d..000000000000
--- a/media-libs/libcaca/libcaca-0.99_beta11.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libcaca/libcaca-0.99_beta11.ebuild,v 1.13 2008/02/15 20:23:28 drac Exp $
-
-inherit eutils autotools libtool
-
-MY_P="${P/_beta/.beta}"
-
-DESCRIPTION="A library that creates colored ASCII-art graphics"
-HOMEPAGE="http://libcaca.zoy.org/"
-SRC_URI="http://libcaca.zoy.org/files/${MY_P}.tar.gz"
-
-LICENSE="WTFPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE="ncurses slang doc imlib X opengl nocxx"
-
-RDEPEND="ncurses? ( >=sys-libs/ncurses-5.3 )
- slang? ( >=sys-libs/slang-1.4 )
- imlib? ( media-libs/imlib2 )
- X? ( x11-libs/libX11 x11-libs/libXt )
- opengl? ( virtual/opengl virtual/glut )"
-DEPEND="${RDEPEND}
- dev-util/pkgconfig
- doc? ( app-doc/doxygen )"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
-
- epatch "${FILESDIR}/${PN}-0.99_beta4-deoptimise.patch"
-
- eautoreconf
- elibtoolize
-}
-
-src_compile() {
- # temp font fix #44128
- export VARTEXFONTS="${T}/fonts"
-
- econf \
- $(use_enable doc) \
- $(use_enable ncurses) \
- $(use_enable slang) \
- $(use_enable imlib imlib2) \
- $(use_enable X x11) $(use_with X x) --x-libraries=/usr/$(get_libdir) \
- $(use_enable opengl) \
- $(use_enable !nocxx cxx) \
- || die "econf failed"
- emake || die "emake failed"
- unset VARTEXFONTS
-}
-
-src_install() {
- mv doc/man/man3caca doc/man/man3
- emake -j1 install DESTDIR="${D}" || die "emake install failed"
- dodoc AUTHORS BUGS ChangeLog NEWS NOTES README TODO
-}
diff --git a/media-libs/mlt++/ChangeLog b/media-libs/mlt++/ChangeLog
index 87456ed886b5..1af3619367c9 100644
--- a/media-libs/mlt++/ChangeLog
+++ b/media-libs/mlt++/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for media-libs/mlt++
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mlt++/ChangeLog,v 1.15 2009/01/12 22:09:12 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mlt++/ChangeLog,v 1.16 2009/01/30 15:00:36 aballier Exp $
+
+ 30 Jan 2009; Alexis Ballier <aballier@gentoo.org>
+ -files/mlt++-0.3.2-asneeded.patch, -files/mlt++-20060601-relink.patch,
+ -mlt++-0.3.2.ebuild:
+ remove old
*mlt++-0.3.4 (12 Jan 2009)
diff --git a/media-libs/mlt++/files/mlt++-0.3.2-asneeded.patch b/media-libs/mlt++/files/mlt++-0.3.2-asneeded.patch
deleted file mode 100644
index b1f64646b340..000000000000
--- a/media-libs/mlt++/files/mlt++-0.3.2-asneeded.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-Index: mlt++-0.3.2/configure
-===================================================================
---- mlt++-0.3.2.orig/configure
-+++ mlt++-0.3.2/configure
-@@ -38,13 +38,13 @@ case $targetos in
- echo LIBSUF=.dylib
- echo "CXXFLAGS+=-D__DARWIN__ -Wall -fPIC `pkg-config --cflags mlt-framework`"
- echo "LIBFLAGS=-dynamiclib -single_module"
-- echo "LDFLAGS+=`pkg-config --libs mlt-framework` `pkg-config mlt-miracle --libs` `pkg-config mlt-valerie --libs`"
-+ echo "OURLDFLAGS+=`pkg-config --libs mlt-framework` `pkg-config mlt-miracle --libs` `pkg-config mlt-valerie --libs`"
- ;;
- Linux|FreeBSD)
- echo LIBSUF=.so
- echo "CXXFLAGS+=-pthread -Wall -fPIC `pkg-config --cflags mlt-framework`"
- echo "LIBFLAGS=-shared"
-- echo "LDFLAGS+=`pkg-config --libs mlt-framework` `pkg-config mlt-miracle --libs`"
-+ echo "OURLDFLAGS+=`pkg-config --libs mlt-framework` `pkg-config mlt-miracle --libs`"
- ;;
- esac >> config.mak
-
-Index: mlt++-0.3.2/src/Makefile
-===================================================================
---- mlt++-0.3.2.orig/src/Makefile
-+++ mlt++-0.3.2/src/Makefile
-@@ -43,7 +43,7 @@ HEADERS = config.h Mlt.h $(OBJS:.o=.h)
- all: $(TARGET)
-
- $(TARGET): $(OBJS)
-- $(CXX) $(LIBFLAGS) -o $@ $(OBJS) $(LDFLAGS)
-+ $(CXX) $(LIBFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(OURLDFLAGS)
- ln -sf $(TARGET) $(NAME)
- ln -sf $(TARGET) $(SONAME)
-
-Index: mlt++-0.3.2/test/Makefile
-===================================================================
---- mlt++-0.3.2.orig/test/Makefile
-+++ mlt++-0.3.2/test/Makefile
-@@ -1,16 +1,18 @@
- include ../config.mak
-
- CXXFLAGS+=-Wall -g `mlt-config --cflags` -I ../src
--LDFLAGS+=-L../src -lmlt++ -lmiracle -lvalerie `mlt-config --libs`
-+OURLDFLAGS+=-L../src -lmlt++ -lmiracle -lvalerie `mlt-config --libs`
- CC=c++
-
- all: play server
-
- play: play.o
-+ $(CC) $(LDFLAGS) -o $@ play.o $(OURLDFLAGS)
-
- play.o: play.cpp
-
- server: server.o
-+ $(CC) $(LDFLAGS) -o $@ server.o $(OURLDFLAGS)
-
- server.o: server.cpp
-
diff --git a/media-libs/mlt++/files/mlt++-20060601-relink.patch b/media-libs/mlt++/files/mlt++-20060601-relink.patch
deleted file mode 100644
index 28e2c7bfd056..000000000000
--- a/media-libs/mlt++/files/mlt++-20060601-relink.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: mlt++-20060601/test/Makefile
-===================================================================
---- mlt++-20060601.orig/test/Makefile
-+++ mlt++-20060601/test/Makefile
-@@ -2,6 +2,7 @@ include ../config.mak
-
- CXXFLAGS+=-Wall -g `mlt-config --cflags` -I ../src
- OURLDFLAGS+=-L../src -lmlt++ -lmiracle -lvalerie `mlt-config --libs`
-+LDFLAGS+=-L../src
- CC=c++
-
- all: play server
diff --git a/media-libs/mlt++/mlt++-0.3.2.ebuild b/media-libs/mlt++/mlt++-0.3.2.ebuild
deleted file mode 100644
index d36d99950184..000000000000
--- a/media-libs/mlt++/mlt++-0.3.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mlt++/mlt++-0.3.2.ebuild,v 1.1 2008/11/13 10:08:18 aballier Exp $
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Various bindings for mlt"
-HOMEPAGE="http://mlt.sourceforge.net/"
-SRC_URI="mirror://sourceforge/mlt/${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-DEPEND=">=media-libs/mlt-0.3.2"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
-
- epatch "${FILESDIR}/${PN}-0.3.2-asneeded.patch"
- epatch "${FILESDIR}/${PN}-20060601-relink.patch"
-}
-
-src_compile() {
- tc-export CXX
- econf
- emake CC="$(tc-getCXX)" || die "emake failed"
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "make install failed"
-
- dodoc README CUSTOMISING HOWTO
-}
diff --git a/media-libs/mlt/ChangeLog b/media-libs/mlt/ChangeLog
index e722e91220d2..f2ba1280bcc7 100644
--- a/media-libs/mlt/ChangeLog
+++ b/media-libs/mlt/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for media-libs/mlt
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mlt/ChangeLog,v 1.34 2009/01/12 22:07:49 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mlt/ChangeLog,v 1.35 2009/01/30 15:02:51 aballier Exp $
+
+ 30 Jan 2009; Alexis Ballier <aballier@gentoo.org>
+ -files/mlt-0.2.2-motion-est-nonx86.patch, -files/mlt-0.3.0-sox1420.patch,
+ -mlt-0.3.2.ebuild:
+ remove old
*mlt-0.3.4 (12 Jan 2009)
diff --git a/media-libs/mlt/files/mlt-0.2.2-motion-est-nonx86.patch b/media-libs/mlt/files/mlt-0.2.2-motion-est-nonx86.patch
deleted file mode 100644
index 96501a279e44..000000000000
--- a/media-libs/mlt/files/mlt-0.2.2-motion-est-nonx86.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-SSE isn't available on any PPC platform, not just Darwin.
-
-Donnie Berkholz <dberkholz@gentoo.org>
-
-SSE isn't available on any platform but the ones supporting SSE
-
-Luca Barbato <lu_zero@gentoo.org>
-
---- mlt-0.2.2.orig/src/modules/motion_est/filter_motion_est.c 2006-08-21 16:55:50.000000000 -0700
-+++ mlt-0.2.2/src/modules/motion_est/filter_motion_est.c 2006-08-21 16:55:26.000000000 -0700
-@@ -34,7 +34,7 @@
- #include <sys/time.h>
- #include <unistd.h>
-
--#ifndef __DARWIN__
-+#ifdef __SSE__
- #include "sad_sse.h"
- #endif
-
-@@ -612,7 +612,7 @@
- } /* End column loop */
- } /* End row loop */
-
--#ifndef __DARWIN__
-+#ifdef __SSE__
- asm volatile ( "emms" );
- #endif
-
-@@ -656,7 +656,7 @@
- static void init_optimizations( struct motion_est_context_s *c )
- {
- switch(c->mb_w){
--#ifndef __DARWIN__
-+#ifdef __SSE__
- case 4: if(c->mb_h == 4) c->compare_optimized = sad_sse_422_luma_4x4;
- else c->compare_optimized = sad_sse_422_luma_4w;
- break;
diff --git a/media-libs/mlt/files/mlt-0.3.0-sox1420.patch b/media-libs/mlt/files/mlt-0.3.0-sox1420.patch
deleted file mode 100644
index 3eed1c0c9662..000000000000
--- a/media-libs/mlt/files/mlt-0.3.0-sox1420.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Index: src/modules/sox/filter_sox.c
-===================================================================
---- src/modules/sox/filter_sox.c (revision 1238)
-+++ src/modules/sox/filter_sox.c (revision 1239)
-@@ -35,17 +35,21 @@
- # define ST_SUCCESS SOX_SUCCESS
- # define st_sample_t sox_sample_t
- # define eff_t sox_effect_t*
--# define st_size_t sox_size_t
- # define ST_LIB_VERSION_CODE SOX_LIB_VERSION_CODE
- # define ST_LIB_VERSION SOX_LIB_VERSION
-+# if (ST_LIB_VERSION_CODE >= ST_LIB_VERSION(14,2,0))
-+# define st_size_t size_t
-+# else
-+# define st_size_t sox_size_t
-+# endif
- # define ST_SIGNED_WORD_TO_SAMPLE(d,clips) SOX_SIGNED_16BIT_TO_SAMPLE(d,clips)
--#if (ST_LIB_VERSION_CODE >= ST_LIB_VERSION(14,1,0))
--# define ST_SSIZE_MIN SOX_SAMPLE_MIN
-+# if (ST_LIB_VERSION_CODE >= ST_LIB_VERSION(14,1,0))
-+# define ST_SSIZE_MIN SOX_SAMPLE_MIN
-+# else
-+# define ST_SSIZE_MIN SOX_SSIZE_MIN
-+# endif
-+# define ST_SAMPLE_TO_SIGNED_WORD(d,clips) SOX_SAMPLE_TO_SIGNED_16BIT(d,clips)
- #else
--# define ST_SSIZE_MIN SOX_SSIZE_MIN
--#endif
--# define ST_SAMPLE_TO_SIGNED_WORD(d,clips) SOX_SAMPLE_TO_SIGNED_16BIT(d,clips)
--#else
- # include <st.h>
- #endif
-
diff --git a/media-libs/mlt/mlt-0.3.2.ebuild b/media-libs/mlt/mlt-0.3.2.ebuild
deleted file mode 100644
index 200416176df4..000000000000
--- a/media-libs/mlt/mlt-0.3.2.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mlt/mlt-0.3.2.ebuild,v 1.1 2008/11/13 10:07:29 aballier Exp $
-
-EAPI=1
-
-inherit eutils toolchain-funcs qt3
-
-DESCRIPTION="MLT is an open source multimedia framework, designed and developed
-for television broadcasting"
-HOMEPAGE="http://mlt.sourceforge.net/"
-SRC_URI="mirror://sourceforge/mlt/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="dv xml jack gtk sdl vorbis sox quicktime mmx lame xine lame ogg theora
-xine ffmpeg libsamplerate qt3"
-
-DEPEND="ffmpeg? ( >=media-video/ffmpeg-0.4.9_p20080326 )
- dv? ( >=media-libs/libdv-0.104 )
- xml? ( >=dev-libs/libxml2-2.5 )
- ogg? ( >=media-libs/libogg-1.1.3 )
- 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 )
- gtk? ( >=x11-libs/gtk+-2
- x11-libs/pango )
- sox? ( media-sound/sox )
- quicktime? ( media-libs/libquicktime )
- xine? ( >=media-libs/xine-lib-1.1.2_pre20060328-r7 )
- lame? ( >=media-sound/lame-3.97_beta2 )
- qt3? ( x11-libs/qt:3 )
- theora? ( >=media-libs/libtheora-1.0_alpha5 )"
-RDEPEND=${DEPEND}
-
-pkg_setup() {
- local fail="USE sox needs also USE libsamplerate enabled."
-
- if use sox && ! use libsamplerate; then
- eerror "${fail}"
- die "${fail}"
- fi
-}
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
- epatch "${FILESDIR}"/mlt-0.2.2-motion-est-nonx86.patch
- epatch "${FILESDIR}"/mlt-0.2.3-nostrip.patch
- epatch "${FILESDIR}"/${PN}-0.3.0-sox1420.patch
-}
-
-src_compile() {
- tc-export CC
-
- local myconf=" --enable-gpl --enable-shared
- --enable-pp --enable-shared-pp
- --enable-motion-est
- $(use_enable dv)
- $(use_enable mmx)
- $(use_enable gtk gtk2)
- $(use_enable vorbis)
- $(use_enable ogg)
- $(use_enable sdl)
- $(use_enable jack jackrack)
- $(use_enable sox)
- $(use_enable theora)
- $(use_enable lame mp3lame)
- $(use_enable ffmpeg avformat)
- $(use_enable libsamplerate resample)
- $(use_enable qt3 qimage)
- $(use_enable xml westley)
- $(use_enable xine)"
-
- use ffmpeg && has_version ">=media-video/ffmpeg-0.4.9_p20070616-r20" &&
- myconf="${myconf} --avformat-swscale"
-
- (use quicktime && use dv) || myconf="${myconf} --disable-kino"
-
- econf ${myconf} || die "econf failed"
- sed -i -e s/^OPT/#OPT/ "${S}/config.mak"
- emake || die "emake failed"
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "emake install failed"
-
- dodoc docs/*.txt ChangeLog README docs/TODO
-
- dodir /usr/share/${PN}
- insinto /usr/share/${PN}
- doins -r demo
-}