alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #24903 from pjones/pjones/atomicparsely

Browse source 
atomicparsley: 0.9.0 -> 0.9.6
This commit is contained in:
Benjamin Staffin 2017-04-14 19:02:05 -04:00 committed by GitHub
parent c089dbe75c 3f69d10342
commit aeebfd9daa
2 changed files with 14 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
pkgs/tools/video/atomicparsley/casts.patch
View file

@ -1,38 +0,0 @@
--- AtomicParsley-source-0.9.0/AtomicParsley.cpp.orig 2015-03-13 15:38:16.817904490 -0600
+++ AtomicParsley-source-0.9.0/AtomicParsley.cpp 2015-03-13 15:48:07.595273416 -0600
@@ -1447,7 +1447,7 @@
uint32_t atom_offsets = 0;
char* uuid_outfile = (char*)calloc(1, sizeof(char)*MAXPATHLEN+1); //malloc a new string because it may be a cli arg for a specific output path
if (output_path == NULL) {
- char* orig_suffix = strrchr(originating_file, '.');
+ char* orig_suffix = strrchr((char*)originating_file, (int)'.');
if (orig_suffix == NULL) {
fprintf(stdout, "AP warning: a file extension for the input file was not found.\n\tGlobbing onto original filename...\n");
path_len = strlen(originating_file);
@@ -4464,7 +4464,7 @@
void APar_DeriveNewPath(const char *filePath, char* temp_path, int output_type, const char* file_kind, char* forced_suffix, bool random_filename = true) {
char* suffix = NULL;
if (forced_suffix == NULL) {
- suffix = strrchr(filePath, '.');
+ suffix = strrchr((char*)filePath, (int)'.');
} else {
suffix = forced_suffix;
}
@@ -4480,7 +4480,7 @@
memcpy(temp_path, filePath, base_len);
memcpy(temp_path + base_len, file_kind, strlen(file_kind));
#else
- char* file_name = strrchr(filePath, '/');
+ char* file_name = strrchr((char*)filePath, (int)'/');
size_t file_name_len = strlen(file_name);
memcpy(temp_path, filePath, filepath_len-file_name_len+1);
memcpy(temp_path + strlen(temp_path), ".", 1);
@@ -5006,7 +5006,7 @@
free_modified_name = true;
if (forced_suffix_type == FORCE_M4B_TYPE) { //using --stik Audiobook with --overWrite will change the original file's extension
uint16_t filename_len = strlen(m4aFile);
- char* suffix = strrchr(m4aFile, '.');
+ char* suffix = strrchr((char*)m4aFile, (int)'.');
memcpy(originating_file, m4aFile, filename_len+1 );
memcpy(originating_file + (filename_len - strlen(suffix) ), ".m4b", 5 );
}

35
pkgs/tools/video/atomicparsley/default.nix
View file

@ -1,39 +1,32 @@
{ stdenv, fetchurl, unzip, darwin }:
{ stdenv, fetchhg, autoreconfHook, zlib, darwin }:
stdenv.mkDerivation rec {
name = "atomicparsley-${version}";
product = "AtomicParsley";
version = "0.9.0";
version = "0.9.6";
src = fetchurl {
url = "mirror://sourceforge/atomicparsley/${product}-source-${version}.zip";
sha256 = "de83f219f95e6fe59099b277e3ced86f0430ad9468e845783092821dff15a72e";
src = fetchhg {
url = "https://bitbucket.org/wez/atomicparsley";
sha256 = "05n4kbn91ps52h3wi1qb2jwygjsc01qzx4lgkv5mvwl5i49rj8fm";
};
patches = stdenv.lib.optional (!stdenv.cc.isClang) ./casts.patch;
buildInputs =
[ autoreconfHook
zlib
] ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Cocoa;
buildInputs = [ unzip ]
++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Cocoa;
setSourceRoot = "sourceRoot=${product}-source-${version}";
buildPhase = "bash build";
installPhase = "install -D AtomicParsley $out/bin/AtomicParsley";
postPatch = ''
substituteInPlace build \
--replace 'g++' 'c++'
substituteInPlace AP_NSImage.mm \
--replace '_NSBitmapImageFileType' 'NSBitmapImageFileType'
'';
meta = with stdenv.lib; {
description = ''
A lightweight command line program for reading, parsing and
setting metadata into MPEG-4 files
'';
homepage = http://atomicparsley.sourceforge.net/;
longDescription = ''
This is a maintained fork of the original AtomicParsley.
'';
homepage = https://bitbucket.org/wez/atomicparsley;
license = licenses.gpl2;
platforms = platforms.unix;
maintainers = with maintainers; [ pjones ];