commit: 5f324a6511dc18f2846c7f0a5a948aa015900b3b
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 21 12:20:15 2015 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Fri Aug 21 12:20:15 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f324a65
media-libs/mlt: fix ruby patch.
Package-Manager: portage-2.2.20.1
media-libs/mlt/files/mlt-0.9.8-ruby-link.patch | 29 +++++++++++++-------------
1 file changed, 14 insertions(+), 15 deletions(-)
diff --git a/media-libs/mlt/files/mlt-0.9.8-ruby-link.patch
b/media-libs/mlt/files/mlt-0.9.8-ruby-link.patch
old mode 100755
new mode 100644
index 3dd319a..9b2327d
--- a/media-libs/mlt/files/mlt-0.9.8-ruby-link.patch
+++ b/media-libs/mlt/files/mlt-0.9.8-ruby-link.patch
@@ -1,20 +1,19 @@
-The build system tries to link to installed system libraries first, which
+The build system tries to link to installed system libraries first, which
fails because the ABI has changed...
---- swig/ruby/build
-+++ swig/ruby/build
-@@ -0,0 +1,14 @@
-+#!/usr/bin/env ruby
-+require 'mkmf'
-+if ARGV.shift == 'clean'
-+ system( "rm -f *.cxx *.so *.o mlt.i ../.ruby Makefile" )
-+ exit 0
-+end
-+system( "ln -sf ../mlt.i" )
+Index: mlt-0.9.8/src/swig/ruby/build
+===================================================================
+--- mlt-0.9.8.orig/src/swig/ruby/build
++++ mlt-0.9.8/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.has_key?('CXXFLAGS')? ENV['CXXFLAGS'] : '')
+ system( "swig -c++ -ruby -I../../mlt++ -I../.. mlt.i" )
+ $CFLAGS += " -I../.. " + (ENV.has_key?('CXXFLAGS')? ENV['CXXFLAGS'] : '')
+-$LDFLAGS += " -L../../mlt++ -lmlt++"
+$LIBS += " -lmlt++ -lmlt -lstdc++"
-+create_makefile('mlt')
-+system( "make" )
+ create_makefile('mlt')
+ system( "make" )
