diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /media-libs/mlt/files | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'media-libs/mlt/files')
-rw-r--r-- | media-libs/mlt/files/mlt-0.7.2-ruby-link.patch | 18 | ||||
-rw-r--r-- | media-libs/mlt/files/mlt-0.8.2-av_codec_is_encoder.patch | 32 | ||||
-rw-r--r-- | media-libs/mlt/files/mlt-0.8.6-ruby-link.patch | 19 | ||||
-rw-r--r-- | media-libs/mlt/files/mlt-0.9.0-freetype251.patch | 12 |
4 files changed, 81 insertions, 0 deletions
diff --git a/media-libs/mlt/files/mlt-0.7.2-ruby-link.patch b/media-libs/mlt/files/mlt-0.7.2-ruby-link.patch new file mode 100644 index 000000000000..c0427c1a3df0 --- /dev/null +++ b/media-libs/mlt/files/mlt-0.7.2-ruby-link.patch @@ -0,0 +1,18 @@ +The build system tries to link to installed system libraries first, which +fails because the ABI has changed... + +diff -ruN mlt-0.7.2.orig/src/swig/ruby/build mlt-0.7.2/src/swig/ruby/build +--- mlt-0.7.2.orig/src/swig/ruby/build 2011-05-02 07:59:12.000000000 +0200 ++++ mlt-0.7.2/src/swig/ruby/build 2011-10-30 16:21:01.000000000 +0100 +@@ -5,8 +5,10 @@ + exit 0 + end + system( "ln -sf ../mlt.i" ) ++system( "ln -sf ../../framework/libmlt.so" ) ++system( "ln -sf ../../mlt++/libmlt++.so" ) + system( "swig -c++ -ruby -I../../mlt++ -I../.. mlt.i" ) + $CFLAGS += " -I../.." +-$LDFLAGS += " -L../../mlt++ -lmlt++" ++$LIBS += " -lmlt++ -lmlt -lstdc++" + create_makefile('mlt') + system( "make" ) diff --git a/media-libs/mlt/files/mlt-0.8.2-av_codec_is_encoder.patch b/media-libs/mlt/files/mlt-0.8.2-av_codec_is_encoder.patch new file mode 100644 index 000000000000..3d0ba1ceb2aa --- /dev/null +++ b/media-libs/mlt/files/mlt-0.8.2-av_codec_is_encoder.patch @@ -0,0 +1,32 @@ +AVCodec.encode has been renamed recently is ffmpeg, causing mlt to fail to build. +Starting from libavcodec 54.7 we have av_codec_is_encoder available publicly so +use this instead. + +Index: mlt-0.8.2/src/modules/avformat/consumer_avformat.c +=================================================================== +--- mlt-0.8.2.orig/src/modules/avformat/consumer_avformat.c ++++ mlt-0.8.2/src/modules/avformat/consumer_avformat.c +@@ -238,7 +238,11 @@ static int consumer_start( mlt_consumer + mlt_properties_set_data( doc, "audio_codecs", codecs, 0, NULL, NULL ); + while ( ( codec = av_codec_next( codec ) ) ) + #if LIBAVCODEC_VERSION_INT >= ((54<<16)+(0<<8)+0) ++#if LIBAVCODEC_VERSION_INT >= ((54<<16)+(7<<8)+0) ++ if ( av_codec_is_encoder(codec) && codec->type == CODEC_TYPE_AUDIO ) ++#else + if ( ( codec->encode || codec->encode2 ) && codec->type == CODEC_TYPE_AUDIO ) ++#endif + #else + if ( codec->encode && codec->type == CODEC_TYPE_AUDIO ) + #endif +@@ -262,7 +266,11 @@ static int consumer_start( mlt_consumer + mlt_properties_set_data( doc, "video_codecs", codecs, 0, NULL, NULL ); + while ( ( codec = av_codec_next( codec ) ) ) + #if LIBAVCODEC_VERSION_INT >= ((54<<16)+(0<<8)+0) ++#if LIBAVCODEC_VERSION_INT >= ((54<<16)+(7<<8)+0) ++ if ( av_codec_is_encoder(codec) && codec->type == CODEC_TYPE_VIDEO ) ++#else + if ( (codec->encode || codec->encode2) && codec->type == CODEC_TYPE_VIDEO ) ++#endif + #else + if ( codec->encode && codec->type == CODEC_TYPE_VIDEO ) + #endif diff --git a/media-libs/mlt/files/mlt-0.8.6-ruby-link.patch b/media-libs/mlt/files/mlt-0.8.6-ruby-link.patch new file mode 100644 index 000000000000..fa4ec8aec05a --- /dev/null +++ b/media-libs/mlt/files/mlt-0.8.6-ruby-link.patch @@ -0,0 +1,19 @@ +The build system tries to link to installed system libraries first, which +fails because the ABI has changed... + +Index: mlt-0.8.6/src/swig/ruby/build +=================================================================== +--- mlt-0.8.6.orig/src/swig/ruby/build ++++ mlt-0.8.6/src/swig/ruby/build +@@ -5,8 +5,10 @@ if ARGV.shift == 'clean' + exit 0 + end + system( "ln -sf ../mlt.i" ) ++system( "ln -sf ../../framework/libmlt.so" ) ++system( "ln -sf ../../mlt++/libmlt++.so" ) + system( "swig -c++ -ruby -I../../mlt++ -I../.. mlt.i" ) + $CFLAGS += " -I../.. " + ENV['CXXFLAGS'] +-$LDFLAGS += " -L../../mlt++ -lmlt++" ++$LIBS += " -lmlt++ -lmlt -lstdc++" + create_makefile('mlt') + system( "make" ) diff --git a/media-libs/mlt/files/mlt-0.9.0-freetype251.patch b/media-libs/mlt/files/mlt-0.9.0-freetype251.patch new file mode 100644 index 000000000000..058412199fae --- /dev/null +++ b/media-libs/mlt/files/mlt-0.9.0-freetype251.patch @@ -0,0 +1,12 @@ +--- mlt-0.9.0/src/modules/gtk2/producer_pango.c ++++ mlt-0.9.0/src/modules/gtk2/producer_pango.c +@@ -25,7 +25,8 @@ + #include <string.h> + #include <gdk-pixbuf/gdk-pixbuf.h> + #include <pango/pangoft2.h> +-#include <freetype/freetype.h> ++#include <ft2build.h> ++#include FT_FREETYPE_H + #include <iconv.h> + #include <pthread.h> + #include <ctype.h> |