| 1 |
radhermit 12/04/08 07:40:03 |
| 2 |
|
| 3 |
Added: mkvtoolnix-5.5.0-system-pugixml.patch |
| 4 |
Log: |
| 5 |
Version bump. |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha100/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 media-video/mkvtoolnix/files/mkvtoolnix-5.5.0-system-pugixml.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mkvtoolnix/files/mkvtoolnix-5.5.0-system-pugixml.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mkvtoolnix/files/mkvtoolnix-5.5.0-system-pugixml.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: mkvtoolnix-5.5.0-system-pugixml.patch |
| 16 |
=================================================================== |
| 17 |
--- mkvtoolnix-5.5.0/rake.d/target.rb |
| 18 |
+++ mkvtoolnix-5.5.0/rake.d/target.rb |
| 19 |
@@ -98,7 +98,6 @@ |
| 20 |
when :mtxoutput then "src/output/libmtxoutput.a" |
| 21 |
when :avi then "lib/avilib-0.6.10/libavi.a" |
| 22 |
when :rmff then "lib/librmff/librmff.a" |
| 23 |
- when :pugixml then "lib/pugixml/src/libpugixml.a" |
| 24 |
when :mpegparser then "src/mpegparser/libmpegparser.a" |
| 25 |
when :ebml then c?("EBML_MATROSKA_INTERNAL") ? "lib/libebml/src/libebml.a" : nil |
| 26 |
when :matroska then c?("EBML_MATROSKA_INTERNAL") ? "lib/libmatroska/src/libmatroska.a" : nil |
| 27 |
--- mkvtoolnix-5.5.0/Rakefile |
| 28 |
+++ mkvtoolnix-5.5.0/Rakefile |
| 29 |
@@ -46,8 +46,8 @@ |
| 30 |
$applications = $programs.collect { |name| "src/#{$application_subdirs[name]}#{name}" + c(:EXEEXT) } |
| 31 |
$manpages = $programs.collect { |name| "doc/man/#{name}.1" } |
| 32 |
|
| 33 |
- $system_includes = "-I. -Ilib -Ilib/avilib-0.6.10 -Ilib/utf8-cpp/source -Ilib/pugixml/src -Isrc" |
| 34 |
- $system_libdirs = "-Llib/avilib-0.6.10 -Llib/librmff -Llib/pugixml/src -Lsrc/common -Lsrc/input -Lsrc/output -Lsrc/mpegparser" |
| 35 |
+ $system_includes = "-I. -Ilib -Ilib/avilib-0.6.10 -Ilib/utf8-cpp/source -Isrc" |
| 36 |
+ $system_libdirs = "-Llib/avilib-0.6.10 -Llib/librmff -Lsrc/common -Lsrc/input -Lsrc/output -Lsrc/mpegparser" |
| 37 |
|
| 38 |
$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 |
| 39 |
src/mmg src/mmg/header_editor src/mmg/options src/mmg/tabs src/extract src/propedit src/merge src/info src/mpegparser} |
| 40 |
@@ -475,7 +475,6 @@ |
| 41 |
src/mmg/*/*.o #{$applications.join(" ")} #{tools} |
| 42 |
lib/libebml/src/*.o lib/libmatroska/src/*.o |
| 43 |
lib/libebml/src/lib*.a lib/libmatroska/src/lib*.a |
| 44 |
- lib/pugixml/src/*.o lib/pugixml/src/lib*.a |
| 45 |
SHELL |
| 46 |
run "rm -rf #{$dependency_dir}", :allow_failure => true |
| 47 |
end |
| 48 |
@@ -521,7 +520,6 @@ |
| 49 |
|
| 50 |
[ { :name => 'avi', :dir => 'lib/avilib-0.6.10' }, |
| 51 |
{ :name => 'rmff', :dir => 'lib/librmff' }, |
| 52 |
- { :name => 'pugixml', :dir => 'lib/pugixml/src' }, |
| 53 |
{ :name => 'mpegparser', :dir => 'src/mpegparser' }, |
| 54 |
{ :name => 'mtxcommon', :dir => [ 'src/common' ] + %w{chapters compression strings tags xml }.collect { |e| "src/common/#{e}" } }, |
| 55 |
{ :name => 'mtxinput', :dir => 'src/input' }, |
| 56 |
@@ -533,7 +531,7 @@ |
| 57 |
new("#{[ lib[:dir] ].flatten.first}/lib#{lib[:name]}"). |
| 58 |
sources([ lib[:dir] ].flatten, :type => :dir). |
| 59 |
build_dll(lib[:name] == 'mtxcommon'). |
| 60 |
- libraries(:iconv, :z, :compression, :matroska, :ebml, :rpcrt4). |
| 61 |
+ libraries(:iconv, :z, :compression, :matroska, :ebml, :pugixml, :rpcrt4). |
| 62 |
create |
| 63 |
end |
Archives