* [gentoo-commits] dev/graaff:master commit in: dev-ruby/rvideo/files/, dev-ruby/rvideo/
@ 2012-03-20 9:14 Hans de Graaff
0 siblings, 0 replies; 3+ messages in thread
From: Hans de Graaff @ 2012-03-20 9:14 UTC (permalink / raw
To: gentoo-commits
commit: a8092968ab81f4270651042f6da4aaa1e3884485
Author: Hans de Graaff <hans <AT> degraaff <DOT> org>
AuthorDate: Tue Mar 20 09:12:56 2012 +0000
Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org>
CommitDate: Tue Mar 20 09:12:56 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/graaff.git;a=commit;h=a8092968
Apply patch to work with newer versions of ffmpeg that have slightly changed output.
(Portage version: 2.1.10.49/git/Linux x86_64, signed Manifest commit with key 0x8883FA56A308A8D7!)
---
dev-ruby/rvideo/ChangeLog | 9 +++++++-
dev-ruby/rvideo/Manifest | 9 ++-----
dev-ruby/rvideo/files/rvideo-ffmpeg.patch | 11 ++++++++++
dev-ruby/rvideo/rvideo-0.9.3-r2.ebuild | 31 +++++++++++++++++++++++++++++
4 files changed, 53 insertions(+), 7 deletions(-)
diff --git a/dev-ruby/rvideo/ChangeLog b/dev-ruby/rvideo/ChangeLog
index ea32804..7965ca4 100644
--- a/dev-ruby/rvideo/ChangeLog
+++ b/dev-ruby/rvideo/ChangeLog
@@ -1,7 +1,14 @@
# ChangeLog for dev-ruby/rvideo
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*rvideo-0.9.3-r2 (20 Mar 2012)
+
+ 20 Mar 2012; Hans de Graaff <graaff@gentoo.org> +rvideo-0.9.3-r2.ebuild,
+ +files/rvideo-ffmpeg.patch:
+ Apply patch to work with newer versions of ffmpeg that have slightly changed
+ output.
+
14 Oct 2011; Hans de Graaff <graaff@gentoo.org>
-rvideo-0.9.3.20110614.ebuild:
Remove again since it isn't backward compatible and overall broken.
diff --git a/dev-ruby/rvideo/Manifest b/dev-ruby/rvideo/Manifest
index 5f193da..55bf219 100644
--- a/dev-ruby/rvideo/Manifest
+++ b/dev-ruby/rvideo/Manifest
@@ -2,13 +2,10 @@
Hash: SHA256
DIST rvideo-0.9.3.gem 318464 RMD160 7f4ae8754fd909e28f6529d43769b9acd88829d5 SHA1 9efb8c650b74a5a2699b1ecf0d0b039f092d9cca SHA256 fc8eb8d000a758cf95e82ce56f8ebf7b801be723f1fcf99db83393bfba18425f
-EBUILD rvideo-0.9.3-r1.ebuild 771 RMD160 2adf026792ab521a86859f61a660cb70cef2ddd8 SHA1 730ea5879bb65b706a8ef535f25121acf3c0f106 SHA256 1a0dbe0fd6ea09967b1bc1b78ce923010f3d956bd0a2a5b1c90c23bee1340f1f
-MISC ChangeLog 911 RMD160 e568036aafb759475c45c3fbae478edc8191c2ef SHA1 af3dd1e597990c474e92b886cd0858f05ef1057f SHA256 490ec9b2d7439ec3d37072d3172bde9b4dd486440d43bfa5d470a3c727a800c9
-MISC metadata.xml 310 RMD160 748fdc57fab597c8f78dd97488b36e2555a6f6e3 SHA1 3a9ce141ba956440cc078f2b927223207bb65476 SHA256 923036defe7520ae3db5417067b3d63f7f67c1140c80d23870b9275d81a6f974
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iF4EAREIAAYFAk6YMM0ACgkQiIP6VqMIqNdd+gD/SbyOc0oJgla0+bKx42yFPGm7
-Ned5IM2T5Ib5xjjy2TwA/jRxpU9SnD/YUQ+vpSFMaly6IAic9v7ij+Qa02ZZCo0a
-=zHf7
+iF4EAREIAAYFAk9oShgACgkQiIP6VqMIqNeCzQD+KJM4cVAi6t7b2K2bAPqqLsqv
+9dIqLSVDOuSrNjj3zRIA/Rw+towMRzL04+5qt4KX0yGFR9esqqXfy9AildtOy1lP
+=OyVP
-----END PGP SIGNATURE-----
diff --git a/dev-ruby/rvideo/files/rvideo-ffmpeg.patch b/dev-ruby/rvideo/files/rvideo-ffmpeg.patch
new file mode 100644
index 0000000..01f4521
--- /dev/null
+++ b/dev-ruby/rvideo/files/rvideo-ffmpeg.patch
@@ -0,0 +1,11 @@
+--- lib/rvideo/tools/ffmpeg.rb.orig 2012-03-20 10:06:21.000000000 +0100
++++ lib/rvideo/tools/ffmpeg.rb 2012-03-20 09:57:31.000000000 +0100
+@@ -59,7 +59,7 @@
+ raise TranscoderError, "Could not write output file to #{@output_file}"
+ end
+
+- full_details = /Press .* to stop encoding\n(.*)/m.match(result)
++ full_details = /Press .* to stop.*?\n(.*)/m.match(result)
+ raise TranscoderError, "Unexpected result details (#{result})" if full_details.nil?
+ details = full_details[1].strip.gsub(/\s*\n\s*/," - ")
+
diff --git a/dev-ruby/rvideo/rvideo-0.9.3-r2.ebuild b/dev-ruby/rvideo/rvideo-0.9.3-r2.ebuild
new file mode 100644
index 0000000..c0e90ec
--- /dev/null
+++ b/dev-ruby/rvideo/rvideo-0.9.3-r2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/zentest/zentest-3.3.0.ebuild,v 1.1 2006/08/28 14:34:06 pclouds Exp $
+
+EAPI=4
+USE_RUBY="ruby18"
+
+RUBY_FAKEGEM_TASK_DOC="docs"
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="ENV ENV2 History.txt README.txt RULES"
+
+# There are specs but they require an old version of rspec.
+RUBY_FAKEGEM_TASK_TEST=""
+
+RUBY_FAKEGEM_EXTRAINSTALL="config"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Inspect and process video or audio files."
+HOMEPAGE="http://code.google.com/p/rvideo/"
+LICENSE="MIT"
+
+KEYWORDS="~amd64 ~x86 ~x86-macos"
+SLOT="0"
+IUSE="flv"
+
+RUBY_PATCHES=( rvideo-ffmpeg.patch )
+
+ruby_add_bdepend "doc? ( dev-ruby/hoe )"
+
+ruby_add_rdepend "flv? ( media-video/flvtool2 )"
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] dev/graaff:master commit in: dev-ruby/rvideo/files/, dev-ruby/rvideo/
@ 2014-09-10 8:53 Hans de Graaff
0 siblings, 0 replies; 3+ messages in thread
From: Hans de Graaff @ 2014-09-10 8:53 UTC (permalink / raw
To: gentoo-commits
commit: 3315ea5b65539aac1a38a0342eb3c5717aa3cd8f
Author: Hans de Graaff <hans <AT> degraaff <DOT> org>
AuthorDate: Wed Sep 10 08:53:35 2014 +0000
Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org>
CommitDate: Wed Sep 10 08:53:35 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=dev/graaff.git;a=commit;h=3315ea5b
Add patch to handle ffmpeg encoding issues.
Package-Manager: portage-2.2.8-r1
---
dev-ruby/rvideo/ChangeLog | 4 ++
dev-ruby/rvideo/files/rvideo-output-encoding.patch | 49 ++++++++++++++++++++++
dev-ruby/rvideo/rvideo-0.9.5.ebuild | 2 +-
3 files changed, 54 insertions(+), 1 deletion(-)
diff --git a/dev-ruby/rvideo/ChangeLog b/dev-ruby/rvideo/ChangeLog
index 917f7a0..e2f2092 100644
--- a/dev-ruby/rvideo/ChangeLog
+++ b/dev-ruby/rvideo/ChangeLog
@@ -2,6 +2,10 @@
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 10 Sep 2014; Hans de Graaff <graaff@gentoo.org> rvideo-0.9.5.ebuild,
+ +files/rvideo-output-encoding.patch:
+ Add patch to handle ffmpeg encoding issues.
+
10 Sep 2014; Hans de Graaff <graaff@gentoo.org> rvideo-0.9.5.ebuild:
Bash syntax, not ruby.
diff --git a/dev-ruby/rvideo/files/rvideo-output-encoding.patch b/dev-ruby/rvideo/files/rvideo-output-encoding.patch
new file mode 100644
index 0000000..012f10e
--- /dev/null
+++ b/dev-ruby/rvideo/files/rvideo-output-encoding.patch
@@ -0,0 +1,49 @@
+diff --git a/lib/rvideo/inspector.rb b/lib/rvideo/inspector.rb
+index f93466f..0d2f43a 100644
+--- a/lib/rvideo/inspector.rb
++++ b/lib/rvideo/inspector.rb
+@@ -45,7 +45,8 @@ module RVideo # :nodoc:
+ @path = File.dirname(file)
+ @full_filename = file
+ raise TranscoderError::InputFileNotFound, "File not found (#{file})" unless FileTest.exist?(file.gsub("\"",""))
+- @raw_response = `#{@ffmpeg_binary} -i #{@full_filename} 2>&1`
++ @raw_response = IO::popen("#{@ffmpeg_binary} -i #{@full_filename} 2>&1",
++ :external_encoding => 'ASCII-8BIT').read
+ else
+ raise ArgumentError, "Must supply either an input file or a pregenerated response" if options[:raw_response].nil? and file.nil?
+ end
+@@ -542,4 +543,4 @@ module RVideo # :nodoc:
+ match
+ end
+ end
+-end
+\ No newline at end of file
++end
+diff --git a/lib/rvideo/tools/abstract_tool.rb b/lib/rvideo/tools/abstract_tool.rb
+index d336baa..565137a 100644
+--- a/lib/rvideo/tools/abstract_tool.rb
++++ b/lib/rvideo/tools/abstract_tool.rb
+@@ -329,7 +329,8 @@ module RVideo # :nodoc:
+ # Pulls the interesting bits of the temp log file into memory. This is fairly tool-specific, so
+ # it's doubtful that this default version is going to work without being overridded.
+ def populate_raw_result(temp_file_name)
+- @raw_result = `tail -n 500 #{temp_file_name}`
++ @raw_result = IO::popen("tail -n 500 #{temp_file_name}",
++ :external_encoding => 'ASCII-8BIT').read
+ end
+
+ end
+diff --git a/lib/rvideo/tools/ffmpeg.rb b/lib/rvideo/tools/ffmpeg.rb
+index 5d4221d..e518171 100644
+--- a/lib/rvideo/tools/ffmpeg.rb
++++ b/lib/rvideo/tools/ffmpeg.rb
+@@ -79,7 +79,8 @@ module RVideo
+ end
+
+ # Append the bottom of the log file, where the interesting bits live.
+- @raw_result << `tail -n 500 #{temp_file_name}`
++ @raw_result << IO::popen("tail -n 500 #{temp_file_name}",
++ :external_encoding => 'ASCII-8BIT').read
+ end
+
+ def parse_result(result)
diff --git a/dev-ruby/rvideo/rvideo-0.9.5.ebuild b/dev-ruby/rvideo/rvideo-0.9.5.ebuild
index 9aa9184..88bb289 100644
--- a/dev-ruby/rvideo/rvideo-0.9.5.ebuild
+++ b/dev-ruby/rvideo/rvideo-0.9.5.ebuild
@@ -26,6 +26,6 @@ KEYWORDS="~amd64 ~x86 ~x86-macos"
SLOT="0"
IUSE="doc flv"
-RUBY_PATCHES=( rvideo-ffmpeg.patch )
+RUBY_PATCHES=( rvideo-ffmpeg.patch rvideo-output-encoding.patch )
ruby_add_rdepend "flv? ( media-video/flvtool2 )"
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] dev/graaff:master commit in: dev-ruby/rvideo/files/, dev-ruby/rvideo/
@ 2014-09-10 9:19 Hans de Graaff
0 siblings, 0 replies; 3+ messages in thread
From: Hans de Graaff @ 2014-09-10 9:19 UTC (permalink / raw
To: gentoo-commits
commit: e3402d4739e290f1845e974274fc38ee0f537f9c
Author: Hans de Graaff <hans <AT> degraaff <DOT> org>
AuthorDate: Wed Sep 10 09:19:15 2014 +0000
Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org>
CommitDate: Wed Sep 10 09:19:15 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=dev/graaff.git;a=commit;h=e3402d47
Add a new revision with the output encoding patch.
Package-Manager: portage-2.2.8-r1
---
dev-ruby/rvideo/ChangeLog | 6 +++
dev-ruby/rvideo/files/rvideo-output-encoding.patch | 52 +++++++---------------
dev-ruby/rvideo/rvideo-0.9.3-r3.ebuild | 28 ++++++++++++
3 files changed, 51 insertions(+), 35 deletions(-)
diff --git a/dev-ruby/rvideo/ChangeLog b/dev-ruby/rvideo/ChangeLog
index be523e0..141ff77 100644
--- a/dev-ruby/rvideo/ChangeLog
+++ b/dev-ruby/rvideo/ChangeLog
@@ -2,6 +2,12 @@
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*rvideo-0.9.3-r3 (10 Sep 2014)
+
+ 10 Sep 2014; Hans de Graaff <graaff@gentoo.org> +rvideo-0.9.3-r3.ebuild,
+ files/rvideo-output-encoding.patch:
+ Add a new revision with the output encoding patch.
+
10 Sep 2014; Hans de Graaff <graaff@gentoo.org> -rvideo-0.9.5.ebuild:
Remove this version again because the API changes in a breaking and partially
undocumented way.
diff --git a/dev-ruby/rvideo/files/rvideo-output-encoding.patch b/dev-ruby/rvideo/files/rvideo-output-encoding.patch
index 012f10e..7cfe316 100644
--- a/dev-ruby/rvideo/files/rvideo-output-encoding.patch
+++ b/dev-ruby/rvideo/files/rvideo-output-encoding.patch
@@ -1,49 +1,31 @@
-diff --git a/lib/rvideo/inspector.rb b/lib/rvideo/inspector.rb
-index f93466f..0d2f43a 100644
---- a/lib/rvideo/inspector.rb
-+++ b/lib/rvideo/inspector.rb
-@@ -45,7 +45,8 @@ module RVideo # :nodoc:
+--- lib/rvideo/tools/abstract_tool.rb.~1~ 2014-09-10 11:13:10.951030299 +0200
++++ lib/rvideo/tools/abstract_tool.rb 2014-09-10 11:14:22.804030526 +0200
+@@ -62,7 +62,8 @@
+ def execute
+ final_command = "#{@command} 2>&1"
+ Transcoder.logger.info("\nExecuting Command: #{final_command}\n")
+- @raw_result = `#{final_command}`
++ @raw_result = IO::popen(final_command,
++ :external_encoding => 'ASCII-8BIT').read
+ Transcoder.logger.info("Result: \n#{@raw_result}")
+ parse_result(@raw_result)
+ end
+--- lib/rvideo/inspector.rb.~1~ 2014-09-10 11:13:10.951030299 +0200
++++ lib/rvideo/inspector.rb 2014-09-10 11:15:08.907030671 +0200
+@@ -45,7 +45,8 @@
@path = File.dirname(file)
@full_filename = file
- raise TranscoderError::InputFileNotFound, "File not found (#{file})" unless FileTest.exist?(file.gsub("\"",""))
+ raise ArgumentError, "File not found (#{file})" unless FileTest.exist?(file.gsub("\"",""))
- @raw_response = `#{@ffmpeg_binary} -i #{@full_filename} 2>&1`
+ @raw_response = IO::popen("#{@ffmpeg_binary} -i #{@full_filename} 2>&1",
+ :external_encoding => 'ASCII-8BIT').read
else
raise ArgumentError, "Must supply either an input file or a pregenerated response" if options[:raw_response].nil? and file.nil?
end
-@@ -542,4 +543,4 @@ module RVideo # :nodoc:
+@@ -483,4 +484,4 @@
match
end
end
-end
\ No newline at end of file
+end
-diff --git a/lib/rvideo/tools/abstract_tool.rb b/lib/rvideo/tools/abstract_tool.rb
-index d336baa..565137a 100644
---- a/lib/rvideo/tools/abstract_tool.rb
-+++ b/lib/rvideo/tools/abstract_tool.rb
-@@ -329,7 +329,8 @@ module RVideo # :nodoc:
- # Pulls the interesting bits of the temp log file into memory. This is fairly tool-specific, so
- # it's doubtful that this default version is going to work without being overridded.
- def populate_raw_result(temp_file_name)
-- @raw_result = `tail -n 500 #{temp_file_name}`
-+ @raw_result = IO::popen("tail -n 500 #{temp_file_name}",
-+ :external_encoding => 'ASCII-8BIT').read
- end
-
- end
-diff --git a/lib/rvideo/tools/ffmpeg.rb b/lib/rvideo/tools/ffmpeg.rb
-index 5d4221d..e518171 100644
---- a/lib/rvideo/tools/ffmpeg.rb
-+++ b/lib/rvideo/tools/ffmpeg.rb
-@@ -79,7 +79,8 @@ module RVideo
- end
-
- # Append the bottom of the log file, where the interesting bits live.
-- @raw_result << `tail -n 500 #{temp_file_name}`
-+ @raw_result << IO::popen("tail -n 500 #{temp_file_name}",
-+ :external_encoding => 'ASCII-8BIT').read
- end
-
- def parse_result(result)
diff --git a/dev-ruby/rvideo/rvideo-0.9.3-r3.ebuild b/dev-ruby/rvideo/rvideo-0.9.3-r3.ebuild
new file mode 100644
index 0000000..4fe2fc2
--- /dev/null
+++ b/dev-ruby/rvideo/rvideo-0.9.3-r3.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+USE_RUBY="ruby19 ruby20 ruby21"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="ENV ENV2 History.txt README.txt RULES"
+
+# There are specs but they require an old version of rspec.
+RUBY_FAKEGEM_TASK_TEST=""
+
+RUBY_FAKEGEM_EXTRAINSTALL="config"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Inspect and process video or audio files."
+HOMEPAGE="http://code.google.com/p/rvideo/"
+LICENSE="MIT"
+
+KEYWORDS="~amd64 ~x86 ~x86-macos"
+SLOT="0"
+IUSE="doc flv"
+
+RUBY_PATCHES=( rvideo-ffmpeg.patch rvideo-output-encoding.patch )
+
+ruby_add_rdepend "flv? ( media-video/flvtool2 )"
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-09-10 9:19 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-09-10 9:19 [gentoo-commits] dev/graaff:master commit in: dev-ruby/rvideo/files/, dev-ruby/rvideo/ Hans de Graaff
-- strict thread matches above, loose matches on Subject: below --
2014-09-10 8:53 Hans de Graaff
2012-03-20 9:14 Hans de Graaff
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox