Skip site navigation (1)Skip section navigation (2) 
Date:      Fri, 18 Nov 2016 03:34:14 +0000 (UTC)
From:      Jan Beich <jbeich@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r426306 - head/multimedia/atomicparsley/files
Message-ID:  <201611180334.uAI3YEIF067489@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: jbeich
Date: Fri Nov 18 03:34:14 2016
New Revision: 426306
URL: https://svnweb.freebsd.org/changeset/ports/426306

Log:
  multimedia/atomicparsley: unbreak with libc++ 3.9
  
  AtomicParsley.cpp:1450:9: error: cannot initialize a variable of type 'char *' with an rvalue of type 'const char *'
                  char* orig_suffix = strrchr(originating_file, '.');
                        ^             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  AtomicParsley.cpp:4467:10: error: assigning to 'char *' from incompatible type 'const char *'
                  suffix = strrchr(filePath, '.');
                         ^ ~~~~~~~~~~~~~~~~~~~~~~
  AtomicParsley.cpp:4483:9: error: cannot initialize a variable of type 'char *' with an rvalue of type 'const char *'
                  char* file_name = strrchr(filePath, '/');
                        ^           ~~~~~~~~~~~~~~~~~~~~~~
  AtomicParsley.cpp:5009:11: error: cannot initialize a variable of type 'char *' with an rvalue of type 'const char *'
                                  char* suffix = strrchr(m4aFile, '.');
                                        ^        ~~~~~~~~~~~~~~~~~~~~~
  PR:		212343
  Reported by:	antoine (via exp-run)

Added:
  head/multimedia/atomicparsley/files/patch-AtomicParsley.cpp   (contents, props changed)

Added: head/multimedia/atomicparsley/files/patch-AtomicParsley.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/multimedia/atomicparsley/files/patch-AtomicParsley.cpp	Fri Nov 18 03:34:14 2016	(r426306)
@@ -0,0 +1,38 @@
+--- AtomicParsley.cpp.orig	2006-09-15 23:22:33 UTC
++++ AtomicParsley.cpp
+@@ -1447,7 +1447,7 @@ void APar_Extract_uuid_binary_file(Atomi
+ 	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, '.');
++		const char* orig_suffix = strrchr(originating_file, '.');
+ 		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);
+@@ -4462,7 +4462,7 @@ void APar_TestTracksForKind() {
+ #endif
+ 
+ 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;
++	const char* suffix = NULL;
+ 	if (forced_suffix == NULL) {
+ 		suffix = strrchr(filePath, '.');
+ 	} else {
+@@ -4480,7 +4480,7 @@ void APar_DeriveNewPath(const char *file
+ 		memcpy(temp_path, filePath, base_len);
+ 		memcpy(temp_path + base_len, file_kind, strlen(file_kind));
+ #else
+-		char* file_name = strrchr(filePath, '/');
++		const char* file_name = strrchr(filePath, '/');
+ 		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 @@ void APar_WriteFile(const char* m4aFile,
+ 			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, '.');
++				const char* suffix = strrchr(m4aFile, '.');
+ 				memcpy(originating_file, m4aFile, filename_len+1 );
+ 				memcpy(originating_file + (filename_len - strlen(suffix) ), ".m4b", 5 );
+ 			}

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201611180334.uAI3YEIF067489>