File fix-build.patch of Package yofrankie
diff --git a/Makefile b/Makefile
index e186b41..cbb35de 100644
--- a/Makefile
+++ b/Makefile
@@ -20,7 +20,7 @@ NAME = yofrankie
VERSION = 1.1b
BLENDER = blender
-PYTHON = python
+PYTHON = python3
SVN = svn
PACKAGE_DIR = ./package
PREFIX ?= /usr/local
diff --git a/dist/blendfile_gzip.py b/dist/blendfile_gzip.py
index d4e5a7d..c31dbc0 100644
--- a/dist/blendfile_gzip.py
+++ b/dist/blendfile_gzip.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
# --------------------------------------------------------------------------
# Blendfile compresser
@@ -47,13 +47,13 @@ def fileList(path):
def main():
if not os.path.isdir(root_dir):
- print 'Expected a dir to search for blendfiles as a final arg. aborting.'
+ print('Expected a dir to search for blendfiles as a final arg. aborting.')
return
- print 'Searching "%s"...' % root_dir
+ print('Searching "%s"...' % root_dir)
files= [f for f in fileList(root_dir)]
files.sort()
- print 'done.'
+ print('done.')
#print files
tot_files= len(files)
tot_compressed= tot_blends= tot_alredy_compressed= 0
@@ -66,11 +66,11 @@ def main():
f_lower[:-1].endswith('.blend') or\
f_lower[:-2].endswith('.blend'): # .blend10 +
- print f,'...',
+ print(f,'...')
tot_blends+=1
# allows for dirs with .blend, will just be false.
if isblend_nogz(f):
- print 'compressing ...',
+ print('compressing ...')
tot_compressed+= 1
orig_size= os.path.getsize(f)
tot_blend_size+= orig_size
@@ -78,18 +78,18 @@ def main():
os.system('mv "%s.gz" "%s"' % (f,f)) # rename the gz file to the original.
new_size= os.path.getsize(f)
tot_blend_size_saved += orig_size-new_size
- print 'saved %.2f%%' % (100-(100*(float(new_size)/orig_size)))
+ print('saved %.2f%%' % (100-(100*(float(new_size)/orig_size))))
else:
- print 'alredy compressed.'
+ print('alredy compressed.')
tot_alredy_compressed+=1
- print '\nTotal files:', tot_files
- print 'Total Blend:', tot_blends
- print 'Total Blend Compressed:', tot_compressed
- print 'Total Alredy Compressed:', tot_alredy_compressed
- print '\nTotal Size in Blends: %sMB' % (((tot_blend_size)/1024)/1024)
- print 'Total Saved in Blends: %sMB' % (((tot_blend_size_saved)/1024)/1024)
+ print('\nTotal files:', tot_files)
+ print('Total Blend:', tot_blends)
+ print('Total Blend Compressed:', tot_compressed)
+ print('Total Alredy Compressed:', tot_alredy_compressed)
+ print('\nTotal Size in Blends: %sMB' % (((tot_blend_size)/1024)/1024))
+ print('Total Saved in Blends: %sMB' % (((tot_blend_size_saved)/1024)/1024))
if __name__=='__main__':
main()
diff --git a/dist/imagefile_compress.py b/dist/imagefile_compress.py
index 4ded875..3993589 100644
--- a/dist/imagefile_compress.py
+++ b/dist/imagefile_compress.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
# --------------------------------------------------------------------------
# Imagefile compresser
@@ -141,13 +141,13 @@ def replace_ext(path, ext):
def main():
if not os.path.isdir(root_dir):
- print 'Expected a dir to search for blendfiles as a final arg. aborting.'
+ print('Expected a dir to search for blendfiles as a final arg. aborting.')
return
- print 'Searching "%s"...' % root_dir
+ print('Searching "%s"...' % root_dir)
files= [f for f in fileList(root_dir)]
files.sort()
- print 'done.'
+ print('done.')
#print files
tot_files= len(files)
tot_compressed= tot_images= tot_alredy_compressed= 0
@@ -160,50 +160,50 @@ def main():
f_lower= f.lower()
if f_lower.endswith('.png') or f_lower.endswith('.tga'):
- print f,'...',
+ print(f,'...')
tot_images+=1
# allows for dirs with .blend, will just be false.
has_no_alpha = isimage_noalpha(f)
if has_no_alpha or not USE_JPEG:
- print 'compressing ...',
+ print('compressing ...')
tot_compressed+= 1
orig_size= os.path.getsize(f)
tot_blend_size+= orig_size
if USE_JPEG:
f_new = replace_ext(f, '.jpg')
- os.system('convert "%s" "%s"' % (f, f_new))
+ os.system('magick convert "%s" "%s"' % (f, f_new))
else:
f_new = replace_ext(f, '_temp_' + os.path.splitext(f)[1])
if has_no_alpha:
- os.system('convert +matte -quality 100 "%s" "%s"' % (f, f_new))
+ os.system('magick convert +matte -quality 100 "%s" "%s"' % (f, f_new))
else:
- os.system('convert -quality 100 "%s" "%s"' % (f, f_new))
+ os.system('magick convert -quality 100 "%s" "%s"' % (f, f_new))
new_size= os.path.getsize(f_new)
if new_size < orig_size:
os.system('rm "%s"' % f) # remove the uncompressed image
tot_blend_size_saved += orig_size-new_size
- print 'saved %.2f%%' % (100-(100*(float(new_size)/orig_size)))
+ print('saved %.2f%%' % (100-(100*(float(new_size)/orig_size))))
if not USE_JPEG:
os.system('mv "%s" "%s"' % (f_new, f))
else:
os.system('rm "%s"' % f_new) # jpeg image isnt smaller, remove it
- print 'no space saved, not using compressed file'
+ print('no space saved, not using compressed file')
else:
- print 'has alpha, cannot compress.'
+ print('has alpha, cannot compress.')
tot_alredy_compressed+=1
- print '\nTotal files:', tot_files
- print 'Total Images:', tot_images
- print 'Total Images Compressed:', tot_compressed
- print 'Total Alredy Compressed:', tot_alredy_compressed
- print '\nTotal Size in Images: %sMB' % (((tot_blend_size)/1024)/1024)
- print 'Total Saved in Images: %sMB' % (((tot_blend_size_saved)/1024)/1024)
+ print('\nTotal files:', tot_files)
+ print('Total Images:', tot_images)
+ print('Total Images Compressed:', tot_compressed)
+ print('Total Alredy Compressed:', tot_alredy_compressed)
+ print('\nTotal Size in Images: %sMB' % (((tot_blend_size)/1024)/1024))
+ print('Total Saved in Images: %sMB' % (((tot_blend_size_saved)/1024)/1024))
if USE_JPEG:
# Now relink images
