From 93b939e52668d7b9579e19918fd591ed6838a1a9 Mon Sep 17 00:00:00 2001 From: fbrosson Date: Sun, 29 Jun 2014 17:08:21 +0200 Subject: [PATCH] cdrtools: add devel 3.01a24 Switched the stable alternative from tar.gz to tar.bz2 (since the "inside" tar archives have the exact same checksum). Added a devel (3.01a24) alternative using an embedded patch carefully created from the one used for the stable release. Closes Homebrew/homebrew#30534. Signed-off-by: Jack Nagel --- Formula/cdrtools.rb | 42 +++++++++++++++++++++++++++++++++++------- 1 file changed, 35 insertions(+), 7 deletions(-) diff --git a/Formula/cdrtools.rb b/Formula/cdrtools.rb index 0cfc27ce1c..e9469dff16 100644 --- a/Formula/cdrtools.rb +++ b/Formula/cdrtools.rb @@ -2,19 +2,30 @@ require 'formula' class Cdrtools < Formula homepage 'http://cdrecord.org/' - url 'https://downloads.sourceforge.net/project/cdrtools/cdrtools-3.00.tar.gz' - sha1 '2cd7d1725e0da2267b7a033cc744295d6e2bc6b9' + + stable do + url "https://downloads.sourceforge.net/project/cdrtools/cdrtools-3.00.tar.bz2" + sha1 "6464844d6b936d4f43ee98a04d637cd91131de4e" + + patch :p0 do + url "https://trac.macports.org/export/104091/trunk/dports/sysutils/cdrtools/files/patch-include_schily_sha2.h" + sha1 "6c2c06b7546face6dd58c3fb39484b9120e3e1ca" + end + end + + devel do + url "https://downloads.sourceforge.net/project/cdrtools/alpha/cdrtools-3.01a24.tar.bz2" + version "3.01~a24" + sha1 "b49b01b6269280336ef3ca89aa41538db3a9b2dc" + + patch :p0, :DATA + end depends_on 'smake' => :build conflicts_with 'dvdrtools', :because => 'both dvdrtools and cdrtools install binaries by the same name' - patch :p0 do - url "https://trac.macports.org/export/104091/trunk/dports/sysutils/cdrtools/files/patch-include_schily_sha2.h" - sha1 "6c2c06b7546face6dd58c3fb39484b9120e3e1ca" - end - def install system "smake", "INS_BASE=#{prefix}", "INS_RBASE=#{prefix}", "install" # cdrtools tries to install some generic smake headers, libraries and @@ -27,3 +38,20 @@ class Cdrtools < Formula man5.rmtree end end + +__END__ +--- include/schily/sha2.h.orig 2010-08-27 10:41:30.000000000 +0000 ++++ include/schily/sha2.h +@@ -104,10 +104,12 @@ + + #ifdef HAVE_LONGLONG + extern void SHA384Init __PR((SHA2_CTX *)); ++#ifndef HAVE_PRAGMA_WEAK + extern void SHA384Transform __PR((UInt64_t state[8], + const UInt8_t [SHA384_BLOCK_LENGTH])); + extern void SHA384Update __PR((SHA2_CTX *, const UInt8_t *, size_t)); + extern void SHA384Pad __PR((SHA2_CTX *)); ++#endif + extern void SHA384Final __PR((UInt8_t [SHA384_DIGEST_LENGTH], + SHA2_CTX *)); + extern char *SHA384End __PR((SHA2_CTX *, char *));