diff options
| -rw-r--r-- | Library/Formula/mkvdts2ac3.rb | 101 |
1 files changed, 94 insertions, 7 deletions
diff --git a/Library/Formula/mkvdts2ac3.rb b/Library/Formula/mkvdts2ac3.rb index 0910372f3..3c781cad6 100644 --- a/Library/Formula/mkvdts2ac3.rb +++ b/Library/Formula/mkvdts2ac3.rb @@ -1,16 +1,103 @@ -require 'formula' +require "formula" class Mkvdts2ac3 < Formula - homepage 'https://github.com/JakeWharton/mkvdts2ac3' - head 'https://github.com/JakeWharton/mkvdts2ac3.git' + homepage "https://github.com/JakeWharton/mkvdts2ac3" - url 'https://github.com/JakeWharton/mkvdts2ac3/archive/1.6.0.tar.gz' - sha1 'e427eb6875d935dc228c42e99c3cd19c7ceaa322' + stable do + url "https://github.com/JakeWharton/mkvdts2ac3/archive/1.6.0.tar.gz" + sha1 "e427eb6875d935dc228c42e99c3cd19c7ceaa322" - depends_on 'mkvtoolnix' - depends_on 'ffmpeg' + # patch with upstream fix for newer mkvtoolnix compatibility + # https://github.com/JakeWharton/mkvdts2ac3/commit/f5008860e7ec2cbd950a0628c979f06387bf76d0 + patch :DATA + end + revision 1 + + head "https://github.com/JakeWharton/mkvdts2ac3.git" + + depends_on "mkvtoolnix" + depends_on "ffmpeg" def install bin.install "mkvdts2ac3.sh" => "mkvdts2ac3" end end + +__END__ +diff --git a/mkvdts2ac3.sh b/mkvdts2ac3.sh +index 270f768..156d60d 100755 +--- a/mkvdts2ac3.sh ++++ b/mkvdts2ac3.sh +@@ -355,8 +355,18 @@ if [ $EXECUTE = 1 ]; then + checkdep perl + fi + ++# Make some adjustments based on the version of mkvtoolnix ++MKVTOOLNIXVERSION=$(mkvmerge -V | cut -d " " -f 2 | sed s/\[\^0-9\]//g) ++if [ ${MKVTOOLNIXVERSION} -lt 670 ]; then ++ AUDIOTRACKPREFIX="audio (A_" ++ VIDEOTRACKPREFIX="video (V_" ++else ++ AUDIOTRACKPREFIX="audio (" ++ VIDEOTRACKPREFIX="video (" ++fi ++ + # Added check to see if AC3 track exists. If so, no need to continue +-if [ "$(mkvmerge -i "$MKVFILE" | grep -i "A_AC3")" ]; then ++if [ "$(mkvmerge -i "$MKVFILE" | grep -i "${AUDIOTRACKPREFIX}AC3")" ]; then + echo $"AC3 track already exists in '$MKVFILE'." + if [ $FORCE = 0 ]; then + echo $"Use -f or --force argument to bypass this check." +@@ -389,11 +399,11 @@ doprint $"WORKING DIRECTORY: $WD" + if [ -z $DTSTRACK ]; then + doprint "" + doprint $"Find first DTS track in MKV file." +- doprint "> mkvmerge -i \"$MKVFILE\" | grep -m 1 \"audio (A_DTS)\" | cut -d ":" -f 1 | cut -d \" \" -f 3" ++ doprint "> mkvmerge -i \"$MKVFILE\" | grep -m 1 \"${AUDIOTRACKPREFIX}DTS)\" | cut -d ":" -f 1 | cut -d \" \" -f 3" + DTSTRACK="DTSTRACK" #Value for debugging + dopause + if [ $EXECUTE = 1 ]; then +- DTSTRACK=$(mkvmerge -i "$MKVFILE" | grep -m 1 "audio (A_DTS)" | cut -d ":" -f 1 | cut -d " " -f 3) ++ DTSTRACK=$(mkvmerge -i "$MKVFILE" | grep -m 1 "${AUDIOTRACKPREFIX}DTS)" | cut -d ":" -f 1 | cut -d " " -f 3) + + # Check to make sure there is a DTS track in the MVK + if [ -z $DTSTRACK ]; then +@@ -405,10 +415,10 @@ if [ -z $DTSTRACK ]; then + else + # Checks to make sure the command line argument track id is valid + doprint $"Checking to see if DTS track specified via arguments is valid." +- doprint "> mkvmerge -i \"$MKVFILE\" | grep \"Track ID $DTSTRACK: audio (A_DTS)\"" ++ doprint "> mkvmerge -i \"$MKVFILE\" | grep \"Track ID $DTSTRACK: ${AUDIOTRACKPREFIX}DTS)\"" + dopause + if [ $EXECUTE = 1 ]; then +- VALID=$(mkvmerge -i "$MKVFILE" | grep "Track ID $DTSTRACK: audio (A_DTS)") ++ VALID=$(mkvmerge -i "$MKVFILE" | grep "Track ID $DTSTRACK: ${AUDIOTRACKPREFIX}DTS)") + + if [ -z "$VALID" ]; then + error $"Track ID '$DTSTRACK' is not a DTS track and/or does not exist." +@@ -555,14 +565,14 @@ else + # If user doesn't want the original DTS track drop it + if [ $NODTS ]; then + # Count the number of audio tracks in the file +- AUDIOTRACKS=$(mkvmerge -i "$MKVFILE" | grep "audio (A_" | wc -l) ++ AUDIOTRACKS=$(mkvmerge -i "$MKVFILE" | grep "$AUDIOTRACKPREFIX" | wc -l) + + if [ $AUDIOTRACKS -eq 1 ]; then + # If there is only the DTS audio track then drop all audio tracks + CMD="$CMD -A" + else + # Get a list of all the other audio tracks +- SAVETRACKS=$(mkvmerge -i "$MKVFILE" | grep "audio (A_" | cut -d ":" -f 1 | grep -vx "Track ID $DTSTRACK" | cut -d " " -f 3 | awk '{ if (T == "") T=$1; else T=T","$1 } END { print T }') ++ SAVETRACKS=$(mkvmerge -i "$MKVFILE" | grep "$AUDIOTRACKPREFIX" | cut -d ":" -f 1 | grep -vx "Track ID $DTSTRACK" | cut -d " " -f 3 | awk '{ if (T == "") T=$1; else T=T","$1 } END { print T }') + # And copy only those + CMD="$CMD -a \"$SAVETRACKS\"" + +@@ -576,7 +586,7 @@ else + fi + + # Get track ID of video track +- VIDEOTRACK=$(mkvmerge -i "$MKVFILE" | grep -m 1 "video (V_" | cut -d ":" -f 1 | cut -d " " -f 3) ++ VIDEOTRACK=$(mkvmerge -i "$MKVFILE" | grep -m 1 "$VIDEOTRACKPREFIX" | cut -d ":" -f 1 | cut -d " " -f 3) + # Add original MKV file, set header compression scheme + CMD="$CMD --compression $VIDEOTRACK:$COMP \"$MKVFILE\"" + |