diff options
| author |   Tim Harder <radhermit@gentoo.org> | 2012-04-08 07:40:03 +0000 |
|---|---|---|
| committer | Tim Harder <radhermit@gentoo.org> | 2012-04-08 07:40:03 +0000 |
| commit | 045d5b72488ad45f3ef1481224dfacf8d28ea311 (patch) | |
| tree | baf1ab190aadebca477bf3b6b33b79a02559aaa1 /media-video/mkvtoolnix/files | |
| parent | Initial import for mkvtoolnix-5.5.0. Ebuild by me. (diff) | |
| download | gentoo-2-045d5b72488ad45f3ef1481224dfacf8d28ea311.tar.gz gentoo-2-045d5b72488ad45f3ef1481224dfacf8d28ea311.tar.bz2 gentoo-2-045d5b72488ad45f3ef1481224dfacf8d28ea311.zip | |
Version bump.
(Portage version: 2.2.0_alpha100/cvs/Linux x86_64)
Diffstat (limited to 'media-video/mkvtoolnix/files')
| -rw-r--r-- | media-video/mkvtoolnix/files/mkvtoolnix-5.5.0-system-pugixml.patch | 48 |
1 files changed, 48 insertions, 0 deletions
diff --git a/media-video/mkvtoolnix/files/mkvtoolnix-5.5.0-system-pugixml.patch b/media-video/mkvtoolnix/files/mkvtoolnix-5.5.0-system-pugixml.patch new file mode 100644 index 000000000000..ab0c3654f4af --- /dev/null +++ b/media-video/mkvtoolnix/files/mkvtoolnix-5.5.0-system-pugixml.patch @@ -0,0 +1,48 @@ +--- mkvtoolnix-5.5.0/rake.d/target.rb ++++ mkvtoolnix-5.5.0/rake.d/target.rb +@@ -98,7 +98,6 @@ + when :mtxoutput then "src/output/libmtxoutput.a" + when :avi then "lib/avilib-0.6.10/libavi.a" + when :rmff then "lib/librmff/librmff.a" +- when :pugixml then "lib/pugixml/src/libpugixml.a" + when :mpegparser then "src/mpegparser/libmpegparser.a" + when :ebml then c?("EBML_MATROSKA_INTERNAL") ? "lib/libebml/src/libebml.a" : nil + when :matroska then c?("EBML_MATROSKA_INTERNAL") ? "lib/libmatroska/src/libmatroska.a" : nil +--- mkvtoolnix-5.5.0/Rakefile ++++ mkvtoolnix-5.5.0/Rakefile +@@ -46,8 +46,8 @@ + $applications = $programs.collect { |name| "src/#{$application_subdirs[name]}#{name}" + c(:EXEEXT) } + $manpages = $programs.collect { |name| "doc/man/#{name}.1" } + +- $system_includes = "-I. -Ilib -Ilib/avilib-0.6.10 -Ilib/utf8-cpp/source -Ilib/pugixml/src -Isrc" +- $system_libdirs = "-Llib/avilib-0.6.10 -Llib/librmff -Llib/pugixml/src -Lsrc/common -Lsrc/input -Lsrc/output -Lsrc/mpegparser" ++ $system_includes = "-I. -Ilib -Ilib/avilib-0.6.10 -Ilib/utf8-cpp/source -Isrc" ++ $system_libdirs = "-Llib/avilib-0.6.10 -Llib/librmff -Lsrc/common -Lsrc/input -Lsrc/output -Lsrc/mpegparser" + + $source_directories = %w{lib/avilib-0.6.10 lib/librmff src src/input src/output src/common src/common/chapters src/common/compression src/common/strings src/common/tags src/common/xml + src/mmg src/mmg/header_editor src/mmg/options src/mmg/tabs src/extract src/propedit src/merge src/info src/mpegparser} +@@ -475,7 +475,6 @@ + src/mmg/*/*.o #{$applications.join(" ")} #{tools} + lib/libebml/src/*.o lib/libmatroska/src/*.o + lib/libebml/src/lib*.a lib/libmatroska/src/lib*.a +- lib/pugixml/src/*.o lib/pugixml/src/lib*.a + SHELL + run "rm -rf #{$dependency_dir}", :allow_failure => true + end +@@ -521,7 +520,6 @@ + + [ { :name => 'avi', :dir => 'lib/avilib-0.6.10' }, + { :name => 'rmff', :dir => 'lib/librmff' }, +- { :name => 'pugixml', :dir => 'lib/pugixml/src' }, + { :name => 'mpegparser', :dir => 'src/mpegparser' }, + { :name => 'mtxcommon', :dir => [ 'src/common' ] + %w{chapters compression strings tags xml }.collect { |e| "src/common/#{e}" } }, + { :name => 'mtxinput', :dir => 'src/input' }, +@@ -533,7 +531,7 @@ + new("#{[ lib[:dir] ].flatten.first}/lib#{lib[:name]}"). + sources([ lib[:dir] ].flatten, :type => :dir). + build_dll(lib[:name] == 'mtxcommon'). +- libraries(:iconv, :z, :compression, :matroska, :ebml, :rpcrt4). ++ libraries(:iconv, :z, :compression, :matroska, :ebml, :pugixml, :rpcrt4). + create + end + |