movgrab 1.1.12

- Upgrade to version 1.1.12
- Remove the four patches merged for us upstream
- Leave in the libUseful separate configure step for now.
- Works well with superenv.
- Works to dl videos as designed.

Closes #15400.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>

1 files changed, 3 insertions, 58 deletions

diff --git a/Library/Formula/movgrab.rb b/Library/Formula/movgrab.rb
index c9f0e0855..9ade65e80 100644
--- a/Library/Formula/movgrab.rb
+++ b/Library/Formula/movgrab.rb
@@ -2,22 +2,15 @@ require 'formula'
 
 class Movgrab < Formula
   homepage 'http://sites.google.com/site/columscode'
-  url 'http://sites.google.com/site/columscode/files/movgrab-1.1.10.tgz'
-  sha1 '2a87105501a3397d513c495d9d1f982ef2e09195'
-
-  def patches
-    # 1-3 fix Clang compile errors: non-void functions should return a value
-    # 4 fixes Clang compile error: c99 "inline" function -> unresolved symbols.
-    # All patches including the --no-recusion hack have been emailed upstream at
-    # version 1.1.9.  As of 1.1.10, no reply from the developer.
-    DATA
-  end
+  url 'http://sites.google.com/site/columscode/files/movgrab-1.1.12.tar.gz'
+  sha1 'de5e48e0cde9c038562798a6a9fdcc56746c31bc'
 
   def install
     # When configure recurses into libUseful-2.0, it puts CC and CFLAGS into
     # the second configure command line causing an error, invalid host type.
     # The workaround is to manually configure libUseful-2.0 without those.
     # The cache-file and srcdir arguments parse ok.  So those were left in.
+    # Reported upstream. As of 1.1.12 the dev hasn't solved this yet.
     system './configure', "--prefix=#{prefix}", '--no-recursion'
     cd 'libUseful-2.0' do
       system './configure', "--prefix=#{prefix}",
@@ -28,51 +21,3 @@ class Movgrab < Formula
     system 'make install'
   end
 end
-
-__END__
---- a/main.c	2012-02-10 07:34:13.000000000 -0800
-+++ b/main.c	2012-02-12 10:22:28.000000000 -0800
-@@ -76,7 +76,7 @@
- int Port;
- int RetVal=FALSE;
- 
--if (!StrLen(Path)) return;
-+if (!StrLen(Path)) return(FALSE);
- 
- Type=MovType;
- NextPath=CopyStr(NextPath,Path);
---- a/libUseful-2.0/file.c	2012-01-28 04:09:00.000000000 -0800
-+++ b/libUseful-2.0/file.c	2012-02-12 10:23:03.000000000 -0800
-@@ -515,7 +515,7 @@
- {
- int len;
- 
--if (! S) return;
-+if (! S) return(NULL);
- len=S->OutEnd - S->OutStart; 
- 
- STREAMReadThroughProcessors(S, NULL, 0);
---- a/libUseful-2.0/sound.c	2012-01-23 21:28:28.000000000 -0800
-+++ b/libUseful-2.0/sound.c	2012-02-12 10:23:24.000000000 -0800
-@@ -416,7 +416,7 @@
- {
- int result, fd;
- 
--if (StrLen(SoundFilePath) < 1) return;
-+if (StrLen(SoundFilePath) < 1) return(FALSE);
- #ifdef HAVE_LIBESD
- 
- fd=ESDGetConnection();
---- a/libUseful-2.0/string.h	2012-01-23 21:28:28.000000000 -0800
-+++ b/libUseful-2.0/string.h	2012-02-12 10:23:44.000000000 -0800
-@@ -31,8 +31,8 @@
- char *VFormatStr(char *,const char *,va_list);
- char *FormatStr(char *,const char *,...);
- char *AddCharToStr(char *,char);
--inline char *AddCharToBuffer(char *Buffer, int BuffLen, char Char);
--inline char *AddBytesToBuffer(char *Buffer, int BuffLen, char *Bytes, int Len);
-+char *AddCharToBuffer(char *Buffer, int BuffLen, char Char);
-+char *AddBytesToBuffer(char *Buffer, int BuffLen, char *Bytes, int Len);
- char *SetStrLen(char *,int);
- char *strlwr(char *);
- char *strrep(char *,char, char);